gentoo resync : 28.11.2020

23 files changed, 72 insertions, 544 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8644723907c4..15c2da70eb8b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 6f37fd2ba274..767223ea35a0 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -1,4 +1,3 @@
 DIST libzdb-3.1.tar.gz 720162 BLAKE2B 2ad8ede7e2a1c0ee831ba546b7756d2688bcde83b537e812c12ab3d42d6bdc13526778ae68b61584a52569f0b42fbeb8462efe379821295d855f585ae3420df4 SHA512 7cf24ccf0f0a938955d8b54af2c6eca8a8f700737beafde9e824129f324511e06adbc11a3fdbd6ad6d9b902fdae6f7caab4e5c1c594d2211be314e3a24c697f3
 EBUILD libzdb-3.1-r1.ebuild 1987 BLAKE2B 7747fd2a24c9f45fbd2713d931a41368369964635466442b452af6a1ea38e1b187d26a424981b76da1a9796dd45a94d00fd3f79a2b43e6f9e855e3b0c6b2b719 SHA512 735b7ed0579a6cdc95dec473f6fc0d15891e51d2068ccedec1188b163a3afa285603a32f68352df88c7cd3f5bc9dc15da6cfb41321b4a2b09efd1231e2dfb0f0
-EBUILD libzdb-3.1.ebuild 1894 BLAKE2B 6247c8d2295cccecb214a306688027b72391e83507ee16870119cd9c7b7c059bbffd07adc62c21ce0a0387c9a7dce5a6df4cba93d98da21507b9ac456e434b95 SHA512 53b3808f028b78f96c05b8d59f7d5d1301bda641afbb0c8f41a36ec28de807d00c0be02f51841602bdfb2d05cd0a79682916d4d82096332265ebbaf4758badd0
 MISC metadata.xml 252 BLAKE2B 607ece46067f5be04418014fa63f92ad521ce98dcd952feb4fcd1bcfcb16fd520bddb62e7f6e14486a7f45a2505cc258067adc1017af98ba9e69a78244bc62a5 SHA512 e7da72c861777d74f6459375f6f43e39f9e4dda779352c3e8942fcd658dcce6f995f016e34a74b331533f1815fba3faa9af024956a804f38a411990878e4bad6
