gentoo resync : 31.05.2021

27 files changed, 216 insertions, 138 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4981f7864720..2d0f8b731e57 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/kdb/Manifest b/dev-db/kdb/Manifest
index 36e03621342e..9f2161bbe8db 100644
--- a/dev-db/kdb/Manifest
+++ b/dev-db/kdb/Manifest
@@ -4,6 +4,5 @@ AUX kdb-3.2.0-cmake-pg12.patch 1094 BLAKE2B 4857bcef303533fdb57bf3d19b8881f872f3
 AUX kdb-3.2.0-cmake-pg13.patch 1112 BLAKE2B 985e25a891dc4b6b8a6c56c0ba4cd93c8af71dd0b4b9c256dbb63014825f9ad9ee17ebd7521679d2105ded9240c1881d94f516f94ee89cb2317bc6fe8a57c85a SHA512 78e2d8d44836e62eceffffaef408976c5f7f9e239643568018d51dec30dfc766a1a985e972ad26c6f375a1fdcd8797e48b68a8c8710e16350ddf38d3ae03dc28
 AUX kdb-3.2.0-qt-5.15.patch 2768 BLAKE2B 74d3f894dfac6caa3bb2b5fab0cb20b6190d3e0341f8b495141f3f6c2d4941faa88859799daeb7c6da680afda3ea2239eea2626f5fc3f2a355b22372b7f684f1 SHA512 5c21da612fa5925734bd8f298059f547dc91ce516232c4c5e7a41ccedff90b641c21da761f5f94f0660d107ebc56fdca191b059b282c8c593e57d4a295c63cf4
 DIST kdb-3.2.0.tar.xz 650180 BLAKE2B 306152b37c2ecc670d26a2df2ae8acb950505ecb37c4994f4debd1b80c8b2ee94252658fe28b59255d9ad0d350375171f3b43dc9e94949417c3aa9ed167134fe SHA512 7df22f2c5b6e20ae3de71cb6c76b234d2f1f33b2abcdffa85be313c63d067a40a85ed102b6256207315db08ced5d69f8bc40afdf84a188463713a6b2ffdb2df7
-EBUILD kdb-3.2.0-r1.ebuild 1453 BLAKE2B c2cac6fae8c12c8db4231712e4ba2047b60605ad33bf24e2c2509031ebd5c3eb3ceace5aa4a4ee4913c94cbf2f64ff3956b46e23232b205d1bcc470c6fd885bd SHA512 0088570c06159e6395dfa22ce6b11796471194d5bf65a6b635b8f4ce1c54b970a16199de631599c79cb558be341b2c1e6749deef13926cbd99272ae7c6406374
-EBUILD kdb-3.2.0.ebuild 1316 BLAKE2B bff6fb7ad77e5c7cc0a3081abc25d88560ea770f430598b6bd5b66a3a0dee4f61930383f23da24cdd2fc1ca28c307583d9027d733d8355ef7daee5ea975b89d6 SHA512 e0f105d9031836512b7a2caf81b69235445f631539e18c7711fe1bfdabbb8a52b76434a29205fb957be21f9bbd68b01426903b4f9454b8b166b3c8521a73d5bb
+EBUILD kdb-3.2.0-r1.ebuild 1452 BLAKE2B bb90f8b6a09270abe37f7400b6a7bdee02b42dc04e81e9afc128f1729316d5da93f8b2b4c00081f7bcc6f4bfae38364625771d1fa298d27626a613df6ffe9d9f SHA512 94ec2d91456c8fe57de80220b56270ce04c40d828d85a6132f3765aee8dbd9605c33409d3c99383e4dd8270681e5b41ae7930ae6954c380a23c1d4c1b921652a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-db/kdb/kdb-3.2.0-r1.ebuild b/dev-db/kdb/kdb-3.2.0-r1.ebuild
index 21b99c70ab22..672f29b8c9e0 100644
--- a/dev-db/kdb/kdb-3.2.0-r1.ebuild
+++ b/dev-db/kdb/kdb-3.2.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KDb"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="LGPL-2+"
diff --git a/dev-db/kdb/kdb-3.2.0.ebuild b/dev-db/kdb/kdb-3.2.0.ebuild
deleted file mode 100644
index 65db2faf69e5..000000000000
--- a/dev-db/kdb/kdb-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Database connectivity and creation framework for various vendors"
-HOMEPAGE="https://community.kde.org/KDb"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-2+"
-SLOT="5/4"
-IUSE="debug mysql postgres sqlite"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-libs/icu:=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? (
-		>=dev-qt/qtnetwork-${QTMIN}:5
-		dev-db/postgresql:*
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-pg12.patch
-	"${FILESDIR}"/${P}-build-w-pg12.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDB_DEBUG_GUI=$(usex debug)
-		$(cmake_use_find_package mysql MySQL)
-		$(cmake_use_find_package postgres PostgreSQL)
-		$(cmake_use_find_package sqlite Sqlite)
-	)
-
-	ecm_src_configure
-}
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index 65f19688f3d0..0888b6bfd7ee 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,4 +1,4 @@
 AUX libdbi-0.9.0-doc-build-fix.patch 662 BLAKE2B 652bdba6b0e9b04bee87f48f0db1fba774bf153bd73f925b3d1111823c14e82ccf3202f8023736e3b0a91e00c28c6aca14ca5ffcad3126723c7f02cbc30a7049 SHA512 db18d3697be13ef416914843d0933caead3b1f57c13790373ec435318212f0ccfb599514f8bd6f1c603e09f13bd526b62322ff92e68512e43020b31f8d0dec55
 DIST libdbi-0.9.0.tar.gz 1194284 BLAKE2B 36ee5d9ec0a9b088735173cfa9a85e30ee595d6781aafeb994271e7745d259dbe983bea037182c471dc35ae36486a5fb8690e9c716e2e08a4a3964d90abd64f0 SHA512 ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce
