gentoo resync : 28.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
commit: f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree: 72f320d5963e55586cfdeed2b14c72b8191b6327 /dev-python
parent: fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)
315 files changed, 1811 insertions, 2472 deletions
diff --git a/dev-python/Faker/Faker-8.10.3.ebuild b/dev-python/Faker/Faker-8.10.3.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.10.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 215a134479ab..4f8761d1905d 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,12 +1,14 @@
 DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
 DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.10.2.tar.gz 1150102 BLAKE2B 5ca744d201a7822cbe35791757a73628d3c12f6521ca55bc2d340c974cb6e76362f87395cbc858e4681738440cf676e9f9bf7a8002b908ff564dc6703ef794e0 SHA512 5a148327df7c34623c0d8c154e6181a183a0aa484659e5872013f0b9c510418690278550ebbed6eb984c87cef588fd862b213295a379b5be3433afe312181103
+DIST Faker-8.10.3.tar.gz 1149954 BLAKE2B 665ed95be11f734ed2ae9b593a4e287cc53b041521ab223efc045f061133e983de500ef12a858d7420342a500926297565b7c50674fe5533b985a00816251031 SHA512 a5969f04dd96660b3e62ece20ce4d92de9c781faa1742e45404b0a6f04dc7521c9532c519df06c4b3e9a815dde43837b7ab7628ef25ed3b60bda49c927b8ace7
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
 EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.10.2.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.10.3.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/GitPython/GitPython-3.1.20.ebuild b/dev-python/GitPython/GitPython-3.1.20.ebuild
new file mode 100644
index 000000000000..87d5f7d31add
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.20.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.7
+SMMAP_P=smmap-4.0.0
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 5ab639afc44f..b43a8f789435 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,8 +2,11 @@ DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde2
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
 DIST GitPython-3.1.19.gitbundle 9507079 BLAKE2B 7f9304c45784ddb779642df6b4412d022dad5ee20f89e998281db426928ee7bfafadb9a849e174c7cf850b049697ac097e1d144ca40f86497c6bab03e32ede8b SHA512 1fa8b01b27a993221ba4771aca416c724c12c208169fe4a6e08666ebf20c8dd870eb01f039d33ed13d664df5c6126cc4477994092ceeea64fc77f28a68cd9279
 DIST GitPython-3.1.19.tar.gz 187639 BLAKE2B 835a43edc7adfbb6253abb904d2f313bb597418c749473e6ce5deef67e546ee5285146a3a8c34d6afc4f56345e3e6a6481899465c8598b5215dbadb59b0bd507 SHA512 019a558fbc60c540872451ae1cd5ab029d5b3c5d5ed4979dadaa0e1829548e04bba62173a85d8fceddab5a19bc83e1750d938f73e984a64747550e6936400c9e
+DIST GitPython-3.1.20.gitbundle 9511740 BLAKE2B 17d1aeec50a85ff5b8688a984ff41933bc8a3d91ec2e706053fcaae9298d9d469b7c816ac61f82934d454f6ebacdbce4d56ac8936ba89a7a694b59cca8b9e821 SHA512 d49e429b45f9edbee9419b94136762a75cf33b1693f9f8fb809b0bf63f0a763d501d9ca42f332d156ba7d79d07eed310763af51797adec4dac30f7c073c415b2
+DIST GitPython-3.1.20.tar.gz 188094 BLAKE2B 3741b6b2e6c77ea8464eb83abfc744e9c646d18368648f805a2aa2f6fdb1875ec61b7e4aa4e224a67bff49686268c86b2cd2b3faf19e9eaa4c9587aacb7fa3f4 SHA512 10dc9f154067eb79a98fbf3204e370e814ab00661ffd7c2e1a1dc8ba46475ed48ec8c355820deba609486c865301e13bd54797ab7da8fccf8cff9cc9efebb153
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.18.ebuild 1929 BLAKE2B 3a33df8a43887f52e637aa66dca50cae9920a7e00ea51af8d0980ba79ad67882c8bdf362f4c8824d6a2475388f7d04327d8624b346466cc2a4c4d5c1ace3716e SHA512 34d346d78b2e7e57d108bbc65476975f31effc169fe69b8ad5fc253dbefeeb23db3faf461de46e427733191fa12aa49f49edbbb7e438d7cbd579dfb9d1b81d77
 EBUILD GitPython-3.1.19.ebuild 2032 BLAKE2B 0db75c2c178d93ad3bdc72f94bda51d9768dd7ce94fe5cd8ecdb5aebb3598f3465edaf93527f89dfe35034504054b801705688ae5e0a419fc2eea8d82b805490 SHA512 15855219ad51288f129755a8a7f7a85b2a720731d87cc98273f1309de1a6769d8f2642e71e38a2f9d8541e567934965133191d29cdda2fd1fea782ccabc076ce
+EBUILD GitPython-3.1.20.ebuild 2032 BLAKE2B 0db75c2c178d93ad3bdc72f94bda51d9768dd7ce94fe5cd8ecdb5aebb3598f3465edaf93527f89dfe35034504054b801705688ae5e0a419fc2eea8d82b805490 SHA512 15855219ad51288f129755a8a7f7a85b2a720731d87cc98273f1309de1a6769d8f2642e71e38a2f9d8541e567934965133191d29cdda2fd1fea782ccabc076ce
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 07024ce015a4..89ad1334f75c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 82fb27d85ba2..54166b6dbcfa 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0-r1.ebuild 770 BLAKE2B 6ccbeaca61ff823afdc6323b37b158713c0779c674f0e96b353e723721fbd23cc34540ba0a9f5f3643615af010ca01cc424204fa6d154dac40ccad08cede9120 SHA512 d073b6cc3f1a0e2b434ddb729cf031231e3ff24711f54063e5a99306dfae97c8475409422b7ee4f212d4909eb71f6f9d22db94be5aff5f335d111fa34f08973e
+EBUILD PyPDF2-1.26.0-r1.ebuild 777 BLAKE2B adf18b1f71c39722bb715708394f65e3330ddb2bb8f96924c95c679e65dda73dfc62bd6ce2f2d0b14c5e76a958d5c46cb36ee3860871743d572728b214e2a717 SHA512 eac5ba56728f0550be3307aa444af63319237897958549c9f12648b05688e1774ef306b58d13794df017f560f8b49447e717a517299560e6a218e71ee1bbbd55
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
index 552d532d3717..807ba1f8c9c0 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="examples"
 
 PATCHES=( "${FILESDIR}/${P}-py3-tests.patch" )
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 9ae880bf0774..3222c15232c4 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD PyQt5-sip-12.9.0.ebuild 624 BLAKE2B 7a98c0d732bc07ae55892090d9c64767e3d7c661cda383ffe6b5730174fbd268fdaee61b811527bf384d5743b1020967ab4e8b77142cd1322f2e7d4847870da2 SHA512 ba14181afd43c520a854d12f347ddafdb1c6ffd05125113f4e7e28201b5bfe0672b17399f5a6adaee3aee96f68230cad4154133750f350fbf0b699a7e4c703a3
+EBUILD PyQt5-sip-12.9.0.ebuild 623 BLAKE2B cd67b20ffb749e17c6c842a0a424ca434c8ff7ba0b15eac045bae80fc6d370249377c816f5efc671a8f239c3e5fc146a47e2d846efeba41d5ab6fe2e610ad83f SHA512 16ccf6490d8def6eb59adbe2b9adbe8e79c6f60813a277ce6ed3379d5b7f28116a66f12b189d5919ffa8d436548069d3ab81589ab4f7478168e15f75dc6b012c
 EBUILD PyQt5-sip-4.19.25.ebuild 2048 BLAKE2B 0ea21df4d969c0f922de85e9aebf89d1037301b7b420a742dae29063391be0bbc264e88a2673e2046dced52def880b84c0b7af546f8bef6c2f85f2aca8cba1f3 SHA512 30cd6bbf428e0749b4fb34f7ec33c95d54d305821db022a30a8cfedea49badd83f7c8bb6b3d616ad2b499ff8c3d82728098ddface1d45be8144a75f67b2d4a4d
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index 8965008f0016..d53a5cbbf0f2 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -19,4 +19,4 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index b80a2cb96775..8f2914e38d1e 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5434 BLAKE2B 025fe217ee4c9bbc7ca527fdb58830bddc04be3854607cf0e9fd7e8e9c3eb1a340209ae47e842613381e12fa7d3c488e41f583c1a8ec2045c0752ce00881652d SHA512 500fb65d0320a04b600e69fac5ebfb7f7dc1a05b93ff07f886d923d3421c6c52ca1cdff60cb42d607bd1c7517b169c83f4ad0b62ac08fed5e3127e53049355e3
+EBUILD PyQt5-5.15.4-r1.ebuild 5433 BLAKE2B d264b8e00d413eb9d2bdeba8645b94f3098360838d91844f8045344d0a0a150c5466dffae48352f3c58b454e134c86a460260f928ac3e3fb59fc28f48e4fa890 SHA512 0f972e0ab1beb7f25c0881e1ff98bc3dfe9d9a9ef8ae4cadd0f940cf96cb01c641a72b4dc16fec3c0e402514705589837719fcb23b842ec6bab7b5747802b018
 MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index 3df5fd4ae177..78f0bdd5dd0e 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 4493e8cfd042..9484e44f2abb 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,11 +1,5 @@
-DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
-DIST aesara-rel-2.1.0.tar.gz 8161534 BLAKE2B e17b70f7422f0f252cd6d248c16ebe2d609b77724d08251fed39d5f90de9dd36ca4006d767f3be8b0d0058f77f2d670033d058a24a5fa2df2c24ff5193e69c7d SHA512 d5e766eff03858fbf851e1baa0877b1cbc328408b3d2e760c2827ee662a0188e3b6dc5ceecb1c09d1f727171cf4c98c89b618f66695942558f44734a7405a88c
-DIST aesara-rel-2.1.1.tar.gz 8163328 BLAKE2B 5f2d05560f0c3cad0b58017f152011c9f10ebc8360ff925b90f6863fd2c683614cb42e86a69c53f0b168012fa1771ba37924afdf4f9600befad7d5af5a56f7ba SHA512 6a823201a7c4ca00a375dd7e1fcb38f31762e1eebe1079a1859b6ee709eb030c2d884364576b7925f5790c394f979bd5a738925c69c44c8e529757f435fb1a1e
 DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
-EBUILD aesara-2.0.10.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
-EBUILD aesara-2.0.12.ebuild 2103 BLAKE2B 4ca1ff4315ed988653a3d84372bcc510a4028fd409598be93d47da36702e1662b9784dcc9c8c526aaba5838ea76f3d8e41a39052f031746f1c7b9f67a58ad7a4 SHA512 4eed528151518ab260d595fa386cda1f209a4d3b299d8c80ebadebe916b9575c3c26442e21bfc870003464f2237b1b9621aa684b84c7f306669af523393eb6aa
-EBUILD aesara-2.1.0.ebuild 2112 BLAKE2B f359e7a97045e2d08e7e1110382c90132453b3c982a51ab2bac581a3455f37b4d49842d294c9ee1855f95fb23c46c8c82aa50574359f40e555c82c48fdf80f1d SHA512 b54b0895caa476d4bc3bbc9cf4b21456e0982ac89dd21587c4e040a1bcb33cfa958593fe60c59c11aa5e8622e0439478cff303efd5f5b921a295f9e6747ef906
-EBUILD aesara-2.1.1.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
+EBUILD aesara-2.0.12.ebuild 2101 BLAKE2B 7915fe29cb13d9c8dcaa0706ecd3ebc4dee7f8935d42af424cc33e1beee829de6fe05a92f0f700859d8923c6d76560b57299fff452ad177337e484819a7f16e6 SHA512 3916aba60e456a40dadad9afe223e125c6ef945d966d4c270627144603a74e2596819acb3e38086c7a38bc1c30232b5d0e45431d87b032064eae1f7b6b2e2715
 EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.0.10.ebuild b/dev-python/aesara/aesara-2.0.10.ebuild