diff --git a/dev-db/libzdb/libzdb-3.1.ebuild b/dev-db/libzdb/libzdb-3.1.ebuild
deleted file mode 100644
index caa64e3ef38f..000000000000
--- a/dev-db/libzdb/libzdb-3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A thread safe high level multi-database connection pool library"
-HOMEPAGE="http://www.tildeslash.com/libzdb/"
-SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc mysql postgres +sqlite ssl static-libs"
-REQUIRED_USE=" || ( postgres mysql sqlite )"
-
-RESTRICT=test
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
-}
-
-src_configure() {
-	## TODO: check what --enable-optimized actually does
-	## TODO: find someone with oracle db to add oci8 support
-	myconf=""
-	# enable default hidden visibility
-	myconf="${myconf} --enable-protected"
-
-	if use sqlite; then
-		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
-	else
-		myconf="${myconf} --without-sqlite"
-	fi
-
-	if use mysql; then
-		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
-	else
-		myconf="${myconf} --without-mysql"
-	fi
-
-	if use postgres; then
-		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
-	else
-		myconf="${myconf} --without-postgresql"
-	fi
-
-	econf \
-		$(use_enable debug profiling) \
-		$(use_enable static-libs static) \
-		$(use_enable ssl openssl) \
-		--without-oci \
-		${myconf}
-}
-
-src_compile() {
-	default_src_compile
-	if use doc; then
-		emake doc
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# the --disable-static flag only skips .a
-	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
-
-	dodoc AUTHORS CHANGES README
-	if use doc;then
-		dohtml -r "${S}/doc/api-docs"/*
-	fi
-}
-
-src_test() {
-	emake verify
-}
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index bbb6978c9949..417df6f5e3ea 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,10 +1,6 @@
 AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
-DIST mariadb-connector-c-3.1.10-src.tar.gz 746801 BLAKE2B 5c6c5b46306cd081d28f2e8be81fea5fd92b5dd75aac7711cfe5958f8a493b1bd84e79c96295b584effcd828303b35c0152a28892fe0bbd2994a6738ef62d5a5 SHA512 6b95b54e1c05a81010659d1b143330cbce411e3327e543eb240a4ab378336826c6958983b96beeaaff64836f4c5cc5c48eb8a7be6bb521dcb2bbe15e4048f38a
 DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84 SHA512 2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
-DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a SHA512 cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42
-EBUILD mariadb-connector-c-3.1.10.ebuild 2369 BLAKE2B 31acc451fa0c66ff4551465a7c1cf7940c1e5848e63774d96cd1c64c2dc5b0038cece7900162639fe9dcfdea77c1c17c1deea46b750a4691caf9e5bcc9002bf6 SHA512 8c14a776c521c67f0230058b6d32af6de053081158dcacbdadcbaf741d7faaa07945fbada968040acd961b1c485e36a1188021eecfcadbf177a97df356ba8a06
-EBUILD mariadb-connector-c-3.1.11.ebuild 2367 BLAKE2B 1b1b52ab3e6ca823233706d34ff5bfcbe79a5a98552e573463e422938d444a9f16e1746daef391df604a3e174343b6598e71b423de7b72c0133eadf6bd292389 SHA512 c74219e2da4baf673f17debbde19fd06bb8ab02703755f8729a9828aed03e423c3243ea53463d73d58731b8e37707ddcd468df61026967d79e9eb032d593b538
-EBUILD mariadb-connector-c-3.1.9.ebuild 2343 BLAKE2B 652296c85beb8bc4e6529e8dcddc19d3448559e446092344ea0b86a9b758c81d56c48b05c6bef3df6f55226a3e410009cea42c86c8bc25e43ba0bd31139ea7ff SHA512 414fc4666d6d16b2572416c7e537e27e96112b876c564076d8d80a40c0303e41b7d0ecf61865aa1a2900fc5df1a809417ef22d71ce849733d609022952c1bce8
+EBUILD mariadb-connector-c-3.1.11.ebuild 2361 BLAKE2B 10f342cf66372adc90c5b9d8d6fd823e2572e38357a0608259c37622e504202b73d828ebd50769038d3da27e4fb053e6fa7e2dbe4d5a0ce605704e9242c2d722 SHA512 8b19012ed70ed80fec2fb7bcb87c72adccd39b5fb512b928e52f9a55a9bdd4df7d22a0f7372197db491f9aa41f78fc073856b46cdfdc9aae1c8a0b3a6104f82c
 EBUILD mariadb-connector-c-9999.ebuild 2369 BLAKE2B 31acc451fa0c66ff4551465a7c1cf7940c1e5848e63774d96cd1c64c2dc5b0038cece7900162639fe9dcfdea77c1c17c1deea46b750a4691caf9e5bcc9002bf6 SHA512 8c14a776c521c67f0230058b6d32af6de053081158dcacbdadcbaf741d7faaa07945fbada968040acd961b1c485e36a1188021eecfcadbf177a97df356ba8a06
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
deleted file mode 100644
index be4696f0f209..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	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 ~s390 ~sparc ~x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DWITH_ICONV=ON
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
index 0d2107eb2b84..5004f428a288 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -12,7 +12,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 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
deleted file mode 100644
index 219c37c6ae1c..000000000000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VCS_INHERIT=""
-if [[ "${PV}" == 9999 ]] ; then
-	VCS_INHERIT="git-r3"
-	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
-else
-	MY_PN=${PN#mariadb-}
-	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 s390 sparc x86"
-fi
-
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
-
-SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
-	tc-ld-disable-gold
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXTERNAL_ZLIB=ON
-		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
-		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_LIBDIR="$(get_libdir)"
-		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9f6296dda189..e5eb1297fd00 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -39,15 +39,15 @@ EBUILD mariadb-10.2.22-r2.ebuild 32479 BLAKE2B cdb02077582e1f1e0f6c1739b43cfc28e
 EBUILD mariadb-10.2.32-r3.ebuild 33793 BLAKE2B 4a4986f9ff7b31bb45d44811733bfd8b088e8b48495fe11d85c19cf1aca35e0200ee251ca83756ae340d13c31edffbf2c8788c1a8f89d56e7637cac3e5ecce4c SHA512 4326e3456f0eede25eef07e89e20acda6bd2518b6b395c2394cc5bd96a2d93e148124464583c8cb4cd4d421e33c627fe255722aae35b0ea1352a94d76e3cea73
 EBUILD mariadb-10.2.34.ebuild 33923 BLAKE2B 7162a33040b26b4c69b3e600120035ed6903ac65f32b5c5825c1a3498e49ac327704451794714c9601ae12dcc9ea8c7045827e7d953a08a3ebfa9991d9f31a6e SHA512 5a2f1f7f6d0ef62bf107d9e632ab87f3092070d3f19c1c1f4a2e103470edb25c2532765bf4efdca8cd3ae0bf80914087a85f6f8cbf91dd13f8be51526dc8af47
 EBUILD mariadb-10.2.35.ebuild 33982 BLAKE2B 7ef21094bdf7d2ca822e9a412524c0ce2e6b846df7ad3fd6f1b73d7ca5759cbd07b553eb8b4da19c9f3011264896234f35f3f315ea403db72856b3c73f6fa2d8 SHA512 07bf7b9eb207f463eac9d8794c947c95dd3d69c6b48be4c4f3160afb0f5e417c1b0a188c56588697e1212dd2d947bb8e740b95c5a159e2ba019ca74f70d8d1b5
-EBUILD mariadb-10.2.36.ebuild 33981 BLAKE2B 2089d29f3c71fd63d95591f09250e428806cef8bc6ad167aa1b7d1f9bc5a2c31e19f70e0a19757f5f2701832f7c1c4b6f47e097c6ddcb0fc787f0225ade5773a SHA512 c79a360a5c0d45ea62d4a14ebedf82a2ebf6bfcdfcfdd029d07f55fcc338e23b4ed150a49d263404eccb0473045e4252d7565bdf6f79b90ce02b7f9ab27283af
+EBUILD mariadb-10.2.36.ebuild 33980 BLAKE2B b5b7ce8a22ea2dfc5db2fc8c939694664018b89411576a38bdc73fd1f9f508fbafaf000bb343bee2d571d1d6fa443a3c4fcccc9b9cb5512150d5c1f571fc593a SHA512 992c130fcdb18707ccb6971e481131a6510a916963ad17f276a5939d3bbb73f20adf63725bf1247ed2222df14a6f308b5859ee8927ad6231a5b7011c6779e0f6
 EBUILD mariadb-10.3.23-r3.ebuild 33546 BLAKE2B 27ae00b9b859ce9305bf1be7d52fff5dbb6832d15cfde3c1baab384385157b7c49e04cfb34680bf5ef02024f79aded3fe9f25a82680a1c2282b1bdcbd9469f2e SHA512 df8f2b177c4326abbbfb70cdf1b7a9ded6dea2b669c9c96b3e86a38db1c165c7d833cfdfd4eb27320179233a42f55d70b68b31d4516b8d1e3d3f2eb9ea32e627
 EBUILD mariadb-10.3.25.ebuild 33436 BLAKE2B cd1b2d506f840723eb23d5fc94c8437936bfc8eee80483e02e18e6541ceaa78b11bf6fb5852bd8ac111f135207591b7d34e073e82dd58530b2be31c6b521b352 SHA512 f610b4dee441d4319b2a92e177125fa1c9afbb4bb86f375e229bf573623688f123007b90ed67429ae186ebef7aa096d4c372617cb733a089938e514d56b87364
 EBUILD mariadb-10.3.26.ebuild 33495 BLAKE2B dff7db9059f564f92427cf323a8008a493fd2c8f9d4e23778d7c6aa2fd79630e217c78e02074ed0e40eef40a16d620d1c7fdbe18073854dd6576906a2b014852 SHA512 c7934e0584da68c329aac1c1721bfc125308af629b1228a70bf9466f26e031b867ea8d713d2bf22dc92dd286d99943b6db0d63fccdcffd63d434cfa5f2373b76
-EBUILD mariadb-10.3.27.ebuild 33494 BLAKE2B 283063810856808801bfcd94b9ee761dba54dc849c97a99727deea516804711d7fd02dac8f3fc648c0f9b5f2ce7ae93a09278028c88eaa096bfd0d795e004b55 SHA512 1a5e170d08fbeb84a8a2c2a20536e3ee800f3bd9954195da2433984cc3b55d0c10036c1fd6d217e13e0cbbeee15dd819e2265a2825fb861f5ec08a7462be12e0
+EBUILD mariadb-10.3.27.ebuild 33493 BLAKE2B 0e47703e453910d9952f99ba1dfac63042a1dd8788c2cfe6236c3d84b86f134b840dd0bc6c70ff97113a64826d7b402ef1ac5b26f4172888018e8dade77d97f5 SHA512 8b942d8160881fca86b9e2c709ac698e1607bd0ab197c8a171b71a6e1cb30eb78c1f155518e73aed8a0ae85fa72fbda239c3c6f1d4130e952afc1c1931eced98
 EBUILD mariadb-10.4.13-r3.ebuild 34110 BLAKE2B 98b42eef162b1d731ed7ac7fe34df39c6c396b4247bece5278d69688a723caf044b96614c5ba06156bab55163428cede02ba37a4da63723a59850d41bed2c5a6 SHA512 ea895b77a66849cafa1e830ad386bbe2eadb6f81b5a62e01344efd34c98e59236bcda15e336f965486be87f89fe002e39d1cbe7c5b65436a2143a9fffc42e364
 EBUILD mariadb-10.4.15.ebuild 34141 BLAKE2B bd40fef84dc3c6c32950be114da95f68aca90d4d4150e117070f9102b441c80cfd105fa06c441e3fcacc965a2f6bd402bb736e957476b41ae77f2e40967bc978 SHA512 95538ccddffd4f47502753bdcb7960c4c11e92c74741bfa3c377fb986d31531c441fa485ffaae09a3b3128da62a70860e74383c37a070db58fc0d93e2b233e61
 EBUILD mariadb-10.4.16.ebuild 34274 BLAKE2B d62e06006a56898833b5357c3ed74a00adb8b5dfdf7d78014ef42080e5bb56242f68a492adfcaf06f371874a3a768f1599f6b8e139730659fb89baf128054a1b SHA512 5c0066de814b431618b7c1cd4264c7fd61861a54f8641dbb21bc3bd2edd3e58c11e84cb81010818815f4df2bfacdd2bec0b1cd49cc37396acc3402ab0aa7e2f1
-EBUILD mariadb-10.4.17.ebuild 34273 BLAKE2B d20943ca0d475bf6f6a553571f209bc4d5f1b46292905ec9c3e3896eafc1cfb78d7d6760015a5b01bbe79b70d67f278376a8c287a53c3d0263b86f320b43c5eb SHA512 03b67c91809e39305e79427050dfa368fc3d32bbaea7a26168258e111c972ce8a092f9f2ab1fd98c7cb0f119fd5cbc907f6198816cf5235a0d21d4c10309d02d
+EBUILD mariadb-10.4.17.ebuild 34272 BLAKE2B be38701c054b82cb18e1946c36f4fa6090044b3a92fb98bde93c3e87168f5534e8debb584f8b03dc6b4715de61e721957da31a758287d0e3ba1d828283dd70a9 SHA512 faa3f1cfdb31ded9c2642958b5c685eb7359366d931048d427c8f12a0ca6d9c1d10ff5ca6d5ac4a1a341da3f4cce50ea436f01f34c7cdaa79d22516d7d39af94
 EBUILD mariadb-10.5.6.ebuild 33569 BLAKE2B 948155fcd9a64f2a9280875bf0f3e99f4b1f64a400a67c2c8adaf2cf13f116ac11554eaeca80e34c53b86a8f4dbd606116d48c11ee80af2738ad892a72a35324 SHA512 d0caa1cf0a21456cbc5f94bf144e279ece57a4ac0c14f4a6d9876df6eaa05488f2d6084cfbdfbde2d4062d1926acf62e64cbb28b2bcdeac6f07bf77bd851d094
 EBUILD mariadb-10.5.7.ebuild 33702 BLAKE2B 60eb424a566762d0fce3801bfb3711528f86ac4b3bf8d5cf75f2ef51805b6a0905764357004445a58fda3a0c8b3f14e482db0e17990ecc07d4b21cdb47fc55b4 SHA512 bbcc467b26975ff33ce282f6b89707ce796e117d7be1266290edcb15fe9609aa0b12fb9dca7a3c04a8c7bbc5c50beb662c7015b6788c77e93c8946145cb99d21
 EBUILD mariadb-10.5.8.ebuild 33702 BLAKE2B 3f655bbc8faac513312676679e452267c632cc10e9500b9bbf1c5b2175b60ce6d006c7b7e777865bb8c96a36e9f199d6b90312234fa3001ddc0b054b3be33239 SHA512 ca26d9a5d5ea810e6d99792302119d4559dfc22f6422be245e386cf08b6e6ebc1bbd72a205ef0fa115d3c93944508d5fc355d32965d367dbaf1b28d5a94d6b49
diff --git a/dev-db/mariadb/mariadb-10.2.36.ebuild b/dev-db/mariadb/mariadb-10.2.36.ebuild
index e001ca8c8860..4f918f208c08 100644
--- a/dev-db/mariadb/mariadb-10.2.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.36.ebuild
@@ -33,7 +33,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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/mariadb/mariadb-10.3.27.ebuild b/dev-db/mariadb/mariadb-10.3.27.ebuild
index 81597d3cfca7..995a71948272 100644
--- a/dev-db/mariadb/mariadb-10.3.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.27.ebuild
@@ -33,7 +33,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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/mariadb/mariadb-10.4.17.ebuild b/dev-db/mariadb/mariadb-10.4.17.ebuild
index 0f9094b3d05b..40a8b9116d78 100644
--- a/dev-db/mariadb/mariadb-10.4.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.17.ebuild
@@ -33,7 +33,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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/myodbc/Manifest b/dev-db/myodbc/Manifest
index 109573089017..ca98176d738b 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,8 +2,6 @@ AUX 8.0-cmake-doc-path.patch 1384 BLAKE2B 96f2bb290e48363c9cfababb845732291f709a
 AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755c0324dbff09b450230d7eafb054a37b2f2ea47d6ab9eed42b0ce0682383c6a9e00d222dd5d7c81bb0ea4f4fe470808e SHA512 f4eb1f8c2182a1a6002548a3ef1fa37e859613b8ab31c67c34d6d7f237f435fe2cdada05e75a518d67c05175e5a6535ece55541bfde477df9820a871e83347d3
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
-DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07 SHA512 dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
 DIST mysql-connector-odbc-8.0.22-src.tar.gz 3726015 BLAKE2B 055920446767b0c9a30a0ca4773e71d662b398a9849df1a0b7975d71a21cfb23f540d8dda5430c717569f173e63673d3e51b025bb098e51202093d33e19bc142 SHA512 c613ae60346cea2e57bade89d813fd5ac21d0712d3d751e3acbc275421da6ac7593afc3da9fb6d161ee413f60e76e670f0c84876591f331925c980d969db4e8c
-EBUILD myodbc-8.0.21.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
-EBUILD myodbc-8.0.22.ebuild 3115 BLAKE2B 854a3eb5338b5bfecad3ff350b738a30d177a4df636908691546a14450152c294149ddf205e18d83cab3f4e26c3acb6d979c9bf83292466d4107425a67bd55b0 SHA512 76908a67edb183addb9db261e5bc05182b938400a0adb770f4f15a12894b23af5580ef649ef35c4abc2be51cfd0425a892ce527a6ed842a111b733314c376b97
+EBUILD myodbc-8.0.22.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/myodbc-8.0.21.ebuild b/dev-db/myodbc/myodbc-8.0.21.ebuild
deleted file mode 100644
index 93159f140c95..000000000000
--- a/dev-db/myodbc/myodbc-8.0.21.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-MAJOR="$(ver_cut 1-2)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-# Broken when built dynamically against libmysqlclient.so
-RDEPEND="
-	dev-db/unixODBC[${MULTILIB_USEDEP}]
-	>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-# Patch document path so it doesn't install files to /usr
-PATCHES=(
-	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
-	"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
-)
-
-src_prepare() {
-	# Remove Tests
-	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
-		"${S}/CMakeLists.txt"
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	mycmakeargs+=(
-		-DMYSQLCLIENT_STATIC_LINKING=1
-		-DMYSQL_CXX_LINKAGE=1
-		-DWITH_UNIXODBC=1
-		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-		-DMYSQLCLIENT_NO_THREADS=ON
-		-DDISABLE_GUI=ON
-		# The NUMA and LIBWRAP options are not really used.
-		# They are just copied from the server code
-		-DWITH_NUMA=OFF
-		-DWITH_LIBWRAP=OFF
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	dodir /usr/share/${PN}-${SLOT}
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-			sed \
-			-e "s,__PN__,${DRIVER_NAME},g" \
-			-e "s,__PF__,${MAJOR},g" \
-			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
-			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
-			<"${FILESDIR}"/${i}.m4 \
-			|| die "Failed to build $i"
-	done;
-	mv "${D}/usr/bin/myodbc-installer" \
-		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
-}
-
-pkg_config() {
-
-	[ "${ROOT}" != "/" ] && \
-		die 'Sorry, non-standard ROOT setting is not supported :-('
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-
-	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-
-	local sources=$(/usr/bin/odbcinst -q -s)
-	msg='sample MySQL ODBC DSN'
-	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
-		rc=$?
-		eend $rc
-		[ $rc -ne 0 ] && die
-	else
-		einfo "Skipping already installed ${msg}"
-	fi
-}
-
-pkg_postinst() {
-	elog "If this is a new install, please run the following command"
-	elog "to configure the MySQL ODBC drivers and sources:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Please note that the driver name used to form the DSN now includes the SLOT."
-	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/myodbc/myodbc-8.0.22.ebuild b/dev-db/myodbc/myodbc-8.0.22.ebuild
index c328e984abb9..93159f140c95 100644
--- a/dev-db/myodbc/myodbc-8.0.22.ebuild
+++ b/dev-db/myodbc/myodbc-8.0.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar
 
 LICENSE="GPL-2"
 SLOT="${MAJOR}"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 # Broken when built dynamically against libmysqlclient.so
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index a7a3e5a99986..673085311b63 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -3,8 +3,6 @@ AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d
 AUX mysql-connector-c-8.0.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea
 AUX mysql-connector-c-8.0.21-survive-malformed-charset-files.patch 580 BLAKE2B 76ea04058e14dce1cdd057b51e17d358ff582c82f27a537fb47aa66d58c88327231ca10755a6e02d0c1dab5c67d6eb92d9e9d5d74038595a203b65d3372d4577 SHA512 d8075a712bf12697499b1da2df7f43662bcce073113193e4b29261f965f10af43b1d529f1fe14ffed6c7c9bda3d3b0a61a2b3462e865724496d3d80f10c5264e
 AUX mysql-connector-c-8.0.22-always-build-decompress-utilities.patch 534 BLAKE2B 15bef04f750b5f373d8c5f39690e90be482bfea66430234befc777e9d84d0060d20e1290798ddacbf0e9f0f8db45ba0318d88b61aec3fd1e859285cefff446ef SHA512 7ae81f4fe020c12e45eba041dcca921fa93f42a12d8c8d840b1bec819c00de8b780a792e99cdc3cae55eef74c911de3087b6583d6213913b36428b96f0e1c3af
-DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44 SHA512 18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
 DIST mysql-boost-8.0.22.tar.gz 285934450 BLAKE2B 1ba0c9bb9a0cb74af4842d3b746f8b690c122cfbf2c6d5201ce95e59a257427a8683dd8d5c2be31dfe9ece4761366c1287fa7b841c45db222725bf76b0639bc6 SHA512 792f2ada93ec67a4679228478c6b798e81d9e9f6d13c7f4977cb7682738a4aae3cb483294edc6b2fde16c3960e51af8786216c063ab500840afd39a609e4b612
-EBUILD mysql-connector-c-8.0.21-r2.ebuild 3002 BLAKE2B bd309386636ee9e1e6cb5f2019e06718036ada58e0dfd6b6b9f94228ea129d348dd8f08306af2ae85b3d68bcb7f936e06dfe2a889483dd62f148fa299bf57efd SHA512 ee1811c9c6c4e1dd27ece9a70d6e6ca174f2d0419704a4612a97e7421505884adee9e2db97282e9ecc341c09bd6381a3d7572d32dc4ce9031793977583720921
-EBUILD mysql-connector-c-8.0.22.ebuild 2910 BLAKE2B f37f92dd2298b56d5f66e317092bef74115c573b04825be82669b7aef24a19333f0ed7cfdf15d0876e72d084cbb8ac2942c5af3853f0d54faa5cef118995374b SHA512 35fd421c79781edc3d42c9adec925c15e45cd84afb312f825cef2189f0a59e0c6f4d579c8f71facc86a99d43577fd14bfbe7162ad0e11f90bb6065957b0d7281
+EBUILD mysql-connector-c-8.0.22.ebuild 2903 BLAKE2B 97696cca2c06e55447c3b7f07f1c2c5904f4efb47a1779d89fecd26554892c84594bc5a62b8be6fa504895da14c170044564aaba4d244513475cc67a4904c4aa SHA512 8c1596343e5bb7aeb7abe3220f872c03be5922fb58b8b6bbffedce235b42532235970d826d69d14592ed4e35a902e3c97b847713a25a0970ba6aa124e9d437fc
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild
deleted file mode 100644
index c79b084636c2..000000000000
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.21-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-# wrap the config script
-MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-DESCRIPTION="C client library for MariaDB/MySQL"
-HOMEPAGE="https://dev.mysql.com/downloads/"
-LICENSE="GPL-2"
-
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-
-SLOT="0/21"
-IUSE="ldap libressl static-libs"
-
-RDEPEND="
-	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
-	app-arch/zstd:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	"
-DEPEND="${RDEPEND}"
-
-# Avoid file collisions, #692580
-RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
-RDEPEND+=" !=dev-db/mysql-5.7.23*"
-RDEPEND+=" !=dev-db/mysql-5.7.24*"
-RDEPEND+=" !=dev-db/mysql-5.7.25*"
-RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
-RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
-RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
-
-DOCS=( README )
-
-S="${WORKDIR}/mysql-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch
-	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
-	"${FILESDIR}"/${PN}-8.0.21-libressl.patch
-	"${FILESDIR}"/${PN}-8.0.21-survive-malformed-charset-files.patch
-)
-
-src_prepare() {
-	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
-
-	# All these are for the server only.
-	# Disable rpm call which would trigger sandbox, #692368
-	sed -i \
-		-e '/MYSQL_CHECK_LIBEVENT/d' \
-		-e '/MYSQL_CHECK_RAPIDJSON/d' \
-		-e '/MYSQL_CHECK_ICU/d' \
-		-e '/MYSQL_CHECK_EDITLINE/d' \
-		-e '/MYSQL_CHECK_CURL/d' \
-		-e '/ADD_SUBDIRECTORY(man)/d' \
-		-e '/ADD_SUBDIRECTORY(share)/d' \
-		-e '/INCLUDE(cmake\/boost/d' \
-		-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
-		CMakeLists.txt || die
-
-	# Skip building clients
-	echo > client/CMakeLists.txt || die
-
-	# Forcefully disable auth plugin
-	if ! use ldap ; then
-		sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
-		echo > libmysql/authentication_ldap/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LAYOUT=RPM
-		-DINSTALL_LIBDIR=$(get_libdir)
-		-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-		-DWITH_DEFAULT_FEATURE_SET=OFF
-		-DENABLED_LOCAL_INFILE=ON
-		-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-		-DWITH_LZ4=system
-		-DWITH_NUMA=OFF
-		-DWITH_SSL=system
-		-DWITH_ZLIB=system
-		-DWITH_ZSTD=system
-		-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-		-DSHARED_LIB_PATCH_VERSION="0"
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-		-DWITHOUT_SERVER=ON
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	doman \
-		man/my_print_defaults.1 \
-		man/perror.1 \
-		man/zlib_decompress.1
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
index 9e70604d323a..7aa1edf8d630 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://dev.mysql.com/downloads/"
 LICENSE="GPL-2"
 
 SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 SLOT="0/21"
 IUSE="ldap libressl static-libs"
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index cf4af9c0a9ae..41fa93f44c1b 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,5 +1,3 @@
-DIST pg_activity-1.6.1.tar.gz 127376 BLAKE2B 4e9c055c2b7d7eb78ee735124284d4d34c70a067011c2bdd3d960a7e2ff59cb799fb4a3ec1a51d7ebd0e921f5d46e85a28625d3a1a7efc281fc751702f2b58b6 SHA512 4a67443521afe88283315be1c2b3d3f19df3cb2cb3e4e059149775f5dd45925dbab8bd34525878ac883f8d007da08fbdfe3d23db9a6e1f17a4af4aa9b9c96338
 DIST pg_activity-1.6.2.tar.gz 127561 BLAKE2B 5ddebd3068ddc33196903892c01b947ffc50ecff7ec790e196626e87ee8933ff79242e3ba61c207ea1020535c5d85dbbc4ac9e4825a19ab98004bb27ea0b6a6c SHA512 fd743f369201c6ec3762373c39969b2b7632d79a8fb9c8ebd12a88b66b91915c30e445e93162844b4a176cf7e13009c9c8136e973180b00e7cc708ecd66b4853
-EBUILD pg_activity-1.6.1.ebuild 634 BLAKE2B 6626868b56015cf8df504c7bd785974a2dff3cfb43adfa315498c25922521902b4b6ccde199d21f37f52409bf56bdbd4b4e2d0e42c05c10cc43b0ee9624afbcd SHA512 c7e548efcae3b1412c80b237028f8126b0e4bc2e0d8f4b8d8142d3c4646dfbe5afad0849d5a7009f87e5e36ec2fb613bed39faeca4330f255cb57c002a176612
 EBUILD pg_activity-1.6.2.ebuild 634 BLAKE2B 6626868b56015cf8df504c7bd785974a2dff3cfb43adfa315498c25922521902b4b6ccde199d21f37f52409bf56bdbd4b4e2d0e42c05c10cc43b0ee9624afbcd SHA512 c7e548efcae3b1412c80b237028f8126b0e4bc2e0d8f4b8d8142d3c4646dfbe5afad0849d5a7009f87e5e36ec2fb613bed39faeca4330f255cb57c002a176612
 MISC metadata.xml 339 BLAKE2B 216c15e347a9dd6061fa95a90fe2a6b5b14f9dcfe7dce8a36376f28dc1c30bad6ae505247d1a5133bf9d8c1d0d61aa07b0f827f1547d563a5046a40e300896ef SHA512 e4b44855c8acd726e3e43cf79e4706077edb2cbccb955ed70c3fe44ee91ed604a057d8b612e4f3950387ee8c96b3fc77fd8e5696e63b896280a243506c7c8853
diff --git a/dev-db/pg_activity/pg_activity-1.6.1.ebuild b/dev-db/pg_activity/pg_activity-1.6.1.ebuild
deleted file mode 100644
index 2868663364ff..000000000000
--- a/dev-db/pg_activity/pg_activity-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
-HOMEPAGE="https://github.com/dalibo/pg_activity"
-SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-SLOT="0"
-LICENSE="POSTGRESQL"
-
-DEPEND=""
-RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/psycopg:2[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/${PN}.1
-}
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 79c75c7489c2..27552278d5d3 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1,3 +1,5 @@
 DIST pgrouting-2.6.2.tar.gz 6065517 BLAKE2B e27e28cf988040de1e894a857e3d210bc7676271f69d898afc2d6116d5b88d87404723b2cb1283ef77b4449b4aa62a03e2dbcd489ac641a4721a596d29f8fecd SHA512 6e37f66e631d0cc87e135be7d095822aae21656bb56b3d18afa5bececaad8cee6324d37e8e152bbf69e3374ded1f10aa4b9a4c52b873e3a4c43e73cd877fddcb
+DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e657774ff81ce7e9f005333a8dcb9d56587d4a793410356092bb1623ec287549dbc60d814b1d5156ff28301503acee776 SHA512 73285d2d47be844203df136b8a8c13d1672ad8c2dac44a1ff7ce16e4676043692a8f2a60a305542132891da83560c49c5eaeb7712e3e3dd250cd8fd550260d4a
 EBUILD pgrouting-2.6.2-r1.ebuild 1224 BLAKE2B d1f10f219e584e2167fbb3351cc35424fb35f10def7e7ba115aa4bec54c259f43e771e47f52d7fddf19c838117d0d265252d4886599ec401020287f590223d35 SHA512 6087d2e8e20c815defe78c440d5ba58e30de353e8ee0722b7347bff79c32ae7abc1d46d48b95c32c0b28db55043f198609217053012134dbfe27b1e879c06eb4
+EBUILD pgrouting-3.1.1.ebuild 1092 BLAKE2B 9e255ade68e57e65f0fb38dc36985f2eaf77323a0e2f769d86031caece6bd08544397b2be8ace08003173b9626663158c54483a0cefc50173117a5991fd6ead3 SHA512 c17720ec34aa5c0c97c39c1e428a45415d78c3b099acb6bce34e8644b2f8f3499bb6219e68efcf2752bc6035354fad239f546589503269e7a098a69ff00eda90
 MISC metadata.xml 457 BLAKE2B d2432768e9244c7648720e1569195498ffa3bda4f862a5b5a2edbbd4383d3ca0ab83063c1004680ea6eb662d74f13c2ec4991baa25365ae9ae8f513b93c973b1 SHA512 bbfc5eec69256ba3addfe5c3158b11b4561b347682474ac2f5ac4cb3be8ca30df130957c751f09d761d3a3d8ad62cf3e59193414a31a9b46d793084285c9406d
diff --git a/dev-db/pgrouting/pgrouting-3.1.1.ebuild b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
new file mode 100644
index 000000000000..519683a61f95
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+#CMAKE_MAKEFILE_GENERATOR=emake
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+
+inherit cmake postgres-multi
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="https://pgrouting.org/"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+
+RDEPEND="${POSTGRES_DEP}
+	>=dev-db/postgis-2.0
+	dev-libs/boost
+	sci-mathematics/cgal
+"
+DEPEND="${RDEPEND}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+src_prepare() {
+	cmake_src_prepare
+	postgres-multi_src_prepare
+}
+
+my_src_configure() {
+	local mycmakeargs=(
+		-DPOSTGRESQL_BIN="$($PG_CONFIG --bindir)"
+	)
+
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach my_src_configure
+}
+
+src_compile() {
+	postgres-multi_foreach cmake_build
+}
+
+src_install() {
+	postgres-multi_foreach cmake_src_install
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 7586bcd55d6c..0427837eb339 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -18,6 +18,6 @@ DIST redis-5.0.10.tar.gz 1990507 BLAKE2B a3ed76efb387e2a8292f71607c19826c8a0a890
 DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38659001421f96040e8a64a4a304e9dc1f06d82802ce1c92515d166cfd37c2f347df4c4cda0c2c4c2bb10d27c5 SHA512 d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13
 DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
 EBUILD redis-5.0.10.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
-EBUILD redis-5.0.9-r1.ebuild 4737 BLAKE2B 2c8ee5fee1812d8c8af4ae154e91450f99e13e1ca574466b5f86090b89d24fd64eba3367be67909f04761bf576db27885c0b78bf05547bf39352a8655f25c324 SHA512 25b463fc2b71c5671f1414d071c697f06ff3df5c7e4e958449dc6031bd28aa4464d624d6e32514ee9c60d9e6246e1b23f0e710ab384460e60754f2c48c3187c3
+EBUILD redis-5.0.9-r1.ebuild 4738 BLAKE2B ca5644ba5a17e2f982623cc242a9058dd04b682e850b88f6821168d80dded518b176d690087d0f8e4d9e021b01d4c37a3c08bc98a4080c954e028a87c697bb1d SHA512 174942f2f4de53a3dbca64f9100dea33e3570535b1fe0019257d651289fff82da42949403481bdfb5eca0eebf8ec32b8893a56a9cec59a2c5fc61c215293733c
 EBUILD redis-6.0.9.ebuild 4949 BLAKE2B e67312a51b324b149eb6bebdf0da4a23ac5d07d39c60d18e072ff829188403c7d831594ae71f388376954fc91f0fec40e193dae52dbd4da0ff8779547e06c67e SHA512 034a2f4936d283f7c491f2299aecff576e4cbe3337f4d830ac6be655ffadef3c3dd003b680c4b9224da06c3d2f61df23704279985119a409dd009164c77a65d2
 MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-5.0.9-r1.ebuild b/dev-db/redis/redis-5.0.9-r1.ebuild
index a4efac4f1871..b7c6c35cc01f 100644
--- a/dev-db/redis/redis-5.0.9-r1.ebuild
+++ b/dev-db/redis/redis-5.0.9-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"