-EBUILD libdbi-0.9.0.ebuild 1207 BLAKE2B cc23a05840017e8b03cd07ebd20a97ed21e16dde774405b73d25d44377a52ef4f7e6e1be4c4c1d9f36c9aee69111e835077b60391a9b603446f07b7f723119ae SHA512 13024435e3d50af6fef61b5d7c216577d2dbc9c5211a0aace9c1db0307316cc51b40e701c7628693e8c88c0d850f26faf5e03333794a96835b055a2f6c58b204
+EBUILD libdbi-0.9.0.ebuild 1171 BLAKE2B 157ec0a815d0aeacc1c6237cbb1bffbe68151b686355e7c4c27b14f9df48ebe706d0aa12676a5cb65bbabfa36e02d35ab532826a8a629a33abd53d49b1ec8e75 SHA512 638d89e11427dae3a8e1cb3122bad480d0b94e4b26ffaf408bece799132e979d133f295c8f89d1638bb99bce8392ca9c272ef43a622a4c2ec229d3b552edc0f7
 MISC metadata.xml 294 BLAKE2B 1d9ff5692cbe4272918f7c3a8a5f9f1e564fd2ac3d5e5878be44f916557ecdefb843ad3b56e778d2833361609ac8cc9dec2939c04bab59687b4a7d2c25f4c750 SHA512 acb2d7a1ab6206a1f489cc8999ae35f014453bc95764000c5a6492a4b8832f2e0cf83bc875aecf50a6a6beb6bedabddb74628a2599f6c84a2d4aded345a39cd1
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index bc6daa9ac86e..e5710565f5a0 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -6,19 +6,17 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="A database-independent abstraction layer in C"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://libdbi.sourceforge.net/"
-LICENSE="LGPL-2.1"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE="doc static-libs"
+LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-SLOT=0
+IUSE="doc static-libs"
 
 DOCS=( AUTHORS ChangeLog README README.osx TODO )
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-text/openjade )
 "
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index b8f776761c18..6133ae5aea1d 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,7 +1,9 @@
 AUX odbcinst.ini 82 BLAKE2B 7c752f9500f2141886c798d9be4aa2e84ecb089589394c4f473712aba0279f2ff853ebc1ea75b7f007abea18e46289bf06c7408d3d69026faa6b638755c13e70 SHA512 40c056bac44dc5e521ec2e66dd046566f50fd8b2fe0d0d2beacc29a68d9ddbe75f8dfe012ee6957c4e2874d4365dbb096e20faebb2b26371b060c0a9fec205b2
 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.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.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.12.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
new file mode 100644
index 000000000000..9e99b65066b0
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.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 ce33ccf411a7..caf1d9e6ab4d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -42,16 +42,16 @@ EBUILD mariadb-10.2.34.ebuild 33748 BLAKE2B 4dee3db71121d7def075565402634c367f9f
 EBUILD mariadb-10.2.35.ebuild 33807 BLAKE2B 75c52a9c1c744a0b58f3a81ed5163df352dde9eadfa41ef0b0d598aea0faa024796c1c7a2164688744ead3e950db5aa87789dc6aad412e751fbd44d9ff541aa8 SHA512 6904ed0f3217ee3d4ab0139e67d7c1312bcd9771c534fb637279722ebba24af9c5168efb8e4391d553acc38add3229fb2ee62a92bed22262fa4076d0520cd6ea
 EBUILD mariadb-10.2.36.ebuild 33802 BLAKE2B 951616432079ee5e54eaafc8ae1e2e893eeed6b78e0d82f0f600c00eefaa17af32d5280c89c28c377f9f96b930a3d2219062fd9d0214e1addaa612c1c4c0f5af SHA512 551aefbe395f7c35150b59abfd72643316f11fac00116c3119f0b2ffee63afa9d82b3d335455c3cbe402283f98c67966d2767a6d9759db262f8b461a6b956967
 EBUILD mariadb-10.2.37-r3.ebuild 41505 BLAKE2B c72e7fd67c44884cbbb19777e51822abafb598e61ed7f6934d45a8bf20858a6577317852dd642b7cf7caff69d42bfc0eb3dcc0d879652769c1e34d97894ffb2c SHA512 6703492272ef7da489164ff17f4ce1e3802032c16d51eade850ba4caa7222ff3fac55967d5174a7164cca2362c9187743c3e67f79282f601e0f6042bdb37008f
-EBUILD mariadb-10.2.38.ebuild 41711 BLAKE2B e430b670278937e7149e42caa6b2a66681c42f326f3b39d5ed4b2a60beaed702564d90808e514e10a9adfcaf6cf7d8cde5ad9c591f7e5f14fa0c11839041be2d SHA512 69798a7af8475ed881ab259ca7e8425277934a4ab502d46d348f494a25fd3e57bd94377fcd82ffb2f24c4671b3ecbfd1910e58ba4756931ca294ecfbbb3628b9
+EBUILD mariadb-10.2.38.ebuild 41710 BLAKE2B 542eadb79d5491ec77c6b8a7c47fc22c247e0c3046062d7ff1cecfa07538854e17673f594255d1edb583e1a8845f0b21bc5f29d90a42be81cdb1aec23784fca6 SHA512 527bef87a8825c16a7d8d29a90ec809698d9886feaf2714bd85e461227b44d96b1cde0ad66c2b1380e4d8f394e71373e3ce15b9c267b46880bb9cf0b1c2f92f6
 EBUILD mariadb-10.3.27.ebuild 33315 BLAKE2B dddcb00e569ab38a470fc69932fa1974b18e78e3bc5315dd99281a8b3b491eed9078844abb0c21d4b60e4abbb3e2a1c9468ffbb7414f34410c1b8fa748dff2cd SHA512 da81a47686f868cb881711cfd14736a98ee21fa23a5cb1a7a034f4efef9d36021cac376af976301fb6170e665140a6a04b065f7ad21801d7533609be416f66d4
 EBUILD mariadb-10.3.28-r3.ebuild 41037 BLAKE2B b57fe4df2bbca5c9c1433bc1718447efa4d499c5700734203897aa2bbb48a5ba48f1a84789d06bf879e6fd558e8699d8a2feffa9e680117c74e925eff70adfd9 SHA512 5f67b938748f65f07b101391a3c07296513ccd93d4733198f62faa51701c16d27ebc4f2deb44ae166baed9ab5e72896b661fce6f73a154adbc5f76032bc9267a
