gentoo resync : 10.09.2021

20 files changed, 473 insertions, 13 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 73df109c9079..6d766fc2e2b7 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index ad0d86076df7..db0bd7c17d41 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,13 +1,19 @@
 DIST citus-10.0.2.tar.gz 5154816 BLAKE2B ace68ec3dcce3e2e9d872b85a864a49f026ba2c0c8b0919bb057b60921094a922f6fed8bc6482b3c31dad396550348d51a514aff0d877d851b871bb5b97773f3 SHA512 3f831c1efd1a54b9dee587f64eae2466691f8d8316643e459d00219c8ca710ea9d12aeac4f0e2e01cadc3dee29f2d8e59f9757d794e9b0bedfbe6ae107815957
 DIST citus-10.0.3.tar.gz 5165390 BLAKE2B ac9bca488cc5546d56f2b5dd2a14733a776fe8da6900650f0a41b0ee223af6b4ea56152e5351346c43de2c96d13b099cf8054692d038a2e8e73d7fc1ba423649 SHA512 1144642e460babca6919d1ddc1f00bfaaba5abc0b24869627fb230781d158f54d34e7c3039a65d79c46682a0e1732bebde3f16b25670a249753afdd7fb81de52
 DIST citus-10.0.4.tar.gz 5176434 BLAKE2B d77acf228b3effcdd47a300d74ce813632ad08d746b2b05cbad42accc9806b0e1d7c190a442a7d09bc1970fa1d1ee731e0125f83ec227fc72f8509e66dc43975 SHA512 73fae991c9176e14b92f2309856b2aa22ad34056573f21a918b82b05dbdc584a2874fbe9cc1b161e0a0c743d06aba8fc6079f81e07aeaebe15771d83f6f2e3ef
+DIST citus-10.0.5.tar.gz 5182513 BLAKE2B 84bd1d2d8a33ecb58371625bfe9936985b3e84237f5580b5d217ee7807a541b7d94c09ad1be75204582149a2be0f3b54fa69ba73c089a33c7d416c796259423e SHA512 38414bd53952b3fcda222a3edeb7c0d32c9fe360fd6cfdefbe2c597df0dc527cf32471b5a9eac68be670858f3c3ee0a5691b778e2821c129838d1f17bc7a539b
 DIST citus-10.1.0.tar.gz 5273973 BLAKE2B b9b17d29e1e213d99779e738a6333beaa0f817872194b345c719663971251ba1430feb7e5508923fe7ecc7df763b9c3a7a43e03d869e5cac6b64cac2370750d6 SHA512 7f3bf01e08a2f8087b570a9b54224878cbbeacaa19115f3dd3e4f45a517af59e920d6a1fc490f86c9d0148de118d2b1f6cab65a5df2b3729793ec70d85a4ba22
+DIST citus-10.1.2.tar.gz 5280795 BLAKE2B db67da8c860297b1f0a9cf61c4c1d60fe6675405a8f8cbfacd82ab3a4353273e4d8ea1ba671efbfc33be4f97c6b61e9f13659dbd608bf81377645bebfd999717 SHA512 9ae89944e11429203dc82a7db7733fcbc54d2396fcc3a364ea39923cb3e506730e92cd2c492aece4c03914587df4a3d39d9bc7ce253ef91576dd18c623cb45e7
 DIST citus-9.5.4.tar.gz 4718209 BLAKE2B 706726c8ca6ffb38321e3b91395924e9b778c106096393992080f511338a7ae559f94336bb015508900f85290bd17cda8ef9ce6dbdc2e254f3daf7a09e243bf6 SHA512 3d5e956354e094811675b646a5baf75c26a3ac593c56ac5b6c4c711671002f78fb98a1a4879c4cc967fc4381ae971311f5d73ddadc78a39b66c3108978d677b6
 DIST citus-9.5.6.tar.gz 4723294 BLAKE2B f3e714c754e6f855322ded2f8e73b29e1d8b1d0bf81a68aa69a3b3ddb09a79aa1c088032fb294fb38b86b75bfd6211d0b1f8586252c53336df40dd94a0e3be1f SHA512 b711885e03424c0302c732a654c1b27fd088efc447a4481aeef124684e6c4fd01d2f535d1ebb8cd645df020895228a6450aaed9e00bf2666ab718c96c62c5423
+DIST citus-9.5.7.tar.gz 4735867 BLAKE2B a9e6f960376a88a20a2a1e02cc28a1ddafa331b4bee4b22ef7a8c6b074a6d3707a02ec7afa86465790034f9db44482d443b8ea6777a2113bf631e793a445910d SHA512 372d2db8da83efedb2c81ff85b857e0846419f732f626fb0806ff1b53177a3f4621f1030ec7d63098999dc223d8c7fbcb1ad408734322f2102674df9723dd5c4
 EBUILD citus-10.0.2.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.0.3.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.0.4.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
