gentoo resync : 03.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
commit: fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree: f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-python
parent: 162945d2a91899b637bbb9e163b406350de12906 (diff)
285 files changed, 2513 insertions, 2258 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 702c097a5fed..20b45d66225c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 00ba82a73ee6..e535b91dd665 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,5 +1,3 @@
-DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720 SHA512 26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
-DIST PyQt-builder-1.12.1.tar.gz 5726601 BLAKE2B 6e6dd181078ed126ecf3db7bbf5e7b68b78ec78e2ca198fb4f504495020c8fc7d61280bf844a78de69621049785b0b152f31d0d25779d7bbe330162bb80b68bf SHA512 4f006564f51758cb05da8dce78aead58a23d132405124e92bf79cac39eaa845efa5db15a2abdd43ae95e191d38d81fbc592f75bb68f83b83e25c51f8f84e6182
-EBUILD PyQt-builder-1.10.3.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
-EBUILD PyQt-builder-1.12.1.ebuild 953 BLAKE2B 7a2c1f46e687a9976370fb51f40dec5d219ef62a4a48f745bd6369aa14b05c50f1637385b32889274a69ea899742a021985626f1787c5ff2e8b5bed929159ea5 SHA512 8081728f9de5be6ae861d17abd5bcef3a9903cb0548834db5df0bac2459abcf7a40d7768b17edcf6ccad0d025be245806b770e33ebace6bd1d35287f2c4bd878
+DIST PyQt-builder-1.12.2.tar.gz 5727071 BLAKE2B ca5d55989fec2a9a6f9d37abc307d4db7305bb06449cbf982aa3a2a3f210113319f7fb303ec0d77b513cce844b529e0e56f62c9d62ab3c51cf85a061ecd00c7a SHA512 022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230
+EBUILD PyQt-builder-1.12.2.ebuild 953 BLAKE2B 7a2c1f46e687a9976370fb51f40dec5d219ef62a4a48f745bd6369aa14b05c50f1637385b32889274a69ea899742a021985626f1787c5ff2e8b5bed929159ea5 SHA512 8081728f9de5be6ae861d17abd5bcef3a9903cb0548834db5df0bac2459abcf7a40d7768b17edcf6ccad0d025be245806b770e33ebace6bd1d35287f2c4bd878
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
deleted file mode 100644
index 4d69521c2f08..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
+++ /dev/null
@@ -1,37 +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
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_prepare_all() {
-	# don't install prebuilt Windows DLLs
-	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
-	rm -r "${PN/-/_}.egg-info" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
index f136447e373d..f136447e373d 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.12.1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 01d2f27c2818..42b6bcf2ec91 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
-DIST PyQt5-5.15.5.tar.gz 3239628 BLAKE2B 8992eb9293bb823f1298108a48d0c8578d0acfcccbabc6cb7c209bb591bfed61caf3ab8b8717205698149b5e4b59b4181e67491332e38ae87856b8169d74ba86 SHA512 67600668c769deb37052e6099a35756519987a0796045cdc291add1763bad103df1226f1b6e304e74808279d6ce56231e614617011ce238e1cf91a302981dd26
+DIST PyQt5-5.15.6.tar.gz 3239505 BLAKE2B e98d6af85ae4586dbb1b7db1d4cb17ccdac917a36a304a7486d553a681be9a920e8750173e49e58e02d0129890a8a713702977e64efbb386ce831b8aaef2b0fd SHA512 65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7
 EBUILD PyQt5-5.15.4-r1.ebuild 5441 BLAKE2B 90338bd83e4cefbca3f207be293dfa17ce05f4058522da44129607d1949107c0794c06a8d4e2d79450c5f969520d6d982d4282385d1cc439c6d737144739887f SHA512 5da215138c6c2fbfbd23d3206f69fde4c805725f6a7787186f2306c7cd3daa92a4458c6fdf38b40d640c00a9cb357b00db96a18cd4bb7d30bd8e29f7b82745fb
-EBUILD PyQt5-5.15.5.ebuild 5256 BLAKE2B 6e47d3ed9835153f8aa011d1a42298a8b5aa62701982bacd177c7d8d5a194250a546d7b08e35118b965d4f3fb91238be4890dc588e86729158a0ef6c54baf248 SHA512 5f3748a4eae0fdd7e7a8e73e441578bcc802444825181e7b9516e819e2e98fe6947fceadd30f12eb96b276f66b8a3f09a33f0e3f7d8a91879cf610d0b6ebe6b5
+EBUILD PyQt5-5.15.6.ebuild 5256 BLAKE2B f30c2dea666f026dff65ae0976319e28d5da7b9f81f9339cc89c41666162468709c693857e02d1637926e678e44c9ebe0f12a5b63f1f1b6b10a0ae6fc6a297b8 SHA512 5341dae4f0c00b1820ce704ac3c1c04d5f7d4d7266a2ffccfa953e435e846457915f350b9a29bdd9bf1e67a2b4dd30e69dbf7f68dcc6d3a7a1cef654451f7d61
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.5.ebuild b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
index d829c5fe002f..e7370b766973 100644
--- a/dev-python/PyQt5/PyQt5-5.15.5.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
@@ -88,7 +88,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.2[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.4[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	dbus? ( virtual/pkgconfig )
 "
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 716fb1755d19..3a9df12fd4f5 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -2,8 +2,10 @@ DIST aesara-rel-2.2.2.tar.gz 8174668 BLAKE2B c95347e8b74f6600c3570177f86b7ebd751
 DIST aesara-rel-2.2.3.tar.gz 8179701 BLAKE2B 53ef58d6f0ab33e7efe3d0eaa2b55153a2ab29c958b48f52f814fecf7f5fa65424465470cde0ebb8d2ef1ced6968fd01217d9f7bd61acc8843cde1a9c0a94cbe SHA512 21414230c0be2c31e08fd371ee69c3bb7098b2134a5aec006abeca00a333e025fcbfd10ebdcbf54d243e1bc8c45f301a2c3443531ba5eaf0fe3a1ac5645ae4f5
 DIST aesara-rel-2.2.4.tar.gz 8180599 BLAKE2B 2b5e6ce0b0cbf0405d312f5b7c842057f05378c240c4dd36818c1b9d1b57667494c2472537e039ab16fac702a30a692bba5c8d5fc8801eb0c7e492d7f8e059b3 SHA512 3e0fe0cfa37f3b597ab94778dca60368aedbf9df79b4bb79812a190d77743addd1ddf5f234bf62c2dd744054204f03b84b358d0c58c27c28829b8fbe919bd151
 DIST aesara-rel-2.2.5.tar.gz 8180714 BLAKE2B 8c94d26df9244c95a58dcf0c7f8d733841f25aad63046b12264e8081bbb5a7debad82f48dc9b3119c87d8d4709f9016205aeff025235fce2dc381832c9f5a312 SHA512 9b28163277b358ebb5bc4d77d7fb9f0e47c4aad3eb92de4702148990fb7cd367c67e42d161465129695869a6c23f31251705c6a24ebd36f048259d70c32f9a65
+DIST aesara-rel-2.2.6.tar.gz 8180674 BLAKE2B 6d2c237a748aeee524e4182c47b17a9f7e7325d94410f8c9d7e3dea1d22306dbaa32be1b6f3c471baffad30527451772c08eaaed4494bcceba1759e9f7e9c837 SHA512 360f280fb997b33fbcef08a278816e51b26e8ba4f6d9b0681984394f293d342b498d4633d5efc1b92d64b056b4cd63b918ea7dd46d00aa78519e00919586f842
 EBUILD aesara-2.2.2.ebuild 2127 BLAKE2B 4da0582395b1de9bf9db5731b799b71a39eca5ea9b770f9a71d9835e0da1d2db4ad763d07fe9c7db4c503eeaf45002a69cb120a1a4d519cb06f63d8501bf0b3a SHA512 6aa5f0807a576eb4ac60097b3ac878ff991c4632d01104f209e3d66464de481241c3c7b64e2db49819711c15bdf05d720cfdcff338156070e94325c21248044c
 EBUILD aesara-2.2.3.ebuild 2129 BLAKE2B adcfc9b383b59507aec8e5620147b75dad1b4809db96e5ee1ea2f0fc4af542c5f97d9af1328995cf2a1f26db9d9cad195f0835aaed51bbcda471e71b6bf7edc8 SHA512 0ba992285cdce523bcf6fdb3a63e1904c29b6d69c3905b5e06715ad777f0e5a69afdc6f8518358da742ed92cc7594e7d277fb8574322b0ac0d15ca954cbd1d4a
 EBUILD aesara-2.2.4.ebuild 2129 BLAKE2B adcfc9b383b59507aec8e5620147b75dad1b4809db96e5ee1ea2f0fc4af542c5f97d9af1328995cf2a1f26db9d9cad195f0835aaed51bbcda471e71b6bf7edc8 SHA512 0ba992285cdce523bcf6fdb3a63e1904c29b6d69c3905b5e06715ad777f0e5a69afdc6f8518358da742ed92cc7594e7d277fb8574322b0ac0d15ca954cbd1d4a
 EBUILD aesara-2.2.5.ebuild 2129 BLAKE2B adcfc9b383b59507aec8e5620147b75dad1b4809db96e5ee1ea2f0fc4af542c5f97d9af1328995cf2a1f26db9d9cad195f0835aaed51bbcda471e71b6bf7edc8 SHA512 0ba992285cdce523bcf6fdb3a63e1904c29b6d69c3905b5e06715ad777f0e5a69afdc6f8518358da742ed92cc7594e7d277fb8574322b0ac0d15ca954cbd1d4a
+EBUILD aesara-2.2.6.ebuild 2129 BLAKE2B adcfc9b383b59507aec8e5620147b75dad1b4809db96e5ee1ea2f0fc4af542c5f97d9af1328995cf2a1f26db9d9cad195f0835aaed51bbcda471e71b6bf7edc8 SHA512 0ba992285cdce523bcf6fdb3a63e1904c29b6d69c3905b5e06715ad777f0e5a69afdc6f8518358da742ed92cc7594e7d277fb8574322b0ac0d15ca954cbd1d4a
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.2.6.ebuild b/dev-python/aesara/aesara-2.2.6.ebuild
new file mode 100644
index 000000000000..86721797fe0f
--- /dev/null
+++ b/dev-python/aesara/aesara-2.2.6.ebuild
@@ -0,0 +1,70 @@
+# 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 multiprocessing 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/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 90c63c0592db..833a066e5838 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,8 @@
 AUX aiohttp-3.7.4-brotli.patch 3537 BLAKE2B dfb410aabbd24f16bb1cf5fe999e9730417ccaf7ea59cb48d0445abcfe757e0b9d165ea723152df8f54ff039ac092a0a6cc6d6bddfebcad44d8d63f4eb5c3c79 SHA512 6bf8969c57fc649f84dae9eacd79d5f13558bc970e8755dbf22dcc08789d2377d1f04a745becd3c533f3a6ceb459ddb6bab5eb39e1098468650b312c2ecd51c3
 AUX aiohttp-3.7.4-fix-py3.10.patch 2285 BLAKE2B 4d0841adb3e0038b1b361449812975e4f908e0813576dd3adf1f6d841e93adb514803629bb186304d44c92680d0b1529e3a2ca5a861766f856d32cc69edb18d4 SHA512 3cb863431c8175da625d429a6e275a6a3f932f162f9dc9c477f7038af302486698ee0665c3ab69111d277b9bd080d90e7b3e4f7a2c0a797e554c0cdac3f5cef2
+AUX aiohttp-3.8.0-examples.patch 623 BLAKE2B 6ad230b48d3245b17a6d3ca72a679ad4b943cfc2d2dee64fa798e5305214e67299347154d931bfa3e1d032ca2fe6c1115d0f5aeeaf71e576c7d6ffc8e934393d SHA512 97a2497bf7a932b6646630e44f9b257512acb668527be1c5d9fd6b97055ab253700f2c12a77ebb203daf9d43588652580285d66d93043b83cc86cf14a5d91d18
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4-r1.ebuild 3383 BLAKE2B 4e172d4405d317b98ebc7c28263c1344e9b75759478650a2650eca248fcb59cfee565b06c57b8bcb2ec3092660c5f2699c6e84dc5644afa894f53d8c8f70d67a SHA512 bd37c51c50ba93b4b4ecb3f989f2d0777f1db3ad1509002b2c81ad3f6210e2af2f81cf2f9d03a3e5a209089063b922b7b6052a8e32a1482611fe3787cac2b6c6
+DIST aiohttp-3.8.0.tar.gz 7323268 BLAKE2B e3d8f6ec7c4b2de685a261171bc8e29db82b5b4677d0d4d0b103898c71184deda700f4859fff49746ace3079f09714c39d06c7d837cdc7fb26c8ebc4b29da915 SHA512 beb711812ccaab6d820c39e663e4aaba9106e270ab28ccdb8f35b74bc68509876dc30061f3df390e514e6ff8d24ede2e77e3355986ca2c5ee860eba940d72f5b
+EBUILD aiohttp-3.7.4-r2.ebuild 3378 BLAKE2B bb91bcaee7cdf0baa4e8ba286f2022877bcc5dda16d60b05cefa2c39dc786f6c8bd8c62b9874c5ba986f6cab51a4023673ac69c39c1b3470b2d8f8381cdda37a SHA512 42d9dbfa9347b768874e469cb695fb297a79bf9bdd0fd64a8ffaac5cd4d0bf8d583139374ae584101194ed64e15f2903bb6648059e7f66006810b47ad977391e
+EBUILD aiohttp-3.8.0.ebuild 2575 BLAKE2B 530950c9fc50397254cb6b06dfc7226a13a213b6db045432f866e3a3378a38195a0722aecfdecadc6c649a5144abadf724290e02e66a51722a9cc8288070ee40 SHA512 529473d7f1d9778e96806075d8c1b1ff8f45c8a97eacbfef82e3d110a0126d8615be2b748399e77f7b4491407b920277b20450f9a11107a27bc6b250fb3d2fb5
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r2.ebuild
index 1010ecc1021f..acc6855a22ab 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4-r2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/async_timeout-4[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.8.0.ebuild b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
new file mode 100644
index 000000000000..a5d3ec99226e
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.8.0.ebuild
@@ -0,0 +1,94 @@
+# 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 multiprocessing
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="
+	https://pypi.org/project/aiohttp/
+	https://github.com/aio-libs/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pypy3-7.3.6
+	' pypy3)
+"
+BDEPEND="
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/alabaster-0.6.2' \
+	'dev-python/sphinxcontrib-asyncio' \
+	'dev-python/sphinxcontrib-blockdiag' \
+	'dev-python/sphinxcontrib-newsfeed' \
+	'dev-python/sphinxcontrib-spelling' \
+	'dev-python/sphinx' \
+	'dev-python/sphinx-aiohttp-theme'
+
+# TODO: re-cythonize modules?
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-examples.patch
+	)
+
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# runtime warnings
+		'tests/test_client_functional.py::test_aiohttp_request_coroutine[pyloop]'
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# C extensions are not used on PyPy3
+		tests/test_http_parser.py::test_c_parser_loaded
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	mv aiohttp aiohttp.hidden || die
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked
+	mv aiohttp.hidden aiohttp || die
+}
diff --git a/dev-python/aiohttp/files/aiohttp-3.8.0-examples.patch b/dev-python/aiohttp/files/aiohttp-3.8.0-examples.patch
new file mode 100644
index 000000000000..ed3f38f68fe4
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.8.0-examples.patch
@@ -0,0 +1,27 @@
+From bc142f906b3e7c63f0b1492fe3eacb7f00e9fb89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 1 Nov 2021 12:37:40 +0100
+Subject: [PATCH] Fix setup.cfg not to install "examples" top-level package
+
+---
+ setup.cfg | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/setup.cfg b/setup.cfg
+index 491df546..fa82b6b4 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -62,6 +62,10 @@ speedups =
+   Brotli
+   cchardet
+ 
++[options.packages.find]
++exclude =
++  examples
++
+ [options.package_data]
+ # Ref:
+ # https://setuptools.readthedocs.io/en/latest/setuptools.html#options
+-- 
+2.33.1
+
diff --git a/dev-python/aiosignal/Manifest b/dev-python/aiosignal/Manifest
new file mode 100644
index 000000000000..ab1ee7705126
--- /dev/null
+++ b/dev-python/aiosignal/Manifest
@@ -0,0 +1,3 @@
+DIST aiosignal-1.2.0.gh.tar.gz 26171 BLAKE2B 02657c11f5ee96173c94ab889993f835904a79e3fee58121fb332583f8d81cb680087e667dc0f8e89cd9704bc338362f2878bef7080907a5a3f86bef7a30cac1 SHA512 e75df2fcaeeea7ff7688c20838600f6315bec25b82c48ed7a23b7853edd3d53d72f76a686ad9b0d856f43b0d476398196a8ce4eb98c8859234710ff008f8ba42
+EBUILD aiosignal-1.2.0.ebuild 637 BLAKE2B 90a9785dc42b4aa6da98a898412cf860c555f02acb6eb8feb8c4bba39fc45ecc86a9eeb556a81ca4ee0060bff90479ffe69a2678329def6a99a9b38d4c1f514a SHA512 80a424036aea235c81f6200593edb9c35a417ad184649b1ed22516081612dec6118d4b529a6f48d9b9ed6ad7642f34d49bef851181bdc2c5fe1257f5ab6d6715
+MISC metadata.xml 348 BLAKE2B f28c722525cf03995e7555242eaf4d053f287eed3105b47c7a354d573081f3da2786fa135edc6063d04b3ec49175a2eadfecb3ec559c9a5c9bf253655ddfab4b SHA512 182cda2842145b98e5ba6a4daeda98cadfece65c6f797eaeb7c28296b498b9e92888d9bb12273de7cf6c95ea507a4f7c9ff4c38770118483cd48eff57667adc1
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
new file mode 100644
index 000000000000..b37f9d1f204a
--- /dev/null
+++ b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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
+
+DESCRIPTION="A list of registered asynchronous callbacks"
+HOMEPAGE="
+	https://pypi.org/project/aiosignal/
+	https://github.com/aio-libs/aiosignal/"
+SRC_URI="
+	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/aiosignal/metadata.xml b/dev-python/aiosignal/metadata.xml
new file mode 100644
index 000000000000..58d5b4e65db8
--- /dev/null
+++ b/dev-python/aiosignal/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="pypi">aiosignal</remote-id>
+		<remote-id type="github">aio-libs/aiosignal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 066c31389b6a..19b256faa4da 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,4 +1,8 @@
 AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
+DIST async-timeout-4.0.0.tar.gz 8258 BLAKE2B 7a3edee9491aba11e59ef6bf7c07b9e3f00e97bf42e69adac92a23d89715e2c90dbf9e431c146c20e44b05ed47905cfd5afa41fd04df63315d9f347a6b8f70f1 SHA512 92716106b42ad3746c9873649b44d414da08f75cd507a0dc45d764270bcbd6f483c149e5cebe1a4c36f5cd02397c21b67b92a0475117d9dea17c580e422cf4da
+DIST async-timeout-4.0.0a3.tar.gz 11386 BLAKE2B 8918878c4edd64c70d831ddd05e3235c3c7cc116a99755205b7624df52cacfb61bf4e80083c85d93e420fbf18e7da16ee3ebc796c5a4890e2801885b670a494a SHA512 04775ea30ffba90a4b604ef040df24a6a2711fd3e2c3b45d1ab87ae3487f216458f44bbfb2c85498bef286acca90af43d8b3b95cf22244027c0a48494ef84e7a
 EBUILD async_timeout-3.0.1.ebuild 974 BLAKE2B 532d3834eda42a0b4ddce694a89a202e2e76ac0d5ca148a8b22b47070524ac27ce2baf9f2633d8d9067f2edc6d492e23eea7aa4ad21ac12bd845f8ec3f5836db SHA512 458d6b58d40909245e9b4601046a7c24e9012d5167a6593877ec0d638ce0deecb90b4beff417376667226b7a479e64d492c9089d7c6a927de67e3c53b0d62157
+EBUILD async_timeout-4.0.0.ebuild 878 BLAKE2B 7ab62de84648e1203f09e6b7e977567ba8e987d5b44132ecb27062fa826918e5b3cbb36bc34a59beb6b13e2e1689cddaee8a01caa6f26d35576ec65edf87b52e SHA512 7d69fc0ebb94ec7600a396dfc4e731277277e51271106ae968ba993ea6bd3c399365daabb781e3abf0b16af4c6f727c2964fa04a15b9f23750ac285fa81f3ad8
+EBUILD async_timeout-4.0.0_alpha3.ebuild 887 BLAKE2B d6bc843a5d322ba66ded96b85effbaf2c9b86c06595c7a6e9bc8f0fc5d4bb5de6bfa54cb40af227fbba01a1b8085ff5c2e79ec19c594ce49907abcb3ebd87d74 SHA512 888a246286d1c5f834f83a875358945ca25920e699a9965fd02fbe58e3f62f88780bfddecd4ec64f0dc38673af677ec9bb0fdfa316ff4fa2aa41d2c22ab94824
 MISC metadata.xml 460 BLAKE2B 33594e2b78abaae89f7cb0c953a432ead4c468e01d005d4a65aeb846030fa01b1544d8df393e9d73cc4af6e557f106f8077c3fc4b0b35aacec20033352564083 SHA512 47b1f783f49a63c17abcabcc73d350582297f5bdd266a3d57079f1a50e4a6e88680b73993d9efa3609fe9820decf7a4ea4b5b87f9db6e99509695286c50aab1c
diff --git a/dev-python/async_timeout/async_timeout-4.0.0.ebuild b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
new file mode 100644
index 000000000000..2f3850143bcd
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# 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=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/async_timeout/async_timeout-4.0.0_alpha3.ebuild b/dev-python/async_timeout/async_timeout-4.0.0_alpha3.ebuild
new file mode 100644
index 000000000000..ec9fda7ab9ba
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.0_alpha3.ebuild
@@ -0,0 +1,36 @@
+# 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=${PN/_/-}-${PV/_alpha/a}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 50f205228faf..9f22c1e932c4 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,3 +1,3 @@
 DIST autopage-0.4.0.gh.tar.gz 14809 BLAKE2B 8b91d76c04f3b6519fe2660cbebb50c9b767346b6313303b757b04bea8e7eb8a48aaeaabe364b1b18cadbd5125c95f77b187f779ef83c913e8db13ca88284311 SHA512 a7573dc5d62559f06b54b4b40ffa916209ab7c3348ac7b0cb20ae840fe841e8f8efab1c1853196b4cad0ce5fbc52b679e651f76f7023af960dd8cc876a6d1f14
-EBUILD autopage-0.4.0.ebuild 745 BLAKE2B 8653da6eecc042f9af3e6d6ccec6aecaab864755ab7ddd386fc061cd417cc6cff6ffd484d0c09476ac61dc99f72ced9c0976de1d0b3587bc9a51a03028471d06 SHA512 b96e5b5d781529a95c1b8e6aa54f06c29ccae8e80576dff61b85c39f9fb851e302546bfe94c1dea9aee728cc801c36cfde3c15f485cd679e79d44bd315920259
+EBUILD autopage-0.4.0.ebuild 751 BLAKE2B 96efdbc0ed72b1ff2bf3d8d54485122cb2b6478a1c470ca37ac7d12aff75d89cdea923d49482a019b57950d5b8426dc1d115e84f70a96a5ff2c1f6bac58aea5f SHA512 f6a64476b33c8d94e71ce93135fd4c03f119c3fe567c13a56b64e6de31c6c2a6e31649e15023ef5c3bcd6cb21c6a36550b25958f433ac9ec7336f96fb872f75e
 MISC metadata.xml 390 BLAKE2B 6be679e40e58985a6ad622fcb85f130bcc6b8039accd14243e6dcba458a0af721eaf9e7928bfe0d29f62477df6e437143865b68a61820b88dfd61a6e760992ea SHA512 3d76be1ae51467569281305138475733f9ce9b89b7d2a41f496c69bebd86e205019d1e75d1de22267d36aa2822ebe8bf94f5722d46ec27a8a79f349e38dad3b4
diff --git a/dev-python/autopage/autopage-0.4.0.ebuild b/dev-python/autopage/autopage-0.4.0.ebuild
index d14b9446a9e3..0eb41b6e9617 100644
--- a/dev-python/autopage/autopage-0.4.0.ebuild
+++ b/dev-python/autopage/autopage-0.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86"
 
 BDEPEND="
 	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index a955d0bc851e..f63c795fa509 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,3 @@
-DIST aws-sam-translator-1.38.0.tar.gz 895012 BLAKE2B e3beae1af8b9fa510f3f21f4f637b0816084c206d49009106097c3b58ef8755b51041b6908fcd04c28b18e512b782570f84f5acfc7de5c6cab239a70e5bd114e SHA512 d76ef3e95bf5e4db1cfbfd1df9928d8f62dd1245f6629ab5078c4f3761e1d5e4ac372d698aa8fba1f4f77a38826c2e9c9f4899518dccacf56ffba2f89ddea801
 DIST aws-sam-translator-1.39.0.tar.gz 974687 BLAKE2B 1cde943fe187bb4d2fcf64a8417fc7d2f0c8226e2cd3a583ed14569e0ef39dfb6a718971552b577cbb4858272c33054a04a76cfc61c0dfcde303e6578a2fe534 SHA512 010461ecc2ec7131af1a9f078abbc36594e8358307ffc397c2c1daf433becea9d9c5a5afd8e47e62c6c618a700ca957f559401e02f7c772271f70a7bc2311b8a
-EBUILD aws-sam-translator-1.38.0.ebuild 1214 BLAKE2B 8602089fd21a2ad8444c03cd012a4ea75c034854f372c47ae6399a3ffbdff1e1e524a9e6addb5a1fb77f28c2599188c0003aada351bf1f31c37301ca7f0d65a8 SHA512 ed50b6ed6735de2ecd9ed965d5a578a125219d01914162de0998507d394494e129cfea64bcf5ecf846e4c1ba162a0dab42f869903be4ee31479f75b1d1c8faeb
-EBUILD aws-sam-translator-1.39.0.ebuild 1217 BLAKE2B f581c177cd22fc9811790dcd5dfb7629f0acb3239104fe33270de6db118d7c3ab85139572f2a4c7604ac60acba34df9a1a1a812f00230b4aaa3e95c8a8889888 SHA512 8c70326fe228c0d687f3dbff1932bfa1d5bbf75d6bdb0dfbdd51e8c257139736fc1ab4384b4a123b89ded8c898b2a137eaf9efb1ab8b09cdda3d8808dfbef26d
+EBUILD aws-sam-translator-1.39.0.ebuild 1215 BLAKE2B 5081267656b1107b865edcce52360bc4cb7aa498cb43204d0b7b4f517b1e66870f85f3e74e3785038deafd4c910ff767f5163d6a7d7bc4894b774324e6a1e572 SHA512 1f757a62c66f94eabfc7178c2088a5b4055941928fe166a556536f81f9b30e24b0fa061c90a389a569b039ddfa84e89a633f8d4a3de6db60016775608aa5f4b5
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
deleted file mode 100644
index 8d1633681a1b..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
+++ /dev/null
@@ -1,43 +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
-
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/aws/serverless-application-model
-	https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild
index b148711fb25a..03889222928e 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.39.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 23873e0d03e4..a0ddc04c614a 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.2.0.ebuild 507 BLAKE2B 87311455a2b16263ecd901ec7a0766bf6f4f1b6649c751efaf8198aba21c8b494ec0dc1c5353b26937ed33d130bab171b900f3d7acd19d0c8b230e207d308188 SHA512 cd24b666cb2b6236f0cb80aef41aacee810f079d97b7eb20398a2f01fe9ab4721ebd665f15ca52914f33e13b9f9713326b6e737020a9e47e1d58e1402555d25c
+EBUILD backcall-0.2.0.ebuild 513 BLAKE2B c93cb6dde38ae2341c942ebfad543dbd841c3ee33ae083ce185725a82d361ccf88b3d738c5313a8c7fc3f2a271423bf2ec52f7e4fb2919a105f8e9434062bc5c SHA512 51864cc12f1d891e993dce120af924eb3dee74135e5a1d9bce0e0972cd26738bdaa2b502883b38b0f2512a0c2e7650edaf9d4378bae6802fcfb37058807696c5
 MISC metadata.xml 336 BLAKE2B 68a24b9019b03bc28ae1ba63aa540019a73e1ecfaa894b047b527e91022888c4ec12473e99db840a877f919c2141b5de86c565b087a9341d8ef105e527f709d7 SHA512 7c5c1fa30436195a17bcc2f3b972db4a92a89585a4f2f73ba25c15143d283e7e7708c6f0ba579703ed1011f48052fd4ea0fe78d68eda46cd6e0303025ef5b99a
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index d449fcdeade5..67ffbe2ac9e2 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index 7ac51a3b2cd9..098c31044836 100644
--- a/dev-python/berkeleydb/Manifest
+++ b/dev-python/berkeleydb/Manifest
@@ -1,3 +1,3 @@
 DIST berkeleydb-18.1.4.tar.xz 137160 BLAKE2B c93e7707bf12199c8161112accfedc3b0180b8f6edcf5c928c03f373528bb9ccb23219865344d9ed29d30b0133a2161ba0325257b6f7a2d22a58e8d9b1f82ce2 SHA512 bac2848e82ba5fdd3ca8fbf3a02d04faf270132f4b9fe93096ea57ab99fcc7eba02ff8a9638ea8e028d8bd4f16eebbefb65f33ea67e95c0a14cced05d04b23b8
-EBUILD berkeleydb-18.1.4.ebuild 1732 BLAKE2B c2d9060398415e8f2dbdb053e7ed784de027112e520a555423e3118cdf852c3aaf6be89ac6772dda0586fb006399603587d0167668ec5fa2c421b8e9c02f35e3 SHA512 d7a47591130edefebb4f3f779b71264e8a63983ace47f170461db3f06adb5e228f8bf157da49ccbe9e33d412da441c55aa8079acbe04c5169cabb3d36090df53
+EBUILD berkeleydb-18.1.4.ebuild 1737 BLAKE2B 607cab974b1eae7e26d134ad27db81da97ed51df4459ed2fb8ce05f0d4336a0fec31090ec959c688abf18ad1b5cea849dae372ed2ec69cd49cd695c650224519 SHA512 06cf1a4332f3949dbb0242ac37d59ca3804fd9c5018fba2b32b76588d9debbf21a2cae467510fb4e0ff2f75a770430c9a7c78624a658e6f9068ff2a9b8e5d5d2
 MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
index 5fc928f2b3e2..d4578a5945e2 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 49fc062d341e..4179c9e9a417 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,9 +1,11 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
+DIST black-21.10b0.tar.gz 1171813 BLAKE2B 71bf628aa3b2b0a73c53446061d07ed0074c2e136c6a4dd09feb4b7dcc2b8c8045417e2c6a049a3051bb2e8fc368037c540851384d00ec89ad943d0c8f949c40 SHA512 0e44fe6c34d75f135996bcd62768f3ea02f5ba996992f0173cd28977f6a9ed4fde975e7433439f3b724c54555867f91edcd167fc1c5273308a613a51905323c8
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 DIST black-21.8b0.tar.gz 1167978 BLAKE2B e7df398d09b71389069991bf0872a97d8a8c0b13ddeec12ee8f08ae9d9716a3d47447727d2759d475f10d323df151b8bb2353f3fd60c99eccb1e912554ebbe7b SHA512 ed38dbf0c881fee7da74f0d6bfe4ea0f85b5bed30d37abde2fd728e33f94ceaaa27b7107cfe763c19bdaea57fcbf54bcae82ce8bdcabc29035cdc85a8e10ab00
 DIST black-21.9b0.tar.gz 1167869 BLAKE2B 31933de69cc34e23e14b0fdba33da844697816cd3917227c1a16c4d1595435d3715405f7f1df820953e83c30c3947448389a703ee662548226dfc2d278b87844 SHA512 0c8025d64ef9e5da8ad73b1f265b912bcb3d8cb00d8a426a39dd4c70505a77150e02a7f26e3d6842456eea367da9fad29d08f586b175d57d66a09cf389442ed0
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
+EBUILD black-21.10_beta0.ebuild 1729 BLAKE2B ea414647b2605eef0f1039cea4241102c042c03ac993dfdc580ec77f09d51fe716feab29fce7621f5aa90d9707bdc0ead2080160e2dc0fd18e4dd54025a44539 SHA512 567b531ded6b01fa0c943501d218c6fce44392c972310d8a1da150be79fa09275a8458db138c7d7d0e32e53cc390e5b906967b0eb74e0415ed58584479863e2d
 EBUILD black-21.7_beta0.ebuild 1426 BLAKE2B ee3b32c88347adf7b124c310a169b2d44da5f17666f6461f8b649536394295e94637f6f832a613632af0ad28f520e11acab125bf9a4e20362c46efad35255e19 SHA512 36fa3e039be4eb322d8f4beb4524be8308ee01c2c11051005955925bb60cce54c5cc910af8b1c8ca45f30381e6cbe8dc7557f3d8d4771159043404714e267cc3
 EBUILD black-21.8_beta0.ebuild 1621 BLAKE2B 02e0edc7879e1bc8cb5dd75753fbb51144de8f21844c08738a6a77138101457b7f46eacd66f6d38b6c091deda327cd85a30acc162d8093934120ac652f560731 SHA512 14c1ef861ac7a571584c8c2242e4aedb5f869630091ca6041b9917e687c1281c3534346da72510d1fc2d5629671a9c501af4fdabb7e925d7f30c4c1e7071799a
 EBUILD black-21.9_beta0.ebuild 1714 BLAKE2B 42ab0af65acc56e18274e3c7fbd0f23ceb61696ed3ab198495ff3b1e4306bb922bd4f1a54194cc9752cd31ca3b01be7c1033b3e1ccff1ad70425307d46dff9c1 SHA512 cd7fba053924154cd37dbd77971d38993405404681f048aba8e29dd7e0be59f99d991bbcfa0fd66c737a606c5a2fcdf58c2db87fca3c75d71f2d83bc0d52ace0
diff --git a/dev-python/black/black-21.10_beta0.ebuild b/dev-python/black/black-21.10_beta0.ebuild
new file mode 100644
index 000000000000..0e415d8e5068
--- /dev/null
+++ b/dev-python/black/black-21.10_beta0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	<dev-python/pathspec-1[${PYTHON_USEDEP}]
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
+
+src_prepare() {
+	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
+	sed -i -e '/setuptools_scm/s:~=:>=:' \
+		-e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+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"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6b0c2f32722f..8d4301bfad09 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,15 @@ DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c9083
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
 DIST boto3-1.19.6.tar.gz 434389 BLAKE2B 3c7e4c91c95b93358b4a31d401e03f8a397802004a6ee2bfc2ef1a31df8b89e8866fa73d3354509ae00537898cc8e04b878cc9d00f82ae4e94266e8185e7abd1 SHA512 6ba4f7a89d973991afe329b4c648c8ecb0bb256d63c7e60ae8bb70e6fd5fc9b1929168dfdd55f2c84039856a32c891013abf61dc2e65f516490c446b0dfaaac2
 DIST boto3-1.19.7.tar.gz 434848 BLAKE2B 102b2d985cbad6c6ff6fc7866f47c172028e4b1a56ef7eac5854b12aedfbca1b94eb426fead04397e119ebaf939f7732202718395775b0555f566ed938c27dc7 SHA512 40cf5341bfd7cc4cae4c542e39e4c5ec1b63ba3bfee5faedb75633e656700dd5e80a137b234b57d22cc1b7d85a2056ced4eb8b7189ab57c8f2c0269e8826811d
+DIST boto3-1.19.8.tar.gz 435192 BLAKE2B 2cec7fe3a114ef349e4afc15f15315d351de93ecae3439946d9936effa257e55a88f6605b33e13ca927a245e99ad60b0c9c356320be6e4f95a99e52c6ff8da11 SHA512 f1038a0103f09c4bb20d4feb30abf3e2be2535d8e9e0e807e4d98f20ac27f27f0260b274c1b6e6b91f00c5d3e4206a92ab1cd80029f2b0720241d98356f688e7
+DIST boto3-1.19.9.tar.gz 435493 BLAKE2B 7f1485c51816ab4c0c52e47f110eebf5b9fd989e695d24daa0bf38fa9fbe09c2dd40758ece655d3e2734e88ad4aa73e606b951ea39b3fe718c6ad1498d7a52d4 SHA512 9cfb454af95d92c68cfd4e12d285ae4c43084d818c3fe75d98929a42eedcf04574e96663b69db6204cab211352dd59254e6c53fb4c3c03bc6ed896d805e6e59e
 EBUILD boto3-1.18.53.ebuild 1213 BLAKE2B c4458bb3113ba83bc2ee3ca57c264c634f702ca4cfa5d95b193442695bcf13f34adb6a30cbd78de4845a3a9dd033eaf05c4ee590c2fefd1dc9abf5aee45dde99 SHA512 c9c841375522cad6d3fdc6fa89172044d821443b35f5c9a957cbec52e6fd7b7e3e15038e03b67091d24c45d010f79ec152fcda93e534061d2636dc85ed574357
 EBUILD boto3-1.18.60.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.18.65.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.5.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.6.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-1.19.7.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.19.8.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
+EBUILD boto3-1.19.9.ebuild 1220 BLAKE2B cf8c5012432f638339c2defdfb798cbd9197eb0dcaaf1dedf194784d858cdfc27efe9ad7e34c76f61b62e528ee28dc9997f9c8b4213530dc2f1ad4c31eac68e1 SHA512 6247d730b23a4024c90daf4abac8c74637bdced6c2778689fb8187b02436288d9ea0d8fb65201e067add5479cb4db05809596d45297e96a3571696ed3093a292
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.19.8.ebuild b/dev-python/boto3/boto3-1.19.8.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.19.8.ebuild
@@ -0,0 +1,53 @@
+# 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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/boto3/boto3-1.19.9.ebuild b/dev-python/boto3/boto3-1.19.9.ebuild
new file mode 100644
index 000000000000..450c87d9f8b7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.19.9.ebuild
@@ -0,0 +1,53 @@
+# 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 pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 206a9620a99f..9095354d2fde 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,11 +5,15 @@ DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e
 DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
 DIST botocore-1.22.6.tar.gz 8302901 BLAKE2B 4627c7bfcbd1750a6517c045b7c7c986c6defb9b35e413fae47e03fe24f3404ff4905c714212ad00193eb4dfa2893a0080da97acb538965a8792278915823a3b SHA512 f39eb6f339011709fa764d3783f225fbd4e4100e51466de9c87d6a3a5430823e81be1b024963ded49785b4fd49febdfa66dd3f91c3b9296508c3d71d794d170d
 DIST botocore-1.22.7.tar.gz 8306878 BLAKE2B fd427ced3eb3c2ce71a28f7334ee312293fc98c7b2d91991ce6c894f71bd39b356aa3a2f0a0495fd91e394be4d284b21dc8272863e9568167112aadccaed21a6 SHA512 39eaa5d4bc64669bc398797c69d63157a6a4539bed1c4cdc492c4fe94c9a32d58ac9ea8c06fafd75a5c36ab9d3a5c99f88990b03bcef6cccf7e0c4247330780b
+DIST botocore-1.22.8.tar.gz 8316687 BLAKE2B 0ea2bfbf794d156e5843687927980d4dc9e4243c00ec6ee3175dd02cf7d99a10e549b06eb377edb52b73ca64e4e97e6c03c96389773f5ac87f648a6ec6a89398 SHA512 d35748c240ad83155c5d97b044569e1d7093469acdac948d4ce396b1f17563ed5e9bbfa91799a87fabd93df3b63724be096d489be909aa1567d59e6bafe99e03
+DIST botocore-1.22.9.tar.gz 8325440 BLAKE2B 9d1612941e37446e030178eec54fd17ee4b9ad4bd43a943a09cc53cf343e5dee7f568702da5f1110ddfc4c814c2aef3997dd72c2e07445ad3287044ffc77a34c SHA512 6be85c95fd9ddd7f7756a337b696433c0d7c3d67fd33e2c3249914fd9db957b16d89b54551bfad58e79292becc054220efb70c45af234b92009e0de72e95a512
 EBUILD botocore-1.21.53.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
 EBUILD botocore-1.21.60.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.21.65.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.5.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.6.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-1.22.7.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.22.8.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-1.22.9.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.22.8.ebuild b/dev-python/botocore/botocore-1.22.8.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.22.8.ebuild
@@ -0,0 +1,50 @@
+# 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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.22.9.ebuild b/dev-python/botocore/botocore-1.22.9.ebuild
new file mode 100644
index 000000000000..638620b2cbc8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.22.9.ebuild
@@ -0,0 +1,50 @@
+# 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/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 pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index bb2b8d5593ae..537e0a565d9c 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,3 @@
-DIST cachetools-4.2.2.tar.gz 23682 BLAKE2B 7c1163d216fed3a5258ecb1c6306468d0ace8c629275cfb4f3aa3c4e6d9e2560683ac5504b0ee3439901f1e53b7428e27a78c909f6629d3b006610ec8ef35e98 SHA512 b3aa68cecbd9f20e0ff482c497c5011f4d1bfe4ed106914433c6bcaa203fb29592e056807767efdcea0cf7dbd3a08f3edc9c0ea8b328a1442792f9be2049c860
-DIST cachetools-4.2.3.tar.gz 24587 BLAKE2B 2a4d52e11604de0ce9e8a112bce7990d02553216425ff33279f0f898737f3cc39254349b50199bf17c5285de834248737ce3d5ae3610f64ebb925c0dd3e555a0 SHA512 ceab0ed27c8059e777fa2800c988735bdd2101a6191c20688cebcb7b5ba717eb799b506f6030d39a17fa744863da6b5eecc608d855a67fec0e9bbb0ac005c7af
 DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
-EBUILD cachetools-4.2.2.ebuild 420 BLAKE2B 03a38bdb288c65d3173e58149163fedbf711d64ea77aaaa3399dbbf14d869e4f1188731c0dca39bd930cac1de4b96e954798bdfe3ddf8c5361fcacdc86bed365 SHA512 ed72ed6904d4e4543dca1cb13141a0796d9444c5eecd94ceb39028b1a9cd1b22ceea7516c25d410f829de5a2ae47ba941efdaac252c2653ddcd349b968761147
-EBUILD cachetools-4.2.3.ebuild 421 BLAKE2B 625353846453d1f92fae2ec8e321ead827ba360335233cb60cce6203f98ee37fb23c889a12d8babda6d23c779d0b3ff0c336164ea9bb13bae91593905cbeeba2 SHA512 8c466263fac9abdee42ab30cd440d86e8d263310af9be2db31b7aa3be027ed8ad8871f4aace9e1050c2e4fdc65721c706c8a335876bff0154bd96832cc2bdf1e
-EBUILD cachetools-4.2.4.ebuild 421 BLAKE2B 625353846453d1f92fae2ec8e321ead827ba360335233cb60cce6203f98ee37fb23c889a12d8babda6d23c779d0b3ff0c336164ea9bb13bae91593905cbeeba2 SHA512 8c466263fac9abdee42ab30cd440d86e8d263310af9be2db31b7aa3be027ed8ad8871f4aace9e1050c2e4fdc65721c706c8a335876bff0154bd96832cc2bdf1e
+EBUILD cachetools-4.2.4.ebuild 419 BLAKE2B 0cb00cc291fba7a29b18af9b3e25202cd36891bc52f1d1d5ba9134e0fa5de557545b3572a835d0584ee8fa7ad77a08b3716c983e0335605438f6e6f63bd33338 SHA512 e52ebe03812ca4317222d0cb040f498d4f87fdb99cc624b5415ee171efab35f8ca9072fd913cfcf299d871a0a61a5a4703a9d7232962a28c3ec3c255b54a606e
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-4.2.2.ebuild b/dev-python/cachetools/cachetools-4.2.2.ebuild
deleted file mode 100644
index 752e73e57ddd..000000000000
--- a/dev-python/cachetools/cachetools-4.2.2.ebuild
+++ /dev/null
@@ -1,18 +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
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-4.2.4.ebuild b/dev-python/cachetools/cachetools-4.2.4.ebuild
index a18634292857..9746966fa6e9 100644
--- a/dev-python/cachetools/cachetools-4.2.4.ebuild
+++ b/dev-python/cachetools/cachetools-4.2.4.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c7214924500d..6cd0e2bb0cf6 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,3 +1,3 @@
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
-EBUILD cherrypy-18.6.1.ebuild 1387 BLAKE2B 7213aaacbd30ca80ad475e047df5660ceab6ac9aa1e15a555fe3ac22be1719d09c1052877e3eefd1e79b752bc10bb33d6eea6801773920e645d02a5fbf106dfe SHA512 ead14c542bfc23d5cbd745e3ae01906b680e2e3cdafbbee4b5fab770185e88c778961cc54b095000584373db096f53d2a49eeba99a26d6523c43cb772970dcb2
+EBUILD cherrypy-18.6.1.ebuild 1408 BLAKE2B 6021967a7f5b7a9eec38a3832c2394d570a9ed179bb1fe14aec3d63a99d6bc647b729c0b40da0def376c159e8f6b0f52a5edde41300890d6c7fda0e27cb246fd SHA512 f6fac9035b8420749d861df6566dd5b1f9fa27104b42e183220f202de5ac67c3e2dc897c9a6d822b74597ebf353712b8a134f5eed547508b80de0bfa4191f38a
 MISC metadata.xml 347 BLAKE2B 7694118d09caebdeac890ee40fd8a79906637bb695f9ec44dc25e67378c8c7f06901e5c52e6f79dd498921ffa01b18b9762b102baeea34792a2ff730a1303c40 SHA512 29cbadf45008c3c422c47ca232634bd15efbd4bcdc6065d18cf1adcbc0c3bbb155a2b122eb4ce7180839fcdaf4acb5515486f191ebbfa63eaec8a14abbb1e3eb
diff --git a/dev-python/cherrypy/cherrypy-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
index f737a38a7917..c553981b3879 100644
--- a/dev-python/cherrypy/cherrypy-18.6.1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 MY_P="CherryPy-${PV}"
 
 DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="https://pypi.org/project/CherryPy/"
+HOMEPAGE="https://cherrypy.dev https://pypi.org/project/CherryPy/"
 SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 09498b61a96a..5873f1de8bf1 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
 DIST cliff-3.9.0.tar.gz 82687 BLAKE2B d49840831e55a205e809abeb54a6c9d45e807a622dc9b02a104311b8a5ddda43415b504f7fd62075cc4cdf89a1b61605ecf32590fbca3d720c07da83d58890a2 SHA512 04b33e14c3b29a02dc04855044184f934919ff92dbc09003f620083e5815597f8dee7201fa33019dd58a3e701d4c3f9966be1f4d23e019a881fee9a9bc1f0dbd
 EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
-EBUILD cliff-3.9.0.ebuild 1136 BLAKE2B 4eab924db7602eed6f25b0fca381ade8e216befeba68c9658ec356d24a422ad3771b9c10df0f5b3ee732245bd78f6cb6d0681472de953bae0e55d6e4f9008770 SHA512 7bd96dcedb96bf427383f6f0eb1876bac054d3e7cbde680aea5e80a0c408fe5657bdfbdcc463bbebf2b20ff21e629a5b9af7e0d3bf28a94043654768ad022cec
+EBUILD cliff-3.9.0.ebuild 1142 BLAKE2B 603b418162825a94fb162208f79c7a72e91598ac206cbe4706e4786543943e1f3c34e553e17933a4bdfe49c86fbc5ad2f27ecc722fba5541eda4884bf4654dc2 SHA512 92d43452c8804cc02f39f041b21f239f7829e6e3339f8bfbc4be5da3a0eea027befb6bd2bb7d30e3ece81c58ba77252f9beaaa73efefc070e2c3d9f90260cd67
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.9.0.ebuild b/dev-python/cliff/cliff-3.9.0.ebuild
index d783eb62db71..9c52872fd13f 100644
--- a/dev-python/cliff/cliff-3.9.0.ebuild
+++ b/dev-python/cliff/cliff-3.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 1e93ddfd68cc..c8bd6694d521 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,8 +2,10 @@ DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648c
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
 DIST coverage-6.0.2.tar.gz 722511 BLAKE2B 43a860610921fd0df106cbe26ba094e5a11bf1137a795a15bc22d82d0f813e8dc67bfe660757d325f15f719429b480ca625ebe66569489ed8c4c477bac23c393 SHA512 a43a312d4668846b6f72eebac1a289d0a603303cd32624c3308cce8934f693c7d3786b36da5cea3ff1cce60f93110a2ded168304e1ca9a79053f0886b7f1bf17
 DIST coverage-6.0.tar.gz 719495 BLAKE2B fa2768cc34f5c8e5e1b0bd328dda4b83bccae4bcb37b1e2ea8ff9a7fad973239a264f12cea7fae7ed129abe1a7aa86b43e2e32fcfd5c4de2077c8b32f405cd3a SHA512 b9a5dcb2aeb8517a9a52feadfd817727086d88682d9d93d65d9f4d7b6116d8eca1ecceaccc98ff34ca2fb1c2d4dc457d0d58d387465e67970ae4df0f4c9f7ca5
+DIST coverage-6.1.1.tar.gz 715305 BLAKE2B fbd7c8e7e1737bc8be8acf0f10c66fa333a027520b5f54869080ea9e31951230442d0d7f5a5ec11201b7ca3ba65ee92c906a373c18123920abe0d3dee5a8e040 SHA512 c029ab4e0d16e4b0a395e63e96d7a8f24bdb3a46a97fbc223d59dafaa52b8522e924a13d88777f862d69e1f30d015b00e0740530e719b6a94065d285cd3dd03a
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
 EBUILD coverage-5.5.ebuild 1665 BLAKE2B 9a9eae6506d4a035f5c51457946e87cb05835e1e532628a46286227a283a35b57fc04c75fe0379ed9243c0aa56e4ea6d6f36744bbd33dc1be0805d6e083e604f SHA512 8fded70eb087b92bd59c57ad546dad45e1911c094aea8445f934d9c7838c99ba31e66f0cda983e0bd4bfb65276b6cc78024bcfdef15af14143c8c4d56ef77a03
 EBUILD coverage-6.0.2.ebuild 1546 BLAKE2B a7616b00526d16b067ed71ea359797b0add0ee8f6a03558a24a422e0f1f4921832c232d20e89d2995aa0b376e010e7176d377162ffb6a72dca91bae6fd2ea3cb SHA512 a8e3fb4b74d439de1ed25db29436d6432f1b7f1f6efc2bc45f890802965bb2802d1450b41795bc19ed5379b6a679a36bae6541fd77110953f1473543e473f440
 EBUILD coverage-6.0.ebuild 1640 BLAKE2B 9d2eb578bda59aef10ad601a4ed098d0d60f79150c3bb26b2d868eade8cbfbf5638c29a1132ea3c204c9a6951ea553106ae6f6aaaeaf33fef4bec4c3aaee8498 SHA512 3c8fc5ab72b7bd11c4cf9f80aa805f9b350c05d2e3993ad6979dfcac8bc17637afc5550037258bbbdc19aa4ebcf1a4b0f86b5489728fa1c365996f7ce63219b9
+EBUILD coverage-6.1.1.ebuild 1546 BLAKE2B a7616b00526d16b067ed71ea359797b0add0ee8f6a03558a24a422e0f1f4921832c232d20e89d2995aa0b376e010e7176d377162ffb6a72dca91bae6fd2ea3cb SHA512 a8e3fb4b74d439de1ed25db29436d6432f1b7f1f6efc2bc45f890802965bb2802d1450b41795bc19ed5379b6a679a36bae6541fd77110953f1473543e473f440
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.1.1.ebuild b/dev-python/coverage/coverage-6.1.1.ebuild
new file mode 100644
index 000000000000..4581809c8ea8
--- /dev/null
+++ b/dev-python/coverage/coverage-6.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index 84af17d10e91..3a61f34f30de 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,11 +1,3 @@
 DIST curtsies-0.3.10.tar.gz 53340 BLAKE2B 376258a71c1e89b241c2fb9439b7f094b72cdc19f50c075debfba019effed5b3b5286603b44f11e37420d4e0be0dce0cb69fc6e11dab332c6f1c109c1b7a098a SHA512 59dfae36a43f7cdb272f94900da81bc7a1033a6482df5ac5babb329659e16d740f98b9538146f2fe7c79aa2723ec3db10c8ec658539db7d462b02953a33cb4ca
-DIST curtsies-0.3.5.tar.gz 53472 BLAKE2B 7ff50b8cf4b1b5016f15eee00333a1de38a31d97444f6462c7ec0429a1656bad442126880f770bff575dde8456660169cfadf63fed804b2c7890d700d792cc87 SHA512 e46ab3f79e2385055e4f3f9bc1d2c341605b93c21a0e6c42f4807b1801d37f70cfbdd1006db1ec12257e95d91aedddd95aa31a7de99bbfc09a6f0ee473497747
-DIST curtsies-0.3.6.tar.gz 53259 BLAKE2B 358e4d7a3ad8e5f705041cf8fdab9a26f0829d57dac93d23d1a524cb5bf2ca784aff9ea17d0e1c73ef4112f2b5b826f80d4c8d300ecd4ed53b031b3e81c78052 SHA512 3ba7050a614c992c6117e61758e378c82467f413f507277ddb78e42c03dbefe34c4fc4a60b29a8f8b24e8141b0521c87df81421fce5c7c64c28f6156b5af8207
-DIST curtsies-0.3.7.tar.gz 52487 BLAKE2B b5fdae3a2bc3900aa4221a39244fe3c781e004d378952af82c6275cb23fa53830f7f54ce5430287c8a5131ca220fb4aa7cddf33a4b913b27de35f1e275578b23 SHA512 a3c197a49c85f644fce3507380f6c77b857e2e97141634178b5d7c6b7673e90407fce68550c329dd4267e69e10fda3133522baadd765269b61e3f9fb800b7193
-DIST curtsies-0.3.9.tar.gz 53319 BLAKE2B 91bfb46ba9eb36f76df7a1fea0c0b1a3d7ec38ecabc015624b93b66b8e0c3dc7c9ee757caf591e77258ab46712c2998427bdc5a6749272bfac6c597e9bdb09b8 SHA512 7f0eb56b37db3c9586a95aa9981cc3f21a99f7317d2484d71618d2ed8302ee1e3a6bf931518034e690cff63b2f38c54cc5d2b5baed7036c588279720d3b96a4d
-EBUILD curtsies-0.3.10.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
-EBUILD curtsies-0.3.5.ebuild 592 BLAKE2B e32fd9a8bc11511b0056655bd5ac531ffd4ce8fc14cda8e784689c78c685b1faa3b4ebae4a0eaa913f8777516aadf5f094233e2760b8aa23afb6cbf60fdb60aa SHA512 a01cc46b45aad273aa6daf5d455e11ec8e5c9b004045d3e6e42408d1d3fc1beec7b8329a83a19b4bc2fe909ba0dbe14fe450e11354392c5808464126acd389be
-EBUILD curtsies-0.3.6.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
-EBUILD curtsies-0.3.7.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
-EBUILD curtsies-0.3.9.ebuild 593 BLAKE2B f1292a6e9b8cf4579a18392c8866ca2f8b046b56589559ebebd99ce81a0a3a995e67a8372fd08c1a9b22d66c939056557f7dca351e47c83925515ca6298428c0 SHA512 a3c8cfb7c8232f13cfc0b8d649bc27a441f927329ef19f45d9c3075c3c82bd457096dff63262f12e3ae199a2090509f94ca7e199dae7f468deef0dd10fb6527f
+EBUILD curtsies-0.3.10.ebuild 591 BLAKE2B 99c4e11220e99821a99700a3d7f319bae7863f8cae15bb653edf45386db5ab551306cd402ab7f84615d35ce4f5c35bde9ac4678085a3a34683c377238aedd2d1 SHA512 45b5e11a179bd9e2c15c18847abd41ff009357697d3375bf8b0541c1312c4a26aba80e809848101b07eab8e27b0b9c2b5221c9393e30e3920fa65ef9b03d5f88
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.3.10.ebuild b/dev-python/curtsies/curtsies-0.3.10.ebuild
index c29551cdcc4a..751e9c977708 100644
--- a/dev-python/curtsies/curtsies-0.3.10.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/curtsies/curtsies-0.3.5.ebuild b/dev-python/curtsies/curtsies-0.3.5.ebuild
deleted file mode 100644
index 65b04a9157fc..000000000000
--- a/dev-python/curtsies/curtsies-0.3.5.ebuild
+++ /dev/null
@@ -1,28 +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
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/curtsies/curtsies-0.3.6.ebuild b/dev-python/curtsies/curtsies-0.3.6.ebuild
deleted file mode 100644
index c29551cdcc4a..000000000000
--- a/dev-python/curtsies/curtsies-0.3.6.ebuild
+++ /dev/null
@@ -1,27 +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
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/curtsies/curtsies-0.3.7.ebuild b/dev-python/curtsies/curtsies-0.3.7.ebuild
deleted file mode 100644
index c29551cdcc4a..000000000000
--- a/dev-python/curtsies/curtsies-0.3.7.ebuild
+++ /dev/null
@@ -1,27 +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
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/curtsies/curtsies-0.3.9.ebuild b/dev-python/curtsies/curtsies-0.3.9.ebuild
deleted file mode 100644
index c29551cdcc4a..000000000000
--- a/dev-python/curtsies/curtsies-0.3.9.ebuild
+++ /dev/null
@@ -1,27 +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
-
-DESCRIPTION="Curses-like terminal wrapper, with colored strings"
-HOMEPAGE="https://github.com/bpython/curtsies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/blessings-1.5[${PYTHON_USEDEP}]
-	dev-python/cwcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyte[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index fb82274c4139..efd5826cd7c0 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -2,5 +2,5 @@ AUX dbus-python-1.2.16-py39.patch 948 BLAKE2B df88f38be549b81b404f3e5e7f0d4c09f7
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 DIST dbus-python-1.2.18.tar.gz 578204 BLAKE2B 932a06f4b0145f7a47cf1ab6ea33c14eb4e36570ef548e7557d4aa5b780e49f2d284cdb51f0ec2d8a1cb286097fb9eabb2193d7cbeb387eaf43cbe209b7f11fa SHA512 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
 EBUILD dbus-python-1.2.16-r1.ebuild 1968 BLAKE2B c79c05bdac499e9977e535d0826dbea8c9e64489c956eea677b1befef2faf598d2175e2ae480d81eb19cd746c6613d7181c66dd849d59a1b0a519fffd1cba3cd SHA512 992fe10d9396420c3d949c97f8758e8c97058fea89498f123c497433fa08d857e95770e5cd4faaaf1854722d0f8d9b8a5a8b878df3ee393061ea841e81cae9d5
-EBUILD dbus-python-1.2.18.ebuild 1933 BLAKE2B 9cd9fccb7dde75e4ef774a30847cfe8cfaad47c48b805f82e17a77fe6e730fc2eeb6c6c8da278cda6febcf014507042e98cb95d4497f631b6b58df74e14bae6f SHA512 7688b5c14741c7e30c4e2ecdbb659467ae873835fb503d76bb9a32a6161d3764cb819bacf9813a7794eae193b2e8e4c7245ed2d2ca3416aa2a8a384ae6c9fcec
+EBUILD dbus-python-1.2.18.ebuild 1926 BLAKE2B 622add78e8b8022ad972f84fc539a2760a71a2b835a5da6d02d56ec58f256c1cf546af70ea2373371cc08c12567590c6d2d1c35681d20c8b2ff0aa949af2b283 SHA512 5046c52410ceac17eec99cd0b35a0f7ec1cdd7a4074290e4e353832124ad22ee9d151b2a264cd7835c639bd021a26a85edeb8e12afa1500bb744397a15c61210
 MISC metadata.xml 404 BLAKE2B 14fb120b562c66c35e57d6686f87d2515d6e7a33e4a3027e2edde743ca533d8be63c8c3c4596de913c86091b2d768c997a1c25282efa657cab08131090cec588 SHA512 7a22b8fccd4715f6d817d528eadff1eaf126158f02113b318a4cf99b5a9bf7a05e67ad0ef1258399a937599bec23cb52f8fb42652948313fb8c8ba63bc5d22b6
diff --git a/dev-python/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
index e7cd6a6c984d..223a0f801d4a 100644
--- a/dev-python/dbus-python/dbus-python-1.2.18.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index c8c8f5b1ebb0..a0f8c7a29627 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,7 +1,3 @@
-DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
-DIST ddt-1.4.3.tar.gz 17862 BLAKE2B f19bbf282180614e1c8e3967a6af4e4696e1a9fce90c07a4438c7b2415ff1e85caf9c113ef3b4d89c11b2afd5ebb66b23c58b18e91a6416bfc1fc85851e75861 SHA512 ac66dd0d20c49df6fae6e86dfa1dce6d4326f985f17ad955ec2c7bdb2e411bf633baf2d3b244cd49ac45eb91e976a33460e73e4d155e17fbf90418062c6ca187
 DIST ddt-1.4.4.tar.gz 18527 BLAKE2B d83df38dc54197063418eacad242269bbc130a8dbac61a9b0dcf473ca1e9fe0f4101f8f96839d81acd1e16d9386870c108dc4aa2c3e206670360fee6066e9e59 SHA512 a7cb4565254d47aeaccaa98cc1bf5a605d5dc323b7f15130d16f6322af3d084e5fae34da5e793be1d197b1ca6213306ab1a907277982766ba38bdfd20f53ea59
-EBUILD ddt-1.4.2.ebuild 631 BLAKE2B c361cc9f54311a3f19c5dfc132c03504205f0dfdd414ea83cee13da91ad0c9e3b8746aba17eeab617df649855df953038e71ad8442ff65c64f39f7b789b5f9ef SHA512 5983870725993973e85cad65c92c81fea7dbf663fc38b7029c55e93d2093db74561ef18aa5cb81e1e73f94da73db570adfa79bf417317bb7ea9d30c630131319
-EBUILD ddt-1.4.3.ebuild 634 BLAKE2B c2a2b844302c26db0c4779588cf25a16d38f0088b051cb85fd6c4865cb64cfaa64d0accfb71ad376192ee934c13910d8fdce1e3e95f1e8452e89b59713997ab0 SHA512 160ec0845b726136e961ee820cc1cab4340f5b7cbed93336190360ee57b74803f13e1f8d2207d211acbd5b948664de7dbe1e7bd147ccab1fb9c2a9e5fa476936
-EBUILD ddt-1.4.4.ebuild 634 BLAKE2B c2a2b844302c26db0c4779588cf25a16d38f0088b051cb85fd6c4865cb64cfaa64d0accfb71ad376192ee934c13910d8fdce1e3e95f1e8452e89b59713997ab0 SHA512 160ec0845b726136e961ee820cc1cab4340f5b7cbed93336190360ee57b74803f13e1f8d2207d211acbd5b948664de7dbe1e7bd147ccab1fb9c2a9e5fa476936
+EBUILD ddt-1.4.4.ebuild 630 BLAKE2B a3aea8f0740599ecdc61a1ef71b1a0c0185ba8d6b4e07f1acc1cf464d9be6cee61c68bab4658a33351285a64259039fe91682fb22c4094154c19102e4126f64f SHA512 9da0f43545d3df051f20bca0508a45744ed260d18ef84b1e7ac94defda2a13521e9ecfcc2a6f1991fabd7d050bf7ae8b260b14ed5df691e37d05575de527e1e3
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
deleted file mode 100644
index 8690f281511f..000000000000
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ /dev/null
@@ -1,28 +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 library to multiply test cases"
-HOMEPAGE="
-	https://pypi.org/project/ddt/
-	https://github.com/datadriventests/ddt/"
-SRC_URI="
-	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ddt/ddt-1.4.3.ebuild b/dev-python/ddt/ddt-1.4.3.ebuild
deleted file mode 100644
index 2af68433163f..000000000000
--- a/dev-python/ddt/ddt-1.4.3.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="
-	https://pypi.org/project/ddt/
-	https://github.com/datadriventests/ddt/"
-SRC_URI="
-	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ddt/ddt-1.4.4.ebuild b/dev-python/ddt/ddt-1.4.4.ebuild
index 2af68433163f..59de48c0262a 100644
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ b/dev-python/ddt/ddt-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 307f7bbb12fb..889770b0b8b6 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,5 +1,3 @@
-DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
 DIST debtcollector-2.3.0.tar.gz 31537 BLAKE2B 6c4993edf08dd72e8378bd82e4578a491f0540d35165e3c67e918ef5a659de06e4fd83d2737458cddd27ef08dfd01a38679b940e80a4b460e145ab20789940e5 SHA512 d8a9a65ec33bf6bc777d6766842cd6351c265752f552bda3bfd1db86a08c8c89c3f871c6eff15648a8c1a79d7820368711256d404934fd826ee6cb0c7c53f77a
-EBUILD debtcollector-2.2.0.ebuild 606 BLAKE2B aa4f1af4a65de10cf4e9c7da5f56381a3204fa7f5fd2808806cae1255558c3854c3be63dfabfd8a3be45cea10a23568b19b4d25803eef0c99f2979dccc8bf024 SHA512 3e260e296d0ecbcdab668e769a3feb5303ad6cd5da9e90ed73ad186561429884ed38b61f6bbba5501b00c4241ac785b4b4a8e67e104928acf29cd8e8dcee35d9
-EBUILD debtcollector-2.3.0.ebuild 769 BLAKE2B 3b4bc7513da7b2b6689a4132d51cd6f94310c22c70b8f1887bb11f01271f2067c320b559187a49273642af86d620779f5cb3cd0ac3ea5173bfb1acdd82a11fb3 SHA512 19ba27b8dee5c012323e20c9379a2c943031676cb9c8606007a5f914fa169c820aed4869d98b6c8d5c9d72cbf06120dc212679c2b3adec4c2e438eccda469bcf
+EBUILD debtcollector-2.3.0.ebuild 766 BLAKE2B b76e55528953a34ec8161009c9899a4aa8cbd42a89c307e5176a97c75a35877354851cdff500daabcdd172132b0eaa6ac1d3235200745cd9acbf40f7e5cff307 SHA512 40b832f67c0403dd469f06be5c5a39e343b8572e05b52e3737a16c84d13bf53e5411f57c6a55998296e8fa094a49cec27787b2f2999f0d7ed9dafa81149bc656
 MISC metadata.xml 418 BLAKE2B 1f3466117ea254c0f63a9281e3051dd933446a82203153ab31427575948501914f9aa6a14e87331d21f1994079935d6ecf3238099e9cab7368bc0c2d44fe3350 SHA512 6bc03c4667e05f99c140707098339dd590da95fc36f2c0634cf4374b714bde1508558f9e0f5b6a98f05d2950ddc2df78d0732f84f2be47bc317a086ed29581b2
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
deleted file mode 100644
index 8241170b3288..000000000000
--- a/dev-python/debtcollector/debtcollector-2.2.0.ebuild
+++ /dev/null
@@ -1,21 +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="Python deprecation patterns and strategies that collect technical debt"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/debtcollector-2.3.0.ebuild b/dev-python/debtcollector/debtcollector-2.3.0.ebuild
index 96fd0363c2ff..fe180f068609 100644
--- a/dev-python/debtcollector/debtcollector-2.3.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index d57cafa151f1..34ca2c56102b 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,5 @@
 DIST django-cacheops-5.1.tar.gz 67776 BLAKE2B d89ac7aeccecdb69e02e03a46c9d4250439319a840f4902a51909c762cdcb8b422c2b2be2921ac256cf4a3d3248782ece0378c19b99109038b2f4e2262c57bcd SHA512 c7c5b284af4a7ec4faf88613de8eaf2bee298208ef13efbb4bb337c1e71817f36afe51ae4cbfa566a999e2dcf1361f84684189d9748a08de32675820f8b9c91b
-EBUILD django-cacheops-5.1.ebuild 605 BLAKE2B 73f9c1134ec2743a0b96dc4e3ac8ea8e4fded544a33e1b643177dc0ffe48442b353473570da47a7d0c58e50da553afccce15a174a606db4d74e8496bf2751d4d SHA512 36f26e616eadcc7de8f70aa50a1c4ef0b8aac0586973b55fc82dfce1fc59de720e322e27637e945cf922413152d61846bd7c1eb2e34d6ea5ae6b385c1e6e6ab2
-MISC metadata.xml 297 BLAKE2B a11ae97e0f945cc993c080208140bd02e48a20bbeb8fc98e98994a54eaecba0d93b62daa6f092f5722c8bc736782ae898ffe40d9de1d6cf7a6b52530ea8eabf1 SHA512 0e173e13e9a1115e9566114248bd76cce45f05021bf9b84324f8265ff7a3f1725d0d5840d35ac0d1bd23b527d3a15e6a3e762577b9f75e3d8c4b49a2282a5255
+DIST django-cacheops-6.0.tar.gz 70280 BLAKE2B 9efe5a10d86f9ad25ad67701005de962185d2c491305bb56920203718c2d5fd0b28d43f2463e28c7c00c7592a78a3adea66090b398a205d5e361dfbcf90ae887 SHA512 54ecec62ff255a867b382bb1157117c8d14d7185891aacaae33ea11283beeae2fae60659621699a52f86d536b5a582d31f24f3b00f16c2e81c1a78ea4079504e
+EBUILD django-cacheops-5.1.ebuild 1306 BLAKE2B 6f71486e72aa54870a73d4d224ecd09a425f17ccf99634845be77478f1dc5a23be979499cdea33055b38e130f5b468c859ddb0486b15e720af53ff127d3753eb SHA512 48ac7d10ddfac48557baa65a62ed8d76c3526086c5c6b38df351f306e7500064898bd579a056c8c06eda674f8a053f7f29ed4206ab4bfc17e007c131fe20e34a
+EBUILD django-cacheops-6.0.ebuild 1343 BLAKE2B 4fb0a485ebca18e0826ce6838cf11afb3712c13752537e95d6dc28bf4f13e20f772f940547b5babe38ce6214e7dfb29b6e07647f5bdc93156bd2a8ad279ce388 SHA512 901a88bbe46c43d767c0f68715c251c3df9b4a559f25f316da07598faaf73abc8b679c1b819611c3b5196ff397f3e0adf75f928b66eb576d6da024b1b9fe0d4e
+MISC metadata.xml 381 BLAKE2B b8bf138d65b463c15b22be44750822bf6d49f1e651ecc6884dc008b9f1c93ff314967d8d3793825e129c8ac5d98348ac2726ec36ad43b8ec5d0829a78a16a26b SHA512 ad1f2ac5abcfc3705d70cc717bc076115d299a3b973852a542a7d41fabccc695b79ada0297a48cbe8f04815d66e696b437eca896e291c7da9682a85542d3e469
diff --git a/dev-python/django-cacheops/django-cacheops-5.1.ebuild b/dev-python/django-cacheops/django-cacheops-5.1.ebuild
index 2bcc4a8d1943..35821ca12dd2 100644
--- a/dev-python/django-cacheops/django-cacheops-5.1.ebuild
+++ b/dev-python/django-cacheops/django-cacheops-5.1.ebuild
@@ -13,12 +13,49 @@ SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-python/django-1.8[${PYTHON_USEDEP}]
 	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
 	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
 
-RDEPEND="${DEPEND}"
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/django-cacheops/django-cacheops-6.0.ebuild b/dev-python/django-cacheops/django-cacheops-6.0.ebuild
new file mode 100644
index 000000000000..ecfd5010beb1
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-6.0.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} )
+inherit distutils-r1
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="https://github.com/Suor/django-cacheops"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/dill[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/django-cacheops/metadata.xml b/dev-python/django-cacheops/metadata.xml
index e46e99b8443d..4ee4d9bf5408 100644
--- a/dev-python/django-cacheops/metadata.xml
+++ b/dev-python/django-cacheops/metadata.xml
@@ -4,7 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-cacheops</remote-id>
+		<remote-id type="github">Suor/django-cacheops</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index db0f1f87e018..c33826bfd50d 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.13.4.gh.tar.gz 303688 BLAKE2B 66ae7a0e15a7ff281af2154f216970a6a9b249a713b3ae987f0fbdb60b95129fdfc96c05924c0285da33f11c59baf6e069830c3079c64164d838d9d34231a4a9 SHA512 86786763db060227b41e2e340df5d52062fb6e8c54f832611bc90d01102411d45dc217e8d84eece84ebbe4fc9727d06e7c368ae15c253aaf02117705dbae8c47
-EBUILD django-mptt-0.13.4.ebuild 657 BLAKE2B 6b08d5f77741b67f41edf92c0a2d8442266ec676d43cd0168522fe1a9627a0b13ae33f142dca1b4276811713049d79eb1a7c8949682a23a8b9ec5c6cc5a1d3c0 SHA512 e11bc2eed74ec36a2b65557c929f1a5d63df07088eb0fa19de0e3d21572c1dbc8369213f1b79601c1e383314f7db35686726abf837bd55b5b9dc6f8bafb4173f
-MISC metadata.xml 242 BLAKE2B fec2ed386ce9cd0b12aa9a319095a55d6744a61c9dfc0fac4a6369267a4b288d9636764eb625a2a23c97967f883b40b31ba9b27baea4f5e4937d19ab1c0d672d SHA512 ed57e316f0dc73592de3ad6e07bb4997ad443bb0fe710279df889039e026ec2d5296f62a531e12eecced9b8cecbb54b07f96296335ab4997013d88f49f932715
+EBUILD django-mptt-0.13.4.ebuild 658 BLAKE2B f05ee8adf40f746657035a38ffef630023b32146852b7fb88c07832fa4083cb44cb033e4a02019af92a4782cd248d7f40e021fc92fb861a109162eedd6b5fb99 SHA512 77693e3ed74466f22457a264720015c630e488ad9ae79e43c599dfc27c458381e0fbf616706ec4b3f3f37ad636b75a1228c57faaa7ac3540a5e85157c5ed84b2
+MISC metadata.xml 329 BLAKE2B f0e9abbf3abb9a574cd7f7ff80cee6b433471df5876a90dd533b0ae92f13669b68b74de21d3d1ba057ca5ccaf610fdfe5b0531a37de9313c6fd0cc56b98ea8db SHA512 4138c4c1604c6bf04316cfd0f31203d44ef40765846ddb60b1725046b9d3071d5017a1726497bdf5421104f00f492417487dee2945757f505b66567c62f9392e
diff --git a/dev-python/django-mptt/django-mptt-0.13.4.ebuild b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
index 10262c58b326..19a7cf871a37 100644
--- a/dev-python/django-mptt/django-mptt-0.13.4.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.13.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index 4c9ade42d473..55dccc0b8ceb 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-mptt</remote-id>
+		<remote-id type="github">django-mptt/django-mptt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 02b497568c46..056a503358ee 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST django-prometheus-2.1.0.tar.gz 24615 BLAKE2B 381aa345fac29e71e2b883fb485dce1d6ca3f13fc863d6ca9a62d5cd8f605f8cca727fbc3a3946e707d80f89d7fbaf544610cfb4857a45bc3dc13eeb22aeb4d6 SHA512 0c102467b99df409e31f99fb77d16558bd01c9c11f04ac0f80b59e486bc6e03979e16785083980c43ee3caad26b7a6bf618f9592fcca788ec2793a30d6b44241
-EBUILD django-prometheus-2.1.0.ebuild 553 BLAKE2B ab968f4e704555898fcf45ae2054cb2cd9c2a11338389fa8d730a65f21cdbbbca67a9cf511b6dfac54b10d3be5140632d069b7b4433b4f6f5cf3ff952b779072 SHA512 311687ee5cd990b6fc405ae873b02d1cf3ed36d3da269bc07cdf52df7d086039a82827a9a8c5ee470fb9d131a54782d690c0730a0b0f6786a572fa9104408f33
-MISC metadata.xml 272 BLAKE2B c8e5147f8b94e7f0ac5635ece65eb17ec95c8e20d75ca306f455a8de1576cab16a4087d4c323f7f3fc42955c30fea9299b5cfd5be5aa18427a1a62086fd2e4ca SHA512 6bd351c96ce3f6bd5b5ae4809ec204fe5e2678fb4b6441573a36a192bb2a7316f4315c233573a5146de44fe9b6d2a195ea312d33297c79f45f678deba1211cbc
+EBUILD django-prometheus-2.1.0.ebuild 585 BLAKE2B 8f3078073cfb0c34314c43471c0666605569d12fd2fdb31e5a4bcc841c82d4e0d98d800d4603f2a317607232b30f3ce8e7b49e7731a23ddc95906f62ea0fdabe SHA512 6a76a7280962ffdae0fbda4f0397c1709e289c0a5aab1e4a8196ac5002bf5f5474469bd3d16afbec924fbb1c7d02cb19a6ba86f08ca03ce4aeaf45449cfbfc21
+MISC metadata.xml 337 BLAKE2B 3a16e167abdc7c361b2ae515b302b1476e90deb010d82cff7a3a9ec0b44ad3d41da3ca61ac290fefa9fc30069d05050ea6da170979afab18d7d22da0ccdb2e85 SHA512 608b835a108eb239a19da8de48b0a731c0ab881758e742b3b47e57fc4810dcef4f23ff53630b08ffde835d19ef9a3e2b10aede1f08d0b641c128afdb567e5490
diff --git a/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild b/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
index 108c87dc5cd3..a669adb8d16e 100644
--- a/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
+++ b/dev-python/django-prometheus/django-prometheus-2.1.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Library to export Django metrics for Prometheus"
 HOMEPAGE="https://github.com/korfuri/django-prometheus"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-1.0"
 SLOT="0"
@@ -16,6 +16,8 @@ KEYWORDS="~amd64"
 
 RDEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	sed -i "/pytest-runner/d" setup.py || die
 	distutils-r1_python_prepare_all
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index c1c161f0bc23..3d385e04b5ba 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/metadata.xml
@@ -5,5 +5,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-prometheus</remote-id>
+		<remote-id type="github">korfuri/django-prometheus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 38baea563187..0cbfb985d86c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,7 +6,10 @@ DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d
 DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
 DIST Django-3.2.8.checksum.txt 2552 BLAKE2B e3bbf05bab72cfd71521451620706eb2b66d2f16791cd7897b2606083af91b62af6c6ea1e9f2b2a1437e3ffc1e1688149f9084d134ac6fc233f6285418bdbe5c SHA512 62cef4cc4c9de4be5db763e35957f2e71e9ca9fc5335a35bc51a1e337a91027236f41b84dd1f9eb513cb769174d9375c0a7b52cfc645331a3927c5498849eb56
 DIST Django-3.2.8.tar.gz 9820955 BLAKE2B 5b53c1033babda046c3e3ff8421465d5bf31e92c5c65e6ebf7d4a401a5f85017625efbf227c718877d58f80f9153fc205b817aeb030d0f322c26b10394e71287 SHA512 0d1d745fc7ebc20a2c3c1d18e270210ec57d605aafafb2bc2bee4229727469dfea6fbd510073ee6509b389eff2a7bdb75765aecafc4506d4489c2ce37a97bfbe
+DIST Django-3.2.9.checksum.txt 2547 BLAKE2B 7a1c38abe3215ee4533984c7d78c37b369545695fb11d84d6600d64eec290addb9257c4d2850af4e311df2245799572e0866917e09713643376da7859754a2ce SHA512 9aae8da65079e20dcf9071fd72fa5f5c61640264b52c842d96cc2f697ba1d5003cf7b7c6d1f95549eb8ec4449679a00ddd267c022b3d0483ab030cc96c9405b7
+DIST Django-3.2.9.tar.gz 9809157 BLAKE2B 27fc04e874055f69466f06b009c015b46c2d2fa9ddd0005f7b2b7b32a45bd1b8a9f34e693027e040b8d05fa581dfeb9a00aaa1d876477cff5292167f20768b60 SHA512 62fb297694a7f5e48465e102dc97e3d1d04b94499bc6d98d37a00d96b438b8c919b6d08055868a1836d62b89ff65ce4fa7dbc9390789dab2eeca0187269b125f
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
 EBUILD django-3.2.8.ebuild 2897 BLAKE2B 3eb77c93ad333559fae6810321a035a7bd66a21400cb985517523e6656af3409e120af7f3434a2a11ac4e97a1afdc2745a32b5a35928dc5197b2e7097540029b SHA512 7b68975726c94cb166a985d36a31c1380d5e6c54a6b858a3cfa3f50883f22518134de8f89eb322093af45224d2db1c631e413db4d35abae41428448ec1c8da4c
+EBUILD django-3.2.9.ebuild 2901 BLAKE2B fd56aa9bff6a70202113eaddb416a2f8877713f871b1cf22b94d59615b2fff48f2bcb337f0f96ca39cb8b13885fc4e8c1deb2207cc7340490286a1ca9033b443 SHA512 c3ad10ca03c068e188723ce8e65ce744219bccf1450dbf5a00c28d21ef4b9755c91db82e89238b88e6c643fd5b038c947b0806c9270756af66a81c7f0b5babf6
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.9.ebuild b/dev-python/django/django-3.2.9.ebuild
new file mode 100644
index 000000000000..28502c5a9117
--- /dev/null
+++ b/dev-python/django/django-3.2.9.ebuild
@@ -0,0 +1,101 @@
+# 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='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 8945f885c0b8..c4c2eed79ed6 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,5 +1,3 @@
-DIST doc8-0.9.0.tar.gz 30995 BLAKE2B 9960e223e9ada9646a0e302230714dbeef1525bf9a912ec1b7a8a0c5e4bf2d2307c2303524668d770ddb38d0b30e4a868e5a2280b7c6ffc1b4b80854f2576e75 SHA512 ebff512dfffb7d21d9173f0ff6ca282810334abfbd9c95570dba4e27796e79bc8d14fd2914c029a3cbf235766305dfa37ca565e2e20d32c63ea741f8ce4d1ae2
 DIST doc8-0.9.1.tar.gz 31122 BLAKE2B 84708d05414fe1545558910d0d74ae9612091500efb1880062910b395f1244c6edb1fe1c95ff97a177fcbb4127fcbc4b819a749f90c8384c0c23e9041af12b25 SHA512 058403a808ec2d55cf732c8eb0e28f6902c935a6fe0fd4e3ce1a11088888f32875a416adf478b81192948ebd581548b2d1591581222f1e841e97777980a80d69
-EBUILD doc8-0.9.0.ebuild 956 BLAKE2B dd8560d5039ab6eb66eae7119817335c7971bb47ed6e9f87b13421deb3d1b52fa7912b6e175a296966b016bca9db6f1123d4b40e325532dcb2f00b46226dc2cd SHA512 fe8e223be01c1c9409b100c13ce7d80e2583a678d91c0f94f7648b6faa944aba4a64c532ea11f3337fee64bb13fd73f9f8f67cc78fc16d2e3a2f09955e3f6904
-EBUILD doc8-0.9.1.ebuild 959 BLAKE2B d0399a298bd7a9b80f0180d1db0c5fcc42bed563b073f96fcf4a78af5a7f9b1973bfb41e77a5a7d32f445c3db5e43f605ffad95544a39560146e7864ad184915 SHA512 2fa37711347cc9743a2f847363e02898409f79aaac96d7d4947db0e8d58057641738cfc54982cd3fe9008654ba731e17943857756ef5aff3e7b094fdd15138b3
+EBUILD doc8-0.9.1.ebuild 956 BLAKE2B dd8560d5039ab6eb66eae7119817335c7971bb47ed6e9f87b13421deb3d1b52fa7912b6e175a296966b016bca9db6f1123d4b40e325532dcb2f00b46226dc2cd SHA512 fe8e223be01c1c9409b100c13ce7d80e2583a678d91c0f94f7648b6faa944aba4a64c532ea11f3337fee64bb13fd73f9f8f67cc78fc16d2e3a2f09955e3f6904
 MISC metadata.xml 322 BLAKE2B 0dc9c91cdb78ef3c143f7e45ac3ee3754643c676c249a685fdc73ee8f7468e19eecd6463fcb873b4a242789aa6c8f65ef92c45a1a5dc61c21bb070ae055f6553 SHA512 a417cd533ae3ef3b64cd170caa7e84fdf761be3b9b35178357134bcd5ca487fd5d4286cdff4718b345afef06cd63d5e9511431483ff7ba3ce5b5aca4ebe8ef41
diff --git a/dev-python/doc8/doc8-0.9.0.ebuild b/dev-python/doc8/doc8-0.9.0.ebuild
deleted file mode 100644
index e80ac6ea7058..000000000000
--- a/dev-python/doc8/doc8-0.9.0.ebuild
+++ /dev/null
@@ -1,37 +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 optfeature
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
-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/pbr[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/restructuredtext-lint[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "checking pyproject.toml projects" dev-python/toml
-}
diff --git a/dev-python/doc8/doc8-0.9.1.ebuild b/dev-python/doc8/doc8-0.9.1.ebuild
index e7f37e7f4c45..e80ac6ea7058 100644
--- a/dev-python/doc8/doc8-0.9.1.ebuild
+++ b/dev-python/doc8/doc8-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 71c74b7253dd..ade892f61b27 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,3 +1,3 @@
 DIST drf-yasg-1.20.0.tar.gz 1800321 BLAKE2B 3db8b0b33c2919d4a331b06b1f6e324ce6e0e160c0454cb066e61cbf7bb580efadb5cd9624579492db3404edcc8e50753e63b6edae022842cd087b820779557d SHA512 b56cd00d7a09f197e95c0129e20e561ece783b4edb389b228027ab8768247ccba15db5768f52a3d5ac5a4c47faa7a447ed7eb9b22af2a21377a36dcb7e7b267f
 EBUILD drf-yasg-1.20.0.ebuild 946 BLAKE2B da0987843266c6da7b7f425f5e14cc5f70fe16ec254063879d10ada8b1e17343730ee0aea3d96ce94464c62b99046db1015213de7f2997c185f046d4db9658ee SHA512 69704ea4e7290e6d38a663598015991466af431b778aa38dc3b6ca0039eaab59955d17f84acce0e5a64cb6ffa76fc9838b97960c279de0572a1552527328c94d
-MISC metadata.xml 354 BLAKE2B 84a2843f9a2c8114b4b5a4d8a9cf232375d1416a54f95aa0e87fdbd11299434af2e35a592b676cf94f9e751c43a2527944c93bc4bb4becccf65a8a8dcbfcd35a SHA512 bd20a9bec093a76a4639cabb1b98ae6148293b96107460faa6c98143eb9b874faad20e3c0818f4af604153dfb5eb22af0f912479b7d328b22e41e49612031f1e
+MISC metadata.xml 411 BLAKE2B a166990df10a1a15f98b3dc4ec418785154297056fb41d635c0778ba76ac6262ad913deb614a4cbb08cf79aa4c13cc57e0aadede509963e897ae822d1ac2ef30 SHA512 c25b4ac9e2690096b5c219329cb44147d8fd8631b39652456cb336d8d9b544855b8ec49407be9d15e7efb331341f5929653ef14a7d84bd808c5f62a03f46a0fa
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
index 4855944efa0a..872e1cf1181f 100644
--- a/dev-python/drf-yasg/metadata.xml
+++ b/dev-python/drf-yasg/metadata.xml
@@ -9,5 +9,6 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">drf-yasg</remote-id>
+		<remote-id type="github">axnsan12/drf-yasg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index ca914af8fddb..35de831d31d2 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,5 +1,3 @@
-DIST feedgenerator-1.9.2.tar.gz 28076 BLAKE2B 18c1db7de23efa79aae7b1d92aeda4d41921e673da7be883099b3c00f54aa4602370caebb02913607644b8cf1d887e8141b8fc71ecd52e4720bb23c645ec5242 SHA512 3f9799a8008cf456635bacce87699c3fa00ac990ed675a92dbdccf898fd189c8908109a27bb393e9f25bda7f880c66c40fc3d1179d09e579be8125c70bf1b7a9
 DIST feedgenerator-2.0.0.tar.gz 23093 BLAKE2B 9f8a597028303f86eaebc0e8e34454dda135a5d62000c4ff6b30fc5baf872b924c3bbf9a76d07817742255305d9a681a25693838992170068e4cd6af540840fb SHA512 1f53077e4c757059947a487a1aa7ca8cf28545bc86f1bf3c8fbe515615f83ac4c48de5c22dd020f28c21ec6549d7f9971513f3de450bad7d4efbe0a0e444b0fe
-EBUILD feedgenerator-1.9.2.ebuild 501 BLAKE2B a45541308ef2bbe6e27412140d52c1756371b3759a9082a415ce3cf5fe791159310aef8366f63821e75179ee2bb8e5ebe7ad36ac7b9cc1b3dcbe725240ff4669 SHA512 8c3fdfafdcc8511315684ed2210b5a8142f54f75151b1b12aec3656ecbb0036a40bd01bd176aaaf31c1ac73d2627e58753cc03b62414b14678cb9b334c7ec06b
-EBUILD feedgenerator-2.0.0.ebuild 507 BLAKE2B f61a80b0aea41d295b4f4652d865ce832e6fec1adb314672d58703d6ad6855113cf2e4656252630618c388c277e42003c43a080e9fdd83bc5433cba2f298517e SHA512 01388cb18ece81d8125a00baf65ad0854d797e1934b9f6ec51a64635a518d565def13e4c852a417b01bff6d13eb96941206760ec90be355d8b5887d00fde8568
+EBUILD feedgenerator-2.0.0.ebuild 505 BLAKE2B 658eb84756246e5e0bb805544207d0d6ddf3105fbdf4ecbf71e378a5d6558406f3624a1678fe0d9c9f4233eb996b263a2fbddf651655f41e804166b0db495825 SHA512 e8c8b195fb0c4e7bd3696db46646694f8992fb571e9de1e6641e901852a0b8009340bcc03750b58ba18a12341b7109e1d34136c5851cf5290f5508c0ac504d15
 MISC metadata.xml 477 BLAKE2B d167790f82aef2a2aec5ef6d351ef3e003d0c5db5e69a2ae78aa108ae4c8ec006f0983eda0d6855ccb11b91218b2dbe7abeebd1bc2428b8a79464eb96c9ba5d8 SHA512 2fa5b9046cb30943e4c511c220a302250355bd60b0285be7de6342cc7bd271df824e3fa73a62efa2998ee9cbbd08e45b2071214e56de053bd583f6d85c41460e
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
deleted file mode 100644
index a4069dac5be0..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild b/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
index ec6874d7e2db..cc2a5004cb96 100644
--- a/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-2.0.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"
 
 RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 30b315caffb9..5096e8449433 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,13 +1,5 @@
-DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
-DIST py-filelock-3.1.0.tar.gz 584958 BLAKE2B 29ce6c14ece7a45104ceda46bbb261730f7bf3e7df9d20be783a8e8324ca350e8b02a099f4273aff953281e10d305772c3572a72377f1039d0763c3d87173289 SHA512 cffca48f9e7b39a750bcecdbd4a1c8fd2a57c0eddd41fb735930ecb954550620ab89994cc159b6f0ada2cc0961a097e5e2c2ac380de424b59b111a3290682b86
-DIST py-filelock-3.2.0.tar.gz 584871 BLAKE2B 67c5d85dd030007c12f549e772eac8d028c9f0ee9abac4b5106bbcae91e5447e7c6394938877b718630c22323c53ebc28a8bff8b2e323401f027807f7447017b SHA512 8c2f3980090b798ca0103158731a816443bf461a40d79f337e1c102aee50b3885d2b30113d509a8457df20a2cef196e70b2313fbe3f5b44557b817e5a6154d80
-DIST py-filelock-3.3.0.tar.gz 200781 BLAKE2B b511e6f2780639cddaa0753b1812c44a32720d84af63ad503ea7843ee59f81555569ed828296ba89f0e42b88de3f62c9af9abea970848acb59f2ce59eafb9c64 SHA512 e0a1603f8056788223edb4e0a2b3a83d7dceba385ff14ed04966b47a29c659ef58f782383a3864b6ffa8edeb5be6e85ad3cc70abf3926514eccac5bc747c81ad
 DIST py-filelock-3.3.1.tar.gz 202803 BLAKE2B d8a97d6e5beb8fe8883aa29bb55135f10f40f899232a84a53d66c4f4f50317f0e66a52141eb4285dd23fada276d23f10f43be166c481dc422a606d02eb350146 SHA512 0e8ff074a65f0f8f65fb4f05d94fcaccd37f2f1c489e5ed888e36f722a046cd143596ed1142d0638f2eaabdbfb27e48011bbce9b09e776e11c16b1c13d1467a8
 DIST py-filelock-3.3.2.tar.gz 203026 BLAKE2B fce1a0d3c6ee1867d0af76d8ad73d3109568b30dcc823923573d9094298139151dc94c41216bb6b9634137949f1d5165a1b162845392f5478e0f240aebf36c04 SHA512 ec077249d2ab2586e33a5ff55246627ad089cfd37979258e5325ea7c6aa80bd08dcb1bd4055fcc6ca326b81f07c65d0db7e7a276da61dfc2dff5500792be83d6
-EBUILD filelock-3.0.12-r1.ebuild 640 BLAKE2B 798ef67b1ee71b99c065b48a8d5b54f9407a32d742a02a8d86e0c5f978662b2370afdc72617af1ec7712882bba3a92afbece905631265c1491a83f28db8971a3 SHA512 027590809537070c19811c080177863b21233728fa8db3c590763600a695898744e777d2a7f3a6a3cd48b04c2d1e6817e44ff59721ba7d254e05d5b90620d922
-EBUILD filelock-3.1.0.ebuild 682 BLAKE2B 15dcf39ee226422f1c84059de265aa5ce6c7a8904dba2eeee5cd935533dec4075984daacc37724c78010f90b03683f59ac3b40cd4ddf0ef74f1e0d9526a9b3d0 SHA512 c823957d1340e507ec6c29a034f43f4c613e8af0b4a557a6f60df297c18b71db76cc81db9868122a5044b131f97f2e28ca87eddf507e1282702c976040378f21
-EBUILD filelock-3.2.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
-EBUILD filelock-3.3.0.ebuild 749 BLAKE2B b74df2eee9c8ba9cdf1b8522be33b9108dd98a02e1614019cce1e762e0c2bc7d9270df5236597c760a7180facfd89cd938a175e6f1f55dc5d031648380c42873 SHA512 5d6344e4da56d1e441a02ef209f252e7d372702e638a942d359c07499550d79071e96fa250256bbac5ad61cbc4acbeb350ef9385642cf9ad74e01e5b2f3803f2
-EBUILD filelock-3.3.1.ebuild 740 BLAKE2B 92350ffb89b35018f445a3a8b8b46da812b8c43bd647173e196b36062e20c0fd21a41fbac2189434ae669351f198f4bf93f369807b2b2bff1ad7566f14a7739b SHA512 4e0a61b93ff0f1fe6bb00626457622c9b1338848c1e1b54ede264189691636bee9762d5055f50c0227a074b7f20a87706b1e345676060c11aa425a10a6be0d3d
+EBUILD filelock-3.3.1.ebuild 732 BLAKE2B a54f9c35612d949f11f7ce32ebba5b6a4c47352e7a2a64ba809913fc22075400dccfb84d71fe3f9f6799c0cc7642b51066063641128338a38285f5c26e67cea9 SHA512 1fe3aa5474761b0dfb6dc47c4acf1b80f1f8707c6006ee876216251ee45ed819d924605064d8f82601b669eec3b33296af5a0e9d0977599d2db9763a460ee669
 EBUILD filelock-3.3.2.ebuild 740 BLAKE2B 92350ffb89b35018f445a3a8b8b46da812b8c43bd647173e196b36062e20c0fd21a41fbac2189434ae669351f198f4bf93f369807b2b2bff1ad7566f14a7739b SHA512 4e0a61b93ff0f1fe6bb00626457622c9b1338848c1e1b54ede264189691636bee9762d5055f50c0227a074b7f20a87706b1e345676060c11aa425a10a6be0d3d
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.0.12-r1.ebuild b/dev-python/filelock/filelock-3.0.12-r1.ebuild
deleted file mode 100644
index c32a5318e232..000000000000
--- a/dev-python/filelock/filelock-3.0.12-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2018-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
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="https://github.com/benediktschmitt/py-filelock
-	https://pypi.org/project/filelock/"
-SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE=""
-
-distutils_enable_tests unittest
diff --git a/dev-python/filelock/filelock-3.1.0.ebuild b/dev-python/filelock/filelock-3.1.0.ebuild
deleted file mode 100644
index ec08c0f21c42..000000000000
--- a/dev-python/filelock/filelock-3.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2018-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=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="https://github.com/benediktschmitt/py-filelock
-	https://pypi.org/project/filelock/"
-SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.2.0.ebuild b/dev-python/filelock/filelock-3.2.0.ebuild
deleted file mode 100644
index 5e3fcb6a7949..000000000000
--- a/dev-python/filelock/filelock-3.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2018-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=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="https://github.com/benediktschmitt/py-filelock
-	https://pypi.org/project/filelock/"
-SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.3.0.ebuild b/dev-python/filelock/filelock-3.3.0.ebuild
deleted file mode 100644
index 5e3fcb6a7949..000000000000
--- a/dev-python/filelock/filelock-3.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2018-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=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="https://github.com/benediktschmitt/py-filelock
-	https://pypi.org/project/filelock/"
-SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.3.1.ebuild b/dev-python/filelock/filelock-3.3.1.ebuild
index 1f2f85c083a5..340eb3c41faf 100644
--- a/dev-python/filelock/filelock-3.3.1.ebuild
+++ b/dev-python/filelock/filelock-3.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index d248e82f6acd..34e0d8bf892f 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,6 +1,3 @@
-AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
-DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
 DIST filetype-1.0.8.tar.gz 804082 BLAKE2B f636e9fdddd93dc8972c434666b82d97fd9572ce94f0c3b617add2ecaec2e1bfeaa267bb5ceaa07a6ed76d0b0ef0736451f9e4395353ce795e1a61e7cce5d543 SHA512 5ab87ec277781d27bdd7a4245f406d230724b0f0a7ab26e879cb78893262fbdff7088bb306203fb1fce38723b5d1c2a998fb8ae113509502755e995a1f81993b
-EBUILD filetype-1.0.7.ebuild 535 BLAKE2B 85c921509c386714f9a1af19688f485a4679aa2da6778c3adafbb7ee3d9e963c063092a611fc4635cebc371fcf780b7a22cdef705ef68f12baad7800f42a4d9f SHA512 c4ed42b9e698ab22bb29afc30f18153b0c518a2040e0c365affd6655062b210e024c26cb9970465ac7d32b2ceb5ab39b60ce72a4d9fa048cbed39423e8d849cd
-EBUILD filetype-1.0.8.ebuild 493 BLAKE2B 02729acc49e3826f9d2b033814125afc639ee08dbc21cdb4737d4af68e0abde9a0cb9eb121a8dbb15ef57e24cef76103757fb99cc89d20c559d72d7947af337c SHA512 89e5b2838f98615a2ac42c86af7bd2836530f3955f1b9b619d1d15f3d1830a5898118b58b98fc4f40aa909e1a2c285a85728c2f8cbaaa400905ebb71cb371011
+EBUILD filetype-1.0.8.ebuild 487 BLAKE2B e688eaaed951f4f9d776193cdabe28eedb8fd207cf35418d6cb638ab6391362f24639b5979e4ccb4db1760601a6fb58a21caa71c2c9e53da4c2caa7dbf9b8576 SHA512 984a133836a5e028892521145d7a521d2e9f51061367fb4a664955c903705becb9ef1c61786acf585a8a2d3bafb12d621b0a076efbd5e2a103174a700dccfe0b
 MISC metadata.xml 478 BLAKE2B 90bbd2432c69c85eb34fccdf6c8e73d7f226d8005d04136a1043a3a0e561a6cf12db5393720e2192c2ae39cb501f4db741d7b41d1c0c3d217e4f84e1d846200b SHA512 18f363a259cafd46ffd3e5bf943d38efea4ce39385af6976b1681088c75fe7b2748752b6f68e9e8fe120786d0fafe9e1c2599dff40951bb28442d9542c422c41
diff --git a/dev-python/filetype/files/filetype-1.0.7-examples.patch b/dev-python/filetype/files/filetype-1.0.7-examples.patch
deleted file mode 100644
index 04eeb8e1ee68..000000000000
--- a/dev-python/filetype/files/filetype-1.0.7-examples.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0aa106c03d0bc7dc872edb349b4a88edd170ca05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 9 Aug 2020 14:55:07 +0200
-Subject: [PATCH] setup.py: Exclude 'examples' from being installed as a global
- pkg
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 45bfd49..8a69c6a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,6 +36,7 @@ setup(
-         'Topic :: System :: Filesystems',
-         'Topic :: Utilities'],
-     platforms=['any'],
--    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests']),
-+    packages=find_packages(exclude=['dist', 'build', 'docs', 'tests',
-+                                    'examples']),
-     package_data={'filetype': ['LICENSE', '*.md']},
-     zip_safe=True)
--- 
-2.28.0
-
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
deleted file mode 100644
index ddb89484e0bb..000000000000
--- a/dev-python/filetype/filetype-1.0.7.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_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
-HOMEPAGE="https://github.com/h2non/filetype.py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-PATCHES=( "${FILESDIR}/${P}-examples.patch" )
-
-distutils_enable_tests unittest
diff --git a/dev-python/filetype/filetype-1.0.8.ebuild b/dev-python/filetype/filetype-1.0.8.ebuild
index d13aeb5a02d6..c65bef90a536 100644
--- a/dev-python/filetype/filetype-1.0.8.ebuild
+++ b/dev-python/filetype/filetype-1.0.8.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0: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"
 
 distutils_enable_tests unittest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 84c94625a9ab..aad270c1903c 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,5 @@
 DIST fonttools-4.26.2.tar.gz 2579391 BLAKE2B 35a2533a336498aa1d5b9c2a61c1de6af03e6a7a1932a1ad71522f7f73e52590c347fe3e7d60b93b013389023792e6e6b91d6b4bfb92e007062dc2ac494adbb6 SHA512 2caa52a48574e6bdf418fe57fb4ca69686eeae65cb1f44c0cb16c64400ea666530dfcca9e8a619859cf553435f93b38f63e422c315206ecec467eed6339a5987
 DIST fonttools-4.27.1.tar.gz 2645747 BLAKE2B aea6b8c13f29f460945f2d075176960f0f994fc262af06b493d2c34a0e4e6d37263f642e6ebb44b4a7c082bdcd7d4f1fa88e40e82760cf8a9b90cab8735f005a SHA512 76371a1244cb1c681b90f31ce67de3aff5e732477aea02c046a45a838ed49f097707edd359c7427e2643b357c12f6516d667d6b1a61e942a8e3b57eae1d6df70
 EBUILD fonttools-4.26.2.ebuild 1419 BLAKE2B 7f56ced1a78da81c4b8e006006c4137c4537f9b771371aa2d9a7605e2e52d2bd6aba8d8e59c2f3309eaaf10950cbe9b362d5c1909c84835ccbfbb5bc5344b387 SHA512 a91140bfd01e9b1f2bccfaefbf629413845bb6797ebfd4f7ec7e0d4cadc76ebf70543a39e0f366d63f2b11cec0eab93bddccffc8d4c191671bbaecfd28d73e5e
-EBUILD fonttools-4.27.1.ebuild 1433 BLAKE2B 2a02667f5d12f60c59537260cc91a2ec99f7915ba6663e78bfb374d9a00258fe377fe9e9b0995f2a0670342cd174193056caf7e62e7e443d35df133556a4e144 SHA512 d4f4356c0282a32ff1b624b664d7ec539a8e111f7186d06ba2cbdf19a46695258399261f2b0f58cbe2f77a7905798bbb2c80fa0762df472ee4a06627196dd2b4
+EBUILD fonttools-4.27.1.ebuild 1426 BLAKE2B 4c4cf0dca2cb14a27dcbda41713adcc55e2b7110cc6b6e38df5f4d96beb7db839a877883c8f6b6bcdc2da56bb2ecb3d2583460b48260c6af2c197654f7cf40c3 SHA512 48e3e18e1b6980623a8656eaff5532f07a792b6f088b618869854773353abdce1d2722969c18a9793676cbba8f156f749accb9c5c4065c90d84cb7fea91bc770
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.27.1.ebuild b/dev-python/fonttools/fonttools-4.27.1.ebuild
index b98e2fa9734d..67b21fff239c 100644
--- a/dev-python/fonttools/fonttools-4.27.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.27.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/frozenlist/Manifest b/dev-python/frozenlist/Manifest
new file mode 100644
index 000000000000..9bc425fe5bd3
--- /dev/null
+++ b/dev-python/frozenlist/Manifest
@@ -0,0 +1,3 @@
+DIST frozenlist-1.2.0.gh.tar.gz 29062 BLAKE2B cc82db759906ad3e0be1806cacd6815377f264ed07ed272abb7da4753c11561564cf1cb4dfc0154abaeb4005f5607c26e602410a4ef45dd8e94e26583caa2ab7 SHA512 e5dda13e173db0b1c6e8c5a61949534f4eb30211cc4fcd102d0be1b55ee48e2db90d52fd770a2c6d6076f3a0d9e11289629a7a115c1270377636eda35d107e7a
+EBUILD frozenlist-1.2.0.ebuild 843 BLAKE2B 250e2841fe73f5aee55ed98ec64d679c77fc1e5c901a83c199d579eaaa63a99cdbddcf0b0fa6fcc8824c50933fb3b6b6fc75869a44c7060e1d098c52c7c52ac5 SHA512 eeb9b30e0eb987728dc94dc279698e2b38bcee73bf01630ce10963202e03e971d92d7702d7fff39df9b724d4c9cfac4988dcbe3a7d11c9bac36c5db8c8802d3c
+MISC metadata.xml 350 BLAKE2B a736540de62fb4fb95da57111cf8d08c3b64bb7ee8bd84cfbc0c4fe8bed3bb8c4e66215cf4ab93453af2efa73eb1676e68ebc01e24957abe7b209d1eb68e2800 SHA512 4fe629b8b52392065d096781396c5fc5c48d44b961a18d88741053dd99016268195317acb66c4fc2809058bb2d24b8c7cc760757254ccef7337b00a2387e3969
diff --git a/dev-python/frozenlist/frozenlist-1.2.0.ebuild b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
new file mode 100644
index 000000000000..ba892fcc5c1d
--- /dev/null
+++ b/dev-python/frozenlist/frozenlist-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 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
+
+DESCRIPTION="A list-like structure which implements collections.abc.MutableSequence"
+HOMEPAGE="
+	https://pypi.org/project/frozenlist/
+	https://github.com/aio-libs/frozenlist/"
+SRC_URI="
+	https://github.com/aio-libs/frozenlist/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	# pypy is not using the C extension
+	if [[ ${EPYTHON} == python* ]]; then
+		> .install-cython || die
+		emake cythonize
+	fi
+}
diff --git a/dev-python/frozenlist/metadata.xml b/dev-python/frozenlist/metadata.xml
new file mode 100644
index 000000000000..c3f806ae6504
--- /dev/null
+++ b/dev-python/frozenlist/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="pypi">frozenlist</remote-id>
+		<remote-id type="github">aio-libs/frozenlist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index fb066cf49f26..7bcd047fcffb 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,9 +1,3 @@
-DIST filesystem_spec-2021.08.1.tar.gz 303969 BLAKE2B bc67e980cb7d5def227feec16d984630703e817fb696fafd53db7c56634e8e101ac8a68ad6d3ea3b0cbed475f431b5847e3e0612cd1f5abc2bd753ef4f6004e0 SHA512 7757480ff8f113715bdf4be400af9b9c5a3f8b52abc8cc8ccc608f2fea0f3c77f074db1aa5e7ce5d0462ae86a702af8058f8a8935b99617e6803bc7344801b8e
-DIST filesystem_spec-2021.09.0.tar.gz 311338 BLAKE2B e448c0e8a0f24f2374bf6b701bb72b10c91b0058b81947fb538ad96412170e6b71ae5e49fb0f679f0a7031f1206f706bbf4f90ecc118d89da621c5cb4f8f4875 SHA512 65ee4f7f7d1dd235dcb6dc6933bb2eb62c91cb50d08703becb0b84640c40efed09cf326478c84316f4edb3cd08650ff1d93e222083463c868e8ca2b8a9fb5f91
-DIST filesystem_spec-2021.10.0.tar.gz 313863 BLAKE2B eaffcbf4b7ef1821406664062961f36e8490ffc36e6b64dbd3be820785c41742f741a8f0e76db5ee0a75e2dfc609000a572ebf5c02dc9118b2a45413a498de32 SHA512 2b478a88c0aa84fb55f8946923f79900350e36395bc6110181966404e6fb6d5fbdb3b6ea19e2e7077c8167f65266a68ac962af25dfb1cfe573f5e74c34329fe8
 DIST filesystem_spec-2021.10.1.tar.gz 315068 BLAKE2B c9be13ba8a2821274335fb924e91904640f4505a7e639211c7b6701f63f7dcddae018c15933b291d4f4d9f2ea451136e09ede637d615985889b565a12ac93665 SHA512 2f89a24b5491e15d3b3d9a2e6307c6d4a0db61848ad5e9324f4e234d4204e3a1f78b00a50b26f6fe90d657df6700aa23cb76f5df996b29dd880b7c8677d21382
-EBUILD fsspec-2021.08.1.ebuild 1159 BLAKE2B 4f79c21e2b4327949f1f9760e0bf8cedf624c1c1153f9543e707cf081240928b3bb4b01ae0dba21a64144c3de80318c237f87dc8a4f89188ca4f2c7e434d287e SHA512 ac34673932df6d58a3b2d787e681f9abd2c034cdb053e36906d376d3e05579b3299d9997efcfca947975002b6433c8014494e2f1e4b4fc6a2fdb9de96bb9307f
-EBUILD fsspec-2021.09.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
-EBUILD fsspec-2021.10.0.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
-EBUILD fsspec-2021.10.1.ebuild 1160 BLAKE2B f09091ed20d567af58f21556a4b99e4515cf724b39bb0a395ed918e80a814ed1050c952123694cb9d7e518ffa776b6c03b7e78216149fc91490eba1ca2f12ed3 SHA512 a0e0399c1e24fd092b188db70a3f35820780119f636b60f35b16f12c254884901fd502aa6bc7f05e429a34d5bc1356ef9a7148eb94421a8da119928e0347c8e2
+EBUILD fsspec-2021.10.1.ebuild 1158 BLAKE2B 5f08d06d17eecd748aab8d45e4c52bc82d6bcc8b48ecbcae76ba5a664ad9a6cba19591f8d457ffffdd257cea7cad486b3b5a2e443021b797bb9d297707b2c76e SHA512 dfb3d2ab968a404faf502ac99b8aa9807f2c3fdf552085770571f3878a5624f5ff2e3d24485df44d68ce6ae2a0828bb58c26028f50601fdf7f0011854ff729ff
 MISC metadata.xml 374 BLAKE2B e3c4cc3d3081e0ca2b3d6745d1920f128bae3d07a4bf47d29eaa2143024a9272e4837ee95e2f2829baa000250afde46279e71b031ef7c283fb47753e7e0a9c91 SHA512 c1ef25f5dbc85cad1bc5dec8efd5e0d8b56587d123464fe37f834a30eff03fbf5d605050322f88bfe3e4a2f1179577f63c2bd8b0257202d20f4a40cffe317537
diff --git a/dev-python/fsspec/fsspec-2021.08.1.ebuild b/dev-python/fsspec/fsspec-2021.08.1.ebuild
deleted file mode 100644
index ff439a478c9b..000000000000
--- a/dev-python/fsspec/fsspec-2021.08.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-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=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-)
diff --git a/dev-python/fsspec/fsspec-2021.09.0.ebuild b/dev-python/fsspec/fsspec-2021.09.0.ebuild
deleted file mode 100644
index 2f83ce072601..000000000000
--- a/dev-python/fsspec/fsspec-2021.09.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-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=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-)
diff --git a/dev-python/fsspec/fsspec-2021.10.0.ebuild b/dev-python/fsspec/fsspec-2021.10.0.ebuild
deleted file mode 100644
index 2f83ce072601..000000000000
--- a/dev-python/fsspec/fsspec-2021.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-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=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-)
diff --git a/dev-python/fsspec/fsspec-2021.10.1.ebuild b/dev-python/fsspec/fsspec-2021.10.1.ebuild
index 2f83ce072601..356790065b64 100644
--- a/dev-python/fsspec/fsspec-2021.10.1.ebuild
+++ b/dev-python/fsspec/fsspec-2021.10.1.ebuild
@@ -17,7 +17,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/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index ab0bf28c25a2..a5903288a799 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,3 +1,3 @@
 DIST python-fuse-1.0.4.tar.gz 46571 BLAKE2B b839043343e5abda2725545c696afd4da847e33a77647d910bc7ea71d17480536770d99899ae8f949734304ea6b4b591934f34476ea84aad1adbe39ee5897fa7 SHA512 48fffc02aa7125df03cf2a5819449a5e10a772ecc737bc8a19199beca6a2f8181b98c91cf05fedd06fc258d846c8d67d073dc1e8620c336a3ae09320688dc389
-EBUILD fuse-python-1.0.4.ebuild 522 BLAKE2B bf694fb9924263cb11d8cd1f6d73b7ff31df83c806d341ee5d83b9aeb4b378af966ba57d3bd6545f65d3b26ea76fdb8a46b10b11e21e494d3ddb24214f8a8060 SHA512 6169fbe023fca8189d5df70330e91cef69f8009f8c75e23b32ccd81d6e2905bb668750b0783bd9cd89bf9ba638994c879665f6f8a1e7cd2fad67b76ea967f3c7
+EBUILD fuse-python-1.0.4.ebuild 523 BLAKE2B 043eb3f7950725d51060aafd6b9a679405868e51d2a564c6e3ac613080d8ebef46cb79e62575b4e177b8ae1a5b37bc0af22e3524399e40cac2ac1b3d75c57fc3 SHA512 7f4477fceb918f1b978d2d2279e667b47357fabe8451911536539fa4e3f201f7d03613c5f633d0631d5f468e2ee142d0556787997d3730a0b6bec32febc87126
 MISC metadata.xml 364 BLAKE2B df4e5fba243a953fbe10107e8a35989d9ff0d1ef320cf256addf871f6656f04a4be967998db220e88c21e683958c86b8db86b8e535bc1c7123db8d11f3406ba9 SHA512 d553757cb1c8fcd852f2c2533086cb5fe89be481568ced00207e819056a66c10b738e072fef477bb4cbff78d8797fb2d89ffb6fe3beda73ab185c7c21f68af4e
diff --git a/dev-python/fuse-python/fuse-python-1.0.4.ebuild b/dev-python/fuse-python/fuse-python-1.0.4.ebuild
index a79e2094d4d4..705b081a3d76 100644
--- a/dev-python/fuse-python/fuse-python-1.0.4.ebuild
+++ b/dev-python/fuse-python/fuse-python-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index ac4bff756561..a5d07ee16159 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,5 @@
 DIST github3-2.0.0.gh.tar.gz 35361555 BLAKE2B eafbabeb1557e55c27b268feaee4a0b49428ede7a419cb36163dc0437baa53a952b026971f07b30be2c33ed63d4c0b855369ee5260d4a3425e86dea101deea8c SHA512 92b044d0f0362c45773f8982043ab4e31cf180a955351fb9b035a8b2ed884330201d0cbb0e5f8f877c30cf6512f2e3864646a1bb1fe47e258a696720172d64b0
+DIST github3-3.0.0.gh.tar.gz 35410027 BLAKE2B d5da6c7a4612879646af7bfe82ac899c3894c0ecba9d6bf2d467ff497431ddabbbb342a5895d55bee56a03a6ea4b12bb989a903bdef31998da4382619810a9bd SHA512 67b8d30ec44a38344117a2d28f4eed1d86ddc4ffda68e36da9d6540ef4fe57a544e9d793d278a289f61e8874271b3ee21da0d742d9a7463cceccd4f1384669d5
 EBUILD github3-2.0.0.ebuild 839 BLAKE2B a048c9b3ca5c836abe5fb155cd88b70369131507c8e869e3d3705c63e5f7de5a24638f5ce6b0fdd70ffa94322c81424ba61425529628cc05a7aa71272842015e SHA512 1cc5c224cb89757b04007dedd0a687b9c4f6646b41c017c232490fd994cd9337efda67b4857503f328f7cee6d46736cb7022dd00031363dbb5059e609cfc7a3b
+EBUILD github3-3.0.0.ebuild 839 BLAKE2B a048c9b3ca5c836abe5fb155cd88b70369131507c8e869e3d3705c63e5f7de5a24638f5ce6b0fdd70ffa94322c81424ba61425529628cc05a7aa71272842015e SHA512 1cc5c224cb89757b04007dedd0a687b9c4f6646b41c017c232490fd994cd9337efda67b4857503f328f7cee6d46736cb7022dd00031363dbb5059e609cfc7a3b
 MISC metadata.xml 675 BLAKE2B aa0bec874cc285c1d5eb57c128188c8690eb572191465ac193e8df40836b4b27b1994916ee419c2d03e7fd95ad6ee2882d5b603702939663bedc9a0a27f7aeb0 SHA512 cc6cceaf8fb98df0ff61aa8ed7e45af8054cc20ea7e6697ff30d103d2dc5b479486374ad6f99e4de46cc37214701fbfaa4d3fd1a74923b9e7d7dfddae08ebcf8
diff --git a/dev-python/github3/github3-3.0.0.ebuild b/dev-python/github3/github3-3.0.0.ebuild
new file mode 100644
index 000000000000..e782c17ddde1
--- /dev/null
+++ b/dev-python/github3/github3-3.0.0.ebuild
@@ -0,0 +1,34 @@
+# 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 wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="
+	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index f6c2a1361586..67469326188e 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,15 +1,7 @@
-DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
-DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5856c7b7683ceb7bf6f0f65400b2407195be7e30a0982288a0f7892e70b659c0984823d5dd0c3d4115eb781643a584091580ac1ed480b4 SHA512 da8515a0db759cfa4e9b991fd04811e9d213a35c184e993e2439e00860ce86857c2968da75dee3ec755a2f679ab44219d4cc1ed817e7ac24664e667412205566
-DIST google-api-python-client-2.24.0.tar.gz 27072085 BLAKE2B 285da09fff461ffd100a5fe603f970fab6d552197690279e0c0d411700b95109bde523c1cba84a3fbc04cdf7bc13237a4432014912e0c79aec0c1d82e42c8c69 SHA512 84f0e0f95de0bede13e76eac3885b2a40a61d3ad522cb11a59cd3ab1d7bf6a7368a21232f9a9f64905bfaa2bd7a9b359ee3dee2a53e1dc303e8aede14dbdd466
-DIST google-api-python-client-2.25.0.tar.gz 27073397 BLAKE2B 0bc1d2c75cf826cc3326406909ab874b7ac51fc823bf5367fd56abebdfba50c035d4b92e3a0d19b8cebd8d570742e9aa3bdc7745c139624e261bc89fba8c789d SHA512 7940408b1d6ec42e1a9cf5a3ecb20eb3d4c3b35d4b363237c6bed0f32a1fb4be0fda11a0c9039a6cc5cf28ba05d0f183ff7b7bb2f5cb3f1bdf071f328b851035
-DIST google-api-python-client-2.26.1.tar.gz 27174748 BLAKE2B f00b4be7b5f62e0067e588404485d854b876b7e829020d980088be62018698c6f6790db7170faedaa2f419fa3f645443aefc48aeee64883077901adbd62af9fc SHA512 cca0cf4b66fd676feedc8efb75e19379668fe567aa104d7305209da157faf8eb31f718d33fa62c25a44b6aaece4b1a105392163e3395f17b837002c347224f23
 DIST google-api-python-client-2.27.0.tar.gz 27434968 BLAKE2B 95575f70ec3a7cb71a252495c8daa74ee06fc5499c4b9febbb4f492db9d043e1a67d78bb7a5cafb64bf50697922b1b5f92cf8e5d023fab762cd4dc585507d139 SHA512 7486cb120ca726a7ba57e8629e6e369c49d1de4459986c1458d087fd1c01be2979ac0d30697d50adbb1ff67c0d262e68bb17c7f43e1148db62d04b7befe3af2f
 DIST google-api-python-client-2.28.0.tar.gz 27582046 BLAKE2B 84803c124bdda7d93a28b9690848ab2a41bcb1327feb26cb13c17b395f6fa57d86cb4ae01095966cf5423a821c49996931dde45f95d5f23fedc05e09f875de3a SHA512 d9cbec2ad600af281df2ad6db34d146a37b8248240357d7bc8a7c651d06029dc9dba2e408aa6b7f364e30ffd2b063926e67b184d90ff66f771974ca84979d8db
-EBUILD google-api-python-client-2.22.0.ebuild 1520 BLAKE2B c5a616793b25aa16ea7c56fee7e10dc489c9b6df073ad005f84c878f4be03f3aa2226dc81e1daadeb3bee337db1b786ac1afd300e24bb60ec50c208155933464 SHA512 4bb53282f81960a6dc2bb75a271d815113b01f3678e6fbb21760c2520069c6a5107fac50706a34bec4dac0ef94f6e1ae96cbd4872ac8eddbedc3b1ab3a570463
-EBUILD google-api-python-client-2.23.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.24.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.25.0.ebuild 1522 BLAKE2B 2da56279b64199e0994a76eb50db23cb405e33aadd7619d6ee7988b645eef855f113616a9d57c71b2b360e288264a0b1879aa145f0449f1a6bebc21be8679317 SHA512 f7588b4c9b3703f0d807c27ae5a116adbe0ec825c62de954f1f9b9cfe3cb12aaaa9c40854022d7fd4aca33496d62399375ac1a628b7bb33ba917f2f17ea5ee0b
-EBUILD google-api-python-client-2.26.1.ebuild 1400 BLAKE2B 5ba0ab24b524c6305db80e3900159cbf0ac529663d4af6569d7111499b788c609f027c6891ce0822e0e1d51a7b022a8890bd5c74198c8c2209c78c66f9320766 SHA512 18088e801ccf750e42fe7eb4883a6f78eecc3f7903284d3646be202224622537349890c553be402ca8d8a10b0478f215664cb2f3427c652c0931b97d90389439
-EBUILD google-api-python-client-2.27.0.ebuild 1400 BLAKE2B 102f93bec9ce5116f997b0d5715756c1e104f82e7c9730e7bc49508d8eae06de12db48b03792ba6ab08303f010e29450a734ac7e5aa0872133c231b68630d5b1 SHA512 3ab76babc29ebb14ae567701ecf4aaba0022eb47410a78a7e418e4be75247e975811b491c87b4c45f3019eb19bad7cfa7b4b066bd3535201aa387d6ed29622c6
+DIST google-api-python-client-2.29.0.tar.gz 27697101 BLAKE2B e8c9ea3e6a0ff89dce9baef9328dd6a424b096cafe00504f28b516c753c5e9a861fe472edd3e980861c244b0642589cddf537f9a0a37ec9e089ea533b8b5d22c SHA512 c842c16496349fff2ba9522fc7144342024fcb056a79c50350c9fdd01a44f843aaaf5c7f8058595029815c0b9d4d7014ea41d28647dae6780a4dc9ee1bcddad2
+EBUILD google-api-python-client-2.27.0.ebuild 1398 BLAKE2B 6b4c852a3bcd0b67420cebd77914fcd221f853390fc49edeecc2abf94055e844f7274eb4d47158bcc00807d809c0160baf6236319ee821d6a11e38110b315805 SHA512 6e7a3e3d8a9aedfe6e5ed1bdc0945143fbc88e351a1b77d070056693989420497798806fb07837daaf702165535b17ec63677f56a2a51967378c5e6b33385457
 EBUILD google-api-python-client-2.28.0.ebuild 1400 BLAKE2B 102f93bec9ce5116f997b0d5715756c1e104f82e7c9730e7bc49508d8eae06de12db48b03792ba6ab08303f010e29450a734ac7e5aa0872133c231b68630d5b1 SHA512 3ab76babc29ebb14ae567701ecf4aaba0022eb47410a78a7e418e4be75247e975811b491c87b4c45f3019eb19bad7cfa7b4b066bd3535201aa387d6ed29622c6
+EBUILD google-api-python-client-2.29.0.ebuild 1498 BLAKE2B 3afedee17c9b16cbb6c52384f9cb55700a158fdd8781368ddf7980aa003cf557b57ca9e7b4cf44bbedf3602920fd3df3b786fad1cd05ba041f4456a9c18890e5 SHA512 43168b197643e63909a2c3c265cdd4128dcdf810f3114f56b40bfbc504870ea6045d863fd24949a520a3295172486d48ef0c089518c033142fe553184647379b
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
deleted file mode 100644
index d5db76b1bdc7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.22.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=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.35.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-api-python-client/google-api-python-client-2.23.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.23.0.ebuild
deleted file mode 100644
index 2bf8009bdc63..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.23.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=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.35.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-api-python-client/google-api-python-client-2.24.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.24.0.ebuild
deleted file mode 100644
index 2bf8009bdc63..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.24.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=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.35.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-api-python-client/google-api-python-client-2.25.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.25.0.ebuild
deleted file mode 100644
index 2bf8009bdc63..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.25.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=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.35.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-api-python-client/google-api-python-client-2.27.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
index 274177292963..1f9e418e28c2 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.27.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.26.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.29.0.ebuild
index 109aa7546326..e908ee3e3cc5 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.26.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.29.0.ebuild
@@ -21,10 +21,13 @@ RDEPEND="
 	>=dev-python/google-auth-1.35.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}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
 	"
+# grpcio support is broken if grpcio-status is not installed,
+# and we do not package the latter
 BDEPEND="
 	test? (
+		!!dev-python/grpcio
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
@@ -34,12 +37,12 @@ BDEPEND="
 distutils_enable_tests --install pytest
 
 python_test() {
-	local deselect=(
+	local EPYTEST_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 }
+	epytest tests
 }
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4804f85fe389..8d3276f24a4f 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,7 @@
-DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
-DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
-DIST google-auth-2.2.1.tar.gz 183909 BLAKE2B 4c18f332f068573567af5100828b3902db17e46c47087569386ad3b012e45ecb841709376fae7f14920e3dfdb0124b9fd002b670b565b9c641dc9ff4ef5cc507 SHA512 245e6b8d27ff49e47093dc2f50e97a57031c93090900b5578a91ab335560b7fec1aced1faf822826263a00dfaf282eb147a4e389c13546f2e34d09f1ef1ca285
 DIST google-auth-2.3.0.tar.gz 184993 BLAKE2B ac1392ca61e092e3e53c9e936e2d0bd11aeb8f33cace2458e80055734a96a05294335a9273acfcc3f385f423ed537d544404e41599cb6a75b21a10998fd72562 SHA512 cf0040d238880ea4bbad64f0a47311f2ed3922a7301a0d5287319b39ea8e76dca66dc78fd860cc12386b078bd2147a1cba01de97381420ef94cc44fca0c90ad1
 DIST google-auth-2.3.2.tar.gz 186112 BLAKE2B df2321252984ea43def8ec703590d153ecbd144f385a4915ce8f52e4cb71d66e31929f95a1ac783c4c4436a454b81a71d13517d38454892203c8ef19dbd80822 SHA512 1a7c828ecf529e8e64f946a5ee1923bed1544d4828b00449d027b0898af47e99b90be1a490b60e19a133fb59397f8860265306cd3dbaa8600bef823da1e4a215
-EBUILD google-auth-2.1.0.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
-EBUILD google-auth-2.2.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.2.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.3.0.ebuild 1511 BLAKE2B dd2d44fef1ae00bc8024c4728a5de48dbeb2e69ebeece7e17b64414808a32b26aef1c9ce947e18027e5c522c69ccbd51c834b6077812a679db4ea3f42f1b1b2f SHA512 efb97e825bbf48719194d35750600f72689fb2c9ea00d6f8cf1aa231ec32b30c67df4b9575942e6a8470c52b90e5e2fa5c507e9a0009cc572e2504f19239c0ed
+DIST google-auth-2.3.3.tar.gz 186600 BLAKE2B 52b1269b88d27fafafcb053219c93c7f180cac11cdf32b140531553dda547d02087b0418d44edc6497eb37793859d86d4beaad1a7a128c86839202785584c9ab SHA512 3ab6d97e71988ef5e338e0a643545f8fa504f5ea04f4176afd9417ecf0e9a3fa45333f0c2c7ea5bf32423df32c48ec59ac9d16ef8bfc35a1aa4c0fcc114fef63
+EBUILD google-auth-2.3.0.ebuild 1509 BLAKE2B fbff7143162485d0246563df76ae32f66ff717780f42964e4aedaa09c0028fcd968d3301dc6bd42b8fa308326d77ebe3212f0dbb90cf97692993518e325609d8 SHA512 14a478f56a307c9241842226e157112ef56114990f8e5eb352b342bbf854c6ca4a9e74313398592fbdfd0e1ccf2e75f3473adbab4c11a0d388b83dde7dda67d2
 EBUILD google-auth-2.3.2.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
+EBUILD google-auth-2.3.3.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.1.0.ebuild b/dev-python/google-auth/google-auth-2.1.0.ebuild
deleted file mode 100644
index 20d8750d0310..000000000000
--- a/dev-python/google-auth/google-auth-2.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/cachetools-2.0.0[${PYTHON_USEDEP}]
-	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}]
-	"
-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/google-auth/google-auth-2.2.1.ebuild b/dev-python/google-auth/google-auth-2.2.1.ebuild
deleted file mode 100644
index cd44f928efdd..000000000000
--- a/dev-python/google-auth/google-auth-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/cachetools-2.0.0[${PYTHON_USEDEP}]
-	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}]
-	"
-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/google-auth/google-auth-2.3.0.ebuild b/dev-python/google-auth/google-auth-2.3.0.ebuild
index a0d95fea9961..986bf858869a 100644
--- a/dev-python/google-auth/google-auth-2.3.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.2.0.ebuild b/dev-python/google-auth/google-auth-2.3.3.ebuild
index cd44f928efdd..01d1b603755a 100644
--- a/dev-python/google-auth/google-auth-2.2.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	>=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[${PYTHON_USEDEP}]
 	"
 BDEPEND="
 	test? (
@@ -33,7 +34,6 @@ BDEPEND="
 		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}]
@@ -44,6 +44,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index ab2165e4e87c..46f0d0fd8fe7 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,3 @@
-DIST greenlet-1.1.0.tar.gz 85043 BLAKE2B d9f5eccfe2dda528e5bc90bdc9c3992517b42c7d5f9d5549590b8f94003f715921585fa01219eea0348d6204b0109c4e342657fdf8150f09cabd2d6179e6e9f2 SHA512 13547917860d9a19f2fab519380121805d8f7801ad47b1584003833a5de66eb703373c71e67b32f13b770d429bcee6856b35bc6fc8afb7be598c2bf509bede03
 DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
-EBUILD greenlet-1.1.0.ebuild 622 BLAKE2B aab3a554321ef71ee14581f7bbb1a1557785a652e9a3cfdf9d63c4c7df02a8c54a67e70d3b40c3cde3a740e4205385a19fc2a19349536c0bc19174913d51f7e1 SHA512 6ca8275677c0571c45f0205e3d910397240227aee3ae7058173d4c808905753b9917ee15371d0fcc1b277c76dedc4bc22d0eb96013c5b1f253e54dfb4be82a1d
-EBUILD greenlet-1.1.2.ebuild 629 BLAKE2B f37ade8d44c202331898c8b14d0614779ae8c52a02281264f97f09e09e1e45de1cf90d827dc03ffefcc2a3004c1ae0b2e0dc3d65ef4cb5a5672b669c68125ec3 SHA512 b5fa22fe7d1e3aa80083e3a3f81395fedc5a1b6912b3c9384e2dcd5d025e5b875f29b44dad0ab9e06086c9a1cf00dbb8a65a57dd561a510b3b817b1a71fdc148
+EBUILD greenlet-1.1.2.ebuild 622 BLAKE2B 700de911f44dcd2dd9eafb6b31841cf2bf529fa47737aacb24af4295b44ef6f5929f267fe4b71ade161a58f5ade977bd51d02ca5d17d9f2c8470e8eb7dd77346 SHA512 c92e6891472c4fd09c30f9aa8411e011fd31e4fcc22505bf434122d5aff9bf3a43183dd8ff46f9f1fad064ed9ea18607f6179ba8b9b10144fb366e7f1e022c09
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
deleted file mode 100644
index 072fc6423b4c..000000000000
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenlet/greenlet-1.1.2.ebuild b/dev-python/greenlet/greenlet-1.1.2.ebuild
index c9476e6d0222..038e44263611 100644
--- a/dev-python/greenlet/greenlet-1.1.2.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.2.ebuild
@@ -14,7 +14,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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 0d17e62783cc..e7ae4e13ac1d 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,4 +1,6 @@
+AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee267b0e5355093c872e582346130c3107e6cd109b8a266c68b79c00440f550f3a73c3c1c12d3cb3cd3c61fd22289532d5349 SHA512 7ad798620f7cfd62aad7d73568410f04001edd70ea2a3cfe26242b309f4dafb44dd78e9de399a050e12164ebbe8160ed324f594ec4d1cf44b5a7b5b70d27d9b3
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
 EBUILD hiredis-2.0.0-r1.ebuild 766 BLAKE2B 8f2490a173d7a9075c1e8dce3568c6ed2bc8bd9a7e32629374f487a93404dfec45ce1cdca0f82838279359e18161d7db405cd9bc9783b66432f3073d8311d8ff SHA512 b067a121e0662e1eb7a96329ab1ae238c50246d7e913e2f921ad2497eaca56574de7dbcb417c31b2db424b3f84fdc2fd6ae0ec1d86d0d9b5ff15d8188c0143ec
+EBUILD hiredis-2.0.0-r2.ebuild 822 BLAKE2B 8e20a21a5de75e3558ed6174f010244c914363c7c61607163f3ddfbe9abfa4ea8afb8118b1cd6d73dea954bdbda805ef66a551f623a2c38b0c33564d06a408ec SHA512 b244f40e2615331ec60d57e220e7814eca6a51354814155dde1dd56b9644b4b7092938d0cd2b2a209f99d5fb20056899bd5dbe8d98c80f92865581e457bdc8b7
 MISC metadata.xml 579 BLAKE2B a625bee5874cd1b4944638094c6f13b7c1aa6c55333e3d0de088e8c2e85c43f212c78ea495470d78e1f143bcd7f1be50c4bf16c616912fbacdcffb90e1cff992 SHA512 db00dee480df0e1c8c553e592c6ef5f931329247cc35842753dbd755a0d825cc6a14b67713fa133a6f3048326e039faede1fba290015f09df3e057ee3949f064
diff --git a/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch b/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch
new file mode 100644
index 000000000000..ad1bb80ac0de
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch
@@ -0,0 +1,36 @@
+--- a/vendor/hiredis/alloc.c
++++ b/vendor/hiredis/alloc.c
+@@ -68,6 +68,10 @@ void *hi_malloc(size_t size) {
+ }
+ 
+ void *hi_calloc(size_t nmemb, size_t size) {
++    /* Overflow check as the user can specify any arbitrary allocator */
++    if (SIZE_MAX / size < nmemb)
++        return NULL;
++
+     return hiredisAllocFns.callocFn(nmemb, size);
+ }
+ 
+diff --git a/alloc.h b/alloc.h
+index 34a05f4..771f9fe 100644
+--- a/vendor/hiredis/alloc.h
++++ b/vendor/hiredis/alloc.h
+@@ -32,6 +32,7 @@
+ #define HIREDIS_ALLOC_H
+ 
+ #include <stddef.h> /* for size_t */
++#include <stdint.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -59,6 +60,10 @@ static inline void *hi_malloc(size_t size) {
+ }
+ 
+ static inline void *hi_calloc(size_t nmemb, size_t size) {
++    /* Overflow check as the user can specify any arbitrary allocator */
++    if (SIZE_MAX / size < nmemb)
++        return NULL;
++
+     return hiredisAllocFns.callocFn(nmemb, size);
+ }
+ 
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..48e177fb23f1
--- /dev/null
+++ b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
@@ -0,0 +1,36 @@
+# 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="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2021-32765.patch
+)
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+	sed -i -e 's:description-file:description_file:' setup.cfg || die
+	default
+}
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" -m unittest -v reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e539ce51549c..6dc3563f3096 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-python-6.22.0.tar.gz 9166539 BLAKE2B 386c7fd4f9ff0d4d199f686f257
 DIST hypothesis-python-6.23.2.tar.gz 9167318 BLAKE2B 0a1ccf0235c64dd69705e48f67c132021898a024e8ae035d2ffc8a416c45443931ffff4a67a13f1c1ee7bbc2201e6f4ca5363568f0ed2ea4743ae46569e45ef1 SHA512 704b8d8c15e1fd510206c8d07f6a0f0bc81249bbc036978e4864e8ce234e35bab89069b0d5a0e958c57fe31fdb63fcc454502ac633d6fd986aaea9841383f36b
 DIST hypothesis-python-6.23.4.tar.gz 9167755 BLAKE2B c953e54abf704f1e4d8ab74abb046c19a9bd7e1f32ae7a17133d2b042ce5a06063999249284e0afa2d650575b69bca646e52bfdb3648ac2972077f4d74b82557 SHA512 9d178545bb6c6cb8ecebbaeefea16b5d7390691536b724742b94a94d881ccc4b2f1b82f865fd7860b0f9b688c19aa60929aabf2e7ba8ce255ee5bbf79ed873ab
 DIST hypothesis-python-6.24.0.tar.gz 9168076 BLAKE2B 550b42c39712f47c74d935b24a5bba98a50ac38b839d94a487a655ce1938d382a30b443107deadaf2b97fb89ea8f53df5aaceaabf23e0f8e221a45120163cb91 SHA512 2bc815876a295b366c4b167e7e13bfe11683b0d0111263f6129ab0ef441151554298c43bf1caa4345eff2d7e9a11bd63450e7b1bf00f8ece4dd49b3f4469defa
+DIST hypothesis-python-6.24.1.tar.gz 9168432 BLAKE2B 4d8e548cd001cd279076990034716692983b799e81063e377fa3f5636671d2bceba718f7ba05d97843968610d2c0d444ad7bb00a774f59aad9b1f17210222001 SHA512 ae321f386be0b9e5b79630b98fc14a24ba3c9285ec9bab880c52fe462800a952bfff07a398199080a59c6e7c32f0700a6f1f36692bb6f3d332cb817441ff5d6f
 EBUILD hypothesis-6.22.0.ebuild 1754 BLAKE2B afe7c86d0907a4c0500ff94249349431c435567753fba197261ce9bceedb03da6ecab286780b66ac4c83361528fe93ff4422c8615bbc6ef20faf289efaa3dcf6 SHA512 b3199308c4981d523366fb48c5d6bee4e1d0eeaa3e9854627cdd23b5d81d22ba4bde02b2669368a5d8bbcccdfb3941aa692c78b18524e907d70c24470e284385
 EBUILD hypothesis-6.23.2.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.23.4.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 EBUILD hypothesis-6.24.0.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
+EBUILD hypothesis-6.24.1.ebuild 1762 BLAKE2B 4315e80027b7bbb4bfd203fd8f7b500e256d14bcee1bb048b042749fa675c497b9f9ae1a4a93d4a9567c3078bc40e8e5aafef57dfbd5d4c51cc29dfa9928875c SHA512 dec6b4c5a4297f1a49f70d0e2d5c5e17f64685346b9500570b63dba5be34553de9bfdac433e7113e282d72d51b16ad59a08030db021de258ab38698be17576ac
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.24.1.ebuild b/dev-python/hypothesis/hypothesis-6.24.1.ebuild
new file mode 100644
index 000000000000..119bf66a0917
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.24.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~m68k ~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/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 \
+		-p no:pytest-describe \
+		-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/identify/Manifest b/dev-python/identify/Manifest
index 08a497511af3..22cddebd890b 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -2,8 +2,12 @@ DIST identify-2.2.14.tar.gz 101144 BLAKE2B 9a23595173ab2ebfcbbcfc503e9750ef1e9c0
 DIST identify-2.2.15.tar.gz 101146 BLAKE2B 1855598314c191a9e4d2f73c2c7a424957a76177df1daf32b4c7de6ddbda4439fac0860ed105e4a2ca4aef0555843157499e9840cbbccf42cf728aef93b13607 SHA512 5b85c07603381174fb4265ad8fc411645dc0cecb68b3fc9b2afa7111f18eae7cf39d5cf1000eda8ded256f441a4bf05d9ded11f31c9aa80f55efaf2dc6745697
 DIST identify-2.3.0.tar.gz 101179 BLAKE2B d51911a69a9845d136c0b5ce50a3ed94c50d80d6d8c89a2c823f1a85cafef373dab68716c5b38907bc920ca5f4d67ef969d598539e59e32bc2c36a0427d37765 SHA512 356e3c983273a771c06863a63fb53bdca9e3df3a50382f47da0d5ef7cee1b83d9279eb0d1e6c28409b2550f6e16eb793901147983582d792cdd39bb4d4c6e9f1
 DIST identify-2.3.1.tar.gz 101199 BLAKE2B e2d37c10e0190b2f876011aec57ce2aa7b4e227e138e1ff78666694516f8f9c2b0d104200daaf4e634f9774bceff2c97d72a77b7918b5e4a943ad5f4d6a1da3f SHA512 6102418672ec2f038b884ed55956fdccd1ff3a2f4da0da0d8b65f93237456314de984be32d2f20fe6754a7dea9f1887628c93a58f42378466bb914a9dde4c0db
+DIST identify-2.3.2.tar.gz 101216 BLAKE2B 2640851bec44c7967b8874d38ac1e4800333465380805dbe88895241cd1fe3537b97be188f1d0e22e4fd8a3f6df87c7410ddc0b605a7953b6d80813628838748 SHA512 9285396817d081b3a598080ac856568db1ec97a34d1859da8b697431c20bc0aff2f9411b85e97549a37c390a7456424ee5fd287edfa0881cccda1de076666dae
+DIST identify-2.3.3.tar.gz 101227 BLAKE2B df5a99e70aee5ed17bffece82e81c98f0a09496b14eacb6c068cf930beccf7905610e6b0240c8f385266ab12c77db6ee482f26b05252166ab22e0e7089f5cf7f SHA512 ed325dc7b1692add1c72aeb5479bba11d36a70dbdbf59f3ce0080ff9d8fab6ea3c8094050bd8ed3ef0bb4dd2344eacdfcdb3f4c907ef5a51163a68d2ee59812e
 EBUILD identify-2.2.14.ebuild 522 BLAKE2B 8de988dc140b50cfcd1785f6f44c56aa850f442f96b2461c7379d211c26c266ac81eec594634ce9ec21c034f437d0c7aca68e54849fb311030d0d5d77fddb8aa SHA512 a6cb99f66cae025edc98afffb8158145597943415210704ea7638275a331b448bc0018e6f2ff1d0598acb50da1a33edfd617381801f6cbbcc9d186103cd3fb42
 EBUILD identify-2.2.15.ebuild 521 BLAKE2B 03ec49bec8d2f3740f3d21462b25e37817188caaf4d12edd529c7be6774923ae7fd97cf70cb32ec1605396867dec0c17e9a89b0ae220fc703c587f7b23637552 SHA512 ecc7bfb0103fddd0f2dd2b4f6657b0f4201b4a8ea545e743242543a8a9ea7f17e09a56ccdca453ebb8c4b1e17b594de0f75f0e41d8a261ac6c5df97f6eab8418
 EBUILD identify-2.3.0.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 EBUILD identify-2.3.1.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.3.2.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
+EBUILD identify-2.3.3.ebuild 523 BLAKE2B 5d84c4a34fa413d2d8b0949d1565442c7e0bbf48dea7d088c23a8e2ef9cac449704115b293a114da1f25e48a4553f81336c28429e18e1e96be12e36f9f9a35b1 SHA512 0bdae8084a8bf3678f911e35fcaa620faa75f366bff3e9b04dc119f9ead31984deaa56dd866e426268a613dc56eac88e066b928539203b1e3375e24ab31ce57b
 MISC metadata.xml 477 BLAKE2B 068a0df0204ecc3f2ad9729c0a6b66b0895f94a08852453c4dcafeb784068857a4baaef55eaf0d9b742d4bfad98a2734b11f8647b52182b7ffaaa04656d8e457 SHA512 79798b3778c546a0105fa02b2cb0b682577ed630bfa7a5ff70a188441f6f847a59cf9179eb6284e7159127b180c990ed6265fdd88e78cecd00fff9a8a7461518
diff --git a/dev-python/identify/identify-2.3.2.ebuild b/dev-python/identify/identify-2.3.2.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.3.2.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.3.3.ebuild b/dev-python/identify/identify-2.3.3.ebuild
new file mode 100644
index 000000000000..c3b147be85a7
--- /dev/null
+++ b/dev-python/identify/identify-2.3.3.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 9c1255b7683d..285a760eb794 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
 DIST importlib_resources-5.2.3.tar.gz 30055 BLAKE2B 72d4ff3d5ac974e68063673af980d70644477e4cf7e1c56b0a8b4a69009abbb112867d6527310c2ec37b1a51e343283f8ee153728a1e94654cea7181d0b4f2df SHA512 97c4f99c184d82d198e75240bd262c18ec0496e07e8eeec2451da8c427500859a1b6677ab044d2e36e87f0c4da439757e13d00f8aa9955db17111487594852b6
 DIST importlib_resources-5.3.0.tar.gz 30784 BLAKE2B 876d9bdc1360eecc973f53d6d3397db5708dda1b0f30e5a10d372535f0831cc0fcdcc0b361412df8a1f4453f27315e6547096e14ec7bdbcd1d1af41778d5dd39 SHA512 ad5a0d5b72e8e49a158254d7146411a86bacda3d9019867bad92e8209dd924ae0928dfe46b574967975622d0809d4e1693dab4b6bf8d78867b09cac8c424072c
+DIST importlib_resources-5.4.0.tar.gz 30554 BLAKE2B f5be47cb63813aea15f65d251115cf398f695041871fdf6e8885fee11d9a9d7a2fbfd07efd494bd7c91077f99ab871e06d45f49de9f7e501a1691601206bfb55 SHA512 9262c185bdf79fad0a11caabc5c5df836702a74e140a9f60ace857e3f6a60fdb091639b2fb7129b17bad5a46968f43dda7d176fe39af495370dd31f04891fb1b
 EBUILD importlib_resources-5.2.2.ebuild 815 BLAKE2B f0f037c3fa00210fe040e0e56e6a8acef484668462c04efca30c5294c001ebb024d3991834fd906b270248e8f0d838f3ac9b1603691b94d8f33fed9e5a1d7f5f SHA512 e0719c05e422fce67c1d7194719fb3b6f24a0d86aa64d759016019eb17517bec0768f182100fdbc519e43a351e41cb85494d2ed3ba47985fcbff1f3701f86e5c
 EBUILD importlib_resources-5.2.3.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
 EBUILD importlib_resources-5.3.0.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.4.0.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.4.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.4.0.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 1aaf909a2bbd..2c0110113bef 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.26.0.tar.gz 5147847 BLAKE2B c0cb45550387e47bba6ea67656bbb4561a2250bf9c39b4560b26a8a9e380061f79c5fa663f90df166af1fa49811cb59953fb367b2fea5f07d44ba3f9dae3de44 SHA512 142ff8ebddd61640e6ebff01d16b1310b6370643aa8cf4c7fd076872ad342949a1778c5ad74eccbafdc6b4d31a1849e096d75a28eafc555d629948db523b4776
 DIST ipython-7.28.0.tar.gz 5150515 BLAKE2B e69b2ca9b788d8bcc12fb1b82c2e3f198ba4cf1918c8d8d30aea9a1ee3c7cea99ba3ade8ac7171466f1ffc8771dafcf5980766ecca7b985e07890e229cd1575d SHA512 227645ab2cc698f6f7141bb3712b254d75beaf3f227065530f25f988ac76b5a741752ddfa6bb2816b625eaa4972d434f9e73dbe465654e4efc5420b5d80650cb
 DIST ipython-7.29.0.tar.gz 5151803 BLAKE2B 685bb7df39513fe262c07dbb10de4d795860bf2958c626d030bfa3e18052a98d7c9d5f0f96c0c9a5d4b9fdcfab09c492457d409f05ce522f607456ff3a4b35fd SHA512 b8e9cc07a0f77bbfaa88183546ed9d7e4a4c37e7c1704b1a3716d605a04339f986c7767f3c0920a94039eda99e75afb62a7bb43fa0cde6699a902f3b8f83a398
-EBUILD ipython-7.26.0.ebuild 4214 BLAKE2B fb571e9314f3afdc33698227e21d070684666393f6ad0c63a7d094b3303574bd9e9929d7e5089952da2021ecf056f170f3aafdf054a7ee56512410efeef76ebf SHA512 69cdff9edce9e452ed99da47406591a1d8f485000a1c3fae9ec03fa10bb19b9d00b13d5f6478781a044b050f3a8b985369538511a11ea4632464da701f10465b
-EBUILD ipython-7.28.0.ebuild 4465 BLAKE2B 7d3389f0febcdc41f95b299ee8f8879a60a5388bbbaa4616d6e5a562cff671e3118220f46508e9872e005b7f465fbdd7ae82c468008db9ccc4cd093bc3ddc2d7 SHA512 58a51548a7d45ceca17581bbde4586af37c3f851ccaafe2ea90b862ee225cfffadb9714b34f35a88447614528e11f26c1c4e86599aeb03be49aa2ee225673599
+EBUILD ipython-7.28.0.ebuild 4459 BLAKE2B adca49384ff66342ea4ecb53b37f2e311a1fff15121a6c3891648e17496438d7ceca21b8489c9b02193c8f67840d5cf4a3e107c716d7322b0346aef33b059359 SHA512 0866b078776afe512ddd86e23bf903b1ecfef8634c6677891f3568bdb8f9446f41b2310a178eb725fb7eb29b5e2aea2d6ff0f7ca1113348f95271b9ff8e7341e
 EBUILD ipython-7.29.0.ebuild 4465 BLAKE2B 7d3389f0febcdc41f95b299ee8f8879a60a5388bbbaa4616d6e5a562cff671e3118220f46508e9872e005b7f465fbdd7ae82c468008db9ccc4cd093bc3ddc2d7 SHA512 58a51548a7d45ceca17581bbde4586af37c3f851ccaafe2ea90b862ee225cfffadb9714b34f35a88447614528e11f26c1c4e86599aeb03be49aa2ee225673599
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.26.0.ebuild b/dev-python/ipython/ipython-7.26.0.ebuild
deleted file mode 100644
index bfc4ba8b51bc..000000000000
--- a/dev-python/ipython/ipython-7.26.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
-	)
-	virtx epytest ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.28.0.ebuild b/dev-python/ipython/ipython-7.28.0.ebuild
index c9a468dda532..b6380077a5d8 100644
--- a/dev-python/ipython/ipython-7.28.0.ebuild
+++ b/dev-python/ipython/ipython-7.28.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 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 3061ed778778..42f68c607b72 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.context-4.0.0.tar.gz 11257 BLAKE2B 38faeb6036ebd2fc6cea9f29dc7fbd89b0ea60819e280e36c8c4f0f90e9ba2552524bfc0f3fc16601cd43276d19e166d9de4107ced885f88dea11efbe0a79913 SHA512 ec76e03d3d5a2148dd49159b303ee278501b9744d3e4d096d6aca516658fb04da020d1cbb1c8eb3dcb58097266e0419883d23e4064c295ced3846540177e57ee
+DIST jaraco.context-4.1.1.tar.gz 7615 BLAKE2B 5734da1c55420c45520aea57398e66a3d880a555c76650bcaf3427911a7814be92f4a879219c8ccf3c808fdf00d3a77b76e68a93ef3fdad4ea50550188118317 SHA512 e01d3bd7b4eb712d00aba3fc40a78a5484141fcacf5bc772287a35ac81eca4c9744963679daadf6a170cf2ec26234243e602c89f71833fe84175ac39fb401453
 EBUILD jaraco-context-4.0.0.ebuild 585 BLAKE2B f746d10c879f5623f5734c4ba39ab8f015b63d835b8e796502409bdf33fdc9cffb551b99e0239b984961dced3e35672e11c9eb7484fd8c939714723e442f2ef6 SHA512 fbeb77816e53d4f60a81cc9cc612725b39bb85fa6169685225bde609b5f133a83b4a7ce55cb714a9460d8662f61c4ace5177b72ffe081e10b4c4e1e286c539e4
+EBUILD jaraco-context-4.1.1.ebuild 589 BLAKE2B 6da2a8de69e54ca84657e417a5037681dc3f8194fa9ba2f4ad0ae3b9a18dbe040c4966c7851d85b6f5a4c459fddd07109ccf0c61e397ba44fddb090e8d63993f SHA512 3041f573bf54ea9a1f75d80a1e8638a66e2a290b79154430044a129825e2e1d5c92e5e5c7ad54a64fbe4ef742d0bee20b88aab287c3234b4f91b8c4af64fb53c
 MISC metadata.xml 342 BLAKE2B 814e419c25d4719a2cd0ee3f8d9d5e82f594fcf1a88fc6547a7b9e0f893451be84b099b35d32536fee97c6ecf401e7b93749968ab4ec5e67d352e4ab9777ee34 SHA512 958abf9745fd7fc9896bad75cb4802b9056e023d854ec3539568ceccbbc4f246327ad794999d083ccac5addc98f56e1bd20e2d705a34c4bab3035ca04e93d63a
diff --git a/dev-python/jaraco-context/jaraco-context-4.1.1.ebuild b/dev-python/jaraco-context/jaraco-context-4.1.1.ebuild
new file mode 100644
index 000000000000..74789d5377ad
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-4.1.1.ebuild
@@ -0,0 +1,24 @@
+# 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_PN="${PN/-/.}"
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.context"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 2353f602bf64..4db5489e1b79 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.functools-3.3.0.tar.gz 17116 BLAKE2B 3e1bf63f72d67e55fdf5cfd8d2e12899b7862ebe6cf426be94154f479cf01a69f01b1af152a574c4fb93766b324b6050748464a17a26a27591396d59ed79cb38 SHA512 fc7c5a11a3411692066f4437d76ace7e8a00af2152256ea9f730254b577e74163342298d5b33d472c744cbad5dd316b56345d05aa93ef6f82bc92d6aadb2f2ec
+DIST jaraco.functools-3.4.0.tar.gz 13048 BLAKE2B 437d73c75326e0d94cf15b4dfe9e5c28e44e5016376371458505377b7420930ac880c1f02ab70d4e2d154b41273d108eec5727ccdf59aa19d5674f33aaa107c2 SHA512 ae15014e566b7f18e456d9da2d02b9508b9c5a00e24f24316c44ab65ad655b97942af0094c33d3be777cc5e743b975cde6e15e72f9a003365f9a0efaae4f6dac
 EBUILD jaraco-functools-3.3.0.ebuild 868 BLAKE2B 3945c3e9047f5bd53feb5096e7af043b26fb1ba256fc94dd8a6d4866e3bc89c7cb2baeedc4808497c33a4b06084b66bd6a16ed91df84c6cbfc51f095b7362444 SHA512 88af4b971ccbf636519c6bcf6ae75908bfb0031217ff2678cc520886f421d429f50d0eaa9f6db585f001905ae4b30afd38b150ae6890502ba3c5e001bf27bcbc
+EBUILD jaraco-functools-3.4.0.ebuild 875 BLAKE2B 846633493b7e8650dc447b67b038597cae349f5e0fe4932aff0f2652750368d0a4d4b95a5def4979509b3cf4c15e18774f204580cd237c389f25e6975ec61783 SHA512 4a4e1ad3c4b2acd9a8164a762e62c3e0d493a3b5f1454d01716359237f49be2b27189296d8965864bc048d5b8c962667352abccf03d94529429289b180a17528
 MISC metadata.xml 676 BLAKE2B b437d010c92db7c16013c9e2dbdb0071c793900189cdd0ec1918abc587ea5fcff10f36b5822e0912797fd2baf3aab5e8a25cf30ad8bb7f3e8e65608a52cd41cc SHA512 95fbff54e3f761dc323dd6c590ad093d301f5438db7a46c90be8a22ab59e1531ea1785317c764e98e278629ff8cd4db976ff1e25d00de46fe741c65ff655201d
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.4.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.4.0.ebuild
new file mode 100644
index 000000000000..cbd85a2ea2f4
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+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 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 52a03a465e40..4a94d53e59b2 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.5.1.tar.gz 11579 BLAKE2B 22753a39b839b575796952e12adf69a10a876d45240c5461f72afddb14d58bbc8396565fb094b3c314ab6d9fbadd7008a7dd66e788f54f17189a48c54b980f1a SHA512 468a2338b82c4352dba0ab40fb774329f115010fdf3633adb860297dffc64c54fb006f85e4d89580923c1e9136168bcf9fd689e33eebee32cd70382bb402debf
+DIST jaraco.text-3.6.0.tar.gz 11575 BLAKE2B 631eb6aa72e9dae7e2baaa896634658525cefa9033b5d8347ab4f2b6f654afb60770ffed0c9397d4ee3d16f81002ba89d383dc6b8899134c2e932cc814aa291a SHA512 74e6f199372b62ee767fd5f5829ab636d6d87c38998d93cb4ed7dddbe53db27e5c3caf45f36f7b5690b3c12367df0c93702fac59ee99ffcb03f53e70b8b18f96
 EBUILD jaraco-text-3.5.1.ebuild 780 BLAKE2B 16fece8b8f9315972ee059c68d8d220daa9a5422972e20d2323cd48fd8cdb09c45d1cad341ff15325e0c2bb70162b5c23d17b683211ae9f8e5d770a5b5fba0d9 SHA512 8ece2aebf2d333c4532df090a63a7e4c10aa91b6e49555785315f26b832dc759710b692d31fc2e4f3742c7f91003bfa095580629809e8690152030b4143dec8a
+EBUILD jaraco-text-3.6.0.ebuild 785 BLAKE2B 1a0a2c12e3fa66f261e9c441679889b73681f5f0e98098a88119cafd1b55a3129f398b06d7c2e5aed6bdb19ed41752808c3a062683be73346a386f19e0c95e18 SHA512 7d573b5904fa1b18df82bd4d1daa962907a343edda33953f81279d10f7b1bcd0cab8074f3678f64cef64bb8204f9a815b45e0e5ff12acdec4c2d7b7cedd50f98
 MISC metadata.xml 656 BLAKE2B 0a887f3b936ada76caabedd24bcfc8d1d53047705761370fdf5c2cbe204b4d7c8449813268e9a45b48409f713e038f5742db12029bb3974b703317e7c3eaa28c SHA512 c8dc08d4347fec9076d6c23899ccb6fadbeee43d64875d8ea727ce20c2c5429a2683d162d602b763ef740c8eeb213762b17b2c964132923a647b769e2372763c
diff --git a/dev-python/jaraco-text/jaraco-text-3.6.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.6.0.ebuild
new file mode 100644
index 000000000000..ba50f329f8ad
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.6.0.ebuild
@@ -0,0 +1,30 @@
+# 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_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index a9bd02ba575a..de61166f2a14 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,5 @@
 DIST kombu-5.1.0.tar.gz 416353 BLAKE2B 2c26aac0a8eda62475e2a9a859b2548046dfce0699a8dafce3cc6471ee3b82f82882a53903a86f69cf16f948e4d0e66f379479f7f1f46aca2bcbdd031ba87811 SHA512 62ef16e8e3fb592882b8060f29b95e7224ba635132ed688eece0c2d254e7f7fb525c778cac23f15495464c6dbcf84d7a1372fde6f55fcfe66677cf43d3e9d4de
+DIST kombu-5.2.0.tar.gz 419952 BLAKE2B 99065bc89152ce6b8646d74fd77eb162150313b30d911a6d3d58cefc279bf7539742cd259fad456925796e718f732d3a0243a3e3cca99d2cae5e5de575489359 SHA512 c5336e239c69cb584cca9dfca137f0bc27ee24d4a2f260d78d70e18925528cd97763a805eefb7270617aad499f9f9a66ed0eaa9acf418e1ae950727c01a84b6e
 EBUILD kombu-5.1.0.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
+EBUILD kombu-5.2.0.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.2.0.ebuild b/dev-python/kombu/kombu-5.2.0.ebuild
new file mode 100644
index 000000000000..22dee35e6bf5
--- /dev/null
+++ b/dev-python/kombu/kombu-5.2.0.ebuild
@@ -0,0 +1,77 @@
+# 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 optfeature
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/py-amqp-5.0.6[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/kazoo[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
+		dev-python/Pyro4[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_celery
+
+EPYTEST_IGNORE=(
+	# Unpackaged azure-servicebus
+	t/unit/transport/test_azureservicebus.py
+	# Unpackaged librabbitmq
+	t/unit/transport/test_librabbitmq.py
+	# Unpackaged python-consul
+	t/unit/transport/test_consul.py
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	t/unit/transport/test_etcd.py
+)
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
+	optfeature "Etcd backend" dev-python/python-etcd
+	optfeature "MongoDB backend" dev-python/pymongo
+	optfeature "Pyro 4 backend" dev-python/Pyro4
+	optfeature "Redis backend" dev-python/redis-py
+	optfeature "sqlalchemy backend" dev-python/sqlalchemy
+	optfeature "yaml backend" dev-python/pyyaml
+	optfeature "Zookeeper backend" dev-python/kazoo
+	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
+	optfeature "brotli compression" "app-arch/brotli[python]"
+	optfeature "zstd compression" dev-python/zstandard
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 8338bae5b4bd..5c95294ed94e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,7 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
 AUX lxml-4.6.3-tests-libxml2.patch 847 BLAKE2B b16ac9e8c4c796db814b02cbe3476b443ea33796d64fe6ee3993d2ab04906dcea46923d7b23fb7cc9c534b8a6dd286eb0e9ab446e9eae18d90aa33f6df35273b SHA512 2b851c835ccbc1be07a823d928d63ceaa78df59133f14519e4fb6c71529341464c65cad05c3f8c500574a321c0340e5b6e51a267e368674329649ed765072d9f
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
+DIST lxml-4.6.4.tar.gz 953275 BLAKE2B 7dae0fe0c92c937d823429b32ae952e501e193835892d40746aa35e48586df4e497865f246362ef10430cc9187cd54f98078b7edcc0fd9f421ac9d15994e7b2a SHA512 4e62b7c9ceec47f490136e86e9875aae3f3dccd0ee5e504f8128c62cdb111e00e64ee35678028438b87d32253fdeb8e1184d4017b56e06dfbc93cd0e8736101f
 EBUILD lxml-4.6.3-r1.ebuild 2768 BLAKE2B 43b98b0121a32725ceda3a2da800a32315259db23ca2c1cc6229efbac4b8f9e635c5ad9f4478348f06861346c275201acaf093a78c287d0d8cc70cf69136ca4c SHA512 3e988f71250c111d7e8ac4c44ec0591094eb916cbbb925ad2d8d1537a515f2a5ced448e3e7789f562e4ca0211385acc47b0fc801d13497090adf31d67dcf6d6c
+EBUILD lxml-4.6.4.ebuild 2651 BLAKE2B 9dc358eeb59595fc850c267abb6edeab9d85b68224ae56e82f58ea17a5665fb8bf57e9243bbf2e0914149b5b03b51d2ccaeb8ec1f1c27c95e03855a8a5c4d3ab SHA512 e409480ff66bb1173bd96b1148c3b4d50c3c88db689e3eac098e7159ac922e6d01c018e4dc437a7d73c9eafe9d8b96ad7660187905a8b60d8441ac428a93dfcc
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.6.4.ebuild b/dev-python/lxml/lxml-4.6.4.ebuild
new file mode 100644
index 000000000000..5669cfb3cd0a
--- /dev/null
+++ b/dev-python/lxml/lxml-4.6.4.ebuild
@@ -0,0 +1,97 @@
+# 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 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.12-r2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index cdffe550ec31..e6f601513266 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -8,5 +8,5 @@ DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad04
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
 EBUILD miniupnpc-2.2.1.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
 EBUILD miniupnpc-2.2.2.ebuild 905 BLAKE2B b062db8e22fac0c6a8f8f9f5785860bdb8fc8102902828c41144d140643e98466f966223fe5c8c2ec58be0143a0e9203d5d1f983c497408287325e76d738efb8 SHA512 4fceee78ba6e8bd03f6a27c83ddc4ec877112fb4e66ecd88f22839641e30bd46551c454600edb9e90cd0402361e5de4844249969fbf46b4f6cd96ff321b7e0f8
-EBUILD miniupnpc-2.2.3.ebuild 903 BLAKE2B 35ba634549aeac4dc665715d18cefcd1d77c5855909e583d4924621af98f0c6e0becc3285410f06f34723dd8b4acc57b35e4d6b66b3a7292909f7f1ec954d768 SHA512 21017a01191e3c0f8a198dce8a5ffbd22e1427ddcde6e9afbdc279f6bdf936e2a9bbecee9c8597a5121cfc931b22d34307dd2ee821375dd05d1f75737170002c
+EBUILD miniupnpc-2.2.3.ebuild 900 BLAKE2B f485cbbbde53e397cb545afc5a98993f893c4127d1b148aa565490abe3179f094d961e666d7ae1249554a85d6d21135c6650ce36d9c7582961d98b6860fa8502 SHA512 4137f08eb911b1b9d30240779c3a0346d3896beb8d6ac84509bfdc56f51a82ac6a8a338d87176845daab627bf318fd253eaa23022b5bc89ee10e62a0d84f4b7b
 MISC metadata.xml 320 BLAKE2B ad0563e313308b3f4e7449b7010821c45c720f90fa9dbcb72ddd82707281ccff98d0c9ed60083d3b3e6c650a2d4f57c83fc0194758e1fdbe7ea73fa0fd6f850a SHA512 72ea7bf08fc1d4a32c473d8e62a368e9e79b52814a4d40a3f0be85bc208e2a057895c8db55196c232564e4a496b5e2b19a1206e967450b715f059219e13c53f7
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
index 1c9a9048f4ad..9775eb42bd47 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 9c364b8ebe77..12f0ea48197f 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -3,6 +3,7 @@ DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d6
 DIST moto-2.2.0.tar.gz 1650655 BLAKE2B 9969de2fb323b2deb272eb47727884054a35827a5db382f83a4177cf6cac5339f89164d05c288a977bc1895a204d13d02069e8b37880ea3d04374f6ed4d6be47 SHA512 7eabb515f94920af9b8f028afaaa51e27983f7bfd73f66c29fc191e2f3dd3e8939ddac67de0127c67c35cbc17c3500a7390103b26c85056780c865aadeb5e1d9
 DIST moto-2.2.10.tar.gz 1894714 BLAKE2B aa1298ed0f067406db3fa4bee8246d8611b867ddd353e8cc80e2e961ebb3f2251f46fbe88b011e8064ef397c9a01b66bd5bf8f57ba915a53d6a939f0f3bc6fde SHA512 57c3c3660fa98bcab5a42c1b853ff73a4c00708f2342e3be57a2c099d7947100836dc15c2dd1aff9388149edf1fb54e8173457f89cfecf93957edb0f056f46b5
 DIST moto-2.2.11.tar.gz 1914270 BLAKE2B a216cb074ecba0d20c8a82c55726d7f936a780fa40ded2ccbc1f0eddd29d1f6c42a3e1da656008ffb0e2f6b14600145577946f4b2e800df12d71f775c073578c SHA512 e9226f8c585b66a5bb283605ba3a78a8778f4866c487d8090dcb97091b37532c7314c627832b9e2549741f07685224b62c3ce89dcb3dfa18f0bb5df40e80e024
+DIST moto-2.2.12.tar.gz 1941427 BLAKE2B d1f85e46f4072b0e1c48e727d9e99eec12001a5397e738a5ab2e776c59e273a887c72dc5e5fdf2e6b61028f4eddb4b6fa809288bf7b087502192139eae170127 SHA512 a55e96bfe1f1c4a4523be30040350fc2929fb4385a62cc5a96a8fb34febed54d442be0e169f836f813e956c9e388fce8b9c405c59ad023011f9c7c76362c3729
 DIST moto-2.2.2.tar.gz 1684678 BLAKE2B ebe1eb08c67ccdb8c484fa8fc75d7ce58750d94620f46b53268d6b6b0732d90160bf7b6837efa492f621e1c001d933f5d59d39c266d65bbb1852f315b3bc03d0 SHA512 a8b192637b701eda0e4a7b11e84f5251386de98590f1d7c33732d8bf12642b39b61f1d360ad39c3e1b0a645268139d9e330d48fbe7029b943094ad317cb45ff6
 DIST moto-2.2.3.tar.gz 1700636 BLAKE2B 926fe245ce457dd79eef6780fc0b984d2ff1cbe95807a3463f0d0080583af2ba356ccfcce22e60927737e1531ec7bc167c5f649e784b191ec821aa56df65277d SHA512 0b46229ae06db7cb2634df3f1b3b1a6b6fc983978a763e8879db0d9e209ccc6b96b28e8e2ee40f6e1a8e39b74d7a2430788126220e3a7dab5e8df217c3c8c005
 DIST moto-2.2.4.tar.gz 1724663 BLAKE2B 3feb39bec246a8157aa542c711289ab0ca257ec510835cd48aa732c3f07903db857971e3d024c1aef35b5a0b55b7c4ecef2b319824c1d76f0076ab8d2d75329e SHA512 8acd8a3156db71af35ad0ac6a5105a6b7739d8ca9881a2cb091637830bc6fbb10d8bf6adfd1a1091556f9269fad737b345d2bdf50e09b54201fe7438674dd906
@@ -14,6 +15,7 @@ EBUILD moto-2.0.5-r1.ebuild 2202 BLAKE2B 78dc6466511968204fcca5e6df49b3e696e5e6f
 EBUILD moto-2.2.0-r1.ebuild 2316 BLAKE2B c14f8aa340406517a880e87512ded8800579ea7a4f5e6d1cb50b1137f9c8d5d7831e037467542cdb6511d2883dff75b6dad62e8a7986f026f8e3ca1b8ef8132b SHA512 6da3993c5fc7496ea6adc0c558c286bf0ae0abebd0b2de7a8a4ffe01bd882521fafd504c0ba6b56bb87c53d655366719e90eaf0d38347a35cf95089f9207b701
 EBUILD moto-2.2.10.ebuild 3223 BLAKE2B eb1a1ff6b180bde4d14612a129c753bf4b39e7c6ef7e9f7ea73d1355c14f61d5001a3044ced50cbbd67292c4459e4c4526200b59e7f7c4f1c8065b247e345ae0 SHA512 ed57853561c41febe6935e065e59ecdf2eaddef785c73f2f186845a474b3e0c5459b9d0f996771569bf5613e2f1ad7378121d40a5f085b933444e95b1c9289aa
 EBUILD moto-2.2.11.ebuild 3223 BLAKE2B eb1a1ff6b180bde4d14612a129c753bf4b39e7c6ef7e9f7ea73d1355c14f61d5001a3044ced50cbbd67292c4459e4c4526200b59e7f7c4f1c8065b247e345ae0 SHA512 ed57853561c41febe6935e065e59ecdf2eaddef785c73f2f186845a474b3e0c5459b9d0f996771569bf5613e2f1ad7378121d40a5f085b933444e95b1c9289aa
+EBUILD moto-2.2.12.ebuild 3223 BLAKE2B eb1a1ff6b180bde4d14612a129c753bf4b39e7c6ef7e9f7ea73d1355c14f61d5001a3044ced50cbbd67292c4459e4c4526200b59e7f7c4f1c8065b247e345ae0 SHA512 ed57853561c41febe6935e065e59ecdf2eaddef785c73f2f186845a474b3e0c5459b9d0f996771569bf5613e2f1ad7378121d40a5f085b933444e95b1c9289aa
 EBUILD moto-2.2.2-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 EBUILD moto-2.2.3-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
 EBUILD moto-2.2.4-r1.ebuild 2333 BLAKE2B 66a0d332dba46c093fcc4b50a8dfc36a2b6ea6e2e6d8bd566262eecba9f4261f02408b54e54121bb6a7687782fc0d9c32077b031a413be92dda7c063da02fc8a SHA512 428f6b979986cdafca75494c51c96a1e21913f67c43d12e997a7d061160ceee35735a5cd52dcb6eb938964d76166c822e9cc3f70f5fddeafd1a313d20f7cf13d
diff --git a/dev-python/moto/moto-2.2.12.ebuild b/dev-python/moto/moto-2.2.12.ebuild
new file mode 100644
index 000000000000..90b1a6e1227e
--- /dev/null
+++ b/dev-python/moto/moto-2.2.12.ebuild
@@ -0,0 +1,85 @@
+# 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="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-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${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 EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# 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'
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 226aa584f021..4faedb3d6bc8 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,4 +1,4 @@
 AUX mypy-0.910-py3.10-tests.patch 1821 BLAKE2B fda18540f14b0fcba8d57bb7e072135f7415ecc39750424ee03fca835ab65491fb8966326e7f51b260b7f1b98e9bc408eb04df4a74e6007a5c1c72b28ed8a950 SHA512 64a6b2361260b0ce9bb22e706b2531af4ac2894191c92501274368d92beb159e53b4da6174e7f91ef4b2f7752936d86250b5fe8347beea1bdf223b7abda98414
 DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
-EBUILD mypy-0.910.ebuild 1927 BLAKE2B 5263ba882f6e4c59b0fc55b56aa8c6b8c2b2999c140ab9f670d6b0fef8219d43c2349d2d25db4aa17c2e07b39e45600550324040b30d8219dc2a9f49d2e0fcf1 SHA512 19ebe12888713bfe389e9a001cfee4dba576ac16b5877a2e34ec9b486143d9f8a24ecd8517a7975e6148c9af58c801772d741d0dfe908312fc44c69798a1217d
+EBUILD mypy-0.910-r1.ebuild 2059 BLAKE2B 8c5a6c6b6b520cde972545eefbd1cc648aed3c97fd7a0927d433bd6b31f7421452187b6379ad3f949a710950f6dd02751b17fdf1fc4954c8609313981bb10612 SHA512 da96d0d594a52013631c682313082c136276c714cd2f5c2a7b16b43dfdbcb511820f9740dc5b2afbbed68c72006900701212079c34dfda27920ca481b378bae0
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910-r1.ebuild
index e34ce4d6d954..99219a9f53b0 100644
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910-r1.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
+# Note: replace toml with tomli on next version bump
+# https://github.com/python/mypy/pull/10824
 RDEPEND="
 	!dev-util/stubgen
 	>=dev-python/psutil-4[${PYTHON_USEDEP}]
@@ -23,6 +25,7 @@ RDEPEND="
 	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
 	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
 	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 7ef7ab737c8d..fb25db4c3341 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,5 @@
 DIST netCDF4-1.5.7.tar.gz 763928 BLAKE2B e8e1c689747aa2697beeadf1c5164f1530fe76e0fb0d7affb94b506d1632c5242a406cdee72a2a683b75beda649f516ca06f5fd8fcddf5c567327d2420443721 SHA512 dfcc900e4d72f7b0c5c6a7fdaaab221735977306e86856e6d712e8a3c36ff22bd6210cbfb9819b9a26fde647c00aed5fcffe430459f9f2d5208a2cf8865ca853
+DIST netCDF4-1.5.8.tar.gz 767013 BLAKE2B 26e30b9ef74b6d1af07fadc5a0c93c1370c9e684b69345e18801c00691362766bce393b7fc8c0ccd4cd4b8e7ac448f3c69a1769e056c780c668c441cf0418b94 SHA512 b43e10356a60ecdd1aaa7585648242e9d610e042da8fd97f374617d7813cc9f35b4133a88ac4c10e921df12d5b2f2b1668af4fb69578b57b7c3d57a731579260
 EBUILD netcdf4-python-1.5.7.ebuild 1133 BLAKE2B f7c9011a87e4baf59fec3aba447fb5b8cc58cf60402fd8e5885e3259f160e773a4e3bdb9ea75ea2bd912c25dd5d6abf41e8bd2376f0d50b69b1481e93be1973c SHA512 8241c0e5fab38c4ab767fef8ce9381085fd7b28a091b1eda9e19cb5ff1f9248ac0ec66bbb3433e2e3bc2585c15f17f08c1d570394295487d728cef1ed0a9de2e
+EBUILD netcdf4-python-1.5.8.ebuild 1133 BLAKE2B ece242c3d5f3e64e23e9b9f1d2692684970fc9133fac2cf63a49dedc216fdfe48b3736e8c2132161f268becd0de3f57c3829cbf3c128be4311f0a90d1c6629b9 SHA512 af7017a7b7d5b459b6aeff6c3b2e525cd8fe04bbb89327e5d22a09c908dc629121c9ffd4c3a3dcf0c6b48240f81250e264252a31281d73e0bcddc8063ff44517
 MISC metadata.xml 681 BLAKE2B a34becf14c53b1f2b7568035f7ab8fa1cdce3e9fb39acf05c8f1151d432057376acde5904e5e63842742061488abe70b84a79d5fe20e2b2b72e160294624da80 SHA512 e6455e3f020069cc843044210c5567e458e784160b6b01d14b753bf29a17d1525a169b5cf4d432abf8d0394c5f0ffd1b14772fb6bdf5ef2913f2f866f08bb23c
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
new file mode 100644
index 000000000000..a818d058a960
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
@@ -0,0 +1,47 @@
+# 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 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+RDEPEND="${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		sci-libs/hdf5
+		sci-libs/netcdf[hdf5,tools]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f60c6fba9ce2..80f1c44929b5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -13,6 +13,6 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 DIST numpy-user-1.21.2.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.3.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.21.1-r1.ebuild 3726 BLAKE2B c81ef764b3a069469783d3c005894bab1b552e1d638f3bf21692e8b3116d54e71bc5d0260112467427a0fd5a4172db950dae4679706fc503115c14ee13f2c387 SHA512 4ea551537644b20d252e5056bf8704ce872af0bdbd058be17b27f65225c1f8264ede22a8e06c754786322970ccdb7246cfae41e3ddb76287bba77882738f800e
-EBUILD numpy-1.21.2-r1.ebuild 3722 BLAKE2B eb903b0e58fb7ceb475d969753c5491a693475aefc6f8e024e461513b6a748d3f2bfed9253ae11cb89d6670ef614f18089b464baf94ca342dc68450238682c2a SHA512 7ed5132bf063e30ed939be7998d381244970bbe7e9ed5f46b5af5fb469efc2aa4b0aa6d5db43efa77887c8b22c1943c668e1fe67d1a41cabff0f40e736825386
+EBUILD numpy-1.21.2-r1.ebuild 3721 BLAKE2B 28b9a634378c0173f255c3756975b32dd68fdf700f8f96846e1d7e727c31272b46d02f9dca3f76c852494dbce3b6f7296d035b85641333a4551b496b5252c0c8 SHA512 d3246d9bd9451f3d83f4025af22d11656ad0c7b37e9324d8d5acb4379e8aac0759a28299cf69f68e8b9211b464d33a0e986d40d32185fc1192720433598f8ea9
 EBUILD numpy-1.21.3-r1.ebuild 3716 BLAKE2B 2f47bf2dee1172e6aae91d8945ecc5067f795919c27465324b89b7d967f64c01a533cab1683259c92328682db055811b8f3da6f29c1ac4ed02d1ab05a2471c92 SHA512 5e0148cd7e35d81275e481890de5287f5b03fecac044e1eb46a73fbcedc95d7f12480433c977b66a3f83b57fd09eb506945efc3746b14e594fb643a405811ed9
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.21.2-r1.ebuild b/dev-python/numpy/numpy-1.21.2-r1.ebuild
index 0802501003f1..43d5088c7985 100644
--- a/dev-python/numpy/numpy-1.21.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.21.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 8cfb7959abb3..351b27d3fd26 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
-EBUILD opt-einsum-3.3.0.ebuild 465 BLAKE2B 16d3c745892adb8eb7da21d41d44fc54ddd090bc318e6060b767efd6909d43aecf9e472f48d821d42fbd3b58dc119178d9046405eda84e20a4fe7862c04423e4 SHA512 68a19c5000287d7bf522a2f380572151bff3a40855c370c7392ab9200a1a146094d167c81323e7415ee72e92485a0324434e219a59f33e3d09c7381ed38b9118
-MISC metadata.xml 471 BLAKE2B c913a584b406e39e234fee42b3c31cd1b51ab636617194f2d890c8c2c4a8fa32e3330d02b1cd954374006372aed343a183ca1e0194d7b51b71a79b388256c09c SHA512 bdb53f728b0e41a5954a479b93d130b8f280850238aa0025e652cdbaabba841459741a81ca071c9d495086dffb59da7bd251c7f6412b3300eaa938756b234777
+EBUILD opt-einsum-3.3.0.ebuild 488 BLAKE2B a5efe678127877b2eecb3f4c20280b786099d5a6553817157bf9615a84bc2ebbba54ce00ea86ff26c8351b5fcbaf3505f43ed3a21b31485ff81a21bba9f47524 SHA512 8a4772e19c7074f9f038b68bbade38c806ebf9e738c68530b3d24e8b6b2cd994a5135b78a160688cdafcfb4943edfd96a29324aa496f6b888d8670e0c898f2ae
+MISC metadata.xml 530 BLAKE2B 657b3a76e2d097512c79cdebe6f9eaf334c788b525e4c6f7a02ee90be68d36d19261972393a47739be4a8f405bbd07fa8678e9b84c8bdafb8c8808ccf4356ce8 SHA512 0301af745cbdad5ebfc9f87e07f5e0782cc80d6dcf449402757267e5894ecca087f169dd68f9e3aa33818fca3349e90ccd421c8e19edb00dcd8da67069aa044d
diff --git a/dev-python/opt-einsum/metadata.xml b/dev-python/opt-einsum/metadata.xml
index d9e9c889794a..551209959880 100644
--- a/dev-python/opt-einsum/metadata.xml
+++ b/dev-python/opt-einsum/metadata.xml
@@ -10,5 +10,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">opt-einsum</remote-id>
+		<remote-id type="github">dgasmith/opt_einsum</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index cbe9bf30b1bc..0c44a6ee477c 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
 HOMEPAGE="https://pypi.org/project/opt-einsum/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P/-/_}"
 
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 4b9d86c54b94..aede79c9dcbf 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,5 +1,5 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r1.ebuild 1117 BLAKE2B 27561a53bbbe4027f40ce7292053a8116856b7c52e3ae0327b2124f5c8538c26634f5f9d36939cd4d457aa2774842ebce9c6923270ac2c7ceda80c42c89275b1 SHA512 736feb3caf00e3353eb285343b847ffda4b6050f0ecdc017ea35ecab4f3e5ea1f1ada71ceb2b3b108a1798c042f1427f82c4850c37ae8236a9bb781504bb2252
+EBUILD os-client-config-2.1.0-r1.ebuild 1115 BLAKE2B b560fea260d8f9f43d7baa38156e3c4fd95711585033a7741dacf0b6768125cdf8efb260bb1c1196d26721d474c7368aba3fc56b953c789494a5da6dac0b3d55 SHA512 53cea0b5609a53189dc69c84f889b6b2a515f990005dda4bbe0e5c718c383cf28d5118f3a5a4b81fafb201cfce0a5200e66079ef3d069db1114c04561afaef21
 EBUILD os-client-config-2.1.0.ebuild 615 BLAKE2B d80ce7abcfcb821e60316c9315afc4fbd4dc0e9a5dba7a7f2e6cd6d57210438a5b302d207a471f37a77e779faa65896b7d94945df95adef761bacfdc801d86cd SHA512 2fca1dba72888c57ee232d41f3e216ba76d1aa68762a2898b4d640bb091ffa04cf77e12a102765f295380a710395e7d532bfe4b2c773657d1a36375d5e2a42a8
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
index 01f631cf7e9c..a0e09edb655b 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 4bb88da223ca..604907bc5925 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,3 @@
-DIST osc-lib-2.2.1.tar.gz 93855 BLAKE2B e6c863a13ea950a30a033e3877660a66ef60f66ef1e42efec39d207b1d492499136f9fb696e10001fe40b815e6cd4fd320a45acfd995504a4b7222b29951bf3c SHA512 8328541f319dfa2ffd0ac51aa89429b05fee0b160b2d236fd30cd9ce2d233c86963b744ce0a63bbb849e5d47af9868ca843db2ad79e9099bd22f59d553235d06
 DIST osc-lib-2.4.2.tar.gz 97648 BLAKE2B f5d34e4a13408f7eea8289c68f938ed47c8818fa9928da6b4d21c9b20f722360c155287e5167d445de18d2f00b8856390f995cd40812f967683d7c6e395e6d75 SHA512 4d6a0016fa17eba5c14c9db919719e6dea2ff13ca64ad6be6e0c3af88b8a1bf75ad2b47475efa3a7d262d73fcdb433afd372f573f00cb0854b5ac4c64ecab4bb
-EBUILD osc-lib-2.2.1.ebuild 991 BLAKE2B bc9b8ab0257eb747f2cb902864d13a71c5c08fc34e491fa8de790bff44ea40d26597c3ccc6ffe4bd0d9e6b6b07353635a7bd06f6eca1a9b30ac9f8e6f92f7dbe SHA512 fea0c2b89ab192e6ad89e3898c25bb6347a504d2e1eb33fe15a04e10cec7726c33d91d8cdec1dd6dc7a972bfc60bedce6d329816a30d02d1fc67dd34581b8b12
-EBUILD osc-lib-2.4.2.ebuild 1421 BLAKE2B be97cdacdacad8f51157ac8e55664f317f65a6eddaa05b19a54af9f84f138c37dda610b874f97ee7c10038e1190d64a2ca6827b463cee18106d14f6ba67c85df SHA512 b6ce2ee6d11b9b19857b3fdcfb7bc4fe1f243544885d46638351f67bf0044bf51a187145f52a2ee03fd1599baebee483fb526d2d46145500b88b47e5acac63b2
+EBUILD osc-lib-2.4.2.ebuild 1419 BLAKE2B aedec1303482876e329b0af712c7cf5e0e19bd59faec4c3b091ece4f0dea5dca511d014c5f272f82cc6ddb813c51f889fcf9e8a0f3520cbe9e52ec9cb558e915 SHA512 1db9adc58eff76ff3bcca43e64f2a1a2174363801b0a29614c7a91dec445106021e35ef004acc70f562a56fe4f02ad264123abe7016477c26c4197ed6484c1ed
 MISC metadata.xml 729 BLAKE2B 176bf470c3c3bbe5474967ab8123237244d26e811aa6ef251e88cfb3a6ac6b7cf3b96085dc670cf2053b700e2d98534867ec043e8c3f26249d4152f9ed70d4c0 SHA512 d75db35ea445e03ca7adbfffe78946519cbd7a44251735193fab8a0a1cc3c80cf60ffaeed5b9c2f9ea92bea2ee367271f6c068690625562c8c96341f38141d7e
diff --git a/dev-python/osc-lib/osc-lib-2.2.1.ebuild b/dev-python/osc-lib/osc-lib-2.2.1.ebuild
deleted file mode 100644
index 320012d3f9ca..000000000000
--- a/dev-python/osc-lib/osc-lib-2.2.1.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,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A package of common support modules for writing OSC plugins."
-HOMEPAGE="https://github.com/openstack/osc-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/osc-lib/osc-lib-2.4.2.ebuild b/dev-python/osc-lib/osc-lib-2.4.2.ebuild
index 817b4b139fae..c4a222dcc884 100644
--- a/dev-python/osc-lib/osc-lib-2.4.2.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index bd2eac2afd6b..cec07ec4a8b9 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.concurrency-4.4.1.tar.gz 58399 BLAKE2B ea28cdd53ae124fe458c0d901b305d99b7a5b5525835e6a04ca856177876fa6c6a1eff74842dcf260c78c205d95f353cd1b70f0cb6205e7bec841bae2d6ecd0d SHA512 1b7e6a2cb2e3ee0710f652489522c7a9e47a5292c46041f21a2ffe4c61a6bbae48b43e93507465013704b89778deec860da06fec32b4d3778e05cade9a6d39a1
 DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
 EBUILD oslo-concurrency-4.4.1.ebuild 942 BLAKE2B c3887289a90a3995134f1ed05fe94ee06ec680181dcb08f3c9f67286613ea019b8e213db6b04b824ce41def70dbdb588fa6722abfbbcde18cdcdb26776a4f599 SHA512 7da4b3cf75c8ce9b8f626790ccf1a4dce04b4f80290064ba69cc8e5179527dd8a382b65585a4471f751bdc3fe73df4c17a697a82d53f462ebd0be3f71fde9b9c
-EBUILD oslo-concurrency-4.5.0.ebuild 942 BLAKE2B c3887289a90a3995134f1ed05fe94ee06ec680181dcb08f3c9f67286613ea019b8e213db6b04b824ce41def70dbdb588fa6722abfbbcde18cdcdb26776a4f599 SHA512 7da4b3cf75c8ce9b8f626790ccf1a4dce04b4f80290064ba69cc8e5179527dd8a382b65585a4471f751bdc3fe73df4c17a697a82d53f462ebd0be3f71fde9b9c
+EBUILD oslo-concurrency-4.5.0.ebuild 940 BLAKE2B cc71c91c7ae4add15f40d41ae673b51ca281ff8c17c06b8df21399206c8f2c0631539fd55e37271114f986bf5abf9077b82b0070c63100d52a2e5c493a28635b SHA512 fffe0d0e00818dfc76cd6d8d7c2b7c2a69bf2033edeb4cd4ef5e84b032ba633686d1677c5b3a623ffc3a243f6e92ef9649deb9cde974bbc1257fb82ac3974a10
 MISC metadata.xml 539 BLAKE2B 243e21ae592bc6063b27bd2da21e7c9b7caf5127ecfa616dac4e36f34a74c0a8d221a83659596faaf5981451feb79553f4dfb94dbdd35916dafc32c5c6d6f279 SHA512 5d1bdc934197cf39dda7e8b14d573c7e401c4b18c09da4447e1ab0ec97fff0f24f90908819a0a3e03956bcdcd58af9beb95511346346c29d59eea8f752751a1b
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
index 6ee2324081d6..64ff45252ba2 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index dcc3130ee83a..0de13cd9134a 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,3 @@
-AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
 EBUILD owslib-0.25.0.ebuild 1008 BLAKE2B b37bc0a351127e7dbf203fb0c3c92f17e0acd7ef591fa70922e0ea1e249a5c2d1ff2d1b7359aec0e63a25a72ccdfdee7bdc62694ea084b772c2f29a96fd1ebff SHA512 288045a3f8840f587c06290839eb70d37b4716946ed55cc669759b3ce3f062c561a2a7fc8a7f3df61aea892acbdfbb293f5af9e1e1bc6325e0c54392aa753c58
 MISC metadata.xml 520 BLAKE2B 01705147ed084a8215d15016b6cc94b2fcdc926eff2755cf2d4c768197d0c39a30a8b0602d93bac7ec221e32c30b9280b37d5736f2f46342ad36e23c1b4a7c1c SHA512 c146cb483caacbde7966a95b899372261493543826cb20d638cd91e7cae245d60f1504bc53f485e35ca5d6c3f83780fc1da211c0838c604dafde27284dd8e40b
diff --git a/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch b/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
deleted file mode 100644
index 45bcb8b38d18..000000000000
--- a/dev-python/owslib/files/owslib-0.20.0-no-privacybreach.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix privacy breaches.
-Author: Johan Van de Wauw <johan@vandewauw.be>
-
---- a/docs/en/index.rst
-+++ b/docs/en/index.rst
-@@ -5,11 +5,7 @@ OWSLib |release| documentation
- .. toctree::
-    :maxdepth: 2
- 
--.. image:: https://www.openhub.net/p/owslib/widgets/project_partner_badge.gif
--   :width: 193px
--   :height: 33px
--   :alt: OWSLib
--   :target: https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge
-+`OpenHUB <https://www.openhub.net/p/owslib?ref=WidgetProjectPartnerBadge>`_
- 
- :Author: Tom Kralidis
- :Contact: tomkralidis at gmail.com
---- a/docs/_templates/layout.html
-+++ b/docs/_templates/layout.html
-@@ -3,20 +3,6 @@
- {%- block extrahead %}
- {{ super() }}
- 
--<script type="text/javascript">
--
--  var _gaq = _gaq || [];
--  _gaq.push(['_setAccount', 'UA-32866201-1']);
--  _gaq.push(['_trackPageview']);
--
--  (function() {
--    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
--    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
--    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
--  })();
--
--</script>
--
- {% endblock %}
- 
- {% block relbar1 %}
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index a1e7481c436e..6b56dc66f257 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -2,5 +2,5 @@ AUX patsy-0.5.1-py310.patch 1159 BLAKE2B 6b734bf60d74f071cae590658b613c36fef694d
 DIST patsy-0.5.1.tar.gz 397623 BLAKE2B b8861e8c8e223db5df616c378d5b1ce475a1b337d049723c1a4b01432d9e1569c4b6537dc467fbc1ba83dfc7cd999ad188008e387c446f2133f872393c9eb960 SHA512 aeb56411e68713ec75c0b5344890939f721c460d3c7643b9fd57d7c928421d21408b0f2963348edf27a025842989dbae6fd5cfccd3f9d9497d60a1dffe8d7bdc
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 EBUILD patsy-0.5.1.ebuild 666 BLAKE2B fabb9fbece6ba85b33400ba63d29b816cef022c92a20ff43aedbac68b7a9a8405c1aa2d79709aaa9f89144285247b7b9154f6be682514d51a36253aca32d402c SHA512 422dbad2220d6a500ab7aac725c99b8b9c6c6d4fb690a5a7adedd83b62f27292ca76f21bf6ff5dda97dd07005b2e79982b5c4a7653e20314627973e0cd80bced
-EBUILD patsy-0.5.2.ebuild 626 BLAKE2B 7b110d367ea1e319659f889b6292f08cc5b05b25ccd0645c54f605961fd0611508a20d7eb5a58f4b6536ac98d203790da722898b7e77ec30232d17fcc54c7a85 SHA512 aba6f4d0d064a902a7adbdbe8984955f8a1315df8ce8dfcce88c2cb1d3a4f2fca439a623bd12835022f710487a1fad1daad32b3fc023704147a1504213074852
+EBUILD patsy-0.5.2.ebuild 623 BLAKE2B 4c2f3e7c21d8c550b986411d0a5fed4b0c2bc9b840a12dd8fb2347a5fa99b0ed6aeb670dfaa223c50b15c82f1a41f85d5e60ec93e73aef43bdacb2c0c0a6b292 SHA512 7e1abd49d2ff0ae61bf19ea41eea4b9b3185ec05d43d24854ee3e4f7ffe848090c9d34d8b8d369871a5b8a3c746755e9f402d91f4f445617d538ad90d325624d
 MISC metadata.xml 569 BLAKE2B c7e5c84214d6630ee67fc867db27979aefae315267eb1689750506c5ab39189dfcc39bafac886ae3319a6a0417b68141eb60ef19c257fa4048ca8cdd0e4c1709 SHA512 ba4bd3cb646d50fa3388e3fa138f9dafa78e171e1be114c63f122ae982a27702a9319a953a697e7de3beca10d8a642ab35070017048bbee89c5e5d729fa70d57
diff --git a/dev-python/patsy/patsy-0.5.2.ebuild b/dev-python/patsy/patsy-0.5.2.ebuild
index 79ca7593449c..19860f28f602 100644
--- a/dev-python/patsy/patsy-0.5.2.ebuild
+++ b/dev-python/patsy/patsy-0.5.2.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 0d09834213cf..1b6452228c2e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,11 +1,5 @@
-DIST phonenumbers-8.12.31.tar.gz 2258495 BLAKE2B 7b08961cf50382857b5bdbeef640091967e3c14f3949c8975028fef4192c7776a2f7619c6fbe177f4b46de44de9103cc62ddd949f5e1c882f742ab2a80619cb9 SHA512 28b608a81a452638e25eaa1311e42384725c55cb8f438e9ab54006b8b8cebd0ae848449f1ab6758884113b3cecae21729c3b4d8e1bbab1120df0d82c9ebe7f04
-DIST phonenumbers-8.12.33.tar.gz 2268271 BLAKE2B bbf84efe22806357f03f647952a66d58538975a932b290ca8d3f83996868a2320aa0d18b0094167f6e38514cde800163eb2240c89e7a244c3b1596743b20b39f SHA512 d156a501c1950ecd98eaa0515dfa8c8d38ad470344461ea3dd1f579091a60472b5998e98b3d7ba5b02db45bee94b1ee8db7543464677f5d79b36469717997f6e
-DIST phonenumbers-8.12.34.tar.gz 2268424 BLAKE2B c7094d0bdd11ee6d797314efc7d3353acf2711e6f7ac1c2861b611e98b7b7183af14ac8f0252772ccbd50f6b6e135143429cbe6191de85f3900e336ec1534a09 SHA512 9a751ce7748bb5fa19c3b25697599c07e169a136f10eb149e839f97bcb803f6ea79213152b4cc900ad288227b576f1ccaca443a97b06d7c12651cc9134771026
 DIST phonenumbers-8.12.35.tar.gz 2268389 BLAKE2B cd1a8613e8948d2abc1ae74d1be989330623fa6f8d22f0c529a88f0ddf20e70af3ca27300610c75783b71d675f5fd999b5c43bd6306d12f1576a520bbb9d0c65 SHA512 8c8599cafeca26d56ab488da8d9c7f959921527777188b3a9432ce3f47dded2df41fba34968a8c2a1a6dc816097bac8f25c060653d96c0904c2b83185d29fbae
 DIST phonenumbers-8.12.36.tar.gz 2268432 BLAKE2B 43ddd80c0dd32acbfe9c872c8cc3e84c4022524198c9baf65c802425f189e4501add440f55676f6d3540dc9acdcaa8a4420f3311928e8e505866e3d7d139e641 SHA512 d918027400bd29f48c9bd6ec2e9190f16619c3ceb33cffb752e797990356f88042188d9bec328071ca4723a1c5bfc1e11c4aa9cf9cde81fb8996a6fa262455d5
-EBUILD phonenumbers-8.12.31.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
-EBUILD phonenumbers-8.12.33.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
-EBUILD phonenumbers-8.12.34.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
-EBUILD phonenumbers-8.12.35.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.35.ebuild 433 BLAKE2B 6a56df6866a0b13825486b809d85c17df719b98a4d265244f45f116dc28770aca60723352c9260595a86e1584803232f22d73e1dc7f01e02fc745a4079ed66fb SHA512 494f26ab2d60d03308289f6fca26d54d2d1f08f3ec00647cbe0db0bc2e1be56a68c8606767db712a1124901cf2f8acf2279a898f4ab1cf6e7db1191cfae81eae
 EBUILD phonenumbers-8.12.36.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
deleted file mode 100644
index b1997c3749bd..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.31.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild
deleted file mode 100644
index 4df0c54c7011..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.33.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.34.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.34.ebuild
deleted file mode 100644
index 4df0c54c7011..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.34.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
index 4df0c54c7011..b1997c3749bd 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.35.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 9fe3457413b9..79b2665bdbdb 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,3 +1,3 @@
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
-EBUILD pickleshare-0.7.5.ebuild 517 BLAKE2B 2cf942cc4bbb9350352bafb313f6b0fb73d1914c2e32f3e1a025847b3b763de5f1ce83be13878a01afb633b21e7c17cc8dbe71fd0ee52236022355f6ddf16822 SHA512 409f3f1908ac448ce73291142fd2e3803858953fe5987624314b1069f755900137c28b6c8ec1d9b8abae6ea37a84a84f29fa2c61ef0a1f6d332ccfc74ea7d596
+EBUILD pickleshare-0.7.5.ebuild 523 BLAKE2B 9bdcd7be117acc868ffe52845f6b87c3f4d10b53b2de9852d3eba39baef7ca2a4b1a638cf8149846282748a47ad1dd3b6a0b916ed5065d879e5a90a02d1f236f SHA512 298070d4b3618360995ce36e21a8148f5cfecd8e872ba3a3f98f1362c4569472216b6cf1375480952168ec5c71a331f6d241c3e16fc9a3b9161cc2e392f94ea3
 MISC metadata.xml 970 BLAKE2B 834db945c8e9c90ddcacf7d001f108b9e26321a155a747f5c7f00068cf915590813d1293afa5f0516233ab52d9a04d73091793bd945fd6e9a96cf51263fa8dd8 SHA512 12a8f50cd4f8aba47aeba2326400d488051d92ea05336b91d59f10e8c2885d00b39a453455c748ff1777a339c39ec0f5273126e719cbbcc8aa15503285b220a9
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index 564b35aa6ed8..0e651b5ed909 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index b2056c49f2c4..de082f092ecd 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,5 @@
 DIST pikepdf-3.2.0.tar.gz 2335339 BLAKE2B 3d294c2c8241bfcfa2b84f4c6af10e4da2e624374af0aed9c4fa597f9d0a789b9d85cb074d945ba521dbdd10f126326bb6d698a97102a93e6de589d89d7fee57 SHA512 307e2289811697b65c021e90496a4d1606e171e557bf5f19e5327be782e59e8683847524eb177ced54612d1e586b070860119a51e74fe25003787b359bf74531
+DIST pikepdf-4.0.0.tar.gz 2335830 BLAKE2B 80e36162709cd9eb23ce70994286d51cd4e83d242dafe65c724fa64a46b67bee048d76efa3934717334ba196d98d7ec70dd7f20b5d42a2a2d56326603f0adc88 SHA512 5727f60c05a72d1b7a249803020358cbb579e180ad1e5685d6120443b75a2b8483bd16c5c705f1fccd5159a0ab23a8b844ab57d39499ce4bf883e5caf2710051
 EBUILD pikepdf-3.2.0.ebuild 1534 BLAKE2B 42ff6883bc247985fe0dee2b7a55779dda32fbdc0818c2ee971cbb390d7f58aece09f5c98fb3d6400de301466a5e8dfe35803eb83b0acda12d06221fcf596771 SHA512 d9e8c178ad9560088e6cb29d2119fe6037829211a54b46809fa0474d5927bd65d150cdfea9818737d186bae91bc420685e8857325c9dc8b385147bc26c367767
+EBUILD pikepdf-4.0.0.ebuild 1535 BLAKE2B 6488385b4ce207e357e2560c74da0c512b94ac51e27e8330e3055cff35bf4410670d36a662d57b92d03a0ce76aa4d3d4c07bef6dd574a39c73d572364ab819b7 SHA512 4298c90140457bd82c79ce40ffd0b306363665b44faa69059545c5e333bd3883e21339dddf33e075e4ce41d02e88f3660bb1c01b8daf2623952d358220ed9c73
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-4.0.0.ebuild b/dev-python/pikepdf/pikepdf-4.0.0.ebuild
new file mode 100644
index 000000000000..80dd3fd26a41
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-4.0.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..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-10.3.1:0="
+RDEPEND="${DEPEND}
+	>=dev-python/pillow-7[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.7.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.7.1[${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 '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index cdcdc6524f32..89d8db42a0f6 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,3 @@
-DIST platformdirs-2.3.0.gh.tar.gz 18338 BLAKE2B c7d2b1b7ea65794507153b5c8d4d2e5a0668e4f9ef78024ab08c724e5cc5e91d0b6d7ec115a1ddab8a6fd7d34b4cb84cf3ebec64079d866344d2a7d18ca617e6 SHA512 3d20476d5064b6e300cddb5dcc9ba15346b1a8c3f5bfad869edda05cdd123a00a0c6c18b15af49a74f55fded5e11d69112b77239fe6f8f7da97c9a43ff442d8a
 DIST platformdirs-2.4.0.gh.tar.gz 19482 BLAKE2B 81ebc4424bd2845ae3b28d95428f95c7920300193ff98159263089b3db0d104a3a59af616bf6b815c0c8b1453d3f05d85120573c71b16b0a5104cc2532c472d4 SHA512 76b492f9d1a5c666c3c6957c775055bbd74db93f2a66f0651a74e1914626d757ab8110df87281cd31ad65abbd89f02906fdf8f0854a44f8500487685993fb8af
-EBUILD platformdirs-2.3.0.ebuild 795 BLAKE2B 8b7da01e8aa80ee1f1e00371a92933323a79e679f69d88add7f605ff3986a4957ce5945ff827239b08c1a81ae28f25060250f6927aa4471350d6b80f5d10112e SHA512 2f8ab22cda1121989638f7c58451d8391bd74b6b5011f1b6fccb8237c60af6131435c47fe2874c53e516fe1032bf21708afb1910ab900b4f5e2b6165d1ef39d6
-EBUILD platformdirs-2.4.0.ebuild 803 BLAKE2B c767e7b83c0df2330bacbd45fca203c331d4abd71d54231fa40af88ad15ba7ab5b1ba787daa9fd7950137f0b77917aa711ca4cbd7c1a2318e37798296acb5809 SHA512 fec658124062fe60fa5d7ba8d92b68774506b88f49fb3f8bd8c988439b2a1a0a8ba3f3cedef4f5abf4ba65be9a8a1cf864264d9225c78d09560c034abddd1fae
+EBUILD platformdirs-2.4.0.ebuild 795 BLAKE2B 8b7da01e8aa80ee1f1e00371a92933323a79e679f69d88add7f605ff3986a4957ce5945ff827239b08c1a81ae28f25060250f6927aa4471350d6b80f5d10112e SHA512 2f8ab22cda1121989638f7c58451d8391bd74b6b5011f1b6fccb8237c60af6131435c47fe2874c53e516fe1032bf21708afb1910ab900b4f5e2b6165d1ef39d6
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.3.0.ebuild b/dev-python/platformdirs/platformdirs-2.3.0.ebuild
deleted file mode 100644
index 1004ce027626..000000000000
--- a/dev-python/platformdirs/platformdirs-2.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 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
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.4.0.ebuild b/dev-python/platformdirs/platformdirs-2.4.0.ebuild
index 39dce3345f62..1004ce027626 100644
--- a/dev-python/platformdirs/platformdirs-2.4.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 5fdb871879be..cf17fc5e4d4e 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,7 +1,7 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-DIST prettytable-2.2.0.tar.gz 44939 BLAKE2B eff6eeb98b6accdb5089cfd1ceb09db2e4a0897e9675a07b744a12ab15fb1cb43bd4a411788d8e22662089f68a31c346d79cfaaca44c7f14f452870a7039bdb6 SHA512 df8ae2a1103a4965a351ba16a95ef9659107075bb023090bd9bffd69805ce647dcb26f49164f07f5af0c0b03503373c0353935b32a0fb18edf969dc984aecda7
 DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e2c7249923d5299c967db74dbd37baef9557d8d5511defe54f64e3f4625ef45635cf2f00a051a599177a3774da1a5 SHA512 5496b1525342b9df4b88cc2cd6079d8c329787b20f7e581465dcdf447b90f78aad764c6505aab8a0e3c4cbb44c943720672373cf754d6f7313b68c28005a707c
+DIST prettytable-2.3.0.tar.gz 49386 BLAKE2B 368dd454da9dde3900009ed52c0d55c30ed69315b36fb53eaebc764af419851b858dc648ac5d8ca62592c2aaa68dac91ac03a1a1bf29d10ee5162981f2937c22 SHA512 feeaeeb0a1897c0aaa2bc0ac7f470244529e8c70debb26976494719607840c8b8a80698b7e463402031b250fe152091e947555be2a6f983764e01bdaa1a71a22
 EBUILD prettytable-0.7.2-r1.ebuild 606 BLAKE2B 5ee8d1567cbcc4ba9ac75bc7ade72ee37f9dd658bcbcd8097ad3104b021e121b02fc93dfa31ffd711afceca065b4b9557ef8668e7b6da73fc01379a16f152ae0 SHA512 1a1016c21f70ef304875c21a1a2660c0433c2e68ff2d630695a123b581b15d0846a97d705f7f91ec1a4f3010fa90baf28e4c7fc29c42fb3ed63d709f10ccbae8
-EBUILD prettytable-2.2.0.ebuild 809 BLAKE2B 90b9f97cb7f30cc80d59bc6b7055ed536c395fc4b93d4d481e340ae358bc8bc67b793dc37471fc0f67cdbcbcc6c63fc9bcf471a90c1c691a8d7302ca274eff6f SHA512 7c2fa538d1e7d9d9a34a3d30ab6c4299c39adeb37d0e8ea51b839679d30384dddf580d2945d2c39f7ac56b684ff470441bd70e1d19ae6c8805b4029052b6b049
-EBUILD prettytable-2.2.1.ebuild 814 BLAKE2B f545600336ae8beda699ea9f51bef6fcef71d8d656a84a2167b1a1d57c80cbcc767ed2fae31e9a8b26307d0c5d61ca6c3aeb0f68abccafe4293b9b6cb1635bc4 SHA512 d91f2bc87046647cf019739e851f05e0fc15f72214c2a7a97a9f225b9607006903293dfc42896a2ed1d6710471419e888dc23da4d540953bda3c472e2f8b5499
+EBUILD prettytable-2.2.1.ebuild 809 BLAKE2B 90b9f97cb7f30cc80d59bc6b7055ed536c395fc4b93d4d481e340ae358bc8bc67b793dc37471fc0f67cdbcbcc6c63fc9bcf471a90c1c691a8d7302ca274eff6f SHA512 7c2fa538d1e7d9d9a34a3d30ab6c4299c39adeb37d0e8ea51b839679d30384dddf580d2945d2c39f7ac56b684ff470441bd70e1d19ae6c8805b4029052b6b049
+EBUILD prettytable-2.3.0.ebuild 790 BLAKE2B 44da829d36f938586ea2436e2f273a8d525ad5412158f579815eb5ea1feb331cdf34f67562df44a596b77cc7db03230f6acc62690b68a1cf2ed607f952425bd1 SHA512 2265fcd45a87192af5501b80c4a058b7dd8b4bade572d0fc89a4d46f3dc9beaf6fdbfb146577dc0c59c34c26f67dd710b8e9f7cc3db6b51930d22e46fe527ebd
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-2.2.1.ebuild b/dev-python/prettytable/prettytable-2.2.1.ebuild
index f2e0a92613a6..b9595bc3c5ae 100644
--- a/dev-python/prettytable/prettytable-2.2.1.ebuild
+++ b/dev-python/prettytable/prettytable-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/prettytable-2.2.0.ebuild b/dev-python/prettytable/prettytable-2.3.0.ebuild
index b9595bc3c5ae..4ed77fa80a36 100644
--- a/dev-python/prettytable/prettytable-2.2.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
@@ -26,6 +26,7 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index e4492decec08..54116c722461 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -3,5 +3,5 @@ DIST prompt_toolkit-3.0.20.tar.gz 3037349 BLAKE2B 52773f9c277d1a16adca007c19d087
 DIST prompt_toolkit-3.0.21.tar.gz 3041438 BLAKE2B 67ce3749404135a16e8b3d032e088e93aa12c851142b74e3ddddcf66713aa1fbce17231935bb22f7e0fda3f86af3da7dfefea612dd0fde7f1da407e2a72cf26d SHA512 46e43329e35b3eadb39c7f83501577cc776a2899005f9a7c299ee9e31eb6fba5e3bf8da33e0092fb1c20367f01518a3079fc4ca92ddbad0e3dfcbcfb1fd3be03
 EBUILD prompt_toolkit-3.0.19.ebuild 612 BLAKE2B df5de2b77aff12ddb7dd80d746931e589e5b2ba4afca55da906d504e8f73402fd7281f79abadcce8af4255bc1fa804bd54255e323871cf0e397adf72cd0dbc3c SHA512 91e0b16cb8d9e1cced54bd4342670d4a4eb86a7f27cd926dc016b893ae88db7d1f0af68ef787c6ce1d42664b43f3cde1ac1c13d11bab8debc43b6701f8c25a6d
 EBUILD prompt_toolkit-3.0.20.ebuild 620 BLAKE2B 27d958dc82f59aad9395079a22b226225ded45fa5d098736b02c133528d298821b741e1cb49e266f8b87efb3bdc2f93b9d0b27734d28de311f0fd1b053321638 SHA512 3146f81ca228a7bc5687bafcf34e62dea7a13da0ed3f86b123c5607a41c006ed12d712a4208b41fe17dec7e4bc7e5dcd739f076192b173c1c9d992a2ae7e1273
-EBUILD prompt_toolkit-3.0.21.ebuild 622 BLAKE2B a77d4ae7baf282ea618c76b7f63d1506a8c0710519c2be69e38e5e040f08f2bb55dcf9c0cfa658556f1266709eb9a29899cd04fb611aaf2b8316102fd65157bc SHA512 170e9d8d4f11973b1634d9eb1dd62adb402ce0e8a17cdf869ab09bd813b476804e3cbf5081d7758408a7768b83fe6d9d7b7c507ad1167d4685b2a33571c6051c
+EBUILD prompt_toolkit-3.0.21.ebuild 628 BLAKE2B 31e483c177ac9002fd48bb3e7cd4eb6cda3ad841dae4f43f428a01b0a2e2c86028ed53364a65495742c2ba43f9e5f28825a77c2b7a713f87e6a41d723fa544e8 SHA512 d24e8017be8e63b91a266567a1ffa7b6b6794ca1a07b958202af6f886c1986631abd9caa8bc5055f7e55296227ba3bdd44f7bf2ebc9b934d4376a99d858ebb7f
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
index 880a84917d1e..8d7e4ed391f0 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 887d74ae3f09..7bfc2313b993 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,3 +1,3 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
-EBUILD pyaudio-0.2.11-r1.ebuild 1091 BLAKE2B db0bfc3efb8ade3fe7f78ea0b8f4bf0072b6761553be733cfc1f367e5b67d777034653543129eefce2efcb0e9a6e2dba50d0bdf8e9b7ebf6869b84ea9da53f2e SHA512 22b0b35094402c2909e3e8bcf59bc972b81fa83f6f529075d2dc44b41108912f8cc17efb14b1fedea716c0c1f79cf770649d7dbc735e0293edd287cc29e099d9
+EBUILD pyaudio-0.2.11-r1.ebuild 1091 BLAKE2B 7ebb50ca17f473fa13ebdf973da074cb00bc161b0c2bf46701a5935a4eeb20763f5790e813ba74f6518db9a7f1a9caabffc554a80755c45bb5156691e8177d3f SHA512 41a4115bb3b8a2da4403fb7358fc3602d83cce90118770d59c31199dadd6e0f639260e62f77b1235d22f16ecca00a860910ad9c75fb8dbdf6628cc7e6f346e05
 MISC metadata.xml 629 BLAKE2B 13fcd9ca931e654d70fa328133f5c1aff9410c7c504338d7fd14f53f2ea971c5418c3f8e242d2cc35cd990c91494626379cf88e7e157a5bfc37b87c0c83bf7c8 SHA512 cc9475811d3f8265e79c80d2b7b817156942430843d23361c3ea9791730c422acd9c399755c8f6a775b6a3e9d7fb9138f22e87ebde9e7019591d68c696095d81
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
index fa28b7d001ee..2af98eb2c323 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="PyAudio"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 319b94003fc4..14fdef600e22 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,9 +1,4 @@
-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
-DIST pycryptodome-3.10.4.tar.gz 15552675 BLAKE2B aaa6e6768d099b7b229f2b920671577800baea11b8b5a8efdd818f3d5685e46ac51d1c79d9c987f1d93cc9df98c786028137348c946da7aff35fc436ff21894c SHA512 1ee2f6c499d7ea73bdeafc94b1e91b45bf888f84ea214a01db180e030b4724264ba05e16241c465484ec13075f5300f6c489229bedb84e54b93e2852906b634f
 DIST pycryptodome-3.11.0.tar.gz 15555515 BLAKE2B fee6a2f2ac0659c82efed2cfdaf7c4d1e4813aaa2203c41c249a7e512a4ec1c955f443022e81847fbfd095cd95f205c054b8c3ef90f4741063c679798cd8c5e5 SHA512 9a6f94a78909b236e9b9224915495f092891951b76836396706c11e8e87717ff84fd92fe04ad641d6a5a0ef1f3b339990d7f21a326e72b95b166a76169240964
-EBUILD pycryptodome-3.10.1.ebuild 1533 BLAKE2B 93b9523336f06fa12c19140fc4dbfe1e1aa2c0be7e7d48955b3e86b0ca461a0b8b4d360e9e6e37448cb9434426db78ff3a7d7ee646a8d04fe2349c945f60e903 SHA512 671ceadeb8fd10c0fb8a4bdba29f082f192f03f4163b92fbe753fd46c7fe1b9a3c9371f6460dac44552e5485fbb337726098bf1c0e24d4777763777ac60bc9c3
-EBUILD pycryptodome-3.10.4.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
-EBUILD pycryptodome-3.11.0.ebuild 1136 BLAKE2B d7480af38272aa6066b81227f00853f76bfa1e6880462ac4d93212a349a635a297751c39aac3e9201cecba770da284d5140db60dc04f589365284fedcc871824 SHA512 87e615c6b7d88402969d6df51a72ce335015239a197ddd10d30b4d0a72c0f50b154229a797095c464631b2051cef43be94787fd205ed76ad1d442c786d4c7d7b
+EBUILD pycryptodome-3.11.0.ebuild 1129 BLAKE2B 056c7b2398f90792d0789065d053681705eaa5cf9fe6f90dad15bc17d014f9669d9397a0500566b40e63330198cf15f471e636c138dd130deba9ffc862f83682 SHA512 eb9b2874efe1b7142442ab88cede0c620e57e14cfe2c3d0f2462aa7175c60e51084b9304f6de51757ad4631d42919c411c094ea0cfc9bbf761756a4f20bd059c
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
deleted file mode 100644
index 3b8f503bb290..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -dupr a/setup.py b/setup.py
---- a/setup.py	2021-02-09 13:46:16.138626317 +0100
-+++ b/setup.py	2021-02-09 13:46:51.116065599 +0100
-@@ -360,7 +360,7 @@ ext_modules = [
-     Extension("Crypto.Cipher._raw_eksblowfish",
-         include_dirs=['src/'],
-         define_macros=[('EKS',None),],
--        sources=["src/blowfish.c"],
-+        sources=["src/blowfish_eks.c"],
-         py_limited_api=True),
-     Extension("Crypto.Cipher._raw_cast",
-         include_dirs=['src/'],
-@@ -442,7 +442,8 @@ ext_modules = [
-     # Math
-     Extension("Crypto.Math._modexp",
-         include_dirs=['src/'],
--        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
-+        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
-+                 'src/mont_math.c'],
-         py_limited_api=True,
-         ),
- ]
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
deleted file mode 100644
index 16d872aebcf2..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ /dev/null
@@ -1,54 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-parallel-make.patch"
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
deleted file mode 100644
index 9bf29ac5892e..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.10.4.ebuild
+++ /dev/null
@@ -1,45 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	dev-libs/gmp:0=
-	>=dev-libs/libtomcrypt-1.18.2-r1:="
-BDEPEND="
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-	!dev-python/pycrypto"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
index 9bf29ac5892e..a4233f5822ce 100644
--- a/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.11.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 94a15a4f4ccd..270dba579a90 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,3 +1,5 @@
 DIST pydev_debugger_2_6_0.tar.gz 4142790 BLAKE2B 46776e261e77a745867423488f97c6584c9497d883d8e2b19f4f82c58472f410f1b5f287ce24b8c20e9cdaa2202cbc78235ea4a7e9aa2981aa520e0b58e4fcd3 SHA512 5e7703f2eec53fe7b4d78d59894cfbb14a35a62ad20431242477f66e72344d88d5538ebe2007526e4ff250e8bcf41702acc71692239693dd9cb788ced70d7aaa
+DIST pydev_debugger_2_7_0.tar.gz 4154343 BLAKE2B 6504ffa5eee5548a6aa9e59712b6c0054b69c2e0f6ff48059ed8b2e3edb92ec92ea4e7f9ff084419b46310c4d08f11008571cbf70ccc4efddd0fae688e4110f5 SHA512 8f09b446eeaace1f9ecd3d331813e8bd7d8e09e1fe9dc9fa955ecc26a97ac6015f7becc4005a87405d1154280ec10eb7fa87914bcd41f27e51d90ad3eb99f643
 EBUILD pydevd-2.6.0.ebuild 2495 BLAKE2B 39b1574a0c6628f0c74b0e19d5df3d9011c0a1afb1d90a595f79ddddf1f80ca16417b751a11a0047812b37c7ee393bb93a690fcee16d9461b86a7f7e0d5cbc33 SHA512 37d05fde51b263f6bb3ede61553e08db751185d97a660c0318abf20ce1c9944d97796fd48dbfd078ed093237d882dbf4f30e9844481770941bfe75911ba3885a
+EBUILD pydevd-2.7.0.ebuild 2497 BLAKE2B e10c42f7c92e4c11403c14299432b5a894c760800bac7f3eade1c1d7c85765444ca6366b45e20081834e9e851b991ab7800599036e99025009f56c6f79984335 SHA512 a8209d7241c268b6973be7af5f2504feaa02c1abf2c234c41cd3706552de38f68114ace76cd592faee5f7f7f1929104202a5467dbcb8913f2aa74b3c64cdd69a
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.7.0.ebuild b/dev-python/pydevd/pydevd-2.7.0.ebuild
new file mode 100644
index 000000000000..61d19f166392
--- /dev/null
+++ b/dev-python/pydevd/pydevd-2.7.0.ebuild
@@ -0,0 +1,88 @@
+# 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 toolchain-funcs
+
+MY_P="pydev_debugger_${PV//./_}"
+
+DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
+SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/PyDev.Debugger-${MY_P}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# After removing and recompiling the prebuilt lib the tests fail?
+# For some reason the test suite is executing a slightly different gdb command
+# then before, which is lacking the file name of the lib that was pre built:
+# gdb: No symbol table is loaded. Use the "file" command
+# This also happens outside of portage so it is not related to any *FLAGS
+RESTRICT="test"
+
+BDEPEND="
+	test? (
+		dev-python/untangle[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+# Block against the version of debugpy that still bundles pydevd
+RDEPEND="
+	!<dev-python/debugpy-1.4.2
+	sys-devel/gdb
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Drop -O3 and -flto compiler args
+	sed -i \
+		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
+		-e '/extra_compile_args/d' \
+		setup.py || die
+
+	# Clean up some prebuilt files
+	rm -r third_party || die
+	cd pydevd_attach_to_process || die
+
+	# Remove these Windows files
+	rm attach_{amd64,x86}.dll || die
+	rm inject_dll_{amd64,x86}.exe || die
+	rm run_code_on_dllmain_{amd64,x86}.dll || die
+	rm -r windows winappdbg || die
+
+	# Remove these MacOS files
+	rm attach_x86_64.dylib || die
+
+	# Remove these prebuilt linux files
+	rm attach_linux_{amd64,x86}.so || die
+
+	cd linux_and_mac || die
+	rm compile_mac.sh || die
+}
+
+src_compile() {
+	pushd pydevd_attach_to_process/linux_and_mac || die
+	# recompile removed file (extracted from compile_linux.sh)
+	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
+		-ldl ${LDFLAGS} -nostartfiles attach.cpp || die
+	mv "attach_linux_${ARCH}.so" ../ || die
+	popd || die
+	python_foreach_impl distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process" || die
+}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index d0d4c9977710..15efd79f142a 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,3 +1,5 @@
 DIST pydyf-0.1.1.gh.tar.gz 14014 BLAKE2B ca95861914d34df1f3e6b805550d9ec620633036ed4413d3e1598a463270ad59d79781923b79b00d36c863452f9726b7f05d39e17362cc75ab6667b6826179e6 SHA512 65b4c6a05bcdc7ed356d4936e2972348508446e3481feb3a736b7353f652edad177ed0c9f88e27c981d593067e1aa46795c3b3d2e857af06eaf0dcde23f4c236
+DIST pydyf-0.1.2.gh.tar.gz 14272 BLAKE2B 66e3a9ff2297994f61573fd033a43e1af5bf6b27335b87abdb9b42e469d954cb518faed3707a246c4bb59fd93a769970a0be9dede5c6858b5ce90f264ff4d289 SHA512 d3d9ebc5daed3e1d09de788505888120c907427c44afcb80ebe1e807e25ca95e8f3a76aebc30a33e915667827e396621e1af67216a2e88db3e75fe81c1d933f2
 EBUILD pydyf-0.1.1.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+EBUILD pydyf-0.1.2.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
 MISC metadata.xml 346 BLAKE2B 1019f43890db1484163da244f781505c1193dc5516cbeb8921540dc298d4cf61903a9a0151e23cc22b7db7fd677f4424c74b5a051b95eb75e38f3546501096b3 SHA512 420175bcf83c3fe2fc1bcebfd88f07e3c56272b999f9693a82b76a703ea5d94d6e144683a67eca871bc6d2723ceb8f70c4d29e354df20d273587a7be6a369904
diff --git a/dev-python/pydyf/pydyf-0.1.2.ebuild b/dev-python/pydyf/pydyf-0.1.2.ebuild
new file mode 100644
index 000000000000..0ecfdfd4412d
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 1c6008c6e218..9e96cce0a3a6 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -4,10 +4,12 @@ DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890
 DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
 DIST pygame-2.0.1.tar.gz 5536907 BLAKE2B b27cb9001499a00da62dac0486a72079ff4e60ca609be444b04f547cb2372090da91d2670307ce7068b964458e6ac1284402439bb7809c9735135d5e93a71d78 SHA512 1535a872c43e5f75acdfa7d325fcfa0f0f826e18602b28b228cfdbe068a382678c21568d80873f7af4f0b318e693adb38afa4d632f8294f716a47188abe5245a
 DIST pygame-2.0.2.tar.gz 6309459 BLAKE2B 0cb23b4226d8d86f938cba08b67ab3bd847c9e4122f5f6cce4d8810b239df672ab282e1b77dd7d71423f805c7c0418e54050347dfb9e506b799eb8e0b4f16856 SHA512 2cef4669e5bd81759c9886293ebc1b82e1ed3b4576a3632437f66cb353af330e15dd39e7378f2be8fd25838f202529dc550208a031aec77e1d05443a070638c8
+DIST pygame-2.0.3.tar.gz 5804279 BLAKE2B fb58dd57a9288bdff3c0d01389e363968ebddd4b2b0fa92335c825297026c5858da4f73a870f84e0c3c7cf302bd9f4163807c97a348d581658df7e7695fcb4fb SHA512 1d2b4cb1e577f0244c2b92511b8fa0ab7bcd689d04a4451ced41e6d97758ba380d7e681e60abed26c81b96bd49d505cf481c67a466437b3cfdb547e744f22949
 EBUILD pygame-1.9.6-r1.ebuild 2293 BLAKE2B 32d2a0539d064892d65ded4f4977c6c1e52f632ddf32d4e138a3a5a1a29a293a5762608e394d236bc0aeee71b041f184f2b05f86760c16d67dc07c0a230b5a16 SHA512 e39987d08942f0cfd5c26f482e28fa2ba39210a4acba7ff7f8b409bffcaeacb8937152e4d4aca1c807d7c4b05d8aa9c2b0a57f54296f9933fdddbf95e094fd71
 EBUILD pygame-2.0.0.ebuild 2073 BLAKE2B 9723b5c5d486de169bd7b8d5e6012eadfced27bedb7e2bb61ebe9cfb73f6e54ba64d6acdc866eee561979ff41edda6d31b337a98c2c15a3328520a91c3eebd07 SHA512 d4615ac5efb8935073c791aa9510a5f61965ff3fb71a8a0b0b2a9d49d99e95e6a2863375665b3e8e2272c4289c44d7e01323c3ecde055018c13e5ceae505167e
 EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B 8fc8454b4e198d0c8862a7c4338792076799e8a13c82827c062ca1a5a6f3b61d0260b367cdbf8590632600d99ac7fe2d8699b95631417e5ed5bab5e7bfbcded6 SHA512 eda538cb1d14f9f2e88ada1497ac816b12ef27805a3d6d85a37f349e2b3891e82594817ff178d9902e2066b1f595a59915d4d0d42e570534fb132fb81b9619c2
 EBUILD pygame-2.0.1-r1.ebuild 2202 BLAKE2B 6b7ec8d20bc629a07d200958f5a4d09f1330933c60ca0ad191b673ef78e950cc27ba4ff456df4b31f50b3b326f42bd020e38d8801ee9e663ce4fa7acfc7645ca SHA512 8b7298c8b5cf5b6635008caac567d0331d7b614535cef88a5aa6813e2df1d97aded32e112275188924bcd3b6f53d52d7fb3f009c164074d0870d579de4119f87
 EBUILD pygame-2.0.2.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
+EBUILD pygame-2.0.3.ebuild 2082 BLAKE2B a1d8318800491adc2448d4a6bc2d5ebf206ce83ab1d71487b6324c51cc77a73f928af85e1291110dd42905acb03d45d8a102ed01fabc92ac15d5b5e16d98ec26 SHA512 5132770e079ac5bc49336c96cad820181522a5fd44bb16d9f12bebb7318d31cb9fb38c7f3a2282ed94880bd4c4cabaae7d2f515cbe060a55996dd7e705b78bfa
 EBUILD pygame-9999.ebuild 1739 BLAKE2B b5e8dea0169ba2ebf0bcfc3f7fa9f140b9c6a95fbec59c82442403c89f35f7416888d736c1ef1d98c4f434b83682cacae507037fc33cdeeb3fc570d2c9855983 SHA512 0e378c44353b0165c452561643fee5c9d6622de4e79b1fddd6ad554e1a9fa39bec18c84907a6c2e9868d0c75d1568f0935660c838f2921c7e5ce0df87c157946
 MISC metadata.xml 462 BLAKE2B 398db1c050bbf14a65ac770e980ca91269277ecb00d94457502532ef7c407145cc2438ead46d370d1195331fd3d2f9602ecbb381c9f178240d031d1c665a9324 SHA512 2e95b731a4cb49372e6af00bb059bd179dc167aaac07f412c51970cf27b0fdddda616fb59bbbd62101c1b6f272cc0263123e334df01ebf6d1697ef8b55b62fef
diff --git a/dev-python/pygame/pygame-2.0.3.ebuild b/dev-python/pygame/pygame-2.0.3.ebuild
new file mode 100644
index 000000000000..1ee94dd33f0e
--- /dev/null
+++ b/dev-python/pygame/pygame-2.0.3.ebuild
@@ -0,0 +1,91 @@
+# 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_PV=${PV/_pre/.dev}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="https://www.pygame.org/"
+SRC_URI="
+	https://github.com/pygame/pygame/releases/download/${MY_PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples midi opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libpng:0=
+	>=media-libs/sdl2-image-1.2.2
+	>=media-libs/sdl2-mixer-1.2.4
+	>=media-libs/sdl2-ttf-2.0.6
+	>=media-libs/smpeg2-0.4.4-r1
+	virtual/jpeg
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl2-1.2.5[opengl?,threads,video,X] )
+	!X? ( >=media-libs/libsdl2-1.2.5[threads] )"
+DEPEND="${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig"
+# util-linux provides script
+BDEPEND="
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)"
+
+src_prepare() {
+	if ! use midi; then
+		rm test/midi_test.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto || die
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	distutils_install_for_testing --via-root
+	script -eqc "${EPYTHON} -m pygame.tests" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 3610e89bfdb2..1b3b5d185431 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -3,5 +3,5 @@ DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee0
 DIST pygit2-1.7.0.tar.gz 276292 BLAKE2B 6091e2916c4986cb545f23d3a31f262666f0349661ccc48769414e888d0ede48af3a80483b4638a3a2275b74ed9b42113bdeae678f03d76caa7e796c6011b50c SHA512 3a8654036d0ab875898ce60e81bcab48bdb6d6bd63c29dc98272c71b5c82391e3186da61083fba09faf722e176fed5c592a36edb53ae0b957726e74646d25616
 EBUILD pygit2-1.6.1-r1.ebuild 945 BLAKE2B 79cfd82aaf7395b5adddd3b4a791f6c848221a2948d02fc75d239d77f5aa4e456a3163b5682db51ab2f8181cfc5aaec1f29c999fcec83ac26bdf77e674761160 SHA512 b0ebb0bd047fd0b1d2b58f970ed7cec2d63ec86c1b01e2461fd14fb85edc29824372b92cae3a0fdd52c22aef30d4b2ca03d401749a9ed500e543df606133a3cc
 EBUILD pygit2-1.6.1-r2.ebuild 999 BLAKE2B 5f8e1ab0c9a4041cd80821c858904debee9221ffffaf44d5933f31b73122a300e1566b4def0779dcedb0b636f54762c4b86fd656a8e3142630cd82d222adbb58 SHA512 b8bebfb9341ebbeab1daeb6207c27a131140b278dea2e8431f8dbb6140853ffc42176ab338c1fe45dd7e06a9c12423c4b7483519096e374cccdf9a1be3e5a33c
-EBUILD pygit2-1.7.0.ebuild 937 BLAKE2B 177001c8f5f504376195c864073b8f10ad34ad068b7d922877d88d149ebfbdcb336ff1e72f662d90746a58edb37db0a9f77710f76cb202f60c25c883552cf37b SHA512 6ee94941cc982672358f254ffffec7723a26c02f7a15ef78b1ee953e70c19656d224b69d00ff54a08c9c78a21d2470c7fdac946299631c7ee817772386be375b
+EBUILD pygit2-1.7.0.ebuild 935 BLAKE2B c7e4115d203ed94c04c2cb7e411704a778d79078ee22d7fcf8cd967f4f572714e415740053a0cd619fb04920277375229d424d0cc99d90ff4e3b7888ad840e99 SHA512 8ae0180ca64a76fd95abcc5e20646f1571e34c6f6aa1a74e029d8eeeb6313f00e389886796af4236a8c65601f6e55e508f0ce1ebb8fc57f526ac1d5cb2e5ea0c
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.7.0.ebuild b/dev-python/pygit2/pygit2-1.7.0.ebuild
index 3e42e86427ee..3e0eeb32d025 100644
--- a/dev-python/pygit2/pygit2-1.7.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.3*:=
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index e5714b6129c1..b4574de91a42 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
 DIST pymdown-extensions-9.0.tar.gz 978665 BLAKE2B 328b36bf34b362ed20b8f52576fb8ea1bbf818e99815c15e0779e38dc560134096bb35ac9a5a4ad11c713921052b0ac0041b0fd2491fc76fcd7cfcbba0760f0a SHA512 813d81900b19e8235e67da362951e3e72f9948751cbe3ee9547e043d535fb8b480f0b65aa811a8b8a67c25509fefef01d3f46b4a1a6af9f00c8be244ad6fb6a9
-EBUILD pymdown-extensions-8.2.ebuild 1192 BLAKE2B 10a13e389416f44b7156715ee1ed9948720ee9e839dd7ed203b8e8d0de90ab4b9fa637f8fdbc22f1cc207bd54fd65c7e50e3923df39be4b3c2419f3269ae52a0 SHA512 c58b66762a48a8a88e6d59ba171af5c312909d371444a30c4041c93982232cab39eac07b7a23d0d5bfb68baa321b3a6714448f873da4b8f6beaa7791cf05338a
-EBUILD pymdown-extensions-9.0.ebuild 1194 BLAKE2B 83b88a1a6cb629a60c86451b43587e639c1ef44bbf691b77b52784f3fab31fd2f14f26a890b55c68507de93d438ae285537f5e7b4bcc2d3232bc86dacf529f7c SHA512 5bc6cdabb49f582d4ed38550ddb42debbdf86f962ae40cf119dd7790c73f7f8e98eeb2479302e3900813820b53e4f6f6a483eff245e479796d2ebc0d9ea8aca0
+EBUILD pymdown-extensions-9.0.ebuild 1192 BLAKE2B 7c9ed914f8234f57a3e7f0f5b5e07cfc1d2dff2740d58e34f605312526a8e26d369c5c5b6ba70efbbc504235135d32fe3cd17e876254b5e3b8cee564319595ba SHA512 839e9c3dfb75dcb884309bc519971bef97610f8d4f5c95193fba3d67528a7df3afedaee31882e9c582c5650e2f0de8ef64797ae12d88e727df755e64071f3927
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
deleted file mode 100644
index 4924c9c9c55f..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.2.ebuild
+++ /dev/null
@@ -1,52 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
index 8ed924a3f6a8..04d76ca159dd 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index d11801af7778..4af3e3207fbd 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,5 +1,5 @@
 AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30
 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
 DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
-EBUILD pynest2d-4.9.1.ebuild 712 BLAKE2B 88abe1ebacd98b606b5f63693037914521673c20fb05102d0049ed7c7e56740cf14bdc048cdd3b69d0e7244b8484370c20ec6ab66c8365ef25c92fafe47aaef3 SHA512 8caee389b39633a187486b9260cb2e859efb10d14ec44190f6e560fc50e843720ed4c1a3a1fbfec3e73cc4ec05333ad5d366ef46512c8437cc36b51e0fe03759
+EBUILD pynest2d-4.9.1.ebuild 713 BLAKE2B 45811d912c37008a210f1b5bd6d4b2c43214c30c57698d6ad8409b5c98785221194b606b9103246bbbb62b3672c83ca1a02d3d16ecaaac71ad03b2ca29958ca0 SHA512 22af425ddf9f79c1ec2307a877e6fcdf15ca734ca8ee917dbfa45e75f1dc14f88eb1943a8e6f3196fd77466210f862f29148e413fb530b10cfc5abc11301538e
 MISC metadata.xml 410 BLAKE2B ca450f3ba075ee6d2fd14a913b4ca7490b1be6181cb5354fc4dfc05ba6813630c38eec71342fe3b7108ee20a16ea3902d72833d697f6816add8ecb498271ba23 SHA512 95519c23b3d8783c70a770ead0dca24c6afb917a864d15cf712f99a8303c5917020f1eb0d227df8782d163cf1bd09bba5b9e2a0de6bff0c5613b82b370746c6d
diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
index e6226da74083..d7a3591a7c44 100644
--- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index ebf95f6736f4..c1d9f1b356b9 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -2,8 +2,10 @@ DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b
 DIST pyparsing_3.0.0.tar.gz 935578 BLAKE2B 2932fb8da83f4f7b0ba98057002c870ab54f50bb93cea3f1da1cb9bba87fd8a6066c7bbee700667663285226ad6bf637f340160ccf7b7b06616e1140a7b93ce3 SHA512 1400370a6e7518940b7965645578028588af5a4ec1c379d57c924f036c86e342a9a60f1dd5c700ce8a4dbcd16afb55a2a4c371548c8bac6c53338b5cc349f4d8
 DIST pyparsing_3.0.1.tar.gz 936219 BLAKE2B cc7dc4670f37a09e98c8bda785bac4121150f1a48438cc42c6fbf0546531e7fc674f2bfe1c85aba66ac1075b9c086d9ee30672a3eebc60efec21fd51772f577f SHA512 70f2f957c713a88979ae95de8834a79c777196a2a6d47a25bf930cdefdc3120919147a33119ada0d33c53bb215fcddfa969b0d1630d2979c9e685d85e5c57414
 DIST pyparsing_3.0.3.tar.gz 938435 BLAKE2B 5237244693759ffc19637b4d8ee52f98b7160160c1f422a1720b9a8848025f37cb8b314aae505acb7696cc1546c495d049a6a93b3824d784b89aee3565001a4a SHA512 19735a3125620716a0a843156e6e9285c7811aa4db876fdc9fed7413dff77c0670fea5a0a16bc074704c6fec45f0129d1a3680b2123abf3c414fa75d73e03d36
+DIST pyparsing_3.0.4.tar.gz 939837 BLAKE2B 27130518d1f3a4e497ecd4fa1fc624516bcb62488baf881ae3c8888bca48c957a4c6f0bf8d29aeeca8b1aa907c04ca41f3a61e876b78f1ea50684e24b12a2422 SHA512 01acf9b7663feae57e82ac3139c35687ea2754874425acfcf29b82595977660dab86ec35665e96400eb92acfbb51fb2326e010b960be7570de7575296078bd31
 EBUILD pyparsing-2.4.7-r1.ebuild 914 BLAKE2B 35964c6637273b2a733d8d7a7969a2eb771aebb230f63d7756788cd4de9403e29375f379f0333c45775efeefaee4cacf483eb93a9a02e8b6c4f7148c0bc36b18 SHA512 adf954f17e3de9ba1376526f6cdfa17ce9cce221e13eaac8382cf68feb5b75b4b7b26de54297ffa96250ae902c2499996486e8223ed61c9b338fabbf773068f2
 EBUILD pyparsing-3.0.0.ebuild 1618 BLAKE2B 0f8a438ed39afad95255ed543d4cf0b1d35d01fb0903f97f7f8b0a4ab81ea722b318213d60fc71b60170430bbc309fbb69f75f62299de2dfbd257b1aa5bed0ba SHA512 9a9b8a784ac0c94b281bef94e368e4bdbbffa13c275a8ddce3d16c2f78e7bd66decf4db45c25fe0e3d8e922b52485cc022f2147b4233dd93b94736222e188b41
 EBUILD pyparsing-3.0.1.ebuild 1618 BLAKE2B 0f8a438ed39afad95255ed543d4cf0b1d35d01fb0903f97f7f8b0a4ab81ea722b318213d60fc71b60170430bbc309fbb69f75f62299de2dfbd257b1aa5bed0ba SHA512 9a9b8a784ac0c94b281bef94e368e4bdbbffa13c275a8ddce3d16c2f78e7bd66decf4db45c25fe0e3d8e922b52485cc022f2147b4233dd93b94736222e188b41
 EBUILD pyparsing-3.0.3.ebuild 1618 BLAKE2B 0f8a438ed39afad95255ed543d4cf0b1d35d01fb0903f97f7f8b0a4ab81ea722b318213d60fc71b60170430bbc309fbb69f75f62299de2dfbd257b1aa5bed0ba SHA512 9a9b8a784ac0c94b281bef94e368e4bdbbffa13c275a8ddce3d16c2f78e7bd66decf4db45c25fe0e3d8e922b52485cc022f2147b4233dd93b94736222e188b41
+EBUILD pyparsing-3.0.4.ebuild 1618 BLAKE2B 0f8a438ed39afad95255ed543d4cf0b1d35d01fb0903f97f7f8b0a4ab81ea722b318213d60fc71b60170430bbc309fbb69f75f62299de2dfbd257b1aa5bed0ba SHA512 9a9b8a784ac0c94b281bef94e368e4bdbbffa13c275a8ddce3d16c2f78e7bd66decf4db45c25fe0e3d8e922b52485cc022f2147b4233dd93b94736222e188b41
 MISC metadata.xml 797 BLAKE2B 9707adcde7106fb0726de82da965fc3aaf7a23b34f4b71cfea4e09bd03cb44c069ccd4d16e6a6f37eca4720ff8c52d0bc11c864bd7dd9e6995d0d25cb92c5cc2 SHA512 0f791598d2b4a37797e7f917be22093f01020cde34876d7d0db3d1b2bf5da8a18d5399d70f381d98ea569f8c3abf7f1cff8b3cc92fbab39bb00f329a58e96229
diff --git a/dev-python/pyparsing/pyparsing-3.0.4.ebuild b/dev-python/pyparsing/pyparsing-3.0.4.ebuild
new file mode 100644
index 000000000000..5e4cb765d6ac
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-3.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2004-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# railroad-diagrams not packaged (and not suitable for packaging yet)
+	tests/test_diagram.py
+)
+
+EPYTEST_DESELECT=(
+	# also railroad-diagrams
+	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
+	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
+)
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 5cdc5c68f773..97fe3af351e8 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 467 BLAKE2B d060f6c8374d387893f482baa0409b5d55ee590855198ad4a7e620291d5ae91d9153b5cc98fbc72fd6bd20736fea104769d779210e71d8d62c54250f8aba7d81 SHA512 a90acceb888748b965b8eab03908faca3e51cc9db4940e31e8990bad74fc6e81e053f9ab39d92deb33659fffeb82585c0687f30865ea0fc1c196fd0c1be14fd5
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 480 BLAKE2B 74181bb8670d28565115a5470a48f8bd333dd7644c5df5ee85eb534a3737bf1c681e89d650a116f3c2400ed7502996bf2ddb90c0e2d46df00a4f41d6075903ec SHA512 0e69d4a10cc1fdc4953a61980726297e25c3d793d992e364156ebb59d8ee8f4fd24345b365f56b8b1ff0e5321df9123580c4fd4077772b2c78dd1ea0f2083221
 MISC metadata.xml 466 BLAKE2B ed3b8b14f649b2bd165f688ceddcb7c75846e3ec75c5629678d1777d9d2df8e784b0c076d497a38dcf457607d739710c8d6f7069643d802d175ca8dae5f955d5 SHA512 09173c651b8b9ee5ac5928117da08ec7a318402bc76e94c14c27116f6a44c07a8a85f83d222de9a5fd09f1224fa256ae2338c5021e6d4893cc8ce6a1b1540b39
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 5b7c8f820706..36cba94c0396 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 44fdc80e0a77..9283ea41f26b 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,4 +1,3 @@
-AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
 DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
 EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
deleted file mode 100644
index 2c911601b070..000000000000
--- a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 15 Dec 2020 11:38:53 +0100
-Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id
- conflict
-
-Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure
-that the presence (and implicit loading) of pytest-services will not
-cause the test to fail via overriding worker name.
-
-Fixes #611
----
- testing/acceptance_test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
-index c273bfa..3bea8fc 100644
---- a/testing/acceptance_test.py
-+++ b/testing/acceptance_test.py
-@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n):
-                 f.write(worker_id)
-     """
-     )
--    result = testdir.runpytest(f, "-n%d" % n)
-+    result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services")
-     result.stdout.fnmatch_lines("* 2 passed in *")
-     worker_ids = set()
-     for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))):
--- 
-2.29.2
-
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 09e8f1d77f7c..401acd767940 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,4 +1,4 @@
 DIST python-cinderclient-8.0.0.tar.gz 236611 BLAKE2B 818279d06b597a00a66c34cf3b468e8293aaf1e90fd04c996e118ea206d475e598d7c8b9ca78542bd07ada1db5d7a2c7ea9a3748fe85ad787d283c8d8073ecc6 SHA512 ae0c5e1d6f0c173382f57f95ac05ec8872a8ed548b145c1f91d96ab7b9e4602cba11a7205c26c81027ca4ad07cbb69f675244e3606ae5dca00c22eeb8bedc126
 EBUILD python-cinderclient-8.0.0-r1.ebuild 1297 BLAKE2B 05335aed3f1b230dcb8f746bbdcc63f155af0948b82e837329709eb599225db02d023e2360d713c21b5bca49d7ec4a61a9f78a20e2b215904e565b535ba1f0aa SHA512 ee80b0376d92be4c8eed9b329f3f2840603571436f29db882fb8647e80217ddf1b45116ec2ba715921a1b9ee3dbde1bf29a7dcf9b455e21dbce8d910ea50782d
-EBUILD python-cinderclient-8.0.0-r2.ebuild 1272 BLAKE2B d2996af242fd2264f537e6011f2f532ca30559109ac0a76485046a5930c27cb50a05b21e239c58899639eb87a9941894e4b09020e5ff58ccfd8ddc712a156e44 SHA512 279cd940250393f9ba70d09fd8533f61e46a64bfab2186bfc924d589af98717c92f455274fefc0362255c830226f776844df43b862ab4cab9eb602e96c69a210
+EBUILD python-cinderclient-8.0.0-r2.ebuild 1270 BLAKE2B 7c2c7145a4441a02a2e3e2180fa4f41e63f4f14c0c15505b61edeff6ce43d4a0d89bcff95557b8f7ac306931406086f66dbd292d7f9306017c728b4a63f377d8 SHA512 e18a3f13bee8cf83daf2c80f7938504814a635153bc1cb2c7971f2bf6624fd27e9f57edd2a5b4512feaf799efdb9f137704f47ffb0ddb6fcd92b154ad249d646
 MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
index 8453b966a990..c0b14ae532fc 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 8f552cc045e8..d4e60f2131f3 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-keystoneclient-4.1.1.tar.gz 316920 BLAKE2B f42ab0648f43fc6424cb502a996c7f81e688171aea4c94ae664d128d31eed04c6936e763ed996af990dda6dbc42d2cc7fcb0aeb8638b75133609521e704d2b55 SHA512 a88f992dfdb196a66ad3b173ac8f7c006524225d426c240e1ed27ae4007df5d5e74251e273c11316ba451f6fb31de6250e51203e70dec670f7f1e0b65d24fdd1
 DIST python-keystoneclient-4.3.0.tar.gz 324711 BLAKE2B ac32c2e4a2a86562cd694506c83e05a4373e86ff619c96772c8bc38329a4e1f52d2cf332b16cccd9690ffbd79c5046e08d44fe2dbc520ce2c2a9b92abe3cf634 SHA512 08131026648a03e03f5bea4505c7fc4922317c8e9d584729c569433a66416cb1584dc932132c5bb7b7d892b1d2545a731b0d77aadc321b1370e332c8fa9eb5ed
 EBUILD python-keystoneclient-4.1.1.ebuild 1066 BLAKE2B 722ed128639b4e17552819cfec52325b404f3c6fb6172135109cfe03fee81a84cb52048b0e2e372d64d2757b8d4afc98e146e6424023b409458b7e83c5700275 SHA512 1f239bd6bf7a1223cfcfdac2bb36aa5cc87c9ef46a596b43b1c83df4af7a4f0913fce50d6195093cc474f0ee67152b29494abfbc9420ccfa480f7446a8d6f701
-EBUILD python-keystoneclient-4.3.0.ebuild 1557 BLAKE2B 85d48d5a06985820db6ef11b2be6df03e7e444b0c43719f8132ad611f7bfbd05fee5b0eaefe6c151fb69e07c3c3429b07b225afebf428f6d8e08954df957738d SHA512 e49201f8862de64f819cce6bd6f88202fdb860801377295c64e50769a2a08ae8c0a880a10ddbf1250d7bee524b721f56e62252cf02ce4b62f2249df3205899a1
+EBUILD python-keystoneclient-4.3.0.ebuild 1555 BLAKE2B c0c307451f7c8ef3a37d089facf4f0b0cf5c6b6e2969ee40e65d88ef11da6e7d591c61c69cb796c1615f25948f12fa5eaacf9e38e0a59ded22d0adb82c4eaca9 SHA512 ecdb6dbced088d7b2a4efcd1af13c562c3aada16aea26ba91a68a1f412d8c67e919dd18cfcfdd729da60e8ce6358f9574baad014a41fb95e5d0f9c1765005390
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
index a286cf850a3b..f244735bdd87 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 65c2be187a73..b109c3be0a8c 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
-EBUILD python-poppler-qt5-0.75.0.ebuild 791 BLAKE2B b00de694cf1c5a869e1edcf05477505fe5cb302847506d8ad06ab0a0d13a8933e5f95718ab28390fa9d25a8c95fed83677d3a84ab50abba249eac407a1845e2b SHA512 768b25cb6f3b72d8812c887ed8ce5954b7250b37401c15f971e3ce293b1d4dc61d1a0368196fd2a9b4e98d33df05c64ebd35ce6c861ecc631f498cae1f61ef07
+EBUILD python-poppler-qt5-0.75.0.ebuild 791 BLAKE2B 91f44f72522a0356983397fc7952bce9eec772e79e2e73c084468d33863ca78f6ca49344b5a1dab11ca68d2068bbc81aa8d6907f2895cb59047027c5cd551a10 SHA512 66e25ab4696e3a5f7806121888d5d696180d60edf473a8eb944692fc5611af399828e555eb2e63b14ea9b2892bc1bfdd892905cb699eada1777dad01511a1415
 MISC metadata.xml 392 BLAKE2B 51992d04b5914b5248871f36659a45176628fe6e45f78b75ad1f64dadcbc5e2606a022498125cefcad2526a43b88e92dd115592b413b86245083fca038611fcb SHA512 6b356062a520973b99990be8f40ff7a5f705089988ebe889a09829fad92ff42d6ec4cddc406f39c6bb19bbf0d6c231557fd350348721c2d9feeb0d4808fc27fd
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
index f4b01c824a5c..6e7ff364efe6 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 qmake-utils
 
 DESCRIPTION="Python binding for libpoppler-qt5"
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 9088aeefe17d..c2d0c4ca0a87 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,9 +1,5 @@
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
-DIST python-slugify-5.0.0.tar.gz 11730 BLAKE2B 0ec93c230523bcd4ba5f917bc9d2676ae92fc164eccc84198777a59c36ff427fdb7a242bd89f9bc3d24e86b5a1d106f0118cf118349de648f5779c384445abab SHA512 b29c542ec3cb3d05d88be0fb53909b160022fe97dbc89efc0eef5f4e2414031026f570dd6eec1e7bbe2930d801c2fd8d152e49cd2639cddb23392c9b11e7266b
-DIST python-slugify-5.0.1.tar.gz 11706 BLAKE2B 1fdffd6fb9eaec13a1ece65433c53dbcb35c5ccbe2ebfb07055acac4d9a7be1e0832535aa6f335ae7eda5b07b823a3b4d63ef1f95f220b5fbf26c28dfbe62ac2 SHA512 6c52d6242fb6b2379e28b074987b474111527ac336dfa673828e5283347cfc52e056d9485251cde90493ea2389210701f566ce01916ae250d76549aafbea75a8
 DIST python-slugify-5.0.2.tar.gz 11728 BLAKE2B 701fb3f679cd4f714b5c57c14fb8cbfefa5b8268e9c4b877dd1e558e8a7dac325d69519b8e666043b70540908dcb250f561cebf0c5f444f9a3cfae34d97456b1 SHA512 79cdd1d0312c9e34b07dca2e898f177a85b31d3f290403375032ae962df61f3a9c4167f4bdf10f47afd17d544731d6961810f8a081ef615d76d8758c1207e6b7
 EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
-EBUILD python-slugify-5.0.0.ebuild 551 BLAKE2B ce836a2d2efe83962fbefa12a753263f51e2af6813e280f1474d75d262ea4744329d11735d4e33be1e09dd2e7290f41c2bb0c195abde9b34c9083663857e3fb4 SHA512 032ace168d060e3ac2758f83e759dae44d5da1d8edbb53e26e04310e09265b187a15665044e1b59aff95c588dd11b169eccd31ab8f805ef1f1ae759910bcd057
-EBUILD python-slugify-5.0.1.ebuild 535 BLAKE2B 547b6ecce9f1fb3da3cce0349dc5ab5ff4a578cbd89b0eed32176e15650ba364ca29f4ba650b60feb4f63c22e7a14f71642f30f73995b5de1bdafad6e53c8de5 SHA512 98c181fd8dddbff8501c5bad35cd50631908136f87634c04eb2f50f0d4aed2eaa9fa6ae7380b7d5c1e54381bbeb10448443ef044cf67098b1180059928026ebe
-EBUILD python-slugify-5.0.2.ebuild 545 BLAKE2B 31409c4fa610329f3d80722b5534ae4b9e9289480eb88443cfe341e76ff89a98dba3ce49d6b370f056590e93ab5d6e478563b4cda329b5b3ef5c0f1b4412d2f5 SHA512 b078896018eae4cccded2d333cf1b8b3e141fa43a9ccd69bfe453a0b248b0144418073f875892ced9e1d6ed7e8e313e2591e71556b5bf17122c6bbcc0aeca672
+EBUILD python-slugify-5.0.2.ebuild 543 BLAKE2B 97e438eb813bce17e76dbf7379eb967af083fcaef20c71799db30411a7e2a53aa2dd95906b773d6e3692124b519710ef10278ab54891c58138de04b33e0f0913 SHA512 4792d41186e9d0d67746d8b994583a431523021271d9c4c1c58ad0ac59bb7ae5a465f99abdecb5e64eb84da353a2bdb996e9a07beedb4bc3d2f5b78e3286daa9
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-5.0.0.ebuild b/dev-python/python-slugify/python-slugify-5.0.0.ebuild
deleted file mode 100644
index 45b50603863e..000000000000
--- a/dev-python/python-slugify/python-slugify-5.0.0.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-5.0.1.ebuild b/dev-python/python-slugify/python-slugify-5.0.1.ebuild
deleted file mode 100644
index 79448555636a..000000000000
--- a/dev-python/python-slugify/python-slugify-5.0.1.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
-SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-5.0.2.ebuild b/dev-python/python-slugify/python-slugify-5.0.2.ebuild
index 99a88f6b9118..5b15078fad2f 100644
--- a/dev-python/python-slugify/python-slugify-5.0.2.ebuild
+++ b/dev-python/python-slugify/python-slugify-5.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index c6d81248cbbd..a75e21394d52 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-swiftclient-3.10.1.tar.gz 199466 BLAKE2B 4230f0fbff0e61a8172344df1cfc32f07628ac0b3784f5b8456d1b43b962e1d8561eec55c530ea94c615d46cd9454963fe0e21c54d1f4097016459e1460795c9 SHA512 f47444243f1968fdbba0643bcb4f05fc10a201b38ad83522e842bbad2221d0893a72147f9fbdc13e7f56469b049bbf11479fd9f41a9706119287543e0587f696
 DIST python-swiftclient-3.12.0.tar.gz 201199 BLAKE2B 36a5bc0ed7855b8ec8df51635ed6a2afba405c73809f3ab17c77e07dc362a2578816e63adf6c8da3b81ba8bfa8973326004c09bf980961b3c90987ecfdf95e30 SHA512 00e2b1b4d950396fba9232c251dbdf6949ea60e1f9de8f633ffcdeaa51339c5487fbccf9d9f337ef7aecba30e504338c592f9ed64d1d5c6798307a35b806f684
-EBUILD python-swiftclient-3.10.1.ebuild 1477 BLAKE2B 2487fb1cdce42044c8840e65f93fdd083cd9b51a14ff69735476835a1b910e70b7bdb3dba83bdce2c5018d8fefddf84325b30467849347ebf6e2c473285d4132 SHA512 333f25cc332dbee41e391d75563da463dbcd33316546ab51693db8ffd7aff72ee28caf6b9738525a64f6b68533e0ab3dd6738ceaac4d070ed6849fc426c446f8
-EBUILD python-swiftclient-3.12.0.ebuild 916 BLAKE2B 2167280c078b707213f98dc0dba4aafad35133988c6392b2cf6e60373477368dc9979b5c5aa15c36fca2db8de621cdf44a027a71ded236ef8cbd1c44928388a5 SHA512 9ca46627152c4f25df45b3cc6dd112fdc4fa37b74fb42187d0928ef363a0053403c5993bdf8190985ad6a95d29dd31afe7437260149acc3ff6af3651c9974ddb
+EBUILD python-swiftclient-3.12.0.ebuild 914 BLAKE2B 24ec25d8fc430f80be7ca7878b4610167543fcde7272494d01358a981cd2213143f256b45ef7150bdd50c7a5da2a3f953ded47d4b573b7b6555fc3184c280387 SHA512 9e9ca82361f26c87884fe61a8cf8a25ec068b24d74abab839b7ea10926665f266c631e096204910d70c1afb74ceff4fffd3aa26ff8b07265a8585242794c09a6
 MISC metadata.xml 516 BLAKE2B fc43b031ba021a2a1cc6dbcb86764ef6f9cab62794220d4f3850050550a18a80dc112d0dd6d1be8562f1d6fd6d961057992e22abb4b4774c79bc69ac7c5402c2 SHA512 8858489aa10114c604eecd42e954d560a04d02e22c139f418b5d085c1be3fddac5d3e3c2ced39c2e4684d970569284ac988cb24d492e8997c3caad7e9ce59f05
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild
deleted file mode 100644
index b012263150d4..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-3.10.1.ebuild
+++ /dev/null
@@ -1,48 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		!~dev-python/stestr-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
-
-python_prepare_all() {
-	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
-	sed -i 's/\,pep8//g' "${S}/tox.ini" || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	stestr init
-	stestr run || die "tests failed under ${EPYTHON}"
-	flake8 tests && einfo "run of tests folder by flake8 passed"
-	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild
index 061cfa612171..03ea46a52e0a 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 95b94dfaca6e..c0b8dbce737c 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,6 @@
 DIST pytools-2021.2.8.tar.gz 63381 BLAKE2B 975a611c0ee7b013facf9754926d52e66184d69b9bbbe3ddafd252d0c0bd093c11cb91140879e2660b7e2a4f2291b58f728b2e19add2e205653df59a9f2b7be2 SHA512 9dde96889c3505f5cf4eb06c3174b889ed8ecc964ac95d8cbf36ad500ab23470c5ee46b8f96bc4fa5d2dc710d3603680643a61e10bac4da8305d92b1e3ebd0d8
+DIST pytools-2021.2.9.tar.gz 66254 BLAKE2B 576e10a1ab823827d030466a2f39ec5510c02a856288d840904a5d3b612191d2a108393fc9a73072b8757e7729b4ead84829805e8913e4c54949465594ac8842 SHA512 1afe6feb6e5094171aba9a2749418a5e677cb70286be1ac9b65d1470835e1ae68f72f7c4221149358ab1595cab438688882b51682c5865955edf89ae32ca6d6d
 EBUILD pytools-2021.2.8.ebuild 551 BLAKE2B 9679116e983c06b650ade862f561ab68bb164915b71fc032151f7866674b3818b3609ce2eb05dc89ddd906f94e5a5be883ff5d317f65fd09f63f3b35aec4f98e SHA512 b17924ce980dd2424ca2b57e0d5416a98f2d97f6ec08b64767527d06631c9d791abd4696e92030d0419682dbc70007267747b5ad24edb7c3dd3635349a351a6d
+EBUILD pytools-2021.2.9.ebuild 552 BLAKE2B 8ed49e0428f6646baf0aa74bde7effa173a68139d81b4cb9a4da65c24472eafa7965a5707ba1eb0f44f13985a3f3282056ffee25953c38e24824d826cead0972 SHA512 b82416f833ae16a5551642d06175d2552f7e1d73bab5db51e29cde8f56cd9e9b994e2c6485059b27092450be1b4814de4c8a8f4ec3645670d2c3084ebfcd79e3
 EBUILD pytools-9999.ebuild 540 BLAKE2B 79935eaf65d8de5623d628068ae537aab12ecc18588272ced9da06c7c3f9343cd83423baf7c56308fa596809f4b2f28607b5f7cba9810958df8ca8157751a3dd SHA512 41da1b9e57b251a497a6040bb95503534a262b1481dfc92a52534874d7268857ada753d36cad384e78878c05221bfd4efc0f427538c829add7be996f68f28d43
 MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
diff --git a/dev-python/cachetools/cachetools-4.2.3.ebuild b/dev-python/pytools/pytools-2021.2.9.ebuild
index a18634292857..5400173d9dde 100644
--- a/dev-python/cachetools/cachetools-4.2.3.ebuild
+++ b/dev-python/pytools/pytools-2021.2.9.ebuild
@@ -4,14 +4,21 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite'
+
 inherit distutils-r1
 
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 7254f6ce9336..dc219ca6341e 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
 DIST rdflib-6.0.2.tar.gz 1273100 BLAKE2B aefd98c480710ece6fc5e621ebc0526eb24c61d36872280aa369baa2ce5bf90173190fa01d592861d2d6a9700fe9fc43a9ebe6d0b1f68851442e860ca702bf31 SHA512 0d14902d24582aad01289f5265feba3c533bbf5a0928b2e1032ba0af16d16cce46a92bde0f01ec2980351c1c13fe2cf4113445d2731e04400f0c20de73efa050
 EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B 8c7608e445a10f5ee8cdf04d44d0055ae1eca18b6af29bb7eec75fe1ada154510439818822cc2470976628e9f226a6ebfa4a0c0f564dc894f77a6c6196fd2671 SHA512 d45fe4ca9a55f56d9622bbd0193216907796e4b91e4d949df0a93ba8eed8b58f30995fe74d8eee96da7bdf3aaa52f4bb681cdc4b4b3799b7029825eec8660e5e
-EBUILD rdflib-6.0.2.ebuild 1299 BLAKE2B f1c05369e7c38bd568dc63a8a930564a955def6e353eab498b77814762acb303e484bde37ce0700a3ffdbc4edeb5b3d8eb967437ee4bbf395d741d5a5bd2d79c SHA512 d5cc4e11070f70f3d274b921eaaa1b604e17f4cf02bb05b5fcd1c8a97f5f7f8858ced9429b49618953bb4bd49eb729c04ca342f3751d6c56b6cae0a6e6f5435c
+EBUILD rdflib-6.0.2.ebuild 1311 BLAKE2B c33814cdc50ce492d5ea03af76b55b1b45bc3a0fade7187224c4d9bf6c19cf87e06d7de32ef1c85c7b33cb4cf5d2b87303e5ff1067e5e2238ff21c953689fd49 SHA512 f452812e17101d84525fc191808940991567222b64010aafe4a253b20835a9fd61503164ad0de93c0420eb42a360a8509b597c6174fd4f5da106a7017d9e5e8c
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.0.2.ebuild b/dev-python/rdflib/rdflib-6.0.2.ebuild
index 2895873653e1..6f38b57fde6b 100644
--- a/dev-python/rdflib/rdflib-6.0.2.ebuild
+++ b/dev-python/rdflib/rdflib-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 3647e735368c..1771b94091de 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
 DIST readme_renderer-30.0.tar.gz 27065 BLAKE2B 974d6070e2704e293701101a99161b7a23b97799b0bb841bc196e603eb97314fe5dcc93329aea2c67921f3ad6afc8f66c6b3742b4de966547ecc5ba2027421a8 SHA512 fafaae9a9ed61338611c509fd907f6314b97d13a30fb5cdfa2b8dd5d08097fa05d8edd27fd880725f783cf96326dee40e85da60bb4948bc810162b53528d18e4
-EBUILD readme_renderer-29.0.ebuild 806 BLAKE2B aa480a9e0e52213dd141e5bfd858ca525358635dc69609ee17404588f3f9357bba7b5fe9ac0aa2a5584297ae287a2d37ae24e17a190535597212f32d379630db SHA512 bbd02c0d027c0095c4505929b7e96f620520d7a5f5a854081d9be7f0133da8c8b42184c436f9f2503fbc918beeec08d8d21542480b0c585039ca7322f24bb02d
-EBUILD readme_renderer-30.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
-MISC metadata.xml 416 BLAKE2B e7d5a0e8fe310d2c5e3afaf1f9008d80104ea6126a3288f5e24c8e3d07a31318f54493bb1f9c4f5863a30a6f806224e04add4e058a8d6b7d7c8a18d54db34fba SHA512 308fe7b95e6652e9e99517ff9ad202f40ca77dc86dc69a15b0989e8885ec9a6a96fef9f6d82325ecfc2d06f8c053f91c8bdd83d10cbe7304063bf52b2e9dfcb5
+EBUILD readme_renderer-30.0.ebuild 772 BLAKE2B 3aa951a47e7a0461b11e25a47eba165e4624c7580aad8b578a091f1e074c7c09fe17c7d287d18d00ff44dca6bde508720918110fc9cc4797c3a07a6bbb593e49 SHA512 66430e60cc77043cc07415391f7b4d01189c9033e369c7532aa9a89e26734ec21fb49c4f027daa2483e2a9202af47a4e40897b4025b0de4ec6d2706df564cd22
+MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/metadata.xml b/dev-python/readme_renderer/metadata.xml
index caea2d603c7f..681b5c1c0d94 100644
--- a/dev-python/readme_renderer/metadata.xml
+++ b/dev-python/readme_renderer/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">readme_renderer</remote-id>
+    <remote-id type="pypi">readme-renderer</remote-id>
     <remote-id type="github">pypa/readme_renderer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/readme_renderer/readme_renderer-29.0.ebuild b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
deleted file mode 100644
index 57c165645ed2..000000000000
--- a/dev-python/readme_renderer/readme_renderer-29.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_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-30.0.ebuild b/dev-python/readme_renderer/readme_renderer-30.0.ebuild
index 1b1eb632f04d..110c64785058 100644
--- a/dev-python/readme_renderer/readme_renderer-30.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-30.0.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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index cfa7d5be945e..7db3900f0c13 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,10 +2,14 @@ AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fc
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
 DIST regex-2021.10.23.tar.gz 703746 BLAKE2B e26ec50994375f8b128206743209dff1ceb760b67967ff66d2553c1da27840e0df1611bf1a2746fd26246d3ac8b4a3974c98c8b4d4ede4e6d7954875c17b2405 SHA512 6bc67a066a7f33f6567a672132b1b65d89b21152d5ec3546262e542413ce40999ad57fb55eec92b9f4010489968b6eed1dab27efa63e14b771d883a890ddf9ab
 DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
+DIST regex-2021.11.1.tar.gz 713328 BLAKE2B 165949eed94deb7ad6a12ca8e73f99b2b6aae26032d6545e74a897c25b32101707d67efba4cc936cdcad361a799e5742816178f0157d37e1fe9876c8cd4d60f0 SHA512 98efb00a88548ec63759f82870775d192ad2456d6c7b6362837e66980f029356fc270e991cf40ea049ead4c98d2baf8bb9a19b118ded7fb24a0bd6efcc1f6916
+DIST regex-2021.11.2.tar.gz 712630 BLAKE2B 0a6247d1ca26b0ce644f8036892ed4a5177d69b06eb6055bcd42a08874b24666df7525d19c270b61eca0c14474a0b68fb365e4f0499cdf5ede6510595bc302b8 SHA512 1863158271224595f6a540dcc0f7fd9125b69f9cdcf7b67efc589605b739e7ed7a09fbe30fbd1f26b1d57fca25df8b150b9726412d331a4aa757387c247cb904
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
 EBUILD regex-2021.10.23.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
-EBUILD regex-2021.10.8.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
+EBUILD regex-2021.10.8.ebuild 859 BLAKE2B 77a0bafb82852650fecd29f1d0d9d380029dc15aa117d496b4fc6a5025fb263a6da0bf6ca8baaac886ffb6f920e9372851b9ca629c89d88ec6b27b04483131b2 SHA512 e5cdc1b24844d406d3c79141b9e318e7ff42e04e7d23709382ecededb8421babd288a5aa12725e3d05b244f3f8cd31f2cefb11a6f1c9551665019cfc22fb0179
+EBUILD regex-2021.11.1.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
+EBUILD regex-2021.11.2.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 EBUILD regex-2021.8.28.ebuild 858 BLAKE2B caaeb0db90154588d00da89b05f0d7310cf8c9990ee7172b47f3c166daa56559d81b83811960174a9134dcc6f7d481e1271986f7ed94a3d7039a81080837564f SHA512 e4b91c910d1684786ab453f47ea5f3939ab1d5d18ba7383a7108a086b1bdc256abe05fd096212b186f658658589d04459f0a4b581b7e421b262c9e13ffe4d5b1
 EBUILD regex-2021.9.30.ebuild 866 BLAKE2B 5bd86b6308e96a7e9ae6fc3d3a131fa43accdbca68f89f0f139abc2c3157ece63b0b9dc174741b5f27162c8cd4ef2c72617b38e935e3a036af17123474dac7a4 SHA512 38d6645f1d715ef347065e7352d29b305e46bbcec26cac2f1982431db01f5cb0dffce9af233b8aad725f9aa4f08c0c848c3dde8459d43faf95472c5610a4d308
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2021.10.8.ebuild b/dev-python/regex/regex-2021.10.8.ebuild
index 67c833d04b54..4a336d826c82 100644
--- a/dev-python/regex/regex-2021.10.8.ebuild
+++ b/dev-python/regex/regex-2021.10.8.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2021.11.1.ebuild b/dev-python/regex/regex-2021.11.1.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.11.1.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/regex/regex-2021.11.2.ebuild b/dev-python/regex/regex-2021.11.2.ebuild
new file mode 100644
index 000000000000..67c833d04b54
--- /dev/null
+++ b/dev-python/regex/regex-2021.11.2.ebuild
@@ -0,0 +1,34 @@
+# 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
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 236156ab6b10..082390c17925 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel.yaml-0.17.16.tar.xz 183884 BLAKE2B 3f7b0995cfa49ed9e19b5dafbddc7514f58ab23186410b4a718027112be471d9136675259800e0136b21ad6d1645c364f14ac071dc10d12a5f60aefdc05bc56f SHA512 7da1e5c229b78ecdccd648fb6a734095c0a1e0848eaf46af93e6ce69f5e065cdd07eb65217f8b3e4c82ce383dc11de07a1345026c6782aa26c4ad0f5a85fd80f
+DIST ruamel.yaml-0.17.17.tar.xz 184120 BLAKE2B 05bd1dd719677918a49798f377c5e52bd1b8c7e3bd38a416626330baec90f3e7a71509f236151be73b1773e48ae02d25ac01ef970ebe6cf15ccca49a01a996d1 SHA512 72fbdda33c193dfb556367d79b50e148d2aecd4f2b04cf5b48f2dcf4b690e0796b40273995badec655891408bb8ba6a7e84992e6911e55e75ab453403da3397f
 EBUILD ruamel-yaml-0.17.16.ebuild 1271 BLAKE2B 818ff85d32e69a1d7a1a2c5e381cd9b96b107f29aa728188d6ccc3eff96a4249a69cedfe8b5995dfc5a0913bbfa43a96d19c3717fde1273d3245a1a549a7976e SHA512 d92b25c5406314c3e8fd7d572940262faf5a7fa4100407d6146e10c27611e7561e602c2324039a532409111079118b5eaff2ffd4b7f05cda7b4e958b16dc722e
+EBUILD ruamel-yaml-0.17.17.ebuild 1278 BLAKE2B e0646bfd1057d47eff7e9b32471620a10d0688adf4c6b13e05cacae4b145d386a33fa739aa5c75a5f38932f3fb33efcfaff8874075b057f34098c7b96dcdeda5 SHA512 65411e5d043f8a58e2fafa71d5b9e63670f463bc5d6eb050e4a5aa7694f9b726a8c581b6b943b526831cfb75d4e4b6469ce4709f415ca8953f0053aeaefef4c2
 MISC metadata.xml 871 BLAKE2B 6564544cff4338a49a824966fba46176125f3318f3a53fd11a1983f3c2f08524dbb9479f3ddd16a58367e4e044aee1d9c14779a425b84a1d80e5e14a59a9eab7 SHA512 9edf1d1c08b976f51e8eae4582d56d99ea1e47a9da29c62e3e3a9402cc616bc587c7d9d8324660485a10f5547d18df270fa3aca21d198d56d886a53978c2ef75
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.17.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.17.ebuild
new file mode 100644
index 000000000000..f87789872e5e
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3dadc9e83464..76b2b740caa0 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,8 @@
 AUX setuptools-57.5.0-syntaxerror.patch 1364 BLAKE2B ce5928c3ed54bb2f2211f5bc6c57b35e7baeefa634e008ed84c48022dd74f4db663cfc588743b4ba217e4bf33e1467f4010994a8f89029ff193182658158dacf SHA512 2c126cecc92550b15b990e7eb44c584cd141a5a60f1b96783af72889ed7fed5d6de16ccd53970eef945114d530c6544e71b2e69dc2218f6ad32ffe8942bebb6e
+AUX setuptools-58.2.0-fix-pypy3.8-install.patch 3172 BLAKE2B 238ff186cc10426c8e7a5bbd123ce5d151c136e0edd32b0853bce20a73640a2d8085648160017d0e963a4e5b8e6f23fb3a3cde4ae15c3a566fe83dc7d8f47c10 SHA512 1cd5ddd943b7b6cef873314f9eed8df4f596a6b9e1d119969eb724b16ff530f0319fadea15b666d3c2a6efc75456efebed5361e59da1775cebfd7d1b277bcd52
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c
 DIST setuptools-58.2.0.tar.gz 2268140 BLAKE2B 13281c3b2ed664fdcec77117cded285fb5b608036c19715c7c786734bb04cc02bc0f300a28e7c49967f695a6b706f9413baa33d99ac4f1f957522136ee5857e0 SHA512 028c9d9533f5493ff89c80c705ea002661a70e0e43afecb0c7546029990ae599e16fad7248ffc29573c18c6aeb33f1bba1fde09f25fe04b74717ad9308ce9cfc
 EBUILD setuptools-57.5.0.ebuild 2973 BLAKE2B 3442ccf93ba5569395c7798e24b891c1260aa71117e684daf82ac7768eae617476867b90d548d9a537a1ed4127a9e7b42931318be71d66ae9b8d0d81e078e11d SHA512 89a2e9ccdbd3671e4ecf1a6f93934c729e761e956ac5e30265afed687a364145dbf79193b16e8f846f8bda5523e22ba4b4bf5277b2d9b3fdb1eea2346eec2789
-EBUILD setuptools-58.2.0.ebuild 2888 BLAKE2B 44a2275c680e522e300006dbbb0caedfb93262f7ef37288af55f63f86f92b26ecf8a0fc032461561d96bd50e698f7e2741acfc6c2fa3a504b5b71dffb023c186 SHA512 2fceb8e1e5f3f80be236d8379b6b8608ccf740d9a9ae07fa7d86522863335bb7b0057f6240af13c57162438a662e62f8d65a18be3e0e5c6080d13723c07b2bb1
+EBUILD setuptools-58.2.0-r1.ebuild 2992 BLAKE2B bfe4122af3be5ef4e608f1dd67bf4b66db1fc2e20e5bd1ee56fef9247819b6837739e5f46014f171929bff3ada2a47581ed60f7416f25d9d87247509701cd94a SHA512 4c5801858bed2125665923a11ee076db68809b24903fb0ffb46e0dca53af30fa72704ae08a6b105bdc74483ad32cabd3c30d08ffc776887d1e6fa5ea56983a22
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch b/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch
new file mode 100644
index 000000000000..238bc47d3328
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-58.2.0-fix-pypy3.8-install.patch
@@ -0,0 +1,78 @@
+From 987edfa3265187a47b8688119943e7d96712d859 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Tue, 21 Sep 2021 13:45:50 -0700
+Subject: [PATCH] Fix PyPy3.8 install locations
+
+---
+ setuptools/_distutils/command/install.py | 26 +++++++++++++++++---------
+ 1 file changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py
+index 866e2d5..e98f049 100644
+--- a/setuptools/_distutils/command/install.py
++++ b/setuptools/_distutils/command/install.py
+@@ -29,16 +29,16 @@
+ 
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+-        'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages',
+-        'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
++        'purelib': '$base/lib/$implementation_lower$py_version_short/site-packages',
++        'platlib': '$platbase/$platlibdir/$implementation_lower$py_version_short/site-packages',
++        'headers': '$base/include/$implementation_lower$py_version_short$abiflags/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+-        'purelib': '$base/lib/python',
+-        'platlib': '$base/$platlibdir/python',
+-        'headers': '$base/include/python/$dist_name',
++        'purelib': '$base/lib/$implementation_lower',
++        'platlib': '$base/$platlibdir/$implementation_lower',
++        'headers': '$base/include/$implementation_lower/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+@@ -64,8 +64,8 @@
+     INSTALL_SCHEMES['nt_user'] = {
+         'purelib': '$usersite',
+         'platlib': '$usersite',
+-        'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
+-        'scripts': '$userbase/Python$py_version_nodot/Scripts',
++        'headers': '$userbase/$implementation$py_version_nodot/Include/$dist_name',
++        'scripts': '$userbase/$implementation$py_version_nodot/Scripts',
+         'data'   : '$userbase',
+         }
+ 
+@@ -73,7 +73,7 @@
+         'purelib': '$usersite',
+         'platlib': '$usersite',
+         'headers':
+-            '$userbase/include/python$py_version_short$abiflags/$dist_name',
++            '$userbase/include/$implementation_lower$py_version_short$abiflags/$dist_name',
+         'scripts': '$userbase/bin',
+         'data'   : '$userbase',
+         }
+@@ -83,6 +83,12 @@
+ # and to SCHEME_KEYS here.
+ SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+ 
++def _get_implementation():
++    if hasattr(sys, 'pypy_version_info'):
++        return 'PyPy'
++    else:
++        return 'Python'
++
+ 
+ class install(Command):
+ 
+@@ -313,6 +319,8 @@ def finalize_options(self):
+                             'exec_prefix': exec_prefix,
+                             'abiflags': abiflags,
+                             'platlibdir': getattr(sys, 'platlibdir', 'lib'),
++                            'implementation_lower': _get_implementation().lower(),
++                            'implementation': _get_implementation(),
+                            }
+ 
+         if HAS_USER_SITE:
+\ No newline at end of file
diff --git a/dev-python/setuptools/setuptools-58.2.0.ebuild b/dev-python/setuptools/setuptools-58.2.0-r1.ebuild
index 13e77de865de..2d78feac9fde 100644
--- a/dev-python/setuptools/setuptools-58.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-58.2.0-r1.ebuild
@@ -49,6 +49,11 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 DOCS=( {CHANGES,README}.rst )
 
+PATCHES=(
+	# https://github.com/pypa/distutils/pull/58
+	"${FILESDIR}/${P}-fix-pypy3.8-install.patch"
+)
+
 src_prepare() {
 	# apply distutils patches to the bundled distutils
 	pushd setuptools/_distutils >/dev/null || die
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 01569da7b48e..f83baac63991 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,10 +1,8 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.tar.gz 1181661 BLAKE2B 7f5638005a01fc1bd60ef6156027db625faa393d5ee9155c88c88aea88e4c5ce63c30a2542cd89aea7c7e066cbbf77aab9ee9d2a45210dcad964e38052cb06d3 SHA512 88e4447aaa574a312bdfbb6ef78fdb95824f33d79988cdf5c824952b7f3535973eed6d8eece7b8c9ce8b442aaa2235e252d438f2316d13272a35c484dd4fda42
-DIST sip-6.3.1.tar.gz 1200906 BLAKE2B 2dcce853a1f3912138a2830b2370db518400119c5819070fd0cfc6ffebee06bf6629ae521cca535f5873859b141831dcfad7b077321356ce2ae69ec15ee28d6a SHA512 69705c2552a87d451ea989b99bb7e3fb15163447a3a5b3625e9e6509ce9e59d52fbfbb19ab911a2efe35219a50c08f0dcb25e16b222e0c8e1094dee0fc4b3b97
+DIST sip-6.4.0.tar.gz 1201890 BLAKE2B be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee SHA512 eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-5.5.0-r2.ebuild 873 BLAKE2B 6056c5ce42dfc77adfef3e38413eb91d150edfd33704dbd0434d4bebb6481b34376768e6b106c26e606094983a548155d5d62315f9cd9483ac49f6ba506a1eac SHA512 b7e8751fd35c0447502819f21600ce4fd7a62adb24c28510368fff1c5d1e21b1d6993aafe2c4b9bc863e44b4999b7ce42ccd67f06203a3aeb25d8e508ac80f39
-EBUILD sip-6.2.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
-EBUILD sip-6.3.1.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
+EBUILD sip-6.4.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/sip-6.3.1.ebuild b/dev-python/sip/sip-6.3.1.ebuild
deleted file mode 100644
index f917fbbbb011..000000000000
--- a/dev-python/sip/sip-6.3.1.ebuild
+++ /dev/null
@@ -1,32 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/sip/sip-6.2.0.ebuild b/dev-python/sip/sip-6.4.0.ebuild
index f917fbbbb011..f917fbbbb011 100644
--- a/dev-python/sip/sip-6.2.0.ebuild
+++ b/dev-python/sip/sip-6.4.0.ebuild
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 09b4fe4a1b50..0dd86dfb9f29 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,5 +1,3 @@
 DIST sphinx-gallery-0.10.0.tar.gz 6544847 BLAKE2B c7ca0398b4a2c0090a9c6154b7aa068e05d4eef832a756693b07a23902d1c2e54bbcdb19c108a261555a12646b6fc5fa2314e0337ad8637c4d63173338189054 SHA512 9aa56966ec137f678187383440c0949fb1f91e88c66ad297efd48329627b9891c2d668a2472b071d9352cc22d717e41a5088884fa89a26707c5399dca7cc7237
-DIST sphinx-gallery-0.9.0.tar.gz 6530860 BLAKE2B 925a745a9bedaa98cf03fbd66bdb87e5c147543a21944d827f738ea1a8bc657a01f0eba2fa5abe64f7bd3632bef604d9490740f2b6fe5100bba92aeb93f3eaf3 SHA512 e511100c5add06de681b0682c90b3e914d49625c63391896dfdec8e6f6f378cfc65fc3425d4216ee0ebbdd4feb3397517ca40a838947b31257654fff2b8a7e8a
-EBUILD sphinx-gallery-0.10.0.ebuild 1057 BLAKE2B d9610f89dda4d6ceaae91bf44259d4a0d1f31b567bc32496bb706246aa2951167fa9fd6bd3640373cd03bc232ff14141013ce339c988ff1e10acf299d0b2e3c2 SHA512 2f4f7e138a90923cd582ac6783cfce5d5f2fd85ff86ebe86928c3f6af83159d71a09356a7e7a6c015ecf39a87b33a6f3240a452bee15842f46ebb158f6d11ae7
-EBUILD sphinx-gallery-0.9.0.ebuild 1115 BLAKE2B f981d3ae9bbcb2e8bc66cb04f908da54b84c27b37b3ff3448e7d6bfe5225ad2913de49a28ed2ed0bbcab413b3d701853964f0f3bf96fbba04ce6694ae1e03557 SHA512 72576a4da31d63d3048184c5940479ffbd02305d8067f53750fadeaf741e0e5c3fb017804b9c3087af831fab8f4af79bc9b0a976dad1699b4bdf1e8b3f538924
+EBUILD sphinx-gallery-0.10.0.ebuild 1054 BLAKE2B 2b554e552640c4152966587567aa2824d5a4de188fe1049e2c2ad92b9abb223fc2318f6a58b6f0a306456e06e25c53d81d163e12300a2ffc49ba88a47dbb8f4a SHA512 875d7334d9c487be4c6be15467f6f64109a0c49ac969ea0750e0a80773235fd6ab1e171e5fa7b0a8c056649fd1393c14897a474d5760f5fa1de779e25b21e52b
 MISC metadata.xml 424 BLAKE2B 4e5cd1e912fd5934c7221d3e5cc60b2894eca6b994384f6ceb8397ce9c5312be1e9869b57f9dd7f3ac66501b20e6fd6abd2f33b5d19b93d3a12f7158ba08e7c6 SHA512 17acc19bf43dbbf1a377949576252f77fd334ddd8a3bec593d2339db5a44e4fde831f9ce47be97318bf72e30a062608f883e48cf572904b3476fde0df33adb09
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.ebuild
index 01bce9304f3b..09cd037c8e88 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.10.0.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.10.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild
deleted file mode 100644
index 70c7730b3110..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild
+++ /dev/null
@@ -1,48 +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="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
-		sphinx_gallery/tests/test_full.py::test_run_sphinx
-		sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index dca5405beb91..f210306bc9e1 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 506 BLAKE2B d5757c929030e6f80b127208257287d6330b31156c2b7ed365a516b1165a762e9a99908400b1ab7b7082af9b55b55cb8cf1594a411c777bd29d8b4c042faafd7 SHA512 9c51c0e780caa15f43c6e61776b3856e3b5ac777ccf38e8add8795fc26693f9ca7d29d2fdff482d482ae19042b02d852c6721fb64691a5e7dc421fed3b55cf5b
+EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 507 BLAKE2B 641ace228c6ea0a9fcb157cd052dc5c1d3a4ec59d37ffb00b2c13c1836af0f6f09a3ff6d63e234e2a9645c823a4d8a9780a869074cf8bf91e6570fc31ce30229 SHA512 11ebe2c6186f630c5af20a77b90188ed4eb104f21c2ea699710928994641b2d003c2097f54a2fc8e4bc126e7bc91d9b3e95126e85edc61e3d7d380d2dde5029d
 MISC metadata.xml 429 BLAKE2B b4e7eb03faabacbb5a7b41f1b0b04ae1580f7a00959b0d0e575577cf0b93f1551773c492826c7635c6cfd18af0e608a23e7fceedb76ef99920c1f09fcd51ee17 SHA512 ac2b159c1a66cf08d5d4990150b0e930b40bfe8ab7f016e3b7d0d479110c0b8c402f33b46175dc31b56e6136a26fc84223e82fe5bdd87cf3de1a6b175254c62a
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 8d6b73eec050..6f54832beb6b 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
@@ -3,15 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
 HOMEPAGE="https://gitlab.com/lv2/sphinx_lv2_theme"
 SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 94045f9d52a7..2fb9d8978ea8 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-doxylink-1.10.tar.gz 20217 BLAKE2B b5b1128d8b60e91b655b2efb093afc77f10e39912c841d2241576c0ed7f1c6d23c92272ee988435958155b9506d22dd5a8b0373bda7059040b38869aea37f9ef SHA512 08beb65cb22b02ae253bd526da00cee322cc72fc00214818f3d5fa503d36725a08f67c6b46f13fec10b1d9963cd7c7ecf57109342d7a2ba991cdba0fa6ef8125
 DIST sphinxcontrib-doxylink-1.11.tar.gz 22043 BLAKE2B 73d137d2c7df594c71def4d422040eb46028192c13a38b7f765dcbda82034936e3985309254b536d9ba49a32e2d9df9c8eb7886b7a365bbc0440e901cb0250c9 SHA512 14a3511c6958d05f6209c292563068e58410e6833821c8339fa95c511ac2c8987b05097a423313345f2c7e9c1dfd17136bd8684520341160fdaefae1bcc2dcc2
 EBUILD sphinxcontrib-doxylink-1.10.ebuild 1004 BLAKE2B 85348b89cf7e84fd855f7336bbf354fd5757978f701fe8b670f04650a80fb1ba7c8c24e0791a543cb98cbb193421f1d4d1358b75bd0f741193f9b8333087a500 SHA512 3a0b09fa82cb7be8b762e22882701b1d24620cc106aa63c9af6fb42370a391e0142c6156b8f76d64c2eb46ae839fe45ce45ce3bfffc7ef5f4be9f33317a94b2e
-EBUILD sphinxcontrib-doxylink-1.11.ebuild 1050 BLAKE2B 203774a4a223ece1d027e6e3b92eb48e0cb4a1f7185a6438878cec6093282e73a9a5087afc8ebd27f1bd7065a6ab7269d179d0256386870c3f495d6633e09e14 SHA512 dfc9f172233546010608a3c3aa6364de03022e125861b9f96c0b3f7f2c4ce43c0b4084e4d022dc803410917549838756c83c86450e3218a01288cb611ce7b3ec
+EBUILD sphinxcontrib-doxylink-1.11.ebuild 1049 BLAKE2B 366ac9e2b3dc90bb73fb0b04891ea89ec2faaed5b8029dfb4f970020cd3b5ff05f71ff895e77fb30233acfa9de1ad9d7c9983a5f02536882dd8b2f3e6ea544ec SHA512 4226ad4c243f9bcb76533cebe0d243345799465195ebef162f7065e8410ddbd5bcb787d43e79ca8241ce3c76145c0eac3ea26f5c34f05f904ca09930bd3996fd
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
index 8e91c69735cc..acec96b8fa36 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 9a582fd6ac15..089f84b5df8e 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -10,5 +10,5 @@ EBUILD sqlalchemy-1.4.20.ebuild 3127 BLAKE2B 1eab3aec274e4151fdf6fbc3dcf7d6160da
 EBUILD sqlalchemy-1.4.22.ebuild 3135 BLAKE2B a33219c712e87ef93f1cb549340d04c513222878fa3e374824158711407272be30f64d865aa2a5a5e2e30434c79728bee719214a7d1f9ce8c077d62842727037 SHA512 390ac7f5f6f607d2418b275192ef2fd53387fb9ba1df6f4ed4519b9e512bc98bbf2fdf49b6ba09f36b2d568a9f882752966e3727bf925c9c5d1c4d70afb37f16
 EBUILD sqlalchemy-1.4.23.ebuild 1561 BLAKE2B dbd9e34b6ac33894ffe547827b8fad24fc3e4194457e7ca83a2645fc45f1abec67d3152f9a69cb6bc64d3949bf952ae17b4b823252efa303f4f48409b709cd61 SHA512 016509c20424b3cbedf3dccfa96a39d59427e43dea14cc938471c005903023f5d0dcd04caf7153319310880ffb0320539d8daa32c02d97e75a03ccf04b9cd93c
 EBUILD sqlalchemy-1.4.25.ebuild 1558 BLAKE2B cc6d1a53451ed1b8b6c3d538de7c525251cdd47b38156149131bb9539f173406e741d68709f3338615c7740912c891c26f8fe94dd40ffb6d0e5db30e202c2bdd SHA512 bb73b56dee4b05ca4db6af151efa64ab9705f5f7533912b824e68a9e1b487eeddf765ef778473051b8987d9823f0fe521f5af72a85d39d79d05e58d079486727
-EBUILD sqlalchemy-1.4.26.ebuild 1354 BLAKE2B 7bc328496e4c6fc1d17b13775d3dd874a6194e2cfc29663d064cf8fa2d8ae18ded4ed0f6300e2be36f0365d949ae605724d441321e6e612bb957b32fdb281ae6 SHA512 730ee50cebd211e1fe957794ed6fb6482a0efdd1cb324faa1f3975b033d0189ca6b731fc9b94b3bbd20226b209fdec0bc3b3b2a33c39e5747b3f5ee4c4f5ac73
+EBUILD sqlalchemy-1.4.26.ebuild 1348 BLAKE2B 8443c938e9317d68ce944effc05cf2eea845e2cc92b59c4f0eb65f14a0a576604b80b727adcf8dc3ec5402d3fd59d38f3f9c6eced2231e9b8283f2180e46a15c SHA512 0d3a2a099040c67834a08beb899de4d53299b57649f9a5798cc0295c93a8cf5fa26f751487ad1bfc75f23903972b668fe29a899f6d26ced7e2dfade01e1446b7
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
index cfccf161e9bc..c65335ded350 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.26.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 148cfb4affaf..de034d9dd78c 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,6 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
-DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
 DIST subunit-1.4.0_p20210729.tar.gz 112644 BLAKE2B 56e785c029f3f2896d0ed3d8005c37403e6aa32d05b653db0e3b679d2157820558e578b53133f4f79404a660f37a710aeeec03ff941fd7cd0819020a0d474515 SHA512 90b1ad071fb5246a7446a4c999142566b9d96c39838905e9020b80f2f0aba0b86dd5185bbd25ff7fc65f69ae68e1e53dfde5b2de05755aa97db9248c6faaa9d7
-EBUILD subunit-1.4.0.ebuild 2589 BLAKE2B 6910487596f619830a195e448eda159753c2a6c776c1ec128086f5fe5f859e028088f16b889559b7256e63668ed86d0fa92d34597442ffee44bc348f699f2a10 SHA512 6ec43969be84272430101edc9e645a182c02951cb5ca6df1dbfcd8b3b82ea262548979cc1a770a3d49ea3838a497e8456d3c82bf41e3bab5e8a21d8f81b996e1
-EBUILD subunit-1.4.0_p20210729.ebuild 2261 BLAKE2B 54b52db12e896f057f7976e396a2444d9fcbbafb7847c965be837f18e16185142633f1dc48d476c4cc0fccc4b78aee9f5fb10a22718107826198b4a7b4e6be0b SHA512 28b9689967cc262e7c0211c6f5fa877e0e64a7ba6e92e63e20b6afb1fc75afca297eb3678bb16c619ecdacb5f0b78156e16d1bb15eb4454ab337b7be61a23cff
+EBUILD subunit-1.4.0_p20210729.ebuild 2254 BLAKE2B 09976c2aa980f00374df734a4878a8fcd6eff0bda77036ef822da095d0620e59819cb0a4caecb5fd59c91d3cee1ceb853612dc010e7236f619cbbdf05f8c9db6 SHA512 1708f2baa610aaba4190947117fc90c6d90f952cb22d183adaa376057fbdbef4054c6aa71659c3c7c041c707ac3522ccfd98cce1037718ed7e618df5b7e2155a
 MISC metadata.xml 536 BLAKE2B a2d8868bf91b862ea393f908c5ae6924dc70fcfa5e2d58692d61c1a45ae33bb9301c82fc032c5951491857da923bdba56f2ed11c149df7b11a4fd9037d1e5a23 SHA512 15d6a7804d14048e959dcaee03bcb2069110ab930368b2b9c31c78b610fd35beb1f714e3d109de2903dba62600b0013d6ef7f5794e828dcc6b34755e35d1836f
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
deleted file mode 100644
index f95225ac17d0..000000000000
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ /dev/null
@@ -1,103 +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 multilib-minimal autotools
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-lang/perl:="
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
-	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/subunit-1.4.0-werror.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
-	# Install perl modules in vendor_perl, bug 534654.
-	export INSTALLDIRS=vendor
-
-	# fails on py3.6
-	sed -i -e 's:test_add_tag:_&:' \
-		python/subunit/tests/test_subunit_tags.py || die
-
-	# eliminate unittest2
-	sed -i -e 's:unittest2 as ::' \
-		python/subunit/tests/test_test_protocol.py || die
-
-	distutils-r1_src_prepare
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
-	local -x PATH="${PWD}/shell/share:${PATH}"
-	local -x PYTHONPATH=python
-	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
-	# DO NOT re-file
-	# test_add_error test_add_error_details test_add_expected_failure
-	# test_add_expected_failure_details test_add_failure test_add_failure
-	# https://bugs.launchpad.net/subunit/+bug/1436686
-
-	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	local targets=(
-		install-include_subunitHEADERS
-		install-pcdataDATA
-		install-exec-local
-		install-libLTLIBRARIES
-	)
-	emake DESTDIR="${D}" "${targets[@]}"
-
-	multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/subunit/subunit-1.4.0_p20210729.ebuild b/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
index 2fbb1719b152..7260b54bee91 100644
--- a/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
+++ b/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 6b1ff495f0c3..de869a2e73ce 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,5 @@
 DIST swagger-spec-validator-2.7.3.tar.gz 21364 BLAKE2B 05e4d3281c112895eff88050f1902161ecd661c77179f9421cd1335a04e759a67480a53858977a5b8ad4b2ad749c8940e01a646960954ee1006b3e75481c5103 SHA512 182e67f6b2a83c61a2ad452614557cfdebf72e30178f3882ba27a55bcbc475c34a02db46ed037065e986ae24970ab398ba7992fbe1e07f7b45cfb5ddb0379759
+DIST swagger-spec-validator-2.7.4.gh.tar.gz 47446 BLAKE2B d284bede24477cfc942d094937cec12224535902383779c223899ab7b359ea45427777ebc8d5f264a76696eae6746b619d35824090ae2f87c6acda4ef040b293 SHA512 d65c060f4730413280a188b01cf62d0f2d77fa04461bb60f2711d1806be2e7b8de16c23d952440a838f57acd50294a16114d34eeee988902fb90c099404c7942
 EBUILD swagger-spec-validator-2.7.3.ebuild 629 BLAKE2B 9b8f01c0567dbfdca9f19c65f6518c48e5a0383a215827831e2f3f99da73ffaa35d0f0d53ba687ca874c5a6b50bc6c52a3a4916700377a0a309ee1fa2b0be12e SHA512 b70b75812f8e928097cca4231883995022b1e5d4f65b79a48dbed5b72f2ca0bd7f46f8a308ee7c591ffcc1258acb829ac181afc4d378087b85cf04b141e39342
-MISC metadata.xml 253 BLAKE2B 53bfdd128826551552c15317ce55ad4915d2d5c2dd8c8811ec923052248ac00b432141003d8b2a3dfe21b9c831519d9329e2e727a89307129319e2c438cfdf34 SHA512 0f0b4669f4680ba1750b507eb44ec589a32989146486068ddd88b0dc163b8a813a6448e64f42662099bb9f6a1d1d3ecead0129ca0d99910c15fdc0ad8c91a886
+EBUILD swagger-spec-validator-2.7.4.ebuild 711 BLAKE2B f4b1c76d7ea34c9d34a2697db1aef95689ceb304dbaa53f39e8635b403763d004eb6c565e08782fca02b4a4665511a5a67ab9d01c9bea2021295d1bc932ff208 SHA512 191864e00edeadfaacc5c01dc76d5cb7ed8b1800f4b191a4bdb0f511c79bada4e06a534a16b10487cafb38cc5f610d721226057c6c9200b5a689dcc56d61df64
+MISC metadata.xml 344 BLAKE2B 0516900540a559b18ec79bde50143ca58ebc7876d15e62967fc7a26405bf8151bd375c8d6e14e89377073969e339cc79481c1361f5ef55727777001a99380b08 SHA512 75f643fd37620ed95d47d68eb53b4f439074788a5a748451cc42625e588c956e22742d3c4563eddc84440d71b3eace1559bd2a8e82e8292448c600d1aa1202e5
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index 809a49444e60..e8e3a986eb0d 100644
--- a/dev-python/swagger-spec-validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">swagger-spec-validator</remote-id>
+		<remote-id type="github">Yelp/swagger_spec_validator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.ebuild
new file mode 100644
index 000000000000..e78ec11c2bdc
--- /dev/null
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.7.4.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="validate Swagger specs against Swagger 1.1 or 2.0 specification"
+HOMEPAGE="https://github.com/Yelp/swagger_spec_validator"
+SRC_URI="
+	https://github.com/Yelp/swagger_spec_validator/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN//-/_}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 159ffa883ba3..1fd14337a129 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,3 @@
 DIST tempest-29.0.0.tar.gz 1090497 BLAKE2B 520e9de1fc326d9a64d7ab5e93887f3bd455d9c47d29e0774bfb362b1baff6c1dd13fc6df2c756f0e73dd2b33ecb02ea61abdca9ea1ae68474ba53271c6c9e93 SHA512 03049d6cf0e77bac1afafad88b5b0fd22abaa40ed24ffd2c0c989dbadf277c09d703f0d9f7b34f4f68a4b5858b061ea9586ef66e26749b0822af0e426d1b81a7
-EBUILD tempest-29.0.0-r1.ebuild 1823 BLAKE2B 5a0aa7ed6c9677176360a288a48eec07005e5d77afb5c42e75b75f1edd11605ce59e84e4770d4f3439f10e5c948dbfa3e36f78c2a4fefdb41206f903aff2efd0 SHA512 30306eb3b2436a8a2b445d2c95f87777e0f0429aa34fd3cd12c6a7dc47fd7c57f435a15f21d5a81f9f6d109395525e084c5a49cde943f1d87b1a27f018462097
+EBUILD tempest-29.0.0-r1.ebuild 1821 BLAKE2B 9a029494e7a6779e0a417803e5347f0ca7bb080a21d94c54abf46ce8763034bfa42c896a60adb7a931e01e5c7f8b78390370042775905223c500500b78d3f40a SHA512 2fbe3eeaef473c8312428491aa0b71113ed960aecf4eedf01863be9b978cb50d2cd13f87eccdbbb9591620f32c3dd7f5ea59a5c9f371df89aec6cd752dbff711
 MISC metadata.xml 401 BLAKE2B 9a92d6bb9b20f86c1288c52b2a656367779e67602bf3bf1be4a21601f3141e4864916250418ca7bf1f13767f528cd4679fb6e1a18dca1143c3edde50b508cc0c SHA512 ba3015a097340042ba4580d59da46e12f6b34e2ee174c6ae775a5d7b71b4bcfbf04b52fcb871af76e0ec3bf592ec1485f1acdb4944a0a48ae77b6e8b958ac198
diff --git a/dev-python/tempest/tempest-29.0.0-r1.ebuild b/dev-python/tempest/tempest-29.0.0-r1.ebuild
index 2653d4804578..5ac10184a2b3 100644
--- a/dev-python/tempest/tempest-29.0.0-r1.ebuild
+++ b/dev-python/tempest/tempest-29.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index d2dc2446095a..e44035e4dede 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,6 +1,4 @@
 AUX testfixtures-6.18.1-py3.10.patch 6506 BLAKE2B 09db867dfaf8b76098681ce2b74731a8224b54e72b96362a34187e3e55309095bac8459d40b3c54fc6cedebe13c9f76ac9cc18ff43c2bf9e88b9dbfa369dff5a SHA512 d91b46005525cbefa2100eee25720b1229c6ca8213aaf36578635ffc82edc50aeef278d8e009d13bdb14ab791d7969b5fd39ae70fb2becce8f255edee1256792
-DIST testfixtures-6.18.2.tar.gz 122026 BLAKE2B 2b30c03ae71a300883ace52dc80e06c6b6610283687fa8df4ded1678991a47e8186de57060458a2fe98fc8eeb8fae8299081697a6471bdedcca2772405c91c6d SHA512 ee27d9944e8e8ec770199b115a50274f7167e9d3d3d866b0d0bbe7fec8a939b25a469ecac0158aaa486b129e078077c5822e7500ad473f98ba59862424413e15
 DIST testfixtures-6.18.3.tar.gz 122142 BLAKE2B 014cc2245d5fbe0d39310c8e2c21cd5f289d6ec7a6a561d055e86d4cd25b79f1aa535067746219e2382df2aeec050dfa24cdae674636d92ee61016fa9861e705 SHA512 e556e7cb28f122526ef19550b1e593b61f01923d0be53951344f917f89b3d4cae29e525ceda3d0290bc18c3641b509dd7236e7b55ae50da0157fe11ca9f04cca
-EBUILD testfixtures-6.18.2.ebuild 1263 BLAKE2B 27c4d3479bb86eb93c64b1bbd28e71e0b816214e2c6fab075d57180a10646edb6339227ae798ddb924b888075b6a2c1625b5b0ef9b7a308280cec3b7cb4e685a SHA512 d144f869340197962d99e4d306bab07189064f01ee9ec309b616ab9341ea73da35624c2db4daf034c601657af7496aa4db761c28bdafcc4e1ad8a2f2a4b93ba0
-EBUILD testfixtures-6.18.3.ebuild 1265 BLAKE2B ce3dff1e0accb6a201a4f8ebe79f828d61d6c99f1fdd0f0c361d0b4868232b505a91a8b2278c32114863c67ed45f46f8952f6b770419b549a5106115f7603fb4 SHA512 e3d8450c4bc118db2919cd0dbf6f628737deef71e25f30766c7d77749af1cb777de1ef945db7dc64c47ac679e916e359d59c861872393fdde07c80b0dea91c2a
+EBUILD testfixtures-6.18.3.ebuild 1263 BLAKE2B 27c4d3479bb86eb93c64b1bbd28e71e0b816214e2c6fab075d57180a10646edb6339227ae798ddb924b888075b6a2c1625b5b0ef9b7a308280cec3b7cb4e685a SHA512 d144f869340197962d99e4d306bab07189064f01ee9ec309b616ab9341ea73da35624c2db4daf034c601657af7496aa4db761c28bdafcc4e1ad8a2f2a4b93ba0
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-6.18.2.ebuild b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
deleted file mode 100644
index 0be51f64725c..000000000000
--- a/dev-python/testfixtures/testfixtures-6.18.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
-	"${FILESDIR}/testfixtures-6.18.1-py3.10.patch"
-)
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-	epytest -Wignore::DeprecationWarning
-}
diff --git a/dev-python/testfixtures/testfixtures-6.18.3.ebuild b/dev-python/testfixtures/testfixtures-6.18.3.ebuild
index c2e4ba7a58fd..0be51f64725c 100644
--- a/dev-python/testfixtures/testfixtures-6.18.3.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.18.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 9480c197e394..cf8a9c921a19 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST typing_extensions-3.10.0.0.tar.gz 45509 BLAKE2B 34730a537f83bdb6fc126cef947621ea13e93ffaa0ca824d4a60319c57b3b5f79f640bf59b2214d6287d9311c92487da396313e327d2122646cb6e1dc8e3b17b SHA512 1c262aedb092d506bcd90d033a640fa6e1f9131f95eafb77d30ed21ff7d6b0f492b6092d3523ecb773bc54904679e0fa1aa8c3b4af62d77f1a7e6fe5fd6cb10c
 DIST typing_extensions-3.10.0.2.tar.gz 46048 BLAKE2B a8f7ecacd553ed469cf090f4b8f52e15039fbcf1ae6879f5899fb99e7bbf5b7289cf5d7e5409314a110b2a626b59bd5e6a52f893e4322244c9e7e80ab393d334 SHA512 171ada56758fb04328a2cafefe80b70fbf166f2d799406883df642927964925ca73f04d0646661cd4fd016dfb5e1856b84f362e3b404c27b368ca06a09cf87db
-EBUILD typing-extensions-3.10.0.0.ebuild 734 BLAKE2B b9f74febedb3bb79a1cb5cc849102488c9c55e6c8571e932190f7c206bdb5220faf1bda96b48f7bc7a2eb8a0d0e44a7c813a76aa4b39412b1564fe4f67ae6631 SHA512 08a3f910034c1f588d1ed08c5b8f8a738debf212aaf36c046db0486ac51d9fcfb47b372415eace95a6ca810cd734fb00f7dd5757ba95244963bccd63be9dbcac
-EBUILD typing-extensions-3.10.0.2.ebuild 723 BLAKE2B bacd16a30eaa56c6e17b15c445ddb12dfc7f1be428b646d53dd6dd2ad7a3b3213ca94a9e78131a90e94b94ab014006e216133921d596816cd013836936023509 SHA512 96524dcf5a8a96d2d45e2926b2e9a01ac077d4541bb0f01b720afca30bff55216a72cc1eccb73a2d22bd30bf2b2097538d1ca521064ad177df301ed8c4b05393
+EBUILD typing-extensions-3.10.0.2.ebuild 715 BLAKE2B 379970642c59db5ee20bb9e66873c3fe406580a34031ca600c235da535c83909e6441eafa483cafc4067588131033eef879785bf03120625e30438019f8f779c SHA512 7c7c88aaae149fd3d4614fd94829b4a344d15a78bf72b9ed745ea5dee63bd1a6149bfeb75266b97b6e712b99800f4880272369e3c23fcea0720639aa7e99088d
 MISC metadata.xml 398 BLAKE2B bff4c130e83d0e2e21739d4767f4edda2d40b649943dd7c8138a5e4d9308d876abc0c2a8a93f875e84711abf00fcf2bce03668b40c5ab4c07342e4c8476d907f SHA512 abd5fde69521deed87ace92128fde7ed147c19e5cf60034fd4d82c7fe5c532e497034ccc15b00198b996f5c6d75504f38a3df3616162344fe142dba7a2783cdc
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
deleted file mode 100644
index 3a841d36a777..000000000000
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.0.ebuild
+++ /dev/null
@@ -1,27 +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
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src_py3 || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
index b9e8ed3ef803..ee7910b5b541 100644
--- a/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.10.0.2.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index d3ec7db31430..eb6ff0bcb30f 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,3 @@
 DIST uranium-4.9.1.tar.gz 1038046 BLAKE2B 3304e89e0a22fbda0e9e57aaf88f6f11979eb5273d6c8a69f5ec9f050741561f67667a76e2136148808862026e2330f3b5043141ed8d69d255632a8c3c869def SHA512 e665a1ff8ebfc629e4bc2253533a3332d8f8804155432af921ad2e7251d5725daf9346cc5f110595914ac6f0d194db6d7e06dfcd3795b57e35b3d5e6dae594a7
-EBUILD uranium-4.9.1.ebuild 2461 BLAKE2B 395ab5c2174d353c5947fccce37b079d42b315ae33168c84256ea4046583e552f5764f4c0d589f856327c7747d8735f06c054c206f0f714215db617d84fe9c99 SHA512 c361ca8125f0350f0c245a093d0123c80a319267e22ede7a6c9d2ca6416714610afbb28856f4b0adfbb75cef555f74f5a959bd53d2e32c2532bb994f4265f038
+EBUILD uranium-4.9.1.ebuild 2492 BLAKE2B 80700ae8a8fed9c16ef3744acaa25efd311a24b663f2dd68fe2f99fcfe12c6028d640382f950c7e17d6095d762981024d2b543ed2de1cb5385ae462867d967d2 SHA512 0aac58b430b90601247feffb2a2f99bc31812f5f3228b511966f5b64aeb6a7a4eecaa2f2fcf0d3b6656b8f2add396bc231aa41aa5f13c35ac029ad19f0612cfc
 MISC metadata.xml 1209 BLAKE2B 00fe2e9f2183b7b5e3f3e59207077e56bbc9fc1f74a1634a9770ec558f0bf066502194f077b65814d99bed2758f4fa5986531815c1bd6cb4f307713c796ad2d2 SHA512 e6309b56239464c64c9ce52b7e483167b0812088b822ccb5ffe6f2d49b5cd1ee1e2ac115747dd53851de8267a0b97c020f38b4d051f40ccd44730ecc98f4cbf6
diff --git a/dev-python/uranium/uranium-4.9.1.ebuild b/dev-python/uranium/uranium-4.9.1.ebuild
index 066a9e021074..6743e295a230 100644
--- a/dev-python/uranium/uranium-4.9.1.ebuild
+++ b/dev-python/uranium/uranium-4.9.1.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=(python3_{7..9})
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9c2c66897bcc..3ca3442a74bc 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,10 +1,12 @@
 AUX virtualenv-20.8.1-pypy38.patch 4808 BLAKE2B e1d2ef42f0cf4098ba6e9fa20367defb0eda41952beddcd7c321863f72e19a553faeb4e543a60455141ca4b13690a69906bafc158e1d502f21cbd5bfb2a84a51 SHA512 7683d1a59d357fef28d31cfff26a11d08c5759aba482b04f01559afd1c36f81d349f8ecc2361ff1e0055d08108bdbf742006208ce0859e8f5da1a3f6f51610c0
+DIST virtualenv-20.10.0.tar.gz 9007218 BLAKE2B 1fd37b38679b7375c1eb6e9644418b1653cb6a8dab194c8553fa113cf4a801a7c1d5e6490067767cfb198a0ef2b5ab9cf166783b9c6fac0b2c8b538949c11804 SHA512 df940aa29801a39d39be46d3518a99e93efb2113650abf81d00b4545183ec6806823ce8b754c5a3c951cb64e941944421046c709ed3de6a925489e5ac1988d48
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
 DIST virtualenv-20.8.1.tar.gz 8708080 BLAKE2B 703e3e8e07105e4a7154d0e91a13ec2c6b7e37be92e73733a6850c7c1a96711c19b4974bc4f6d3816ea78095b2af807183f53cbc579acad9a7ec6815ea547294 SHA512 db373bdb68efce0ce26cefe508e452b62d4336ccf74f08a51aa61272127c8cd43639443342f42cacb62d7bfd1381bc1204211218c486dfcdb165d8486a2e728b
 DIST virtualenv-20.9.0.tar.gz 9005930 BLAKE2B fb3875c34d282f030d06ad3e6f57d4d8ba9be9f9f40602b0129c5ae68e869a4b64cb5fb7935242518e09fd47294a8d87d6eec6db8f8e78947126564428aff07a SHA512 bfcf60946e2fcc0c4ac2dc9ad48187097961280dbd2353a23cb0aaab97aa63a247637d8f41ed6e6de9d30262978495ebb9519f932ebbb636cf81bb699beeab4d
+EBUILD virtualenv-20.10.0.ebuild 4599 BLAKE2B 825112b6e94eaaacab405607faa6bbdbda3f729b3316826f376da5409dc59482e8ce8d78f81c135f983d3703829ba6650cb354efec36c3e7707a145ea477d390 SHA512 4fff29e9288cfaa94c3bb69b1420914110d4b515316608f4ee0fc4e9d131fdb932d89911a20bfd920ff27d577a773d12256169eceb899d976f3b208d08096f4e
 EBUILD virtualenv-20.4.7.ebuild 4177 BLAKE2B bf376450c121d476752301a909152a465de7646a712509dc11709baf7a997440aa7b9e09d0823e8bb08255f913aad7133765d524c7e99615eedaad2dfecd63e5 SHA512 e252764fe0c907dd8e6d1ba8c5fba977f48700a829373bae6cae34be2142fa40b1563f1d797c9ca63947897a786b1983ae6b3590ecc3ce58d98c2e4d73457bbe
 EBUILD virtualenv-20.7.2-r1.ebuild 4645 BLAKE2B ff89f8dbb08ad75a3129ba0113271f30342fa18a406c3595d8ab1b4482e3be9b62e8a73554d31f53d72b7bf5afc76975d8d580e1b4afd5657c3b496d26c91e93 SHA512 b43da9f650fd92469a0d539fb076c892aa6f1856977970e0f8234684ebdf18559b03ad860b69c398aa47d9ad0ffc6268a1d8ef231647ba2d35d1329d4c6caf66
-EBUILD virtualenv-20.8.1-r1.ebuild 4639 BLAKE2B 2674c3f0e7f5a269c1de6473247d496c9c3eb004bc12599f01abcee9358fadf35fd3a89372932d656f4c26dd2ddbdf86ba222802ed670901304b705804f75317 SHA512 8a0b1757e772743812927ac35a129e733cbfeb8fc0a9952e6d81685d5f1aeedea0dd7d1ddbc9b6cd2e289499c88a0e4952a2594af31f415f61567cf4e72f5a10
+EBUILD virtualenv-20.8.1-r1.ebuild 4638 BLAKE2B 4fe03697ee065050e95e7eda036406318701076a18c38dc17a9dc3b013f0e7efc2985593cb06d0aed046592b01aa32e7619d8818d3ff743f19321c77de2942ab SHA512 d072e2d561feee33cacaea62ae3f7aab326bbe37122dca8c01052ab21439f4886533768058748dcf1c6cd3fd234f53584157d06915e255b24bced03c5c8b166f
 EBUILD virtualenv-20.9.0.ebuild 4599 BLAKE2B 825112b6e94eaaacab405607faa6bbdbda3f729b3316826f376da5409dc59482e8ce8d78f81c135f983d3703829ba6650cb354efec36c3e7707a145ea477d390 SHA512 4fff29e9288cfaa94c3bb69b1420914110d4b515316608f4ee0fc4e9d131fdb932d89911a20bfd920ff27d577a773d12256169eceb899d976f3b208d08096f4e
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.10.0.ebuild b/dev-python/virtualenv/virtualenv-20.10.0.ebuild
new file mode 100644
index 000000000000..49b7be5d7c71
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.10.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
index 722476fd418e..eeb72b931bda 100644
--- a/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.8.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 123b7c9eec49..78e91518ab39 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -2,6 +2,6 @@ AUX websockets-10.0-py3.9-fix-deprecation.patch 1822 BLAKE2B ccbde169be0d9c21803
 DIST websockets-10.0-src.tar.gz 276231 BLAKE2B 6170f0540bc33be3d9a71f596ffee58e6e43c2173239a8fffe4f0c2a7555f8ce26849d85ed7865a5df6a4401f01bb0c928a341598916487cc79152a5031e9bbc SHA512 532289dc411d11cffc6e5aa07013cdad9655f124fbbd5dbdfe92985caf554644976a521466b1d3cbe124de11809e395b5e83195eac87495585779591b189c4d7
 DIST websockets-9.1-python-3.10-support.patch.gz 6940 BLAKE2B e4835c7d5efaf956d07b884c85e0b95f26674bf36164fa8362d1c1a564a959bde761d25e747333c58864f74a5ea1b199f228a46ec6a1647c5495ea032020c179 SHA512 7fb4b298a9167c8d913e293fa7549b21d5acb333a5b97e0624a22cb83548ef548b819ac23750c40295140b6f83a701c73a81fdcaed3ab8e704dbee8e17d22f1d
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-10.0.ebuild 859 BLAKE2B 84116c49e71643efca8f5266aa6c3b1a2e4afd4373061217802155225863603343d38d440d1f54b237f9389661e4b6a0d57b7677910854b1b655742d8e8c5077 SHA512 bd6927af4ce3a4d7fa55cccd40242115d00291e718a0b17acec60192b5dccf66946e39d48a4de31734df23fe3090ede393a5fb1729bcfbda01d8bd2c35b5603e
+EBUILD websockets-10.0.ebuild 865 BLAKE2B e201021ec5371b8504b434c3bd9c53719f757b6eb7c16780c4a40d024fcac3acfd05e1d482fa29441712d9d5a39e43b1afaf3c8c96c9be57ee4815674cd9ac9f SHA512 205a31651bd67bbcd637d3f49bb9c39f400a10556cb227666fe97c404a3b55013f44dfe4e44fe82682f7ac6c371e27f6c500bfba3d43c1669f2095d1a2c9ca8e
 EBUILD websockets-9.1-r1.ebuild 1043 BLAKE2B ef93fd36ba135d5b915d1797c399b01f1900d760353e9d050a65e1e5ded3a5692f021cb14dc85098ab9554a51dbb431d7e5c46aab1ab25e86325811879980203 SHA512 5c45f7f6401181c1be65bf1c5fa472ef80c440d15a088e7d5c8cf6e698fb64ce42ff6c6d33b87b82ddd53761b1cf28a25bb995e2f5295f396a1d56e89376f93c
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/websockets-10.0.ebuild b/dev-python/websockets/websockets-10.0.ebuild
index ac82499ce323..f30051d5d439 100644
--- a/dev-python/websockets/websockets-10.0.ebuild
+++ b/dev-python/websockets/websockets-10.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index b7699641e6ef..d4408ad5b73e 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_3.0.1.tar.gz 34350396 BLAKE2B 441d9969df932ebe636474ca10eb260cea160b71b8bc46a78964ffcb752acdaeccd69703ca80a2af4c5284c5555f49c62cfefeb5fb8cdb9f0c305be44848815d SHA512 425e86acd8e54e89393931e5c698c244721ad16fe4bcb13aa9038ad7ba279803f8cf5c3b35170b274a0386ada03ba94ac385d039b3b8aa97c86f0abff4a20e58
+DIST XlsxWriter-RELEASE_3.0.2.tar.gz 34433041 BLAKE2B 748d710d3f953ae22154022a75f3a67898846914cab67302167ba34ba5e449041a95dbc984883e4ff58c078b940ebd429898109abb7a39f57ea499e5fcff83fa SHA512 790eb7fb93d25987adf5d30bfa28e0fa137f809dc9a293edfe86105e0a948263759df85b5a0f9fb19b89c256a33b5b68179d95a210964b6f82345972ee9e6108
 EBUILD xlsxwriter-3.0.1.ebuild 588 BLAKE2B e9f9323add3abe43984810be82ec0f669a45bbbcde293a7344d155f7ca1efc92d2373837c7cc22a2ff3b240328e811a9a04db9edc97f018eaa30ff6cd696d0eb SHA512 a5db084c48e56ed11d3873fa16b2ebe81c3f1011ae884fdf20e80da67625eb29b158c9c50aa37f3ef8d4c85f157caec300f9aa5beae91a3e1cca7a72cd9e681f
+EBUILD xlsxwriter-3.0.2.ebuild 592 BLAKE2B 0137eb0f311f831a57aea43090a2ff5a13ae769d3ea9f84da74a5e17ad63e3a0409af6e6d6117cf51c58e561650d87d62670b781a077beacc67bf910cbfecef2 SHA512 94dc821eac85e21336a5d7b730b9ef00ff70cea6594a985d921e9d68932f0e0f16b1af2cfbda754dd2ef8cd5199c0481bec2806c1f88ca7ef1494f4e247ab25f
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.2.ebuild
new file mode 100644
index 000000000000..c677523642a3
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.2.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} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 5ae3374505f9..8c6b792a37b6 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,3 @@
-DIST xmlschema-1.7.1.tar.gz 372165 BLAKE2B a534c42d5405eefdfd0c595f1ea02a703c8f5a225f9a46ea4fe9885d09de4b87bc5ddb470fabaf3e01093012346247d34fd56495641815fe04f4fa1919f9f53f SHA512 4ad8ef9d91aa2e0b06d64aa06cc380898976c8c1b4efe049b67948b4534bb8edc3a3450cf5e242a004a039e8e29b23954138a0192ac6355fdeecb77e6284c3d9
-DIST xmlschema-1.8.0.tar.gz 379305 BLAKE2B dcc3fc5860dede681912f578b548bfe39feb5fda3dd7c5f0ed7f85fce247489d492b062b789acce6679cab835b31c1f77eb82ae43b83c5af5b749a4e93c991d1 SHA512 b4622030e959383729074554e80606dce6e731b9c4e3393c60a02d592acf66f07e50f12d65867fad31e18494e04a8bb1bdadcf22f110d91708e8a0fa89848e2e
 DIST xmlschema-1.8.1.tar.gz 390835 BLAKE2B 5ba4e37bc52402a939e3c6508bb3d2cca33b85d73db9be375295de62587bae638d498435198a4b25bc6858bad19a89d14a11870774c631bcc9f1b22bb1c41f4c SHA512 741477d006270deb4a1d1b13bb404c6f4917047b0f68e85727a2dfe239a59f36f4160a6a88f26514a05865219a16ccbaa26bc319b06ac867aeabe008a778ddf8
-EBUILD xmlschema-1.7.1.ebuild 785 BLAKE2B 7aa3e9128a4b1d03602515a04dffc8d9e8e83c9a32733668bf4c42c921b23ec4bc8dc97e8ffb10e3377b79319e0929945ae8b5d3536ffa92da558413d8c319bf SHA512 2381069dbc8c3ff7c9a7a1c1ca50e1ead544ee8a81eb9bdff9869da3021420da50cb2cca72266142ee4f7a629f7090fd05e2347aa570dedaa08f302cb5cae796
-EBUILD xmlschema-1.8.0.ebuild 793 BLAKE2B a30244fe7c4063b7573351a7190ab44124f5eeb96cd8dbf3fc56e408f84a0b601db1e0dc7cbcdd6f221f48c0937a84643e8482cc893490f834bb0a01c90c6c90 SHA512 52417d911c4f7a3738422db216e0c0f28901a26595512ac47e300ef7f3396619808535b94db4679c069c8bdb9c3f06ba30157952291b0984b67405161a46ff29
-EBUILD xmlschema-1.8.1.ebuild 793 BLAKE2B bcf145939d1ba20b7d293523bb068b344fe6d6922b1fde0b92bac0f8603f41323250e0e10bc7b3a9670a959eeb329a69339129d81e268eebe7768d084ebf4546 SHA512 ea1d96a8c33c1be1c36c863cc240cebcbbfe5e5dd6ba2f428e5ff1ee457675b22d7f9e0b1d677eca4832e29e527280f9ffa8dad248b1e028cb11a82fe5308ae2
+EBUILD xmlschema-1.8.1.ebuild 785 BLAKE2B b55ff15cffd9fa12c2015ab2fadfe8e213ac69dc6334cc1edb9b1d939a41ccd30e212bb40fc15fdb4233122f5f37507174741b513df1a9951526646e5ee33896 SHA512 3e5dea3479ba1d2f07c553b3d04d5c4ad8b029922a160e4291c1391642c9f5e98334d8bf10d7cb0ea3f52853a78dcbe2a5410eba7e4f5d6bb3e58c0dc6cea027
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.7.1.ebuild b/dev-python/xmlschema/xmlschema-1.7.1.ebuild
deleted file mode 100644
index 8b02ffde71f2..000000000000
--- a/dev-python/xmlschema/xmlschema-1.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.8.0.ebuild b/dev-python/xmlschema/xmlschema-1.8.0.ebuild
deleted file mode 100644
index 19b2c2736c27..000000000000
--- a/dev-python/xmlschema/xmlschema-1.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.8.1.ebuild b/dev-python/xmlschema/xmlschema-1.8.1.ebuild
index 4860e6037578..53a7a786b0b0 100644
--- a/dev-python/xmlschema/xmlschema-1.8.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index d0921a21baaf..fb68c651137f 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,6 +1,8 @@
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
 DIST yarl-1.7.0.tar.gz 168325 BLAKE2B 25d708935c8b97142ee729827bb70955458d8ea8212d2a6e59dfe899f2cff41a8cfd93581f8e0f80a3ce194707068ad968f1ae8ee0434e11ac8f7909abda246f SHA512 581b786710c334a8f3d2259678f2bb22c40a0c2b125a786c81a9dc9e4e637e3eb80f11194835f58ada17b346b840ae1a539beba37a52e59b648340cc93f65d5c
+DIST yarl-1.7.2.tar.gz 168562 BLAKE2B 7da82193e9fa0d317bd4ba46d63ce04a36c95fc3a389d6800d12e0ddecaacb41c07a665db9e731a9112d98a0f3133861b174dc62523da202d0d06f4cb995c354 SHA512 ac5b630dd592ffa8b095e4d7eee2facaeac8ab578e55fd8856c6a6349f514081020c707cd0b33f250c0e78133e92ed6156835660f14c5ae54d60b4fdf6ea50ea
 EBUILD yarl-1.6.3.ebuild 927 BLAKE2B 86f90493dc43c951fb824c3e1f9c1ce789c376bd92646ac314e7fb6ebe9e1d88554cc05e3a85fced290251ce12645565c0ad343c2b2a87b4d5046f31512c5881 SHA512 376fceeb9f260ca9444aada5fb4fe080f0a9eb0ab7740b7b05243c0ae1a0bd63144d503e1e893af6403da02243f95afb9aa00ef7e19d640af3fac52a7df556a3
 EBUILD yarl-1.7.0.ebuild 783 BLAKE2B 9c88ad8875d1d24531e960b9fb4e353c8b235ec4aed37d911e857241cc9b89c636eb93032398e5ba903edd8d3eee1745841d1feeec04aa489a95a746d955533b SHA512 7db615ae4ab1184dcc607c77806d79a17f8941474ca46d49c7981720f1f8a95f25be9f2dbf2df30f590c3aa73d8b084a0ea5d9b93b4d12da8b871c3922bacf4e
+EBUILD yarl-1.7.2.ebuild 783 BLAKE2B 9c88ad8875d1d24531e960b9fb4e353c8b235ec4aed37d911e857241cc9b89c636eb93032398e5ba903edd8d3eee1745841d1feeec04aa489a95a746d955533b SHA512 7db615ae4ab1184dcc607c77806d79a17f8941474ca46d49c7981720f1f8a95f25be9f2dbf2df30f590c3aa73d8b084a0ea5d9b93b4d12da8b871c3922bacf4e
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.7.2.ebuild b/dev-python/yarl/yarl-1.7.2.ebuild
new file mode 100644
index 000000000000..c30d1180c9bf
--- /dev/null
+++ b/dev-python/yarl/yarl-1.7.2.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' pypy3)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 34a709f0a39f..e841a09179dc 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,7 @@
+DIST python-zeroconf-0.36.11.gh.tar.gz 130455 BLAKE2B f32556a0fad91e6476a267dd8c6b157c05aeba185842cba5fbb3f0f86c973c0dc54d8240d83a74a265ecea7d24dca7d0c3e3028f88c10a781243a641e78f324e SHA512 da34ce59a2036f1497f0b6ee37db57c0b1608a81e1ed36a089b380fc7fea746dff95ee08efc348bbb383b75f5aa9d9b4d4a70961b4de2a7968e3a46173774400
 DIST python-zeroconf-0.36.8.gh.tar.gz 129890 BLAKE2B dafd1a660e611afcac0367b6f4618dd488161d30337fa1d8bd7f43af06446785e86125ae50781b341549fb9b1c70070e6b86ba271a98e5544f5d0e3287640e00 SHA512 928a78a59a5e23182c5f0af8cc8bda477b8225ffaf50e25bdd746ce7b40f7e215e5f23d7a4a282f802c9a4b7b53cbc60c38f547f382b8eff5eb14d1a21f108c1
 DIST python-zeroconf-0.36.9.gh.tar.gz 130154 BLAKE2B d9a96a853a12d3f9f0e4fd9f80bb7114ce25b2fed730ed79baa4ac07a6108a6f5cfc56232ba77f829a947e2961a91c3e1eed224fadf95b2e433ebe0c7b9374ee SHA512 27558fdb9dd8539fffdc5756d180dce921bed010fb7eb2e11254e162792ba663fcaa74afbfcebfb86b5c6aa9187d00a302f6a402cf40986f0bc9e3bed1dd0e19
+EBUILD zeroconf-0.36.11.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 EBUILD zeroconf-0.36.8.ebuild 1099 BLAKE2B e30240d8f97c417c18e98cc1a9b6e1a586aac3122efe97954ac76fd53ee031e831cd8f76f43f831c9c40e58ee425e5427fefe54711c3f9ae0e044ce8681b1f50 SHA512 99dadf5f509f08b63cd0d76da836784a65662627977b7217af54d0949cd9e97ce816479bc6f40a49243e9cc8724ff7c9074317892d4eee3814165085cf38b19c
 EBUILD zeroconf-0.36.9.ebuild 1101 BLAKE2B 623d7b2b618f89bc9c1b503245f0a5e000fdf8410457abeb50415c70aba1880141bc0d00bbfcb952b0934bbab37ba5bbde5db31709f36c18c9301dbf7b46032d SHA512 c060542566c6e77ab8b020da607300bf61ce39899b013e94a738c02e9d333fec7423d53796904998a2dafd1417ebe0136c238b34ee40c98881209ef01f6baf69
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.36.11.ebuild b/dev-python/zeroconf/zeroconf-0.36.11.ebuild
new file mode 100644
index 000000000000..b416d399c1d2
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.36.11.ebuild
@@ -0,0 +1,35 @@
+# 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-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+)
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 9952869bea07..4b63e4bd4a47 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,7 +1,3 @@
-DIST zipp-3.5.0.tar.gz 13270 BLAKE2B ba3b6f82ed0f1a902050ee8a89b6876a839d180dc048dd19cd31ddbaf89ec0494b9444f2ac082ed347e3183ccaf2e8342748737c2a29e1a2bbc492a0bc34767c SHA512 676d7e9a7fde386b57a213975121aba015461453f0809a97d39d030b06918a4c54ba1cad21877ddf007560941ae285883098d81d5e6f17eb4636379345b4513d
-DIST zipp-3.5.1.tar.gz 13005 BLAKE2B fe50ce8467dcb62a3685a56d3feab0b227832320f4d97ba7eb12a07a66065c1acee8ecb391812e2c772e7c55bbd4966743891f9fd80adf1138b289ed0bc06cd6 SHA512 7043d491a7f5588416973c4ea9d1fb5e47ee7febe423d01ee131662867ed1d616e2df4d2c87ad327ff1b8b297a8b10c6584cfce5de27d09a81d7a7ce4fcc4815
 DIST zipp-3.6.0.tar.gz 13047 BLAKE2B 2e3f5fd0acf9f931f5a74957e9ae29f12a42bc824eb36d769720282ec0413d90b0b45f0524f3b319ce614f43c061ae324fb29f7f2a83e7aeb393283827bca5d1 SHA512 8e21b0a757ed9ebddeca43d3e4b64549dc4e59f781704626b0b2b0a117752b84798a0484cceedd4684ee0459643df4d0f479e64a143c8d9337d2b66951a7b227
-EBUILD zipp-3.5.0.ebuild 1171 BLAKE2B f2c342697838816f4cf123b4c70fd3efde81224ea68b805f0982098ea67d5b7a4c65fa3fab0b16a9793bae3d874a778c4c21d3d3b3317c45bc64d66359e9119c SHA512 25cb668ae1061224a1b4e619c7467cbea67268f4f514e2cf37123dabec733ea5e8bba8b9e442fe6203bc7838256647077fa9606cb0c42e353bac2320a9d94b6d
-EBUILD zipp-3.5.1.ebuild 1165 BLAKE2B fa429305db0085ad1ab8ea82aba683edd5f1946298a6c3de23a1e4a5dd6f92fcbddcbfd87a2fb1b41b7f1a791ab68658cd7fea3264653367f5885a1bdb9eb790 SHA512 9fcd9bf08b339069773ddfb758d3e71863bd686647740888c26ee7912228490e6854b86818f59779c8f7df509fc44d09d1a320d7ace8c85e3f3adc90ea4a2407
-EBUILD zipp-3.6.0.ebuild 1165 BLAKE2B fa429305db0085ad1ab8ea82aba683edd5f1946298a6c3de23a1e4a5dd6f92fcbddcbfd87a2fb1b41b7f1a791ab68658cd7fea3264653367f5885a1bdb9eb790 SHA512 9fcd9bf08b339069773ddfb758d3e71863bd686647740888c26ee7912228490e6854b86818f59779c8f7df509fc44d09d1a320d7ace8c85e3f3adc90ea4a2407
+EBUILD zipp-3.6.0.ebuild 1157 BLAKE2B facc2f97d68700ab997d1b2655059dac0b18c016f5a4f964cef3c31d4453bfda892867958917d932a2ecde0c2b1b776055ba9a5c7f5a79447059c16f0bc14fe0 SHA512 04e3dc1e66e42c25c6b6bfb6415c57231b81867509381a4ef06b335e26cf9481c23ed51cc2e5d79b6338a9b23aea302f459e7538ac2872bdfe902c6e33a7eef0
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.5.0.ebuild b/dev-python/zipp/zipp-3.5.0.ebuild
deleted file mode 100644
index 3a39a8dd6fcc..000000000000
--- a/dev-python/zipp/zipp-3.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip a potentially flaky performance test
-	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
-		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
-	# by ensuring only zipp from ${BUILD_DIR} is loaded
-	epytest --ignore zipp.py
-}
diff --git a/dev-python/zipp/zipp-3.5.1.ebuild b/dev-python/zipp/zipp-3.5.1.ebuild
deleted file mode 100644
index bef59282ca20..000000000000
--- a/dev-python/zipp/zipp-3.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# speed tests are flaky by design
-	test_zipp.py::TestPath::test_implied_dirs_performance
-)
-
-EPYTEST_IGNORE=(
-	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
-	# by ensuring only zipp from ${BUILD_DIR} is loaded
-	zipp.py
-)
-
-python_prepare_all() {
-	# dep of disabled test
-	sed -i -e '/func_timeout/d' test_zipp.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/zipp/zipp-3.6.0.ebuild b/dev-python/zipp/zipp-3.6.0.ebuild
index bef59282ca20..aa0bec0ed728 100644
--- a/dev-python/zipp/zipp-3.6.0.ebuild
+++ b/dev-python/zipp/zipp-3.6.0.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
commit	fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree	f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-python
parent	162945d2a91899b637bbb9e163b406350de12906 (diff)