-EBUILD mariadb-10.3.29.ebuild 41267 BLAKE2B 4d8dc205c9d9ade8a43c800892e1a59f55607fcfaa6fbe05dc5e442d48d0c787269cefb5e5cb34fa54dc5223e9c15bd6612457e518e642b4029b50d66dfc427f SHA512 821118c1bbdd1d3bd55dacfcce99f3d323ef157304fa5d01489c3d74759c46d23819eedd5da60c371af4295855eeee02b7d6872e122db15b49c35508a93b2d77
+EBUILD mariadb-10.3.29.ebuild 41266 BLAKE2B bcbe4325f6c6a02f0d8aecf39b335fff14d5542527c94971a9104f6259af580075fa8f63659e30910805e1057f53a566ebd2c5bb0b5b96aba9737cd407147b12 SHA512 b8413f464e3217f09337c2e69e38e97ee11e4508ed0d62ba0b7ff78ed6779728ddfbbc098e44b3dabcf55c9cbf16d052ea93b9862cf13c5e973bb5f9c07b2cb6
 EBUILD mariadb-10.4.13-r3.ebuild 33935 BLAKE2B 74eb39d6fec14db04ca11891db579ffec0245794eae688119b74b3e6ca6fecd362494132d3fc64ffd6780e70cc1e0432dc5b98c925decf12f57b3c3648ecec93 SHA512 d48420d78d7357c8c3fe492a0c45380823246ad29ff71b8c5f8ac164089723d78dc8cc6169127247f699c1404199b6d996788583c3d4f48bcd603cb91f9a6ee4
 EBUILD mariadb-10.4.15.ebuild 33966 BLAKE2B 7102c4c5010816fb80199b030218ec7d57b3e7867dacab26cfbefd415e159cd098a51988a78da7cf691d986596112ea6432c823bc791be538ea13ba12fcb7a55 SHA512 94d386d0af525b59d33deca8dcc0af1deb0328218ff371151fcd876d5b0ec586d062ee64391d74c3259e72c6b3ce55eebf6ec8f75bb3fe684136459d472f5e72
 EBUILD mariadb-10.4.16.ebuild 34099 BLAKE2B 88476cfc7a91578451236805dc2d73ecd83535dd7114d5f9bea673fbecad5798b46c0b5a471e0d3b6a00b63a3b05ca01320f2002214e8e4b212ce9116ae35abc SHA512 6d9417fc8d7992dda73b544fdb73b1be24bcfae1de138f84b4560ec7336ad8694b98bab2de3349f477c54865e51d899645f08a9643baf39e17d573b31119c77f
 EBUILD mariadb-10.4.17.ebuild 34094 BLAKE2B 62c8a5485a629e07c61fa493f0852da45d8512f3465da758816c7bbed7844ef59a99ec821cff9378fc6bed05f3588f757727fc0c1eedb0e39f2684662f5e7e98 SHA512 9c1daebbeaea6d7feb31f30e0576d2e1188f1fce35f15914b6cc51748bc0057642a975c536a35714ea075302427dbbc45ae2cd33470af84be2f9b122bc95554e
 EBUILD mariadb-10.4.18-r3.ebuild 41594 BLAKE2B 9e3c6f1794df4e08dd99363acd40a3568d46fa188ca03ce32e8bbf8353ae17d0ee20263166cf56b2d55eb0f0f78dad1dc8137688e812cc421cd3136a810aa6a7 SHA512 4660aac0f5b3f97c1931a6cf3a25278d03e5f34454c8fd686d730fe87edf39ddbd445b352b24e7824dc6a572a03fb8b99f867dcf38032e33f05cd85a6419ff12