+EBUILD citus-10.0.5.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-10.1.0.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
+EBUILD citus-10.1.2.ebuild 573 BLAKE2B a5572761f51a81157e42dc6d860cd0a8b91857102aa027b0e23d9aaff092798ebc3efa4fa560b5e52b3e7ddb37be79c7bb26c181e6f87c544862e47583bca25e SHA512 dede570d1b403a461bd9ded53857dcec565c52d11b1475074e40e0ad2ab74fe34bad726857025087152aaf7be7e53f00f89b068a51ca1f9dd58e6447a5d809fd
 EBUILD citus-9.5.4.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 EBUILD citus-9.5.6.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
+EBUILD citus-9.5.7.ebuild 576 BLAKE2B abd2e1f362db53d55bbbfc8bef3e1d3d26fea6234685f353e72df5ea8584118015966f6a11f238ca8b0db91f1eb916e0a9f00a082358058bbf2fcbe338f8b99d SHA512 c2bf7eea0716ead448f7b9a3b8c3301492b6afcc59dd8f0101c9400423d9fea2de8aa4ec90452385486ce47ceb7955f7f93fb03cdb24a8094eb46110b374f1ea
 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f
diff --git a/dev-db/citus/citus-10.0.5.ebuild b/dev-db/citus/citus-10.0.5.ebuild
new file mode 100644
index 000000000000..4bb39ab5f008
--- /dev/null
+++ b/dev-db/citus/citus-10.0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/citus/citus-10.1.2.ebuild b/dev-db/citus/citus-10.1.2.ebuild
new file mode 100644
index 000000000000..7c1f0e8ac75c
--- /dev/null
+++ b/dev-db/citus/citus-10.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/citus/citus-9.5.7.ebuild b/dev-db/citus/citus-9.5.7.ebuild
new file mode 100644
index 000000000000..4bb39ab5f008
--- /dev/null
+++ b/dev-db/citus/citus-9.5.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 11 12 13 )
+
+inherit postgres-multi
+
+DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
+HOMEPAGE="https://www.citusdata.com/"
+SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="POSTGRESQL AGPL-3"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}
+	app-arch/lz4
+	app-arch/zstd
+	"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	postgres-multi_foreach econf
+}
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index be778ae325e0..9d0af5af0544 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -3,5 +3,5 @@ AUX lmdb.pc 295 BLAKE2B 29c1cc5a70eb3d7f5c9dc4b1646644045514929428f164894ece93a4
 DIST openldap-LMDB_0.9.28.tar.gz 144520 BLAKE2B 3466da1ffde7350056fb3b16fc0068d78139c578fdf79cd6456ca0d98e2d7b3d899849ae42a7224335a4680e52b5f0feb2c4233eaf00ee3d9ee648ae10c3114a SHA512 0cdf9a2ce35617a3135cde96491fbbb73be9362de2b94d23eda44b65ce48362ff9dbdfe921c3255ed486aceb385fcb62b81f560b1037476f4741291b29ba0dce
 DIST openldap-LMDB_0.9.29.tar.gz 144545 BLAKE2B b7e55e4fa03e878a95b8f7c583684727a81d51a3acf2ec064d8fe26475bf9ffe4dddf16c2bccbda901b94b7c8d57f41fa63f7c09bcab46401bd000958a5b87b3 SHA512 b41ba5b139375d23617a79f4d322399df55745c5a4a63159ddbe0f1ded4707f0eb7f71acf3d1a4928f8fcab30a7b5db17e3e165441a61ec1dbd29f8d9efa65d1
 EBUILD lmdb-0.9.28.ebuild 2423 BLAKE2B 636c329e7b7b25836eab23957eb79511cbe0e8d0a77f3d05628b7b0947772e07f287e802d682eadb95e6bf358dfdbe5eecb3ac95aa92e98c649cc7981958aa7d SHA512 32b293b7667938b1a79752904e7a42e73a1391aa7d89c3cfa3fffe350d3fc6aa246837ef0d0de6728e0255cea64c560b34ab9a6e382ec105833b0eccdd403bef