deleted file mode 100644
index c60f566ca355..000000000000
--- a/dev-python/aesara/aesara-2.0.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/aesara"
-SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-	)
-
-	distutils_install_for_testing
-	# we do not package numba
-	epytest ${exclude[@]/#/--deselect } \
-		--ignore tests/link/test_numba.py \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.0.12.ebuild b/dev-python/aesara/aesara-2.0.12.ebuild
index de59ba7c70ea..8e43a3eafa6b 100644
--- a/dev-python/aesara/aesara-2.0.12.ebuild
+++ b/dev-python/aesara/aesara-2.0.12.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.1.0.ebuild b/dev-python/aesara/aesara-2.1.0.ebuild
deleted file mode 100644
index b067b0298c71..000000000000
--- a/dev-python/aesara/aesara-2.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/aesara-devs/aesara"
-SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-
-	distutils_install_for_testing
-	# we do not package numba
-	epytest ${exclude[@]/#/--deselect } \
-		--ignore tests/link/test_numba.py \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.1.1.ebuild b/dev-python/aesara/aesara-2.1.1.ebuild
deleted file mode 100644
index efa88e842a94..000000000000
--- a/dev-python/aesara/aesara-2.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/aesara-devs/aesara"
-SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-
-	distutils_install_for_testing
-	# we do not package numba
-	epytest ${exclude[@]/#/--deselect } \
-		--ignore tests/link/test_numba.py \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 0631759c00fa..dfa166836aeb 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -4,5 +4,5 @@ DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1052 BLAKE2B c3f66bb05bdf885ad1c4879691421724fb84e9da24fefd50954fee27f3f0b1dd385e6d3a5c3b2a18325c0ee4a077d108f0c2e3821d9e91647d3e2ae8d3cbc2ee SHA512 bd1a3a5351500bfe6486dc3214afdcdd4201548b5cf202454b4efa386964fa1ec91e3d567ff113dbada4c2e855a01ece4927d09453954c691ffeedb920f8e6c9
+EBUILD anyio-3.2.1.ebuild 1056 BLAKE2B f4eb649e62c2af6fbf8c752d79da26cd8cdd29bce6b2820b67cb8b1a3783cc467d02458f6ba521ed6358f1ce733d58524c5fe832731dd92faa3bc8b67c6ce168 SHA512 e0ba07e14cf9bfae1ab38d8dcc1bebf83a8641056bd0828d2077a00a2def8cbb6afc45a7d6e0a4c9327a742f4b1a88bf08ddc63907b405819904b9cedf6c609e
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index d09f4ea9c084..67f9a4d6fb2e 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 7babc0c9e99e..034e1a92f16a 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -2,7 +2,7 @@ AUX asgiref-3.3.4-py310-warnings.patch 8869 BLAKE2B 9690124277e49c87fe5d72965407
 DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
 DIST asgiref-3.4.0.tar.gz 32396 BLAKE2B bbf80c4f5bfc7eaf2f27896913a59f522643de35a5eac45807b88f0b2deef6acef408a6d3abb939c4653554415028b5eea68e99ee45247e384848c554ab61c7c SHA512 259dd6fafcd4db73554a4bd26f6000b33c61e8e4d42294bc22826bc95e89959bcc3f9f97d8f0b5dc7e0cf8420890ea8ab368232b4046254e8c91ad010f6509c0
 DIST asgiref-3.4.1.tar.gz 32529 BLAKE2B 4b5f3b33e165468d71711cf28a5a6161866cd7495140cb67ff028aba5a2586414783d2fa7ce744e99e269714d9d64a019a67c852fd4546ba1f71625473010b9f SHA512 af266fc3eac58c21f2ab3f66e522067388f9cf232b17344fb5afbc408c034e61a1cce02362ec5dc494985beef099800f75cf7de28dc057c45e4bcb973b0a6dbe
-EBUILD asgiref-3.3.4.ebuild 815 BLAKE2B 6df2257f14b8497d9b3c2f740310daa1edf8378c9ebb08323126455259854fc37312766f531a151661b49c79d3ea7dd2e166709dde6a7577dc560d54b4b5f98d SHA512 5543d78dcba4dcb6743e1ae05040eb6b1cb465ace2bb17b5a61b27961ff2e842f93f7d13d35f2be9ecc89d07e7ee0205498dc13363c628d37efc9d3e67b7a6b9
+EBUILD asgiref-3.3.4.ebuild 813 BLAKE2B d3734b2e613038bc04c49562c75695a1affb024cb3db63a7632e615b2942bb4698f6d25616df76489c4163bc8088396731229895c37601c741ece1490a883174 SHA512 e394d35e7ca25e84395fc20c6a7b998d076e3268319991cbe9116b059d9bd969c220fbd2fa107d0846b7a4935b36082964105482912746ea4d6b0c3d118eb3bf
 EBUILD asgiref-3.4.0.ebuild 698 BLAKE2B f04dd652264530179490857aef42e3af9a8d4f14a7976602c77f8e99af47d84ceb3a57981db64aa29a519e85beae4535aea99e475a4b82124b98d35457998fbd SHA512 3d11e79046a7ea4e9ff0ff4cd4816d19634cfafb6fc4b18a7305ae9befb672fab0d996da1905e6c721d5c0bd570669d7759df36041fc77c9c50cdabedd2e00b8
 EBUILD asgiref-3.4.1.ebuild 698 BLAKE2B 1a4ef749ea4481e64d8c87eb8f5cb51fb2e875fd8f5108f02472c1bf344385011073a22bb4f5175069b48546562b5a6a19a798045d5341062a98fef08d98ebed SHA512 48a91d936af1299747d53535ba24406c9c5d42865d45fc30a71d82e1d863c5add0e5d1e21e42a3994a827351caf72d55ebaf40b6be1d896bd098b4ffdd367aff
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
index 5e646be8c07d..30ca06005aa0 100644
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/astunparse/Manifest b/dev-python/astunparse/Manifest
index 86d43a53a944..a15f8a8c0742 100644
--- a/dev-python/astunparse/Manifest
+++ b/dev-python/astunparse/Manifest
@@ -1,5 +1,5 @@
 AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 AUX astunparse-1.6.3-py39.patch 2466 BLAKE2B 8779b2a98e801f675f67e2f57b283401aa577f76bfc9633c0f17af9ee9c11f1508c3b23f4bba12040012e9796f887bb7253a40603f1777a1f8cb95c5cd080c4f SHA512 6bd1a46f48e96634f67ffbd49fce4a3e9251f030a1a4298455bbe92f09bdaf1d03ce807b9bd44b8e04218d80df72974570f2c4de00e617dc6557ce537fb2abcf
 DIST astunparse-1.6.3.tar.gz 18290 BLAKE2B d7e6fa3ba58c6e112eb84720832890f4515b1c4ed420587565cdff37da893c07eefd0b9eb00795a3eb08bf56834d65150298a6be65e524b0c267c38e6f9c20d1 SHA512 12e99b32524e551494d3053a57aeb646bca8a96a9aa17b0737e6dace6c11874e2e7633d82197cacc0b55622bea637030344ab45c8db57ef244bd63663799d2e9
-EBUILD astunparse-1.6.3.ebuild 669 BLAKE2B 5d2ecdc9def9fdb262e15164afca1238e0882fa547ede3e08d0316a5bb73188c87c57b48cc2d303a165c46024232a153dbe1728697f6cb895735fc3cd30b184e SHA512 b75273b091fb84171f3871ef621eb322bcde7ab7efcf34495394069699314b39781467918554811600df8c8bbd52473b04bb5b28cbb386cfb73ae81ac19769ac
+EBUILD astunparse-1.6.3.ebuild 667 BLAKE2B fed9add792390e5557437b0178081b3cf8d84135a67be1d1e28a20ef45dd82735c103811025652b83b0b375515eff71e254cc38c75a9973e2b046e8bae975dbd SHA512 b6c73cf423d092e5f6b76caf82a48dc83ccea05aedda63f9e899197e8acfdf4bb5c2418fa223ef0383914a21082c37f725d1a0e9995123f480232f8df881cac5
 MISC metadata.xml 422 BLAKE2B 763c15dd58eb4688772d6a7a2fa0ed133584ed20dc9c1582a8b17cf07c53a57dc235346d77467345347026f2ee472015eeb07d877f3c5270c80531a600a53a06 SHA512 1dc2b0a7712a848f3a611af5bde383b3a60bb5d03f220867b690cb921fecc6fa5e892a61a1b53c788e41e4242f0513a023d64eb2e3effefc32daf9c7a33b7686
diff --git a/dev-python/astunparse/astunparse-1.6.3.ebuild b/dev-python/astunparse/astunparse-1.6.3.ebuild
index 0339e4a52d90..e8dd6a0f9b79 100644
--- a/dev-python/astunparse/astunparse-1.6.3.ebuild
+++ b/dev-python/astunparse/astunparse-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index c564045b33fe..20e9d615d9c7 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 744 BLAKE2B f857b7930751ac7aeca55215a871cc25bdec8a7dccd85de558fe40e32e980b2c39050158e8bf8a39538e13e62d59f93b19a471fcb3b308310be311056d57a95e SHA512 7ca3d1d6ff22dd9fe0d53941b962ab079e8f1aea015ae5a2656cf10aaa2fd523b5d1edf03a34e03eb31ec741ce01d3765b0cf630e7b1b671309f1576531b11ae
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 750 BLAKE2B e24e432dba1d3254f338d45bbce0eb6d106675b3a5e00a54965067aa4df49c1c44107b468efd2021778cce828f4e08823f503c1b10f656586638c5116c2635a7 SHA512 be61a61bc5b187118bd9aae390d67e7585335146346a7ad917b38b0ecebac2e76af27c337e9a5ba1f06b07816d61b1d57a7e19b2ca0f793dd8fbb5c0cfa6a7d7
 MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index 8911b4a6fa0c..a2e941fbf6e6 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index 78907249e9c3..d98a4f643842 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,5 @@
 DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
+DIST bashate-2.0.0.tar.gz 29579 BLAKE2B 35cd827a9b5846d0319e6de8fc4bdffbace6b0f669e496aaffa12c44349cc5947a14baecf3b21c3bc4f424796f12b38e273f273f4862949bbae11dfc4b787464 SHA512 f6bacddcad1077d034df0de4313b13aa24ba4c60baa456912d1f40511830a58ca118a72193d4cac358963870e097bee4b0e2ae5a7f7aec42f0ba1663180eb401
 EBUILD bashate-0.6.0.ebuild 687 BLAKE2B 75232f40208f77702288a4446f71ef861e13d0cdf7ebbcdf875a979eaa6ecea39f0f803bd24eff961e14503030bb95029fd821d47bb6ebc8cdf0f9e865261289 SHA512 148d86f3328788b5eaa1f9bce5f7575b9a495cf14dfc6ebeda67f82af2ce3d9a585e343d458440814350185c99a8459fb7fe996690a2a7ff0f7e5122bf856182
-MISC metadata.xml 431 BLAKE2B 5584ee417afcf244975299d7ee769137b41956f60aa7b273d593aad8b9e1a05d0624d820870648a56da0ee816366a03b59e31ab27113cda02ddc084237c850c1 SHA512 1b7b1ac3b3de9dc163ea84df81645beb10790b3b192baa16b49fd977d9cc1c37794cbdc846d995c54fa1eaa9d04ec02149acfad07011bd273dc6693652c77860
+EBUILD bashate-2.0.0.ebuild 640 BLAKE2B 7bc8faa88127536c4de91094474cd2af6dd2afee30bcae758f4fdb95ab50c3624053fe56d3cc1918e4d0664d82db1599529fdf996e7d06de7057c773446b6ec8 SHA512 1e42a9824eeac074eaca2f9f693ec46057ac9a086ee08f3c578bf12d2613e369700fde10f4bcf2c6cba2fa6c568476fd699e040c02e3cbc333d9e6e62443cd27
+MISC metadata.xml 532 BLAKE2B 64f75a70a9ea98ba69589deff0b3bd704d60aaaee33c74d7868f9ba5b5683aa9be7c0fd43c1a794e6c3d9833f7dfd041203da2508b9cfd4d199ad2b61b7cd51a SHA512 726c60d1467e810c1dd95afdf018bef0770dcab865634734bc82c8575efb3cd934a2d0088471f64e3207f90e6f049a359b163fb16def13b06df1a7827dbd8466
diff --git a/dev-python/bashate/bashate-2.0.0.ebuild b/dev-python/bashate/bashate-2.0.0.ebuild
new file mode 100644
index 000000000000..a15011c0549f
--- /dev/null
+++ b/dev-python/bashate/bashate-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pep8 equivalent for bash scripts"
+HOMEPAGE="https://pypi.org/project/bashate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/bashate/metadata.xml b/dev-python/bashate/metadata.xml
index c720d6562fe6..5f8b7c035d7c 100644
--- a/dev-python/bashate/metadata.xml
+++ b/dev-python/bashate/metadata.xml
@@ -9,6 +9,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">bashate</remote-id>
 	</upstream>
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index fe749cb77699..3134b8dc67dc 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,5 +1,3 @@
-DIST beniget-0.3.0.gh.tar.gz 16001 BLAKE2B 2a14acf8affb6066bfbf337d547c0eb2215d9d38aa5ed14300f6bd0699409f27619d468cb8cc44f510e38a4abda0e3705be2445c0809c74125f17e860cb5e97c SHA512 c86421470c31a703c2f488826493737100d86c509c8e99d32d7244af8151962eeaebe0f3ff92cca90222bbbad6a045ddcda3d5efb449eb2e06783971a9c474ae
 DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
-EBUILD beniget-0.3.0.ebuild 554 BLAKE2B 686c69e875f191a0aeae0914754a4d71938f93988c146609d2b0f41a3fe87a191a7319efbda7ee97b90ef5a248fdd5ccf7c69cd1694d55ef966e05b7dab067c0 SHA512 107e52d46a6cd8ab9c60f4748f24fedf55ca9d57665728d897330c68c1996056f6e70066c6680b70718a33ede00c8831da7e2f29b34ef8642e669c3bb29b6149
 EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
 MISC metadata.xml 353 BLAKE2B 045be9e1628640f0c33d984d45107f67bdc692ab5e9648a7a333e5d933f163c4738fe88c13887254ce6cb87f2cfed401477c9b8727c2264ddf6bbcf99eaf4939 SHA512 40571beac3e14d1455717533e9be0db570f24720ca733fd7b51e93dd3a0d12dc366e361a659167556ac4e447280b808c09ff021efa2f36d6deb15e3434b7c67f
diff --git a/dev-python/beniget/beniget-0.3.0.ebuild b/dev-python/beniget/beniget-0.3.0.ebuild
deleted file mode 100644
index a1ba9d3ed739..000000000000
--- a/dev-python/beniget/beniget-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Extract semantic information about static Python code"
-HOMEPAGE="
-	https://pypi.org/project/beniget/
-	https://github.com/serge-sans-paille/beniget/"
-SRC_URI="
-	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=dev-python/gast-0.4*[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 7105916f908f..ca8910cf8b7f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,6 +3,6 @@ DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330
 DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
-EBUILD black-21.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
-EBUILD black-21.7_beta0.ebuild 1355 BLAKE2B 59f4a7e0a2648d29e4fbec70b5667b74f3e9d07d790cdfbcef7c4c6a8e9d014fe82f313b3d0af95e94a581738ea6d14594805c5b07d34e8ce811be846be25a21 SHA512 20cfcca1dd98c1cf798ed96226197499e60027593a68395f4696b085d80f250c9e2caa378d467fc2e2fa7bf990b41f24707e58e9db2d6ce2e06e603604434c45
+EBUILD black-21.6_beta0.ebuild 1567 BLAKE2B b9ebf689ad0d2cf8a38fa296977ac10afe2626d90cf0cc0a0ceb8b26364a514d1536b34d21983984363af17262e4adfa6fb1d59721dc6a901cc65c7daf6971c5 SHA512 228058c935b77d23dd2dd26d42d3aef199e492255f39898dc57093b7ff81ad45d83020b7d981eb97811a29c3ba826a826858296894c2bcbedfd5c9202055983d
+EBUILD black-21.7_beta0.ebuild 1411 BLAKE2B a19e601c5157e0507bce9734bc6c026fc0c53f7f1e19af177c2863991b52a3dce93b6bf42879f224c5d23ddf3acb3f38bc1e4ff7d0377ba38af32a358cf623cf SHA512 2caf50f452b84c2e53609e0aa92365f2a35b4ae0eeab7a928657f5d0ef4fa6b07ee2c64393270ff00b2940cee805b3c65f16e1cb7cdc9c67e8501adc9198cac7
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
index 0675c52604d4..43103259dffc 100644
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ b/dev-python/black/black-21.6_beta0.ebuild
@@ -46,6 +46,7 @@ export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
 
 python_test() {
 	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
+	distutils_install_for_testing
 	epytest -m "not python2"
 }
 
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index fba4e4cd454e..d104c045b58a 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
@@ -42,6 +42,7 @@ export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
 
 python_test() {
 	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
+	distutils_install_for_testing
 	epytest -m "not python2"
 }
 
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 1ecd7b4ea1b5..d36b225d35b2 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
-EBUILD blockdiag-2.0.1.ebuild 1635 BLAKE2B 69a62421f120e8741119059f8a63f57aa9bd5f71c1321714c0dde30cb7e201277c879199be2c36bb647eda0ccd6e62af39cb0579f3c50604f262af75a8aae8c4 SHA512 fd57bcc92d8e62831ba485bb0b03db068c090d570d67dc481b189d09f0f2ce62bdbb9a3da3649dab40d6bd5738868c442b06479ce99e410282da899e22176dde
+EBUILD blockdiag-2.0.1.ebuild 1642 BLAKE2B 9f3cd62f5fda1ce0e0fecf1367d8dea29883050fbbf6e60209e7a8b51629524cd1f62c53a42b05556bf8ceeaebf6e5675d5972128763e20e73956a9e058e0aa6 SHA512 db989b8e63819c67c7f4654f9f33d4e829eaded3694cc014b47c7267fdd104c403de5d719a89463e8bb72a89738b7d445f6dd57afbd29c3151c5b69acd56f996
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index 547414810550..d0799b0b795c 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 6d02ddff8d38..ada293f21a13 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,6 +1,4 @@
 AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
-DIST blosc-1.10.2.tar.gz 858096 BLAKE2B ff314011e1afc2d972c2445df9ad25c245494479201ddd0944ddf5f14aa0aa772c9da1e117eb5395f5488e7238aefe1236d9a5579b4d03be2b041790de9575e8 SHA512 82dab50a49ddd45d8276fd43999233f41b507e35af5897ed4945565fde8f56be0855b0dd926d254bd77904ec7a13ad3f024007159510b677769d97599b731222
 DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
-EBUILD blosc-1.10.2.ebuild 951 BLAKE2B 90e35b8ce48278641f70d79342b1b5d4b042e0d4553cd740e5b49783a06bc86e30da5df23b8bb22e27ef393c9c1c3886c8bf8359d449a45424332588ff23f7d8 SHA512 f168c9a55ba41e2c7a846b7e316126345fa43d907ff7ba4530a6148f7ee555d709385a4c12e26863d834f5c31af6dedc6508b1137624dcf7f057a6502a75000d
-EBUILD blosc-1.10.4.ebuild 953 BLAKE2B 204a11d673b94b9ccebde8c269d03a05aafe0601b1a48bdce4841393fd2c8e5ec778355f04936723add2e6299fe2a6d9de33de11d70020ab7baa76aa509ddf5a SHA512 3684f3f68878d470b1564350c9b85a5e66c292933a9640b5dd23eb541e1a70beafca8dfceded637005e31f36600b683cc7af9500da75c57d264d2852da810684
+EBUILD blosc-1.10.4.ebuild 952 BLAKE2B d40e3a595205b109e72ab4b710e5d973f6bc4a415fe979a528d3a9c80376dcc485a5524187595281d9201536f855feafc7e0b23c4e7e94619910d5ced54484dc SHA512 8cad13fc1d0c33181b11b6281197d3e348ee6afb0280e867a622b56617318a7492217a32a39d01d496607a00f1645a351f70c150cb0eba4d7d471ba5f14bbf33
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.10.2.ebuild b/dev-python/blosc/blosc-1.10.2.ebuild
deleted file mode 100644
index f4059392ee96..000000000000
--- a/dev-python/blosc/blosc-1.10.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-PATCHES=(
-	"${FILESDIR}"/blosc-1.10.0-unbundle.patch
-)
-
-python_prepare_all() {
-	export BLOSC_DIR="${EPREFIX}/usr"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index a6df49b09596..d0100a8b57ba 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index fce9b54c7575..469ac4807456 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,6 +7,8 @@ DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ad
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
 DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159434db8d492edb8d93f3d872757dde5adb358b89af80d9fb3f489fb424a4de6f8c62ac14220b22588bfb1ff0e SHA512 9292241055684dfdda22ec2243b0d64b00b3fa3ec73b3209db8eb8d90c14aa5aa2d7a77cdd0670350227ed6b923b9142842ed5bc8a4fecbaa4705a90af546022
 DIST boto3-1.18.6.tar.gz 394941 BLAKE2B c7ef6f85fea5a12c248afd03cbe5cca2475c32de0d5b90e8390837e4e1980390e07bc99b6dd1e1831c34135503fe5859e0a837e0aff88f7af2bd8ddcad804a1d SHA512 01cdc6e71b8cd04da7e6f2bf9268625824c12b53fc7322343ae635d5fdd6ed30170fb698d7c4a788b4095fbfc186ef72a11fb6f785a1006fe7861d2db6108da9
+DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
+DIST boto3-1.18.8.tar.gz 397295 BLAKE2B 34e4e9dbaf53d7e9917b26f62385a012663147bcebe3a3989f3e306ed1bad8fc90c47ecd0901e127ad024f67d6891e3eb2b2f59e179ca45fe88b5cca6968bbef SHA512 59ea0cb50058fde12f748b394b9ba7053755c642d6124343a6fe00d8c7918f123b508441006c5a9ebc6319d4318f7f95c481cca47d692349c4591958c38d53c7
 EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
 EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
@@ -16,5 +18,7 @@ EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f0
 EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.5.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.6.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.7.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.8.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.18.7.ebuild b/dev-python/boto3/boto3-1.18.7.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.8.ebuild b/dev-python/boto3/boto3-1.18.8.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f752a30ec67f..b4f657ef9c3d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,8 @@ DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbff
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
 DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc413bb3a2e36b2ca149f4edb0b8b750cba1149474351ab52a04e08018de81fab93607eb65e19b452a80a249cefb5871 SHA512 ad84b3f75883279452ba9922492e1a63b9f951ed54767feb573000d077335eb50685727ae1924d02f23d5342bcd8f96d2a56b06efedcded4b718e8ec68f6d636
 DIST botocore-1.21.6.tar.gz 7974218 BLAKE2B f3391b620a21d04712e1254c4e8ffc090956bc1e0a41278be2c0e02a659ada639af2cc4e94bf607492164a8425988c16e8b899726fe645871b1cf6d1f98ef04d SHA512 1a74f2450a1c57a61c704550c0f08fd518b8d4fc463acdd8622ca8bf7fa51293c52c54999e1a1d563815cb0fd35585072753d623739a6738367b0bae94f655b7
+DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
+DIST botocore-1.21.8.tar.gz 7996323 BLAKE2B a0c21ec64fd97f011d2e986806b0a47f5f5941f13b7a17fe84f4886a98e91629c641b9e39c2040105ebe4102d8a9c84ebaffbb6a0bf9ef8c48be80804863d441 SHA512 178914d04d1abfaed5fc7e5225e3da54706608d8075298e3b1d7ca4ef09fdef11ee4eb4b7e2f5eb60ab1527b2dcd0c46bbd6b987903be8959ea16e775ca9b548
 EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
@@ -17,5 +19,7 @@ EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a8
 EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.5.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.6.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.7.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.8.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.21.7.ebuild b/dev-python/botocore/botocore-1.21.7.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.8.ebuild b/dev-python/botocore/botocore-1.21.8.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
deleted file mode 100644
index e6c816b1cc68..000000000000
--- a/dev-python/brotlipy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX brotlipy-0.7.0-test-deadline.patch 913 BLAKE2B f7a57989defc3cbc6aa0f29d9db73d7aaf5abae22609b4d501699b4e5195f50fa8025feee64e7935584868d5100f3e088abcc2086056058464f3f4ad14a939e6 SHA512 c125622a149582b0e45397877f4f609ced2d9b388ed101a7a5c0bdbdbb849093538be5ba12e6d549c7a9fea1df3c74dc8dcc3d4bc894bb2ebae0117440b1d5af
-DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
-DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0-r3.ebuild 1570 BLAKE2B 181f09721a98ed75399a57f076bea0001761b4ab21962284b1e1035dc2c1a666a3bbc36a3cba8dc93f6fc3f4aa031a83a65aa23dd3e491cc0d874c491cbd52de SHA512 f90fae1c3da3d6a19546dededd95747c7622e3a282ca73e1b8db402000399abcfcd4f05d88c98b906fbea1700041d02a4bd0c1d579684cd104bbd61f783191d8
-MISC metadata.xml 372 BLAKE2B 3911434692e9e18810246101a8a365425be643f6895718f6faaf9463a99624ab898a5197127d904942cf8ad452e28052da420f05abd1d8c8368f8b7da2fa08d4 SHA512 daa1c91e60f79c74e425cbbda5a60297659ccbc91e7356efc32053d435e666f56347c02f7ebebbc2059ce3b91919d73c7d70295c1a2a255d8abcc2e197a90e79
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
deleted file mode 100644
index 9d1102eab848..000000000000
--- a/dev-python/brotlipy/brotlipy-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-# Commit of the Brotli library bundled within brotlipy.
-BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
-
-DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="https://github.com/python-hyper/brotlipy/ https://pypi.python.org/pypi/brotlipy"
-SRC_URI="
-	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz -> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# module name collision with app-arch/brotli
-RDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!app-arch/brotli[python]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/brotlipy-0.7.0-test-deadline.patch
-)
-
-src_prepare() {
-	# Inject the brotli lib.
-	rm -r "${WORKDIR}/${P}/libbrotli" || die "Could not remove the bundled brotli lib folder."
-	cp -r "${WORKDIR}/brotli-${BROTLI_BUNDLED_COMMIT}/" "${WORKDIR}/${P}/libbrotli" || die "Could not inject the brotli lib."
-
-	# Tests fail if we have this folder preserved within the lib.
-	rm -r "${WORKDIR}/${P}/libbrotli/python" || die "Could not remove 'python' subfolder."
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/brotlipy/files/brotlipy-0.7.0-test-deadline.patch b/dev-python/brotlipy/files/brotlipy-0.7.0-test-deadline.patch
deleted file mode 100644
index 219243986dd9..000000000000
--- a/dev-python/brotlipy/files/brotlipy-0.7.0-test-deadline.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -dupr a/test/test_simple_compression.py b/test/test_simple_compression.py
---- a/test/test_simple_compression.py	2017-05-30 10:20:01.000000000 +0200
-+++ b/test/test_simple_compression.py	2019-11-22 11:37:31.248755016 +0100
-@@ -9,7 +9,7 @@ import brotli
- 
- import pytest
- 
--from hypothesis import given
-+from hypothesis import given, settings
- from hypothesis.strategies import binary, integers, sampled_from, one_of
- 
- 
-@@ -25,6 +25,7 @@ def test_roundtrip_compression_with_file
-     ) == uncompressed_data
- 
- 
-+@settings(deadline=None)
- @given(
-     chunk_size=integers(min_value=1, max_value=2**12),
-     mode=sampled_from(list(brotli.BrotliEncoderMode)),
-@@ -62,6 +63,7 @@ def test_streaming_compression(one_compr
-         assert decompressed == f.read()
- 
- 
-+@settings(deadline=None)
- @given(
-     chunk_size=integers(min_value=1, max_value=2**12),
-     mode=sampled_from(list(brotli.BrotliEncoderMode)),
diff --git a/dev-python/brotlipy/metadata.xml b/dev-python/brotlipy/metadata.xml
deleted file mode 100644
index 56e99b52ee7f..000000000000
--- a/dev-python/brotlipy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">brotlipy</remote-id>
-		<remote-id type="github">python-hyper/brotlipy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/chainmap/Manifest b/dev-python/chainmap/Manifest
deleted file mode 100644
index c89fdbbcfd5c..000000000000
--- a/dev-python/chainmap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chainmap-1.0.3.tar.gz 6325 BLAKE2B 108f4b728e5377272923e6d6c554b205429ed3534f0ed5fcbeb60746837cda64d124d415ba3da83cca23249e69795d3bec3c46fa91966d0cd2a5d220b5e1dd28 SHA512 0079f7e725d67a89402b00290bd9dfe5232c91050e68809c6fa76ce6697279ca6962a92f80a841341006d05d9a36fef639fe1e967631e21275aad03c1d871bad
-EBUILD chainmap-1.0.3.ebuild 406 BLAKE2B 9dc2fe58bfc97f84434246993a9e3fac8e6b0cde560a2558d541851514dfedd11936be592c1cab830b732385b9d0f155433853cda788ff6a43777cd34c7e5507 SHA512 881fec038c5640550ad7ce7ea87b0ef6c49db6a5f593b06608726e003045555f35f049f18fe6a322d54d9015de5e425f40c9cabb31fe8e57d788dfb3ed0485cc
-MISC metadata.xml 319 BLAKE2B abcccd81c84a99250d6857f1e9ef4fb9dcd3fa30fb389ca980928984177da3ff5889687b9060f7227c7f14082f793f2e1d7148426f07f0b937f37935aa9c2b6b SHA512 7c6d4b6254e367e9fc2f9443ad234f57305a27a762d0696e3947c1e90b4c73932d0f81cf7046cd1460848b5671b38975fc00d8297c937f35d01172cc720a35a7
diff --git a/dev-python/chainmap/chainmap-1.0.3.ebuild b/dev-python/chainmap/chainmap-1.0.3.ebuild
deleted file mode 100644
index f09b01717ba0..000000000000
--- a/dev-python/chainmap/chainmap-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="ChainMap implementation for older Python versions"
-HOMEPAGE="https://pypi.org/project/chainmap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-python/chainmap/metadata.xml b/dev-python/chainmap/metadata.xml
deleted file mode 100644
index bd0850df10bb..000000000000
--- a/dev-python/chainmap/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">chainmap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index f0cde8b0697f..e35390cd6ee8 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 614 BLAKE2B 694cff47328641825580cd7dfa6ac8934f6e72d6eef3d8994aad9e7f4f735f7342f105226a4b98a69c48b26bd9dc01a7fe0738c8c149b08b74247b6357eab539 SHA512 624856021a4a80fa18e50944d1487cc25793fff104019243dc986bed71eb1c16b25eb7cfbb0f3de1d4a1754cd2ddb79eb6454bcad40bfea5fa4d7b009ac5b1ec
+EBUILD charset_normalizer-2.0.3.ebuild 634 BLAKE2B 3f6739ea98b87f7e0eee01071cfce5d3d767bd046e77e73738ac18d575b3179adc943807e413158a20b78f0671ff6b8a93be53cc6a5cefa6d0b271f0e2280124 SHA512 144d7391f6262631b6088cfeb2e04a23ab4200e6124bc7e02d45ba3379ced65ea31b113d735a27a35a566596fb62eb7031b186095b24c8c5490a1caca6e3f084
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index 63c87dc14827..e1fa87993f46 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 9fdcbe04eda1..ffb496a1a564 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,3 +1,3 @@
 DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
-EBUILD cheetah3-3.2.6.ebuild 1109 BLAKE2B 7ec6c6985393a31223739d82ce3b83e9fe0bf9feef5ac720a455771c1bebb0138ad3bb3989067cf1ea091fc43e3808b5d0b72d125e6bcbcc61fba778b1e4bfeb SHA512 4b3f091e789de35324d9b9c531ab2bb88406a96e4fad2329d70b190eb96559c8f33d38369c98dcace5eeb881e890549f0284036714bc89e8bbb99860e00237a0
+EBUILD cheetah3-3.2.6.ebuild 1116 BLAKE2B 39fcd02539cf2a09afd27e91276481bcbe6fea3fa8a31b7b9189e37d195e57797d84ebaff1231a3d8495f54b8649f68c21f538a46824ded381cdee727c934694 SHA512 75794dec4df190a31c2ee9019b66bcd6c9cbbef165e444929b6191edfc0eaa5904c4c9a1f28c9355a5d603add708faa6e5db1c7c5cba499590029363571bbc21
 MISC metadata.xml 662 BLAKE2B 3dfe6898c1c2b60050da8427fd4e51a07ba7870120ce491166b9fd222bbaa49e7df7ba3afafe8b159a7b60f781da67dc0dfdf03f085e813cb3f6d59169ecc526 SHA512 b15fac64b057cc9216aaa21002332ec348e89a618ba4c32dd8b9622afd17d7d8db6ef6c3e7c645ad0a03b306c50b79322f5ad1866db93f1033e69b1c7d6130a1
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index b95666a053ee..750ee0a37321 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
 SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 325160741a05..3dcf43a7020e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,5 +1,5 @@
 AUX cryptography-3.4.7-py310.patch 8611 BLAKE2B 6cabc8056658f6a0c895a75b287ebfaa3d25c4ba9f95e28bf63c34bb87ccccdb4b04e42c5d72fdb4d889560e1ca13c602755fa05b9bab3b1fe05788abe110964 SHA512 d1c89a6c50fd4032d6aedcf026592b52b1e38922ecc2a83e8defcee5b7b4845a66de45de897fd3c2022c6118591811b9fc25df7fdd33d219647e0923cd906a66
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-EBUILD cryptography-3.4.7-r1.ebuild 1930 BLAKE2B 7dd5447b2d3190bdd73c9debb4a35b5c6be7bf235b7e949c2a3998beff5381c07e40a7b75f981c53510b1b435b0fff5f1e823e6713a83ee9d932ffb946adbdbd SHA512 8ceb657fd2d8e9d5d6847aa4774b47e6d3beafef817e9cc5d8aaf5f0d06c7f87bdc2a63dcd68ed1718849c59bb714fbd8cdcf6df34c64375b0a320dbb8e6b829
+EBUILD cryptography-3.4.7-r2.ebuild 2080 BLAKE2B ab2d65326c4465b0bc20da266317f9fd6552fc3dac2b4249099cdc5671bd372e37267b1ffa53d7ac1bd1c425e965a3f203081280f5517a295556afc1b0c43b42 SHA512 fe4ee78741c32fbeb01bee53a4cc6cdfda9960568feac8f38d6e06952b3532fa7d5789e70a85895746e2cca840b365e4d7dc6ba5e52c4237f296cee95659eb9d
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-3.4.7-r1.ebuild b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
index 0bc251d53b55..57dc03c410a8 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r2.ebuild
@@ -48,6 +48,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# avoid automagic dependency on dev-libs/openssl[sslv3]
+	# https://bugs.gentoo.org/789450
+	export CPPFLAGS="${CPPFLAGS} -DOPENSSL_NO_SSL3_METHOD=1"
+
 	# work around availability macros not supported in GCC (yet)
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		local darwinok=0
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index d6deb083cf6a..303a59094a49 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0-r1.ebuild 688 BLAKE2B cc48cbdafdc5715645e26cd256a7b910ee695c90a750d8ad98e64778185a3e8943465691c6aaad1e12b1ef3dc08a1ffcaf0daefa16541483abf3ce3aeee97eee SHA512 05fd6bff9348c32d2d0875662a1ac20e59ed855becdc7d43945426393c47cc2b4bd1cff753f4385b94cefad31c384955c31f389b96a6cfdbbf3f657a8b28962e
+EBUILD cssselect-1.1.0-r1.ebuild 695 BLAKE2B 97b8f89ca6e21371ad46e998786f26379fe6df1adc918dd432ce8176a1b7acd3cdb245ff4cb475d029cffd5ca185035579d6824cb60ce24bcd663d600f1dfe25 SHA512 5e0e3ff06ac1c6c9b7c1a183bfe4c06f2f08d0794ca4fcb061727ff2a858e2a4aeded3134f836afed14ce9af2cebcc1590c7c384e7f398a2b29343d274da970c
 MISC metadata.xml 392 BLAKE2B 303b60a36eb7f9c18b3f6a9a7fc164ce8e0896165200bd418718a47d77e8a9d970ce0eb274702b7bf24cc3bdd0b385036bcd5d01cf40fb724587369001223693 SHA512 03d9bc1936c4b6567027916468d2e12f29be783763d1a19719de78e59a142e247d51844b4ae9d12aa533b195473b2057ce6d5e08ef9d548358fadc7f4eaf558c
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index 12fd4132064e..78465a2f7da1 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
deleted file mode 100644
index 8b99d13a0dfe..000000000000
--- a/dev-python/csv23/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2-r1.ebuild 757 BLAKE2B 449f949f5c422a33fb0d4d7fdc232ff8475bb447ba55c256a5c1d3c2d9d7ab686882462686ac6fc3233716ca1d0078f6865a40edf8cdbabcb9676144a41d60a8 SHA512 6af03c6249b9c16e29162339dbabc4e13080c60c77248ad8127ac76fd56807576a16e0ad7f124bb9c8d49fb65182b74e164cb63cfd47dac272b2ae8db16d52ed
-MISC metadata.xml 361 BLAKE2B 43f9dc14af4978ea8f825d16fc06ba82b5ad1c33ea279ed6be0bde9fe9d66f0c5705e5a35498de60c525ce5db2653406ede42fe164be618aa119158f65feab68 SHA512 921364097f1d8c20e7ed174304bd4736bd3137edfecc77258ee77a84298b2d005bf070b8900ae1671e291c3b064e45937865c581f9a192bf7fe9c0c3f77c361b
diff --git a/dev-python/csv23/csv23-0.3.2-r1.ebuild b/dev-python/csv23/csv23-0.3.2-r1.ebuild
deleted file mode 100644
index 93f75ac5187a..000000000000
--- a/dev-python/csv23/csv23-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python 2/3 unicode CSV compatibility layer"
-HOMEPAGE="
-	https://pypi.org/project/csv23/
-	https://github.com/xflr6/csv23/"
-SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.6[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/csv23/metadata.xml b/dev-python/csv23/metadata.xml
deleted file mode 100644
index b49d8f544761..000000000000
--- a/dev-python/csv23/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">csv23</remote-id>
-		<remote-id type="github">xflr6/csv23</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index fe5eab25dcb1..0925b4effc26 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 621 BLAKE2B 6e0dcb47e054d6ab8084cc89d717c0d6217c0c9a62f3ff8c85b049607b774381422cb9b49d327840b4b904b67de302dac923c20a903518d930a7e3eb30389b17 SHA512 be5bff96421ecfd853ad223d6062ad0e568c9b128b36ff9c09b47e69c1f926e98ea598a1cf63f0ae7b00212b7f273511d04a97cffaebf7d4fb64dfe4e7501655
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 628 BLAKE2B b98ab43e36fe4ba5e5859f35a30210a05659d9a00a880892c96520fd6d9027be6b139398ec7c52fca4cbf6a1265e7579c9ad100a30c8f12a91ae3ce04b3d44a3 SHA512 6eb5feda97615b134551a3191a4c31c7a2df633f93563bdf572fa3543ea6d2a7ccb34447cd95c4831c43e3e10c0367e94ef75914f889c2c5747ab564d82854b7
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index c38bc5b3d747..7b917c4f775f 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 419f607579af..f5be335d711b 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,5 +1,3 @@
-DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
 DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
-EBUILD dbusmock-0.23.0.ebuild 884 BLAKE2B bd4705a564681c26f4a7df8e7c7a1ea5c81d2ba34cd9076668b6ef0bcaceb1d8f1d275845a1ef41edd2f87c59b7aa3a4eafabcdba628690c969aaf592d1216c6 SHA512 dd458558957c6a95d08462e85bc54b14ccb865bcb872f282208dd8b8233bdd43ffaceea4d6fc92ca614e12a8d9601b36d831b1685e0af1a2ca237eb047969ead
 EBUILD dbusmock-0.23.1.ebuild 885 BLAKE2B a0c5098a9bccda4c78106f33681f86bc06671207e919a0f2ae1ae551ff5a01dde2121f5589f545089583122a38a0418288e60de75ec97f01ada9863a004ac04a SHA512 ec398412aafc00980d35e27c84d0b34071eaa69bc2b2eaa3a7e918bdfe65d94cbd06d6b89a7a503aefc0fe6e41db839d82d4312729e6f998cef57a6e0e2a0db4
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.0.ebuild b/dev-python/dbusmock/dbusmock-0.23.0.ebuild
deleted file mode 100644
index 0697b483e45a..000000000000
--- a/dev-python/dbusmock/dbusmock-0.23.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index a9eb31f68029..66562373615f 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
-EBUILD ddt-1.4.2.ebuild 611 BLAKE2B e623dd2ee805fc0dc102fdfca2c6703a439abd542456f33f973d4f380782f7b7c9d7e9bf36e92e916ed4db808ab62c854989b21c9f8420d822f9e1c3ebfbe902 SHA512 2e9fcfe8a99cbb4c76669f46d35608bf213d5c713f6735eee06258558c9720dfd012774700ddfa2c19d6e8619fbe48f5aafe7dc888ba088e9e326e2cbf74fb92
+EBUILD ddt-1.4.2.ebuild 618 BLAKE2B 47ca51b717dd8c89649e2cd2690b47c0cbdd84b5fd80a546b7c7556221124848babe28b17b1c9a39d09a372dbaa7cf16691e750e7771d802003791cdebd2a4bd SHA512 4cf0f70673a9b2031b449ca6cd5b6ef0eaaff30016b01135afea79fad79f72b2433c07a7f3ed86f72c5510d45aff958a84e7b9f9742d6eac3ca88be7c296e74f
 MISC metadata.xml 636 BLAKE2B 073d2c7d879b92927f8fa037b79eb9a947b3acc9decd241e8c1ba50352af45f27480c02061d264ae3eb5187061b2f2df1465ec6540590edeb871d29eacfbb7e2 SHA512 9dc659009767cafa7509e00533ffa037fad5152cc2e35b1631e764d0120e9dac532718859dec4fe6368fb6f44adaee307eb264820ec8d2e8d8cf515e7dc4e563
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index 4ea7853d2886..faf576c90bf0 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index dd7dee6604db..b3ec8897ad2d 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,5 +1,5 @@
 DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
 DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
-EBUILD dictdiffer-0.8.1.ebuild 1022 BLAKE2B 0c7acf3350dcebf73b7a79393f48cde94784a996a1d79431589308fc309f52d62d20153e4b1722b0a45983cdeda91f20cdc470b0884ac636b07e3102787a82c7 SHA512 53fcbba5ce9807030b85c3dfcede681c6da5623516031b0b118e7aaa9e77c16adb2deb8eb6ae6f280ce5d2d2b22867fac7ce8ab51cb419ad09c972e9a002bcb8
-EBUILD dictdiffer-0.9.0.ebuild 937 BLAKE2B 83616c1c9a1d17648e0f9a052db24a65d9d7fb6992653f23cd2ec256ed77e3e6101f5eae930f48c7cf561240e8ca67925d65d4c6597500e38532319219bfab95 SHA512 05d938a4a2270eb81d4344fa29737eaca826bb6932bfb86dc3758ffc7fbd2f6901229697af1f5ff985b85fc31071269bfeb44254d369ec25b2415e9bfbc75e63
+EBUILD dictdiffer-0.8.1.ebuild 1021 BLAKE2B 68aba39c47c34c031b95964e6afef21d7b42edf3fadd90e101d7a81f1e2add9d342b2f9efd6431231f9a262b96be416137daba5c82c90afcdbd6dfdd4356b468 SHA512 8d0915941c0ee5f47df5e51c21a4696c9a3ec56aa8b192bac4733b8761c9162b1ac76f29738676e5b819cac3c7ffae14f9ccafbdab242e694491c7bddf7a46d8
+EBUILD dictdiffer-0.9.0.ebuild 942 BLAKE2B e0f8d852b8acdf8cbd176bb5df812861d7d2316d0bdc3e0ec9ac82077baedba97ee5e63371119ebdc8382f7608184ff9c2137f90238554a8db6c67929e88296c SHA512 2aa6000b94ca6a4b212ae55c6d24a5eed88323f92a8d12a17f6020213196e572b0f8a7dc7d5536c28cc16e027e626dc33633ff8aa2de72eadf9b0b7c68502a8d
 MISC metadata.xml 523 BLAKE2B bf1e9589b48905feb3403b44d6b3f71e1bbf47c881d4fa095d29a3f63f08942eada116427be49ca4504703156e938136881556a4a082cace3e3371edfd35b361 SHA512 e3e91226e18302414a97ceb9160a36ab0f4e3b1dc8537936e0fcd31371e1d6ae75a4a471ff97cae3366af4b92596a25fde266f9233304052c61efb945044d292
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
index 2fc1f2cd5cd6..21a62b24858b 100644
--- a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
index 7cee88a5c46d..65199cc8aed6 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 2fb6c9443336..033b2de479f4 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,3 +1,3 @@
 DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
-EBUILD diskcache-5.2.1-r1.ebuild 1034 BLAKE2B 374b3d494128eb614485c829deaae37b23988c3cf0ff95bcb14893f1d5986deb3448f8d50db2ea0c36ff77307e78e6bd4f8f7d8e486f6be9c5f818a88cecb43e SHA512 23e086e7ab304b153b7b1c3150766818140812f4ac22104018a14ec610ca63446c5f59f00d5d85ec8f809f9abed365dd6c8989510f8fad87567d8a648d046db5
+EBUILD diskcache-5.2.1-r1.ebuild 1041 BLAKE2B 40d05aa9af519fc68cb098eb2d78cab92473255de873253b011a458d55ea61e66c39b6c5702cee04cbfa7b0b86867ea896b6b521693e098c66309808b6136e06 SHA512 daa5dc9bc95e1e9017e6e7eab590951435bb6d4a4e96a2159b6fcdfc389da97d9a1bba300464074e4e68b704045a88183904dca7b64ef9a0b3372a9e547058be
 MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index c83b15546c6f..0e742087ba6d 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 5b96917ff350..7112d687502b 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,6 +1,6 @@
 AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a0752f59ca3f30aaa26ef677d3a041f04b23ac0c244fdbca7661c5bbaf44cd30258410f92ab48330a236d92d78f668 SHA512 9e121f33ed148923a6aec919a8aac1f68e84a007f0ddc7daa550275681b1ecf5a47aca82bbbb7e27ced93752d4e76f4614bb10e379fec482e8f6bd730a5dc2b6
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
-EBUILD dnspython-1.16.0-r2.ebuild 1341 BLAKE2B 96974c67109cf7b06cd9266886d12aafc4f2fd562d66de61b7e9eb7500dfea21cbea6d07ada8823eb71e3b916d82bccfe9264891c10153486f0aff48cf63434e SHA512 250253fd84576d2ee6b2d65166e6daec2322867d607336c663d56b474d6657a449718534b8e3916bb5367ddb3c3addbd7c0c2e510810091d43e0736894e4eece
+EBUILD dnspython-1.16.0-r2.ebuild 1348 BLAKE2B 07f30b43035336ca2913c4c93c917907f839361aad51e7dd159f4c8ec19f8c687a7a8606daa4432cb984f0606cc7acb648dea08d2df74c3b729ec1c29a14100e SHA512 35acb59597c4193fddfd64131aa40cb20356ab941e3878462cb0dd649ecae27d3e6f66843271cb65aa231170331c826deb681a88c708e1209e5b507c87778c38
 EBUILD dnspython-2.1.0.ebuild 970 BLAKE2B e1bc4aadafbb4514e8606f6ffa551d5e8a852f0c9229cd34d3f76baa014ebac3678f807b92b04de2a5f7816cf8306d75bfa80b3e7cae8b66b9706e9bf29a9fda SHA512 ecdc6674de2f6cb29ddd16a5aa23e74f3593d63ab47457f824ecb50eab7ba68f330715788d1529be4c29977f6fedda0f7b19f2a91424eaf6adad6d2b1435f10c
 MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/dnspython-1.16.0-r2.ebuild b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
index 82f4762eb6f5..16a44dd5782d 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 7172ad3f65f0..02da9ac56060 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 EBUILD dulwich-0.20.21.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.23.ebuild 1591 BLAKE2B 8a24894a4b5a92580fb55eb8edd9940e579aed2b302117276380dcd06ce990743dd56657fbf46c2135205d0a2382b05b0e25982833378d7e28098158200ae36f SHA512 071970ec97321871868c1189b727bb03a88b34699e4b3fe477a301770d930d822da52724cdec24093c182ad7dde35002c072bf99931928f8f7ddd0eaaaa2b73f
+EBUILD dulwich-0.20.23.ebuild 1589 BLAKE2B 5e36e2b66e89ff3944862432a6bd08d07f630eeb790cd282bc758d3d3071998d4c81d84890e90d8fb609c8b76aa6fe14e944ed58258765b0590e415fce8017e1 SHA512 eed9337dbddef429caa19c0fa6acf02983adbca2d42371cbf961d8fc294b07e50d99942839c0473feb2bca10052b1af058fbc8b8d235dc1b609c13f26632107b
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index 076237a6c33a..0e8096b83c54 100644
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 377e2c21af68..63058d19267b 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
-EBUILD ecdsa-0.17.0.ebuild 771 BLAKE2B e2708decf97044e799eade890a1b947521cd2c2d3cfcee9896ba47c9ae5c2211e2e961e17ca88dc469bd624fe97a59e0b55c0fdeb9b885d4645d5f079a20da0e SHA512 135442dcc2f55dcb1a58158b163d8faebe32317a8d8f9ec42cd874eb062a751889a3777ffb2b90ae0054b385b99962d633c9b980bfe857f2e4376d23eddeb16d
+EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 0eb720629e5ead98e38863b4809476e78d420fdd047a20cfa76db9f22b5bd3a1cb46f7b5dc442976442e54990b0e83f38e8bcae8d0ebfc3a77f81cc072a87009 SHA512 5e1786dd9ceae6aa8ac90327a25edfb6d9d8e464a886635608029628a8703b985dc46b9a6eaa1305437ff0cb8375ef3b4d25592c0272f55e42c0f5bf16ab5cb8
 MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
index 652c0dd68150..783d0153a948 100644
--- a/dev-python/ecdsa/ecdsa-0.17.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index f797b90ad9d7..08d1573976be 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,3 @@
 DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfead11ed486f4f3c2a070eaa77addad300ee8398d6fe6d5ee0e517a25617dccd49500bd9e0abc3f9bad8216026c114686 SHA512 72b4ead49bb0c4f0e0c4ff47cab12f645af456e9100f270b72582b68239dd2536b1b641b38693f4f3635fc977e4ffa059c249e097e8842a1325333c4a6e864f9
-EBUILD fasteners-0.16.3.ebuild 734 BLAKE2B babd0a48a14a94ff07ac9cde7a9bb7f19e21a0cb92d47eda29889d9870295d95b3cb38925b1264b246e55706dd798a51c059ca3894e83bef9f9731fa310e295e SHA512 3ce341b2ead3170f1a3f2ed313c6ea36bdfb5dcea09a2f4abac8963e6574d82218d6b831c75ee3dcc3d9cf9d92e907e07ed9ae9b344eeb60755de8508de2cb98
+EBUILD fasteners-0.16.3.ebuild 741 BLAKE2B f53d671d0cb5a2ae8db27bb922fbcc25acfb720f29c43e8a54ba7269b8011be0a453fd98a289be07e069164d2b879895737530cd1e99dbb3d56e44153bee8505 SHA512 8c4e4cecb287fd1dc66a8dc1bb7941118bb844811c5e18c0fea6b37e3d6c37f39d061b4d033d906cf264191f02cd81b27513927421dc3ca0f057bcfa4a1fd63b
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index 65386ec95da6..52fe71e7509c 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 3bde73435870..08fab75c8538 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,18 +1,6 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
-DIST feedparser-6.0.3.tar.gz 251556 BLAKE2B e0aec37a3bf70be26791c6717dd015e128a8a1e4dc8be77371deb4b02e4dac7316366e1a36333e92ae1fbf10096bcba6aa61e06fcbb58c7cc6a00d401939fa7d SHA512 f8de4ed660cde3bce1b289a3f2eb49222a55bd3512a1a16b1805f7d19461c0aac3d9603d66c68af94b71557adcb1cc080cea996700950cee81b644c2fefe0c54
-DIST feedparser-6.0.4.tar.gz 251880 BLAKE2B 22a94bce43b4ff8ad9aa95d07c71568d7d6e1d8732ce84880f1565d48673706a3eea1c9bbf2dbe42e6384a737170c409cddccfcbfb46f92140d9262b16573071 SHA512 33b6e2cda5a6fe5bc1b51f26ec256e86e81c7cab050027592cc47173389554a7ebf9ed82454690dad534256bac5f907ca0f32871b2741d1d5318ff94e8e66558
-DIST feedparser-6.0.5.tar.gz 252003 BLAKE2B 91f1a5cd8f1d7124ebfc4c6ce31be81d2251a3769a2ec491325236ecc6506d73658fa7f4825a82e41d4c190017a66a41b6a93f19b37f0062d2abcca76d6791bf SHA512 6b91c8cd84ac7de9a632ae23c3bcd543ecc4dbbeeefac370c62af0fc83057a108b26a84e2199ae900300a09e89a117c475776276231d7cd27d20a10b16814958
-DIST feedparser-6.0.6.tar.gz 252114 BLAKE2B 47a22799c76832d8c21959a43514f4e81b427a1d54d4cfd6e95bcb3cd23a8b50611f640107d9078b3bf8f4d3b254b8c8863fafe56b6a53d02cffb6d7cd7c1a3f SHA512 e94b0f8e1be2b70db897297fb456df3d5e86a1e952fd4278f9370fc94e3a13930ddbeb866a525b9344e9cd2e4d768a7bda7b1368354e68d16eff133319a8bca9
-DIST feedparser-6.0.7.tar.gz 252432 BLAKE2B 7eba914b073a241d79c73a1a3a0308d035fae9eaa26a3eb54714272d534b5c965db97676e32ce59bf748dfb3ccbf31d1044b75006b87df0e0b6fc2f7a6f5fc6d SHA512 ae0f871dac2f7096e265f6931fe275ecc22eae091a6855fb5d1b78c9a5de9a16cff05742ddf05277068d6b4e4908b2350bb8784855be4c136c9b37835c19efa2
 DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
 EBUILD feedparser-5.2.1-r1.ebuild 1133 BLAKE2B de711d5a8a89583536f614de0a692c4f65bd0592bfc8ebc0556913c5104ef46c781a32fc8fd58efbebafaf44874279d180668242b4f2c74344bb137b566ebfaa SHA512 56e5dc52b253e94c5effcdbaa00915d5e0d993e39490e98f05e2eabfac93c32d48d815314acbb1255f80f408508f75dac68d173f56a73a78a1c70cb19ad19972
-EBUILD feedparser-6.0.2.ebuild 894 BLAKE2B aed5a4f23419c7435f4899907ea0c79b3541a2e369fe2177296b41e22a01093aa278b28ad290242bb7163866aa8370f6e2730c7243ae9c7bbcd3abb8f78da349 SHA512 86a5f6b27f93c71c9a9101ae438d8f1df293d12faaac8278c3fc9e09a9e847d2cdd4976777a6958d0d038b932a50d473d4878b434d29343082b899d5f00eba69
-EBUILD feedparser-6.0.3.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
-EBUILD feedparser-6.0.4.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
-EBUILD feedparser-6.0.5.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
-EBUILD feedparser-6.0.6.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
-EBUILD feedparser-6.0.7.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
-EBUILD feedparser-6.0.8.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
+EBUILD feedparser-6.0.8.ebuild 894 BLAKE2B 54f55e37aab56f5fc470d7e1a69c837631cafd9b26decfd87490960b394d92df63bd0162b8b5865cd8f6a226f88bbbbf195ed9b8aac0313b1547f30e57010a63 SHA512 f953cdd621792a97f3f9dcb16a5fa87c0568fa10fac7e3e3296e561946e927568ed4409b3ed2150023903af230d51ea6808ad5c8204a36749f04126f1b64050a
 MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-6.0.2.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
deleted file mode 100644
index 3eede0f31b71..000000000000
--- a/dev-python/feedparser/feedparser-6.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.3.ebuild b/dev-python/feedparser/feedparser-6.0.3.ebuild
deleted file mode 100644
index 2eb6ae0aca1b..000000000000
--- a/dev-python/feedparser/feedparser-6.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.4.ebuild b/dev-python/feedparser/feedparser-6.0.4.ebuild
deleted file mode 100644
index 2eb6ae0aca1b..000000000000
--- a/dev-python/feedparser/feedparser-6.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.5.ebuild b/dev-python/feedparser/feedparser-6.0.5.ebuild
deleted file mode 100644
index 2eb6ae0aca1b..000000000000
--- a/dev-python/feedparser/feedparser-6.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.6.ebuild b/dev-python/feedparser/feedparser-6.0.6.ebuild
deleted file mode 100644
index 20498a98346b..000000000000
--- a/dev-python/feedparser/feedparser-6.0.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.7.ebuild b/dev-python/feedparser/feedparser-6.0.7.ebuild
deleted file mode 100644
index 20498a98346b..000000000000
--- a/dev-python/feedparser/feedparser-6.0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die
-}
diff --git a/dev-python/feedparser/feedparser-6.0.8.ebuild b/dev-python/feedparser/feedparser-6.0.8.ebuild
index 20498a98346b..dceae5fe0cae 100644
--- a/dev-python/feedparser/feedparser-6.0.8.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.8.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 727138edb066..07c3ecf86a7a 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,7 +1,7 @@
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
 DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 EBUILD flask-1.1.4.ebuild 1330 BLAKE2B ae78a5a449bad145e9ae537f968bab105ce9f4c69a22ed881ea1dbc8cc7cba708da8724731c8009ee23a8c606fbeb32fed970a5237427d51aab13a91baf7bb28 SHA512 1885d47a974863080b2a3c5372fad49765958e2b17e7a70a01afddc7ed87866d9205259da4b2e3891d88594144ed13663a396844aa92e7f430489e2acbc68a42
-EBUILD flask-2.0.1-r1.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
+EBUILD flask-2.0.1-r1.ebuild 1222 BLAKE2B 5dc98bfddd15251889ca41761d37079dd7a12da64aecdc88749e7e88bee09353b1596eef94ca16baaf76b1a07fb64e7a33522e550a9fa54f359b656d7ab12b02 SHA512 4936b7ef10305903e827faed39c2e35d379d002a5d0ee103f80f09ffa1af9321537b16b6efaa9b51736d665130d51ca9a1a95bac150dc0c86b637c4e6a67b04d
 EBUILD flask-2.0.1.ebuild 1161 BLAKE2B 652196afb4a78a8ca1bebc957588150522e6360ce1d524137b449bd4b2123a811ce3e7b08c161f8d20c397d1d85c174d63437f5df0dd2a7f2327539229ef7446 SHA512 03e7fdc43bb1582d20c8620e9f86ebf07a9ce52d63a134751190b68dc17027371a22a17c9dc23bdd97b86871bf1e4843a0684b6e5125d1c505012083127234c8
 EBUILD flask-9999.ebuild 1217 BLAKE2B 57aa06a3fa33b0e8e5fd3e3054e7fba2e263524d2613207582e854643afd6b7c1ab3f41d73318012a9d77982a778cf90c6cdd13d0232447ef94fd2603f5f32e8 SHA512 3c050a9e65cc40a6556d5bace0ec403d043e8c5591814d47fa3c4284f4886d0eeb1c6f29ae0b9e25a001f2ab38f28fc20f34e3de67d2f74c9197b0b94d4a3f05
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-2.0.1-r1.ebuild b/dev-python/flask/flask-2.0.1-r1.ebuild
index feea1195fdd3..ad0a2c7da03d 100644
--- a/dev-python/flask/flask-2.0.1-r1.ebuild
+++ b/dev-python/flask/flask-2.0.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index bf44391c867e..963c3b6e6507 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.4.ebuild 482 BLAKE2B 03d6e64fc5fdc74468d12e0df9d9c1c062f72f5d05b846eae5eab09592abacc2c15aaf4d19bbbe73973abf0b0e374372be026fa86fbf20ffb7e8182e5bfdf967 SHA512 0ec3e119b67a5601b104a939d9450060ad22616b3a0c05eee95ca131c920dd5b0c5bab543093375fa9e288b46cbcac8eb3ab44edeb26ab928f613b16e516373d
+EBUILD flexmock-0.10.4.ebuild 489 BLAKE2B f22dc9131f02343a598a8b61546184bee128d54de48acd2de913f6ef48121438323a0c7c169ad9c8761628f44923147403761e46c59bc5f302c48ec32ddb1be9 SHA512 e389dd36a35931b8d2a7354b32ab3155e3475f92332aee2040576ade042cf9b30310292e0d0925e61cc647993ab857d3e4ad7ccc12198c080f95e11cf2f1a217
 MISC metadata.xml 657 BLAKE2B 065a19cc94f756b0702f9b52010d5ac63af8d3b8f67ea307a073f0ff6046143e2d2e4f4266df5324192e42c4ce823fff646188654207cd87277d854c986d2667 SHA512 c2cfa313f94d79e0cce3213f53449582e18edfdbdb244d9771aed0f4e610e2a7ab225b0d7d51483be9c1ac9763c376f051b45fffc1f83ca44bd06017c0b29a06
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index 7045a6d0ba79..5be99a9dfb3e 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 896e9cacd990..115c04cd14ab 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,9 @@
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
 DIST fonttools-4.25.1.tar.gz 2577170 BLAKE2B 8cb03ef1f9cf4e61d5e6d4963bb5c43ec48838e0453cc293de1c763a29b34d69701b87430d8a85085f06c26671e00a91c89e4c50ba8d2fad4a9cc72b1f17d0e9 SHA512 ca3732bcc5e2b373983d34bd72e0ea36488f24aa442d25d0d16f6a473ef35323547f900b1ae87c42e64c451afe4f760291095738a4442c11c5566c9efd0aa944
+DIST fonttools-4.25.2.tar.gz 2577630 BLAKE2B ba03dcc25672008722bb7f5ad4238e9216988f5ed1d545297937e771bf076ae516172cd90bd450ded04ca28fe158c83247bd6b6aaaf4687a5893c0980630210b SHA512 b5c94e76a09aeb92061cf792f53eccc0ab369c5458aeac103f865f6110b2764677ad7c63d1367fb027c891a11d7eb158469748ec495c3a7aa6b86029e7c95223
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
 EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.25.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.25.2.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.25.2.ebuild b/dev-python/fonttools/fonttools-4.25.2.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.25.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/frozendict/Manifest b/dev-python/frozendict/Manifest
deleted file mode 100644
index 9beaf418d88e..000000000000
--- a/dev-python/frozendict/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST frozendict-1.2.tar.gz 2650 BLAKE2B 8c2e10055d60a1fcec76be993c7fa1ba2b445a4880b1f7cc2e1a1be4010912da20bba2e7481fd861445d386814b3523993c9d73786b3f95d3f9e2444c44472ce SHA512 095cf5f6f8b02bf5666e04200431992bf4b3160aae3464d528bc256b1ab643e29dda78fe94d9e8c983dbfe66cd2459e0559122e17b6b8660c0552adc5318b3da
-EBUILD frozendict-1.2.ebuild 409 BLAKE2B 246d35855c789dcd01fc9006ef394953c1e27b5787f9a880a1b68bdd22cd147f1966f9c4d0f7559b15b7013c5d80e71683d1d9790055087a632bec052c4d4f7a SHA512 dc9b7c048455dc675a1b87b72a4db2019e05c5ebf8f5fc84718f6cda2d715b65d8180f839faddc12aeb7c5a58e69f42b4fc67e06f37e478dda261db016d4da51
-MISC metadata.xml 386 BLAKE2B bf0692d935ee3a4af0db6ae9ca33b6296fad5965358565ee92f52709037bb71ffe6c7520df571cdfec825f4ec4dc7432e7ae6ed23110d95eddf4db6f74d6d67e SHA512 a5f3a73547a012730a2342e9672f5227a44b00f260af7b96392ed4ca433d4e035f45a1bfbeff569a3c02f045965afbdf9e881e1276d86c58354b7d670711a16b
diff --git a/dev-python/frozendict/frozendict-1.2.ebuild b/dev-python/frozendict/frozendict-1.2.ebuild
deleted file mode 100644
index 7f149937f152..000000000000
--- a/dev-python/frozendict/frozendict-1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple immutable mapping for python"
-HOMEPAGE="https://github.com/slezica/python-frozendict"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND=""
-RDEPEND=""
diff --git a/dev-python/frozendict/metadata.xml b/dev-python/frozendict/metadata.xml
deleted file mode 100644
index 64bfc1f30e32..000000000000
--- a/dev-python/frozendict/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">frozendict</remote-id>
-		<remote-id type="github">slezica/python-frozendict</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 5550ceffb6df..e3a9f87a1243 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -3,6 +3,6 @@ DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d2
 DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
 DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
 EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
-EBUILD fsspec-2021.06.1.ebuild 1241 BLAKE2B 0a79be9a0a6e0b512c24e86753380d98b38d81c31aec99dd08e42abac5aeab4f95abbeaff38c0ae89507e7a677117d01aa36535cd2730f066120a8a3f3733a07 SHA512 9319a05c1b9dc4be33a51fd3ba43b91bcb21bf46048e06df630086ff3e4a413fc83f48b255c2081070606ac56d7e88928803b4dbbd4feb081d218cdb687ec5da
+EBUILD fsspec-2021.06.1.ebuild 1239 BLAKE2B 10d15d90196fa59f567185337c9d7330d981caff400180c0d0b40e01efe7896b80ddd0161d4460a8cda60d58d91e7407f560a176af89d54098f7733078c73b17 SHA512 b8c7232cb4b0937344908f13b4c5033b84cfc0c72f1c946bd5a34ba31389f41da9fe42cb321b85073ed7f89a7132472e64ff969efdb9a6610242b0b40b6292e8
 EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.06.1.ebuild b/dev-python/fsspec/fsspec-2021.06.1.ebuild
index 38f77d30991b..62cb55afaecf 100644
--- a/dev-python/fsspec/fsspec-2021.06.1.ebuild
+++ b/dev-python/fsspec/fsspec-2021.06.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 08abee8c81bf..ce235fb3b10a 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 649 BLAKE2B de7da6007108228f5eed786dcaac8111b724eb29573350d06ac65d497fbc743ca7da5ec25b56c01db2d969c447850f699247328563f5ec39f184f85e5b3f2409 SHA512 2dc250696c3c16f2d59ff9dab6d00274fd47d2fb3b5fbfbd2c81cf7996298c2bfa60080d93250e90c1aaf7260a8cf15ee63ad31516b7815325c4d20254e1a675
+EBUILD funcparserlib-0.3.6-r1.ebuild 656 BLAKE2B 131b4162943523660582c87739d5de76b30159914063946bc75bb4397c293f4290d0844bc51da4cfbafcaec45993b7f23497e1a8b498baa35a724d45655d1d96 SHA512 6567a69de71db5c4c1aa7ba0f5e616ce2cb8b8ab5d96dd73bb39aa8a3393f98dd7182527fb7e4f0ba7733f38cdf311605aeac93328abfd09e7ff25051ed272d6
 MISC metadata.xml 340 BLAKE2B 3887b5c0f79a5f63b5e1aceb5334847f6c38d9f6d1c21662c4c64375983c508cbccabd6bc34927ff4a6e4cbf0a19401713e60fdf4b24ea4f5568cd428bc2af04 SHA512 e595ca8451bdf62cbaf5022886865b8079ea2cc8ed850cde96ee7dccee2edde3b4f27058c419ee67f63ad130ecac18df663c802f6a72a46002aecdefcf23bbf7
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 1f1f660a98e5..9b43c23a3057 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Recursive descent parsing library based on functional combinators"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 python_test() {
 	cd "${BUILD_DIR}"/lib || die
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 8d2c2e7dd470..779ee47d698f 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 663 BLAKE2B e8e54f8a9b15d59ee3bfe530530a636c23b181a46c43ee54732b28c55e33284c4bbce28ff20c7b6258a8f72f7f11d17e9f5f780f04b45c18a1f29ac1839064eb SHA512 5fecccd81694958efeb2c89592c780307457557fe62efa61c010182759e2c93aa7c00de8f014d156126331de1d117bf375fc5bb870e575fbcf3ab7f9d0566230
+EBUILD fuzzywuzzy-0.18.0.ebuild 662 BLAKE2B c6e26d374120abc2f791b30bc83a90930845fd9be271f7cee66d4dd5988d54f7498f4c84627c5b330f7605fb8762f93276fb8f7e4a1d97b51b5e7c3066eaaf25 SHA512 18afa6ac3e2c3191aa114a40f05cc9b3f8e2bac3aad6b00a86b4a396226de1529b87bf38efaaa7fa3d0c089f090181dfee8712c4a671d090f6e436d703087bff
 MISC metadata.xml 396 BLAKE2B 9d393923d1967fdc5ed931d8a0767c3b9fede9d39371349e1a6a6e1119d6fe5118ab2191bb264ecb119d28cc2f2f07816b5cfde02da1dbda0b0226a838913a9b SHA512 66404a0ba9996258fac47a0e31d6d4d8bab13ee48bf90adbbc6bb5c268ff7d4a504b6e6840bc5d9217614c6d8966c931e268af20f32689d4f233c67c6c576442
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index c70a588c0bbd..f9e0426f7f07 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 07efe31f854d..68fa1ee5ba78 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,9 +1,5 @@
-DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
-DIST gast-0.4.0.tar.gz 13804 BLAKE2B 9f614dbf5e7f635f2179481d933f9da53224e1d623548c14a0df4302e47d7c08237e46d13e73e62402bfd060ba002179c0592094f5c47612051973cafd0f3d2e SHA512 d132884c51f7172db9b807095619b2cf3ef92acea18aa1de65f6a338b381b7d3fb3f79ff0c1f9ef9388ef885700b7e58309bd95ccebce46bd3173cc484c9c4f5
 DIST gast-0.5.0.tar.gz 14933 BLAKE2B 5d70d832d69185227e574a4bf88752e1dff43ef0e3e78a1de8ac7ab96218530d37a6dd0a3e6e4bf1fe8e11afe98b8d87722bfc2d6c8b68d8ac4905f335c2b85a SHA512 31c204587b3abcde61ce7343bef8439fab7e36c46de17eb2e02138e3d709f8f70e24c2c5d045044ef06e42119a50566c881d293c1c815743655354e72304701d
 DIST gast-0.5.1.tar.gz 14094 BLAKE2B e58e989198991fac1036363f7d1f7aa831263f0a9e5e616470fb6b7732b2bd39b9ce71cfd97b990bc29c3b9a978c56b90e375ec3d4a9b3c6692f44fd36d9309b SHA512 955154d273e97bdb80528bf17bc060e6266c524218d81469ed99e09d099cfa320af5c8384f8cc51d22be254578221e068d7a2e2bd3f0279cb65d40a4eead7766
-EBUILD gast-0.3.3-r1.ebuild 425 BLAKE2B b5bd50096c839ccd16d7422ee793eaf642b04b8904fd739fcbd75f102fc7420f9409044bb08316c1bb71bc3ef5360e76ec836dfab9c61f5f33961a4daa680721 SHA512 eac215e1527ba1d8028f17101da808d41084bf8883c72a53a54b60f72319e83815d88f9d1640ac99cf8ca6b20a85f83e2ca5d373dab12ab5814b2fc2d9509e86
-EBUILD gast-0.4.0.ebuild 495 BLAKE2B 5aec96c67a75f47c4035eb9507bc954a71eca2200f5e359bd6e503dc4f52c8269118087475de736a89a8f422652708219adfcc3b484c9f6fe44c0fb384b5e37a SHA512 894ef43d290b613c58868ab3a3eec36357154f5bc38380d8c007c2a22cb67873c742d83fe794b8ded58a6f7b9a9f587e111d6ab66bc86778c1275b2f064710ae
-EBUILD gast-0.5.0.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
+EBUILD gast-0.5.0.ebuild 494 BLAKE2B a305be1db62fc33ab224764831b5613c72f15f2193bd8975deda5ca72d049d171d1eb1f1077177ff96f4ae532a71d1a4cd1b148b4524aa17c402ee5ce1964113 SHA512 1d85abd88a29dc52c1a13de328ce715e07835921db1db0012bff3c1c08453a3b24d141b8002ac6704d8fd211d5959412f96fbe047ba88d8589355688804e5be4
 EBUILD gast-0.5.1.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
 MISC metadata.xml 652 BLAKE2B 487de5ab8f3b93f2a1546f307429cf547162f59ac6f8d35da73b9a116517c53e3c365717746f4f0369a44a4863bb2e423119b775ef3c18e4ba61aa79966c099e SHA512 e9b2688651207c7a7384e099b2ddb7d083fb5419681446ed56a6cbe18ec302a689e71dd7e795f934b0cddab96a0d46b2f1c0aefe90132c22fa2ec4700ef1945a
diff --git a/dev-python/gast/gast-0.3.3-r1.ebuild b/dev-python/gast/gast-0.3.3-r1.ebuild
deleted file mode 100644
index b4993552b2ae..000000000000
--- a/dev-python/gast/gast-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gast/gast-0.4.0.ebuild b/dev-python/gast/gast-0.4.0.ebuild
deleted file mode 100644
index 07d27aad9c9a..000000000000
--- a/dev-python/gast/gast-0.4.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gast/gast-0.5.0.ebuild b/dev-python/gast/gast-0.5.0.ebuild
index f25219967d31..f8d24cb607b3 100644
--- a/dev-python/gast/gast-0.5.0.ebuild
+++ b/dev-python/gast/gast-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index b55c10dd513d..27075fbd3930 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -2,5 +2,5 @@ AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c876
 AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
-EBUILD gmpy-2.1.0_beta5.ebuild 1281 BLAKE2B 92940940091499078cf28762247c4cff6e93b083d4e9b0deca4d9640c44a9c96bbf3da8b8176af5d6d9140b42b2cad6ce7438a28c177dfb5dcf4838992742c5e SHA512 73f82946da64c4491d6c3aad5d2019df990818506f107be09a26cf7a5ac430ae197cd2040061d9f40120ccba99d51e1d3bdafc479e2218f6000565d6c436adf8
+EBUILD gmpy-2.1.0_beta5.ebuild 1288 BLAKE2B b340097a38ecfdf08bd687c28087c1dc1f4673c70f2f1684c546b27cfece75b748a47496e123c3cb34ee9e358a6438f48125b1cf1c2e25912e053452033af806 SHA512 f77c84add0eedee24a6318587bb5fc78b4fe67765dac5cd51827807c1292267fca48abeb7189643698eee7b88342776567a941a965009f8ea82086d4b85f8e30
 MISC metadata.xml 686 BLAKE2B 825fe2a9401b5dc0f1c78febd69b60f26554bc909e253f0c6ae84c110cfd7c756cccbf46822b045130e770a6ef908eb78570f72ef8b186d5f3eeb915dc299dfb SHA512 6ce00ad42436897a2a2c25db8e7948854142f5e87b9638a56cae0db108173019ed186fb783f75e9967941b0a0fae51d0cecdec0cfbe2291a4d6320d83220e311
diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
index 6ac012168ee1..4768bf50c719 100644
--- a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="${PN}2"
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index f22b182b49bb..f31f2acb9a50 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,9 @@
 DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
 DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
 DIST google-api-core-1.31.0.tar.gz 134806 BLAKE2B 8609dd1260b72bc2c8fe949625c1b592e409bcd34c90f46671ef5c1573775f1957723ab6a03909b55145370e2c06250717b15452a89400ad1b6273a28c5a98a3 SHA512 af5a134ffeb65358d1b8e39bc6b0fe0b5477572dc915d941d63fcfeea72cff46c74d5d85350417484243a298462ab1322f69657694b25472d023db4b5fb27659
+DIST google-api-core-1.31.1.tar.gz 134947 BLAKE2B 112e705f8a2d945a207c10096a3cd8c1c65bf806339e8d688cc5638d234c1de03d168099414dd7314b8d3129d6d0e198208cddf15369b84ad837b9da90e8499c SHA512 29c84b98ae39416dbcb8ba7412237007bddea6e9a3af07c1f7753bfe57576125325a6412b73ab7d58c57257405b4b6aa36e043d0cf2496517828c7594f6698ef
 EBUILD google-api-core-1.28.0.ebuild 1260 BLAKE2B a3b0db659b2af9d38c7abab74c044645a03643f634443a6ff5739b0a58d47def40d86d721215afa7090b092325842dc335f83d8609e1da0cf6059dd355ccdfc7 SHA512 48a322282012623f07f845e3f2e6c626261f354ab4044fd99ce4936de559b8a830fb2b470547267f3dbbfd8c9fe8a68b9821918e08c5e7d199f748d8c5557c06
 EBUILD google-api-core-1.30.0.ebuild 1298 BLAKE2B 12d850962f1f5546eacbf64a502314d224c463cb119d6effaf5a5e6dad9591cc5b1ac5e0c5e50d85bcdb54aee71824ff78340f880c3488c456d6af849923ce30 SHA512 71e9bd2ab53bcbd9bfb0086fe2db395056b37c506f1d8e143c60a3092995ae672c2e87d521eb6d7dbefbd89cea61deffb939b4a5f1ec0066483746be92800e46
 EBUILD google-api-core-1.31.0.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
+EBUILD google-api-core-1.31.1.ebuild 1298 BLAKE2B aa2d3fc7236e6261111a95174eef4ff90cce0dce3164138c5d5947b1b4804dfc9ed967eaa3635e3ad0fde32f91513a7cbd850edffb308a0ab7111ef8c16ac2c3 SHA512 22b106f4c7deb4136700e16057fd9987ef0b4bd718d0cdcdc489ff1eb94c304b05175a70fcb606714c7f8b922ecef2a3e7d85d91234bd8afd84deb4fd1c8dd52
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.31.1.ebuild b/dev-python/google-api-core/google-api-core-1.31.1.ebuild
new file mode 100644
index 000000000000..e85bbb95287c
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.31.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 39bd14ee435f..7e8932a93a99 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,10 +2,12 @@ DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341
 DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
 DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.14.0.tar.gz 25412673 BLAKE2B e8c14c069f2900d560ab2ed70855cd0ebcf1191f0932cefa385858466a482f92934df97cb994801a0d85514bcc33d918ce50ee2e980f1957f11c1cb8cfbb34dd SHA512 4c644d7acb5eb9853672a17fb3cb08796c3afa172b3b1c56027b8ef20734cdc2995d972006a6803ed806171f88a0652910a0fd1682f3427c546312cf1a719e42
+DIST google-api-python-client-2.14.1.tar.gz 25415625 BLAKE2B 2b843a6ec6345e51c5a92c0285c2b8ae195928bec61b73033fbc64d8e55c34ae39d8d542534d89edac36d6ddc6c12b6acf11a25dbcbc06f72776799a70606659 SHA512 e22600b9b87d646775780d0f45043753e4dea24e898faf16ae49f2c91677282700b45de993d085923c006f2948747a6afa2e58b38f42f934f1602401faa30d22
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
 EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
 EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
 EBUILD google-api-python-client-2.13.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
 EBUILD google-api-python-client-2.14.0.ebuild 1602 BLAKE2B d1807524be9fd7c9bd6e5defd06589431c622bdd988846d81c11e64274978e7e2565576e19e357fb1f27f988e743a33d4ecde9a92534c183885d7bc7dd9ab725 SHA512 e334d83ad75593788df24a3d4887a34f1a1ddb28f844ed18c97bd5e44bc54ec5d2d9f65abd82b0f7ae67992602ec21eae09dd3824c81a86a7c838a9b9c87bf4b
+EBUILD google-api-python-client-2.14.1.ebuild 1522 BLAKE2B d81e73aa68eefc2b1982e2a377b4971c4a117de7b0cf48b879fca70bd77c1f177f6d42a3f5c9400b7e433a7e9f7f063de6a353b69aa93bc801a08a7d0e7e1a17 SHA512 c6e83761485362ec5501e151ea12419b4c46b6fef3e6eaa887fa9e5e99c6a90e2aced84ccdccf7f6b1f4a6010e8a56ba32047c95239397f4d60f7f1e935cfe09
 EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.14.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.14.1.ebuild
new file mode 100644
index 000000000000..81c76fdb764f
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.14.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 1b885060b7c2..9a7d539ef6aa 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
 DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
 DIST google-auth-1.33.1.tar.gz 178615 BLAKE2B 1600ca8861a7e75decfda5605414ff45d8f6d7ece40e0bb7a5892fe2289f1adc5bba313eab10c4d0e1f6e7a38634861e28518c2f02522ec924d6ed53805c4207 SHA512 c54356b21af5ddeda88023b886631050e8e4306ed444093ed6589d13d95af402f03928dc5b5f44f9b4c038128ed254aa14de6d852108f44949c42e2d05304062
+DIST google-auth-1.34.0.tar.gz 180860 BLAKE2B d536d689ff5b0c033f787228d643504d1888f0b73a9c6855fe4fae3af20772ef0640feca39c58c39f45681561dce6d5f3ec1d1f7d9699442fff0ec63fd019361 SHA512 7c3b64e8f85056fb660bbfd4f737053813a1e5b8aba52290882a0ddb9d9fd8c5365b767c78dd1e7859ef95caa6e653786d5a8747c8792bbee9c6fad1a5218910
 EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
 EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 EBUILD google-auth-1.33.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.34.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.34.0.ebuild b/dev-python/google-auth/google-auth-1.34.0.ebuild
new file mode 100644
index 000000000000..2bb9e016a997
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.34.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 0b3fe8740162..69930ca58129 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,5 +1,3 @@
-DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
 DIST grpcio-testing-1.38.1.tar.gz 16862 BLAKE2B fad99b35851e36b4e80e8d5d1ec91fd5f22e21a37596b3240aa81128fc77b73c95ce83f0d0423a047c85b9dba428e94f9a2c1681971776c1a141c756026b7ce1 SHA512 2814247be309498ef9605d630afd4bdf1843b21e89a7d6742b27107499ac73ca60c2bbcbe9b76d2be765505025e887af9a2b2159b324f10e3d85960759aba23c
-EBUILD grpcio-testing-1.37.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 EBUILD grpcio-testing-1.38.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild
deleted file mode 100644
index cc55c6572526..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.37.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index cbdfdf53c296..0382fa46695b 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,5 +1,3 @@
-DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
 DIST grpcio-tools-1.38.1.tar.gz 2128280 BLAKE2B bd8f8a371e89c096ce0e7f458e88c7d00ee6d75f18c008e8e0daef37559afea1792cf874829e1a8bda315ae49cd6e453406a75705672032811b059c2189b6aee SHA512 7498443a42da8077b91972ccf78bc64d9906a4344d8f4ce17ae8e45f32c952baf0c84d20771f572e7c883a26022be32f6e0a46f1d0e79dc651f90193987892e5
-EBUILD grpcio-tools-1.37.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 EBUILD grpcio-tools-1.38.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild
deleted file mode 100644
index 3cd4ae36bed9..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.37.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	hprefixify setup.py
-}
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index e6c283c10e3b..f04f80b96a7c 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,7 +1,4 @@
 AUX 1.37.1-cc-flag-test-fix.patch 1053 BLAKE2B c2f6b0a506fc2d074e656db3081447b3a0521a2ed2bd14a19104b962e0ad45b0068116384403eaf199d2bb8027b4a260dfaa7ed274974ad0bb6ca56b9ad19e8b SHA512 72dc39d549a008d137db29aa446ab7fc0add575103e941a969bed0124ce3b285f27edc31ca06db71b2dd3232c77c280755de3d3ef257792ead0516122f0a9b3f
-AUX 1.37.1-cxx-no-gnu99.patch 1366 BLAKE2B f8dc0d4cbcf5868d74c168dc1103a4b89d3a330470c67f835572697ab9d03ac1d9d89f3268186181fe395877d2f7842cdc7cef8bcceffb719553cd8206ddf5a5 SHA512 c93a54f30e87a51ec161639e6e89d59367c0b9afdf404004050b7e950f640acb5eeba05473e2e7893bd222487a9369bdf65b739fb3919317bece5f140599edfd
-DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
-EBUILD grpcio-1.37.1-r1.ebuild 1298 BLAKE2B ef7cf673b021ded68d29c46f506d76cee781bd62ff03aabb8dbd03488c810032ea1369418bbd2800439642eebd2e327e5a7cf2153631aaef64497ca4a7bce4ac SHA512 28bddf5c20d4902166dc68c944f26699cfb85045bc3a7ee700486d2c1d6b55543d0383ee48ce188232529b3364048bafcee65f49ce313de767e2b496839ebafb
-EBUILD grpcio-1.38.1.ebuild 1264 BLAKE2B ce658058c785aa5884656bd733916856010f36afa686c8ac3cc1d2dabf1216f4cf2f6b329ad67901ab59be1df5bc14588eb3569ca16fced565230a49124e31f5 SHA512 ad684f3e6d53413584d0defd55033cfc18c9045f4aacdfcae145d39b5ab6affed2546c25dfd21ed4a476dc3f325e1bbb4560054bac058692d2b5d93f1da37f14
+EBUILD grpcio-1.38.1.ebuild 1263 BLAKE2B 41c0a00756aa4354a5cba8fb3da44c2a4073b0b4325d5fd188186dbda0050e0d8bb0b16e321827b1421f6d687490c7ea923add840397c2bafde291c1c961dc21 SHA512 8ad606a485f52a6e9dc6f3916538e08dc4fe548cbecfcd4d8ecec91bff6d3181eca381b02d373211fbd24d9d51abe314a79c6adaa86e2843ffdaf57e9a6d18ed
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch b/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch
deleted file mode 100644
index 71e02eafeb65..000000000000
--- a/dev-python/grpcio/files/1.37.1-cxx-no-gnu99.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 05ae3c5a87ba1037bd4c7a94e6b574c8df847065 Mon Sep 17 00:00:00 2001
-From: Lidi Zheng <lidiz@google.com>
-Date: Tue, 6 Apr 2021 06:50:40 -0700
-Subject: [PATCH] Remove -std=gnu99 CFlag when compiling C++ with clang
- (#25778)
-
-* Remove -std=gnu99 CFlag when compiling C++ with clang
-
-* Use endswith instead of hard-coded slices
-
-* Fix a typo
----
- src/python/grpcio/commands.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
-index f4a3d2bdc041..df8fc46a3cad 100644
---- a/src/python/grpcio/commands.py
-+++ b/src/python/grpcio/commands.py
-@@ -258,10 +258,14 @@ def compiler_ok_with_extra_std():
-             old_compile = self.compiler._compile
- 
-             def new_compile(obj, src, ext, cc_args, extra_postargs, pp_opts):
--                if src[-2:] == '.c':
-+                if src.endswith('.c'):
-                     extra_postargs = [
-                         arg for arg in extra_postargs if not '-std=c++' in arg
-                     ]
-+                elif src.endswith('.cc') or src.endswith('.cpp'):
-+                    extra_postargs = [
-+                        arg for arg in extra_postargs if not '-std=gnu99' in arg
-+                    ]
-                 return old_compile(obj, src, ext, cc_args, extra_postargs,
-                                    pp_opts)
- 
diff --git a/dev-python/grpcio/grpcio-1.37.1-r1.ebuild b/dev-python/grpcio/grpcio-1.37.1-r1.ebuild
deleted file mode 100644
index 4a41d63de85e..000000000000
--- a/dev-python/grpcio/grpcio-1.37.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
-	>=dev-libs/re2-0.2021.04.01:=
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.37.1-cxx-no-gnu99.patch"
-	"${FILESDIR}/1.37.1-cc-flag-test-fix.patch"
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	hprefixify setup.py
-}
-
-python_configure_all() {
-	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
-	export GRPC_BUILD_WITH_BORING_SSL_ASM=
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.38.1.ebuild b/dev-python/grpcio/grpcio-1.38.1.ebuild
index 1d79bf9a0481..97c8b8152736 100644
--- a/dev-python/grpcio/grpcio-1.38.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index e4451de0a5d2..a437fb367568 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,3 +1,3 @@
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
-EBUILD h11-0.12.0.ebuild 480 BLAKE2B fc1d19a44fe2de2c6340068f6c2d04d40d733230e5ca30ca5b2db7d6d8f3ee17acf172a6cfa3dd0475e29a7e0af8bd5e783fac16ded56e5ba0fd7be4a05483a5 SHA512 0b43d882a7b87ff76ee732b3bfe14eaa15a3928fda19f40aa26391795be995629c3d308affe855ef8340c2c90ac1ca971be44cf50008ab3fd4f04939357289c9
+EBUILD h11-0.12.0.ebuild 478 BLAKE2B 068f86cf8190be80802b522067fc78af31bbd86fa4518c2f53fdb1f16b1a2b043c02f28404c3e458cbc8cb5c98bd94700c271a241b01969c8c6d1a284cb95c4f SHA512 243ac667df679af432410925fda77eea61fcf0760488d8ca5e3ec5e4d6eafa0c9256b21c8a326c646dfcef3e98ef98916362c8b9b7ad6db1f123dfc8811525e9
 MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 692c8f38381e..9c0a0d3c8a81 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index d92cbfa86608..c14d4ab0b15e 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,9 +1,3 @@
-AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae4506e2038b17c7111bae9ebecbb8eb5ca2a2cb8c32b2f6c8cd7c0629cffd926774c3d995fbd0fb6ad09db8c4310 SHA512 7ee887648d025d994eb6e495bad7ab41f7b8c2e9bb65800d9c34c1e31fc1020455202bac87c7cbf2a037a68c7cac43704f02074ae4396053ae03694fab949314
-AUX h5py-3.2.1-i686-types.patch 1944 BLAKE2B 55b00cdf84a369fb1bce79fa5acbc82d719f49804d7db47d9fa6f0f17f7fefdf6db7fe653a6d765aaa67eceec5acc010184890294f29a655ab4707664e5798ad SHA512 e100888fcf2f3de1b8a331b20776899100a9d5b8ae65d21a451ac2501af5c63abc78114c620025186e805b64f3828b3be80473ddec6d256d2e6aef9e0f9e1878
-DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
-DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284
 DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
-EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
-EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 996256072ab2696da939d080cc23b947981e978759ce82b487177bd103316d84a2682833fb8976d3ad6db73f87ad7dda2b500ffddf218bcaeee8e50983fe876b SHA512 3cbaa44da1679595ec0865103f445ee4cda16e6bc2b8a8560d8ce715e1c4e1cc37a2d9a6bb8c6c9cefecbab3c58bf8872f49298197dcdfab5409305f1519eacc
-EBUILD h5py-3.3.0.ebuild 1417 BLAKE2B 7c90cf6e5ccb4eb6b495c8a8232c5de4fd8ba0ca05d29efbceaa4c1d1dcb1bf1113921b86690580c7b1e884ba2909bc481d04d586ad63aab23456d91449c91b9 SHA512 02c39d36bef5b0d39f1373dcee5ab2d410c72436bcec3683a650c6b9cb872966b8ac63ed887ee03c2c580f380259ac2eeeb52f7aa32d04b1c66455f68327dce4
+EBUILD h5py-3.3.0.ebuild 1416 BLAKE2B 5fb629237ec262cd1a395b9e5187fb214c79ddb5575af55ad35aa8a98f4bf8c0f3d5f90d8f985c9193063266dc487a35e45701941f98e8b7f4b1288b0206dd82 SHA512 ca8116d2ac0e402cb793608de9234d59e490b2367a16588157516c8aac5a7fd9e3ffb8855673a866a9f1a89a23b0c0ce44a0b59a002bf84586794bbe5170ca3f
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/files/h5py-2.10.0-tests.patch b/dev-python/h5py/files/h5py-2.10.0-tests.patch
deleted file mode 100644
index 9f810ed46f01..000000000000
--- a/dev-python/h5py/files/h5py-2.10.0-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-These tests fail as confirmed by upstream.
-
-Reference: https://github.com/h5py/h5py/issues/1291
-Reference: https://github.com/gentoo/gentoo/pull/14343
-
-diff --git a/h5py/tests/test_file2.py b/h5py/tests/test_file2.py
-index 0fbf2d5..a7a28bb 100644
---- a/h5py/tests/test_file2.py
-+++ b/h5py/tests/test_file2.py
-@@ -207,22 +207,6 @@ class TestFileObj(TestCase):
-         f.create_dataset('test', data=list(range(12)))
-         self.assertRaises(Exception, list, f['test'])
- 
--    def test_exception_write(self):
--
--        class BrokenBytesIO(io.BytesIO):
--            def write(self, b):
--                raise Exception('I am broken')
--
--        f = h5py.File(BrokenBytesIO(), 'w')
--        self.assertRaises(Exception, f.create_dataset, 'test',
--                          data=list(range(12)))
--        self.assertRaises(Exception, f.close)
--
--    def test_exception_close(self):
--        fileobj = io.BytesIO()
--        f = h5py.File(fileobj, 'w')
--        fileobj.close()
--        self.assertRaises(Exception, f.close)
- 
-     def test_method_vanish(self):
-         fileobj = io.BytesIO()
diff --git a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch b/dev-python/h5py/files/h5py-3.2.1-i686-types.patch
deleted file mode 100644
index 80bbb112e7bd..000000000000
--- a/dev-python/h5py/files/h5py-3.2.1-i686-types.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 76c9c8c4049943c490556fa888cf7743d1a677e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Apr 2021 11:48:16 +0200
-Subject: [PATCH] TST: Skip problematic datatypes based on their length
-
-Filter datatypes for tests based on their length rather than keeping
-a list of illegal platform+type combinations.  This is more robust
-than the previous solution and fixes the test failures with new numpy
-versions (1.19.5 is the oldest I have tested) that declare 'float96'
-and 'complex192' on i686 rather than 'float128' and 'complex256'.
-
-This fixes the following test failure:
-
-    E       AttributeError: module 'numpy' has no attribute 'float128'
-
-plus, later on (again):
-
-    E   TypeError: Illegal length 24 for complex dtype
----
- h5py/tests/test_dtype.py | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/h5py/tests/test_dtype.py b/h5py/tests/test_dtype.py
-index c5fac97e..ec4eda21 100644
---- a/h5py/tests/test_dtype.py
-+++ b/h5py/tests/test_dtype.py
-@@ -13,8 +13,6 @@ except ImportError:
- 
- from .common import ut, TestCase
- 
--UNSUPPORTED_LONG_DOUBLE = ('i386', 'i486', 'i586', 'i686', 'ppc64le')
--
- 
- class TestVlen(TestCase):
- 
-@@ -289,13 +287,9 @@ class TestOffsets(TestCase):
-                      if (np.issubdtype(f, np.floating) or
-                          np.issubdtype(f, np.complexfloating)))
- 
--        if platform.machine() in UNSUPPORTED_LONG_DOUBLE:
--            dtype_dset_map = {str(j): d
--                              for j, d in enumerate(dtypes)
--                              if d not in (np.float128, np.complex256)}
--        else:
--            dtype_dset_map = {str(j): d
--                              for j, d in enumerate(dtypes)}
-+        dtype_dset_map = {str(j): d
-+                          for j, d in enumerate(dtypes)
-+                          if d().nbytes in [4, 8, 16, 32]}
- 
-         fname = self.mktemp()
- 
--- 
-2.31.1
-
diff --git a/dev-python/h5py/h5py-2.10.0-r1.ebuild b/dev-python/h5py/h5py-2.10.0-r1.ebuild
deleted file mode 100644
index 1a7328394762..000000000000
--- a/dev-python/h5py/h5py-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-RDEPEND="
-	sci-libs/hdf5:=[hl(+)]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="dev-python/pkgconfig[${PYTHON_USEDEP}]"
-#	mpi? ( virtual/mpi )
-
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/alabaster[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	)"
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-DOCS=( README.rst AUTHORS ANN.rst )
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs --no-autodoc
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-#	esetup.py configure $(usex mpi --mpi '')
-	esetup.py configure
-}
-
-python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
-	# tests generate .pytest_cache which should not be installed
-	rm -r "${BUILD_DIR}/lib/.pytest_cache" || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild
deleted file mode 100644
index a658b288acfb..000000000000
--- a/dev-python/h5py/h5py-3.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="sci-libs/hdf5:=[hl(+)]"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	' python3_7)
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
-	)"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-PATCHES=(
-	"${FILESDIR}"/h5py-3.2.1-i686-types.patch
-)
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	pytest -vv -m "not mpi" ||
-		die "Tests failed with ${EPYTHON}"
-	# tests generate .pytest_cache which should not be installed
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
index 903616019b46..d993e7d19b24 100644
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ b/dev-python/h5py/h5py-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 0cc933dc544f..fb5dcc02f806 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -8,6 +8,6 @@ EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.3.ebuild 2203 BLAKE2B 3c4bbe16a90244ef5a340dd1c22692167cb9365d8fcc25bc5ccee78c60b6b365daa984f96229381b402c7b6bf8ad8bd47fab5da932e7b3da6ec7bea199ab39ea SHA512 a1db99e35da81f34e78806b1cc9226408736f09bce1321febed43bd3904013abff5f3978fa326d652d4f6fbc5199a1af045f90712531318055f31df65b9c7b97
-EBUILD httpcore-0.13.6.ebuild 2302 BLAKE2B 500632e564d8dea5633644e0fdb4686d298053694347367aec4f4c8ca44d7a311036f43183ec5252ae8a39ff54883deeef5b6fdbd22211a9bd803d1a71f2b19f SHA512 189e5ffafe30e95f82ffcf02dbb6033895c6d0b91caa7f9b619dfff1e28db1a68f9b3bc5dcc56dea7a0e41691c889bc8ecf783d918d68c85fd1b74ab3fdbfce0
+EBUILD httpcore-0.13.3.ebuild 2200 BLAKE2B bd8054b48aea11fa7cfa3838bc747860982e903a7d56bd7c4f5cae60c50c618fbaf0afe46a0d5d2876b05a91f35132a5237043d56faac472b5e1c681dd07d101 SHA512 8cd8925a97ada21fe17ba3744e755ca1b231f73955ad4138115c8346d790629f9156dad4e3778f743d483cd8fdca21d044f229d139c90af4944510e440f944f3
+EBUILD httpcore-0.13.6.ebuild 2306 BLAKE2B a31bbbdeea1bde7731632eae255e96101ce0b775a263523586aa4011954746220bd46288ecfc2aa33e4701c6d01a91204a93f6c7d9728ea04250d99dcad71a5d SHA512 ad7495a8ab821825d7ff7c038ad787e7db4b5ae1c0ea6071902df9ccabe5c680e05dc50ef17e962aaa5dcfd3e0ea8032e964ed30249ce5e82e894b983135418c
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index 16d4d2c1c957..afee6091fbc1 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 4e784aaa59dc..65b6fd3805fc 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 0b022df6c5b8..b69cfbf94242 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,11 +1,3 @@
-DIST httpretty-1.0.5.tar.gz 414946 BLAKE2B 8bbaac3d53fbf5744f7bf8ef952bd9305112934af24809a233ef0446886e09b7d2a897e69aded12d9e715580305d729609365b0be55f8d324cc48e6aa0699d75 SHA512 2e5f4834848ab1a0b84230f000afb0409b30b3cc1769d36ad61f712f56abc8d6076e7507598f791fe343ce282cf9e26939add71ef794ead2836badfc2321d6bb
-DIST httpretty-1.1.0.tar.gz 417966 BLAKE2B 2decbfdb8b8a1e04bc2a985bb605d59ef2ee84a434dcd3c420ecf68857a5a409cee622db63bb5bf8981c1bf287b7dcf56cf91360fec4dd219dc349b1d4425a6d SHA512 a6da71115d4dc12125bec451888c30858ec94f2a3aec530b21efcacd9c595cb3d2196dbca3631f4b6f50c985c14b3c4bc6f34ec1d9e41aaf2b48fc8a072f5739
-DIST httpretty-1.1.1.tar.gz 423682 BLAKE2B a68c28155082d01d2cc3af9672dd03d6e1e0427426bc5db08fea1fe9a6cf6ceb422315f321cb66e9a6b9fa13f8abad02ca7fe78753c4deb27e220263f18b363c SHA512 29d9f1a4845b0b3dd6d3e1e9cc3f81d673a939286203de06ff34b167f69cbab180eebc0ccc4a733d81728deb2e44ffb14df25cab31475267609ce510664af736
-DIST httpretty-1.1.2.tar.gz 426456 BLAKE2B 1b593344de4d2470a6712075b8476c024ec16bfd5501d0ab63e5e15ee65d3c4a7c89a24cc0c0ccee019554ab751afa1d09bdcd162602edd0d1d7523961e0fee8 SHA512 674641509e43cb36c14af560853271495474157477350ff80a9bd311b435fb64e9aa2b710419b34b1f344ffc963f8c7141a631dd3f0d9599accb43647b5680c0
 DIST httpretty-1.1.3.tar.gz 441309 BLAKE2B 9c8138bd83fd93602d4ab72e9ee2ff27605a851ee4e7e61f5fbe0d1423041479311315cf0168acb2474c2b579401c6817f4713f61707e21faad076968b2aa1f5 SHA512 3bac68ecb78efc7592f9ab314ca9ef570c8193fb7c2ab3d3fa003b0ff623ac57d6a74f8f0e7b6c2ed45f30e520d157345db56837212d9acd4ec6259570a43dfe
-EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691d951cabff545725c42a89098786064544b83c466cb07ecf5de05d8313b54c48f11c7872523310f685ef20a0199c SHA512 0ab4ea2ca20b103c10361d858e89238583bd547e371b6bc19bf89bc3091188be0e44ed9fcd92090b55c20de1ee1ded8b34f9015a9afdf280adf03703f8766983
-EBUILD httpretty-1.1.0.ebuild 1198 BLAKE2B 8f6feb8bb19893c4c74b9653ec90414d5131197cd36b5bc4d1dccffa5a49dd6155e2045bbed9d60995853560708c1a767b013246627a666f24edada682b25bc1 SHA512 891e9a72f471f5529f2a5d3c10c04ab55cd38d7eb97c8b17633fb6c6e521d7ff81b0353ddc70e649e1dae7cc9471f9e37d8f1cdee2cdcb967344ea0be44e0402
-EBUILD httpretty-1.1.1.ebuild 1291 BLAKE2B 8e312ccbf0070c4af60df4a98aea0db7f5acdbd4fcda701369bdd644342f8bd88fe793224f748e1904b464d76ab488d499735ce7b5c27e4d60e5dc50676f6932 SHA512 4e8691c96e9da6da9881a232b860f56bf24048f4c030de3c0427e4b2ba058dfb6d695851462f2e52d9efb0c0343797a537c5ec9af2bcb5d4b614315dd73cd2f1
-EBUILD httpretty-1.1.2.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
-EBUILD httpretty-1.1.3.ebuild 1289 BLAKE2B 97f5e5ca195652b2cf5f504470f81db41e166e0b3a6d3552f71b19201fec716a268c3176db4c8c4909a64f8dcbd251070f307ca958f06a4c73b8a62c33a88eed SHA512 93785980e8c9ef12679767006bf50c2a0a55158d866a659322a0c1a2254400fcfbb5802baf487c1b07c7c28d797173573aab42ee52db69afca6ef15a6c8dc28b
+EBUILD httpretty-1.1.3.ebuild 1285 BLAKE2B f6d88ce2a636d9acde7f7c31bb17f2e99bffee6003ffd275591327c3402fee481c226c569b8c88d10c7e87d9d4ee3d2365c296364753937d91d583943cc8ca93 SHA512 f1a50a51fd1896cd46dcbb077f286da93e8f200ded752a9129942ae1b6fd725b5cb1344cae57974fa18cf63f128063b08e6a40f066f85c2251da78d4a6fb17fb
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.5.ebuild b/dev-python/httpretty/httpretty-1.0.5.ebuild
deleted file mode 100644
index 0e08b6be2fcd..000000000000
--- a/dev-python/httpretty/httpretty-1.0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.1.0.ebuild b/dev-python/httpretty/httpretty-1.1.0.ebuild
deleted file mode 100644
index 4945fbd3c3e3..000000000000
--- a/dev-python/httpretty/httpretty-1.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpretty/httpretty-1.1.1.ebuild b/dev-python/httpretty/httpretty-1.1.1.ebuild
deleted file mode 100644
index d4b4d4ebba91..000000000000
--- a/dev-python/httpretty/httpretty-1.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpretty/httpretty-1.1.2.ebuild b/dev-python/httpretty/httpretty-1.1.2.ebuild
deleted file mode 100644
index bf841f155b15..000000000000
--- a/dev-python/httpretty/httpretty-1.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	#rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
index 6fb4f3d7e8ae..2f421089dfc7 100644
--- a/dev-python/httpretty/httpretty-1.1.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 9a2c5732f223..142a593211da 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
-EBUILD httpx-0.18.1.ebuild 1310 BLAKE2B cd916f7b1a450de2a2091ea53cac84b8fceaa9efca9a6a3dcdeb4bed6a98bbd2306eb3e2147756ee5bb0c307f698acc300f41e3a3932a8b9193e1278d19f6778 SHA512 0015042ad3ed2fe9ebf2ebdc1221231f4b49ec31f3dd9d69e645d737778612f7d51bbd061258e0e014974230cd0b5481f58a485151d6bd44f91f1a17813abd57
-EBUILD httpx-0.18.2.ebuild 1547 BLAKE2B 7f267cb8f047aa1cf6c6ba635151d482730628c57fb080bb18c277b0b2e963c728074d537b2025e992b2351d3c0ee14169f0dda386bff5c710f9560075aeada4 SHA512 df6af32a04c4d9716f55261311101c62f6f5787aa28cc138933a16c7626e1dbb922a32957623a92a11d9c158e16027e3c86c31e4849b15518312255dab7df660
+EBUILD httpx-0.18.1.ebuild 1355 BLAKE2B 94a851f649d0dc4f8455fd08544f1a22f3f960df4d880368d63ae0ecb59384df465930c71b7078b7493d0e7dada421230dfb4303b6bc577330076e72418520ae SHA512 903129f1d0120d980981e60a0a185ceded491d6e00cfb457b02a069ef709c513a5c764817a1450ce3406c2f3fd0ef93960eaff1b8e412bcc56f3f2e9f309d036
+EBUILD httpx-0.18.2.ebuild 1594 BLAKE2B 1e93a56d73d4c11feb0e0ea9d3c17df7796749dcac00c1880b83cd963677b3de7be2abd5cd0cfad272733c8f81508a2cf47689d630d81860c50880aace7a6393 SHA512 6fe94fd6e63d6bf2168eca01eca9aabb2fe0e7d470ceddb0440e0ed8a652f0bb2a91bfd47b4904587707a24b292ab2ba01ddfe56c7071ac3dc63a99f9398ab9e
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
index 2cfb607a045d..f607ace6cc32 100644
--- a/dev-python/httpx/httpx-0.18.1.ebuild
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
@@ -29,6 +29,7 @@ BDEPEND="
 		dev-python/hyper-h2[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/uvicorn[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index 4504b1b31c9e..32a16e124e37 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
@@ -33,6 +33,7 @@ BDEPEND="
 		dev-python/hyper-h2[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/uvicorn[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ea549f4c4e3a..aa00d8275b19 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,9 @@
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
 DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
 DIST hypothesis-python-6.14.3.tar.gz 9135537 BLAKE2B 2effb0c68cf3a7a2f7d56c0c46c2ba36cbed4fed35b8a617ec68a721990247370772b986f0492aab112f7420c07409f8d738485ca28f42e7aea919af52611b10 SHA512 1722c5dcf1eb7375fd09d4208851826582808449fcaaa0345f1461d9a531961500a9c888bec5a457efbbb34f8178464b3358a3187b94bb5c783af42b4e7287ce
+DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
 EBUILD hypothesis-6.14.0-r1.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
 EBUILD hypothesis-6.14.2.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 EBUILD hypothesis-6.14.3.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+EBUILD hypothesis-6.14.5.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.14.5.ebuild b/dev-python/hypothesis/hypothesis-6.14.5.ebuild
new file mode 100644
index 000000000000..536affb7ae13
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 1abdfd4b4f85..d6d79f22f4f6 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,13 +1,5 @@
-DIST iminuit-2.3.0.tar.gz 371854 BLAKE2B e432da9281c5d50eb306766b65e20a1d02b0fcc06ff0c9dd44f60a8cc840f406e76b4d3c5643a6ab36b9ed0f29f0a327f6fa16b859522853ca9211470691334c SHA512 e3be69040bd5a5d42fcefb5bdc8f20e002eff22fe46d83a9a4cafc66d6772f57169c336c618f9b14bf819042f922e3c37ab88db4dacd36b3d2f1b2ceb8e2d081
-DIST iminuit-2.4.0.tar.gz 372122 BLAKE2B f6590bb67d8c79cb8398345a76a7af7e95bec83864ca950701a97cc3e0543c6b6f2aac8340cd814586328ca519387f592dd45115348a3e5c1096c87799db2f81 SHA512 9c5664cc2b21ccb0f09a63bd5484dc65a6226d385d073f2430a0d5230a3c624694b37adc911e787d87bd6d6541a5d322dcf937a0bd82cdbf9362cb53edb4a7ea
-DIST iminuit-2.5.0.tar.gz 375912 BLAKE2B 422bb8ec8f6a763ff010bd28f695a1b26ef3b3c44e324ffc2f4592d224ba5380d29b47b99d9f8b3f9dd8a5d81ed45197b6f89eb2d2fa599d8d1fdf9e50358e58 SHA512 25ce217ded4f9a142cf0522d9e66efeee4c3bcc16cd1f324a5008c1b64477b2a37a9655ea939c74bc60f9222cae8045bf7a77a5807b09cb3e3e61da4f41e3c91
-DIST iminuit-2.6.0.tar.gz 376846 BLAKE2B 5c5c8ec223ede39ea3c02d3df0639e52047f897eed7b441d567ed3f88656c6ae5740efffb234bbf29ecfa4578bce38a6a5ff4983d738ad1321df35efd0c14acf SHA512 6f413e11d8be3a823a7d12bf1e9197abb27561a15ec29127f6bf4c2339dfc67344b0900522d10e59dbbe1eb08bafb931950b2edb5f5679e06459bdf52abc1170
-DIST iminuit-2.6.1.tar.gz 376846 BLAKE2B bec73b182a24c242fe5c8931e7cb745728b8f492c8989c9d58615b71bcc705e5c36195e28158b550e06b9356235d5a89f9e170da62b808dd89a1083f705e0650 SHA512 5a600842c8e4ae0d2c1ec4b24d5f5a33dae6d0e7659b1908b4215289f82974d97a932366817c7af257d63bf5418080884c01936d84b55942f6149b05db7ab03f
 DIST iminuit-2.7.0.tar.gz 384016 BLAKE2B 857df47e8f4779c41b32e624ce3c5dfe16f39f57441f1f32367c9170bfe6f74fb84eb67a54b773690ce5fdde762d3383adbaf97e81d917a17e2995b9e69623be SHA512 c4f5ba80024e87e57087175b012d043df65079e5b8f0376ff7254ebb256ca845460b3c330043aacd960092178ce8fd4d8bd3cccd93ebe3515f7a9896b756c629
-EBUILD iminuit-2.3.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
-EBUILD iminuit-2.4.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
-EBUILD iminuit-2.5.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
-EBUILD iminuit-2.6.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
-EBUILD iminuit-2.6.1.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
+DIST iminuit-2.8.0.tar.gz 389147 BLAKE2B f54de6fb39d942c39438e82cb38f04974f0e565d31c3bb06ac39f73a28b82207f7590d9039e491c8dc44286e4311ee3f6f0114be94754104e0d0a06af5fa8acd SHA512 89655a5c925d6f02cde3c8a3139a0c93e9a667a6e0a34ec1f99d5b0f91c79671f2b325553359daeed91437d474e31354088b66a58e53e8235dcbbb4bf6da4935
 EBUILD iminuit-2.7.0.ebuild 732 BLAKE2B 0521741646c2a79d9610b8c4426e56774b281946bfe91c012b433467f4b12190360fba7861a96c0043ed6a7e0a6bb39a68e0f326f9576e2a52572ab9ecf65a26 SHA512 72e7506d58939e30f6a87cb0e1de1d9afbb60df03b9497932796fe8cf30aa023728283bf279fc7e217b90096f3372e6516586c761f3c19500a22cb0e8ab844ce
+EBUILD iminuit-2.8.0.ebuild 732 BLAKE2B 0521741646c2a79d9610b8c4426e56774b281946bfe91c012b433467f4b12190360fba7861a96c0043ed6a7e0a6bb39a68e0f326f9576e2a52572ab9ecf65a26 SHA512 72e7506d58939e30f6a87cb0e1de1d9afbb60df03b9497932796fe8cf30aa023728283bf279fc7e217b90096f3372e6516586c761f3c19500a22cb0e8ab844ce
 MISC metadata.xml 493 BLAKE2B 6b9a29fc8851930ad4c8a23ee8e10983f68dd21eec5637efb12cacd6a20b154746333918f6acd81c71422dd3f54128e210448f6ae9710c180939d38c4325840b SHA512 8715ffcb3ac90a2ef0cb20efaefa6375b4bb901c5b7e224702ce951a6dc5b963a64ebd57ad55bc46eece978a9ea4c24124a2ae09dde2315d7fc4a79fbc2154d6
diff --git a/dev-python/iminuit/iminuit-2.3.0.ebuild b/dev-python/iminuit/iminuit-2.3.0.ebuild
deleted file mode 100644
index a949c1e97989..000000000000
--- a/dev-python/iminuit/iminuit-2.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/iminuit/iminuit-2.4.0.ebuild b/dev-python/iminuit/iminuit-2.4.0.ebuild
deleted file mode 100644
index a949c1e97989..000000000000
--- a/dev-python/iminuit/iminuit-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/iminuit/iminuit-2.5.0.ebuild b/dev-python/iminuit/iminuit-2.5.0.ebuild
deleted file mode 100644
index 9dad35750c8b..000000000000
--- a/dev-python/iminuit/iminuit-2.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/iminuit/iminuit-2.6.0.ebuild b/dev-python/iminuit/iminuit-2.6.0.ebuild
deleted file mode 100644
index 9dad35750c8b..000000000000
--- a/dev-python/iminuit/iminuit-2.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-# forced implicitly
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake distutils-r1 virtualx
-
-DESCRIPTION="Minuit numerical function minimization in Python"
-HOMEPAGE="https://github.com/scikit-hep/iminuit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/iminuit/iminuit-2.6.1.ebuild b/dev-python/iminuit/iminuit-2.8.0.ebuild
index 9dad35750c8b..10e6b9207df9 100644
--- a/dev-python/iminuit/iminuit-2.6.1.ebuild
+++ b/dev-python/iminuit/iminuit-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 # forced implicitly
 CMAKE_MAKEFILE_GENERATOR=emake
@@ -26,6 +26,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_test() {
-	virtx distutils-r1_src_test
+python_test() {
+	virtx epytest
 }
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0e0a6f02fd52..b6139d00bc52 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,5 +3,5 @@ DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad80
 DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
 EBUILD ipython-7.24.1.ebuild 3838 BLAKE2B 26db4ab35ee3aef7ef4c604c2ef6de13ebc998a6b6cf37fa4793cd7984fda1e406521aa8f11cf6eda87eaf2e840672fe48e6ed08f6490cf57cb474fd3c1bd056 SHA512 d6eb9f9cb7a5b2c537c65cfec76822d24762a42bcbff0a5ebdff6e91a5908986f3732f9e8dfdf03f2cb9ad151fe3fbc615cc63e7943afa2edc1ae08f309489ea
-EBUILD ipython-7.25.0.ebuild 4171 BLAKE2B 69e9ac23537c108dd0c07b3513c8b9324fed108c61a20ec0f908f906a73871ac285990c8baaff46e563c4cc6324f58214cf4b955dced990a8d6754c97c6397a1 SHA512 3e34d75deaf322826cd4a4681e8ee30d4fb566ff71150118df6ae3ebc489633da6dd705b005f7db6a7ba81b6acad0a8da4bf62d982a4b2a81994cb2f3f1c1ee7
+EBUILD ipython-7.25.0.ebuild 4169 BLAKE2B d0c773f9ed896d53ad512a02433d9d41e9c21603eee90dbb08c85772d35c8a4b1698a0d0b0ce772dbc4b95ca5e692148ea421243c3704aca0426091d8c1a046b SHA512 aba01bf68071fabf6d64ead00b121509c62ce0567a5cde3b337f0b7ab42c51278b4217c568a93da5651916e5c955e4ce655d0a00785d29ea88a69d0f91710b5c
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
index 870fbdee1654..df8b6a4a1de4 100644
--- a/dev-python/ipython/ipython-7.25.0.ebuild
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 6b8c25f1e0ec..3ebc57b4be9b 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -3,5 +3,5 @@ DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
 EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
-EBUILD isort-5.9.2.ebuild 1356 BLAKE2B 648a8957f4bd8cd65b63539b16b7eeec08a479705827e00e1d792ada3db99725937c09388d601032287dce8fa8600fafce3b63c2bca7e091b9cfce29954d55e3 SHA512 f1fe06c256c953236512439fb32b945e3d5b405448de97f14665daccb08c20cdb3491bab1d8d16894069906f6eeec74ae6513afa20ab6f234a3608ecd28cccf5
+EBUILD isort-5.9.2.ebuild 1357 BLAKE2B 053b4a6ebbfb850249dc9598f47f11bcc947f61f26a14d234b9d0e3b5b22c53adc9e440ba0eef9974621ed850e1d7d48ac3cbd4b7d9bd201f52414aba26e2e4d SHA512 6bccec33f9b891a2125df3bc6144664581e20da7b5a7353a07c5347b3803d80c7b43ef700fb2608923e47fb37a40f70dbe34ba57605902500e951a42d8191d9e
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.2.ebuild b/dev-python/isort/isort-5.9.2.ebuild
index 48eedd714274..8ed12e811b21 100644
--- a/dev-python/isort/isort-5.9.2.ebuild
+++ b/dev-python/isort/isort-5.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 8a0ee33759d7..07638a5614b0 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -2,6 +2,6 @@ DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25f
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.17.2-r1.ebuild 2067 BLAKE2B b6f8da4804fb92e3937fba9071107305e3f67705a182a783ee7b3ca82fadce96f3f75c7d9f49111a58e8ec14b4097c480efd6aad2ea0f8373a3834d71dc98294 SHA512 fa94a1be329ccd38f377385300143606e07506baa3adc37233bb00e0626e2cdad90ab35d07c0869bdbba6b5899de3203bd8b2385cc10fd0b3a641e0e260aff34
-EBUILD jedi-0.18.0.ebuild 2100 BLAKE2B 5b039354d20eea6e5804b504314a1c01d6cb5aa9bf0060e159f683679021c7176b64ffe4e7c53d518e6f22d4dcd385a38b29b38bce7cec169eaf30e18856d576 SHA512 eff78fa0c885ad5a879cde50bd072917674d4602f633fb34524dd12628b4138bcd852fa2adff11a8891f6c7035f2ca9a2f385f3965850c837722ab546062f22a
+EBUILD jedi-0.17.2-r1.ebuild 2080 BLAKE2B d27a1db8dcb1f76a86f25f4023b19047a6931e2d10ecc08e68b35cdbe5cebb1916b26cae097ddbfc2c8dc179a4e5eb793ffbd4906f83446d1f59a842d809b40a SHA512 c661c2af2a2c07f2dbf8e4cc6b0ccddca91e028f7771f4c2059532d4cc75ff2f4d4f879b86454e43a2132e28df8dd190bc901f6a2775df598654cfec7f2d4dae
+EBUILD jedi-0.18.0.ebuild 2113 BLAKE2B 93b22952f6e75c26cbb55bd77891e543e7c095e8bd0486ff2515df8d92db1b418c3001765877e203e5f2f18703536789b33dc9c86d00223e9eb578e17493a9d7 SHA512 9db1e83208d14c770f6083ace7a6ba282347bc7a2940c5a880281af983682d3c63b5ecff1103c33e9cba47f85031d1ed069d8f986eba2034fdeb6db5e9b44bf0
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
index 71fc58c9def8..2fa5ac08cf84 100644
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index d2d0631a0fd7..95127b3a78cd 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index a7c93b7413d4..8d24fecab63e 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 539 BLAKE2B a9b31b42c38345635b35317029948bdbc8db8b0a379c4ce937d17cb7e1f3a2761dec995a9fd7db831560928853fbe4d49143117cce3829ab2e931b57da650f61 SHA512 0eb0633128d218ffc5c420cdf91b11e20e7704aad6fb8029846c2be2e2c290647bcd2025b23185bf06147b3f2ba4ea6a35852a9b565d2f60c1deb4079b7c76bb
+EBUILD libarchive-c-2.9.ebuild 551 BLAKE2B 899facfbe24c71e3de08272df2a3dc8f0da5bde25ed3d7bf43b8260b11660e11372076e39a56f2e735fb5cbbbe30ccaff7014f32716344f1b263c6eb835c2cc9 SHA512 d77408392d18b46da4b4a5de803c873508beff891cbbcef0bc5c88128f4efb87ef958da63eda6aa63d1cc93e237b950b09d1c49ac7cfd4887988a4d200a0b920
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index 102eaee9ad83..ddb41531b499 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 91bf148fcdf6..92b66d179d9d 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,5 +3,5 @@ AUX m2crypto-0.37.1-py310.patch 3843 BLAKE2B e983077f9eda65ea63e34f73178429aea8d
 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
 EBUILD m2crypto-0.37.1-r1.ebuild 1487 BLAKE2B 13825020a0ab5d5203e238bd5d5cadf719d77c02dfa1b4be8fca51a79b1238360bfc52ae06500ff92c0caec2418c51db8c4c7016d77977304c80a5d6db2531b3 SHA512 2100ed3ca111b84ee5dfbe92f83218a1403981d63f906b49a7d80faddf46f8bbbbaca42da5ec03b304b91dec30dfb296622c9340499ad29c2a55e53b08e96ab6
-EBUILD m2crypto-0.38.0.ebuild 1491 BLAKE2B 5562e114cc0c4bf55203989831d29386069eac1566a9b68cd39d7c95b619420c7b0826fe5c08e5a987f9f6c7ad9a6dfcc71907d78ce225d4a80949ad2b790f8a SHA512 e3981fc36668c519950cbd4a08cdf6d3f1bcdc042e02f83ba3d5b292b2ff4b0773a62b27ac27931fe562923eb7952fd894812df0cf51d03c670944e697952a22
+EBUILD m2crypto-0.38.0.ebuild 1494 BLAKE2B 8d91c7f87e680de0450db4312dbb59984849f5caafea807f77a2797c3265fd08fe37d0913a0b111c41710a162bfa09c77196c9c015d13f66b56aacddbcbd34e4 SHA512 4d64ad186eb92ccf51e96ddff6c6cbe8c79d9a3ea142b6fea782940702ec572ae0a64875b0753308fbffc1e80ba4ef5e2d873165d362039c0429d6c4a0b6262b
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
index 2c80639e8951..5cdac9b517cd 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e74a4f15dab5..4598fcab48d1 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -12,5 +12,5 @@ DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d
 EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
 EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
 EBUILD matplotlib-3.4.1.ebuild 6845 BLAKE2B 91e4c9281b79eb1c0bba8142a8de315322198dec213755717d318b00ce90ee2746ea950d7bf3ddbcccb039d757801ad541922966574297d50843600c4bc28edd SHA512 19fc5c3e739c1d687c16339c361a36245fb48d84b31e274c15fde827458fb1723f7836a737d9750778bb1430e83ac328d9242868de817722143dba4cb7a49eaa
-EBUILD matplotlib-3.4.2.ebuild 6926 BLAKE2B 78feefafc7e4decebe6d60d63bb50baab4001904bbff744c7a347e467cbdb6fe5d4f1bf41ad6813b707d6bdc9c8d09b8dcb43ee4aa7b90ac076830c8a50692fc SHA512 11660f310fa7fe68188f7cdce7a79a4a7af19922d298be8d9e29bb23e6951d35c4e6695e17a2c4d5b6cfdb7dc3e9ff3f7134126e3915324e367c2a54942d2d69
+EBUILD matplotlib-3.4.2.ebuild 6925 BLAKE2B de748898d28e72271988758203605d179ce684e8cf297fc3699395603491e3b59cd1cb871f479c90f6c52af55bdd9d65e3249d16fcc0b71fbc53c4795da996ab SHA512 253f7cd597f9c4e0a188a838ccd31c36d5096444188690b7e8b29218ff158cfd036237e3cb2ffd6ae1255011cd57a6b4c7265395939518d18686c047162f8080
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
index 79ca3e5d52fd..d2ba4a665139 100644
--- a/dev-python/matplotlib/matplotlib-3.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index f2d3f8d0985f..198678465359 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -13,6 +13,7 @@ DIST moto-2.0.7.tar.gz 1565849 BLAKE2B 1c6491828a43156fd347bcce80f3440cd8d4964e2
 DIST moto-2.0.8.tar.gz 1569426 BLAKE2B 746313241d49558ab49d7e2116406f128a315a9fca40956808e7f901e91518551a1f75c95c9ce5c92534221d1db3e01a3baa2cef6cadab9a9d024cc30d8ce0e2 SHA512 5cf1a47c97100b76ad9b69787ce4df00f24f93ba1a36a242cea535ede649af457ff043b44f1cce4a4e44b6735844652f69271f18edac0748b636f4e519545018
 DIST moto-2.0.9.tar.gz 1614328 BLAKE2B 0bb9e3dcc0c25476b7fdabeecc31be6904a21d6a77f6ce3d9c9c176625873d30c55321c8939ecb8bbc91ee64faab9cd7231150dfdcbd4d5d7d3dc8eae614d9f2 SHA512 41b32aa192dd5c5052a90f345f29e696f9cc6abb3698ea0b738f8805fc920f4abf7d418a64aecf6efd66162aad631c88754d5e4e349ca2ba5b393771038219cb
 DIST moto-2.1.0.tar.gz 1638267 BLAKE2B ee778cab1a9a448408bbc495a148201bb016c2ba29076062360db23d86d725758303c32e1fb1a3f9e11112deb1cbca686fc956ddafd259fd942654510ba12147 SHA512 cae18324200d827a1750c5dbe2df2ea68dc66a5b8ff40b4c873f7511d576417c1a2b20203cc126d84b99b1aec5ef8700825271893933e6cc4bd61c0082b9e9be
+DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5db382f83a4177cf6cac5339f89164d05c288a977bc1895a204d13d02069e8b37880ea3d04374f6ed4d6be47 SHA512 7eabb515f94920af9b8f028afaaa51e27983f7bfd73f66c29fc191e2f3dd3e8939ddac67de0127c67c35cbc17c3500a7390103b26c85056780c865aadeb5e1d9
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
@@ -25,4 +26,5 @@ EBUILD moto-2.0.7.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668
 EBUILD moto-2.0.8.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.9.ebuild 2251 BLAKE2B dfbd64deaf75259e39927cccaa72be0634304863cf413828e07c49e160a9c0c14a50b0d3e4b5d34232d0cb7c579cd1e49eee22c6ad4d31ee9b889a89fd7bf602 SHA512 f99521935ac7d9d64f9954166caf37a2df6b50e8ec862100e320470ccbe7372d3580eeb9c193b288d5ac28407b055f73f26b1ec895e446d20f341c3f49845c35
 EBUILD moto-2.1.0.ebuild 2403 BLAKE2B f61936ee276141c887613a85ae20234e8cf6358005af3e48d2a441cb3dc74e0c8f82a6fbae511cd8ac21c00ed8decc4e88aa96f9586bb1c4bb8fe752c61d07eb SHA512 3209e5a97ebad0b689465bbbe48d0f1d5f2c34230f9b917f4bb4d8d6453dbefec90da1b844a01046aabee531e2dbd99933f4b01f74d47271f2ca32bdb877cbd7
+EBUILD moto-2.2.0.ebuild 2363 BLAKE2B 08cca417a13eb2e92f2f94ab322705a8a35ecfaa71a2307df904527fc6ada9da21a73fd6d36c0f3724d5a9d9699affa647056265a6f1549eaf0cb9b325a57081 SHA512 588d0e2248b0c33995a5197c70d9d009c5720a606a7a1a08d1ce71127a8969771b6d5d0405f744ab164bcc8aebba544fd8c3f8facb5d6a547503f0488d7d971f
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.2.0.ebuild b/dev-python/moto/moto-2.2.0.ebuild
new file mode 100644
index 000000000000..7c79594ac4fb
--- /dev/null
+++ b/dev-python/moto/moto-2.2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index d21e56fe3d97..bb877c4df351 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 537 BLAKE2B 7c3f2b882c8efbfed6df3f06949f1e624bc2084bbcb56965722f38cdba75ea0481cbf8e00542661c45c3341b8016aefc997fc3333440c1bf01c072fe2580f783 SHA512 900408dac154473798e4226efe70f2245a62e6f4a95baca2522403ac8dc0dc5b982e0175b3348af81064b01d04b05fc78fbb733803dd3052128b35531a8d30db
+EBUILD natsort-7.1.1.ebuild 540 BLAKE2B 3ccd6734cc487075ffd12b84e7d28ff97121730c5546b38bbdcb29ff7119d1b77d579aded0aa835e1bb1fe3c80069784307bfc1b4fb26c6799d1e86d4d9f9bee SHA512 a52e4506b46473fc2289232ba9bdd4e135cf427a83efb51cef29a6374df1e145909d1e1919642c6ae12c2c9a4c495516da9a6ac3d6de3d829406080f17d930a7
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index f2ee199a025e..3bdaff1542b1 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 79ac9302b042..895c80a7fb4a 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,7 @@
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
 DIST networkx-2.6.1.tar.gz 1842369 BLAKE2B bac0106758fa7d33000d970873ee221ee9b367ad895f2f8fbfdfb29908851c69f632214dac06c48ab433e3b6251a439199fe3675517252c959ba2a29076cc866 SHA512 132f34eb8790fb366263cfbb501ec5ca0f9c9082562215a06a114b2ec80baf72f5489f27e7fe1cbea49749eab48116e8772ff953339de0caabf37096ce097500
+DIST networkx-2.6.2.tar.gz 1842077 BLAKE2B 8493e2d6a64d140b012ea443e9b1dc2409f8208dc1678c1d21cfd19bbdc07df6e9051aefe994d5fa6460db48320d563bb3051150782545ab5f671b7aafda4d0a SHA512 7006dcd209cce79f0f6cac4884797775422bd90fd3e8abb2eee70e6e00c9a25a785dd5856fc1657019a2b5c13a6fa5f705ea2e650c15a1f9d7d93580bc299219
 EBUILD networkx-2.5.ebuild 1504 BLAKE2B c281bc937ee2e4b13a57e6e861e4dcf881498e8b645230038d53fa6b10b800a15a999297c85503491c54a091f170604a91004a4d8c7387a67b4b36d4ea724730 SHA512 1c3d8159f280fb08aaea8dba9224db19ce801f73a991e4ec5f654ada7e9d28518eb366b05242a483ecfd812cc8380fec08770e56b61bee5c17e5f36dfec0df5d
 EBUILD networkx-2.6.1.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
+EBUILD networkx-2.6.2.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.6.2.ebuild b/dev-python/networkx/networkx-2.6.2.ebuild
new file mode 100644
index 000000000000..51a49fc1b85c
--- /dev/null
+++ b/dev-python/networkx/networkx-2.6.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples extras xml yaml"
+
+RDEPEND="
+	>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+	extras? (
+		>=dev-python/pydot-1.4.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygraphviz-1.7[${PYTHON_USEDEP}]
+			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+	xml? ( >=dev-python/lxml-4.5[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	virtx epytest -p no:django ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index ade178c7ca66..6f3b537f51a2 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,8 +2,10 @@ DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c29
 DIST pandas-1.2.4.tar.gz 5469105 BLAKE2B 7f39e3ca67f5997c0668b0c2e9792869963adcd0347a3983188a992794ad58ccba82105b4dc3315cc17d79104f7fea7a273c218967eb51b1ea1514e87aeebb66 SHA512 79e7a38b8edad52b70eb81ba821141b928c782009d59c50076e7d1e7c015078d333c0c80bda7ba720f4ccb221a0ba93a02885fe6a573567ee37ffae14ee9b2c3
 DIST pandas-1.2.5.tar.gz 5470907 BLAKE2B 2c5e0cb0849aa23ee8640528a3e29a579cc051543731e44c9be41fb989c85f1b2b18bc028e97c9b200f9894e4c3ac8af6a2100586e41f6d8a165a4c4679fd649 SHA512 c8bc2ca7ff8ca1a4877ccda67aaf49c103525d0f511636f93e1db3720d9a1717aacde0a5e3f107f8f620b59f0269d9e5c9515fbef46da4e87fca678d7acda990
 DIST pandas-1.3.0.tar.gz 4721119 BLAKE2B f09eedd848686597a755da929683e841be61cce4385fa1e4616a328e267dcd4fb44bc9ad5da56402a52da6fb3b12f84795da10cd20df7fd0b349e749dd814bc3 SHA512 67145114091901d8e2a376392d8890372675a1b5831de310715a6e6f7f4509dd8cf1a4b30cab3314f849b6c709270a246524b958b686f9e7fbe2489ce5b650a0
+DIST pandas-1.3.1.tar.gz 4724471 BLAKE2B 3c645927d25ba5cfd8f2822f07752149cc4a33c0b3b32d1f45986397b877b338a5287170281231058c37e2930152a6bd5f3f50fddf32805f05de49150abd6dd6 SHA512 ec57d123038cd4018dbfbe2da2d10211d507cdbaa849f4752c5770d017c55cf1d2c4b29f7c86e480695205e95622b28cd75319338644302732eb4ac9efef6993
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6153 BLAKE2B 3fb940dffdc0c19cddd05f31d7f065a5c5c873fde0e888b7a6a356b759dbfa2ae4729697c9240ac71b39957b9367bbeb70731ebaeddb46c778dba8e7eacbcb17 SHA512 44f78998f669a2df55b2b31c762c2e28c4e6064b3dd63f465e16a09a4843487e684142244348ee3f17a973ca98eb6645a73450444aa9a1fb984ef174f6a7e0c6
 EBUILD pandas-1.2.5.ebuild 6179 BLAKE2B 1830c307da0c8a1566ab2a47d7c93f2b591e4ad0f31274f133dbc374f12c6a206b7d8d94974c2063a44018f8197c78790f108988e353b84366e7e5b661a59e65 SHA512 00a11c97733b1ff262efd76f599ffcac0b46119508f5a444e386ba3c4d9f0cb36bb9d55afc397a6a3fabe7fb3a52ebedfed153e8f0ee59cd0355704c6e3afc33
 EBUILD pandas-1.3.0.ebuild 6410 BLAKE2B fa9b743b1cddd91d835cb6941e16118a8ca9b118119a0806ccc8d723df417d75a0fbe218b44d62c10983f25a7d1424a8e06798475ee879acb1aca71e018026d6 SHA512 cf2e4eff5dbde9ecf45578660b4fbead2299b419a104b01759c19cae21b6be89e7776ed514445527f338ca88186596c45907c73150e31ab10fe7f619a1f68dee
+EBUILD pandas-1.3.1.ebuild 6410 BLAKE2B fa9b743b1cddd91d835cb6941e16118a8ca9b118119a0806ccc8d723df417d75a0fbe218b44d62c10983f25a7d1424a8e06798475ee879acb1aca71e018026d6 SHA512 cf2e4eff5dbde9ecf45578660b4fbead2299b419a104b01759c19cae21b6be89e7776ed514445527f338ca88186596c45907c73150e31ab10fe7f619a1f68dee
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.3.1.ebuild b/dev-python/pandas/pandas-1.3.1.ebuild
new file mode 100644
index 000000000000..cf0c8aa8a43d
--- /dev/null
+++ b/dev-python/pandas/pandas-1.3.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2017.3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# weird issue, doesn't seem very important
+		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
+
+		# old psycopg2 API
+		pandas/tests/tools/test_to_datetime.py::TestToDatetime::test_to_datetime_tz_psycopg2
+
+		# Internet
+		pandas/tests/io/xml/test_xml.py::test_wrong_url
+
+		# TODO: some data path problems?
+		pandas/tests/io/test_fsspec.py::test_read_csv
+		pandas/tests/io/test_fsspec.py::test_markdown_options
+	)
+
+	local -x LC_ALL=C.UTF-8
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx epytest pandas --skip-slow --skip-network \
+		${deselect[@]/#/--deselect } -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 588f7bcd6d94..3dff2404ecec 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,6 +1,6 @@
 AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
-EBUILD parso-0.7.1-r1.ebuild 853 BLAKE2B 394b8ee3a1f2eb7fff1b1a81c4ee335166f65413ee9491e77c6cb9b84a96889d59ac6ca3c5cc3ec1e051f36e7c3ccd7d4bf173f31e296e7d0642b58317055fc8 SHA512 2f7e636c246a721be808ba86db60f63b24bbad3d1e67e4c723a61f7dfe84e96fa208cf61a13500b3a0ef62912900f1f47c09c9c76609ec57d18bfb1ab045b642
-EBUILD parso-0.8.2.ebuild 898 BLAKE2B 438f01c3e7c86b45a45ab1769ef09a423ad3fd61af7de4f8652910ad76f5c0a2e84de49e52bfb0c3cb6a12cfbad9196cba47e8b2263d054eb922d6ce745e3aba SHA512 d58a25c78bb979e61aa6d9d1d7c68359aa51c33d30bfbd82ba252c1808602e2c5caa25d80d835252cd6473ab2b60e311aff6b6d3c50ea6e860f898351e937d82
+EBUILD parso-0.7.1-r1.ebuild 866 BLAKE2B 730cdde56ea2935fd3ed22322a423d7fd4025b117ab3775b7f64517ad3735b4bf2eac7ea3de2aafbfdd41139e14b4301d13295e3d6f5313161a465bede10cd65 SHA512 725052f75029489e6eb9d9ee179287fd6b258d0f0f1baa414f76a4a9d5f322283f7a921db11d60bb64525caf76c82563ca8f61790cf5922018b4b1729065a74d
+EBUILD parso-0.8.2.ebuild 911 BLAKE2B 50944234ba8b5a49412bf541d88b342c11c933a45b4246a78e296371016e2153156a513c241f46ee2a5cc928bc7a30e28cdb26c82b4a6cd963a03029b9a5a2d1 SHA512 d37c6834563a2cc62cd6aee457fa943a6678ef416a9de66c8edaae663acf63e76a3b3fba0c35c348199a4c74b07f134a0af7dac31e52a562a7e79eb7bbcf749d
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index 643c8aad785b..d05ee8925e65 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index 8ab7282e6cfc..2aa420a8cb86 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 3517e0355b0a..3d09fd8598ab 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,3 +1,7 @@
 DIST path-16.0.0.tar.gz 44187 BLAKE2B 839c8a9d10cf4ac3f738a9e661fbfb1059554f965fc8224457c05c249578a18118129b69b46276fe569fc8bc33b398be1462d660bb20b905ecc6ab2b4db3f8fc SHA512 3874321d488543219a081adcb692739fcc4935cddaf563b58fe5a97c2cee4b5b683b2be52d220854b2f2224d15ec2bde054a53862352c249f14f1460a72d5e72
+DIST path-16.1.0.tar.gz 45551 BLAKE2B bb22684f9b8d1996d8dec5bfc3d6b116595338a6d9f55f3c6084e0c6a41d6a708174ddd6fbcfa29e37f042f65e85465f4155f71569a1851994f03ddd4e4eaad7 SHA512 85d2d0415e28eb737f9fb6eaf669b687af768c5a1c4cf20a3c36706209fe6a97b44c34ff07468d8fefae372049e18d277e245f080dc6001adb14f794654ebfaf
+DIST path-16.2.0.tar.gz 45276 BLAKE2B 40b8eacc7e28398324f24b955adef11e5fc0bd512cd711cd3117f35a322ce0c3959b55255d4c96bbae64f914b5f3768088eb73fb45511c09f2e21bf99b3e9911 SHA512 f893d9fe3539eff0b43e4945076f770ffa7c3125151774d6accaa3a609fce351bc121562deb7ef695c0b1fc7aba12ce7487ae09a0b5daba2d5340586fc41ec79
 EBUILD path-py-16.0.0.ebuild 991 BLAKE2B a34423a4b0ff511cda1b8a151966e776003fb904133da0c9049828213b585ad505a611949e090bee441966b2941904383c1d285d3321c5740389657f1a8296e7 SHA512 0941a3669633d256d38a47f497032229f7590f25d87bf76c7daa43f58d5feb84025ec7fdf26faca12e0cc67b8b5b0bb373f8c773849f6233d56c87f185373497
+EBUILD path-py-16.1.0.ebuild 999 BLAKE2B 0d6c40958fbcadac91a06ffec620f371c9935c0d08734f824e586a2f1fac6860dddb00f35cdcd25ce2f4441d4ee36290ef982e4a580027ab8abf2c7a360bc116 SHA512 cee88aafe108d1f0573a35ea4111be59630a650feeccfe6de225e059ab19c83592fe488d786b964734f6ee17e66f292b42c2bb77ddcc5b7b567020ff63c46aa0
+EBUILD path-py-16.2.0.ebuild 999 BLAKE2B 0d6c40958fbcadac91a06ffec620f371c9935c0d08734f824e586a2f1fac6860dddb00f35cdcd25ce2f4441d4ee36290ef982e4a580027ab8abf2c7a360bc116 SHA512 cee88aafe108d1f0573a35ea4111be59630a650feeccfe6de225e059ab19c83592fe488d786b964734f6ee17e66f292b42c2bb77ddcc5b7b567020ff63c46aa0
 MISC metadata.xml 382 BLAKE2B f4e983fc27f8e9a578a8469a0b432adf91f622d9993bcdf9a0f25f2786680eb26a67d53d1c97deebc8bbbf7d62ac5b37b2d5a44b39c81f3862e0ffe2cbe2e577 SHA512 61909559eb0ad81e607bdd7b9b147f3e9c71e53721ddd99b1cc2afbe8e33ca7de2b9849ff3ff7468183c5f82f108b958ae0ce3042998972dac8eab6338040151
diff --git a/dev-python/path-py/path-py-16.1.0.ebuild b/dev-python/path-py/path-py-16.1.0.ebuild
new file mode 100644
index 000000000000..611ebee5fa9f
--- /dev/null
+++ b/dev-python/path-py/path-py-16.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P="path-${PV}"
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
+SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# unreliable, not really meaningful for end users
+		test_path.py::TestPerformance
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/path-py/path-py-16.2.0.ebuild b/dev-python/path-py/path-py-16.2.0.ebuild
new file mode 100644
index 000000000000..611ebee5fa9f
--- /dev/null
+++ b/dev-python/path-py/path-py-16.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P="path-${PV}"
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
+SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	!<dev-python/pytest-shutil-1.7.0-r1
+	!<dev-python/pytest-virtualenv-1.7.0-r1"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# unreliable, not really meaningful for end users
+		test_path.py::TestPerformance
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 8668020537f7..15f89783830d 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,13 +1,7 @@
-DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2d509ebb8824a5b2fde709db341366ee2b8f8160e65d876c2fff0aa7da54eddb1fe2b9fd524b0c25adf79779e21c SHA512 6bde2a538cdaf55460083c54a6d55ddab3ec4ba127dfc77d3f79da8492ff50ffb76281312395973f8448c360ae53b0c9a0d090258f43bfdfdf420336c99fb423
-DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
-DIST pikepdf-2.14.0.tar.gz 2309588 BLAKE2B ca0af8ada258742571afa1133ba5ea282ac7a44dd34b5ebc24091dcd36629ac97b1c7b0e7e65cf86f0933a13423b9b5011d53ec75cd7b0bd614917443e72b793 SHA512 3b6c61f14581934aca2293b1d42be1303234209bd5fdd24216db57df765470591d5252b912de9b797f885cbd52ad610666d86ddfd1c279b97b1058cea36eb378
 DIST pikepdf-2.14.2.tar.gz 2310009 BLAKE2B 1afddc090e8e92c57843fc25cd7a6c8ef75e4f9c46144b10e91a96747b0a800a38715ace4d9eb5a65944b4495531417e8a34d7c34e1136f04df6c2c359ac2771 SHA512 cad165078bb634d6e5202ff71ab8d11f89a47974a3dd33c237b804f2784582b739bebfc6ed99664c98cf274c16dadb718a81d95710827be711e7d7d4c9ce5f77
-DIST pikepdf-2.15.0.tar.gz 2310862 BLAKE2B b511f9e721174c28898ccf0a00c84162b850b911a08815f400ba7269a9860dfc4b77b311139cad30fd6817a09938d360f8348d9d42a5bf2cc72e630523835644 SHA512 d43cd5759d053416ed4ac84150a979175ade970ad7f3128641549690a47113656739694af0589ba9f7202410be08698e048a38525d9ce108090283d9f1546ff3
 DIST pikepdf-2.15.1.tar.gz 2311058 BLAKE2B 47c7600ed8c27970b2a45dd5cd557ec6f18782f826a6f31247885d34564935bae2d92f6702fdd635d38730bf6a01e9c4b41251a8a94b73c1828677590bdf84ca SHA512 d71931539f87c64319e45710f31d01ec1cddc5c6bbf15948161336344857a9497ce61140ce4631af3e7708fa13e6e909eaf4bfb146c68f7a8b2ce1f03e206cd7
-EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
-EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
-EBUILD pikepdf-2.14.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
-EBUILD pikepdf-2.14.2.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
-EBUILD pikepdf-2.15.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+DIST pikepdf-2.16.1.tar.gz 2312177 BLAKE2B a7695ecc71621c1e64ab919e76dabd3a94ff16d401861fe50f29f00832dda8be01f3e67c811756ef89573345b49ec6c880635309f859624b9df42cf6eff7b43b SHA512 d2c73a0a69c6cf0ed22dc2dc949187464abd4194a5d917e5681de033d6a8ce4c089efd49eb110c9fa11f9dead292aa6ab7ed71a01f7cbaadc51d1f37a773c936
+EBUILD pikepdf-2.14.2.ebuild 1540 BLAKE2B fd8b5c1985b0971583ce83b0400719c33fa87cb7a9d3e3d3321a4c07baddfb681d406ddd579ee17d3ea41fce780d4d291c0977c006ab98fd7b0ab8ea1aad52e7 SHA512 8f9c2b0c5cec84cfd95c331d19d8fc43df526aa37e7e8d4ecb8bf85d91707d66089b3c05428e627b61685bac85426c3c768bd2956e3f69f08bc3f523c5cf5881
 EBUILD pikepdf-2.15.1.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+EBUILD pikepdf-2.16.1.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.12.2.ebuild b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
deleted file mode 100644
index 9be38c49c018..000000000000
--- a/dev-python/pikepdf/pikepdf-2.12.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.13.0.ebuild b/dev-python/pikepdf/pikepdf-2.13.0.ebuild
deleted file mode 100644
index e8d4a2650905..000000000000
--- a/dev-python/pikepdf/pikepdf-2.13.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.14.2.ebuild b/dev-python/pikepdf/pikepdf-2.14.2.ebuild
index 2e4514c389e8..b35dcf5d5062 100644
--- a/dev-python/pikepdf/pikepdf-2.14.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.14.2.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pikepdf/pikepdf-2.15.0.ebuild b/dev-python/pikepdf/pikepdf-2.15.0.ebuild
deleted file mode 100644
index 2e4514c389e8..000000000000
--- a/dev-python/pikepdf/pikepdf-2.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.14.0.ebuild b/dev-python/pikepdf/pikepdf-2.16.1.ebuild
index 2e4514c389e8..2e4514c389e8 100644
--- a/dev-python/pikepdf/pikepdf-2.14.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.16.1.ebuild
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 41d0a5283591..48557e4e384e 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,6 +2,6 @@ DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722
 DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
 DIST pillow-8.3.1.tar.gz 48722889 BLAKE2B 4483c3cebda33e57f665a7a73b5898b4f0fb5be895ec05feeb266a99f33c78fd1b550d82225c201ea015d267206f5b47909b4963da9f17d51d0e5bd897332a77 SHA512 22a85a5510c8ec13928af571ec7f329f4728c46ebaadfe338d837f6d3718eedb57b7548fd9a3260a3bb0c0f97b3f3c911e730af01f90ca70c967d44b1e5d3606
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
-EBUILD pillow-8.3.0.ebuild 2627 BLAKE2B fccc81f2b2258a42dd70a7aabc1eb66a494f0f6f5dfcca0bcccb4a6d0cea5a81d43a1e15728301158f58d7c726a67cef1b123b7753f7592e420ab1a1cd3b3ab5 SHA512 eee259b4c67547014c84af2d4d034395efacec8f5119735530c51a6d9424fc71d759678b68c9872a9c393b863e6a46df2f9a1a165959c22e45384a99a96835f9
+EBUILD pillow-8.3.0.ebuild 2626 BLAKE2B f30f0079e2d884bb8b8d450d085037feed17d03ce1f481fc3d58d39e05535dfed6134ce2bd13093f139e0d15b044c7e250cb1f0019c99ead4c5dd1e186fdcdcd SHA512 7b7c6c37719d3e09f80f3f5e434cbaceae64b6dd1321a79f884dbfb31fc9978f85ebf06064e305b6ae674f7c9cd22637b6a39c0d70b84e21c8fb1dae1d699fbb
 EBUILD pillow-8.3.1.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.3.0.ebuild b/dev-python/pillow/pillow-8.3.0.ebuild
index fc76b7c92491..2d3f81c0ab9c 100644
--- a/dev-python/pillow/pillow-8.3.0.ebuild
+++ b/dev-python/pillow/pillow-8.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 149cec3ff0e4..181bb6788999 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,6 +3,7 @@ AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d
 AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e63e98d0613c3cbec6b633699b2a1688652e00d6f31ec82eb399c7c87e0e80e8f8ff48dc0dbe38f84a7c6f74124e76950 SHA512 46074b0705048de5c7e0be2c6a3fb88f15553dbf44bf92d6e0f23fd18510f4d6a2689277299d748bfc3f44a6ba7eb9a32a5554052b391fe69714ce6ffc217ae9
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
+DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
@@ -10,4 +11,5 @@ DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
 EBUILD pip-21.1.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.2.1.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.2.1.ebuild b/dev-python/pip/pip-21.2.1.ebuild
new file mode 100644
index 000000000000..dfecccec8ab1
--- /dev/null
+++ b/dev-python/pip/pip-21.2.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.11
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index d8fd843e8ae0..1425b22ab048 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,3 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-EBUILD platformdirs-2.0.2.ebuild 594 BLAKE2B 6ffbd439318d426e4d929c4f06370e6bdfadffeb90650594f1091af512f6bc1e8880f64a05e521d79bd407b66fb0f8f7fd3264c01ac8be79212b1352c8ebae81 SHA512 ad6637b33ff03b9f3af792f45fc090dd4840069911e85996b3d5ab874e54e0e9a3235536904bfa945c88e58b0b9308d04a838e31797873ce8e33a200e8245bbe
+EBUILD platformdirs-2.0.2.ebuild 600 BLAKE2B 498e9ea8874b8ccff398599dd4df4a78240fd0c53292924352f8dafa5c07c530bdaefa16a98cbeec6fed55da7d48344c8077811e288b7186aa998af0ca4a36e0 SHA512 0253ac42806a5e34b1e0bb2c8e3d4be0ece79364665a64f96ac499f097144fd40829092c9398542f073c5dccf52d0fdb1bbf68536148ecc52982cec814ff7862
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 854f3231a6f5..71db9d69770e 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 784d21bd02bb..494c1460e0bb 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST precis_i18n-1.0.3.tar.gz 64037 BLAKE2B 99486f8791785ecad7f3a246a0a13f26ec52aa91bc40ac904e92409f2cdbb28a5458c153da593ca8dd626462f0216e8c72447fdc81f8133ed61240717d08cbf7 SHA512 afb987fe4d0fb2732c62585e70361ad5ffc14d1eb9b8e767fe314fa9a3dee8dcd14f2531f5638d3a72fa7ac4fbeed94ed8907976816570257b405468cdb6702a
-EBUILD precis-i18n-1.0.3.ebuild 497 BLAKE2B c7f0f22c87372b7b3e160858783d769cadcae41c7bff6b95af593e1253f9406413829c69c520adfd6197cfb5cfbdaf31a918e6ff495e8504c3629c5bcdeb47ef SHA512 9b66a48a5552a2770e8b29b21ce3a7024be9779053b84d4b69420118c9c4ed6b232aecb713dd1b1963ebec8dd8375d78b54e7004c0454786825a4ac9f68b7c95
+EBUILD precis-i18n-1.0.3.ebuild 493 BLAKE2B 851384264c8d06a9c0039668f3fb7d5f5db4704aeb31a24445e8bbafc5a5a184605dd33314b76acce578ecd1499b77dc304de3110be735c69c25aa83eed73bca SHA512 41ffd5611773825ec3d6befcc69fb7439739936c22e801a2b1c11e39c7a7dfb1544792222ad9d611129aaacaa54b1e92773d4b16028cee8aa2218572facd6b99
 MISC metadata.xml 918 BLAKE2B d23b58dbec4b4a3ac224ddb0413c70ae2ce1985c4a516ebb87ce9ed960c570f7dfaf7ac535c20b6fca401f49c81a1a3ae6df5df101593bbd65070ab50356edae SHA512 a04fd3004462cb9619f284ca076be314757dccadf916ade53eb5f2989fd5b4eacbea0817391a2380eed7358d096e2a5a253188f441be53086bb0d4c4716d5c6f
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
index 157bc735dd9a..3d716b4820dc 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Internationalized Usernames and Passwords"
-HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
+HOMEPAGE="https://pypi.org/project/precis-i18n/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index eeb5128c4434..d2eeaef39405 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,6 +2,6 @@ DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880
 DIST psycopg2-2.9.1.tar.gz 379972 BLAKE2B 89a05f0f3e2f426848641bdf07bee1846a5512dd248d7e4eb4723dbc4f7775b00d142217a5cc59e126eeae8e672173b63de3b1152e3bf14dfaccf5fe7149c88d SHA512 478eaeaad98e4521424a0a48d5f0fdba934bb3b682ba111cc37b833cd3c953ad5fbe2a2071d3a9b95c6a447e95de88887ceda5143b63a08703c388f96dd9b4ad
 DIST psycopg2-2.9.tar.gz 379805 BLAKE2B 4e34b9dc28d0922ae9e9f75dd734b961915a032eba0c4b5ea9c4fe82bff4d5d230b37b0efdb25b8423177fdd7e98e69d0ed6ae0eccd731dca212845966b9c0ac SHA512 9787d0d3bb163815a452139bc3fbde93c767431b3e31c77dd534b6a476d1c09a51e2503b0420ac7a3753ef7fa64c13e2643f4bf4aeaeb60f15ea4eefc3538bfa
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
-EBUILD psycopg-2.9.1.ebuild 1319 BLAKE2B 20e2e26a3816f02ca6964d730a6ccec8943e539d7bbeb4527479bd824ddf24186ab0b4478ca8f8b9d0434fad21af334c922338efa31019ed5193d80b4b6b69ac SHA512 a1a73dd8eaa28f4ebb5a819d2e2f031f6edea10a3b0b7356f1a63b7b3e900e2b83ed1711ec2a46838efcab826157cb09bf2e257705faeecdbff8917ca3d4db58
+EBUILD psycopg-2.9.1.ebuild 1314 BLAKE2B bfb0b2322085761cc582386671dbe273daddb7173bd142655dbbdd4ed395b02771ea5e367dce2513f9c32622f2baa7409ef3b5b8898ae1d9b68937301279f099 SHA512 972033aa2d972de28305ee1560f841bd80ca0890f2cb2c823acf91d60148c2d7abd01ac711294835b2efb09631ded33058179f501cd89b49a71d3c320e8d328a
 EBUILD psycopg-2.9.ebuild 1320 BLAKE2B 979571fb982c3f10bc2e372ca057f58dd5853c548b5f0c6f323fc21130bd28a0f63efa73185401b104ef7c7ecab9a02d6b1031cdb21a94d6efa6e77fc3e7b358 SHA512 80df76f557598a869ae34a7f917863de7c93ce1a66dc4202fa76eddf360360019f45e98cdd5e7e7b3029201d41602f5bb8f502c4644825bf5b2f87847e419e92
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.9.1.ebuild b/dev-python/psycopg/psycopg-2.9.1.ebuild
index 8b69cf001c15..dd341bac2755 100644
--- a/dev-python/psycopg/psycopg-2.9.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.9.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 955276ff0151..102f2cd24bb0 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,4 +1,6 @@
 AUX pyamg-4.0.0-test.patch 589 BLAKE2B 2b337d2815b4bf091a30fcb03b8c9270e601a0dfc5c1d3ed2a4541e8af1d026e8d56a517097d403110eb91c675cc07177b0fc96c81fa48cf51cabccd81da1112 SHA512 c6419ae72b6231015f46679a277d61755cb11cdf1a586789d6cfddbd28ec548ced6bc81c4b973011163d6be76509d26035636ba5952c8bddc3d0c66bc258142e
 DIST pyamg-4.0.0.tar.gz 717171 BLAKE2B 16483d829e8a938359827ca8ebe3093c890685244125576e05220910b66e9aeec278472134d10c589e58dfbd363930cdd7ae13d16c9b9d54c1bd5250e66f4677 SHA512 cdd27834c12ef18f023e78b5b946c06bc2c35f73cf65fc4c76da2fab75f23466e6c1a4b3dccb8506be3ada7e0bafda38122d3d7315deebc7959d2e5300d9add1
+DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb SHA512 311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
 EBUILD pyamg-4.0.0.ebuild 691 BLAKE2B c1305d310c4ecb3957e42b67100da3cafbdee52565b394c16edf2176e69a6e1c214e7c3935fecfe090bad576f2c393fe0505b8f9a844e01f0043fcf7df22d9ab SHA512 e2bfd9bbd83300b12800b534713e5b610f5abfe4fa61bac3d09102e60df265e0654184783f98013cb123f55a69ee9737830e294949fcd464cd4b5363b91c5aa5
+EBUILD pyamg-4.1.0.ebuild 737 BLAKE2B b1f0bd7c9f9cc65ca6d6aea2ed93078c50978d8bbd3b62fa9bc4c90556154151cefb683472bd5a4f06c3bec463dd08bc19a1fdcc642237bb01766907ae700feb SHA512 10b5cbb4d98f4daa312c6edb6fcff91df85ccc874ea52633d9f7f5f453f8b81398deb9087867dd0dbb0e5959a1f5c0e5beada9e15dcb7910c037daa526901418
 MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/pyamg-4.1.0.ebuild b/dev-python/pyamg/pyamg-4.1.0.ebuild
new file mode 100644
index 000000000000..27080fa711fe
--- /dev/null
+++ b/dev-python/pyamg/pyamg-4.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://pyamg.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+# cannot be enabled by "distutils_enable_tests pytest"
+BDEPEND="
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+PATCHES=( "${FILESDIR}"/${PN}-4.0.0-test.patch )
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index aef74c585ec0..c70cc9e7c1b8 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,5 +1,5 @@
 AUX pycryptodome-3.10.1-parallel-make.patch 837 BLAKE2B 9d7b3088d547d294dab498dbdcdef7f5eeec0ef8c264fd62a49e2e64a9adfc785f8becae91a6f889184e53af04aabe638d503f523daa62edaa3bf91596a268bd SHA512 2b2f310a3ab332f9d1c2f7742fdd902cfbecf49360df3412839cb67bf69e8eb1f9e051461d4264ff7d732d1bbad285b5a635aea085945d543c2b58e880f0b807
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-EBUILD pycryptodome-3.10.1.ebuild 1433 BLAKE2B 647397fcc209fbdb79fcf043eb4b46b1b5286fae3d58764af4615eee3fbee01578b31d2574b9714fb1a957b3b63a2d5bd6ec0cb97b44eb0a24c70f11ea17219a SHA512 654f6de5a745f8366335f42f438b2b61fccd87965fd503136f3f7f30a77d5911c9a6a58ea18043598ac56ac93593776dea55063f6749114c13e51ed5d083a216
+EBUILD pycryptodome-3.10.1.ebuild 1440 BLAKE2B 9300c91d1d20d4bb389ea463494d71ddf57c4407b841d2ee1fdf34e05a8da671568fb7a752e14f74607536f2d0e921772fc6c6fcdf072f04d28768411a5cdceb SHA512 4826f56939ff2d232d65a9e47501807ce431327b6790fe896399b1ef4640b672e0970600dc4a792b130c81ce2a7d3e200297e5eb7847d21ee4c8900d4286c80d
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index d32f4cc20f80..fb97fbd66b4e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index d5df57123b2b..69f78dd9106d 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,3 +1,3 @@
 DIST pydata-sphinx-theme-0.6.3.tar.gz 2617286 BLAKE2B caac09add734ab3127461f3b54069cf9bbb22b00b54e6d0ed999ff6d7783f68d2d97bf31d19ce99bdefa0e1d754e6194e5ead8347d89c5d704dc38e148fff619 SHA512 0106accc2f7b64899d09d1da5b39fccd074732c07db78a924aceb403923b3d67cdc0592834211ab1fcc2788ef55616da63e9eb058a7909b2486006061b6d367b
-EBUILD pydata-sphinx-theme-0.6.3.ebuild 967 BLAKE2B b2c91676ff1b2f0294c8c13f79fed8ed95d5181b1ac8765df8cbe4cb45ca6da0cf88d4076b15e5e808b216d9a96aaaabfc894cc19d1fc106e9c4bd1547f46c2a SHA512 e60aeca079035b002659eca7cfecfc2e17fb87b239bc2c648bd78769025e8b74f8459fe6dd9be9316175a87c3e696ed614ea21bc4455009f391ec88825750469
+EBUILD pydata-sphinx-theme-0.6.3.ebuild 968 BLAKE2B 00c52a481cb539f3d321222762a7b3e2bfd20c91d2c7df977ae74be70d3bd66a0bd8193541908d389b774cffd6e0ba2753be37eae935e24bcc5e178c802e765b SHA512 6c5c5434f10836b0ee7c1920cbceeed3d8b517225fd01d95d41c3f259a982d2176e17bb79dc071d6ee87a0e8f6e98a0008273c1497d78d12f5dccee1e3de87f9
 MISC metadata.xml 531 BLAKE2B 29ac12ff8537f67bd180905341f96eb0d1ef88b15fb194ae08c37894b7a784f66f97001e3a5fd8c522020322644d06b200029eeb22a9f4a35bdcf7297eb5c450 SHA512 9174d12f80cd62c94dba8aa34003291b074f3c859c98e223a131949d6b6ef061add5782d2503d1e0af99b923f95f18844652282a6787601a06524816760c9e29
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
index b88251f345a5..c690200bee56 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 6087935829f0..b44d6b04e680 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,3 @@
-DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
 DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
-EBUILD pyglet-1.5.17.ebuild 1249 BLAKE2B 29ce40ef1be1efb2440908367b279b0ac865b5e10a416bb43f8fffd4bb89622ca4e43279e50731662fd7ff4803cf220866bf45c133b1a94fda54f34606b6d91d SHA512 e851e9fe37b43f1e656e454377643500cddf4473fa52d91345d754d858d4a2b51c3e1e8f5d3b10d441568f9c2183bb5a23d074f24cdc6812b8a7eec248a683eb
-EBUILD pyglet-1.5.18.ebuild 1250 BLAKE2B d9bdf9bd9d243d3c423374456c0609a2bbaf30f02cf87e0ee676422b199024c4770b7ab1248cbf62d2e10cdfef7bd22f5c9ca245531e01ae9c03b8df81768adb SHA512 5d947bf695300235902dda06acc7be85a3af28b6c23835023996a502d4b892ea977cd6e942415b84f073f0005486afe3cf75a8d56a8646fb692af64c12d0fe6e
+EBUILD pyglet-1.5.18.ebuild 1249 BLAKE2B c334f422e5c5ca40b5098d3cee0ab37a0dc5c2cd73b51ffd9b54914f1326e741b211fb1bdc7a1c4bc048f27842d478d542783fd59bfef9dfb17e65b8ef443969 SHA512 89edf1fa62b8ae5c669efbe3a892ed6815110e324b1df8fa8f0e4182ddbbecc9da16dc7f0a4ad57f538753de4a664e620b9e53a655db3ee4ae386263695141c5
 MISC metadata.xml 1036 BLAKE2B ad16f5e991753cf8e6291b5cbf19f791684617eb8394528c0b751d57c9091ebb73112f9a4439f9b78eb2d648d0980bdfbfdeaf0c6671bf5d0521bb87f19011a0 SHA512 efe3d7ff5ae120e037b0521c45b67833f4cb57802596793704fee556b36e2a6f6797bd948254fb1ad50122a2927bea7bb5bf6b715caeb09648e7d4facaa6734b
diff --git a/dev-python/pyglet/pyglet-1.5.17.ebuild b/dev-python/pyglet/pyglet-1.5.17.ebuild
deleted file mode 100644
index 9ec70e8d0e48..000000000000
--- a/dev-python/pyglet/pyglet-1.5.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	epytest tests/unit
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.18.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
index e533e64c024f..24e77b128b01 100644
--- a/dev-python/pyglet/pyglet-1.5.18.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 69b4e25ee063..5a990ba81d1e 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -7,5 +7,5 @@ EBUILD pymongo-3.11.0-r1.ebuild 2642 BLAKE2B 3ab0a0f617a4aa61880829f1f507673a2d4
 EBUILD pymongo-3.11.1.ebuild 2743 BLAKE2B 9a4e53be028428053e1b8d7478c4e3e336488e52c75b667fe3f17176e82a9c8275cb9d278ed921bb54b3ef6ca66d7a3a9beaaa3b4a87805d5f2d7e42ff103691 SHA512 937fd738051a0cceb969ac14f26cc27867c874b0aeaabad7cd9cdececcb2bc960d0592a97ada6f55a50bb92a2ec4cfcefb43583ee46b445b63adf66af151df2a
 EBUILD pymongo-3.11.2.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
 EBUILD pymongo-3.11.3.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
-EBUILD pymongo-3.11.4.ebuild 2703 BLAKE2B 984e13ac067fb62a61d5fee095be170a528c14940e8c92e3da51c0d78cab3a236a61d3c0525767ee9fd62a12a1ae2e030eb7ffc653b08acf2ad5732aea21649a SHA512 b5af6cf77fbf13528331ac0ac398da829efc2c25eac94eae4efee77c3eb75b6d0a41e0ca586bc2d97c791eeea31bdc3b01ec80c69dd62d4d146f60a5c49dec94
+EBUILD pymongo-3.11.4.ebuild 2710 BLAKE2B 386d460631c49eb84cc9ad452b4237aa9e57de38d4c5d3e054142880e719ac81f37e67d9127244b8730b3c984b2621c820f2dc06d7c2f5af1d430d2425f7351d SHA512 665fc42e38e56c42836bb7d32603085c2bef957f52f7e0a77b2a650875f098499eeb752436b1a96b57512b126e6a22a0ed7444a009ca8d3de14aacf533965482
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.4.ebuild b/dev-python/pymongo/pymongo-3.11.4.ebuild
index e4049abe9d41..45b6e2b41d63 100644
--- a/dev-python/pymongo/pymongo-3.11.4.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit check-reqs distutils-r1
 
 MY_P=mongo-python-driver-${PV}
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~riscv x86"
 IUSE="doc kerberos"
 
 RDEPEND="
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index aae763d92a96..6cae00c4dfe8 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,5 +1,3 @@
-DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
 DIST pyscard-2.0.1.tar.gz 149193 BLAKE2B f140e3e62635634de8125d88c69e4ac3657468eef04798b4ce5b20d73905189ced71f041ef7742233a185aff8b28cc0fcda5af175d6dff21afeff84f062afcce SHA512 c9292b9616f150e500b308c47b0d6ed6f869f2022149c99a7789f8fef8c145dec4db84d35b6df30fa31d4007dffff75fcc21c9846693eccd9bd3bc8ec77fce5a
-EBUILD pyscard-2.0.0.ebuild 692 BLAKE2B 44c43a4eb72492a5ef29faa069ede7c51aa12f47a308054e241e1ae56f8dea35147df2afbbcfa0a3d7b80f1a56fc19d60a76a7a5b1fe1f2ffa5f16c0f7445a77 SHA512 a4b4aa1f9b94266f4ffe3551eba2de405253fa663ae7d35f7912e88aca30e168e70a2a473b9622acd0dde4c4c6448509503cd41d305ef3a6c73c0df5f1d4647e
-EBUILD pyscard-2.0.1.ebuild 690 BLAKE2B 0fcdea4ad433dd3fd9cf2efda3aad417e3b0f43be27ec7b0239807fbc1d8c7e1a989474e16ea3c6a025c415487f2d09808633f7dc145e2e1cd23b7e1445a4ad3 SHA512 54534ea020b12bc6ece1e596f8c53b60abfed0e04ead29ee770df033c720ee3dc074549c57654bda3a79e97b041396daf03ca138f376320bb5782ce3b2556a42
+EBUILD pyscard-2.0.1.ebuild 689 BLAKE2B e43f6bc8cd4bc377adf932b497f4ecfa793d054f7e380b54fa7c43eb5ebdbc222ad4e0aa27a746b0c9e049d591b4b83cc5ca3d0f2cb9596db4559e960283e3c2 SHA512 ff90be9d70d0886b04429ddcf1dfc5a109a8cb380b84fdfaac472b877d5e1e6d5bed76369780591d99e77b532fa69418f988c2f2dcd20a31929eef665b0b2d44
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.0.ebuild b/dev-python/pyscard/pyscard-2.0.0.ebuild
deleted file mode 100644
index c3bdd158fd22..000000000000
--- a/dev-python/pyscard/pyscard-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Smart cards support in python"
-HOMEPAGE="https://pyscard.sourceforge.io/
-	https://github.com/LudovicRousseau/pyscard
-	https://pypi.org/project/pyscard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="sys-apps/pcsc-lite"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Gui support" dev-python/wxpython
-	optfeature "Support of remote readers with Pyro" dev-python/pyro
-}
diff --git a/dev-python/pyscard/pyscard-2.0.1.ebuild b/dev-python/pyscard/pyscard-2.0.1.ebuild
index ec6604b6a15f..cfd7922e7568 100644
--- a/dev-python/pyscard/pyscard-2.0.1.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 90b4f9d8b955..fe154751d134 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1.ebuild 608 BLAKE2B fb061d9fa9d797efe3ca43aedebd480de6d43ff8a9b1b8e000e6ed596847422fd9fd0e7e45140b8640c349d27689700971410980898cfc0a31e7a8726fd57641 SHA512 2ab701644cdf08a687a2f7bf5610aeef0b7138bb3446eeb7b1dca4fd8138ccd7787a5fce150c21acbbc39c6b882e5f59c218b38a81e5c6679633f8e24e1af197
+EBUILD pytest-datadir-1.3.1.ebuild 613 BLAKE2B ef60c0fc71c3f11224a31dc2262a7972415f5c1247fc621450234dad26468df1fc5f7857ebe461472c40431bcc5e5d7d5d7d4dfa6b5b95efc2358e21a55860fe SHA512 0766686899a801c07a33e256b46a0be014ccbac82449081f0a978726bbf47651069a7c1f7ebc790feae6fe9026befa548880125790cf3673c25698f40610f11a
 MISC metadata.xml 359 BLAKE2B 41902d1f5543ce1c93f41cfa086f273b440e0f69e59601ab48ec57ef4e5371a45e2a9b3d913b406a46b16eb073b30cff8dc30c09ff66a16b9010dcb5982460b8 SHA512 b0cd9e7e16cafb7051d23fa47f7eb0e6ebffc7cd2334c539dabaa252d5d1bcd3e4db51afab71fcb3e03e933384735bd49d378cb4fe2f8558a8d3da91bc429cb5
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 1b2a63288973..7d375a90f87b 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index dfdcc5517136..3ba1c26bb038 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-EBUILD pytest-regressions-2.2.0.ebuild 1067 BLAKE2B 7c71b39503281a8b6be61b5ef690f52c4c877883ad726d9699782359f5f5a66f1127be9dcbc447c32faa810fc7a108170cd6c31c1ec3c875608cef7c831723e9 SHA512 8b324aabeef709b3320115b890b3c57e1d31697e525a8f712de48e24ff42d6dfe4893bce16e6d3abf4f80e0fbb87412e5f6f9fae35b475820f4e80cbb64f9f1a
+EBUILD pytest-regressions-2.2.0.ebuild 1072 BLAKE2B acc00f997fa2bf940a4174338888ca65404fc0592ebfe3d6a35d6eb95b70cd64091007b4bf5660a088ee1d4e98f820f6c7ad09b3cf588ee7734318835a79dee7 SHA512 508b5ae2b21d610026c60d96343967a9884521e0c8ffa1b080db6233912a46c40752090efe2a470b5b2a0a16c850b2380536cd7551e84f42e8666d37c4f434aa
 MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index fa7829c72396..50c202516a7b 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index b61b9ed658ee..8e170c58ec90 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,6 +1,4 @@
 AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
-DIST pytest-xdist-2.2.1.tar.gz 64956 BLAKE2B 7ea18b0e7893000ed9d8718506a7b0f7cf45444196a23e3defec34639c2159b52c7a533ddbc0e0a9b3c3f1e0a867ad5c85e3549167e9b7049ce718646ed50717 SHA512 0732f5ffb56eead3d1aeecd37381c2d9c6ed22398e8e51e9358b562765d737ebde48ecb6fe9f90d9a46902dba1422721cb2c7bfc9fc13918aa2c3b8e6a5e48c4
 DIST pytest-xdist-2.3.0.tar.gz 66072 BLAKE2B 367ff15cd46b8594668ccd9710a2fc7665295d41e268b464b81d5e740a580d70621a1ab5ab590788e44887b7aa3049a83853ea097c0cff54e22c3422c8f11b24 SHA512 bf49a1684b29f0ae21621b9d293f530cf2fa3d88b33f631fb803aef872c0d5ef6b3bbf2e16d01be8a6c1872fe3e6cff86ab842e3000b9e642fb46c2a170627f6
-EBUILD pytest-xdist-2.2.1.ebuild 924 BLAKE2B f6dc3fb9beede5a58e7d1ca112435f287b226bd78326bfd6ab2c6b74377da6770d462d4f7817ae9888ad756f43581146721e55be798f8e6fd41895311ca0805c SHA512 214b7fa4672bc009b6f5c5176f26912c888d5a5dd895cb0c100c3bfa11cc827dd093d2b7026cc456dc325caeb9464da1e4deeba1634fb732dccc72de78098125
-EBUILD pytest-xdist-2.3.0.ebuild 932 BLAKE2B 9e5421027442ea79ce82395adc2221cd97c9a84fe7e05e81cb678029a3c4b6c56fa23fd83749413729cb60ff78d1bd47cbe8f133606e1e4b43b2e693fbf1e430 SHA512 7cd7fd85edfc39ee9e1328066fb6f6a33642a0efaf8f0da663910b420b59d12dc5e404794b06eaf16c54cb4741340679a3cd6f961516fad3fd2cadd26a898934
+EBUILD pytest-xdist-2.3.0.ebuild 924 BLAKE2B 0a88f0aeab027eaf95f8dd92c5fefbf23ec685743bcb71925ef7d35e64de52307e9a83a0e1927ab51e37cf7894fb9660f931a9eb6873006880d2cbe4a25f51b5 SHA512 13626bf5baf5d11a1e1ea98a063359496dbfe01b861d4c13e3d7a2fc3f3d609cf2e9b9686d1ae1ce9e1db47ff7a401e0fa401526e15589f96bf4192529bf5dfd
 MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
deleted file mode 100644
index a05d3a645b0f..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-services-conflict.patch
-)
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
index 127050a2150e..e50a1049d0c2 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index c5c54d5e7e66..5b54ce93298b 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,5 @@
 DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
+DIST python-bugzilla-3.1.0.tar.gz 115259 BLAKE2B d3eed35aeb9778e23266fb3ce1fc477a93c09533c78e478292b90cd49668f2627d7ef47afd46973898b4d5de474399aae5e94e5cd776d5608d32325dc826c12c SHA512 8f95a60e559cc5b4576d81f37c7104d6bd4afae21986db3c5ef05c6021e601690a01ca97d67fa37e97026f0b97762594e8edd0454953e31930fa841696f65121
 EBUILD python-bugzilla-3.0.2.ebuild 656 BLAKE2B be693d87efe97dc3c803db278f531d0702652e80408bab9b3ab4393bd9ab128188c7928cc773c779ff60a69ab23e38e541c7658d60a02881640755e2382b95ea SHA512 48b21bc7ddc07d3f61280326415ae633ef3cd2e6c9c2febbffcda189c0d95f48f3a06f512087ede7233dbe9953b764c650eca0b536543c2381f57f33fe4338a1
+EBUILD python-bugzilla-3.1.0.ebuild 668 BLAKE2B b58abcab04dde18addfd3225efdce26e5b2ce53e21c503e62f593f1db37fe5a7ecb7027a39a08c3d7baf0020ad8f100398a68f1c6420779bd9d1a0dcf546d1d4 SHA512 c7c9e0af7ccf8c1aca87ab166d964f8e5fbd6d9f7c8e74f3462e526dfa0a7211a71b334858db710255eebf478b6eed5e2210066e94b6bbc3b0233dec46012284
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild
new file mode 100644
index 000000000000..137bbf61ee25
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-3.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index deac754f3ee2..2a24fa6e09de 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,11 +1,19 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.6.13-docs-html.tar.bz2 6016532 BLAKE2B b1aa4fea09f84615146a160ebfc7f2a40481397f25549f8935ea83b5dd5d6db83c0e8ecec94efa9941712186f93b8564fbda7a579550919bfe3ce47adc6c0a84 SHA512 7bdc77767211a652dbbe654cf9675e325a959d1d90eb751fa2f86abd04ddc41301d1035c8cf1a4968a8f23c97f95cf87b06763fd97f7844ac13c365b39dfcd8b
+DIST python-3.6.14-docs-html.tar.bz2 6022374 BLAKE2B 5c747ccc66ca9bf9d22368893d3be488a1e3cae4feff34557f8abe394aeb5b5c0038d8a0b319a903a38ad7cf0fd267486704e5e41d5db056472f03861b4a2a53 SHA512 a35525fd934e7e95a4e242fb7cfaa770ee42acdb4db40cbe8e40d77d73e98bf72ab02554f3733c884a73f7afaf28e079e0b37ba300134814cf9a08bb61dfee45
 DIST python-3.7.10-docs-html.tar.bz2 6289108 BLAKE2B ff751e3b847602f766389a4dc249bbb55776d91c7263a7b51b4699b3c65ab02a055e67c483d28a284c18b686086c21b2689a1b62373209a64dc102418d6fe26c SHA512 c303561ce3b758df1ee017ab8dad862adad116eedf1f2d0ed1180529e0af06526c9293810fe086f8223ec97b2c935cb08ca7e74bc20b9be93dc4e97909f5f561
+DIST python-3.7.11-docs-html.tar.bz2 6294193 BLAKE2B 3fe4794770e81ac92c75d3fe3d717770011d3ee5d98bc0ea67049450427b01924ff10ee41ef04932e4885b08f808bf0e1b8d2b09ead2b28303a25d2a9cc8db56 SHA512 c2e354df460b20cbcf49cde56a93070033dc8364f6678bcab62ffd66dbe9803447d5169c033486331351c2cc1dc7140879297e0ad1ce35c6788c94ad3555b283
 DIST python-3.8.10-docs-html.tar.bz2 6604538 BLAKE2B 270c53edc7917926a1fa065b4cd3cf8cb2e1334e55fbe8f7d1b6e52117b44da1e66d1e5ee240055b5f34320aa45145a38636201bd0ffb9751897e5060f987e90 SHA512 74a94ecbcba83f3392f08e36b0697f4213ff9118c68363706d0151c29c50fa12a0e61fd821bb1c16166833872a996e6b53126ba5c9e1c3aa606a57ade5086eb6
+DIST python-3.8.11-docs-html.tar.bz2 6603016 BLAKE2B 8488fdef3fce83c71140d4fec328a0564993b95a6d00307da3ace1c3c4447b0edf99e514cdb224cb06df14228748a7ba9355525a5c8afcc4bd4e27ba20530210 SHA512 8fb51867d2e0af1b4f6e39d24241ef5b8955f9f8bada31c4ee096e4148b0313d10eecb4dee3b6af4bef6ffb3e4e871465cad8d05b5974719936f110cc96fb792
 DIST python-3.9.5-docs-html.tar.bz2 6839136 BLAKE2B e05d327c858cb674463b8bbbed53cf92a4816a58275bb493b02c670696cc58c07735685f1e9e1ae39e10bae3c1fb4e253b29e096fcddb5f0a592ac9895fadf36 SHA512 74526fd849f8a8e50e9263f7963e4ef14635c994e8abb89ae6a096703a4a1807316dd1ea095ab33f0fde63f195cb6d94b5e1a523b34d35481441b4fd1d2b5701
+DIST python-3.9.6-docs-html.tar.bz2 6848664 BLAKE2B d5e84fc69928e304898120b172629cd724043fff26237908f2adfb13c9ffa11701a87bcd7091eeeee4ef5b2ade12c29781ea26554a7f4fc13fd28efe765b48cf SHA512 b9aa734e9616253278febc5f668ecb6f1d43bc824f84c92e3c13007441388d21e27edd4cb30c463739a271ffcbd8581d6d4573cfe693dca78623762bcdd5bf20
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.6.13.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.6.14.ebuild 629 BLAKE2B 05225eb9e9bb9d334c8b712bd5c15c400c43a85ad3d220378d7d1e4c2783947a60029c81ac518de45c2536acbe47fe40876b4d9f05710206055c88d294adc8d4 SHA512 a69af3959cca52c4a51272445343873911d47fcb83c8edc66f2ceec0dee7b67f518e69cabf4193525103270d240a269c3fcaa64617c6e60cc05d981c005bd64c
 EBUILD python-docs-3.7.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.7.11.ebuild 629 BLAKE2B 4b0fdf8cd90278f72e3a4a0a885c43c165c3082e0637470511061b670387b63d4eb0db594cbd6e4d179342e2eb3fcd39c9c14cd83751f116e526122b4d956065 SHA512 2a89633a30c32f73f7ddcddef64e322865539e0d347c00cb8a30721b8ed8f1a7457ef295b2ba95f585006d352b802c37c9a54852947bb5ce27b4221ecf05db4e
 EBUILD python-docs-3.8.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.8.11.ebuild 630 BLAKE2B 1aa6674e4fcab8c4b5a11b040602cb58d52005f177aee6dd73a882df3c1554d6ad6247e3918b53a28dcb969344162ed20d9316b537af4a2c53319e36af7f4510 SHA512 6669a6ffab0376095e9d53a464d4662ed903f8702a19655f20986059a128d82fae4068dac75dc0865354db186a6355691f466b56edb9842fb88dd676dc206e69
 EBUILD python-docs-3.9.5.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
+EBUILD python-docs-3.9.6.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.6.14.ebuild b/dev-python/python-docs/python-docs-3.6.14.ebuild
new file mode 100644
index 000000000000..eb85be6819d8
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.6.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.7.11.ebuild b/dev-python/python-docs/python-docs-3.7.11.ebuild
new file mode 100644
index 000000000000..db542dd885de
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.7.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.8.11.ebuild b/dev-python/python-docs/python-docs-3.8.11.ebuild
new file mode 100644
index 000000000000..d5d2529bb54e
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.8.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-docs/python-docs-3.9.6.ebuild b/dev-python/python-docs/python-docs-3.9.6.ebuild
new file mode 100644
index 000000000000..a957c58aad3d
--- /dev/null
+++ b/dev-python/python-docs/python-docs-3.9.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="HTML documentation for Python"
+HOMEPAGE="https://www.python.org/doc/"
+SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
+S="${WORKDIR}/python-${PV}-docs-html"
+
+LICENSE="PSF-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+
+src_install() {
+	rm -r _sources || die
+	docinto html
+	dodoc -r .
+
+	newenvd - 60python-docs-${SLOT} <<-EOF
+		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
+	EOF
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 4ce35b718688..b5d5d6123685 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,7 +1,9 @@
 AUX python-dotenv-0.18.0-second-entrypoint.patch 582 BLAKE2B 48921b086c2d4dcf86aafa743d78767a1dce50b447f429232614e9e61cb222d0190f0b1e65bf98044b286746f6ad3c3706a987fdbbb51bdfef6a9baa721bafb0 SHA512 bc7c5e35823730ff520b1862af1807dd4f0f21152bd9ae5df7d79020894df0ecf9bf785ff157b99ff668e1e23c227f8a461e13be0fb842ce06d2b1ebc1752e0b
 DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038e91a046a1248dd27af011dc60361f06f5324504d623a6109d783bb3b5ccac7cae758d918b17f5b0c65a1085bda627ea SHA512 42cdca1356ac2ad80884a5bf3ed419d1202d6a54746f7a21dc9c1bc7579383ac5c72e8b708bc33dfea3904228125fe7b3b2190bfe53e8b4767f5223d59050417
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
+DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
+EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 6821b07f026003ddb1097a6d42f2da445cac967c67d57b3ed3bb964bae46ed2b673efc4214304fe3d3aff8c855882d27c5492de6d4badfdb5e94e9308b9c1286 SHA512 01007cf2b806e7a99498bd5a8c0e5ff8ef5455b8e0944c95535d143f79d5a161b2da30f40838f407075870d819e747f0f4e683d6f2f1c8fd78c844cb36a9d0ce
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
+EBUILD python-dotenv-0.19.0.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 8c07ebae93cf..a462def98ddf 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.0.ebuild
new file mode 100644
index 000000000000..8c07ebae93cf
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.19.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+)
+
+distutils_enable_tests --install pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	rm "${D}"/usr/bin/dotenv || die
+}
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 4fdfbc16b2a7..ce430efff339 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,5 +1,3 @@
-DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
-EBUILD python-email-validator-1.1.2.ebuild 759 BLAKE2B be5e83ca690f13620fed9d24409cfe6681da56d92f25e7a322259a52e76dec0faef382880e369eadb3be80ca54403cda50b1ac4585ec97b536f441f2ad4daa87 SHA512 ca282ca64be28ef0dda6e09330be562cb2bb650db7278df6cf760c4884ff871c564831293f726dbae8e76687a1e98b7955c85d2a21290a1bda1473d697444bd7
-EBUILD python-email-validator-1.1.3.ebuild 984 BLAKE2B 5d03e8b6bd55429c1f908c12f3fbe71e1d48f219702f97138c74ec4c02e511938f51bc5cd9d60b990f2e245425f96d0a135c07ddf732b2f6e9753099854e47eb SHA512 411900ece2734f3781dcd06c9caac74629a2cd65f89df4b8df758edfaf431350c0f5092f3f994cb9a0aa7b445a7e4a153cca4b47a44140ab3cb0a3153b07644a
+EBUILD python-email-validator-1.1.3.ebuild 1172 BLAKE2B c269b9d4f54934e86d0c39dfbec326d001a0aac06c7156b6789d08f9150a7200a87ec8526f39c266879b3bcf899f6517e74cd87f07f8442efb9cad1d7c1cdc0c SHA512 7906e93fdfecc20271ecb2b92e829d717a3fa4abe3d20e732608f1a78e4eeee6e0c353c254e393667f3767325b4d86c3c86b584752fd0625b34a9ac30b5010f8
 MISC metadata.xml 791 BLAKE2B 90989a47ce58b16cbf5b74e25486f412928d166b122baa95584f0b211ad19e8799c914cfde81f531915c190aa3d29ed23d38c948395ab224a64a6cd13231cbe8 SHA512 afa5676ca2931aafc9e97fec3da47cb25b6b5dc5698910f0ab428ea713cd9bdefde826d8726fad67a26875ae317f330252bf838faa2c2d0dae9acf172911e84a
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
deleted file mode 100644
index a3419bc335ac..000000000000
--- a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A robust email syntax and deliverability validation library"
-HOMEPAGE="https://github.com/JoshData/python-email-validator"
-SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# deliverability tests fail within network-sandbox
-	sed -e 's:test_deliverability_:_&:' \
-		-i tests/test_main.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
index 68cc0b7a9ccb..37514f3ad4d8 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/JoshData/python-email-validator"
 SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="
@@ -29,6 +29,10 @@ python_test() {
 		tests/test_main.py::test_deliverability_fails
 		tests/test_main.py::test_validate_email__with_caching_resolver
 		tests/test_main.py::test_validate_email__with_configured_resolver
+		# these tests rely on example.com being resolvable
+		tests/test_main.py::test_main_single_good_input
+		tests/test_main.py::test_main_multi_input
+		tests/test_main.py::test_main_input_shim
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 6717f13095b8..09d68ec18c17 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,3 @@
 DIST python-magic-0.4.24.gh.tar.gz 863700 BLAKE2B 09ecc8bea1696343ec2462e6989da8059c40f88e401390c8c491e531540ef0b38e5a8eac1fb8a3356203e25cf2e5caa6dad0c13d24eb34a7a299b5a071ae29b3 SHA512 b3ec148da398293465299938fabf691b56c4b3876f6abbb7a734a9c0a5180cc758a15f7085bbf1bf40ec6031697ec84d98c161db1fd04301133af09928c611fc
-EBUILD python-magic-0.4.24.ebuild 710 BLAKE2B 609c2a73f4451c175f59b8a709c07300e28d97789b621fd5ede26ea66ed06f633a8c637a93bcd4e58c3f1511d1ca412fdf61616c85b3f3c5114df19c43aee8cb SHA512 a2800a216ce1639b352c4399777f376dd3126035178680aaaa3bc80d454f47ef4ba0117f97bc4ce72d921332a927f1db8807f9d6bc77b54270d3018b7edd19b9
+EBUILD python-magic-0.4.24.ebuild 717 BLAKE2B 864aaaf0f3f31cb18c65983e1966f41603ecbb138d1c4f7a0d331c4eb96a6ca838081d917f8df8ee892a267c412fee6cb4b235727cb6b2bf1cc58cb5449ec456 SHA512 fbd19da973c7e7fb1f1344463b6baa6c869fe7fe6a8fb6a7c992ab9d5b22121d0fc92868b57a464bbddf4d50872acb0b18ab6bd23590d65b4b9c69e54d4ccc7b
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.24.ebuild b/dev-python/python-magic/python-magic-0.4.24.ebuild
index fcc0e0be1933..871c069b2541 100644
--- a/dev-python/python-magic/python-magic-0.4.24.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 6f105bafc55e..4e516084f244 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,3 +1,5 @@
 DIST python-nbxmpp-nbxmpp-2.0.2.tar.bz2 121999 BLAKE2B 70116ab89fc99ed5a8bff7cf350f578673c54ee5c38a4cf58cdfa63645e142ad2d1163846989ad8eabd6ce6e9738b84f9e95f42dcce7703202c659c2c9ec29b6 SHA512 31fac81d856a993a7ca014519305c74c342c89e049d779386292e9dc73cde70d924d3fe2903cdb14231b60a583d92406a7830f61a29d2a9cf159a247b8e88509
+DIST python-nbxmpp-nbxmpp-2.0.3.tar.bz2 122433 BLAKE2B 9543a93c2ea372fbe8412c410252907eeaa00e2576bbe4a614141d521d03ef997481b482e9990376cd5b8139e5daa01e51f946fd9792fb26bc0084e04f3b1de0 SHA512 6ba1dc045a7f6d761e8d9d5da9f4799aaff96155fa7260c76820bbe9c11d95a11777fe73b9f405ee9e4b93be2167dd575fae4cb880f0690bb6a99d091a5eadfc
 EBUILD python-nbxmpp-2.0.2-r1.ebuild 720 BLAKE2B 27f7d1ddfaede964d3f9a77e19d53e73d0844b41e9f6f389b306c93d057977467d6f2c9306f44a6e870aa0568f11f191d29badf976ea48fa64abcfc7a36b54db SHA512 c8e258287e92d8cadc2b25d3004bebc969182f90e97a3630562972fa6b05f5cd78cc5795c45a47292e2f11018dc02942e28233bf71264694cd4bdd38be2e8909
+EBUILD python-nbxmpp-2.0.3.ebuild 723 BLAKE2B ae40a7d760b2a2a5a2af2f80782f2fea5aba60b444c3f9449d73305d59a17e0065d2e0ee0830fd12f8cf825c1734e7eaf3429e77f55d22efed6066da7e0430ee SHA512 2491b9946b601e73efb186d600b3dd6aaf849875001d87a50c904408709153bc2429ae916f06ee4a7807d1279675c8d90698d3cec4d34efc4c9cabfa770f450c
 MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild
new file mode 100644
index 000000000000..f19877c96c40
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-2.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-nbxmpp-nbxmpp-${PV}
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="https://dev.gajim.org/gajim/python-nbxmpp/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 3e2288e9c18e..9b26a08b2f4e 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,5 +1,3 @@
-DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a
 DIST pythran-0.9.12.post1.gh.tar.gz 3612135 BLAKE2B 1c0650d249a0834a488aba6f48d1130b8897b4b220523d3aaa0f7557609f9cfcc208563980b6855132199fd394b45404c4c15c961380ea2089121c5c9eea65b2 SHA512 71a9dec2ca9eca85a2b3e52022e262135b4f1642d646bfc66323bd8b7545a11351d70aaec0fd90d82dc0ba23ec6733a30c8d807e5d90ff5c208d2995a6ac6f83
-EBUILD pythran-0.9.11.ebuild 1183 BLAKE2B 7c810169aff4d52fe1d23dcbb0dcf75a61f342ae4b2e7f47b01c8ae966389638cb38700bf06fa3e1285d8664706dbb6c6bbcef528a0e76652bb0bf5b8d5b0dd7 SHA512 53c038ee10e4411ade77b3917554f46a38354cd4855e854df6842654f4ba3d6c3ab616d4898ba164bfea2c9b38939ea2aee8b7adc6ecca25625534bdea7fde6b
 EBUILD pythran-0.9.12_p1.ebuild 1119 BLAKE2B 9d5b29d81e994b29b5463d6b9a3cd1dedd732bd2a15315c0fbbe3489873d1e8cf53d2abf1a0a8a7a1960da57bb79fcdadf12eb5aac08b05805a6b25734dfd850 SHA512 cc528373ec1f9d0cf50256422dd8f074b4f9066b578004e45a0a25fc99ffa9224591897d50f2cfce6266d83cda5e239b2a93f1c01d83105c970dcd999230e8e5
 MISC metadata.xml 353 BLAKE2B 3584e4357ca55b22b1bf1c707b22df13999c358ce3968fd968c2cb94db6014e325b6782b8bb2b6e97a7a6c584081fa974ddf01ea88103b51cbd0bd2b49300bb4 SHA512 13435a1f1b2de15e825165e9d71ad3f12f29f32fe55694b7e504b76a5b6738bf4ff7b2626b0c956a1edb66d744b3589dac320eca4af0db5e6c55f3ddf537550f
diff --git a/dev-python/pythran/pythran-0.9.11.ebuild b/dev-python/pythran/pythran-0.9.11.ebuild
deleted file mode 100644
index e9f0d52d41d0..000000000000
--- a/dev-python/pythran/pythran-0.9.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Ahead of Time compiler for numeric kernels"
-HOMEPAGE="
-	https://pypi.org/project/pythran/
-	https://github.com/serge-sans-paille/pythran/"
-SRC_URI="
-	https://github.com/serge-sans-paille/pythran/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-python/beniget-0.3*[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	=dev-python/gast-0.4*[${PYTHON_USEDEP}]
-	>=dev-python/networkx-2[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/cblas
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index b325d7d4f4a6..e8c6d93124fc 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,3 @@
-DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
 DIST QtAwesome-1.0.3.tar.gz 878811 BLAKE2B f4392caf940ffecabf4848e892226a0871686d34a2190e35c4b11a0803a006ca0a9bfb09b3de03f7baba6777eec40ede30e35aa702bc83d9eacfd45cdde207aa SHA512 90ff132034ccc21c358b341e21aa848c34dac1c10e41720f57870f6c73fa21d1da944e4ca2ce2ded034c9edd85679181f0bd7a6a949f46a582a4402a620f2849
-EBUILD qtawesome-1.0.2.ebuild 950 BLAKE2B ec5b9d25ccbcc59e6f7d330db40436fb1cb7dec2954d14bf53f5474f366b669c41779e3a01ca85ffe6662ca847891b1a0c5b03580eb890cc9c1dba2bf3b946c4 SHA512 926942a9d8e9f847ef25316e301c7b10ef3ad9ee4a7ddf40ad724e5da06879d3cd522b098641649dcf3d4c904e2e335f740fb2c815c694b48bd8c93c28ac98e7
-EBUILD qtawesome-1.0.3.ebuild 950 BLAKE2B a30c0a38c03e4cbe90d040a9352122fba16acf388fe0a15933b41c6ef79ee842e1ad527cdea2239d12d66777d762dd92926dcdc98f7e2ec1510013c14395c654 SHA512 ad58451f33991961015104fa7f5ac582964198765767f4e1d9171086c6f071860ecc7d7ced1f82eb0b6cbef9c82a5e623306883a06abd36be542229899ed855e
+EBUILD qtawesome-1.0.3.ebuild 948 BLAKE2B 9abdc5951de496a7c82d3d26b2c4869cf3f7ff689838c7d33280d9e72bd8b33e603148d55808c8bb3d38be60ecd877ec6a891cec6451fa6f13a970e0a181572c SHA512 f31308e333163823bffbf867a3d4f956dfd1c4d2d49e3b1dacb542ff56990961674ab3e21094cb3f9406b66933e55738880644e76b231283601cee634129bafe
 MISC metadata.xml 809 BLAKE2B a2466e110ef2e6cb3a9c668bc9d41cc1a37396ec49e8f90c75e5bb22b87c09e27f393941ac0c6d72dc73e7cfb793032815f16fc84228e7107d1a626a2f629608 SHA512 26439f8cd592cf1764e62d146f467942d1b1d4cc35b096f2a2cef43099c8d1dd41d22713ad476f34c9945444a7ac5449e1391aad815da753f9ca8f46ff340889
diff --git a/dev-python/qtawesome/qtawesome-1.0.2.ebuild b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
deleted file mode 100644
index b2805bcbc5fa..000000000000
--- a/dev-python/qtawesome/qtawesome-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-MY_PN="QtAwesome"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
-HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-fonts/fontawesome
-	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
-"
-
-DEPEND="test? ( <dev-python/pytest-qt-4[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
-	# the tests with pyqt5
-	PYTEST_QT_API="pyqt5" epytest
-}
diff --git a/dev-python/qtawesome/qtawesome-1.0.3.ebuild b/dev-python/qtawesome/qtawesome-1.0.3.ebuild
index bac4a1950b96..d943dee56f41 100644
--- a/dev-python/qtawesome/qtawesome-1.0.3.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-fonts/fontawesome
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 233d51814911..e131d633ca8f 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,5 +3,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
 DIST reportlab-3.5.68.tar.gz 4512985 BLAKE2B b38fea7704fcf08ff25d314286830473b90e75a80bcc65fc7b2cfc4c270347aa7c68f31716e635048428c24bb0ca0afc3d0e22bebedb1d1bc50901c13d278fc4 SHA512 4d41f9d9708d2bd172928985e1e2d22ffcc61d2d6fb21bdf1f3275f9ff576f06e712cd9c9d1707ff364608ad8bed6c30754893a7b142dc3accd6eef8aa19c975
 EBUILD reportlab-3.5.67.ebuild 1492 BLAKE2B d9b54242e7d90d7ab8df30cdffe52fb2ac3ecfc8b4727f7c631fee7d000f7e231a097dbdc67ea0999bac6360da963c43c05231cf61c20cd8c66e113e1b3e30fb SHA512 5401c2173c88acb054c37ac0acbf894d2c741e391300cf38e042b90115de07418639ce65275ca0edfc11a7139b43371487f58ebb9356f32b53a7edb3013b7dfd
-EBUILD reportlab-3.5.68.ebuild 1499 BLAKE2B b49545fdec1a8e65d73d157fc2e2fa20d83ea2d3e87c901675def17712ef56869e9e2c905bff0138d859902a78a401c97e462d6ad4ad976972e6b5e12ca53c72 SHA512 be3712634f72644c9d5ae78e5392e6a2212d8d9d52cf31839b67b796c2e358fa32a4339ba3dfb39f1e0b54261f88c9b7b74964aa723a360241aefaf3f0fb5586
+EBUILD reportlab-3.5.68.ebuild 1506 BLAKE2B ffc03740dc04b43534aae829798c416466017cbb3c637316ce4940e2acfe0a289568559c6fe84f785291850da414e71e5998fcb23da569929147aacab46a9e95 SHA512 b1397f7c24bf43bd987d1a54dc2823572266cf4fb253d055803f6a5d5be13bda416422ab2936e2d794a0e2405838145c5b56a969028f2980ab01eca25209f736
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.5.68.ebuild b/dev-python/reportlab/reportlab-3.5.68.ebuild
index e525a1a47f9d..6a2d53daf896 100644
--- a/dev-python/reportlab/reportlab-3.5.68.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.68.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 19baf106f327..33e3d6bf86c4 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1453 BLAKE2B e073858423408b53e0c89db0c31445c60507a43d6670966060e931026cd27787b2b84691a8fb405036cf7dbd0c2c8680024b55dd8d6768da03bec373b15f2b40 SHA512 c3e83705eba56f4c3d08c3a9a1158c80f5c7f5bae22528209d40bc8e7c2a0027f8cb0d371c0cc268be19baed19bd1e55262289c7fcc34dd1d7bba23e24e23d44
+EBUILD requests-2.26.0.ebuild 1473 BLAKE2B f5aa4569a4580e69a26c6b11c3217ee7ad0f9cccd8dfba3471c3ea6cba0674aa02df37aaec20cbc0c195bec12cd8c931164ec10650a196367f78343008c6f312 SHA512 3b3cf0cd224cc62849b224b27dd7786fa4de56351942fa3174f62af2b301ea1d676b769b6b32d4e7b02f83d6b22cba8194220f2386ff080365a8e69ba20943c3
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 4436fee0e52c..24926975d014 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index c1a8c6d1fb81..d854b5b5dbe8 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -2,7 +2,7 @@ DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef
 DIST resolvelib-0.6.0.tar.gz 16471 BLAKE2B 2cc7b616d1818588070e84f42c195b828f32da374b5cfe16d89ae0e32bf6d8bf0fca37065f570f1ddf4e769b9eab5cc3082ada1a1d907f258e099c45072d3f2c SHA512 7d73d9368783bf5657b95c19470d4e8c444bfce3902fd986f80f5ad44d04f486046113c540c879601bcc29a420630a74117bb5f6b77ad28fed75c94769deeac4
 DIST resolvelib-0.7.0.tar.gz 16439 BLAKE2B 5e48f3b5618b84498ec5646e4ef502c9cf1ba6ec720ea450064983d26c8890a6399839261f92a471bb5f235c6c7d976bd7a1c0e2ccc29ba51c0fdb740ce607a6 SHA512 4cfc4ca58c3308209b4fc5c96e8e379a3ec897943493478cdd5b63a6edc21c7c416877eb3ce12954be98131e5f37a9727d753347414790c625284a8e9dc393ea
 DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd212a2ee5068ff155526e17358e3bbe4c92c4d59817c17de152882a738c924c7f5ba389d2a7d13ee1b2dc0de54e8175c3b SHA512 de5c1c29790ce1eb4393021f17f1a19a0f2de29e5d8688fc307e412d80052319b822bb24fceca47fe550e21393ee38d58fa6e6cfefd207b7a88b632b9670d282
-EBUILD resolvelib-0.5.4.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
+EBUILD resolvelib-0.5.4.ebuild 511 BLAKE2B 2459023b3fdd4fe6b7b7e4e070d43a9ba2dbddd898b5d78ca1d044d30916609947d6b8f18bc83d0dc0b5f3441374e47946db5da751f21dd4c6e09cafec9b4136 SHA512 1ff656be933084de43506a99ac745fd5079672735dde60a1360e6f93ea01baa7f6d3aec5e26bb86aa67783e188b09d3833351d512380d050cd690e3198af1be1
 EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.1.ebuild 593 BLAKE2B 206bd7dd4d41822052a7a252b9d3b5f586f2ee4266b9b9bdbda895bea2e9ebb965fc85456fb63cb6dce7c70dc56d829ce22c45e7956adb63babe016809b5b6a3 SHA512 2a925e88f6aa99b6112497f5dc10d0b4d94772ccb8c21a5507efb398f2177140b03fe048eeb7d5a55bb2cff0a1245837e14d391cce6441a963c611e0f6eceb25
diff --git a/dev-python/resolvelib/resolvelib-0.5.4.ebuild b/dev-python/resolvelib/resolvelib-0.5.4.ebuild
index 2535428a3c16..1857364f0eab 100644
--- a/dev-python/resolvelib/resolvelib-0.5.4.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 724fec76febc..ad461ca20d66 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,5 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
-EBUILD scikit-build-0.11.1.ebuild 1496 BLAKE2B 3eaebe868dd25c1882b2ef22800c7c82d63f0fb291652b77ccc2821c3b9e2c3ebb6440472184ce088c779621b5b6556546bfc0925e658130aa5221af2d1a2f67 SHA512 0bb1db3ad5682d02d00809df3e0fa253618e97acd4f388f0c06ac029f49590e23a538f10393891c1c45ffa69af6713fa174ced3dabd07e6f8c0cff1be6322c50
+EBUILD scikit-build-0.11.1.ebuild 1404 BLAKE2B e5f2fbef3a71a1bca0960e6bf122888b7f650ada67cc2f2b151b14579a58a7613c7569767627e59b62ba7d31e70d7728b1238cc830aa46782086fc4278636825 SHA512 3c60c320085ff46096af8ba4cf27d7d20c2f41e1d1a26e1a12e6cc8f7fc30e194183b73f69b754129a80785333171c058c4f436f13d62925cbde96567c045780
 MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index bbebf508eb95..398a1f1c646a 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -26,7 +26,6 @@ DEPEND="
 		dev-python/path-py[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
@@ -42,14 +41,13 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-issues
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	# Skip tests causing sandbox violations
-	rm \
-		tests/test_hello_cpp.py \
-		tests/test_issue274_support_default_package_dir.py \
-		tests/test_issue274_support_one_package_without_package_dir.py \
-		tests/test_issue284_build_ext_inplace.py \
-		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py \
-		|| die
-	distutils-r1_python_prepare_all
+python_test() {
+	local deselect=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 288bc11e0b43..753227afc115 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 DIST sentry-sdk-1.1.0.tar.gz 215946 BLAKE2B 486f32430a03d42c73814195ef16ec4efc71512faca197d8020fad7b3d1e7350ec619ef453075bc4fc4e0e454f3aa6eda41ec29b88af19d75b5f6a10273db325 SHA512 500d0d3add4bf8e74f2e34d6c00491f4bbd45a2226cc0ee93ca0f63f5ae5aea61be6730f845d50e10909c9ede6918ec6cfb90e5ebe80b753dd634ac9a9238061
 DIST sentry-sdk-1.2.0.tar.gz 218371 BLAKE2B dcba23b246d4620f93b82a07a9fa9c73ae8b67d54e9a690fc53c1b08580433b2d37a50f29a47e01c7cdcc29eef45cc0b67e96f1e9b333496002ceea5ce7388a9 SHA512 86705fab17331bf5cbe4dbb25562d80b5b080d2bee0a9bb2c153bb379e63ada10465bd5fdfa24d71fc50cc1d80d5afd3e569a779f2a11bde671cc6782ddca347
 DIST sentry-sdk-1.3.0.tar.gz 219259 BLAKE2B d1da04dc80653f1f55e03e43f71e19b27588110e34dfd3c8b6968e8966e3ee6df1818bf7d0e23dab2534723b9ea93488933bd23ec763935c5683aa800b335152 SHA512 44e96654a3e4288e63e0fc780ccdf16e5a105ab51af32de146159b9affcc42fbc7004df6673e84369f802e8fdb4e060d1f756945afbe0465dca078d28ad242fb
+DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
 EBUILD sentry-sdk-1.1.0.ebuild 2235 BLAKE2B ad0f7d0491f5ae9e64fdd6fff4f80b2e4970ae631e1a24b0ff150f89561d243b84dd0850cfd94dd8cf6f4a9b8e0bff615c1d61dd2a2c38d51c8f629b553f219f SHA512 b46de1ff55068ba6dff4885dafb1e0826d102fb6db2036b9bf4afed5a1acd4bc4ad29bf9c53787b0f9c7b002977a2716e5912babde6c97f89c9de5859e8f05db
 EBUILD sentry-sdk-1.2.0.ebuild 2348 BLAKE2B 3da27b983c50cda97e229946a537d2b44adb4acb3a508f1652788d45c6425f8a85df7ad1638a8572af316a5cfe33ccbe4542bf44526080e0a6b824b697492797 SHA512 bdb8d55494c9ebd309a1b1f4e729d92bb312ab24f66d5337dc7ffa4f23008749880a988adc3244f83b176412c4f179b1006b20e2159427863e81204207cedfc4
 EBUILD sentry-sdk-1.3.0.ebuild 2348 BLAKE2B 3da27b983c50cda97e229946a537d2b44adb4acb3a508f1652788d45c6425f8a85df7ad1638a8572af316a5cfe33ccbe4542bf44526080e0a6b824b697492797 SHA512 bdb8d55494c9ebd309a1b1f4e729d92bb312ab24f66d5337dc7ffa4f23008749880a988adc3244f83b176412c4f179b1006b20e2159427863e81204207cedfc4
+EBUILD sentry-sdk-1.3.1.ebuild 2348 BLAKE2B 3da27b983c50cda97e229946a537d2b44adb4acb3a508f1652788d45c6425f8a85df7ad1638a8572af316a5cfe33ccbe4542bf44526080e0a6b824b697492797 SHA512 bdb8d55494c9ebd309a1b1f4e729d92bb312ab24f66d5337dc7ffa4f23008749880a988adc3244f83b176412c4f179b1006b20e2159427863e81204207cedfc4
 MISC metadata.xml 509 BLAKE2B 5b68b368764625061ea2eadc0161570e46760904015f6e1e3e97a7a4dacd3604a18b2cbfb665e816981a40f95ec9c4f0c4a0447ecc968cbdf1fd21dcd4149193 SHA512 c42a1f7972313d3369ba392347b0efa700ee9c9b01d3275b3973b8137cf00fca693288a1af57c355b2d87525d9fcb7a320ad571fe8be5531472a8710f9b287d1
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild
new file mode 100644
index 000000000000..1d3e482c7e75
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index cff861ee9f89..9fbce5cbffaf 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
-EBUILD setproctitle-1.2.2.ebuild 562 BLAKE2B a574e853f51ef8b00630d910c81b4a717279ddaa554f84f5e6813a61e10578380c552e4e09b28d55725f22e01f0616d17b997e4874df015c9b2d4387b800f06c SHA512 49dde5d482921691f587c5f8caab4857f4a2b5cc03bab0c7106ba945a0fc54aad9f7d5eff0f918ceba7e765d3eb002c320750beca90256eb10fa0dcfa0a6089e
+EBUILD setproctitle-1.2.2.ebuild 569 BLAKE2B c7483a9b25218e159191807fb692a64c20f851f7b7dcf0037ebca99b4a6542bf957ae08e90524f2c96795647cee23d64b620ad9961e91f41d1a86a596831e009 SHA512 9651a530db06a95c5a82a795ab8b9b6bbfe3159a725e77509817cb05406dce02324da05c3dd05341b02e93244268747e22e1301e5e66200e509034b2502df622
 MISC metadata.xml 380 BLAKE2B a4f3fcd916d84f435535d148dc0f50bec06410d0502048b1d72b06db2a7f9007c00e80267ac3e3cd99cd7c22ddca64c08438a0882ec3c2bf0db459f49673ed2c SHA512 f2f94b9cf710b4bb43273f6ea80846b114288deae9c3c802ac40f62c2e9ac60ca5f2d7123d807832d1e265b4b7e423e40e39c28a09ad8e2a387ce12d04e5c096
diff --git a/dev-python/setproctitle/setproctitle-1.2.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
index a37b4eb18c8f..aa3f6ffe1d72 100644
--- a/dev-python/setproctitle/setproctitle-1.2.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 270085a69ea3..c4e23adee98a 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 689 BLAKE2B d3223d90e39f8470592076c8a03c3f36e06fe146528d513a1a4096c21cd25af2c8450ddc3083cb5d8270c8954bcce9423ec8350b169485a9708898f672e77f19 SHA512 286453fbaf083ed514c4d98014dcba0de4fbffaceed4e8d9d2f79ffa6d20f440185617fdec5d0ff6680c6b6bb34aeeeb321481452789296ef3c0195bc6a32e48
+EBUILD sniffio-1.2.0.ebuild 686 BLAKE2B d2afbf2791a9d42e63a8e95b23495ab970f4fac96aff61f436f57b98e9c6bc0c4de540ab5fd675d68bcc72b227b0604d6ec84fb2fb8b3bbe5dd31e2ecde46d86 SHA512 57793717b3104bc208aebab6e4b084dfa3f73fb27f5e70ca8caf9221ea9aaf17716d967d33422dd7aba3a302081eac32f49ecf23cec31d74175a69ce47156586
 MISC metadata.xml 393 BLAKE2B 1e85a6ae107eb5dbdbaebf54211bca24f605c8b40d8dc9f941a485a5dd6714c9e6b69646e627d6fdfed874f5ecbc4217b158c6be66b392e583f4aab24fb4c609 SHA512 ed60062a1393a7a3bc73388ada684e70a51fead79e3bd5e4cf3fc14aea6ff133121f2fcdc68ae0277c0bf2290d3a0f18959d00eb835534e16abb58b19c7b0f9e
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index d7d201ae88cd..a0f66f38cb78 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 1efa86f2b726..4ede36e931c3 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
-EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1090 BLAKE2B 00609a4ba709bc1be17195ff38615002ca71cdf8ed938a1e3689f5d1d057464edc199260fc024f66f98879c82025d2d88bd477177d20178f7aee0d756c37bc3d SHA512 bc88ee5d7380c666f6407cbda031250b2af21138b95264212f996289ff6fb12708f0a3a5fd372ffff2e2686b8e04b35a57de8d9b9879e9cdc9e800bf8f2beb66
+EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1094 BLAKE2B a3175b39f1b782bf5f7c12596be8c6a3382af2cb24fd408f9f5b49e8dcf44703784520683fa5f02d7cb714e83de78ef06191d16cdb36a8eaa403cb3f819205c4 SHA512 d4309370023a1e7cc0f313ffe1a805b1ecdf340716764080dea014aa072daf7a08f6f1acc8efb458cbdfb8d788334f11ed3b7963ab70f41fe4cb1e6a5ff96888
 MISC metadata.xml 701 BLAKE2B d1c41250ae7a9f233e1e208443b764522071d4d0ce3274b28ca95135c01b780d38faa88c8bba7ab7874584b420dc81c8b43e629718fd085d461bdcf755bb9e79 SHA512 952f4e2a940fe23acd47a9e0f101c6d78c6939fb9ad69920a9cf9770b44ba3dad7e65e708ca0ad54fac5ef871a18a737e9ed200a678210e93740eb065be81a0d
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index 89635d95814b..eb83013145a0 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index fa5703cfa1ea..35d858dff51d 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 631 BLAKE2B 5f51878daf51b27044689d4dbc9d417f56b8f2238b0b0bf7033229392d34199e3a465762bf922a55cb4e531ad9e214d2db44ac7a66deb034b59f1a38b73bc780 SHA512 e7fd8b41d43a06f9719ff052ba7b3e02d89d5dbf362c3828cdf297d23c71447758aed85f4194a6879698de3824a2e9cd89396cbfc71477cd2d0dc279a9675da1
+EBUILD sphinx-issues-1.2.0.ebuild 638 BLAKE2B c36560abf57d1c71fe65d725dab03cf47cdf5ebd7ae0462bfdd107eec43a7bf3e199d8c7543b75f84c52fef38e25f08686bf165be721cc46891a5d4a5f03f8b9 SHA512 49ad5147aac269a723972fbbb1ee5404205068f70b5f18a2c8504ffe93416e9fc19196e59b50479ff75e078511c64811fd66b17e8b39dd4669e51fa11ceb6456
 MISC metadata.xml 458 BLAKE2B 75d607d8ba82c59848b0bf07558eae09703128191cd8c043c86a970be9b31bb6697233fe22c65520a0d416025353b5f66e8936f13f07ab593aa5dba35769aec7 SHA512 b67c984d20abb117bcbbee5da75ecf07f12ed03713da79249af3747a4252da2e629d6c4a4905db809b7f35ae826e3eb9855c4fe5207e4078a697783f7c502b12
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 554b180f0f9b..4e5ae6d14abd 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 20a1d5b86868..91ece728aa4c 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
-EBUILD sphinx-panels-0.6.0.ebuild 686 BLAKE2B b26b7edb5419644eca087c65ab32b6567e89b1471a6f9d808aada00332690f8d16336453e6885a2b21b9ab38f9c7535a01e1e5e058bc1f89a7d42b789c04a2a9 SHA512 6395879fd8d8dd0a64e73da984321ea5cd76b32d9d534859ab2eaf22b6c2773252c0ae8d9a2fcaea2f161eb4c1e3360494ca335944922a224a854027e5ba3c9d
+EBUILD sphinx-panels-0.6.0.ebuild 687 BLAKE2B afcc996d884f5a86de6f7829d4e35c55c864a1941e944a2b2d43dd343aaccb4e404fbe5a99b39bdea307a775c566c5523c92d1af4ca5caf3dd08de43bf739cb0 SHA512 28a0600300123b6c10cfec8fdcea4f696b03babd0d57556766f86216e4a03bb9803b9ecfac1f5a31f7d6268d44b19900fe5a0f6ab09d153a745a24836ee9817e
 MISC metadata.xml 358 BLAKE2B 0b9979bdd35a02a66c8a0ba8bb27e7170ada70a9506ad8bf320288d4a40a04a75f8481bd6d084d49569131154e689277fdf43c7120e6c0927c373b4a4c922403 SHA512 a8a585957fdf380ab763cc95cf455a927c6bb0558cce5f0429ba43da72d2655ab15cb6f06f9e5360f24f854f275e0df67ec573167c02332a7dc3912e96b31b3a
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
index 644f9878ebcc..57a2b467cd5b 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index e83301935d12..46520b76c113 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-tabs-3.1.0.tar.gz 521642 BLAKE2B 10fb138f62ff98316b348437d1fcb0354060a89902b6706919d4439800b79b94d68fb871d37abe3ac5d19a7920c928143251c5d58d5f66979b9e551797d8f9c3 SHA512 4e278e860a763cc03981dc15ed493fb1a9c43f671031eadf7c75412687543e4eaa75c60d527fd6c7f815d4abe79a833cf11ff97b660c47b635fc8b0b3c77bf3f
-EBUILD sphinx-tabs-3.1.0.ebuild 894 BLAKE2B b30ae90e1ff2a667bd214e01eb7d9d2b7324d433193f688aa0806738dbc3dcf53238341ce072c2c6620dec05bd624f37d5245fbea7feeae09532fbe0eee3f303 SHA512 23b4c05d57e28a6105d914ca24f0b819a0d9eed92e24cd1255c861228234b0b5492d1a992ee52f5e8cc0b3dbeedf1dcfcba59365a0c225f55a1770e22a94e5f4
+EBUILD sphinx-tabs-3.1.0.ebuild 899 BLAKE2B 9af945f9a1c413283c70823ef7ac1a3838ddb9b45d840657964a61c54bae6cc3d5784728f0a4ad0a1c6caae949f70d3412761e9520a95f5592ff6d8982881d6d SHA512 dc70b6e45cbd152e5042efca800d77fba8b5148344ef22737b0e48286137610c5347e31143cda78b7fc04eac093aa6c38751be670d3b64cab62bfbe5673175c1
 MISC metadata.xml 316 BLAKE2B 375e14399e0e3fcc075546dcb40e4125667d899744136c51827951ff91c721da0e8a3c3a8672a9a66ae5379b46fc30128d108407d95153c39e75567f2b106434 SHA512 09121a2b49771ae98c777720b3cf24840f9e76fa5a300d44f4a5b0fb29375a0995f28f51d6756cfcebcf576a93ba0e5c4ffd28c6ab8e2300e05a4ba5e7d35b35
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
index 36801b75db7d..66b201c60e34 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 8a83eec8c753..9e5129dd19f0 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 554 BLAKE2B aea6aa3e3f6822762f97ad633a1ddeaf5080c24b7c9a60f6e0fb5029a98d224e19792a35e79836a88f754a5618f55cef92cd3d269ca28275aae89f7b8d9f0f76 SHA512 0f4ac215f4c00340becb71078f08c62137b420687e28ad5074eff1d93593aa88c759600dadf6ee2f715e9e2daf2b4f624870cecf387e825221fc83b64e092470
+EBUILD sphinx-testing-1.0.1-r1.ebuild 561 BLAKE2B 7506eb8f9d86e7028f0b383ace3c255459dd464eba19e503181cd892d3aa24a552a086e26664b48634365481d65c451aa051f54c2dcccb0ff33d9d8fb9dd0c75 SHA512 c254756678a82d58f7816a8205f8911f84e769c0eed55880256a2aa25c0c97b6dd2328e7ebf49833ce93c7cb0ebeef46ea4c8a59f4a3c6cdac894623e953326d
 MISC metadata.xml 382 BLAKE2B bc907f0063c080ab70373e0d2e67fa2ff2f16e2c93982da1769a92bc4f67a9288e9c4f683bba89aa9cab479dd793e4ef294a726b6532fc8031f5d397e2b8c1ef SHA512 8e617b870299fbfc28e7cb6e67ea8e772e97a4886d6de808614c72b423bf557ce46005b64e37a705333edd8064f873575ae6687719a1270b1fb78f0d654e087c
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index e951c6617be7..fcc82c64d48b 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index 042ae0928a8f..6c4fc55693d2 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_lv2_theme-v1.0.0.tar.gz 9795 BLAKE2B 7406d03b53c06a4e814490df65c5dad3bb8299be2808fe89da842c4285ac8798141d7e59713e6bf3b3ea72a7af8650c2b7ead586fdf48004df78350ef789a649 SHA512 e10331f4a979055929b7146b89a4c19b05698e32d0acb2eb3d7734f6e9298d1dbe24dbe5f56697505f9f7488845643011fa1df4ed112b4f016ba21d41a4f91c8
-EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 494 BLAKE2B e8b3f8f60991204d017c8968e8424ca3a413c3a22ed5ab7dffc7ab8c18e3a185e80524983820bd92b279872f935a085613a2a7d4d43abc733b8ee07b6ab2351f SHA512 7144ba9cf28ca2edfc86efba8de36956f1293d67a8386392d385fc58c78c269e59c4e172f15c90384f1f7c5aecbce719a323276486809b719ae0310fe3ac67f3
+EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 501 BLAKE2B f0347b8a1a72ae517c7da2910aa20341bc33c7e833f6e99ba59c91979a7ba385662d73920afe3b10f67ce26848de81e6e17f0e6a93d3240ff5bd7010de4e5828 SHA512 eced3ddba1c3e6a1ae060206e48e90e662f7570c54b43b6f3d11ad27a9a47d9f1d0dc06e12cac8bc1d7f48b294c4288b086b530c5dd04b1dce4fb3e4987647f5
 MISC metadata.xml 428 BLAKE2B 44682c327177ec1dd09978a294329e8a23e25dbc5b382d802e5cec4a281b4345d147b6348ee6d2008d9e8b9463b35c0c3feff62f3c5d4c6083618fda5a7f8629 SHA512 df698193da79c7d54795ffc35f22c043b7144b62f833d50dc3f1403cc878954fdf294ec2668d2e6750ff4baf0043ab81bef28e927abbfd61bfc252625b8e8e3e
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
index c2df679f9a37..6280d12d0c3a 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 99833a32f2a6..1fc1a5ef7ad5 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1072 BLAKE2B 6b492fbe83e2636aa3fdf854dcd50c4d0614678356a447d0b299b05a88652cdab6f06c75c3a452a88287b83647405af1fa26214341359b7f3232140d9a4a35e8 SHA512 169e1cb3602c5184f13041e0c975391b4072b8f55a3f7e9854735ad243144c1c3d66304fe20785ecee0b6c5f5dd777071ff9666f1b4c9155392bf4ebb8257460
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1079 BLAKE2B ef688f7503ae9b0921c67a42e534382486f66912e9bcf06258a260f4a7dbad7bdfb49157168fab13b2507ff735585a8eaa0a1d39246d59996f97c317a67bb26b SHA512 aa4658286b181429c3e71c7e7fdd4588f8dcca57cee59d5aa8916199246ebf548dc0ec4e649792e36cc9bf92239ff004759afe3d602d8de095625341c73cd810
 MISC metadata.xml 477 BLAKE2B 81fd6ecb1babff7205258eea29e7937a0007ad0ab1d275a0baf4c2b2b0d2bd40143e47ed8dcbed54381283368019443fe67d7c4d210bcaa3713a72269f18aca1 SHA512 48c35224a7fc9e72de6fb738686be0e81d76469a756efadd80455bcaea3feba0aa71dd9be4ecca43c6843cf9160ca42a6eacd2a15081c4c8a637d4384677db92
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 38232e161d5d..e7d18a6002f3 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index dfb270f8be41..d927b96af873 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1253 BLAKE2B 80b2609b0b304c92bfb3d8f03181bb262fbc2ef873fa1aeb30eef097e52fc39ab147a50b0bbb93a3b96bf3850a5bed5c8a1e2e32940a4fe41d2c981552c3240a SHA512 e2e015a39c7f1a84a21dab29b7018b68c79e6888ea119adedfe0a4ee9ff97ddb88c58f7ccd957c454966915cf43fb8f0c5759e83f0f08ccc28af77e0eafecc01
+EBUILD sphinxcontrib-websupport-1.2.4.ebuild 1260 BLAKE2B 52b7a082399892c8eb9c1f63ddd5d13883829d23c3e1ddd51acebedd2b5f8cb02922c9c3f044193dcc375d5204cc6d42866135de6ba30bb06569bdd963e38f0c SHA512 fc9f20c2b47e9e93d4b464ea2630b6e69da9331b0e2a6ca98d2e4cb39350a8fed35a33511e20571e3c903e11dfe6c8cf8efe6002361d9265eb0189453706f5df
 MISC metadata.xml 613 BLAKE2B 2113d218297d01838878ae22852cf3e78c7bc8807f2c46b1eee03442b3e0af2d3762d331adde3d116cfc71bf5f0e0d7f2b5d1f26a18d9c5fe068eede34f971ca SHA512 ec3a2a5917a3332c95d48f42d0ad2d0bf91745c2f61f57f1efa11d80bd828e635cff0c22e604cc11aa7ddbbc73dc93ff58415c75c87b4c00cb60c668e721b993
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
index dc4c7087a7db..fdb6aeba3847 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 44567568cca2..6b713e0810ea 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,3 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1.ebuild 1405 BLAKE2B 838158bb68a800558cfd269c05ff8f86f44f4cd851b399ec539d625036d67f9a1ae8c4e5db8698a9492be1cfaf636e017da2d3dffc5c7041de1aa43651a4aebe SHA512 4af200d549a0f8a95a449bada39b3f4f50c9f3c588644568bad407d6f1f8c0507813ed6cccdd56efe0df15f8dbd3e90cd5eddf4ae06d7d71398055643121e8bd
+EBUILD sphobjinv-2.1.ebuild 1409 BLAKE2B c5840307dbff454b737b3f41bd1b596f4ca444849fd8b2061d2aa47e5af85f18f41d88dd36a7be427349e53777f667f769ed53922dae503bbb1354c78e3556eb SHA512 2f8543bce642df4245c2c7fcdc75445c8135db02df7161e33fdbdebcc2d0d02d283bc5feabc7ca6c133876b3251cc32a0e7a063ec604608aa930c0d85801fb72
 MISC metadata.xml 893 BLAKE2B cf258281d276e039b3eef66ea4612b3b8df3578265939084d02f9743c5aba3a5b27cadcb406f8dab157d9c0b52bea1ed23a71b989ffd20c236d7cb93aa8c52d2 SHA512 87bf6bb4eff58e18e351fd0512c89cca99bb72dfca01dc33b892656a6ef283d3545072bb47a0f1034f27781df1647f3d046440392fd040481b687f75f589d44e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index a5698540a247..a8c44c635223 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 49f6c5e0ba80..6ef817e7258e 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,16 +1,10 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
-DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
-DIST SQLAlchemy-1.4.21.tar.gz 7701480 BLAKE2B fd7898844241e381df1356b33f42c99f1d91e50cdf702d3d04302225b64ba7e5bd4ed0d140b1ef2c6a3c4480c282ef3aa6f1301083de68c63d4b86448a9420d2 SHA512 90e3e63f339d784bf46928031c24804bfc2221044e08061f3da7db9c905013fbf4f0cada3b870a1662234b0169a51a678ff6bd837610ba18ab7cd1eea048a028
 DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
-EBUILD sqlalchemy-1.4.18.ebuild 1690 BLAKE2B 4a31c38037057fb338e12175331a2ed3347612c9df5c3817c0717d165d9544a204e55514130fd4d8ce3ab533138c2e9ef9f070d09815dbc2d21af82f76921ae1 SHA512 23f80e868cb99d48aa52da3881e210bb86e9576f339a5376c2922bb6b5b3f4f4a37c45f70ff8700557d157b19261937e45eab5b9f696671ae76c9e0579e9640c
-EBUILD sqlalchemy-1.4.19.ebuild 1704 BLAKE2B c6e674ffe8efcfcaab23945ff90090411622da56f9d65414a0c849b2f01bab12904c4a79c71383b4fac21aad265e6dc83a4543adb532fd44ae84aa7079185981 SHA512 1e6cc2c24dcc02930e1687d9c0424b3a98baa6e4be7182e65beea5c836dd0b6396d47abd84c0927d497a34b8cfa39b1dd84449753a471dfd99e65dcbd21c64d9
-EBUILD sqlalchemy-1.4.20.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
-EBUILD sqlalchemy-1.4.21.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
-EBUILD sqlalchemy-1.4.22.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.18.ebuild 1689 BLAKE2B f416319b85910319c2978ef29269ef78073aa917a503ab9b9c5d649480179d918c15530170783108d6c48dc8ed24896f4e82607588d8b36a041e404581983cbc SHA512 706321122605b9b121346f7e408b06dcb9864fcc59f778c50612f01819da7a92930dd9c01d137fe23ce76b8c43aadf94a93fae421d9d6a1fe77a1a558c85d275
+EBUILD sqlalchemy-1.4.20.ebuild 3129 BLAKE2B dea891b5cf7c6f91fd9539ff5391fb56423d3ee5607d6fce242dd474b41ddfefe5b8d981285b08f2380788b03e233a45fe6192be7585ef9ebab4b4b79531f472 SHA512 f9ee209be3903d2935621d5036214483159685c21ffb2914b6630f04a02930a3f4335d89a3c7a560c1ed158da2093756d085cc781510f7eb7bb60c293a293ea1
+EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
deleted file mode 100644
index 34d7b91a49dd..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
index 619a4c03c66b..4e64d3a7d6d6 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
deleted file mode 100644
index e9bd1afd5434..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
index 144d57d9ca1b..842ded996206 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
@@ -44,8 +44,32 @@ src_prepare() {
 }
 
 python_test() {
+	local deselect=()
+	if [[ ${EPYTHON} != pypy3 ]] &&
+			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
+	then
+		# skip tests requiring greenlet
+		deselect+=(
+			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
+			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
+			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
+		)
+	fi
+
 	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
+	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
deleted file mode 100644
index 144d57d9ca1b..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3)
-"
-# Use pytest-xdist to speed up tests
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove optional/partial dep on greenlet, greenlet is not very portable
-	sed -i -e '/greenlet/d' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
index 144d57d9ca1b..3d2c8002bc0d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
@@ -44,8 +44,32 @@ src_prepare() {
 }
 
 python_test() {
+	local deselect=()
+	if [[ ${EPYTHON} != pypy3 ]] &&
+			! has_version -b "dev-python/greenlet[${PYTHON_USEDEP}]"
+	then
+		# skip tests requiring greenlet
+		deselect+=(
+			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_lazy_init
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_async_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_fallback_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_error
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_await_only_no_greenlet
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_contextvars
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_ok
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_propagate_cancelled
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_require_await
+			test/base/test_concurrency_py3k.py::TestAsyncioCompat::test_sync_error
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			test/base/test_concurrency_py3k.py::TestAsyncAdaptedQueue::test_error_other_loop
+			test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]
+			test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]
+		)
+	fi
+
 	# Disable tests hardcoding function call counts specific to Python versions.
-	epytest --ignore test/aaa_profiling \
+	epytest --ignore test/aaa_profiling ${deselect[@]/#/--deselect } \
 		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
 
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index 530ccd894066..8c73b9cfed70 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-EBUILD stdio-mgr-1.0.1.ebuild 801 BLAKE2B 466c333c71aba440017f05de0dfcf04ee35574a92981dbcde6ae75f8132bff096f93461864493617cbd9578e34bcedf52c51d33806eda30faf913a1ad9f68c8f SHA512 755760504455879c45419082be47f56130c55e269788e5d425060896f6406c7e421356060072a90e6a390b0e14f6ee00620700e04aa9511dc1f1557354ba1be5
+EBUILD stdio-mgr-1.0.1.ebuild 805 BLAKE2B dad06a0416f011e79f3fece6d7509b86ea186ff2bf01cf5c2fbc8148383c1964094e990e4d164303ebacf5dba6c7d5746e87751ba2fd0d1d558f44a8b4438fb2 SHA512 6035698d1ff20f1079bb4960bd0df42f23ff1669662b849373dba5b9efdbafcb93b1952cb888d95d4a16f3b9238fc0f3530c1a24a548e6c7c62a021cc2a40e53
 MISC metadata.xml 938 BLAKE2B 63b86f805c3eb74bd92a09792c04f91083198595c38def2fa795bc66d37af74b6017c801adcb17ad0cf65b7fa5a9a5271ebfdf1bbe295b465ef94d8b11535b7b SHA512 9850613726ea4ce8f6bff5785e2531479bcf1754999273b647f77d6774cffd79925193d37793b55702271364339a128b906bc4b9e49bec98dec5bfdb60f78759
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index 4d97399cf0ac..4262395472ed 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 2cc8be5e2b00..0b8ac538790f 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,5 +1,5 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
 DIST stestr-3.2.0.tar.gz 118000 BLAKE2B 901654b53fdc9e5ab287b77b0a26ce531e3a167b2f5d0aa0765de170341bac8ebfbc4efcae39f672ca6dc6f7518913cb5e56d87faaef35c0b06287652c06edb1 SHA512 4f5e41c92518104b06f5b9717d59c214a8d87efe47fee199a602e71efd64e29c98711ffcf3b88cd00209946d0ab123c7ec5aa842e1d54bc65d83c8d70fa4898c
 EBUILD stestr-2.1.0-r1.ebuild 962 BLAKE2B d0387ce2d488ff93dafbcc1a0ef2f92c6b9440b40baaa905d560a8e5591c3981e8433319ad7ee71aeec2429f2d949b02f71341b18c143872fdd77ebd4f230383 SHA512 1f46b2bf824b3782b72f2fdda92241497ec4d8145e9564d42931d6559a68b8c1160fc810ffef3e6ca7f23e79af4a7df332fa3aca5b5da2a82da7973d91d17941
-EBUILD stestr-3.2.0.ebuild 1119 BLAKE2B b419e8bd366d0950c6f78f6a390a646804df09f5ec6646377294332c86ef4c7f3b08b27dc020ecac9e14115707a8761b13e4faeb2f75f1f46326bc3e20b34ff5 SHA512 234f5557199c0cdd6a84fb0fb4385feea151806884434bf1a7dbfc5cadb678a12deb77136ecd1beb1235becac3cfecb2a3dec05a9b889eba6741551b3c924c9d
+EBUILD stestr-3.2.0.ebuild 1126 BLAKE2B 20b463be000cf12b868ed41ef07bdc8c981dce154e57c93c8ce490b08872e84d5aadc09baae8c8dae83e581a3f938e65eb4332dca64d0fe7bd7b8cb67aae7660 SHA512 0c090fb1fb0dd939ef15cde60fbbfbd443a9153eff3ed1273e768688424d6fabbb5b8917938eb7ab2f085111d71042ca8dbf8ea244a95eba041b5dcf34bf81f3
 MISC metadata.xml 639 BLAKE2B 1a1ae7ac17a9cd8b64fc394ea8d4aede9f7ed1d8142c22eaa88e6315feeeb48e70c074e021dfc8115fce3a8e1b70d0a7739f66e9021e648609d5244548e42f2f SHA512 bcce81b4b21946c4762b334086ba5b72b899f02731de74cfc9bf6a6890bdb0211c7346adb76bc7dbee8edd200392584a1a29bdd5eb6722be1b8a13aeab734533
diff --git a/dev-python/stestr/stestr-3.2.0.ebuild b/dev-python/stestr/stestr-3.2.0.ebuild
index 3348bd63a10e..2960049072ab 100644
--- a/dev-python/stestr/stestr-3.2.0.ebuild
+++ b/dev-python/stestr/stestr-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 4d264afdb461..f19de09ca1e6 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,5 +1,3 @@
-DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
 DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
-EBUILD sure-1.4.11.ebuild 699 BLAKE2B 4c8e3f7982411657f043bf1810fe2e13899431fba7cab279df57dac6847dd860bd02d720354e17a4556034d914431480d7aa40baf71286c1c758728886f90466 SHA512 a45402b06d588b7769e58bb3eb7992ca3a02cb06faee4c19b38ea7af89d6cbd37be1fbb42feb7b0cde1826b54f8a5f1b57239c62d00a8c5b3e1da59a1ca2ad9d
-EBUILD sure-2.0.0.ebuild 696 BLAKE2B 8c1fa41e781352f2768e7fb6227df92cfe33ab37095eca25fcb5be74b089a7640715b53815de21d79d8da3c007b0f5e07070b7d6f4e9c04d1b1b653f4449e93a SHA512 437c153aadb341fc02ff565a80e469da57ed774ef2c7aab5b4847d4b1d6e015d4d40caa5ebe6d8784615e67f66de2f2dedf26ec976d78ea75546d7b675281023
+EBUILD sure-2.0.0.ebuild 689 BLAKE2B cb61e898377ff7e9193913362e2dfeb134625c15b248bd0b98a8f32928541290941a7bf7b7b77377ae1ac97939ea3175a57100f2b10584f76a609e9057fa7163 SHA512 a5de2f724ff297f3f3525436e37150da0e3d1c00223f17c32a2611961ee041d28eccf9655bb8d41e68da1632518ce225d926278e56e1f664648efbea8057a1e0
 MISC metadata.xml 582 BLAKE2B c4704a54df6af54ebd4e5278e88fe8fe65ad67c7ac23c9759008f8fe16df48c2760b89737466be1872f50345f7e2fb226e591d4c2fd10c5785e246311c9f178c SHA512 642576884a94f6f014d06f3f5cb5a3cc95de68e44c6a948ba61b21a03618b10c9040659ef8cc3aa93f26a62209f17708d3c8cc248f5267f4789089eb8547bb06
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
deleted file mode 100644
index 496ccaa734e2..000000000000
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	nosetests -v tests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
index 03bb0dfc4e10..f787aa00d109 100644
--- a/dev-python/sure/sure-2.0.0.ebuild
+++ b/dev-python/sure/sure-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index fd4b3b307505..e3c0ecd58132 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,3 @@
-DIST tempora-4.0.2.tar.gz 21837 BLAKE2B 2d3a9e2fb09ce63e37beb8090eef0238a55c0daf8ddeec79da148af5a77ba0afbc1ae5cc9cbffe1fe04adee3fb0928005e30dfe69dd95ec746d5b003670926cb SHA512 6b4b4f78d1bd05518a1ac89900f927bff9164b57f9cf295045babb0a2b23216012226035d9a2e092e987ab9dc55e583975f9d2f8e62e526cd1a88e13858f9588
 DIST tempora-4.1.1.tar.gz 19208 BLAKE2B 77901d1f4b19f2c88d4492788f8b351c70ffdb474769597bc2eefc85b4dd503e57876b687b600b49a381dd24133ae30ac547961e7cf8d7005e4cce5dc5049012 SHA512 a272980be5d4448bbd97d9e48d8a992c07cd1e970924f301fd3444834fe112453d5714ff8f3e7af6a5775d931b825601d7f1abf3cd9319b08d148a2a07d40d07
-EBUILD tempora-4.0.2.ebuild 923 BLAKE2B 0b677504ba3fc1eb2abc1c49a4f7a6743adebf3f483f16fa89df50fa7dbf3261f58108971f4827f14e9bca4ebfe842844a4f8a316c9d7b83a5ee3ecbd1cd7282 SHA512 048988e122120336e294fd3de48ab7f880d1db15bf909c4458fd67a28191ef1dc5a7c3e594d09d319f582ee1a69fd223d3aab0c61f334c0340f44687e73c2660
-EBUILD tempora-4.1.1.ebuild 931 BLAKE2B 173212870d76f832afc8e3c598ec3b314b3138306b1e3280912a946e96740bfeafbfd7a66ffd891c667a096143fb933ee674c0377c4b136a25fdf162ecbe1f48 SHA512 c4f139b317f52174cb970ef221513ff431d6ca8bfe1107b74a9d2b9e243c125b8c08cfa7ae3cd32ef122dcdaf4f8b3b7686a3105ad34dec902e3ddf8769a8106
+EBUILD tempora-4.1.1.ebuild 923 BLAKE2B a8ade4642882cd8379218de8f63997a61a190b8f0226409d4b60dfe3bf7b8e767ef7a221822c2eea441db7df2cda512b3d315dc1ac91fbf3c0389aa6c383b594 SHA512 9146ddaf66a8cd1ede4eae7399386da7ab98f1f1fbe8508f3f84fcdfbfa3ea9f0e67ffbb1347379aceb18420e2d7fdcf4bec3735b3e2eaca5708f33e0fd1b448
 MISC metadata.xml 639 BLAKE2B 0d9a50a66ac1bcad2bb56a48e3749b50f3b0ed4163d5d1ca75f097f0f67a1dd3104720075c2e2e484e8e9c119f18f62b9217c413dccf62ec19d7558c6b5c65c9 SHA512 a5faad13de686702dae7b796a6a2bf7f0195cd8d1a4154fe006435140cc4d789a9c42251c072c21dc099569b65b67d4bfe02f115c3d4c5a25d76f28532188e9b
diff --git a/dev-python/tempora/tempora-4.0.2.ebuild b/dev-python/tempora/tempora-4.0.2.ebuild
deleted file mode 100644
index 271e88fc1a9f..000000000000
--- a/dev-python/tempora/tempora-4.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
diff --git a/dev-python/tempora/tempora-4.1.1.ebuild b/dev-python/tempora/tempora-4.1.1.ebuild
index 2147a01b0971..35aa7d998cbb 100644
--- a/dev-python/tempora/tempora-4.1.1.ebuild
+++ b/dev-python/tempora/tempora-4.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 90c801598ef1..f7d7a138fd58 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,3 +1,3 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1.ebuild 815 BLAKE2B 229e7637852ab5df133a73efd60e58c8b6cb8136190639c49a59dd25bb1cef2ba45a9971c191c40fc263fd940f510ed38194dd18be0f2a77f6dd4d4f1bde7451 SHA512 b8a6a918e55877af514f9974fa95331d3656e289f86d3d98df35866bcf67ec3f47760afcecbe1767e6d26beeb5714ce6869bf4ddc9e657563fa812a7db3a8b5e
+EBUILD testresources-2.0.1.ebuild 822 BLAKE2B 73af21c310ee7af838e055e70ae65fc208fce0cdc413a4bdbc6d5f0df2177de4cf4c902a311a6ad612c661c9fe4fe32f7fab779f65df693c7f78b6e4afd5a5cb SHA512 f5be3330932132a2cb1d8e173971245ccc6f78bca2919af2103a91e47fbe201f19fd624833f2f6c2bc5e8c47d0f17dded3f434e1ecdc5d65db15c990d17ea34d
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index fac3d7bddf58..2e21ffe61f0e 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 2511b6a0a13d..dae3ea426ae9 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,3 +1,3 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
-EBUILD tomli-1.0.4.ebuild 580 BLAKE2B e9e88f57f31e27a96b8b6f18a9ddff898864b04c472fca85af88294b7af6a722027e461b6506bf12328546c201b51b030e4088159e0652b5bd5d2b38801af8d6 SHA512 8c829eeffcf790b37f5fb84a3e79e2fb437608488faa223ff5826d6e88f636bca348f89d781a84c06096ac9d3d5449a096322f7d11075fa001bf0cc85fc3b71f
+EBUILD tomli-1.0.4.ebuild 605 BLAKE2B 742599f57c015247c50e9e06cfe4f460e9a19fd710e6efc825fe0abf48160b4965554f130c3137536d5544a2d93e73ccb2eff7f3241f1a86cc01560db89b6761 SHA512 255da837f0e42fb505c7d8f4fae366192ab2663df69fd4879d949cedd93c30f781eb9fb35ced8b6153b8e01bd7469fc8b9d6ae819f822ed90f37f0d8991b405b
 MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index ec5349db21ec..b35f22cf0cf9 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index ca26fa35540c..c45c1e285802 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -3,6 +3,6 @@ DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2
 DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1279 BLAKE2B c4a0bedcd484ba1e68392ec89b156df6b3f317fff921600033e82d43038efab715552e2999851ca1ebace2a63a900a964876ad0bd00a8c1a13578b8b0dacb2fa SHA512 c11bc9c4ccea1bfb94c593dca294fd940c686f30b70fe039e7f6f043865708d688fac8b2216e29c1695b07c2014e6a559a6e8c8c94a7daa4b2fcf7214571216f
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1286 BLAKE2B af1a497bdbb90039876df911c2c8a2f3942bf7a670a183a5a37a582f807c300327cd19d26552caef34dd93a7c3be98859a502d2a8ffe205a9ce59776c23d2fc7 SHA512 b80815e381a9c0dc224e7b615deebe220c9e2e3d313609af779dbdf3e161c61a5a57dc1b63d985a2171699677b3f8007a7b6d4d00133a759c1099e8c0695b2de
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index 7b8530aae75c..edd034eb8fca 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 1649ee6426b0..7485b613d57c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -16,5 +16,5 @@ DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f58
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5778 BLAKE2B 357cb440aa44c8203865c199b5d00d6da0567a19270065277eed1ecaf4e999d51120aa66db9200c0b18af64e2855cee4986de6e198504b72f9d691b0a541ab8b SHA512 8d0c15bd1fd4aab254053bca7b7b65066dca3ee8078af107dd5388d893ad6edfdb8abb7e89806314d1a755e65e1055c98354774ead50dc0cf64cbe4c5e6ddd99
 EBUILD twisted-20.3.0.ebuild 5612 BLAKE2B 7fec5be0b0ccf4cddcb2b04fdd3de6ce697f0fafec4e622cdc3d1761947f7c469b70e3e4bdb21262fa8645bbfdbeba8b2070723bcee97c02f8029734baa05c30 SHA512 4375f5549010300e6e933470c3be054289acf5e6cebb18189d8c1ba1e2aa9c96e8629c0b6c5fc3aa68218b84d978120be3e703dfec901f49cc75db0533a86e16
-EBUILD twisted-21.2.0-r1.ebuild 5153 BLAKE2B 71101e37a12739ed912294d9c5648a49e514ac13a6735b45af7059937e1bbcd5cdd14aadce420ec87b8094eeff45b68b87484781a3cd1f5d629ea2ac00baf00d SHA512 64389992956299c3d7fb39f6c5ac1e844bce1d14016630f18f08d7b042c3d561ac66545adc31fdd0fd03d1c70bba76ce16e8c329539032e59d8a696f0a331bad
+EBUILD twisted-21.2.0-r1.ebuild 5160 BLAKE2B f86a801b1e5b995b821b4e5327ca4cd12f39a530e6251f3344ae24b6b798f2c6a44d28acf24873404b27e38b6d1792ae28a2bbe6b268c39a4004cf9f7322844a SHA512 c98f9376e32b044fc5718455ab1777a4f6347246b33ddd9b25c8f1cb665ce9cf6bc51c67042b08bca17d97eb950ec90eed95eaba0d5ff0dfb1c1aeea76b2fb95
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild b/dev-python/twisted/twisted-21.2.0-r1.ebuild
index 7f7c659441a4..80810364d1cb 100644
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ b/dev-python/twisted/twisted-21.2.0-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 53c723a28aeb..3e3e73f657f0 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1281 BLAKE2B 822eb226ea59ca2daf2ed0fa81f97c30a1dc678d07684ee10bfe604cbd30d2bb0cd70c5b4bbb64c180bba9f605570546bfa81f457b40371edf672eb10f4689ca SHA512 c7e2629d574374a45973ec87a8e19d2157c449b727948116aee9e35d288bb5eb4c65fce223ac72693fe6dd84f7f505b8114504984ea89a3ea25f5e29495294b8
-EBUILD uvicorn-0.14.0.ebuild 1430 BLAKE2B af1e1fd35aa98b57159d045233bbaaedc13e69a21b95271f2445f44b439d9d316e8601f19da048364a099130f6762d41209375efabb7303706e87f42df6a9d8f SHA512 bbaf9a47ee11762690a74fbf20031a8f0643479b1fa92ec8b0477c01007a0d4cf9c36e55b56c077639428a274c586de3917762b1d9b5bd827daa73421e86de34
+EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 83891f78a5e59c9bafc60663bcb1aa3c00326418f1de3de0d31589103b5d88e86f27c1226542952d93c2b496527fc3eab3f5641f562cdc85c6780374daf6c1aa SHA512 8f98fbf1bd0747d74638ffdca1360deabbfc662038f43cf6939a29f1e2f6b88a67a52f11221c0558f1e5b81b70d50c4dd1d1505bb094095519c667c58d58db93
+EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 54753fd5b284..36625ca3ac4b 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
index 494ab6b4faeb..e93bdc3d15e6 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 120163e651eb..13ba6947a135 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,5 +1,5 @@
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
-EBUILD uvloop-0.15.3.ebuild 1181 BLAKE2B a39d893114caee875a7f414758c55c6dec6bb4fd55409b1a207f9ecdddc1e1f07a264458c198ad77b7d72f1c16054689065798836c90decb2f20fdcbd4718df7 SHA512 39909e1d61d8eaad914fb1d02b11fc3711d499ba7e276edaa55d065368550e71d8e2a3b70e63ece07f92f1ad0e09a2c4eed50ac6868ea1298255381eaff7e87a
+EBUILD uvloop-0.15.3.ebuild 1180 BLAKE2B 6b861bf35c1f4b5b44aaa5ca94ae411e17d39f2c9e9237e05046cf867e779665efa6270d9d3165b90be1724c5591af8f7766f11a1b285abde2944513792663bc SHA512 f1388b3d5ac6ec2ae175496e4508fd93e8f45191a241a7e43670a408bc30f59930d4e01611fd9f83fe4700d04ff46b9e60f54e9c454fa2c9e9f3347d5f161a15
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index 35aac31b4a0f..da543faea652 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 4a1dce161658..34fd3ba4ca73 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,5 +1,7 @@
 DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
 DIST virtualenv-clone-0.5.5.gh.tar.gz 8679 BLAKE2B 4283de1e7b53083357d68ea556ad68144fff104d531fcc741b2194e7b501de52ade791612a538d87585af75ecf187e0bee2d13a76cc55c0516f8f145a11b58e7 SHA512 b4bcbfbba9d6616d00ecbd574651dc93cdc71ac85e610c924681692665478975f2381e04afb0b9e8b59c76484085ab3519aa4a58b1dfe057a0be0ea83263e93e
+DIST virtualenv-clone-0.5.6.gh.tar.gz 8723 BLAKE2B 2bac625f85a26ac2224fb982230fdf592963ac462d6d86c59100bf960fc37dd4ae7ae9da0e6234e1b2952d77ce55e0a0c60c06c7db4868709638f21479e8150b SHA512 5788a3d2994b3cbf4ec4668e2d0597e7a033a5eb13465b3964aeb2a38c5798a879e818a88a9cfa37b87a9aae534416c157cd82959af556b6ec94ffbc755ba844
 EBUILD virtualenv-clone-0.5.3.ebuild 505 BLAKE2B 26fc9fb7c371e458990d62086417d8f2ffbb18c28d3f019323974cafa80275d1de52baafe787ea362df1f8992b2099be86ea4c7800566b579bbbfa8298517649 SHA512 03120fc0e981b8198b78b6acf86c58a316069d834423dea69d8710b29afd662c5874f2b9279395f242c9f22337500e48807b183341fd8aaecfc19c6d2b78e02a
-EBUILD virtualenv-clone-0.5.5.ebuild 537 BLAKE2B 8e8ee82260203e3c16853f624176da7465be75ad8327f9b58935efecdb1fac7164b4dd591ce364e03b46ff084dfe88f8625e3a05fb70daebfe6d6f5ec87e53d7 SHA512 871a3867eefb7ea48debf44aad2ab26191de7edca37d1c7e0ad3391996632831d22b23cb38626a0fc9c4ef6a1f392cbc142ed7eed61cb2f2e6f88851be5e69c0
+EBUILD virtualenv-clone-0.5.5.ebuild 536 BLAKE2B e3c2bd20b7906a06bef1d041df3716aee4bf8419eeee09d10632e208f7ad85e18f5540186b0942977eed37d51f2fb1e37fee684a0101cc3d78771c33bcbfd8c1 SHA512 c5f6c8846f8891c94879a1e0b7b6fbfcd00ed14f9bc15851d6c8438371a4075cd0ce988a924e0bad1041d6e3eea2468e4349d6bb3edc8f7ab179702e18117aed
+EBUILD virtualenv-clone-0.5.6.ebuild 537 BLAKE2B 8e8ee82260203e3c16853f624176da7465be75ad8327f9b58935efecdb1fac7164b4dd591ce364e03b46ff084dfe88f8625e3a05fb70daebfe6d6f5ec87e53d7 SHA512 871a3867eefb7ea48debf44aad2ab26191de7edca37d1c7e0ad3391996632831d22b23cb38626a0fc9c4ef6a1f392cbc142ed7eed61cb2f2e6f88851be5e69c0
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
index ffb83dc6e391..92908cdde49a 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="A script for cloning a non-relocatable virtualenv"
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
new file mode 100644
index 000000000000..ffb83dc6e391
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv"
+HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone/"
+SRC_URI="
+	https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a00fd3e1f965..a1f77baa2a6e 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,5 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
-EBUILD virtualenv-20.6.0.ebuild 4257 BLAKE2B fafac98f404cf0eac5065f36b0d96c6e6475483f1170ece02e8577ea80b8b9c53f25e493abe01fb9db99ab0646036ccccf669c8501b25db51c208564a7e0a372 SHA512 e3f1f2f6142b8b8b8fc6831776bb68039802ba16e702c1da4f0dee5c3cf33795cbf665dddce466e327ee18ff4478db1f46607f533e9731390c8377d0e583772a
+EBUILD virtualenv-20.6.0.ebuild 4263 BLAKE2B 94fe21a4be14a85eadb08db776b648875876d83204b7e673de42cb38b2eda5773baa949b4f69cb0e8ad2e89e5820b9dd1c1b6ec7cc7c7a219a52b3cb7aecd4d2 SHA512 e0ea9767a671948a9fe47696d0d8bda66972782d0dab6194b7bf5238dda8f96dedb608d3500aae954bbde7ae665b3edf785e46270e94b7d50453d84c467bc550
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
index 15279072aa1f..2167370f63af 100644
--- a/dev-python/virtualenv/virtualenv-20.6.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 7d8f5061f653..ce828ab25a1a 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-9.1.ebuild 481 BLAKE2B 0f681992c42ef67af0039703686dadc7e1841f4cdbbc6dabebd303b2fad9bde9c44749bde580707c6749050d6e370fef4dd814a2d090a5c77e56c868735b7e7a SHA512 2a886bb574e9ab7e9105bd69942fe57fa5f798bc2a4ff976f2774e754b3c8b52f2f861074bf431651922f225059b86283111b64b3d56f5acb63bb85ef3012a8f
+EBUILD websockets-9.1.ebuild 711 BLAKE2B 76b5e96b67135d5173709b1ea9ebd459595a26986fe8f522434a8b744fa5b7faf21e80480323b0573ceb4b4656c9e65d3ee91000937d184a99a50c5bc5697c78 SHA512 c097db15bf8ece86b4595078699f9644ab2026dd215288fdf202aff356c88d3bace38539cc280f4efcd2c467d0d17d26e4ca1ad278e4b7f89498fa2fbf034f93
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
index a41e8123dd58..5e3b89269e27 100644
--- a/dev-python/websockets/websockets-9.1.ebuild
+++ b/dev-python/websockets/websockets-9.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -13,6 +13,15 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	# these fail due to timeouts on slower hardware
+	sed -e 's:test_keepalive_ping_with_no_ping_timeout:_&:' \
+		-e 's:test_keepalive_ping(:_&:' \
+		-i tests/legacy/test_protocol.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 145ac10b1df1..d5f8c586259f 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4-r1.ebuild 931 BLAKE2B 15e9cd951a84b4724d6ef7fbdd1b5b704b0ca00d632a38e1cf9fa9911b1b597bf25048c3cd9d792c75a6223b0d56d271049f702dc5a9fea8255ec99cb291a523 SHA512 465fc09cbc5868050c13d42a8ab3c2c5090eb863910787c4bef0e8182c76b4f48a323c4b83c4a330240723985c384c82f6b3e32ec1446519f06f3db1d9bd456e
+EBUILD whoosh-2.7.4-r1.ebuild 938 BLAKE2B 2ff3e0d3b3a1ca02e06308cc5c2fe4de859f255389b610786f1c98e726d1759f54a41a578c3c44693abe41cf13a3851dc4b5266925da947262c04373f817b0a0 SHA512 f4f5edfd91ad9cf49576ceaad32b0c7249404831446570aec9579ba8dca805e4f0660cb09d1154a7b4053efec82338fae70a4fe3acbf12db30ec086c2aacc7cf
 MISC metadata.xml 760 BLAKE2B 6c2bb15db2b263c2583af425655eab29bcbe6e1903a88baae4a5922d31dfe4de19dad5409a927da3504db5c10757c48de1d2d2e7811a33da539c74a87a911d50 SHA512 df5ac5858ced41e412bf97b321d05e1a9dadfbf23e185d5713be11a669f97e73a731ed53b08c3a2997e2b4341fb8d15a7013b483b9e00dbbdb056a56c859882f
diff --git a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
index c5e5581f8b5e..5ae27273496b 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index b545959aa840..625c868fa4fb 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 534 BLAKE2B e2f88d4f19f0ad67a46535b0401f81aeb46d918cceb53e8ac953d4f780610c2d2b9a50c3adaf28d0620cb4d90a54ef38dfd1f3a7df40b7ac0f25529cfdfda2d4 SHA512 1d1b677e34bfa746efd7eb18de8700662c8b43a18eafa380fb107e1cab81c517f8862b242906017a949e7e4f6de5d6c50d7f8110c7f1060a92326f0e3d616b50
+EBUILD wsproto-1.0.0.ebuild 532 BLAKE2B 5d7d0c1e3d59e29e080fdb685197ef6e1bb1189bac66744ca29c91e6c31ede6672cda5a04d1910db4a93f037a255868afe782f2778194a347e289daa1e8176c6 SHA512 81c5b2c440fcefd5f3d3bfee5401e1c55a69db9a7b649b61dab2f0a7bd542c591a816d4d1d0e8783ba7f0ed750d77a333ab3b07ebce3c38d83630c5049d61328
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 3de2d072536e..cdaaf69cb505 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index e1b45b85d6f2..7219d66d6ff0 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,6 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2309 BLAKE2B fb39bdf1f58b27e9d0c55be6f6ea6faca3f6ef63f62ed56da59cad29469b263b22a8932f9a273fbd9b075f4723606578d06654b376add53bbff92119685893aa SHA512 baef30a3b16b016776ab77c46dfb080255a969e6f12ad9baf1abc4829a9b69dadfcc047294076486a82ec79717d773f52b7798165fa77ff1551387e03ed904bd
+EBUILD wxpython-4.0.7-r1.ebuild 2306 BLAKE2B 845dc17e3f66fdc35effd8c72620ef58583b071dd5c8dac047dbfeefaa2483c2bf8b05770b997e57494b37159379ea00ff01098e3f5f59361ee669168fba9bb6 SHA512 8632153234ccbd5b699c0c98cd4cfbeffd4adddcb8280c0b0f6ed4a02100be833dd49969684bd52064a2543f50a348e7a6682bb45bb9fa35c75afb4c8b7e630d
 EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index a0ca6036859c..53e159cf13cc 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ~ppc64 ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/xdg/Manifest b/dev-python/xdg/Manifest
index f0bf87417704..8950b2b8c292 100644
--- a/dev-python/xdg/Manifest
+++ b/dev-python/xdg/Manifest
@@ -1,7 +1,5 @@
-DIST xdg-5.0.1.tar.gz 4120 BLAKE2B f80ca1ec0ac064d64a2603f101301d427e7b64133eede1ff0770db0b7ba4368c8640b2d2eea8f1d28a52874a6b632ce83d969c38a036c970e20c2abba3a1f98c SHA512 c6da757cf0fd11a03d97506f7b898b902f560cb74cd9a90ed55550d89bf60eef5e32abe2aca19816279621e6ad0ad7899c7326b126a777231c67cc6cb30b766f
-DIST xdg-5.0.2.gh.tar.gz 20457 BLAKE2B 87ad0914bc5165b7ea5918a7e9f88b14b4c3adebcd43552a98f9570c1682febf1b02c0f65ece03a449a489ea9de57932cebf3f5d8e4465e366a89734cdb77b90 SHA512 38c418dda2b7ed3369757e8cd40eaf0667643e1d8b23d609be4a2ecfa53e8e634bef9cba6e61f38e08b56d85297f35e38469b87ddd58b1bf2be202f6ad5f5838
 DIST xdg-5.1.0.gh.tar.gz 20801 BLAKE2B b59edb9bbd32b19a5d875a541a26b27746e964098570f14fc233c9cbcfe76b8fdd8105b925adfeab4dc519787985848f2acf3be3ef88dc5c2a4acfb6d10d7059 SHA512 37c1f45c4900d26df592da0bd02bd10fc4d132e68dfb76d30723f37e1a72d68bf7e8fe6e64ba17d37f008046726f803268dee4b3a74ca05d0b823d0dd969d3c2
-EBUILD xdg-5.0.1-r2.ebuild 478 BLAKE2B 4653632e0acd8411619945f6979eeee30bc91a86ead055ad63fd188cc6391628b2d88602c8e1d6b1ac4383156b4611c1ec1e1a607b526a57ff9939d789d38059 SHA512 a33f4c10b6e0335f43f7e0748e7d6c867c1df3394f6ff5d16a611909e88a440777e5381a8463250cd6261b3e5797ecba72e8b39fd0bc30c92fe86da5268bc22d
-EBUILD xdg-5.0.2.ebuild 588 BLAKE2B 7da2b8712e71ac552b1357e9c044d4e52a82c1a071a903abe977da8391ae44af5715acd80b7632eccdf00bb9d0e2270aa5840dfdabb0aede7a061923efecc775 SHA512 77803bd3fc3388626d2efd09a1cf4bb967f19a30c4f84ac52dd05d7419e12b50c421dd2f637c7ff463e9cbe7813a81af5994f35ba75f506d0a249efaef3644e2
+DIST xdg-5.1.1.gh.tar.gz 22662 BLAKE2B f25e1e0aed9d14d244452bb9c71194016ac2b92d663ec20fe0a4aa6aa041fe99551b9c8952c6d7ddc7d8aea85d2010a072dfd7a7efeb8fbe37a58e965146ecbc SHA512 aaf3600703762dc9876c603e90fffb7cbdb57d73e3cc2726a9381d211ccb02af9ac6a7a055d8380ee206c8afa58bb1c20cfa56d780a6bd279efaa76b9465380f
 EBUILD xdg-5.1.0.ebuild 588 BLAKE2B 7da2b8712e71ac552b1357e9c044d4e52a82c1a071a903abe977da8391ae44af5715acd80b7632eccdf00bb9d0e2270aa5840dfdabb0aede7a061923efecc775 SHA512 77803bd3fc3388626d2efd09a1cf4bb967f19a30c4f84ac52dd05d7419e12b50c421dd2f637c7ff463e9cbe7813a81af5994f35ba75f506d0a249efaef3644e2
+EBUILD xdg-5.1.1.ebuild 588 BLAKE2B 0c772dc130376dc757bfb2c0ebfb750d107ada194f8a8286b03cbd432f24902fdf006fe934b2951f3cbe0b2b0d17cfdfbbbd03816cd685187da638eaa2b0d59b SHA512 31705bffb5fd76b2c7ff1b6739b1cc7fb4d0b58a367a6ed24d84136851471bc332f3399c5bb26ca1d4f60fec019a868b2a22a66a7931a68a8d946d420399e7d1
 MISC metadata.xml 621 BLAKE2B 5a3cbf7eafa16a4c1b3fb84a6d81e1082543df391109ae16527afa59aad4e9301e4ac103582221da5e215ebdd0dd9a07bc98236a861e62195f044b03e387743b SHA512 da8000528c3702d3737d357ad3f3ce05a04090568506012811debb4bc68a15d00345f1c92e2535dacc3f48f000db57045ec91c6caf2222549732d959d2f248af
diff --git a/dev-python/xdg/xdg-5.0.1-r2.ebuild b/dev-python/xdg/xdg-5.0.1-r2.ebuild
deleted file mode 100644
index 08ed5d1e0b04..000000000000
--- a/dev-python/xdg/xdg-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of the XDG Base Directory Specification in Python"
-HOMEPAGE="https://github.com/srstevenson/xdg https://pypi.org/project/xdg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# https://bugs.gentoo.org/773415
-RDEPEND="!dev-python/pyxdg"
diff --git a/dev-python/xdg/xdg-5.0.2.ebuild b/dev-python/xdg/xdg-5.1.1.ebuild
index 6f45c65fcd8c..f690901578f6 100644
--- a/dev-python/xdg/xdg-5.0.2.ebuild
+++ b/dev-python/xdg/xdg-5.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{8..10} )
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
commit	f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree	72f320d5963e55586cfdeed2b14c72b8191b6327 /dev-python
parent	fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)