-EBUILD mariadb-10.4.19.ebuild 41979 BLAKE2B 95786b6d6859ccc8a23aeda87b3080c2604d575f49210437cefb49da53617c5fd1e1cd14557451b827092e39876830cf2d6b3a90fb54439a313d45a81fead33a SHA512 29ee6e07174fbe4fe10d75f48e156bdb54ad32a3a7d9dda7847ecefd86389eb7eb9d4581be0617905ef6b6c7b316b78bcedf03b8a410ae84992100709c4f691d
-EBUILD mariadb-10.5.10.ebuild 41406 BLAKE2B 6333ccdc250905ffb507b1b20256ebdccdba22ceda178ef08c853272ce951a5aa04d10def4fed485dbd199ef0c3ec9796526a353139e126304b81c1633a1b24d SHA512 3f2a02d2bb605f8f5e092d893a568168f2e2effc8cee7846315139a56eb1363af32b0d155599faa48920e8f3897d07db8b084cb2987694521f7979843e8e90d0
+EBUILD mariadb-10.4.19.ebuild 41978 BLAKE2B 52c88e8b793f64a571dab9e92ddfeadda2443898258ab94cf84db03c5ca1d5caab09952316f306f940555c0745aa6fc736f688ba4b5971e989efdee5da46d966 SHA512 4bc810b7645e7ac2cd6f4cc384df0326357b076cc4e0d5d10b774fe8128bd9a6d7dc0933ad5f659324c31c716bd73a9f8239f6bf690abf25c89beb0ffd68e64d
+EBUILD mariadb-10.5.10.ebuild 41405 BLAKE2B 9949e10b41dbf20c03f68c6b4733019fc7a3465335ad5fb7ec0924b89e4c7482a578b945a068506f881faa6c5e0d5be4f801a4ae96e8faafd9b432a32492b4c0 SHA512 0a6fabaeb5f77cdfead4536659967bc0c6fa14a5dd709b2467a91767fa4af93d92ed962cfc7ee9418914406e0f7a08ffd76382355654bb2eae449d0b7eedf5ea
 EBUILD mariadb-10.5.9-r5.ebuild 41092 BLAKE2B 8bde28f7f5a3ef726b8bc77f62cc7da65c061699d76b98692d8434866cf4e9c9b8278ddad852ffedce939a57cc34ae3fed72c7c3663b760aa5c835739dcbc569 SHA512 17815ddb3321640897ea839193c324b9c68c56eb666e3d575babebaafb595b6d29a57bfd77bf0a6ed918a5e14c26462fb772dd7adb186957553209a5ef5b142d
 MISC metadata.xml 2625 BLAKE2B 649e3bfdce49ed2352d31849a7d4547e0eeee23fab8ee58705fab62f8e1dee1874885027897bcb2895def5dcfeeea66caa69f83161ac1cfd19154a8712bdf573 SHA512 edbbfc7be64f124c0969f7de67337ba0b579292837d10e18da56b7e4e1cca88a36ac304e7c2625d9ae2bcf625d632a707f9813a0382242fc3d59d384b5b7bd54
diff --git a/dev-db/mariadb/mariadb-10.2.38.ebuild b/dev-db/mariadb/mariadb-10.2.38.ebuild
index cdbebe3a49f8..77001a3325dd 100644
--- a/dev-db/mariadb/mariadb-10.2.38.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.38.ebuild
@@ -32,7 +32,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 ~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/mariadb/mariadb-10.3.29.ebuild b/dev-db/mariadb/mariadb-10.3.29.ebuild
index f4598844ffe2..ca5c4aa6821b 100644
--- a/dev-db/mariadb/mariadb-10.3.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.29.ebuild
@@ -32,7 +32,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 ~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/mariadb/mariadb-10.4.19.ebuild b/dev-db/mariadb/mariadb-10.4.19.ebuild
index e663805b40ff..fe4673db495a 100644
--- a/dev-db/mariadb/mariadb-10.4.19.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.19.ebuild
@@ -32,7 +32,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 ~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/mariadb/mariadb-10.5.10.ebuild b/dev-db/mariadb/mariadb-10.5.10.ebuild
index d56ed81b9fee..4a82eccb2e10 100644
--- a/dev-db/mariadb/mariadb-10.5.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.10.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 ~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/mycli/Manifest b/dev-db/mycli/Manifest
index 3691c705eb19..c36881feee42 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,6 +1,6 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 AUX mycli-1.22.2_p20201026.patch 17058 BLAKE2B b9e436fab98be62fae2b4ff549914d9431520a179af946db8a48255d1f7c2e36f90b91d4adc698c7b84095d00483f14a22f5e0c99ab022a1ad6364601482db63 SHA512 0e7b5cd9e687056514447e50df1310090d04f50666455c87ae32cf2ffb2935e923d93a8343d44adb2393d696238cdda5f215535267dca45e9861a8d86a0a21c3
 DIST mycli-1.22.2_p20201026.tar.gz 269338 BLAKE2B 42f4349e65a43829691fd7fa0fa1a57968cf34ffba04156ae221d7a2713179826fc09903e45b6f05fbf05688f956a9cd95e87393179992378766b3a3a6ef9c6e SHA512 70d68d7517322b28783c324d463664c2794ba26cc78e0eee056891ce43dbce57c4dd9c13982ac2976af07ff1fa3d4552cb22bf42b9c7885c93483ba86b873636
-EBUILD mycli-1.22.2_p20201026.ebuild 1659 BLAKE2B ccc8bd4b81d395b8c0c7f7adf29e9a214d338df336924f40decf4da10a8f57467d85eed53dd3d549dbfed61383948cdd24568b17120b08ee2689dbc76fcc8004 SHA512 c7f15da24df2443cbb20451c47425454afcb520887d5c7f21e1f4d74dff21c936192c287f2b2066eb16d92669c104dea2bd9047c75aed2fa273507502a9f9c22
-EBUILD mycli-9999.ebuild 1541 BLAKE2B c07e831f0f93017b3967e372cfa21401fe57b76286fb80265fa2b56afbfaf84678501e63988bed450ee935ef727aed1e9114e7630e9f2aff4bfd048b05c6725e SHA512 557aaa6880eac1e30e511726b2b7843b516da446a465273b64847ee03df961697a794fad90cb4e3a395927498908a7d7c24e6d8d07d3f4de65b74c02314e7167
+EBUILD mycli-1.22.2_p20201026.ebuild 1573 BLAKE2B abd09587e3cd1fb9012972a2483f619a28b107fbba19eb3497cebedbc4979d23c79df2bd64e7a012a6d2f9ca7f2083661ac967df88a2e205e6c949761e77bc4e SHA512 eb434c741d4c8a39e69215698bf8f58578bf57675eb42d8bf1351fc9c2b95520a6809200733a0b28ad03eb3708fe34b85909f28de569842627143a5fdada4d72
+EBUILD mycli-9999.ebuild 1455 BLAKE2B 53714eb7c30e2755239616d55bae85f5e90802be0588eaefd0169cb4e2516e8bb7d864235aa26a0f303c98da67a378267c073fc8d1e39c09f8bf9919662ce565 SHA512 994991c604407a0490d8d0970314dec87f2803ae7b9b673e8535e63715fe35b2581fc1a977ff14ec329cdd7f8946d3f9800e2679470a00a14ba8c7c6c9e51d7e
 MISC metadata.xml 406 BLAKE2B d46b17f9f36fc9851f36d4deadf52ca52d6df621245e521f66386ff3deed3b863188875dd2207c3cf78474cd8a04aebf03dad6564251581b8f9d09fb7bdf5ba8 SHA512 b88e9469cfd9287df46b84c62b27fd60f3cf84abfe93aba4ca7b46d668b0ed855c17ccccd95a49bc102bc2d9c054846ff33e094fe0351c598a9b55f494618e57