-EBUILD lmdb-0.9.29.ebuild 2368 BLAKE2B 8f69cdb2a95c9ccdd758ca0840fdbfc129676e3f9aca16838f6417a68aee8950c54b5b147ca58b7684966882b5b3d8b4c632cae901900a3c8404185104d01d4e SHA512 43d943164427ff162da94ff9f59231c93f8b864c7d08519ba60ff7b30b011ad945c887b3bca0c70b9f7e6b22e6317471e05f9f75b88f08d7985e5587d107d1c7
+EBUILD lmdb-0.9.29.ebuild 2366 BLAKE2B 8c0dd9081b6b427a775ddff22a341f2d5814133946643ffb27a45e6e22e66167bd0f0db9d59188aa284e3087e9aad66eff88a180332ee5baa45a220e811c27b2 SHA512 20e616de78ed27b15549f72e4d08ae12fd0c233f3471fb5e73e4e39e54b698eda3fa6204893ddfe3cb4ed4f82d22738031606708854eccc9bb2284291b9d0c31
 MISC metadata.xml 432 BLAKE2B 21af6c7ba636803d33bf8877d93282327ab14f0688657115cfc2d23bf40b0f1c556cdf7238460430347570590d8ff2441f8186b5f15fa48651f12e8fdef846e4 SHA512 5feed30bc7a5a51b41f330de6446ab4f92826d2e1c216f0eb994d3e6e55b596e0a57369d51f11fc0151acc67da5d6b0d169d2394de1bd4790f2eba0eac1a21cf
diff --git a/dev-db/lmdb/lmdb-0.9.29.ebuild b/dev-db/lmdb/lmdb-0.9.29.ebuild
index 638f04abd994..23a29fb5b0ae 100644
--- a/dev-db/lmdb/lmdb-0.9.29.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.29.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 1acc393855b8..456000f7311f 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -5,7 +5,7 @@ DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284 SHA512 0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
 EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890
-EBUILD mariadb-connector-c-3.1.13.ebuild 2096 BLAKE2B ab84bfc07ef6bda7e14dad90833e3cf6154efe104d248fd6abd585e93883ba1d067953b43e68be6e97d539e9844bd3db99d16e233405a621872fd995c4a46244 SHA512 68dc9e2d3abcd36bec39ad8ccfdd61ddc14be693756e0fa4199ca68d33e633c470099eb61953e1d35a756050d49b991009b40088a984732b30daee9d76554083
+EBUILD mariadb-connector-c-3.1.13.ebuild 2095 BLAKE2B e4cfcce60afebb3c706c585396950e4e90dd4eba29e22a541ad4947639ee2e5d957bf0347be30fdd5525af93e53824ba6a99a4057d2676b70b143bf0faeb1e86 SHA512 7b2f9d3098d43fdff9ec0e44beab28dc5a1e0bf66460d402cb8e66c528f4dbe04a15e0aba2b5dcfe96924d818d1c0be5db81abb13ee2dbb4e1d98da51fa086bd
 EBUILD mariadb-connector-c-3.2.3.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
 EBUILD mariadb-connector-c-9999.ebuild 2129 BLAKE2B d166508f5a826a721b3822eab5a6f5a8c9161f084e0f2f7e57bea70897344b4f82fc2d26860e459002786e6b83ef0f214a42526ff9965594ea23847aa1c76ffe SHA512 e10c8135d1cfccc68d57990220d64ceba5b5aa33f9a6d9a507ac3ca5d4730b11802f31ccef9ced4673bd85e2640af21dc325262aa3e5e8c40ff0d258a14d94e2
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 86003f60c86e..47a263996a79 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 CMAKE_ECLASS=cmake
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index 6133ae5aea1d..36a019bd62a1 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -2,8 +2,10 @@ AUX odbcinst.ini 82 BLAKE2B 7c752f9500f2141886c798d9be4aa2e84ecb089589394c4f4737
 AUX odbcinst2.ini 90 BLAKE2B 8070ddb3460799429fc9a80f5c54317381f3fc79a9b98766bb7c5db325ace3ed5f558df70386c2249f8a1f5a373cde51f0a28140421a00d3599f75994c28cbbf SHA512 00634eab33d08650cd19128bfd9d2187b4e5d38a866d08690d0b1e2224af7dcfefcb45f13a83f4a774beee322e6c5f3152c0f967399aea2893f8e857451aba8a
 DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966 SHA512 185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3
 DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121 SHA512 9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
+DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f SHA512 b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3 SHA512 ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d
 EBUILD mariadb-connector-odbc-3.1.11-r2.ebuild 1996 BLAKE2B 5e75c6e35be1f662ed0ca39dfa16ae1bc52b8969aac2497e78e7548bbeb773c451bef0838f82ed2d351faae830ccfb4e0f4c52a5fb27f97eda937735976eff7a SHA512 5e7123178569fa3097845ec93b97d0fd53ae8846b1fb0d987979c0c42cda09abf925eb4308f60f3809a32ce7404dbd4f1bae537923f1942eb69f67abd5530e34
 EBUILD mariadb-connector-odbc-3.1.12.ebuild 1992 BLAKE2B dda492ef03ed45e2ce32b5af2e41411c2b5286f78f542191340f109b3cbb2fee01fdf5b32a01df02bb65525fe46116294e8a854e518f7a2a18372f98030d730d SHA512 e54bd65b29fe2cd8b89b41e34d5996f6000bfe2a29d5c8751d623562aee64ecc2e78595f8e36442bf0390949ffb096fd508c815aa1a39f44a5f234304543a588