diff --git a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
index 3d988df6d527..f660a9ed97dc 100644
--- a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
+++ b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
@@ -1,48 +1,47 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 MY_PV=$(ver_cut 1-3)
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-
 HOMEPAGE="https://www.mycli.net"
 SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssh test"
-RESTRICT="!test? ( test )"
-RDEPEND="$(python_gen_cond_dep '
-	>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+IUSE="ssh"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+BDEPEND="
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
 
 distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" "${FILESDIR}/mycli-1.22.2_p20201026.patch" )
 
 python_test() {
-	pytest --capture=sys \
-		--showlocals \
+	epytest --capture=sys \
 		--doctest-modules \
 		--doctest-ignore-import-errors \
 		--ignore=setup.py \
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index bbed0c815157..6c8183acf1e1 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -1,46 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
-
 HOMEPAGE="https://www.mycli.net"
 SRC_URI=""
+
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="ssh test"
-RESTRICT="!test? ( test )"
-RDEPEND="$(python_gen_cond_dep '
-	>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+IUSE="ssh"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+BDEPEND="
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
 
 distutils_enable_tests pytest
 
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 
 python_test() {
-	pytest --capture=sys \
-		--showlocals \
+	epytest --capture=sys \
 		--doctest-modules \
 		--doctest-ignore-import-errors \
 		--ignore=setup.py \
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 15b0bcf5937f..1435b1248842 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,8 +1,11 @@
+AUX mydumper-0.10.5-atomic.patch 955 BLAKE2B 9405d3b1272bd913e7d570142fee01533323c18238e5a3f62205b3bd54da6c1d36df4adefbfffa1abfe8ccd51e28483ec48a7cb41058f9285f25625273d78c0e SHA512 82cadd013ccfd338f48ff109e58c64e74244fd922495b4cf764ed13408ef182694edee2ddcaf31fbe32e29ec7c4ef4d526613f8aeab3d23570ecd8469c3035d5
 AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c16877a7851db6cea6e738ddeee06ff8ce255d067a9321c8a687c2e99c3f36caa84d9a3ef017a045261f81d4f13 SHA512 6c9a9a8378aec435431ac84cc530b880616e5e1df823525eebe4f813c6e0e73eeb0408bff4379b295a1fb095c91a4b1eaea83aa4d8a7bb2e159143ce7a579a90
 DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d12698119e6d84737601d7bc0e71022926f579d21456b73b8ff1d384c961256538467badeaceaf60a92b333196a17dda10 SHA512 dbcb207c8ac61b286cd4464a3f2c67ea6972d1cab215c09a577cdf621f685011cc26e1e36399b72be2a8165b4e4c518b401be928b6a1a31e35d2f27c169dcc18
 DIST mydumper-0.10.3.tar.gz 64622 BLAKE2B 14020b6bbb72271659dec965de164274e2bf81c72b52fa7c1d6997f393d1c0cc977d06d689bb7d7c6e3da86926add2c61f1551afdd30be71ddc97c4803d4e455 SHA512 d7cf6897815de3d46ec15cbcacc393722f7d547300a45e70960e47b8ce30e06a5e652f52a0ff8999d2ac3662b4a48927aadbab464668ac23f446eee95ba574cf
+DIST mydumper-0.10.5.tar.gz 66399 BLAKE2B 77bba97580bcdb267d77be455f56831209a29b71389337c844e4e0cb37749dc22d000d3845e936f5d589951a21ad61bf19cd3b9084004a62aa1b33f16f81b5a0 SHA512 61127c4b9ae5a01111d431672ec3818a6c3db74704ac5db12d286e380273968b8b9e56298ac73eb6c1c32649875fd2ee01d099a73c99cb9c8d4604eaf0eedb09
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.10.1.ebuild 1055 BLAKE2B 1fba1963ca58f425fb9319aca1507bc895eb717f8f2ffdec3741003187e0203f7493191e62d3475e057c6e2c4735ec2210355705fcd24750ac73e850740a9c16 SHA512 867fa644160a44955f4be27eb2a82bb10be73d5e1a9c80850e7ea5bf34f00410e0005bdfc963df4a94439cdc54ba8b22178481b606fa0d8d33eb94f96c6ad1dc
-EBUILD mydumper-0.10.3.ebuild 1023 BLAKE2B 71e67cc1d14e7cff1b4d44176fb222e0a7df420c4e60848fa231cf0dea1cb228f3dcde70793e21cfa2ccb9a487894f45ecb9f4b2d7dab4d6d930948dc59ca668 SHA512 a4021b107e54d222a949c11b6c4eaa3d20666517eedec8ad131d5e8fc8924e16e84d97c1e20cb873ba831d7318bf981a5fe742e2e4f0f26f1c6df9ef623f71f4
+EBUILD mydumper-0.10.3.ebuild 1022 BLAKE2B 27782ee1ecf8053c36c6495ea66bf7761d0a29f452529a02fd041abbee08accaf6ca68ebb3ea8f848ab0b1256bb907d00386fec61b5150548e1492d766589ebf SHA512 530a786b9c5263aa8396849885612d4f0a432ccbe2c7f1fe59d78bfd8902586e5664e6d8dcdc8d8ff03dfcf1c38c23d39f84036015687b461b12e061af4a81d1
+EBUILD mydumper-0.10.5.ebuild 1022 BLAKE2B d398aaa8aed706e8d3f3599ba2912c263b4be2610e81970b0293ac61c6379ddbc9a961e37bdb6b2dd540d38cb4ecd7d51da52bcdeee093683cb2a7c3ca90744e SHA512 dadfaa10053cefc4e4e6a5bb6ee397aab7ee6668b1f812ee5e813c09a6c2bc687d8618b3700447ad7efcee3e42c463e1b4be382469b50f2a1c3c723b273b9b99
 EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B 5561bc8e94a28d6676d6673953b970b05f062a48d25a2ef280a6cf79a9a881081b936e39260d34f46719a45085b4201511a10af0a00441008218032a5aeaafd5 SHA512 fe5ab2d9ef8f9d4067e61f376e9867bf48b49029666d7e85182aa1ad774fd9177936e311e9c31fd8835a0494712cf231e55097b393b01c084712492245f507f6
 MISC metadata.xml 478 BLAKE2B 75bc3d3ed6095b767a4fa6488bab9c98c693370eccc11508a56647c8d45a3d909cd08cf0deb93c011ccfae5f727e9942e90b340ce7a70e7e514dea3e2e894cbf SHA512 5410f1bd014a5de0fd9a0e0ab85c6b2955ad761619118b549a1ed85ba76f1bd785cf89099c6096aee20d43ccd849bb90840331bff80b94611cb27cc0c2ac3460
diff --git a/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
new file mode 100644
index 000000000000..6dc7fb5fd290
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
+index 23470a8..2b8ae63 100644
+--- a/cmake/modules/FindMySQL.cmake
++++ b/cmake/modules/FindMySQL.cmake
+@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
+ 
+ set(TMP_MYSQL_LIBRARIES "")
+ set(CMAKE_FIND_LIBRARY_SUFFIXES .so .lib .so.1 .dylib .a)
+-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-    find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
+-        HINTS
+-        ${MYSQL_ADD_LIBRARY_PATH}
+-        /usr/lib/mysql
+-	/usr/lib
+-        /usr/local/lib
+-        /usr/local/lib/mysql
+-        /usr/local/mysql/lib
+-    )
+-    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
+-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
+-
+-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
++
++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
+ 
+ if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
+     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
diff --git a/dev-db/mydumper/mydumper-0.10.3.ebuild b/dev-db/mydumper/mydumper-0.10.3.ebuild
index 72aba08da6e2..b04b6fc975e0 100644
--- a/dev-db/mydumper/mydumper-0.10.3.ebuild
+++ b/dev-db/mydumper/mydumper-0.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="app-arch/zstd
diff --git a/dev-db/mydumper/mydumper-0.10.5.ebuild b/dev-db/mydumper/mydumper-0.10.5.ebuild
new file mode 100644
index 000000000000..a9e9ab55b395
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.10.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+	dev-db/mysql-connector-c:=
+	dev-libs/glib:=
+	dev-libs/libpcre:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-atomic.patch" #654314
+)
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's|-Werror -O3 -g|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
+
+	cmake_src_configure
+}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 60ae546372a9..123f13eaeb24 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -19,5 +19,5 @@ EBUILD mysql-connector-c++-8.0.21.ebuild 941 BLAKE2B 47888d50b869e6f62452ca2146a
 EBUILD mysql-connector-c++-8.0.22.ebuild 942 BLAKE2B 479d3ce48c9bdecb155bb28c2b054124e716d9a8c4a90e496f4166e31fa7dfa072a0dd4a29cc4a2c67c1e82c9fa6afca900db82ecbcae12378fd73c8ab161e9e SHA512 4b1924e9e2bfcd08db957785c534cb7acfe440cc33c82ea845b74e4d848acc80b1489af5a8358e5102c8621b0169ed79cf9455389ec7133025b69bbf0532ae71
 EBUILD mysql-connector-c++-8.0.23.ebuild 943 BLAKE2B 91199b0deb991b1275377ee17c7ba55241265701c260443c845c6c47432c7cf34ba55b3227b65e234550dac37e08aa359fd5d2cd043951a804b8fdb2a9b4b9a6 SHA512 3fb54ed0135bf6727e5bb7f161947de858abce3589f3ca2c80fa402aed790b4e91e28af248a4e6a33cf78b7da684edc2ff1db6554b5c5ba7027eddeb009f87e8
 EBUILD mysql-connector-c++-8.0.24.ebuild 997 BLAKE2B 184b385509ec362bc962357f9c54dc554d6c1d66500154b6c8243ce2b8d2a01bfeb68d0e1c01c0e8dd98f16ef718b587b407e44a68010ae7bcb6f7583b32285d SHA512 df28ab886f014f30a44898b72f8a12e41bae8bc7109952712d7b44fd451de4b32babc0c5aaaf8142d7f90aa8b07a4f80ffe3d0cf34694be003c6234705acf6cc
-EBUILD mysql-connector-c++-8.0.25.ebuild 1065 BLAKE2B 3ce7ce4ffa616f38f6617e5de99e042281243a938c2a1b21697d386b48adf5a45cb27ee0584d43b2ab781390e614091666b1eeec759f12e22e3214cc9d77736f SHA512 3f2ac9a1dcd5837e95064e4673d6048a09f090a4a04c6eb3b2a8b59d4187f06ed11898f3d3fb9bc4e3946d5cbd78502d859c490d9c2fe4570edc35ae43b470e9
+EBUILD mysql-connector-c++-8.0.25.ebuild 1063 BLAKE2B 1ce9e11fdcd814c1e464098ffe61027e36136562adbd1efa9a4ba10c252ac04eb5602f47abf5ec94f5514c778c38b3f0d81d82a66a113e647b3f02baf2a4eeb7 SHA512 db6ebd66158eadefa3a355d5add58e015a62587f51b07484fcefa8b59d28c199ee81d468a51f534b7be37a0246331edbf845680181fa3e27ff6ce086397dc940
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
index 1d5c5bd6f516..0114e1a21a46 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 8d5cd4b46fb8..b84a0a3243b1 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -5,5 +5,5 @@ DIST mysql-boost-8.0.23.tar.gz 291039175 BLAKE2B 3a7d3e05c774085d6078d0d3effd58d
 DIST mysql-boost-8.0.25.tar.gz 290265324 BLAKE2B 5393a2a2525a886d9ece19777deae01e6c0b24b9ff5a0a5ffb9075740ed912d0df59a165b6ec9ceb60c7c28f3062cda5cceb4da3a8280f42549984c846f1ce5c SHA512 af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081
 EBUILD mysql-connector-c-8.0.22.ebuild 2782 BLAKE2B a03af99dd8eb16b78a7b891b9eb6c79a893edef92410b614722f2857ee21d1b519f93f74842d89b56ef50d628abd4873c00b59b4fcc06f1606319c078c2b89f6 SHA512 7dbf5e4d22d5d000e702809b2356bbe842da16b1bb61aa7d8fc3fd62f56449f5d893f377cb9a4b5b4b7019679a05f20aa67fd570caa4d9ccf27dccdc9c549df4
 EBUILD mysql-connector-c-8.0.23-r1.ebuild 2986 BLAKE2B a7f75b2115e7e4f8caf06ba5a81d6227214178d9b70c12007f13615ea55d75c1918b6d38e9e47f5caa4dde3539df10c8a21a9fedf9b325cc82ed2a875a346467 SHA512 b916eaa8cf6a4d3b39e65ae531324b9c13fcc4a65fd69ebe6d9b476f220ffefa542d6e5c7f835a83d283b751119f84c81fef234a6b2d164e4cd91dffecef13c3