+EBUILD mariadb-connector-odbc-3.1.13.ebuild 1994 BLAKE2B 23a1536f236c35ace2b7e43fb8df28166732cd0c39f53ea11ce64a39b6b27e23b1d7e8053df0d123119909b0d7c5e9b9aaa323c5cfec3fefcf47d7baef58d4ec SHA512 88d2cf122b8ef9cb16f2a3416467f369e2d89e895ec7174f898aea523e2ad9279280e88102c8f7ee763aa91f98db6d0cf0b147467726e48306c3023faaf873b8
 EBUILD mariadb-connector-odbc-3.1.6.ebuild 1700 BLAKE2B ff213bb689fb6d20754b313eb296da1bbd93d87cb3af978eb87b021321d459f2bfe0354340a370ea88054e509af34ca311924ebad0fac3843491b9bf84fd6ab5 SHA512 0ad3a6f1e594fcdb6248f6eb39cb54a85f4a0c59f05b82b1c2ad4037939a227ef73983a34a01e0c9c40d9b5a2bd038dfcc85d3d91ea6f6121dee5e397ea523b6
 MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
new file mode 100644
index 000000000000..5cbce6d6d5fb
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-src"
+
+# USE=ssl merely enables the configuration options (seemingly for interactive
+# sessions) and does not cause direct linking to any SSL libraries.  However,
+# it doesn't make sense enable these configuration options unless the
+# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
+# require mariadb-connector-c to have it too.
+DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*:=[ssl?]
+	dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
+}
+
+multilib_src_configure() {
+	append-cppflags $(mariadb_config --cflags || die)
+	local mycmakeargs=(
+		-DWITH_SSL=$(usex ssl OPENSSL OFF)
+		-DMARIADB_LINK_DYNAMIC=YES
+		-DUSE_SYSTEM_INSTALLED_LIB=YES
+		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
+		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/${PN}
+	doins odbcinst.ini
+}
+
+pkg_postinst() {
+	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
+	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
+}
+
+pkg_config() {
+	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
+
+	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
+		einfo "maodbc (MariaDB ODBC driver) has already been installed."
+	else
+		ebegin "Installing maodbc (MariaDB ODBC driver)"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
+		eend ${?} || die
+	fi
+}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8a4cfca6b20c..df356a29e3cb 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -36,5 +36,5 @@ EBUILD mariadb-10.4.20-r1.ebuild 42052 BLAKE2B d4aa73577cf7e76b59fb2b3317b732361
 EBUILD mariadb-10.4.21.ebuild 42860 BLAKE2B ff39ce3452746c749bb0c09340aebb0ad8487ad6b3b9b2d01b17efe4799087e3d05b1947520151fa0a57a925792c2c7a0f8d2fbae93808115fb2dcd42c0ff641 SHA512 1f076a734e32619184271a4df62ccb8296bd332854ef2a82e8044f5f4f00a2021be9047af45751d1b6ba7a1a8c271d16efbfc189a2a004c5619636fd14f085d2
 EBUILD mariadb-10.5.10-r2.ebuild 41471 BLAKE2B 1f4e6991cd21db2470d24a90dd8c0757c961bb42a9f2ac9a17756398f9ec9d7f543c84ba045f332fb2cedc900bd8f14f8bbd17ee4f68b9ce6867bb5068c917fd SHA512 d720b727d1b56074dffd0928ca2463a19a90a124266127f416fff095f551f0d83449e486c01fd0322fd77c0955f1481c023e2764220057b2d5841440b26d230a
 EBUILD mariadb-10.5.11-r1.ebuild 41476 BLAKE2B 3a73afbfcea1aa38f8d13f1db6f0707a4cb43b9bf407f93cefe433c893f504c88047f4ce7924912c8e6a238f5dd00d5fa6cada2d4214c814254ab27de3782d03 SHA512 0af663e45d2291d129962c96d66243d0a999b02bf573ed0e1d80e5f784df39c9d19575e5a5ecd74d547205fb033eadab3311fb18afc6e9d1a661bc96b9e6955f
-EBUILD mariadb-10.5.12.ebuild 42284 BLAKE2B 1da16d3f1ea9d8981d1adc74d6a64de19cb0bfaabe7c0a0b83c91e408e3f78339f171177579523ce6eb3946b80ed50e7e1fd9566a3edeb99322d2cfc500a9475 SHA512 5b3c5397fdcf565f48f5b1df7a663a0d8ab40bfdc995eddc2b10eaa3effaa52a0113f9f0b989b97f4af7e05c22a383eafd8700f6441d13e6e88bd53d17f06e5d
+EBUILD mariadb-10.5.12.ebuild 42291 BLAKE2B 1639d616cdf556ef65f227d0caef6ad8fa100d0058cd7afdbccd3e49934cbf583fe02884396ef84fe64065fa616cd767b91a155345980c617d2070853a7db59c SHA512 cfbf194886a021e4e86c182f53de095231ddeb823efafb0274f0903e9aba55a114ecf7a469ac53427ab0529a1b3c921a0a1218f9895df5d4809275f9eafb6750
 MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.5.12.ebuild b/dev-db/mariadb/mariadb-10.5.12.ebuild
index 137b7a322f1e..7333e139eaa1 100644
--- a/dev-db/mariadb/mariadb-10.5.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.12.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index e34fdad2f5fc..67f393bd6ff3 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -4,5 +4,5 @@ AUX mysql++-3.2.5-as-needed.patch 18594 BLAKE2B 39baa700bd643205974e1e96e48f0595
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 DIST mysql++-3.3.0.tar.gz 4635623 BLAKE2B 0d5bb3dc7eeee92d10eb82b0537a7caff7faec2f330bb3081790b63544caa2e6967aaaf2adc8f68b9b0854da8f0374eda73d4ced50d77fbc119f83fec84376e3 SHA512 cd50f9edc9531b385d91d70aa292629dc7b839fd296f07db470f37c4748617c5c2dba647adf8965d70e2788e9264288d8ca941a6dcd8d08ff7d838e7947e6465
 EBUILD mysql++-3.2.5.ebuild 1689 BLAKE2B 02ab642e69128f159ae66a288fbf651cd9c6176ebe1eaf2f26c9276b0235082c3bcda507ead81b812d41ed4bf8e9f327f9cae7b558af29cf72b401d1f6b59012 SHA512 cf1451689bb7509e58358e49ad526b94b89997756d420a23f4592fe3372974e9f243a9cdd7dd28db4db020e121eab2419ce45f2ccb1bece30c2d6876526201b7
-EBUILD mysql++-3.3.0.ebuild 1655 BLAKE2B 3afa80f70427946b354c622c63423549f8b94ae966bd94c794be6a6498390b4a0549f58463f45886c5079e832ab3dadd828e9c67f6fe2f60743bc574868f61e8 SHA512 5dadf754a857e839759d455c0736a7f037a9e08bbede29515a23332fce0a17594e51b55a936ffd18430bec8615bec501533879dc5b2b3aa617744da40835fdcc
+EBUILD mysql++-3.3.0.ebuild 1651 BLAKE2B 4ccd8ec626105d36173443dc8a4d456bc1889b7f79a795c47c35e7bfb72425ffcb19e32f3c42d35e72d257554ce6012ff94b7fd1c9d3cfaf0fc533cf762d9c57 SHA512 c7548ce309d6bae38cf7b30d8b8b413402be0ec809fe7450d63e067b80c37938a3a43f073c4da5478bb094570f2a31440b671bb2e69ac1b4c56372888661085d
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.3.0.ebuild b/dev-db/mysql++/mysql++-3.3.0.ebuild
index 8e4e26e8bd4c..1dbe3d8deb93 100644
--- a/dev-db/mysql++/mysql++-3.3.0.ebuild
+++ b/dev-db/mysql++/mysql++-3.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index e359d0a9863b..0557b7762bfa 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,3 @@
-DIST pg_activity-2.1.5.tar.gz 277854 BLAKE2B 49dce244d553f516c5d52a061d36a7c51940566e9a13286d3913758eebdc4dbdfbeef9b6954f1c6f41a83647d255e50ea23c6597605571a4563b3cb02fdaec87 SHA512 78d6560ec15b435eeeeaa132851337f04822d42e4288425d85a78842f321ad2c426041cb953fabc8f3f406b9d68e4001a3df5ba2c9223bc0facc2a65619979e0
-EBUILD pg_activity-2.1.5.ebuild 988 BLAKE2B 69eeb374337b00713cb593f0ba2eee64bf644aec89183105678797205b871ed0e1c67cdb0754eadad4694dbe951d41a4ff544c63bf14d3906cff4a4fd09c694b SHA512 4a03d3b88b369f1be169ca542a0e567d4f4099bb729929d1a428473bf9de9174c254d60d0cfc9ed8b9ae95d0214a50da3f6ca5f508a66900a21cd286d6b318d5
+DIST pg_activity-2.2.1.tar.gz 279973 BLAKE2B fda51751d2d6e83eac1f9a731c085b0f37258a5aaf38116f2a90008554d6c8ce48cc615ee9b9a34ab9631b315dba6a763f634754e36b7b5590e08e3077878bb7 SHA512 8128dab29465b1521801a0abdbe242c08ee33aba63b6a29b04293e83383a66a302d96a1980afdc5e92b44aebb784f5b093f48dd22e3d2e703247f4f3408120e5
+EBUILD pg_activity-2.2.1.ebuild 962 BLAKE2B dcb50e03e350229f317159659dcd18cf334d4e7ff9570c83342a69631ee259a05772f4993095a3187dc21d025de877d38edf127ffd27c58d5ea31a41fd858f0a SHA512 ab7cf484043ab510736424adefada2ed4cde374d96d98882175a413f70a27da69636bf83676c9f857f7808717a814012df4f3a0fe031e4f0e86b83140e99b6d2
 MISC metadata.xml 339 BLAKE2B 216c15e347a9dd6061fa95a90fe2a6b5b14f9dcfe7dce8a36376f28dc1c30bad6ae505247d1a5133bf9d8c1d0d61aa07b0f827f1547d563a5046a40e300896ef SHA512 e4b44855c8acd726e3e43cf79e4706077edb2cbccb955ed70c3fe44ee91ed604a057d8b612e4f3950387ee8c96b3fc77fd8e5696e63b896280a243506c7c8853
diff --git a/dev-db/pg_activity/pg_activity-2.1.5.ebuild b/dev-db/pg_activity/pg_activity-2.2.1.ebuild
index 745e50c6b85f..76fc218aadab 100644
--- a/dev-db/pg_activity/pg_activity-2.1.5.ebuild
+++ b/dev-db/pg_activity/pg_activity-2.2.1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -34,7 +33,7 @@ distutils_enable_tests pytest
 python_test() {
 	# https://github.com/dalibo/pg_activity/issues/201
 	export COLUMNS="80"
-	epytest -k 'not test_ui.txt'
+	epytest -k 'not test_ui.txt and not test_data.py'
 }
 
 src_install() {
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 7be7e07cf7b5..17c992a0a5a0 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,14 +3,18 @@ AUX postgis-3.0.3-avoid-calling-ar-directly.patch 2302 BLAKE2B b45f5c1e3bfd694ac
 AUX postgis-3.0.3-detect-only-stdc.patch 813 BLAKE2B 837b1bcd9dc2084d452dc3403293c159fac081f9564783a787bfe4a22af4486207f84d9f426926acd106d50d83ffaf239abb671eeba75d12677db00a9aab27b2 SHA512 cf950a100dda547caf7f1da3f92cd4f070d4f6e0e864be5cf049c1904ee2ad7e4cdf3f19468a591bdab1e921728d62ba143a4be54f22502d1fd47ee6a0839225
 AUX postgis-3.0.3-try-other-cpp-names.patch 459 BLAKE2B ff9b529a733861956062303e7e3e95979411e33de2c82b8849ba30fa4fc1fad4f030acac667eb33c5a3ce6801025a41a62a0b27b2fc3f198fa98417038bb1e3f SHA512 f7da42b7ecf9efa1a203c0096d8d4d292ff2d5a2d61cdb816a53a37fbef6956a8a6f309c45c9c7132fb7d5cf7c27ee4ebf10cbfd9185d8de66c777cc7fa049f9
 DIST postgis-3.0.3.tar.gz 16871696 BLAKE2B 891f814271de9193cd17013d6d971a752d2e984cb0f68b05510450adef97fc96827e3d1a1c7e4fa4cf79a5d15eb3f74b32e6e9a8db1947f7bad7c2b23656bc8f SHA512 478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+DIST postgis-3.0.4.tar.gz 16871782 BLAKE2B 188e9b843526299bb112cb5f9437a9471a1b2cbf51cf85f68094172cfe98101f66cd2a72b2667161a0d40c4719ceed14299c04494e8165716b5dfd4aa84cd5c7 SHA512 0b01414433137af2708f5dee3cc054823dd788d311273f9055ab2d7bce5901e18206021381f3705408d6e263f7afc9cfcf6eaa5298b82690efaeac66486f8c0e
 DIST postgis-3.1.0.tar.gz 17262134 BLAKE2B dbc6edde826328b84ca7d6cc9329d648c7874d51528252759499131d7ad5dbc1a7a4ef881054f2fa1fc255810157270dc1c0ae0e2ea24ec702f06b9fd5f6dfed SHA512 c5b063ff7cbe855ab6ce4104d170b27eea04ae632fd6fcb8de38b14699296a8e0c9ce06bfb48ab14cba51b7a1b3f7e0a3996d9377a954dfc39fd68fe3f839e8f
 DIST postgis-3.1.1.tar.gz 17261826 BLAKE2B a14bdce3773f8cc50c72880d9b8158c32b546332884645e91cba539ab9238c3cbcbc9ee60292932c86de67a0134bdab6a2b4e6b1f3c55881afbb36a08d8f138a SHA512 b975d26c1ad01fa6b90b5b3b51fd2b4b33204a380af0f76b98d1bfd6bd95f527d4ac3548f1b822e114be17bb3a133bc88c3d33a17d4effdfa1f90ec0c683e5e5
 DIST postgis-3.1.2.tar.gz 17266501 BLAKE2B acc65e3ab70667c57a71bcb9c7bbfc382f8a6038ceb0e91aac07e36fb6b4cb6365aa968b30af13eda8292410cc1b567d871970e6cb7dfaadb454147224f9b834 SHA512 df9d2fa118987e29acd635912a708e643770ad3df82c098f8129f11ab07a9eafde969302d2d2e59a68fea6fc7312fe768a231dd4cb5de7002c418725da75848a
 DIST postgis-3.1.3.tar.gz 17273487 BLAKE2B 603be66476037fca5e75b00079a26b4beaa50f0af0626f89660f17da398576d929574cb363c4177877d9c8db5459f7eac964b85796cd93b0d0c6ff2462d7ad3f SHA512 525c982de6b5888d1f4a4f6d2cca5dfa945d8899d8038b1d62ce222e0149c4ab26a2a3602bb8c85e89ce22b3d5b20d278fc4f841144f4b0d19e6de4f48d819ad
+DIST postgis-3.1.4.tar.gz 17269391 BLAKE2B 6070fb72c777f8baf9c520ec51cf436837fffb54f21af5b4cf800940240f2fb9fcee162b2d3817cbfd4e60c2cef37eb4cf902d9e9f065e537d8d9b8ec965bef3 SHA512 afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683
 EBUILD postgis-3.0.3-r2.ebuild 3373 BLAKE2B f343d54a11b140d87d811337aaba6c2224a7822f158285273d83db7fd7e2e34570760e92efcec9a1220e2e938f3af07f525800406925b5acd51fd2317cc95335 SHA512 6a6e2e25b80a8b4dbc5dd342abcf8ca0af46c6b83d0d6f66f9d30ed01213de5664da47c90cd57a6e2f0985eed4a3a06634e78c94a536d5ca8a04e9e70121e62d
+EBUILD postgis-3.0.4.ebuild 3382 BLAKE2B 5a47a8597294133f9c7448f4af04cc38351c64c7a4ebcaf74e69ed5ad5beb094d79ea269a45171cc7e7a7b21485536c0a237d539979b821f76699543c8840849 SHA512 1813d3a8bff65838e9e2ba7cfcdc460de23311ae6cebf419f30c50a9bec983b933e5e6557e993b8365f19632c67d9d96753dac612f901cb76a7a56705a729e44
 EBUILD postgis-3.1.0.ebuild 3318 BLAKE2B 8433965a9d7536d4909fc18eb09bf74718e94854b272b4ef7d660eb8d5114f28b6aca877c2995f56fb4d3bc0ab71e892f9610bd34dfe9b527338d77ec811f27d SHA512 3e1ddce90bd260bf582844e3464c3a9b926e98d6d584f7b4d52c0351d201c71d71eea87add34b60378ace025f739ed758cc4ea4a75f48a662958ff3ee0d51b7c
 EBUILD postgis-3.1.1.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.2.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-3.1.3.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
+EBUILD postgis-3.1.4.ebuild 3320 BLAKE2B 52426df4505ad116cc33c1122b8b37329a0620d66fda9c8499caaf0571953f775c429a44f8d95a2fbb14b30744e8e761b206a2bd081805b181ffd7716c768351 SHA512 2a02d20a6b63148258cf82936d4d867307c3c527ce8133605e360dfab8166fdf00889b850daff0b7ce0144da2b22b63be792521174ef52967f762bb2352ce487
 EBUILD postgis-9999.ebuild 3243 BLAKE2B b12d44e623a1d57bc6081b6395b85781dc2751ecaa66b854766329b11122157ceaca8ecb0d95a5924f25daf1b2bc2e28cce3487d98373b3d0e9a508ada0a3c52 SHA512 3faf7598a5f029cffe543371c44d82c0943b6672a04722b47bb4be6c6d6c320138e5a11fef38278e1a12947c9a00aeab68bde1c7e080e5e497540baa5717547e
 MISC metadata.xml 682 BLAKE2B 8ba8b31f48ae367ebfca1e4f34337b806f965f97ec449480d3043cf21a5fa755e92ac1fe2ee914b22819d4fc5cc136bc7f51fea07d962e392eb450793936e0d4 SHA512 b22c968248f19308bc5d4bde3a725810e1d4f0cddfa836825099e7add32a758f7afebe89f73ae4c85f1033830a2e94bd5a0827f899896429ab3f4977f9baa486
diff --git a/dev-db/postgis/postgis-3.0.4.ebuild b/dev-db/postgis/postgis-3.0.4.ebuild
new file mode 100644
index 000000000000..ec0647eb354f
--- /dev/null
+++ b/dev-db/postgis/postgis-3.0.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
+else
+	PGIS="$(ver_cut 1-2)"
+	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs test topology"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf-c:=
+	>=sci-libs/geos-3.6.0
+	>=sci-libs/proj-4.9.0:=
+	>=sci-libs/gdal-1.10.0:=
+	address-standardizer? ( dev-libs/libpcre )
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.5
+		dev-libs/libxslt
+		virtual/imagemagick-tools[png]
+	)
+	test? ( dev-util/cunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
+	"${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+	"${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} = *9999* ]] ; then
+		source "${S}"/Version.config
+		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+	fi
+
+	# These modules are built using the same *FLAGS that were used to build
+	# dev-db/postgresql. The right thing to do is to ignore the current
+	# *FLAGS settings.
+	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+	# bug #775968
+	touch build-aux/ar-lib || die
+	# bug #775968
+	config_rpath_update build-aux/config.rpath
+
+	local AT_M4DIR="macros"
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with address-standardizer)
+		$(use_with gtk gui)
+		$(use_with topology)
+	)
+	postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C topology
+
+	if use doc ; then
+		postgres-multi_foreach emake comments
+		postgres-multi_foreach emake cheatsheets
+		postgres-multi_forbest emake -C doc html
+	fi
+}
+
+src_install() {
+	postgres-multi_foreach emake DESTDIR="${D}" install
+	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+	postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	if use doc ; then
+		postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+		docinto html
+		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+		docinto html/images
+		postgres-multi_forbest dodoc doc/html/images/*
+	fi
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	ebegin "Refreshing PostgreSQL symlinks"
+	postgresql-config update
+	eend $?
+
+	local base_uri="https://postgis.net/docs/manual-"
+	if [[ ${PV} = *9999* ]] ; then
+		base_uri+="dev"
+	else
+		base_uri+="${PGIS}"
+	fi
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/postgis/postgis-3.1.4.ebuild b/dev-db/postgis/postgis-3.1.4.ebuild
new file mode 100644
index 000000000000..a81f3e9072c3
--- /dev/null
+++ b/dev-db/postgis/postgis-3.1.4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.6 {10..13} )
+POSTGRES_USEDEP="server"
+inherit autotools postgres-multi toolchain-funcs
+
+MY_P="${PN}-$(ver_rs 3 '')"
+
+if [[ ${PV} = *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.osgeo.org/gitea/postgis/postgis.git"
+else
+	PGIS="$(ver_cut 1-2)"
+	SRC_URI="https://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="https://postgis.net"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="address-standardizer doc gtk static-libs topology"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+RDEPEND="${POSTGRES_DEP}
+	dev-libs/json-c:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf-c:=
+	>=sci-libs/geos-3.9.0
+	>=sci-libs/proj-4.9.0:=
+	>=sci-libs/gdal-1.10.0:=
+	address-standardizer? ( dev-libs/libpcre )
+	gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.5
+		dev-libs/libxslt
+		virtual/imagemagick-tools[png]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-arflags.patch"
+	"${FILESDIR}/${PN}-3.0.3-avoid-calling-ar-directly.patch"
+	"${FILESDIR}/${PN}-3.0.3-detect-only-stdc.patch"
+	"${FILESDIR}/${PN}-3.0.3-try-other-cpp-names.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} = *9999* ]] ; then
+		source "${S}"/Version.config
+		PGIS="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}"
+	fi
+
+	# These modules are built using the same *FLAGS that were used to build
+	# dev-db/postgresql. The right thing to do is to ignore the current
+	# *FLAGS settings.
+	QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+	# bug #775968
+	touch build-aux/ar-lib || die
+
+	local AT_M4DIR="macros"
+	eautoreconf
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	export CPP=$(tc-getCPP)
+
+	local myeconfargs=(
+		$(use_with address-standardizer)
+		$(use_with gtk gui)
+		$(use_with topology)
+	)
+	postgres-multi_foreach econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C topology
+
+	if use doc ; then
+		postgres-multi_foreach emake comments
+		postgres-multi_foreach emake cheatsheets
+		postgres-multi_forbest emake -C doc html
+	fi
+}
+
+src_install() {
+	postgres-multi_foreach emake DESTDIR="${D}" install
+	postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+	postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	if use doc ; then
+		postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+		docinto html
+		postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+		docinto html/images
+		postgres-multi_forbest dodoc doc/html/images/*
+	fi
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	ebegin "Refreshing PostgreSQL symlinks"
+	postgresql-config update
+	eend $?
+
+	local base_uri="https://postgis.net/docs/manual-"
+	if [[ ${PV} = *9999* ]] ; then
+		base_uri+="dev"
+	else
+		base_uri+="${PGIS}"
+	fi
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "${base_uri}/postgis_installation.html#create_new_db_extensions"
+}