-EBUILD mysql-connector-c-8.0.25.ebuild 3069 BLAKE2B 4ad28d6690ef4c9c58b9f9d62467781134763d80a6f8a5dd6380c474f57db3bdc41d80998e00209c5833aa6060a25eb07f7eb129a14e9d91cd85d11dbb5e576f SHA512 fdef8a53951c6ddd1b5d31861161122dc11c83d536bff251012ea39071cf19b0ce8220400cd11616f106bd6f464b7a5984e670dac62d5723a697ab9539da5646
+EBUILD mysql-connector-c-8.0.25.ebuild 3067 BLAKE2B f13a525798256e2677fc2749a5ce460ee0002774a5528a73e281504e0ea632f51431d33251d1d629878a9549dd4bf7080caf5b6693ca1e790d17509c2c15e07a SHA512 1ff8ed515e6720eb9b509ab5fa268f7217bd2fa94b9f9052f8fe28ba78a32dce3270b965afff2e68e87a196d5d5cc861b1595254bc4e0c5655000426aa71ddcd
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
index aab795e4a263..6f5a2cb668c2 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/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"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5f3134a4a942..6bde9ccc6bee 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -35,11 +35,11 @@ EBUILD mysql-5.7.30-r1.ebuild 30275 BLAKE2B 784fd18e9808de17affd5925f06042606aad
 EBUILD mysql-5.7.31.ebuild 37143 BLAKE2B ba9576ecbc8e486af3dcd1b7319dbae4dec7d44c4a70ac45cdcfeb58ba4e271abf6d3695f16759c10242015ca2837e484106ccc3e0668b08fbab24b71da6e32d SHA512 edf56d1e97af8641a030a6e85a0933111ce448a345146a3a374a2ad047ade4ff8ab3bd51a6a006f53b5d486893de18b836b9351c1c96fe5a8be0ab796e67eddc
 EBUILD mysql-5.7.32.ebuild 37185 BLAKE2B 13be67482bf1e3e7171b9ce7468d51c1f67dc469f61c4ec18de94548e1077bb31fb7848feecd3761b3549fb4afbfaff6a128223b0bc516b0b4601edb4729468a SHA512 e457f6cc626d3ed452d772bba59428d60eed2c40d2d7fa52a9ab91538123e332d8c86b1a1da8217f1bd81c807c459d4397d237ac04c2e22f37a2e9e775878fc9
 EBUILD mysql-5.7.33.ebuild 37400 BLAKE2B 9245b583265b65125d35d6d52c317c547ded926243c0d7d430e7739c27efc2148e40c968aa55eed964c3064c4f4df82ddeacfc180d47e62e51c5707bc7984311 SHA512 dba99a3536f75fced834e3eb9da03ae5e0f026409165cf805295f216b7e3bc2d153927f7716d1cc52bf4f1f1d88fa834383a25d16ca263e036c01f07db7935f9
-EBUILD mysql-5.7.34.ebuild 37471 BLAKE2B 0627ac23815e67d6f31b0ad1cecca4df7a5b9e06f4d43661a924881617df01d3268a2d3306c39b6ec92b57aacaad31a5db348c2575a9b363cb89ee0f5b064209 SHA512 712bbe401ca81f8fa668d42a78a1de7fdf2bc9a092071e6cebb038c04862b995c07e7e745c2730dd9601abb346d928f0a2291c7bdb63fc99bed25b6ed030fbb6
+EBUILD mysql-5.7.34.ebuild 37470 BLAKE2B 0d40f2e123960750582f7fba0caf035a9070aef61e2c0f2f030f1bd2fb628a8346f21a399a7144bd1226d103bb7badc0b3fc803c13d4a3364e861917a2dd96c3 SHA512 611c1849bc715dee1403fd53989a6e129fa2b88589b8568b494aa2a868d461389e08336ff8c53f9b8fadb0f7db3be06da2b52d2cd6d21fbaf470d57da439cdb3
 EBUILD mysql-8.0.19-r2.ebuild 37706 BLAKE2B c8c70f4ec09c2c7fbfbdc76aa6362a0c553c1b8ae8b13edd12d2f3a0a52ab12e692c13f706813d7eb9bda5f49fc9b932fc832213056bb985c2821ec86309892a SHA512 13d96f95cdf1df2367272a1c5352501a95779b8e9c411103d55f90e6035e7b4893cf208fb92e60c1cf3df3d1ab8c6ad48a89b1096705d7f126b8462915fc2998
 EBUILD mysql-8.0.20-r1.ebuild 37043 BLAKE2B e05d79b543cda0f4ad5a4f1fe9ed72dcec32382704e41aded18e57b6c8a0f85dbe71f58d30a97a9631919272c443e85d22b269d5adedd5f01a8b004f88cfccbd SHA512 4eb892d96d3177e7aa518f1fd49aa156eab70da90cce58d2e180c1e87c8b79cb45314c5a6e52185e3fa9b5566a4be8054a37d63338c9ff5d730fe81747e45737
 EBUILD mysql-8.0.21-r1.ebuild 37994 BLAKE2B ca5f8588d0acafb0a323d92922e6a98fdaa4e41bc587f9815b6afce50d03915e8e674d243952ddc6d56e93fbb2255679536ee8d982bdfea394880631819c8d1f SHA512 eab92d18be2c4d2c2192480a66ba547b7cb94b6c903c13fc4f697f2d6eae06bbdc194c4bf07beb337aebdbdcbc8e779bfdfeb0e7d8af1721521acb54c3c8129d
 EBUILD mysql-8.0.22.ebuild 37433 BLAKE2B 7d047acfdde052e6745869ae3dc3536cc4f6d171bc04c18aaf7ce7773f2bb840f3b826ed091d6b89aa0af1167e372aa6fdcae0328a9591eb0de0e74465f9aea8 SHA512 2e7cb6a55376f03757e14d08801be88ac07ca7ec7d2afa23c73da44cd72a9f7a02212f310176de4fae076421e363b29b29b251ec98057ad54ad7ca6ea313d3f4
 EBUILD mysql-8.0.23.ebuild 37575 BLAKE2B 135ee2f924ab3b50a73ee6366ee9b84815cb81944c9be9ae48c3ed643e6f288d7b2541f6feafa3bffefa28e75b81eaead199704b93b6c3e4e02a158cea868b0b SHA512 3f0dbca7e24b4c696d5970657bb7b405878e6330a6fb26815707d5a3bee7117ab0f1434ecc799515790870544f92973a31eb871363926b5d3be4b9617484decd
-EBUILD mysql-8.0.25.ebuild 38047 BLAKE2B c58154807df743c0aaf094662e7a208270950f3e9091f47edf10af70cc039bd6ca90c5117ca097daaf9c1da2130101dcbf37211fad9dfad2871d8388541df52f SHA512 3725dc548ec6ad34a7ff0dfa657a817e2a9ce36e7112919432467ce75b68b0c8aef0630a79f651197114f60fda9c529f169c562d629dd38e9ed92ea06d4e1047
+EBUILD mysql-8.0.25.ebuild 38046 BLAKE2B dc731025c2807d49da2c036dc4f1d99557269ad926c1dad1ca49ac0c28ac5c7b3239036b3f0da00ab7f72d8763f105c3a57ca983dbccdaf375aac62e810a8bac SHA512 7e3fa8d4e243acebcf82d1b725c587a3b44d0f0077c2850ab004dfd6915c10225bab7970be0ddb13f1b3842f82667a06afe943dfa660481ce04cee91d9260f76
 MISC metadata.xml 1360 BLAKE2B abb7dcadad78c58d6bc6a56e34795903309f1b506e49b00b09f06e9ae1cbb9a5d246295b9c351353ecc08f157a64f421072dae9c7b0d43ce93cde21d3917489e SHA512 2f676f17cff8fb79b58ec7baec00bddc9e3247ca0bd8c8202bccb08f3e8ceacd682db742b38bf73d667e84b9671d085deae1682221e684443466218c6a9fb759
diff --git a/dev-db/mysql/mysql-5.7.34.ebuild b/dev-db/mysql/mysql-5.7.34.ebuild
index 0e825dede97b..3826beb3aee8 100644
--- a/dev-db/mysql/mysql-5.7.34.ebuild
+++ b/dev-db/mysql/mysql-5.7.34.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~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/mysql-8.0.25.ebuild b/dev-db/mysql/mysql-8.0.25.ebuild
index d2edcb9991cb..c23ef9ac5ac1 100644
--- a/dev-db/mysql/mysql-8.0.25.ebuild
+++ b/dev-db/mysql/mysql-8.0.25.ebuild
@@ -36,7 +36,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~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