gentoo resync : 17.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
commit: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree: 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /dev-python
parent: 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)
482 files changed, 3005 insertions, 4757 deletions
diff --git a/dev-python/Faker/Faker-8.10.1.ebuild b/dev-python/Faker/Faker-8.10.1.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 9ae6ff8367ee..82820fa867fb 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,8 +1,10 @@
 DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
+DIST Faker-8.10.1.tar.gz 1144158 BLAKE2B 7463566a8bf2f510ab89b7fd67ee3aea80ce65725063f83798a6f7ce959a1e5c4eef82504adc124add6ff028d6e248871123d0992f715d46485daa6d64d4179b SHA512 c5bb3b376757fe025255de67a184dfae959c834e937825515eaae083a2ce931f2c00ed1ade7ccba49adf182570cf533526e583e6a45c4fa08b41e22544139227
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
 EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.10.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/GitPython/GitPython-3.1.15.ebuild b/dev-python/GitPython/GitPython-3.1.15.ebuild
deleted file mode 100644
index 66fe6caf3dd0..000000000000
--- a/dev-python/GitPython/GitPython-3.1.15.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5-r1
-SMMAP_P=smmap-3.0.4
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.17.ebuild b/dev-python/GitPython/GitPython-3.1.17.ebuild
deleted file mode 100644
index 058915920815..000000000000
--- a/dev-python/GitPython/GitPython-3.1.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.7
-SMMAP_P=smmap-4.0.0
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-	rm -r test/performance || die
-	# tests requiring network access
-	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
-	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
-	# TODO
-	sed -e 's:test_root_module:_&:' \
-		-e 's:test_base_rw:_&:' \
-		-i test/test_submodule.py || die
-	rm test/test_installation.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.18.ebuild b/dev-python/GitPython/GitPython-3.1.18.ebuild
index 058915920815..2b4965f449ee 100644
--- a/dev-python/GitPython/GitPython-3.1.18.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.18.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index a5e32ea6f7b6..3563d8cbaee8 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,14 +1,6 @@
-DIST GitPython-3.1.15.gitbundle 4811422 BLAKE2B 16399b302f7f3f36b315bcaa1535992a43b02fd888586d135824f8f4dc5ba611875d68e6d3102d71edc93848a91d3b244176d6b735ef30d65fdf64c28d325ef9 SHA512 13064036f20aaa58cf7784a3a61ed9c9e08414e9126332fc629e976889c87a2a70b1c9270774df676dcc08ded0ee3629112c60b88025536a9d13a04491b7b1e2
-DIST GitPython-3.1.15.tar.gz 175132 BLAKE2B 5a0cc8176257a5fec9afbf81351da191fc70ad5678d3ee89d36807cdf01a7f69216916723ac551bcc29fbc07a88a9a0357d12d41b4f43888917bd45dd766328e SHA512 bee1e12625995a0264694796ec6f346a5258ec13c24517939e65eaf9b679d82afb7848c02e6222389609bdf3a0dccbce4af1bd59a5d12f2851da47878a21b210
-DIST GitPython-3.1.17.gitbundle 9249795 BLAKE2B 2c647de0e335d58d85eb5444e52f93adb13c5e2cf9a6272fa26a7fd68bc1f467ab2134ee88a4386af03b9816cd568b7366a202480ab0fd7540202b5757a7caf3 SHA512 576082e3f6f741183392e3fa51c3ed0f3c6de668562f07ead14500644afe01ea5d667a1c30f3a111326b3bcb320b42eadfeefb9eeccb699cb19661b330321a6b
-DIST GitPython-3.1.17.tar.gz 178303 BLAKE2B cc4a89c6d5ab8ae59439286ed4159aa4e6cc936e5ef011eecae2ba79010eb13a2e7e79635e1f89bfbc32dc58e4a6f11c9bb13f164d8111178b3302a2780d599c SHA512 c87d9de510f245a64d9df68f0e5c07744eef21669ef3beb81f2d0aefe4299f1cb4cfd2d37b87120b21781aea06fa9f8b2ccbfda1f2648c92cd9c73506b953ed4
 DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde29314b467811526f67629f181a62b2b5ba235a3302b979dfd87993deca238a91820b3caa58fcb7cf3aaffc3bf76b0c731 SHA512 91fd937193db8a948fb575bf24a295c349e69b132128ed3b0c4fc3be89feb76ff47f31afe422c99ccbee4cf908b3040e9dd3f568db74785d12cf6cabbc356daa
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
-DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
-DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
-EBUILD GitPython-3.1.15.ebuild 1724 BLAKE2B 41e1ade8e6d756561c3bb44b30dd00517a6dc0065e6889366a9c2366c1c51461d15e1c7daec35c24f91662f2bd856f99f69dbe78b83b1460c164367d9913740f SHA512 18c6d02db8ad8895a55f63925c9d28e76a74682872eea299d2cef016b15ef14455619ca9ab9f4b22cacbdbcaf40da5d6ca72b8c63e5abae64e1fdd60e354a956
-EBUILD GitPython-3.1.17.ebuild 1932 BLAKE2B afc4d78a25819b3fc365f650b697cc50754d06377d6231fa455fcf4a1c7bdb6717c7759ee7685070c20c6688ae6f1986715ac724c982e559108325273cae0e20 SHA512 f39f578930daf8ffda3da9a8d88389b65b04100ef6014dbcdfe93d8934fb6c9466c466a1d51b83b74e4de0a1fae48b33a5e894f331d053369c02602efe4027c9
-EBUILD GitPython-3.1.18.ebuild 1932 BLAKE2B afc4d78a25819b3fc365f650b697cc50754d06377d6231fa455fcf4a1c7bdb6717c7759ee7685070c20c6688ae6f1986715ac724c982e559108325273cae0e20 SHA512 f39f578930daf8ffda3da9a8d88389b65b04100ef6014dbcdfe93d8934fb6c9466c466a1d51b83b74e4de0a1fae48b33a5e894f331d053369c02602efe4027c9
+EBUILD GitPython-3.1.18.ebuild 1929 BLAKE2B 3a33df8a43887f52e637aa66dca50cae9920a7e00ea51af8d0980ba79ad67882c8bdf362f4c8824d6a2475388f7d04327d8624b346466cc2a4c4d5c1ace3716e SHA512 34d346d78b2e7e57d108bbc65476975f31effc169fe69b8ad5fc253dbefeeb23db3faf461de46e427733191fa12aa49f49edbbb7e438d7cbd579dfb9d1b81d77
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bae394e77978..9b0a11a27cd3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index b3efcd3df40c..82fb27d85ba2 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0-r1.ebuild 769 BLAKE2B 20cdfb4de25ee14125951aa948199dde1a2a8e385436972503a043a6ef89c3d52ad4ed881014bf8963ac2aa8fce2b3d4ec9a212b89c7a35443e542d659f839b2 SHA512 7ff001c98d092e9a3762342b5a0803b36a892eafc7ab728b06ec2db78c8b6ef1f56145968f85c02097f182d539fa4392369f2659a7332fa8ae53d5fed3533bf9
+EBUILD PyPDF2-1.26.0-r1.ebuild 770 BLAKE2B 6ccbeaca61ff823afdc6323b37b158713c0779c674f0e96b353e723721fbd23cc34540ba0a9f5f3643615af010ca01cc424204fa6d154dac40ccad08cede9120 SHA512 d073b6cc3f1a0e2b434ddb729cf031231e3ff24711f54063e5a99306dfae97c8475409422b7ee4f212d4909eb71f6f9d22db94be5aff5f335d111fa34f08973e
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
index 7c767d86a71f..552d532d3717 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-DESCRIPTION="Python library to work with pdf files"
+DESCRIPTION="Python library to work with PDF files"
 HOMEPAGE="https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 22668f276efd..1483f1e5920a 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1709 BLAKE2B 2826b3c82d7b8bfb1c4c1f7a66360ad3eb90a6f0a72feaf058538c8a80913654f04666c29dfb4aea14eeb288bf27728d0100a88c34d1c2279410885bc3fd1e9b SHA512 070f06ff3fa5e7c7deb2e21992b50b77436f0a820656417c781de17f447e7a1572e1d402398655fdc0b438e7a50b8e3ade2d4f95e9c05218cb29106495866dc0
+EBUILD PyQtWebEngine-5.15.4.ebuild 1708 BLAKE2B 64d902a7393e50554350bb76281f592e0d4b6cd68131e7bfeb84d610fdf08cf0e85400699ec0f361e302183ab81284fe99be10f5329f4f7e13884703ab5a26ac SHA512 26f41890f33277171b2d473635878be377126d48ad9d8cf82a7a4475bc99b35885389daa9c70254819b2c44935b4ec2de2997644d1df4f8fa92eeea2a274bc3b
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index aaa3aad7aad1..81bcbeb17ccb 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index da84f40d43e5..81cc01fea3d6 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,4 +1,4 @@
 AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c356219efb36d89371ec473bc9fe77aafd637d5310077db0312c7c594d3569821d12524c0ff30710018f9d481ac12706df246b0f SHA512 5ffd4e6bc726633a0957796ab531bb3a566a6a8cc39fc59df888afa7ce53c4b2b7fbbcf5e64dc111e5a603ecda3d7c5920f436b986f11df0ae4fdf9ad042b81e
 DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8
-EBUILD SaltTesting-2018.9.21.ebuild 811 BLAKE2B bf5382813fc053597aaf0059afc17165fe8bd95b03328896fe9e36716e43463798cc827038386cac02ddc81062a2ac74b970f8e913874f3e1cab6c317d023fae SHA512 2ae927ac01a7e70f78b7f7c373cd0660f27ff06f651114f5190ec3cba169a561e9e6f716090b479b861d96395f28f3d93ee38e49df35f30a8cf2d0b74105141f
+EBUILD SaltTesting-2018.9.21.ebuild 818 BLAKE2B 64467e8db3421e702a8c59ea2c7f1e1cd540fe05d2c3b8f21c4b6cdaf8dd1f0d9659de3b0a48e9c57bb6a64b27aeefc96a5445910cbc7b44c98e66194bc0f7d2 SHA512 1e84628032fe1e37b975b347fee7c9b166aae7bfeb720edfbb9f1cbd0a8639cac25e62d2bb0bacb75e4f629d14d8f5f978b230df28a4bf06813f6f444a8ff905
 MISC metadata.xml 333 BLAKE2B e600956c630527e61c16aeba7e9146732252ed6351301052a3aa1c6187f1b496a162ae7f656cb2c1fc6be3112a7920503af30028df8b4410aa460cc1975dbb31 SHA512 ea35cbbfa8be4ef354636ca16d31caf69cbde213be302049874e03d5167a7435c28605b3dbfe8d8285784375ba2a73718eaa24bf5e9985c559cb04a6b8ffb74a
diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
index dd100667fd93..78e0db8dbe62 100644
--- a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/salt-testing-${PV}"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 831f5fc724e8..13128b125082 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,5 @@
 DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
 DIST absl-py-0.12.0.tar.gz 229360 BLAKE2B f913f1eff2d8efc1f5bc06c83d09dbd5c57ba5fdc39953ccbe99750da49676a95112d4dcbcb13e20bd380c7c07f4a3d01e69ae940a19a91dc37e51b2189fb66c SHA512 566cae120779920f8529eb797f9b26a662df0fa2ac853d78424e35d906f487069a945b2ad5a9a292aa90663e8c31c363925aa3114331f0f5f9fb479c79d781ac
 EBUILD absl-py-0.10.0.ebuild 562 BLAKE2B bdd34c24e60cfa203213557a361feba3fb19aac2d1ea6fa701523cc782a4e3880e4a52948d9817b9fdd9cc68491cb9b19dae6e4323ac38b4acbba872eccf9418 SHA512 23525ffdfaadb697bfecbe944c363de72179eb2b08aefb43cacccab93023f05a16cffcf60d0c902fe188010f96f65dc4299198b75c276ce1335e0d737ec6dc65
-EBUILD absl-py-0.12.0.ebuild 566 BLAKE2B 0da353f306b8066d1e839ad9932907a704e90992cbd1c88f7f67771b1a0e2700b8e42725e3880755f145bb4cbbbd3d832b4fda41da48410dd4d426007502a472 SHA512 47ece7a55802c04e397f349f07a3f09513b23c84429221137a2085cb5b9d504f3d05106d92e28051b76eff3f40049267fa8445539f1c861f0c2bb2bcf4c97854
+EBUILD absl-py-0.12.0.ebuild 564 BLAKE2B c51969eaee5e50113ce341d47cf50e9bcdc434d79798c06fa4a0d11cdb228e9bd640b786f9e1a539692dce4d783ca95bd15343b80893bc36e8ae19fcf6e8d563 SHA512 5221feff8f71a77f42579f6ad212c1c361fbf7c7aab1a1d0310b1a18f34cf2cdb7681bff37ad30cd289b6f256978ad1aaa568986e3514b4e105ef5e617db52ca
 MISC metadata.xml 576 BLAKE2B faf52655a8b6fd30293fa05a9b333806db3b2069a30ca7720bdaf971cb0242ee04350460d63f411c9e501cd4c6f0ba91e82ba32e3e067a9954acd954677475aa SHA512 cfb5ab7671b8cc6ecb55e3074cd31c42a52a293cff27210c7b5b955e1804b8b3a22da599142469097daa85331008e50a48da67b594bb55ecf5f8f8935191e527
diff --git a/dev-python/absl-py/absl-py-0.12.0.ebuild b/dev-python/absl-py/absl-py-0.12.0.ebuild
index ea6caeeaf535..b35f1e4e974b 100644
--- a/dev-python/absl-py/absl-py-0.12.0.ebuild
+++ b/dev-python/absl-py/absl-py-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index b2281e056039..a8ec88a083be 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,9 @@
 DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
+DIST aesara-rel-2.1.0.tar.gz 8161534 BLAKE2B e17b70f7422f0f252cd6d248c16ebe2d609b77724d08251fed39d5f90de9dd36ca4006d767f3be8b0d0058f77f2d670033d058a24a5fa2df2c24ff5193e69c7d SHA512 d5e766eff03858fbf851e1baa0877b1cbc328408b3d2e760c2827ee662a0188e3b6dc5ceecb1c09d1f727171cf4c98c89b618f66695942558f44734a7405a88c
+DIST aesara-rel-2.1.1.tar.gz 8163328 BLAKE2B 5f2d05560f0c3cad0b58017f152011c9f10ebc8360ff925b90f6863fd2c683614cb42e86a69c53f0b168012fa1771ba37924afdf4f9600befad7d5af5a56f7ba SHA512 6a823201a7c4ca00a375dd7e1fcb38f31762e1eebe1079a1859b6ee709eb030c2d884364576b7925f5790c394f979bd5a738925c69c44c8e529757f435fb1a1e
 EBUILD aesara-2.0.10.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
 EBUILD aesara-2.0.12.ebuild 2103 BLAKE2B 4ca1ff4315ed988653a3d84372bcc510a4028fd409598be93d47da36702e1662b9784dcc9c8c526aaba5838ea76f3d8e41a39052f031746f1c7b9f67a58ad7a4 SHA512 4eed528151518ab260d595fa386cda1f209a4d3b299d8c80ebadebe916b9575c3c26442e21bfc870003464f2237b1b9621aa684b84c7f306669af523393eb6aa
+EBUILD aesara-2.1.0.ebuild 2112 BLAKE2B f359e7a97045e2d08e7e1110382c90132453b3c982a51ab2bac581a3455f37b4d49842d294c9ee1855f95fb23c46c8c82aa50574359f40e555c82c48fdf80f1d SHA512 b54b0895caa476d4bc3bbc9cf4b21456e0982ac89dd21587c4e040a1bcb33cfa958593fe60c59c11aa5e8622e0439478cff303efd5f5b921a295f9e6747ef906
+EBUILD aesara-2.1.1.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.0.ebuild b/dev-python/aesara/aesara-2.1.0.ebuild
new file mode 100644
index 000000000000..b067b0298c71
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aesara/aesara-2.1.1.ebuild b/dev-python/aesara/aesara-2.1.1.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
index 8b7138cfc420..f8763e930369 100644
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@@ -1,3 +1,5 @@
 DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
+DIST agate-sql-0.5.7.tar.gz 14975 BLAKE2B 7890d5c21d89dd216a7a4c906189e1e44111bd96ef3476f0e6dc4c842dc3f25d537ee398f3c8e720d43e64001fa0ea93940d4a54ee31605eea9e8ae9aa4dec37 SHA512 df7e1d5975d9af0722f4bfa67f1e8679ed46759f8aaa5c76614ed5280c8347f727517568ba377c21dd8eb349f93b7a6d308959ae69bfedd125e6d99bd7bd9dcf
 EBUILD agate-sql-0.5.6.ebuild 1477 BLAKE2B f5a946abb127d8ce24ccd77fc573e6440df8b3c0d1317834e0128d9a8057e1b83f0e054aeb16f2e968c869fd2226d7e5bb1ba1a825d7f91df9dfabb01b80a7f0 SHA512 5e10af0fe07be21b99050734f01e562e0ac2b6fa7d7439eb81e883a601774756fdd32ec244ffdeb2a4ad084c361a0cb8689cdf7ff3f567a33ef5a816db1d02d5
+EBUILD agate-sql-0.5.7.ebuild 1406 BLAKE2B c1b9db47eddbd9cb8a2748b9b6560f0a2c26a0334c60572b01f80826e3766fc52b14aa29747545338ed1ed0ab8b2e4e96ec02ccb7a54ede0003d7f4f2b4a8a2b SHA512 d941e02a642f31f9bf7268a36a6c4cd460fa25d7eedb5761ec571615590cde84b69b3f8b50167a1040dd4e3259aee2a080aac7b432bff66ad428a8dc948d81bc
 MISC metadata.xml 512 BLAKE2B 0709aed8b06df8981ad0b0c2733a1acde06a0753701b6b35ad9662e5c66871529b968a71d39265d0fd72aec90f09f7166848e1155d240815041bff498d4be06a SHA512 f09f6203a8f90abb3646be9e8d2abb4d8b367a857f384a7c43d43862953c99111e05707eb4890a6a3abcfd33aa8717bc65b180771c0cc97e5ff1ed762978f95f
diff --git a/dev-python/agate-sql/agate-sql-0.5.7.ebuild b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
new file mode 100644
index 000000000000..e58ff6efb206
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 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="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xml"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local sed_args=(
+		-e "/crate/d"
+		-e "/nose/d"
+		-e "/geojson/d"
+		-e "/Sphinx/d"
+		-e "/sphinx_rtd_theme/d"
+	)
+
+	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}"
+}
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index 2749f7ae899b..bd8ecd7c8cc8 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,5 @@
 DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
+DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
 EBUILD agate-1.6.2-r1.ebuild 2753 BLAKE2B 4c80f6ab093d11f85d96215ee86d929fc788ad7714e61632886f1806bd8909c677e5e65887919ab6514c88d08f6697fd37c0d657876e000f86a56c9b13db3fc3 SHA512 7b2bffbdf6dba030b97a6213e7d47c43a24e0f02d25b3420b313a5bd73d465a74c532680ffc8ec1a5d4cade29c6de6a299df251c4ca8fc3764c24eb129dc61ec
+EBUILD agate-1.6.3.ebuild 1375 BLAKE2B c6409f7f677ea26fa8dc305aa6b7664db636cc26a974ea760d2ea701008a9c8684e408c339ad317a5722e424b7bf48195bfa729a943e70c7176cf7f79b2850b7 SHA512 671f40e651ade42d04571c413df6beefbe7748162fd889b66ec99a41dd7b7699008b0e05735489dc6ce3c818af754da5f78d6dd552ddaff84b31316e86ece01a
 MISC metadata.xml 485 BLAKE2B 32cfa1d6bc9582bfe411d79e541837d48019eb8a3bcb956634f3a72f5c41ec30568cab69348e5c7419210b77263a93dd042bb88a1376706888a0e13b2553f456 SHA512 30edf8ea75b16bd491372ca7d72b953fb9d3d27c88b10829b7d90108e952fb3a8489541958621a34d288d9dfb5378063fe6973a15d71700bc1745d20093f7b87
diff --git a/dev-python/agate/agate-1.6.3.ebuild b/dev-python/agate/agate-1.6.3.ebuild
new file mode 100644
index 000000000000..52a588ad921a
--- /dev/null
+++ b/dev-python/agate/agate-1.6.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 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="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+xml"
+
+# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
+LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
+TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require specific locales
+		tests/test_data_types.py::TestDate::test_cast_format_locale
+		tests/test_data_types.py::TestDateTime::test_cast_format_locale
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 3aa0adc05667..65beeb04aca1 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,3 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1.ebuild 599 BLAKE2B 69b12b56cabc24ed9c3faeeb4e63969beefe31120fd67a15e4aa747b6226d6709d486c9abce6df27b7e4342cbb7935e145031d180bbc9f790fd5c32b015c6850 SHA512 44c73464068dc6c9871c3e0ceaa3cdd8784f57d0f247b4d8a097292ad2e36d3925e4a02d50fb469b385dcbd197ad518fb60163415fcd9836d3f2bb95b15f576d
+EBUILD astor-0.8.1.ebuild 611 BLAKE2B bb4f0a6abb3c90578b3c67bc51bcb67c0e11f8bce9492d0c23b02505910b7d0c60091dfc5ed892ec710dc736805b4c8fcad7885a422442717f05eb88d8ce7b17 SHA512 1475a4b544b0a39bd4434ddf899c69d0cec19070608b091869536979d77e7ed83110e8829d3656b5410938876a8854800d569fe8f228d9823f68d0c61d751d49
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 49a4d593853a..acbd1e50eea3 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
 IUSE=""
 
 distutils_enable_tests pytest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index eb460b7a203c..f12c5ef53c07 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,5 @@
-DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
 DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
 DIST aws-sam-translator-1.37.0.tar.gz 880633 BLAKE2B b3913b12fff38657662a16c13ae6ea3b836faa94eae986e7364543e7ece6cd53afbc9bc80380ce5c4500be57d1b588f617f3ec7e6104cf83357ffe733f4e50e2 SHA512 aeaf194d7c8338802762a667ac05e57a8fbffbae7d1a707a708392b1d103d4e30f42e683e077b5cbfc540bd38debac95c578dc2c02f2c3f7ed531ece64bb7200
-EBUILD aws-sam-translator-1.35.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
-EBUILD aws-sam-translator-1.36.0.ebuild 1216 BLAKE2B ada96426305b989e71ae43b086230e4033bad4b426c01500a0a98692796eebcf1bd1a5aff3b3a211121330a74ef2b4d7835cba8c5899c6393b6c9a2b40cae2b9 SHA512 aede80a780473633841976a0a6355ce31bac5e8862692556b0af76577c7bd6653a194152f7c008d298f5a468b3c0ed7b90b9812e62f90fb795709d3ce8099311
+EBUILD aws-sam-translator-1.36.0.ebuild 1214 BLAKE2B bd359042998104aaf99fa92928a96080e3e87d2238cdf7aebc18fc5fdfcb42a12650488f259a051630e6a71ddccdb8097b78affb7f81e0f925535e4bf9f403b8 SHA512 52aa296ee137cdfecc6906e82b226b030af0beb1bfa67b90d17c26e44c40a58283d55760e82161ef7f8be0062fcdf03a14fd62a047532e1abd8ba33a9fea11ec
 EBUILD aws-sam-translator-1.37.0.ebuild 1216 BLAKE2B fe9784c4435b5c56390bfce87058de70b98af7620ffc6f58e3381ac0249a9d8e01d1a25f7b8538c33f02eff149628a620301dc88143f5a68b8ca714efc5f9c89 SHA512 4b82a3f9f589eabc4197187e1e87ff2ffa4e52643ce33f84796001fdd924528e6dc108c7f784d606d91f17cf7ae9182dd6c3bf336099de0a3909641219158326
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
deleted file mode 100644
index 93aa7dc89a4d..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.35.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || 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.36.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
index aa73432a351f..57f6ec0593c3 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.36.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.36.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.5[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
new file mode 100644
index 000000000000..c564045b33fe
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -0,0 +1,3 @@
+DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 744 BLAKE2B f857b7930751ac7aeca55215a871cc25bdec8a7dccd85de558fe40e32e980b2c39050158e8bf8a39538e13e62d59f93b19a471fcb3b308310be311056d57a95e SHA512 7ca3d1d6ff22dd9fe0d53941b962ab079e8f1aea015ae5a2656cf10aaa2fd523b5d1edf03a34e03eb31ec741ce01d3765b0cf630e7b1b671309f1576531b11ae
+MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
new file mode 100644
index 000000000000..8911b4a6fa0c
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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
+
+MY_P=${P/-/.}
+DESCRIPTION="Compatibility shim providing selectable entry points"
+HOMEPAGE="
+	https://github.com/jaraco/backports.entry_points_selectable/
+	https://pypi.org/project/backports.entry-points-selectable/"
+SRC_URI="
+	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/backports-entry_points_selectable/metadata.xml b/dev-python/backports-entry_points_selectable/metadata.xml
new file mode 100644
index 000000000000..d6f15c81c771
--- /dev/null
+++ b/dev-python/backports-entry_points_selectable/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="github">jaraco/backports.entry_points_selectable</remote-id>
+		<remote-id type="pypi">backports.entry-points-selectable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index df24a91f2f12..5eb0ffda4256 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1,3 @@
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
-EBUILD backrefs-5.0.1.ebuild 1164 BLAKE2B 041c0ac793ed5644857338d90ba774a8f11d934e7475465b76eb0800e98f335f8d43962ac6698c90e3325375f13433933778de52e6b379418bd8de2237d04cc0 SHA512 3eca0d88d2c5268d8d06e49577a73c90730ffc8b739e83336ea25c72095b5e07d81cdc912800a89c389126917ea2f393a11bc2ca414c8939a42ddb66237d13a3
+EBUILD backrefs-5.0.1.ebuild 1162 BLAKE2B 43b8a0801c86cf3106064ab6d4fe24177940ca141a724f087c097e9648f048a11dec46388ae352b17c7836677014ed295a08ad34583523b8d7ad509926a4a024 SHA512 582076d72d202285abb02fe71f5e5fa2380e181a52ceb4c2406cbaa29cef758f38d630c8b3c201d8a3fe0163cb26f244d10948e196712aa92eebdca3000cb330
 MISC metadata.xml 1127 BLAKE2B aae5baac8851a61252d27454a13959977d2d172360671f9ba29d45125359ad445ee53d8e699568a90084c9347c3c83191a1f8f24717b19007286d6ada1f5a1f0 SHA512 50114f5146d58366f5a7325142bdfe4eae5aef656f79853a1dbb9dd872428321b8bbbfdccc8684f62c0041ba6d18b9f70f6f4fcd8d49622c1dd8b58437423653
diff --git a/dev-python/backrefs/backrefs-5.0.1.ebuild b/dev-python/backrefs/backrefs-5.0.1.ebuild
index 60fd99b24c7b..6f53136ab0d4 100644
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.0.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 20cdfa6e2fa8..95096270a01c 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,13 +1,7 @@
-DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
-DIST bitarray-2.1.1.tar.gz 72522 BLAKE2B 28afebad24c574706f3cc57d1b82890d8e98a2ba745765a1a8d9e60a630a1e1e6e467bdd7b953c4c75b08b302658f7704d83a8e01b351c1e99e66ebd52fbbf83 SHA512 d690e266d1ac9f8fba6f2dd2770b80d1fbb2a53baf2ba759c946a2d371d9804e5bfd6792fc2a64809fc10e78563e106c2d357474fa515423fdcd6964a8191718
-DIST bitarray-2.1.2.tar.gz 72530 BLAKE2B 85b98e3e7b89ded2f6d05aaf08efdc46982b92f67eac6153afe0814537ef84528a5a76e1b0de03d771e8b9ee69ce762fe34d908d14555a5e6c70583350009a9f SHA512 1db9d54a2721741732cf6d455b36d3fdeb550a3a6370e14d794c2d67a1a0d39ca6ddc8db939ec391b33dc86962db51cc4291d8d04db878758fdb411fff377819
 DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b74179e361f1e08644d3c4557085bdd99931ce9cec633e39d4fd454fa36d0170c5057a8931cbd8ca2fb8f3bdf71dc1 SHA512 de84b8b1c84be32f946a5f12e8a6ce84f9aecba6e5dc28c0cb0e1fa59434cc5b0757cd5e0b616163b134d460edaf4d53edd53da86ea517a97c818ee83855b174
-DIST bitarray-2.2.0.tar.gz 75776 BLAKE2B 4be063193ee4ee5c991213837b360a97ef26949e9e3c83fb25796705a9d22816c16024e9c657c95b57e5f6a5d60cf8f8c829efa847dd5691d0f62ebbca214239 SHA512 74d7f05a9d03adf660f17883782eb1f2bbd08922c3f6a9a7a44eb86cfb29ab8e3b7c2aa7acc27656d04713396e956771b3f9b429630b74f0dc39a6bad869fe25
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
-EBUILD bitarray-2.1.0.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
-EBUILD bitarray-2.1.1.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.1.2.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.1.3.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
-EBUILD bitarray-2.2.0.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
+EBUILD bitarray-2.1.3.ebuild 555 BLAKE2B 2b3a6ec7d61f8aab17773e44b70fa98a2ecc24384b22561fd83396bfc350ff7d9addf3228ae1580d0d9dc2dd6a2a6d094232b2e52568e06f6eb77540567bbdf6 SHA512 b7c65e4bffe459f8fef3c3af19be16f4fa1c948121ae044a8abcbf6f65ce7400d50641b3c794d698286b89b46b42479decdf8211c44aafc36c9c38acb619b2d5
 EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.1.0.ebuild b/dev-python/bitarray/bitarray-2.1.0.ebuild
deleted file mode 100644
index eadde2209108..000000000000
--- a/dev-python/bitarray/bitarray-2.1.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} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.1.ebuild b/dev-python/bitarray/bitarray-2.1.1.ebuild
deleted file mode 100644
index 15dfecb43203..000000000000
--- a/dev-python/bitarray/bitarray-2.1.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_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.2.ebuild b/dev-python/bitarray/bitarray-2.1.2.ebuild
deleted file mode 100644
index 15dfecb43203..000000000000
--- a/dev-python/bitarray/bitarray-2.1.2.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_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.1.3.ebuild b/dev-python/bitarray/bitarray-2.1.3.ebuild
index 15dfecb43203..ad5f9ce0a0e5 100644
--- a/dev-python/bitarray/bitarray-2.1.3.ebuild
+++ b/dev-python/bitarray/bitarray-2.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitarray/bitarray-2.2.0.ebuild b/dev-python/bitarray/bitarray-2.2.2.ebuild
index 2db993517908..2db993517908 100644
--- a/dev-python/bitarray/bitarray-2.2.0.ebuild
+++ b/dev-python/bitarray/bitarray-2.2.2.ebuild
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index f68f70e4604e..0cd71334b087 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,14 +1,8 @@
 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.4b1.tar.gz 1135304 BLAKE2B 9dcb90109a9cbddb53682b6385f5b7ae5cc650251eeb8866921bdf8f04264d5ebeb2eaf4ca04fa761d461c6f389e352cafc2b2dc521fe6566a9d41da48830e44 SHA512 1a7d3ada1c91084c6e84df9367abca6d64315ba25dcb3a65ad13bfc3db76a13a84b1668fb23563e9f2ce61df72bcbd776b9d641ce670023465768c7269027e0a
-DIST black-21.4b2.tar.gz 1136152 BLAKE2B bd1ee42495953687e23338df793bfe791352ab91541dc9b563a1274378a6527dc9eccea92fcaaf3c67403448e0ce7d99f605ff7dab1d7d38926f0cc84a859e1d SHA512 6d74bb718aea64db6e83045af7e787419efd7fb647c7d2b49a412e92e796a800fa4f1496fdb28253af894956984e22836761d22677631726f705d78143a63444
-DIST black-21.5b1.tar.gz 1136153 BLAKE2B 60a8c1ad1e6b237a79f65b790924c405d12ab34f7b6067f069f26831c76fbf99a217316fa5e2b47421ec982da56b870850455f78a2a37ac7856f72b101ce4f65 SHA512 972c69d13fb1e3371273a3b185d4413f37e07a573cb7debda795dabb25bdca3d25fc1ba8bb41c8ce27088eda695a3ae1f12af5de3fd329dbd54019d3537d90b1
-DIST black-21.5b2.tar.gz 1143836 BLAKE2B 90e24ef83241dcccfe9c43e62e8369db8c961867c25f85ed526d7c0c4a9df0c75fc4709a07ab2e844c5a30d04c50f101f4a80348210d6b64c32fceb13ebd143f SHA512 3974588a6bdb9417d4886eceb0c79351e4129ea51c5d1de018acc2e571dab6f1ef244ac074e6e561e4353276939531d09050fbaeb93c891e47d780dd548b8f14
 DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5488ed4851b5afa3bf3166df9723c3815220b68eb5a069c167393f501063321addde19149ad4ef85d59938eac7 SHA512 0f676f6bcd8bcbbdc615a2086631b3cebf9b9612fabc62de78215a7319cabd4e200333340471dd26a6a80cb920f04bcfde5a8dd42d069c19dba471ade30487ac
+DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
-EBUILD black-21.4_beta1.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
-EBUILD black-21.4_beta2.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
-EBUILD black-21.5_beta1.ebuild 1569 BLAKE2B 6ed170af0fabe5c5f81468ffc19c687a936dc815338c1574481c4ddf900f6b09a67ac4d0fe1bc6b44377d6dda92bbf4b6f5afb6abdd48f5aa0e9eac8fe9fe1b4 SHA512 8662e404c08b9bbb4b837645fd67d77c1d5b7aaf85a054334d2980ccf27e4db1096c47bc2466bee3e56ca53574cc09cf7dc59ad616aeb3cfbfd1a4f089334980
-EBUILD black-21.5_beta2.ebuild 1544 BLAKE2B 7e8af30c33fda87f7d24aa2aa396f4cf748cdcd862ad747b7e012dae3b3b65c9c2556e3fbdd5bf5bbb6e79a4e3c0293f035cf1547664a2517aa0b9cbdc694337 SHA512 461b9e04c506c68497e0cbe6fd7eb6cc5f6f6ee36cb2596916f4dd0cf0a59479b112c1b03e8cd6d7d621a0690c315fc2e6a3e57a74dd4c64b8a3d345c3517746
-EBUILD black-21.6_beta0.ebuild 1538 BLAKE2B 044ceacdc37ddd64a97d74af6ec9ec03e4dfb1979870ec23ded907515bc8cd0338f7785b85ba173eaa4b57bba806f92d40a4aaca826a499d2d549b3a06754a0e SHA512 e762ae3aaa8a311210ca5602608fe6e7adea40a839e9e4d2145b900bc02dd30a96bcfddaf8af2490e2e95e0b802eca088a7c2cf37953d120aa61e9ffba0d6939
+EBUILD black-21.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
+EBUILD black-21.7_beta0.ebuild 1334 BLAKE2B 437d2ec4445a6653d4415e3f307fe84468eb99f0422bc1a0919f71773de361224ac57e52e932c595d77f4865c4726f5c1a64a4f740e25dbe9d3485398af946f2 SHA512 7450a4f89eb092402f7b662588fadeac5a2febd13f6320f303678c4871882a6fff9672cc11c771bbb2a96e0a10baba7d1b0bf9ab63f86dc67fb59193dabd4a65
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.4_beta1.ebuild b/dev-python/black/black-21.4_beta1.ebuild
deleted file mode 100644
index 9257824ce16c..000000000000
--- a/dev-python/black/black-21.4_beta1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 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/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	eunittest
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.4_beta2.ebuild b/dev-python/black/black-21.4_beta2.ebuild
deleted file mode 100644
index 9257824ce16c..000000000000
--- a/dev-python/black/black-21.4_beta2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 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/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	eunittest
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.5_beta1.ebuild b/dev-python/black/black-21.5_beta1.ebuild
deleted file mode 100644
index e02676ead3e7..000000000000
--- a/dev-python/black/black-21.5_beta1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 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/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${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}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
index c69866925f81..0675c52604d4 100644
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ b/dev-python/black/black-21.6_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 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/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/black/black-21.5_beta2.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index c80dfedc410a..38f9c3e07d94 100644
--- a/dev-python/black/black-21.5_beta2.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1 optfeature
 
 MY_PV="${PV//_beta/b}"
@@ -16,19 +16,15 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
 	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
 	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_7)
+	<dev-python/tomli-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 49973a093031..e10b90052936 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,4 +1,6 @@
 AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
+DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
+EBUILD bleach-3.3.1.ebuild 989 BLAKE2B e8e9874d7a6147aa3bcbe782ef809f3f34d726f90ce8f812e2cca46ae6d22c93665334a001ea53406026aaaed2a12458eb2e8e6c5aa676c773ff9ef105282ed6 SHA512 beb43388c19a2fd8b9ec2200bd91b8feb3cfa591e2c40f572ff4df2c833eedf7a7ab86b9d8f6860baa7168701c065e783a816f8acce25f2e6291f72197f164dd
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.3.1.ebuild b/dev-python/bleach/bleach-3.3.1.ebuild
new file mode 100644
index 000000000000..0310e25c43fd
--- /dev/null
+++ b/dev-python/bleach/bleach-3.3.1.ebuild
@@ -0,0 +1,41 @@
+# 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="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/"
+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 ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-3.2.1-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3cd0542bf1b4..bf03e9c4823d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,16 +1,10 @@
 DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98042a76311588463f36f48a6bd9641fd25e07b63ad50afcb3ea9bfea0b5f3304e3c2689a2187198aac04549346c SHA512 477033e623476fa1e2e49cdb788f204ac49230088788cbae3f079de4561e7bbe56bb3b170480592a0ce056fcd2ea0cb3f14b4f5091279f46346465853a191829
-DIST boto3-1.17.105.tar.gz 387920 BLAKE2B 475342a93440418f6fc5682e7c24f386aaac8dc91e670e8c6ab7f949fb8557c97ca0f7e7929128742c3b1091cda2a42e0f1212528f8fb1c7ce1a6dcc3aea18c4 SHA512 a044f0a61f8ebea58f7ebbe670b4f0ba94f6c3abe69857340908be780e1cae5f5f3ce892ba16af44df62542883d30b93a9b42830123dd3fb31998ae8c642e1b4
-DIST boto3-1.17.106.tar.gz 388602 BLAKE2B f9cc023ce4c0810ea7eb004126941229536fc068ff51039dc9f9943d153f8fa717e832c7161f85332e3edf596f55b3ad7dfb9ef117b471f59fc269ee9c63818c SHA512 866286d91d157d513f35231f8d512cd9738c7795b044b41c8e2b1594ed83a6060bcb3a2e3c8388df2ed86c7b04e0ce2d42c88393d8a6753d04c2a007865033e4
-DIST boto3-1.17.107.tar.gz 389348 BLAKE2B 8c0893d8ad73563f63254877621440ba24dac76c577f5684bc37b5f99b9111be209f69efa324cc079209340051230a43b66004d09ccd5804d631b0c04083c384 SHA512 450222507aa3bae8062b788ac7f637dbe8a5e7a5baa0f45001a74a810c2579927a7400cef180b57a7d7e57c391d665930b577b39272681ca380b5e553385b1f8
-DIST boto3-1.17.108.tar.gz 389871 BLAKE2B 964ff0b2d7a437c569e2b19f5c24d228df6595f15d72350b2cae0cb43c5e1f4d8376c0a25ec393a0a0f085650b193afc852fef59d258dd1c3addbfff4c27ce62 SHA512 4b78af4e59f399aa022762b6d1dc14252d4f549cdbb9264e5762a927b3a7e391d336ca48d938b1245ceaaa243ec01ea642545bc97abe5f7a3f8f8774ee21e2ce
-DIST boto3-1.17.109.tar.gz 390366 BLAKE2B f39548e623fc65907b13d7d5ba8a16034e5f741a3343ef69e52984a2417b4fcf8c21cdd49854222781a41aef0e26a7ffeb38c7a2dc600321ef6e7574f43e785e SHA512 4e13a99db4be8d61b217afc9bf4626ae5e6be524684581d74b7d7ce180c8d74716a0ef196ab6b91a7ef6fa56a57887e6ab0d05da380ebf8ae5bb915ac1a844b2
-DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
-EBUILD boto3-1.17.104.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.105.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.106.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.107.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.108.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.109.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.97.ebuild 1336 BLAKE2B 7e8ad6dba926d35239c71ce2d80fbcaf13062ae03bbbd962bb4842f6ab01ee0226b8f41dd57b05c0e4602a45f43017213fd6da4ad6a1afe36307e006b0866d25 SHA512 185309d57be679c0cff90fc53e0868ddfe7dbbd6a8d46be2835b825cdd48ad9e942e9212b4c853caea0c90711a3b729a0181b6aeea980e9e01e0de13b01712a2
+DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
+DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
+DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
+EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
+EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.17.104.ebuild b/dev-python/boto3/boto3-1.17.104.ebuild
index 75afb4bcf865..1e9c1265b2e7 100644
--- a/dev-python/boto3/boto3-1.17.104.ebuild
+++ b/dev-python/boto3/boto3-1.17.104.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.17.108.ebuild b/dev-python/boto3/boto3-1.17.108.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.108.ebuild
+++ /dev/null
@@ -1,56 +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 AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.109.ebuild b/dev-python/boto3/boto3-1.17.109.ebuild
deleted file mode 100644
index 75afb4bcf865..000000000000
--- a/dev-python/boto3/boto3-1.17.109.ebuild
+++ /dev/null
@@ -1,56 +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 AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.105.ebuild b/dev-python/boto3/boto3-1.17.112.ebuild
index 75afb4bcf865..75afb4bcf865 100644
--- a/dev-python/boto3/boto3-1.17.105.ebuild
+++ b/dev-python/boto3/boto3-1.17.112.ebuild
diff --git a/dev-python/boto3/boto3-1.17.97.ebuild b/dev-python/boto3/boto3-1.17.97.ebuild
deleted file mode 100644
index dc4338635795..000000000000
--- a/dev-python/boto3/boto3-1.17.97.ebuild
+++ /dev/null
@@ -1,56 +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="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.106.ebuild b/dev-python/boto3/boto3-1.18.0.ebuild
index 75afb4bcf865..819e73691110 100644
--- a/dev-python/boto3/boto3-1.17.106.ebuild
+++ b/dev-python/boto3/boto3-1.18.0.ebuild
@@ -52,5 +52,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
 }
diff --git a/dev-python/boto3/boto3-1.17.107.ebuild b/dev-python/boto3/boto3-1.18.1.ebuild
index 75afb4bcf865..819e73691110 100644
--- a/dev-python/boto3/boto3-1.17.107.ebuild
+++ b/dev-python/boto3/boto3-1.18.1.ebuild
@@ -52,5 +52,6 @@ python_prepare_all() {
 }
 
 python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
 }
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2a5af42dc222..26cb3e2ecd71 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,11 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a442b2d49e461a2a4c2bd613e26095ceb87f4b7ceb672f338ea04ad918060bed118f7bc4c184c46cce1d6a9f98d4239 SHA512 2201d87ce2e1c8979548698d6a46eb03c0a2026360b178fea895ad6a244efad534d9970d3c6343d50639d25b3b8643db6744658fec14e0fa29fd7c4b45c8e0d8
-DIST botocore-1.20.105.tar.gz 7883335 BLAKE2B b48347e304ea54b56a37faae8bcbe9c127118b5bfadc71ffff3f6914b57f4d819faaadfc25834e49c9523f073f639823db4046bcbd9b5b72ee1df4c2ad198338 SHA512 72267620e4ecb7e4e4fa446b8f5c0b42d2e0af372f9e8bcfea123e5d8a6f4638102d57a9eb9f3c6f2358c6c2b36e727552c0b350b07f95a79292fb3c2cf4dd99
-DIST botocore-1.20.106.tar.gz 7885164 BLAKE2B 3fa8b860a40a0915f6a59912fdee7b9e55fa88170da747d4d87464a5b44d6cbd5ce83cec383a7a1f41ec9a203d43a8cc006c7fc0005bfcf2869d66aa9f333b14 SHA512 135d789e2d5975697840dc4aca759b2d07d70d58efed7356a3323feb54faa2b8a339a48a3ac931270e335bc730eb8cc5e87f6fc2f9e3aebc452aab331ca49261
-DIST botocore-1.20.107.tar.gz 7893209 BLAKE2B 4e4882efef667ae91bb3e42a84748609390ef637d0a72a0b8b9dbab83a55cac9117553a0ef34bd38af98493d0972fd6178b322207c71914068eb3c634debaae9 SHA512 09c7a4bc4fab922aa7dbe94fcc0da6a462dbd90bdd51e8612431e5a790b46c56eab3b436048572a4a14c6ed2417ddca8efa52474d28fbe32558550c44b3fe0dd
-DIST botocore-1.20.108.tar.gz 7897833 BLAKE2B 3b4ee27640dbfce1c9923137ef21500649454eba8e1a5b569fb0d949253e619852b61344ff86c769e2f2314a089047fe9590a685982491b21f4f7feb0a33b220 SHA512 a394fa8fc686d07ad5e1a25f0403d4adf53aa6af565696c4bd5aab58ee8f739b761f4c8058263a05b028175d1256ab87fa7fae3035cee605f236749939cc0eab
-DIST botocore-1.20.109.tar.gz 7900306 BLAKE2B 1f2009ccb236ff7b4d9d3b45b34b2295c9bbbd4bce207c51514bf3f568985eb3d5fedaf0e5309266f46ad1e42466524d148d601452474b738b53c329f0164a84 SHA512 7f266b2395f79bfa629ac147abbf646bf049ea78b208228b3817912626845fffac9c89419c75444116ae6f14067805e291faeb942e6d25061d2e6f1c382d762e
-DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
-EBUILD botocore-1.20.104.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.105.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.106.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.107.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.108.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.109.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.20.97.ebuild 1509 BLAKE2B adaf8d92de73c9637d36076b667adf0923761053f3da84b9889e84ea5cd0871edcfe27ae1849df654616f1cda04d6ac5e73f4665e686929d4ef8abaf2a7b379a SHA512 366bc1f07343f294e02e78d76efcb60935e62435f58807b67ca96d9715ef8f787f922e0dc199ad9cbd9e2a9d57892c1d770da6cfd1eedb000b14342d29991aa1
+DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
+DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
+DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
+EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
+EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.20.104.ebuild b/dev-python/botocore/botocore-1.20.104.ebuild
index 30e0988848ad..6b848259897b 100644
--- a/dev-python/botocore/botocore-1.20.104.ebuild
+++ b/dev-python/botocore/botocore-1.20.104.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.108.ebuild b/dev-python/botocore/botocore-1.20.108.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.20.108.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.109.ebuild b/dev-python/botocore/botocore-1.20.109.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.20.109.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.105.ebuild b/dev-python/botocore/botocore-1.20.112.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.105.ebuild
+++ b/dev-python/botocore/botocore-1.20.112.ebuild
diff --git a/dev-python/botocore/botocore-1.20.97.ebuild b/dev-python/botocore/botocore-1.20.97.ebuild
deleted file mode 100644
index 64b854be9334..000000000000
--- a/dev-python/botocore/botocore-1.20.97.ebuild
+++ /dev/null
@@ -1,59 +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="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.106.ebuild b/dev-python/botocore/botocore-1.21.0.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.106.ebuild
+++ b/dev-python/botocore/botocore-1.21.0.ebuild
diff --git a/dev-python/botocore/botocore-1.20.107.ebuild b/dev-python/botocore/botocore-1.21.1.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.107.ebuild
+++ b/dev-python/botocore/botocore-1.21.1.ebuild
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 1ea188fb7088..67a1de919032 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
-EBUILD bracex-2.1.1.ebuild 1049 BLAKE2B dd4110fe090f59503599f248f7ef26cae5dc5e419f1723b8a7c9d57be5a9a11fd72676045b139a9145cbc47774361697a1b254fb03e392dcd78bb1db8f8eb21e SHA512 fcffd84b07718db713338dfe8c5093e40efadfd7e2ffce3e65f356df446c65e82a8fc342bf45c9285a38f31fcd9e2b0e29249c6d940e3ab924169e6073de6da6
+EBUILD bracex-2.1.1.ebuild 1047 BLAKE2B 8a3982def9da1bc47199e5b9a53f1c4cafaa8f90c817cead51977c64f476f557df777584717fc4cd77ab8e7bc4ff7525461c4f2e55631f0f1dcbfe2880135e6f SHA512 89ab3d7a6882a873bad4a3a32d5e021a74d2e2db2d59eb5751a97f5a10f75bc210026f1974b6fd6cf8212fa707fbae1c320de7bb59b0e3bf264f7577207c9e94
 MISC metadata.xml 1251 BLAKE2B 7c791f302e5cd7a9eb9f1693e7b6bbc08d2a124ed55e80283c3b795dea30b29077b48802e735e685a3f0bd9c45d8b7054c550d0e835e1eb3bd590d346bf9d76f SHA512 202e98c2241032d3f859e6484fe659d78a1a3e277674c05e69552dd8bd3df9797ee0813a04c88ebca0d5d281944082d3c71ae18370f23d43e2d1f18b78a37f5b
diff --git a/dev-python/bracex/bracex-2.1.1.ebuild b/dev-python/bracex/bracex-2.1.1.ebuild
index 14f6cc11376c..210344a4ca18 100644
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? ( dev-vcs/git )"
 
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index e4699bc19e67..2e3532b5db6a 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.2.0.ebuild 905 BLAKE2B 71bccf1cc8bd3a180658dd75636b53b37c657d332b28c787844399a53b35194e1d1280374df07fb2386bcce6d5013fa4802716e659fbbc018a42a0abc339fd77 SHA512 d99304de9392d993090546c13619d0e4e089d16a7d5dd6e87890b627e4ac7d289941072c024dee3c5471274d28abed3b1fe1f9787c73654371c71a00eee53d7f
+EBUILD cairocffi-1.2.0.ebuild 912 BLAKE2B bc8e0044f413f5e75f5327fd6991b9b75d844e4c9139f9f1a453162e099f472609e6005bfa3a3179608e75b10033ea6d794922016bd828c5d0ffd274205575a2 SHA512 55d351080e390c5d7e265133d19265fa21e2a7d6db0483824367ac43bb798d4f1553173890cf0fcc7070a3979f995d6ad4f7ab1e54a5229cc22c352659f64c5e
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 39f10d4e3df1..e58a4d6e25e7 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 702713db0ff4..df7166de5cbf 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,3 @@
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
-EBUILD cfgv-3.3.0.ebuild 469 BLAKE2B 17a7ce7b35d2bbcd30d9d72db1a8b09e1c97ef207af8a99de1cc7014d02ceb0280ae7666f052f14304daf17eb96bc11d319508dc340fd207f76fccbc459534ae SHA512 2515fcc3a2991cba61a083d98c46b21383fa3578a12e8f18be4fadc25dc1b06a51aa2dc3f97e44f0c2a3f227e230088c02b130752b544817a7e3573305627536
+EBUILD cfgv-3.3.0.ebuild 474 BLAKE2B 2faf90c53ef30224e4d89fdd66057be00f437db21be79607cf924465df55aec664349f1f2de5bf3634e08fb033f940a238f4fb6bab6a999125857031aa7e6e15 SHA512 93816049de0844dbb3a0767f10e0857aca8f408d3fa962b75e33c5aae45a4cd79236b8321a357550078769e6ed7047d4ada2133f7e8ec3f0a9f75ee088e858dc
 MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
index 6ca33230df57..37eaf09fbe2d 100644
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv"
+KEYWORDS="amd64 ~hppa ~ppc ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
new file mode 100644
index 000000000000..0645e12bc912
--- /dev/null
+++ b/dev-python/charset_normalizer/Manifest
@@ -0,0 +1,3 @@
+DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
+EBUILD charset_normalizer-2.0.3.ebuild 593 BLAKE2B ac1dbcf2b540243c357ea586a5a5d2e34865b4b9064eaab1cbaa1b57a7bc8b1aaa2715f01aa744f9b4627a53689a8ea12a0cc5adfc236f58f4d914d15be3f633 SHA512 fda4a6cad5a571c4552ae02d7afcd4906f44616c38d57c339496632045857e6cb3c726f31b051db9593a1182a2b4371197e093496a239fc3590c1e16633e28b1
+MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
new file mode 100644
index 000000000000..c31319b41abb
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -0,0 +1,26 @@
+# 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="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/charset_normalizer/metadata.xml b/dev-python/charset_normalizer/metadata.xml
new file mode 100644
index 000000000000..1b65bbbd11b0
--- /dev/null
+++ b/dev-python/charset_normalizer/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="github">ousret/charset_normalizer</remote-id>
+		<remote-id type="pypi">charset-normalizer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
index 199ecceff4b9..dda09a8df562 100644
--- a/dev-python/click-help-colors/Manifest
+++ b/dev-python/click-help-colors/Manifest
@@ -1,3 +1,5 @@
+DIST click-help-colors-0.9.1.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
 DIST click-help-colors-0.9.tar.gz 100701 BLAKE2B 838507658aec9cea962d1f373bd771871837d1fe274c70fe4555efbd4e1825203d8728457c5836a482add26e86d4eed83b962811602864d43bf8174f49bd89cd SHA512 02cca02a5cec6b3b23fdeee4aef921cac1cf83d85bea8eb04dd100955dc27b2e4d098bad2f49694c0aa6548135fb979a1fd054525dcec27077f461a034d62a87
+EBUILD click-help-colors-0.9.1.ebuild 602 BLAKE2B 20b54e68755c6201107ecce9f1b1515cd845ea534bc665b9099dfb7a5901f8102bafcbac37d46278c19d519cf54e3ef4825e92023cdccf9a6469d1311be3cdf0 SHA512 88dfb13846fa12889862e55f927d9fba42b2bb9a9e0a85c59bb416cdd737457922d7233b07e008a3dfa4ad19d16675f09783aa63f5b6fe8fac37c3f225738329
 EBUILD click-help-colors-0.9.ebuild 612 BLAKE2B 093296e1bc0a492edcc6d6c29c1635d63352f2903f48103d1c0012daf5fe6429f7e5612da687810d4ae890542b3c260d9e431908522ffaa6d7859c5069d8e3ac SHA512 49175a08eda7d01d1f6211ac6021862a8b1f9e716b9d2e972530dadecdb225c32fb191906e55e8ea8b952c5392db28904ee40eb4b68ab13ff6778f2d8d422ebd
 MISC metadata.xml 420 BLAKE2B b7f9eb67dcb6e7e6f2de54e0f8d96974147d92a5839fffb5d68201dcaad1ff600caae1971d9d0608366fafebaa270d8aa750bee3e51fa3a97ca12c2fdf6842dc SHA512 b1fce393231a5053ff90f5163e2a4788500f0819a0623f2b8a0df391ce37f085d11ae69d7db41235195a31bc83c6ff729058d6ac0aa66d155a1a652f485d65be
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
new file mode 100644
index 000000000000..251b5c3328a4
--- /dev/null
+++ b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Colorization of help messages in Click"
+HOMEPAGE="https://github.com/click-contrib/click-help-colors"
+SRC_URI="
+	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 097dead9116f..01f91444bae4 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,11 +1,5 @@
-DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
-DIST cmd2-2.0.1.tar.gz 644705 BLAKE2B 5fa3b89d42252372b1b75863f8c1293182a555e6ab1b257f1a243c87685bd0aa643d2906741636143f7d3aa3be5ffea5f8616c25e99fbb8598573d3d1feada9e SHA512 880c5f2d80f81a850b545052df2bf3efaae8f44deb30186119a2d94277da59cb027da5bf35b2bc106b90c87883c8eec1a869df65988ced1b6a0d0c7e236569bb
-DIST cmd2-2.1.0.tar.gz 643826 BLAKE2B 532a09002ee957c7fc670f7507665153e39043598a54be0f1dba36de061d8bde6eade064c93a0dd1f9f95437e1dc833a6999b1bcbcb6d6c0e1d5e136aaadfe98 SHA512 0e262ceeab908077b1d698202559a6d093d493d6dda420d4dd5c069414c716a79a53276931e0fb80ad29ee0745525cd2b6ead6150a90daf11735dbcd66eeb2b8
 DIST cmd2-2.1.1.tar.gz 659548 BLAKE2B 17ff372505398df460b56b13c8ab7c8830a1bab25cc52429555bb3e0f766ef46d14a72826a5af58a6641ef533289296d00afa1e6d2980aea33c9792ce3173cbb SHA512 03624ce8eb6d94c7234427a8a7dfb9b321bab76679b166fc3af26ba581ceae74a90ab282f9d6ab0d48eec589614d5daa38ed88251dc7400b48c112863959d164
 DIST cmd2-2.1.2.tar.gz 660849 BLAKE2B a8c8db8036badc020b34e6d4cc62a6828a6f3788562d550826369d2ce6ddc41fdd29ab95bd56d35115a1e8c2cfdb6df97e3b25c3f414798aed9a597243b37967 SHA512 3f2edb336ec662e3b2e22abc947ffb669786142d29f0723b0d5bbf898ecff12096a91e08c4890dde79915b413c0f9a70945f1b5795ae12991e85d7ee79331d31
-EBUILD cmd2-1.5.0.ebuild 1412 BLAKE2B 5e7640c0555dfa7f8b441deadc7fbf444f6ef7de931d070966695f9e6a5d842dd9a84d4108109fb38f13fa5f53ecf7b276bbec5af5bfa8f5850a777af6868a63 SHA512 aeda875bc85e14c6667953dcac3a1ddf14ac5a7a255ad7d7f46a1b2ee376528d13deb2e5c2b84821a53a1f845743818e614202adacf0bef49eba05054a173cdd
-EBUILD cmd2-2.0.1.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
-EBUILD cmd2-2.1.0.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
-EBUILD cmd2-2.1.1.ebuild 1401 BLAKE2B 6d0655e38d6f9f91917057298035e818112b09b24a281979453b739cf0af5ca66287698d8582b5946f3f9c56a5c47b28348014cd87f5a8639c99210f65f8884b SHA512 86f66e4ee0252dcf4dd6e860e47c93c38dcc782a40fec4c7920a68c0cbc26eee85743e29935723e790e07129c2f65ad74b2477d07e08f4fef31e9f44590188fd
+EBUILD cmd2-2.1.1.ebuild 1396 BLAKE2B aaa14292dcb2fc80e0d4d4d65135a128dc7dc7c803fc18e4357275e2572f2fc2eb151fa114ef127fff1779d9c2e688c54d8227fde87c26dbc68235b558d168e2 SHA512 8e2e6bea3aac896eb28c08f48b2981f97619850122d4235c52c89f871313f3cb0f6a535f952374da5190ca8e4703d8426751207960be80bc7199e5ab00f43683
 EBUILD cmd2-2.1.2.ebuild 1401 BLAKE2B b1bca955a068f55b761600276fc997c7812e80a48a9a18183e0e1bdb8fcbf8a6c36b7e6dc0ee323084dfc66ccdd7a822aad468b988fd9d83ec1f384586946310 SHA512 417e6c9d09f29857743d4a007f75c0ca20fbd352af8e96ef4776547d169b12f974f41f64dfa3922c251558d7c5b14507126294ddfbc02f3a23c39633bb874292
 MISC metadata.xml 521 BLAKE2B 30386914ac906a5e6f08eff94faed7cc964475aca24a8055cd0636d602a1f8812936ae6a0560e7c31796d3461c07fa010e0b1d4d11eb1f6d3bbb6d414f475e5f SHA512 681e363e25381946d07e03d94649c8be03b50fa2415100be0374a69cf6225a284d37fddb002cadde62ba3ddba88e91c32d1d09e4a81266bd0fcf7eccab963bf8
diff --git a/dev-python/cmd2/cmd2-1.5.0.ebuild b/dev-python/cmd2/cmd2-1.5.0.ebuild
deleted file mode 100644
index abb40a0a9bf7..000000000000
--- a/dev-python/cmd2/cmd2-1.5.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=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
-	' python3_{6,7})
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.0.1.ebuild b/dev-python/cmd2/cmd2-2.0.1.ebuild
deleted file mode 100644
index 3e35f0efcaec..000000000000
--- a/dev-python/cmd2/cmd2-2.0.1.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..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.1.0.ebuild b/dev-python/cmd2/cmd2-2.1.0.ebuild
deleted file mode 100644
index 3e35f0efcaec..000000000000
--- a/dev-python/cmd2/cmd2-2.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-2.1.1.ebuild b/dev-python/cmd2/cmd2-2.1.1.ebuild
index 3caf2aa37e43..06714b1bd914 100644
--- a/dev-python/cmd2/cmd2-2.1.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.1.1.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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index aeae54005245..b02c17cfe6ac 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,3 @@
-DIST croniter-1.0.12.tar.gz 38763 BLAKE2B 28bb662b05d893c782807687261b3bdafa0b1412d98dc8ceebcc0d9fff941f58b22a3abf9462c0f601bbe8701460350dad70d1239aa4f28978444698836b87b2 SHA512 ff5e35ddb0a6080ff95155de2ac5942fa1cab827a4cbb6e639553f8646b89063d0292b7fd69bc38fca90429da0272f3efeeefe0cbde0d83b9915ecb078340f08
-DIST croniter-1.0.13.tar.gz 38907 BLAKE2B 436bb766c39ad61343913e354d0838458e56048115ed5d15ef95b0dc0c22b38fb4e7ec3fe6162856d208d45268fd360c8b18698b7c61bb0f70636b79a6a84988 SHA512 721749a268734e06776ab968a1fb01926f416e1a42678ee28dcac9b4655a92b5cb17984a9b9d886f8d963484f1af7382b17e72fd3998e3e1e8101fa5038a4fa1
 DIST croniter-1.0.15.tar.gz 39164 BLAKE2B daf40bcc7c791dd2a65d2cd132c380dff03353ab6d7920adddff2b1b6a87166050be6ed2b7bac5eb2b9543dcab9a4f2f65738506dc35eff0836cc591e486f885 SHA512 5aebc8a60d278acae3cef7eee6ee0ec223e44ae01b69dae601f76cb14f135547557b1417498d71a84e187dd478605efdf15355f8ad0344e459b6b40d41e994af
-EBUILD croniter-1.0.12.ebuild 610 BLAKE2B cf3d4c1f620c95a3393fdf8ed058fbab4ff2945c569d142c880abaeffa51e5bc5ab4a21074aa7e4e5008ba2fa533ba1042a43e9f49c47133deade5d5d859a90c SHA512 a3107a73fc30c5a8426e250b4b4b6a52ba6b5622058ef82687ab9e6a216b171592ad087049664378ce22de19f2790f707a62fdc3c90ba99eef2d0642a9fb3d59
-EBUILD croniter-1.0.13.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
-EBUILD croniter-1.0.15.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
+EBUILD croniter-1.0.15.ebuild 611 BLAKE2B 6c31b21fb62dffe4ac035fb644bab20a22c8bf9bc582a818bb43e9a4bb4e870f148138741c11200c354e0869362f8a0b48f0090be04fd4c55d4af4f48c77c94c SHA512 1091b4d2cfccb52c6fe7d1b0e98f744a7ceec8da95e4ec83a0c54ee73117fe57c81b7b6c6d25eb07f3f60ebce23386f061553f4dbf23dd6ebd31b271227b01b3
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.12.ebuild b/dev-python/croniter/croniter-1.0.12.ebuild
deleted file mode 100644
index 51bb1316c8bb..000000000000
--- a/dev-python/croniter/croniter-1.0.12.ebuild
+++ /dev/null
@@ -1,26 +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 module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.13.ebuild b/dev-python/croniter/croniter-1.0.13.ebuild
deleted file mode 100644
index e9f104d3af45..000000000000
--- a/dev-python/croniter/croniter-1.0.13.ebuild
+++ /dev/null
@@ -1,26 +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="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.15.ebuild b/dev-python/croniter/croniter-1.0.15.ebuild
index e9f104d3af45..277378fe8a2c 100644
--- a/dev-python/croniter/croniter-1.0.15.ebuild
+++ b/dev-python/croniter/croniter-1.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index d2ff863e20cb..2a074875bd42 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,3 +1,5 @@
 DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
+DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
 EBUILD csvkit-1.0.5.ebuild 1297 BLAKE2B e00ecf1a78ab98bef348790fc76426f305f598f17893e36588e6d89e0f948f5c7b48b60e6be08d3918ee531696dee592be679759a8054a341130222ad1b733c2 SHA512 7a817661dc9279c841718449a63e218650358cfc8ea9f3bbe70e6b92f33da3156acfeda79be582660841eaa1182eeacc368815a2293cbe1b5fc23b7846755cb7
+EBUILD csvkit-1.0.6.ebuild 1291 BLAKE2B 7f9335b92e6064ac49bd9ba7c144a1837e6e757d21223b8b7862b6f994b7a96a12803b51891456a4316a3cb309563046297c6b40db04fb56b00afd1efe85d32d SHA512 85cb1f7b183a7970ea3b22504d51162791b4b7081648223f4ef9a14b7b4c7700c5764ffbdcc03865b787e2c86c152efdb2bee4856b545683258743f3e69339dc
 MISC metadata.xml 500 BLAKE2B b73dbe5965b76d39d6e97dd46e7de1c0d583fe0b48de00528169068c6d86123c25000a37115d2f9db48eb687a95eb6742975daad252591d4ff18a8ca65b6f4c4 SHA512 daea7035cb0f2e5a852c457e3bdacb15ed5ed618e21dbfc6a42d25d92b8b7f17f46e597783c5fde45a8e71719e035d78cc94ae2c8d76be3e5f36e3f559856b47
diff --git a/dev-python/csvkit/csvkit-1.0.6.ebuild b/dev-python/csvkit/csvkit-1.0.6.ebuild
new file mode 100644
index 000000000000..b703b4a252cb
--- /dev/null
+++ b/dev-python/csvkit/csvkit-1.0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 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="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 77a51ddcec5c..e60d50583303 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -7,8 +7,10 @@ AUX cython-0.29.23-tracing-py310.patch 13401 BLAKE2B e2359644ef2dd2c2f9eadc41eac
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
+DIST cython-0.29.24.gh.tar.gz 2097245 BLAKE2B 9f5f2da0aed61d7fda2e14ea0669a2dd187cd053f3b82621342c7be29e26ff581b673a32e43bacd5c0df3e515f250eb23a64b1dae8911132fdca48175910a3dc SHA512 387a827f3cb7428248019744e3ed606a133d98ac882b83624d24ae0fdf8a8f2334978555d7d84e5cc4adaf715c541fef64e45bcbdda85ca33473c21f99360be8
 EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.22.ebuild 1845 BLAKE2B fcace04a858c1fbbb291c7ac9c961c8fa2cfd9b222298082bb183cd0608015965110d0c809daf6cfc206c0f9db709d5689ac71711f8bf5c06cad0d974c09ce60 SHA512 c93468b1e423be8ddbc42bb507070d33a88454b85ddeae6eafbcaf3d50f6658f1732bb8f45381b714af3d141fb05ae76d294a8149a2cbb3cd7cf53893e1edab7
-EBUILD cython-0.29.23.ebuild 1953 BLAKE2B b7a6d286d13161035966badbfe62af11b8a9abb5df9b67516740b9c6295118032b3e6be38167f816cb30dd1938391eaddd40064fd2252b99896b89234e4824a8 SHA512 dc00e398f42d8604a980d2344532f0741f8c446a5d28b3fa6f641874e0a0e961bdb6aaa255a3b6076f361282246dbd5e71ad3956e154e9d43d27606a89557d1a
+EBUILD cython-0.29.23.ebuild 1952 BLAKE2B e8d88577efb70db3f75a7c0068bc1b9659132bde1927c3a50a92822020d6d575761ccacd66f2efea021570439c5c052cb352834071d8ef505247ba427d045da9 SHA512 cc6643d4a19a075e0e54184775596251060bcc9b73c6b9d6a26564c5588ab81734d30127c42b723d3c1e62d9afdc5f268dddf1a26df5c138634b9cabc5caca44
+EBUILD cython-0.29.24.ebuild 1826 BLAKE2B c412f584f72cd13a43a47d21d1406e692b634f964090b309868360c7fdd8244213633f831e970b4b1b5e756f636001ccfbd8a62499c2c5967f175d902dc35c07 SHA512 6e146597a191232445d624e1591c1e5cb52639743a9215e29c7ace4feb711d8c362d0d695eda698fe0f06d668bff157d39b6e501db0f341a275bf31c7aff175f
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
index c202aeb4126f..bce6983a00f2 100644
--- a/dev-python/cython/cython-0.29.23.ebuild
+++ b/dev-python/cython/cython-0.29.23.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.24.ebuild b/dev-python/cython/cython-0.29.24.ebuild
new file mode 100644
index 000000000000..2dc83aee957e
--- /dev/null
+++ b/dev-python/cython/cython-0.29.24.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6309dc026729..f8ca5bee3a1d 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,11 +1,5 @@
-DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
-DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
-DIST dask-2021.6.1.tar.gz 3725331 BLAKE2B 7b466507b968dafd2c6f3a3db70c3f557ed877bd489067ff5243794c44a9e77f9b72b4a000eb0865d2096845b3c6005739214bed1215ae053d9d1c313c6bb52c SHA512 c3c032ae8d67994cb924e23787a571ad75ac88ee682542aa486dd76b38ba25c809593e9bb11a716589eeea437aaf8b69a4ecdf676c417fe566d92a2b1a8678b6
 DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
 DIST dask-2021.7.0.tar.gz 3730549 BLAKE2B 8f76648614adbef8ca1feb01f5b39d4ad217eb5178c4b7ace72d3764062b172d83b74e9fad5eeff0a745025e0cb2bf47bdb14beb03b1520130332ece00c3e318 SHA512 3dbeefe08af6536f19a03ead69372dfa7a26eff66d768fa8e238341822136a2314fca0291694ad22bdfe3618a4ed6785d836ceb5cc4231f361d97f0cbba0edbf
-EBUILD dask-2021.5.0.ebuild 1128 BLAKE2B d11dd7ef54b5c61e5fb7f855f4654e5c81caac4dae773d88b3ec8e62f93464df5888fbefff87ad935ac8e2cee2acb2a5e2b3a910ae668b30bf6ef90d72265af8 SHA512 409347854836aff9cfe1047dfd36a5175094966205acc6216dfa2f6e1b0016df25d0822fc3ec6390808d30b90b69a6457e36df4d59dd31c694b2be2c5e4b4b35
-EBUILD dask-2021.6.0.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
-EBUILD dask-2021.6.1.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
-EBUILD dask-2021.6.2.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
+EBUILD dask-2021.6.2.ebuild 1128 BLAKE2B 2302fd9867ee06d58d1707bcb06658a23e633041974b604563859c5a67b084514e6fba886182dd3f721991f33d9ac9010a2b114b90e7f91fa192af88507fbeed SHA512 b378c693d991fc814d31d2c93541513d18bd79fb7220acbad444e6aea44295962e33f4249d84f7db25b66bb22a6b554abc76428a20e8680fbe87ae84f3c272f6
 EBUILD dask-2021.7.0.ebuild 1199 BLAKE2B 52cfc495d9df0fb9d3c6477baac98f8e8eddda366c79d1f83cf0c3c828418e436bd10b1aacb449d9a76f329b63b8ae882840105fb65e3429e3e6f0ef41657bc7 SHA512 0e9047e376151ddf90bcc6de0d46863d703472f67889e50c6869795be40fd163e7b728d24c870ca4d466e0e7a6dcda65beb6f7cb07caca88f951683a55896594
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.5.0.ebuild b/dev-python/dask/dask-2021.5.0.ebuild
deleted file mode 100644
index 77791c1017a3..000000000000
--- a/dev-python/dask/dask-2021.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.0.ebuild b/dev-python/dask/dask-2021.6.0.ebuild
deleted file mode 100644
index d3f5be8aad05..000000000000
--- a/dev-python/dask/dask-2021.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.1.ebuild b/dev-python/dask/dask-2021.6.1.ebuild
deleted file mode 100644
index d3f5be8aad05..000000000000
--- a/dev-python/dask/dask-2021.6.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="https://dask.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2021.6.2.ebuild b/dev-python/dask/dask-2021.6.2.ebuild
index d3f5be8aad05..51598ceed7ff 100644
--- a/dev-python/dask/dask-2021.6.2.ebuild
+++ b/dev-python/dask/dask-2021.6.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index a4d9fd5425cc..6195340cf77a 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.5.0.ebuild 567 BLAKE2B 64e1231fbe2a6788fb1dd244f20ef8809f53c92af5be1ce26637871f9e4047cf567143519e20819ca686ee2ccbc78950f9c9adca3a1c4389e63ff5fa33c9a60c SHA512 205d75b9e44e8841974c38db2390e702aa9dcc0e383b394832bf96befd5a70e0c756e4a97f7815b9773601fc95f87c116e587a59a8a174b227cf06e458d5a2c3
+EBUILD dj-database-url-0.5.0.ebuild 565 BLAKE2B df312b685b2ea17b13176100e0601a4a4378422f67492a2e28efe93706b97c2453a9ab1bf72faff4b2f53f48f7726241a51c0a4c4d47cd54b01e689ca30909bf SHA512 ce6ea354ce091e5f5c8f71785861e2e6febe2b8edde348513d7c2009159ac505c09d59922afd5e2786bbd599585abd3bc20f1d8f3396fb9d315c382401d983c1
 MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 3711e5754ad5..5892f0d17d7e 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index ea26e6610481..745305af6854 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.2.tar.gz 7213 BLAKE2B b538fe96a1bcf0ab2fddb4f09f6bfafefd07a9a8d61fbdeaa3be3e21bd90d87488c852200a100c544023ee0a8b57dcc8d75cf6aeaad6489da106e911ce8e683e SHA512 446c2e9847f135981f32bb2116d8abd3fbb80765dd1301821992a97acbbbae8d74d1109fbf7bdc3ee469b9d40c4ac08f39befee36a06926a1d049291a5c0c837
-EBUILD dj-email-url-1.0.2.ebuild 624 BLAKE2B fa333a4aeb92456b13bbdfe78addc904081363c3a6075bc979d525e9c51067a8955e2e2ffd2a055b298c1ba1513e0e280eb7daba3073dd94673c2c076fb28b7a SHA512 f639fdb4ddd351d0722683136f374d2a92ecc8a7d72360c77076312ac69848d98c272d2ae96095b177832e0a43e02536d89076df921e9fd3888290ba45bd3766
+EBUILD dj-email-url-1.0.2.ebuild 620 BLAKE2B f10ccf850e88b3eebcf2860b97d5ec9272cd4a7df5acb0d1003e1d70bf2201388e79bdd429d9c1044107d1a3f9fca6881f91e0cb6b99bfa5d52f007bb52c5bff SHA512 bf462a4b00d4d8659d93a378c3041cd27db059762f76e0627532928f612bf5149fc97939191047bc08282e7aa3a61672724cf218e17a96f399e1a1036f963904
 MISC metadata.xml 407 BLAKE2B 724ee962580eb5c4ff6b2b8d82d7cc50a6d6778b73a06f1cad1f7dd2f64289de5b72dc9713aae488dcf23c57ee575d5080765f2d8bfe41b9f845fa81919eb628 SHA512 fe1d3809c17706d0801daf8c073ed5f70eb56c525a9ea978d1b449720a2cdf43086adbc61c4585123d6712b40242dd145513d9fab15e35889b1b4caa62ea9c33
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
index a3cc58516c25..859e0bbe7149 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 341854185c58..6012788deaee 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1.ebuild 464 BLAKE2B 1736b13890bee21d112be99a91552c40f104874adb63c99b62dc59a5a0c85fbd4ee9c5648789d08e8cedb383382b7cbfc676e1e4cf6e0b8679ab8b79c53f1f43 SHA512 2201e9cff8ecfafee0f2708c38dc442ae1a977720cf8b57992f2e18556bf98bad86a249a29b990bbe413871cd5a17990fe067f02e86432e81d483584536eedec
+EBUILD dj-search-url-0.1.ebuild 460 BLAKE2B 9144fb814241b607907c1d48a2eaed41c53bf065f85be67fc0d41b232b3674f549d58d8d281fe3355237c42dfea0c946c2a786652f750e88fd945367173599ec SHA512 c2f3aad09da9d9471af908db7d1d731e467de8252d43c53d3feaa411778873e64a558ba54b63311f34769aa7da26f701545064b49cfe20ecf4366685b17d00f0
 MISC metadata.xml 355 BLAKE2B 31e54d6f53ffffda0e1b261309311c03e4e3ab8e500c06bef6fb8629800fd32f779b4c6c1e69b868e557b47fd4b697db86bac49fc42b173a77d0b4765a8f997b SHA512 be285d36a522b446fa95c6ef5a976566922a9e2f0c9fd71b2ebaf2e0b8a4ff91c148e749e698f36fe618c57267cb01f2e5a56b950cf4a99cb9ee23b1b8807045
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
index 18576d01aa52..3d98438004a4 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index 6af079e721ab..71892dde393b 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,3 +1,5 @@
 DIST django-allauth-0.42.0.tar.gz 549566 BLAKE2B aa346bcc47b9419776a68c023ab560e5cba0fd97eeaf4cb2f43da4b2c53619c65a3ec9e1313ff3ffa0ed051718d41ccea2d362f56d6bd8dcf4c5a0569ccbb7c9 SHA512 2c31a70dfd3becf0f921b0566204b8b3221b0c85e82cb8a8ad37ab557fc6f302b9c24bfdd6885978157f4ccb9044d1eed9973d066ee59877aee727c60d2a5b46
+DIST django-allauth-0.45.0.tar.gz 581007 BLAKE2B a0f586818e4d17ece5ed009481b71c0213bf265f45d391664d411268d53124c1d5df226ca40d98722691ace5f5ed50026b0a9db3bd34070ff855059bf3e237d6 SHA512 16b166a5f97e62fef3c801af17b6b7569bd27e597cec394032a2644397afc30512f52f0ff77af8036e414086cd207dc9f5d310dbc744627b55938243ba18e50f
 EBUILD django-allauth-0.42.0.ebuild 663 BLAKE2B 792557d0a5b45cd7b712cedbc312df96deb651388205407455ddd6fb637912c588144978eaa0038f3fbec061ba76b51a26ba55eda95b3f69a593f2e633c97694 SHA512 1a08051188196f026a1cfdd73b3f09f3c449cd2d5756bb1597b04554b3816c76645869374ccfecfc1f45fe5c0423e4cc3d9e25105a73a6a1ed3a2eb077f59142
-MISC metadata.xml 293 BLAKE2B 1f94d47b3f88a08c249d0d9dd6667e195b68ea8f47401ab02c6d5bc41619e5e4eb6877ffe881353c5d2b69fe9d71703a48002e5b5557aeb188ad592f8e2f4d54 SHA512 6d71d8644c96cab3551e98e13ba808a6d97685cf093a8e1c7968ce5e5a4ba3a358428e4b597c438d72be7b98a24714dc6ddd41ea970b6c97e902f9b5de0cdd8c
+EBUILD django-allauth-0.45.0.ebuild 1126 BLAKE2B e8ad92eebcc6c680cfa07f3f0e5a60e13cc93d303f4a4535d2479d81fc36cdde7107b7a108d5bfd467723b229558b776fe5ac84a71dc3ab9467df55489d9b960 SHA512 5c2cf7592801fc7b43f6d01b50ed9d90b723479436440ef14215daa9fb8c63363d955e6b9b85393231c25c3f78de4b3e92ed330e7c73e16adb8a7d7ab6ecf716
+MISC metadata.xml 394 BLAKE2B 9348d0e49b3a4b79f48484ec312841062b5ada42a5c6cea9e34f8da95fcec1c5766d5ac2d6d45c6ba0622eadece09b8ff696fd77f0bd304f481ffbd02b8d2f05 SHA512 7a746fc90952cfec4cbc788b8af481ba0c361d31a56016d061c10a77b8eabc8c2a80deaa070383c478469562821ed5a625fa7f73d7ecefeeac15e989459f2f4e
diff --git a/dev-python/django-allauth/django-allauth-0.45.0.ebuild b/dev-python/django-allauth/django-allauth-0.45.0.ebuild
new file mode 100644
index 000000000000..acee98cb30f9
--- /dev/null
+++ b/dev-python/django-allauth/django-allauth-0.45.0.ebuild
@@ -0,0 +1,44 @@
+# 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="Django 3rd party (social) account authentication"
+HOMEPAGE="
+	https://www.intenct.nl/projects/django-allauth/
+	https://github.com/pennersr/django-allauth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# cryptography via pyjwt[crypto]
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/python3-openid[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )"
+
+DOCS=( README.rst AUTHORS ChangeLog.rst )
+
+src_test() {
+	# cern provider tests require Internet
+	rm allauth/socialaccount/providers/cern/tests.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=test_settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-allauth/metadata.xml b/dev-python/django-allauth/metadata.xml
index c2ab2a38263d..097826fe3092 100644
--- a/dev-python/django-allauth/metadata.xml
+++ b/dev-python/django-allauth/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-allauth</remote-id>
 	</upstream>
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index b99f1d3a9d0e..b375f79a6ec3 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,3 @@
 DIST django-cache-url-3.2.3.tar.gz 8198 BLAKE2B 19c91cdb519fea9c80e4d5e89ec9d340fb9193ec3891f6fbb42ba07cac26aba2bc69c00c65797f0f70c1a4590ff7be2037eebf3bf4589270e68afe289f74945c SHA512 d5b3653de755a668c33d28d66d38d938fef84d3acbfd726463c85a45c49a4d13bf880723226be2946ef7ea784e10623e164e448263893f779effc3eaf75c959f
-EBUILD django-cache-url-3.2.3.ebuild 731 BLAKE2B 9ccc87c05eed78b8968ba9baa036a7ce8e9d6c3b27a2d6e4c2fb4321ba9f1dd882ba6f624ad078b6c20fa5c54d7fa489f04602ffca2b46d92752b27f48ee6eb1 SHA512 cc181f0f6d4d2bbff65d90feab4a66d156e9706bb94883fe09b9e724cf48d3e1f3bbfd26fb3f84fddc90da6be65f18c51f09ff540b9f4f0138be2da49b647d6f
+EBUILD django-cache-url-3.2.3.ebuild 727 BLAKE2B b6df11ac41e53cb5396d31ea7439511cbec1f1ad4451fbe2e793c9112e197f4a7d181fef7ae9ce6b2d616f71a71e73a94b6972652bddb4b2d47bfeec82247c6b SHA512 b5b2c9976c2f3c68d370636754eb3a111012b89a96d75fc41aae68e75a8f81befd41fc31e075b5683243e92977fe5439617e8d1d66af757feb4bd25e28cf8727
 MISC metadata.xml 413 BLAKE2B 7a014841105ea407191ef0fad8df2365a13101fcccf9324a3dfa3a55f67be9d5f9c3c33b766660cb1cfef9d14358634e304da3e62eb97b02652ff331b4643dba SHA512 89fe4d187320cc50d60a1d4821fd88d57e42efc6ffe4ccdbeb6b62c1d2d6e3b642997b1bf7bed054f0ec1fab0e774af7c2ca422a87dbf37b3d210d03073beea6
diff --git a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
index 72fca067574e..b0d261f52401 100644
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
 
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index ddb612ff3291..bab8cf0005cd 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,3 @@
 DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2
-EBUILD django-configurations-2.2.ebuild 1451 BLAKE2B 08a4891cf646ac5c9c2afd1965ed4915ad88ab9141eb9c73888727edab3aa90040482708a493327e8a38cda54223f19447ad13ebf9e8994fc9fdf5ac027ff644 SHA512 a33ae01bc2cf8b12693f5424438848c7b9550c43ae3cbf027fcb619e9fe7035f97dead12e16162a3815973a675ee4580d3acabc8bbe337e74391fb2eca03b640
+EBUILD django-configurations-2.2.ebuild 1447 BLAKE2B cbf8aa50de4f1de3851af4e6de43393df6f37c622d8eaa6d8d0f4e77d62a8c69a118e8cec828e47f89418ec640470637295e4ecf6bb098930a2b2f8b444482b1 SHA512 3582413d81ff0b9c624c06f9520b524ef8bc2241c48b7ffc6f75091929b110af6294b27e5c7a5352d2b64771d8fe6cc22a696e3a65dd92c1c4ee0aa46430dddc
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/django-configurations/django-configurations-2.2.ebuild b/dev-python/django-configurations/django-configurations-2.2.ebuild
index 603cc16737b4..54d504b631ce 100644
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 189994736473..65e7c90cc678 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
-DIST docutils-0.17.tar.gz 2014148 BLAKE2B 56d03d755651e9c022eb7ff79dd83bab8f8bbb2c8b6528c673b04b69db2c11084599bf7cc294ded3a024c4c1a688f232ff0f3c9f7a1ecafe1f857513d35123fd SHA512 e99886dc6420f6325426ebbe0d1528249592e372fe2a052548c9cd9c2fd87506cc8b74384a3cf4afb97a1d936a906e157e084785639aad59c4abbc672c33b689
 EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
-EBUILD docutils-0.17.1.ebuild 1756 BLAKE2B 0dbab29c0523ecb6cd1aebbe233460222f6e2c71da368f3ae39d1fcf05c19276e8dac759aaf1f9e37b06b9828f6d1193833e6b99b82631b6c148bb27fab662f0 SHA512 b36f39bd95e667799f6d74c5ad8150f7f356e2fec8e4322960a91a9fb46047e7d0f0be4bc1ce74a0e7878b86acaf54685e98b3512e1b5d8125f50a8d14628609
-EBUILD docutils-0.17.ebuild 1755 BLAKE2B f7370968b7426081c623dd6fab4e543d50aac5fddbfc936b918d76237942920dec10b2b1f8e1ea429144dd08fd85d138cb09e8c32f91e96585cb672053c81049 SHA512 f8c6fe9da047aa06e423172fa5a621ce22617d64e3781167f460073de732c15d4d64c8a046ce2f38354591b021ebe73bcc6bc2f7e806d770aef1e150bbab00c2
+EBUILD docutils-0.17.1.ebuild 1748 BLAKE2B 150d82c9667c782fcd015ec933a647fddf41022dac98253c7c4a187575d4526ad768cf6967f37dcbc89cd1030613b8a76466e6626021c23bf76020be24578cc0 SHA512 08d1c248a3db7098d50f8283b0d7a8b8e1cab5ffd7a8ff4ab8c779b216d3c74ec097f7185514c25ce1154b21f2ed3c03f09ef5b0d8d7ec69abd3f03d2cdb14df
 MISC metadata.xml 388 BLAKE2B 0781c1ff7eed3e16515aa155bad0f9bb80714c7297eab6840de07aea41d496f94d7c59db363518f914ce13b54cf2c038ecd05b86f6823df58ed01070b46d4775 SHA512 e977e1b753d903ded926f251b30443e07d3080bb33be1e7e66bf2a80e4d81da1fdc2bdff12e6cdb1a1746019adca4c3901f59daa816588301be42a85709995c1
diff --git a/dev-python/docutils/docutils-0.17.1.ebuild b/dev-python/docutils/docutils-0.17.1.ebuild
index 99cb6e787e95..4e3eb42d0c49 100644
--- a/dev-python/docutils/docutils-0.17.1.ebuild
+++ b/dev-python/docutils/docutils-0.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 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"
+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=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.17.ebuild b/dev-python/docutils/docutils-0.17.ebuild
deleted file mode 100644
index 3f2c2cceb548..000000000000
--- a/dev-python/docutils/docutils-0.17.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-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=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 1768e37c68be..7172ad3f65f0 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
 DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2ef23875fbcbb92e7e3ff0ed6a4191a30b3975f90ef20b8320575e42abf31f8ec2199d558382c917d0510c2a8d96 SHA512 8bad3528dc87e70b39b59b2f7218579327db4dbd15937b63db76c9b8e7ba6d22e963eaec45b8d675c92f250516a541c395fdac391db68d0932dc5d8cd7ed9fb9
 EBUILD dulwich-0.20.21.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.23.ebuild 1548 BLAKE2B 66ee88ada28614fb125803f920b2fa5eba210e832272f19b59c4692374cfb884af24b84b2ba1c0b54d75b6f373fe9f9e849b93befdf30942ac2b37a232c855b4 SHA512 eaace381edc5ae360527a272a180a010ed217bac9f815b4af13c03da5537629475e1befad28cd21a5f72e6368ee0d432b1d0e12372c12e0a93cad933190830f3
+EBUILD dulwich-0.20.23.ebuild 1591 BLAKE2B 8a24894a4b5a92580fb55eb8edd9940e579aed2b302117276380dcd06ce990743dd56657fbf46c2135205d0a2382b05b0e25982833378d7e28098158200ae36f SHA512 071970ec97321871868c1189b727bb03a88b34699e4b3fe477a301770d930d822da52724cdec24093c182ad7dde35002c072bf99931928f8f7ddd0eaaaa2b73f
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.23.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index c3784feb382a..076237a6c33a 100644
--- a/dev-python/dulwich/dulwich-0.20.23.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
 			dev-python/gevent[${PYTHON_USEDEP}]
 			dev-python/geventhttpclient[${PYTHON_USEDEP}]
 		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/fastimport[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/editdistance-s/Manifest b/dev-python/editdistance-s/Manifest
index d92901d40b62..17b6a774aeff 100644
--- a/dev-python/editdistance-s/Manifest
+++ b/dev-python/editdistance-s/Manifest
@@ -1,3 +1,3 @@
 DIST editdistance-s-1.0.0.tar.gz 5408 BLAKE2B 5420dff814de4d61f7c36c88113c568562a174205d8a4ff2b52b60e797f7459d95fd2a909b70911cfd7d0d67096a3844888bb88866980a2c43f8967a96ef4c55 SHA512 148234a38f54f70a2d6bc64f6a166a8954c79fb89d5f5c0bf3f041fe60056332901484a0626e218a72ae992f476305cbb662dfa0acdda794727fc682c569d718
-EBUILD editdistance-s-1.0.0.ebuild 534 BLAKE2B 93d8dfa56d0d23eadc4b62a3a31f37ee864e2d8c840ad1809767f735d1e7e6ec8a5e59518405f46a4064c0f45796c59726209c582be1c858c32a47f53ee262ce SHA512 daac7ad3c73809f0effd66d530355c3e86ecc109b75faa9abf961f4f56cbc9cc51a87934962c92879a4ca18488190af9ee97d8824561ff4c0fb3c25884c6dea9
+EBUILD editdistance-s-1.0.0.ebuild 539 BLAKE2B 256a5ded75535d534d4db21dab430d1ae397a1cfd4cacb24e4709c400fef0f32601c71b584c6e4744f3af94d3003f6ff91e82935a947a078c1f66854f153deb2 SHA512 fbacd85c132bb10a1afd0e24d4719e030ab953af21cbba199ea8116af3939445fbaf46bc2d7e0500e849ce336e6c228a6030fe7a1980d8bb686fa128482d20ba
 MISC metadata.xml 769 BLAKE2B 385d6e712da66dfd89e385bc712157b3861c0238d2fd807755d636feb4625782e76e1f5272c4efe758cf0de14fa5bd63d519ddd04ff9c4fb4528566c5620f419 SHA512 df3869e4c09d072ab860470f74958a25a446e0c71c7529f13e85b3f82f8c18245aa1dd7e4594e1add53675f3b87da9726260a367c6c9cee17ea758b0bfe99b99
diff --git a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
index 005f719417eb..624ee75314dd 100644
--- a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
+++ b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~riscv"
+KEYWORDS="amd64 ~hppa ~ppc ~riscv"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 644ae4b64b8a..1cbf0b8e24df 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -4,7 +4,9 @@ AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
+DIST eventlet-0.31.1.tar.gz 412021 BLAKE2B 6358dca8e0a766f0cc2cef37586a8d38f5d87f03d8389a7cc11b3d2d616669825df2a416ae980eed8a980f8e81ce8b2848225921bb4536f5537a7954ed75fb64 SHA512 c240a332aaf8eeb4af429d1b190ae198b4bcb92ae1bc38ade3f824634327872526267c6ff02f7196e3f9dfd17d639af500c28a3ed70a773b1b050d6d967a88a5
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
 EBUILD eventlet-0.30.2-r1.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
-EBUILD eventlet-0.31.0.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
+EBUILD eventlet-0.31.0.ebuild 1692 BLAKE2B ffa99bff5e79ff2303d5db785cb4aa442dfc89df75ab4275cc18fa62d60858b45ac11756704c8e4bddde196ed89d30f5a63dd3fbe877e512c80ddf3778d7311f SHA512 32c51abb391651145b9a6098806b442014049a10e67b6127f3e3364f61460285330caf52f359974b44cc265a88184e61a11fb8ec4f2c70ce201b8bae52465b33
+EBUILD eventlet-0.31.1.ebuild 1151 BLAKE2B ee2f60580b1d985ed49ee3b4433db7aa2a975028bd863e538dd0d8d9f510a636b4ecc166b3f9ac66606a88a47aa653216c36af1ec608090410a941d9e6abfe11 SHA512 3d7fe3d2d14a1250f12f6001992e3fafdd17cf57b9aed26d540c2c02fad5a04b27203dd600893fb106ce2d36ed4cf41db1d614137f2fc63d7f000618f43059d8
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.31.0.ebuild b/dev-python/eventlet/eventlet-0.31.0.ebuild
index c335ba582bb7..cc5799f48b25 100644
--- a/dev-python/eventlet/eventlet-0.31.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/eventlet/eventlet-0.31.1.ebuild b/dev-python/eventlet/eventlet-0.31.1.ebuild
new file mode 100644
index 000000000000..3fc34d0e705d
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.31.1.ebuild
@@ -0,0 +1,52 @@
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
+)
+
+distutils_enable_tests nose
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v -x || die
+}
+
+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
+}
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index e41ed24fe603..f797b90ad9d7 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,7 +1,3 @@
-DIST fasteners-0.16.2.gh.tar.gz 29549 BLAKE2B 603cfe3662194f8f493e915aa3689af1c4a5e74c9b96ddb75e44d0fd0df3d17b71c0473c6c5c1deb0c037bc7f5fcbf2cc48d36ceecf9ce0336a926daa352f028 SHA512 f1557f3ab44acb7975dd98c4c5b2b63cffa9e42c82c5b31750dcfbddbd19552ecfe5ada59c2409e5d12da77dc00185619349340f8e4e177139a09c47f0a5ca6f
 DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfead11ed486f4f3c2a070eaa77addad300ee8398d6fe6d5ee0e517a25617dccd49500bd9e0abc3f9bad8216026c114686 SHA512 72b4ead49bb0c4f0e0c4ff47cab12f645af456e9100f270b72582b68239dd2536b1b641b38693f4f3635fc977e4ffa059c249e097e8842a1325333c4a6e864f9
-DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
-EBUILD fasteners-0.16-r1.ebuild 654 BLAKE2B 1ad152a2d29ab8487b70412aa57889a2f7351449d221662a423fc696e4e16884af1917bd387251642cc57d3c3a21546221dd1449be577638f74f6734cf8f87e5 SHA512 28c3dac7d4620f6a6ce1a04361ce249cac21f68b7fd75ff1f83165be28050328ac9d994c78b589f17241afe52593dfac12b74a57c1f61c4675f14a454acad05c
-EBUILD fasteners-0.16.2.ebuild 707 BLAKE2B df46efc7b85996ee878b2e64764b4a32f27ae143916dde9a4fae6874b8896234a6f7e7964de826bf3c07ac23a9b6206edbb68e0ad079384f160a791151a94a2f SHA512 816ca129228a771284b482080712f98c89a1e148abf5aba95204da3735ce51fe16390dd23433b2339ce1bbb474bf8bcab429c3ee483804aa088c718bd019233c
-EBUILD fasteners-0.16.3.ebuild 737 BLAKE2B 7200bfe0ecbe92f675d880ccd42cb7af219507f00efcab5304b5351219efe636ed8ee6ce553220a5fafeea402f07b13ee35ede3176b38421bdb6a8f72197c560 SHA512 0a40edbe9e4cc5ab5b5c5c9c587316ff07a0c9d5099a37be4cfc529b719c79e2640ce8fba92fa635f6b32c1f801e12a8efee574ee658bd8fa6666b1a2876ad06
+EBUILD fasteners-0.16.3.ebuild 734 BLAKE2B babd0a48a14a94ff07ac9cde7a9bb7f19e21a0cb92d47eda29889d9870295d95b3cb38925b1264b246e55706dd798a51c059ca3894e83bef9f9731fa310e295e SHA512 3ce341b2ead3170f1a3f2ed313c6ea36bdfb5dcea09a2f4abac8963e6574d82218d6b831c75ee3dcc3d9cf9d92e907e07ed9ae9b344eeb60755de8508de2cb98
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16-r1.ebuild b/dev-python/fasteners/fasteners-0.16-r1.ebuild
deleted file mode 100644
index ff7636a0dc6b..000000000000
--- a/dev-python/fasteners/fasteners-0.16-r1.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners"
-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 ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fasteners/fasteners-0.16.2.ebuild b/dev-python/fasteners/fasteners-0.16.2.ebuild
deleted file mode 100644
index 87fc43fd2b6e..000000000000
--- a/dev-python/fasteners/fasteners-0.16.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package that provides useful locks"
-HOMEPAGE="https://github.com/harlowja/fasteners/"
-SRC_URI="
-	https://github.com/harlowja/fasteners/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/diskcache[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index ac361e013dfd..65386ec95da6 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index f2058a08fc05..934aa97623a3 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,7 +1,3 @@
-DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
-DIST Flask-Migrate-3.0.0.tar.gz 11536 BLAKE2B 6bee958fc059f5980ed1b75309c7166940f6ecee536f83a7f7f219e0ce5acd4e62aecffcae5979d2da53b4b074c526c662b4c7c74be0548240f64501c0c2a27d SHA512 e13c3f96e68892b9319292998fcec43df253e01534d9d02a24fc54a2c2ef8fe87b5a01706842e9825819021d29a41f56f635963ed5157c6fc16bf9686212d107
 DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
-EBUILD flask-migrate-2.7.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
-EBUILD flask-migrate-3.0.0.ebuild 659 BLAKE2B 492ea38d7a8319a3c5df29fc46a46e3483dbea58d78e67ccb043c52db697cc1bd04daaa3c02f4558c1beec39a0d77d507540f76e2330abb1782d0fc98b8b4fa5 SHA512 7a21716fae2c16802b730cf35d34e58361d4d3ac53ed65df25ca76dd5f0d3765f453f3e44939b483f7d77646b531407ee45db73bd5529cca7dfd26c34c12493e
-EBUILD flask-migrate-3.0.1.ebuild 659 BLAKE2B 492ea38d7a8319a3c5df29fc46a46e3483dbea58d78e67ccb043c52db697cc1bd04daaa3c02f4558c1beec39a0d77d507540f76e2330abb1782d0fc98b8b4fa5 SHA512 7a21716fae2c16802b730cf35d34e58361d4d3ac53ed65df25ca76dd5f0d3765f453f3e44939b483f7d77646b531407ee45db73bd5529cca7dfd26c34c12493e
+EBUILD flask-migrate-3.0.1-r1.ebuild 654 BLAKE2B 26b23baef434a602182fc1a1f627df0768f801e39b7364cd3062f62b5565c480cb5fd115d84616e9fc54301dee71725c82c8c563802c58f7bc84d7579045e274 SHA512 49a3000dc724c3097fe1afdc191e2b9683996b87fefd18c6923d0b0f91222848107efa373a3b0676e805d15575f533a38bfffd7046cbe1b1052fae27d3293012
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
deleted file mode 100644
index e72818dcefbe..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild
index 815f8aa2a278..ab97cc945587 100644
--- a/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild
@@ -16,11 +16,11 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	<dev-python/flask-2[${PYTHON_USEDEP}]
 	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
deleted file mode 100644
index 815f8aa2a278..000000000000
--- a/dev-python/flask-migrate/flask-migrate-3.0.1.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..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Migrate"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 5a8cdd2d2e7e..6e9c04bceb9d 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-WTF-0.14.3.tar.gz 44507 BLAKE2B d160e10b1434c0578708c265468b77624953eb2d4ddde9a6ed2ff5b4f4651e0d5d2483020f51c9e512e3cb04895ecaa8fd1d0bf9380211d0a916acd8428f353a SHA512 58bdb87e442dd49dcbc9090e6466ecbd0b5c6bd2f097a26e071a5c73e09256ac46cc2f794f138f0e0b45e4f65ce70c231c275dc69aa44df408d7d79b15198832
 DIST Flask-WTF-0.15.1.tar.gz 45540 BLAKE2B 95ed9efaa89b487f406811926a8b206d15ad9c065f99595a35ea2ca4f98ede671673204c4085de91afe1e1b91b611ceb0f43b9c68b46fdd0e38d9025ac666f70 SHA512 9741e2c2285a500866b160e8c906c38ca579fdae2235bcba2336c7125ba614a9f75167c82bfcb96a45e553170c5925cb1a530d0164ecc57dc76cf1b560c40855
-EBUILD flask-wtf-0.14.3.ebuild 1030 BLAKE2B 6741790ee45cb60146b5d2c36a0510e5f635cf19de6c5ab90705af10daa6af512b046a418df87741f3ecea27ea292c4d1b776bd477ab2c0272fcebfe260e8cc9 SHA512 4e6bcc04e4f8174a1b81c96997a1f8a72d44b772bf41cd8a76c27efd35376ca3cad229f533fce86731794d326f6583da4df22e19bded7ce07f877951338a2ddc
-EBUILD flask-wtf-0.15.1.ebuild 1012 BLAKE2B a378d29d4f6a24d9993f7f348397b5484fee746d5e3ed32625386058d71754a1e2a87150f458f8b7af57f43f627f55d89aa37d26075af3b173d29aca6ce945c4 SHA512 36cb6661181ab09ebd7fe87be92d15b2ee82403376eccda00911fe5e3c425a8defc43247bae06a66442aeb247b0d132bf0bf0f041976253201d3e468ea6c75d9
+EBUILD flask-wtf-0.15.1.ebuild 1010 BLAKE2B 6775c6ad4f00ded0f2eac08fb60890b28afdf4761ab2203a2996014a54544b379795df401d2a9798866e47fefde53f1d5879879a0069e7dcdf4fcb180b3e2211 SHA512 0a002fe933f4ed75aa095e26a1a12d7d1e3b5b485fb55b74e5776098351e1f52cc5a59458b864d20f151d69c9e74b03b4075e345b51b5b8ca2e2dff12c6c5fd7
 MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
deleted file mode 100644
index 08f60600e256..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_PN="Flask-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-babel[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tries to access things over the network
-	rm tests/test_recaptcha.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
index af7bd3457aa5..64af34e29e53 100644
--- a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ff6f6c2b596c..896e9cacd990 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,8 +1,7 @@
-DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
-EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
+DIST fonttools-4.25.1.tar.gz 2577170 BLAKE2B 8cb03ef1f9cf4e61d5e6d4963bb5c43ec48838e0453cc293de1c763a29b34d69701b87430d8a85085f06c26671e00a91c89e4c50ba8d2fad4a9cc72b1f17d0e9 SHA512 ca3732bcc5e2b373983d34bd72e0ea36488f24aa442d25d0d16f6a473ef35323547f900b1ae87c42e64c451afe4f760291095738a4442c11c5566c9efd0aa944
 EBUILD fonttools-4.24.4-r1.ebuild 1295 BLAKE2B da50602b72774fa7dd8ea45e5a8decc1410637898075d60445a6949b1a38c826f9834dd60e0452d8b1f864a44d0fc620f1166ae32181ae8b01279630aeda390a SHA512 02668aa827368428afe0fe2633b7cdbab70590796a822a1eb15fea29d51428534e2ca53c1b66d574f2e7d10b3cfb1af0e99fa8c3c04e072844232081b29dcb95
-EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.25.1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.23.1.ebuild b/dev-python/fonttools/fonttools-4.23.1.ebuild
deleted file mode 100644
index 04af2aab63cb..000000000000
--- a/dev-python/fonttools/fonttools-4.23.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx epytest Tests fontTools
-}
diff --git a/dev-python/fonttools/fonttools-4.24.4.ebuild b/dev-python/fonttools/fonttools-4.25.1.ebuild
index 95ced12ecf0d..e40813acd252 100644
--- a/dev-python/fonttools/fonttools-4.24.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.25.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 virtualx
@@ -16,9 +16,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
+	${RDEPEND}
 	test? (
-		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		app-arch/zopfli
 	)"
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index ae5d9a272aee..373ee4ceb7cd 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,7 +1,3 @@
-DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-DIST Frozen-Flask-0.17.tar.gz 179081 BLAKE2B ddd029bdcebfc6a682de5e052bfed50ede18cfeab29655d321dcbdf38070c61c4c9c2d2424a43d170ea34d7ea512b029014786b6f6a48b90d024ad512ccb0861 SHA512 278aff5ac5f581963f0b5935c7b52b44c93ba6dcac735ee3802bba899faa35ed6a170fcf2d6f7507948b277e6de9a30f46f99f0e61e94fc0c670181ec35ddf53
 DIST Frozen-Flask-0.18.tar.gz 179245 BLAKE2B a82695892aef9b6b4e3aeb91f12f78d7d661f2f2b0efc57c11f64524ed467b85d8d9e0e7b147cb78c3d0a641dfef0f683e0f77cfda560aada79e1b435424c0ce SHA512 6c2e4d900547cc5c0de4af23b96c5b9e1925101fb40f710bedc67ac52c303282aa223f6972f5b9cc813878bb15eb90cb0a007619dd5a9db2dec762f04dcc7ba0
-EBUILD frozen-flask-0.15.ebuild 853 BLAKE2B 47ef6e7daadd445e13f71cb7c625fc572c86ff74b895ba86e1e26dda1822a87dfb5fbca88d500dd986a6a8688422b8bf111aec513c36b889932a644b1b68ef3c SHA512 c8812a1e774e3daa75b3ff3e78ba4cde8e97518d958c96a6a53a0bc96f30f49c5d83d1beb2b13248a87df7c21bdb0ecaab92717680859a4a8312278e4d38f53d
-EBUILD frozen-flask-0.17.ebuild 655 BLAKE2B 87e16a6f16aba8fdb715d2c0fc64063af3e2eb3390a32be9b154affcdacdb46cb21f4b53597f89061f90d0b7a7fe3e454bef101feeb373c14a12f771d73b6eda SHA512 ab55e1941e7bad4f02dc76cbdcdef18f7f48b01e4576ab622098599651a5aeb53d2b80c1487db97d61df3632ffc14df7cd45d10678439dfe288fb66a2fa38701
-EBUILD frozen-flask-0.18.ebuild 653 BLAKE2B d6f37a08a31fcd609562d2ff41986643e332bd2d8bf2bbf3a98007c26895c26153532466996078199678465d63c5177b1ca27b012d8fb950e3c00e7a391afb7b SHA512 14efc578633a8ea57c3ca641be1d3fd3f95ee4da326e6981411642f2e651be815436b717994e717d7b99bb38a99b81a65e936dc2546729376a14d3b61a04135d
+EBUILD frozen-flask-0.18.ebuild 651 BLAKE2B a54a8b53d80e7b953980375f58ac986be8d8cce342ad727af9cc816d2d3dc62587a40544169c5384b8479c335d553cd25958c1ee4e6b011b385807536945355a SHA512 c32dbcdfc22d0261b9e383702e194ee079a0acf4ee132959f212bd325ac837fc2f1a8899eb02ee197bdb78ed0211c0b0ec29c36cc2dc8d7cd0ce5244a14d9c9c
 MISC metadata.xml 417 BLAKE2B 2bdbac5df39081dd75056d27c5e943bcf898baefbd76b6080e1cb8f6cfabe0ca9d0ba5b073c1929dd71d3207d7557dbd23267464d59633c1ded1e8e429708898 SHA512 94b50fe00a2434157ac8aabf79e19e68306b70a7112fa2ab20299e1754910c55182678309ba13c6e2910016e3614812067e482e6f6d638ad787c3baff4c2bd3e
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
deleted file mode 100644
index d34cbdb14e74..000000000000
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
-
-python_compile_all() {
-	if use doc; then
-		sed -i "s/'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-		sphinx-build -c docs docs docs/_build  || die
-		HTML_DOCS=( docs/_build/. )
-	fi
-}
diff --git a/dev-python/frozen-flask/frozen-flask-0.17.ebuild b/dev-python/frozen-flask/frozen-flask-0.17.ebuild
deleted file mode 100644
index 2b5a9bfaed65..000000000000
--- a/dev-python/frozen-flask/frozen-flask-0.17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="Frozen-Flask"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="<dev-python/flask-2[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-distutils_enable_tests nose
diff --git a/dev-python/frozen-flask/frozen-flask-0.18.ebuild b/dev-python/frozen-flask/frozen-flask-0.18.ebuild
index 53e03ad0acb4..a84f085abe91 100644
--- a/dev-python/frozen-flask/frozen-flask-0.18.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.18.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index f4a8c4ed9e97..5550ceffb6df 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,6 +1,8 @@
 AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
 DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
 DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
+DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
 EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
 EBUILD fsspec-2021.06.1.ebuild 1241 BLAKE2B 0a79be9a0a6e0b512c24e86753380d98b38d81c31aec99dd08e42abac5aeab4f95abbeaff38c0ae89507e7a677117d01aa36535cd2730f066120a8a3f3733a07 SHA512 9319a05c1b9dc4be33a51fd3ba43b91bcb21bf46048e06df630086ff3e4a413fc83f48b255c2081070606ac56d7e88928803b4dbbd4feb081d218cdb687ec5da
+EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.07.0.ebuild b/dev-python/fsspec/fsspec-2021.07.0.ebuild
new file mode 100644
index 000000000000..01506d4cf04b
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.07.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+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
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	epytest \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py
+}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 052496a3561e..7e615933f782 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1,3 @@
 DIST Genshi-0.7.5.tar.gz 266071 BLAKE2B 007a094f8ce9aa17209a2c1c7241eb5eb50c3be3439fa2066ac7ceab88fa4dccbcaa11809042445e23ad1ce106b2e9efa825ac11de03038f07b421e9b93c03f6 SHA512 b5be34094e2eea8f5fc373097414dc77ddfe0ab0a82901b6fd87af558cf62420f690fb39bff2d13bde3f7fef5ef000697372996877b48187ed068227dab59119
-EBUILD genshi-0.7.5.ebuild 824 BLAKE2B 602695955eab507971382b9bb3629b65c886f096ea6603a28c1fe930a1765b86943e5530b226a12a2f9d4cd9a5f30ada8a6efddf86b3876e077ee4d7e1ed17f8 SHA512 a855686406b39a5238c2e7f7706abf3f29156b5eb5b8ec248beebbd92665ebee3f87a0a9d574ee92cef8ad7fff269261c62782658132aceca4b5f124a1ee7cc1
+EBUILD genshi-0.7.5.ebuild 836 BLAKE2B 43630c37164a79841db2a3925e4e56b7d4107b5cf25b705be4d5746ead797b5153c922c6579e606a4b477ed24b7c2d81765a524ae3830e5fc95d5b95fb595699 SHA512 d3b97d03d6d483d09adb54224a99fe9f611e39538a09de4ff79a55ebd4f175060fa3ed31b748d268718daebdc6a877a3ff89bbaac28913c2d3d848ca85664e65
 MISC metadata.xml 388 BLAKE2B e8c4b18a11c58ef5960d0fa0967f1f0b65726366d82ae288c5190f7cf77321add975f653e1be53fe0b6959004f24b4dabf18bd2c0b2459554a82f2e6a8dc0398 SHA512 410dacee9c67277a3c4b5546d78d2ad7eaaaf46ab51181fddaa14c326480216e8b5f5ec19dbf0ef8f444482cdcfff834457ec9707a6e6b628024ce57cbb67081
diff --git a/dev-python/genshi/genshi-0.7.5.ebuild b/dev-python/genshi/genshi-0.7.5.ebuild
index fe7f34e0cfc5..63016f30c154 100644
--- a/dev-python/genshi/genshi-0.7.5.ebuild
+++ b/dev-python/genshi/genshi-0.7.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index db2afc5260ba..30be977deeac 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,3 @@
 DIST geventhttpclient-1.4.5.tar.gz 58183 BLAKE2B 48d44048e7040552824ed19ac49c6dda41536ffded56bae0d942c06f111a327a1d571872f35f388853b479ea1aaa6de518f86e7ee72e362360492530ade65131 SHA512 9ffe00c79b145dab104e1dce336e072060f315d9bee880daf64b5f1f52e661d810dab9a60286320a7d30cf0e794465f201c039cc31fe7ec325cdb3a8350c9f7d
-EBUILD geventhttpclient-1.4.5.ebuild 1513 BLAKE2B bf85eab82133c2a6e908a7f4867c28b05af9b20b2dd2c1b845afb056793f11836ba6aa18a9571ec8b8fe5e85122967868f9ef327c5d034c5f20d5d6699afba1d SHA512 d5e87185deaa2ef22168dce14e8edf923733902c40cbcad5c50a7b10f31473b8639caa615d2916f5e48b50bae6540ea139cdaf10581b511b625c2b2d664beac7
+EBUILD geventhttpclient-1.4.5.ebuild 1477 BLAKE2B 35bfeb29334f743c0bd7ee2ed476f51c056606f14caeaa149ea4d0cae6e66a5868b804528fc60cc542b07474b5598f30e6b007985255e1bc9b2798ab0497cb91 SHA512 68b9ef7dd73a8aa1da5fff02fec0edbce304bd0d3c26dc1be96f06ec3cce39f16a98e636673034d78cbead3a578c7a81fe1350876908bfdf0c23543147813fcf
 MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
index 64318b31be0c..35efc6717e72 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -44,6 +44,6 @@ python_test() {
 	# Append to sys.path to avoid ImportError
 	# https://bugs.gentoo.org/667758
 	# Skip tests which require internet access
-	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
-		-m "not online" || die "Tests failed with ${EPYTHON}"
+	epytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+		-m "not online"
 }
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 3327c9505150..78d68ee84e98 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-2.0.1.tar.gz 11158 BLAKE2B c091d193cbfd44d90e62fe843775412a74f7962228130ba381ca07f5af93ea2296e989cffd025fd7d6a50ae5e526afe69fb00f49a6780b9b2f49ee8f06e2d3e1 SHA512 8e53b1a516a8d9780159d57b3973ebe02bbc4f60788470ec823c99608c2b026f5c43a12796506adf039420f06964a11d9e7e318cf9ea10df167faddd8b6f9707
-EBUILD ghp-import-2.0.1.ebuild 449 BLAKE2B 12908d41c5864b4b7bd8b1c582404e10bada37e828d7d04ea9be7c6a4b0451330dd8a7dd44ee08bd3904d30a50c16235b73d8883b23169155807e778e819da98 SHA512 9758c81e3cd19fdabfedbd7f3dbe7189070575507ffa8baaf1cec6caec8536bf4c2095ab5e8591fc6cafdda72d1ff8d311374ffd1fc379af9afd8d59acd9bc70
+EBUILD ghp-import-2.0.1.ebuild 447 BLAKE2B 03d84d95b404e6d98921eeb1a5bfaf458a412d8800ebe4cca31cf590290eb791fe8c67fbb435e951f96490ff10b208409aa0ba71defbabf37f719d4bb1efeb9e SHA512 f3297201dfc4950d4107d00ee14506eb654c4d51031666a9b185074223627be49fb9a06abec51fa4b7ee3132c1c4993e588306f1a95f9a4e8ed6975bd90ef807
 MISC metadata.xml 409 BLAKE2B ac8dd9b78b629937b57e93e9ae18fa427036552d5ae43a9f46a1a59973943e402557e0008f0ed04dfb48ad9c4b82e33b86de79e062ebacc6e89b9c280d2506e4 SHA512 9f986d2b4d7d129504cd4c0a60b448ee1deb64a92019e7648108728c230b8602277ad906c520f834c2cf25fefb7940923d1abe51c9e188596e969abd366bf337
diff --git a/dev-python/ghp-import/ghp-import-2.0.1.ebuild b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
index 5a4b8d9ef5fc..27790525a2cb 100644
--- a/dev-python/ghp-import/ghp-import-2.0.1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.0.1.ebuild
@@ -13,7 +13,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/python-dateutil-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 2ba64f36f2f2..b55c10dd513d 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,10 +1,6 @@
-AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
-AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c8766e4829d35ef91c9c829c2d2b433ac5811d45995bdf089b3dc2dc6b58d9b3a10f0283b22d52551b06da4f7709d4f78c8366240 SHA512 a4478447e966292db24e208b763ac11463e7684372e7df5d2115e5908ca6fd88718005c3f8169dc0171e22160d10d3dac034106f50680bc7e1d86d96cc3bde11
 AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
-DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
-EBUILD gmpy-2.0.8-r2.ebuild 1716 BLAKE2B 85e9237fcdedc534b93243109f28754577f34328602317fb6a7d599f33839c5c3b019973e2a73974211d6e96e93653942de09946031ad87d996f66c90c1fc0d4 SHA512 195083630391eed0b1b392116d6a34722bbf4a1e40dc94448a0683d3b149a3f2f65937a95456879ce961fde2ee9da39370392599af5112f3ff913000369d6b50
 EBUILD gmpy-2.1.0_beta5.ebuild 1281 BLAKE2B 92940940091499078cf28762247c4cff6e93b083d4e9b0deca4d9640c44a9c96bbf3da8b8176af5d6d9140b42b2cad6ce7438a28c177dfb5dcf4838992742c5e SHA512 73f82946da64c4491d6c3aad5d2019df990818506f107be09a26cf7a5ac430ae197cd2040061d9f40120ccba99d51e1d3bdafc479e2218f6000565d6c436adf8
-MISC metadata.xml 779 BLAKE2B 39be0ec90382e04ec8e482738f0ee8a984f7532e4efa4db27bcd4d9c201b2aadc380e6c3faf180fb32e2d920638bbed4c15b1fefad1af1edfbce8b1f6a1feccb SHA512 af0aadfa3d9c3caaddf2763c33aaf77e0ab285228448f03a8388ec0a2abd199bc88256cce57b78141a437d16eb493e57785791b953898e69f9712dbf26b741fb
+MISC metadata.xml 686 BLAKE2B 825fe2a9401b5dc0f1c78febd69b60f26554bc909e253f0c6ae84c110cfd7c756cccbf46822b045130e770a6ef908eb78570f72ef8b186d5f3eeb915dc299dfb SHA512 6ce00ad42436897a2a2c25db8e7948854142f5e87b9638a56cae0db108173019ed186fb783f75e9967941b0a0fae51d0cecdec0cfbe2291a4d6320d83220e311
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch b/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
deleted file mode 100644
index d21e5a55510d..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gmpy2-2.0.8.orig/src/gmpy.h gmpy2-2.0.8/src/gmpy.h
---- gmpy2-2.0.8.orig/src/gmpy.h	2018-04-03 22:44:35.494621951 -0700
-+++ gmpy2-2.0.8/src/gmpy.h	2018-04-03 22:45:33.580835296 -0700
-@@ -129,8 +129,13 @@
- #ifndef BITS_PER_UI
- /* Assume we are NOT using MPIR > 2.5. */
- #define BITS_PER_UI         BITS_PER_ULONG
-+#if defined(__mips__) && (_MIPS_SIM == _ABIN32)
-+typedef unsigned long long  mpir_ui;
-+typedef long long           mpir_si;
-+#else
- typedef unsigned long       mpir_ui;
- typedef long                mpir_si;
-+#endif
- #define mpz_fits_si_p       mpz_fits_slong_p
- #define mpz_fits_ui_p       mpz_fits_ulong_p
- #endif
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch b/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
deleted file mode 100644
index ab4128ff55ca..000000000000
--- a/dev-python/gmpy/files/gmpy-2.0.8-test-exit-status.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -dupr a/test2/gmpy_test.py b/test2/gmpy_test.py
---- a/test2/gmpy_test.py	2019-11-22 09:21:42.313037873 +0100
-+++ b/test2/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -34,11 +34,15 @@ writeln("  Caching Values: (Number)
- writeln("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     writeln("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
- doctest.master.summarize(1)
-+
-+sys.exit(ret)
-diff -dupr a/test3/gmpy_test.py b/test3/gmpy_test.py
---- a/test3/gmpy_test.py	2019-11-22 09:21:30.421908749 +0100
-+++ b/test3/gmpy_test.py	2013-08-20 22:17:52.000000000 +0200
-@@ -28,10 +28,12 @@ print("  Caching Values: (Number)      {
- print("  Caching Values: (Size, limbs) {0}".format(_g.get_cache()[1]))
- 
- pf, pt = 0, 0
-+ret = 0
- for x in test_modules:
-     testit = x._test()
-     failures, tests = testit
-     if tests == 0: continue
-+    if failures > 0: ret = 1
-     print("%s %3d tests, %d failures" % (x.__name__, tests-pt, failures-pf))
-     pf, pt = failures, tests
- 
-@@ -41,3 +43,5 @@ if sys.version_info < (3,1,1):
-     print("There is a known bug with Fraction == mpq for versions of Python")
-     print("less than 3.1.1. Please upgrade if you rely on comparisons between")
-     print("Python's Fraction and gmpy2's mpq.")
-+
-+sys.exit(ret)
diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
deleted file mode 100644
index dc45e33a9a13..000000000000
--- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="https://github.com/aleaxit/gmpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="mpir"
-
-RDEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	!mpir? ( dev-libs/gmp:0= )
-	mpir? ( sci-libs/mpir:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-mpir-types.patch
-	"${FILESDIR}"/gmpy-2.0.8-test-exit-status.patch
-)
-
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	# rm non std test file
-	rm test*/gmpy_test_thr.py || die
-	# testing for contents of __dir__ is really silly, and fails
-	sed -i -e '/__dir__/,+1d' test3/*.py || die
-	# fix sphinx-1.8+ compat
-	# https://github.com/aleaxit/gmpy/commit/c35c1f3319fcf95e894a59a6d523851bad4abf66
-	sed -i -e 's:pngmath:imgmath:' docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(usex mpir --mpir --gmp)
-	)
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-	if python_is_python3; then
-		cd ../test3 || die
-	else
-		cd ../test2 || die
-	fi
-	"${EPYTHON}" gmpy_test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index fd738a835d7c..2b02c6f120d5 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -11,9 +11,6 @@
 		library, the MPFR (correctly rounded real floating-point arithmetic) and MPC
 		(correctly rounded complex floating-point arithmetic) libraries.
 	</longdescription>
-	<use>
-		<flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
-	</use>
 	<upstream>
 		<remote-id type="pypi">gmpy2</remote-id>
 		<remote-id type="github">aleaxit/gmpy</remote-id>
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index dbd783360298..5b1288363c1c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
 DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
+DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
 EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
 EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
+EBUILD google-api-python-client-2.13.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
 EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.13.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.13.0.ebuild
new file mode 100644
index 000000000000..68ec1c0b8c12
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.13.0.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${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 ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 35af4196546e..4f7e8bddb751 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
+DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
 EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
 EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.33.0.ebuild b/dev-python/google-auth/google-auth-1.33.0.ebuild
new file mode 100644
index 000000000000..2bb9e016a997
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.33.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 8442925793a9..616e82cd8b3d 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,3 +1,5 @@
 DIST graphviz-0.16.zip 193031 BLAKE2B abedbe170eaf9d3ad83f91b5ad13aa9fbda8669ac19ebbd1087aeab3f9401b0b8e6557313e04d791451ee501c75bc2843d89d1a0f789a219b0db771467b4b8bb SHA512 7896901decf712657d4cb16fad58eab8492e1476e60a32b1a7fa37ede2e9c47ed31c00b7dedcaafdee291e2cfe6b2e2affa352282665782829fd3fb2f30bdf92
+DIST graphviz-0.17.zip 193647 BLAKE2B f2f5ad728157d60c48964d2cfdc76559310af6099a9eae16279b0f9e8a41c08d02d5f255be62222c1f0808750a26e67822b5fbb930f7ada5c6a614c3607494cd SHA512 02f5ef21f9e3bf3b609f43fe0d9cb51632ea43c878055746af62fda4dd55883f6ad58f69faecb6aba552100cc835901309c8c2ec833cd74c617619fce2d49600
 EBUILD graphviz-0.16.ebuild 743 BLAKE2B 76db9057ea6113733060b80840fde1f1cf16be3037bb2d800fdc889c8d62a6d684404c3a4e8aa8a0ceaa31e7bb55b8745249f7bf7ab585372a3df372f1065b7e SHA512 e309c4982445f2f11e3df428b47d563eb2d69beaeb5e93f71cf1f4daf4e1c376d57da923fc59ffa3caf3458df0a7a9b69fbcca02555db1b1b8a9cc4ef92211de
+EBUILD graphviz-0.17.ebuild 733 BLAKE2B 5362a98046f54f2079662066ec5290743912843b1dd1477b2664927c3c007960cbba95a579c52088f0888af064b104a92c79759e97afc2b6cd3869dfc35e15a9 SHA512 4da644d793af568e9cafa2248478e780ddb7e36c5010ef36b0d764adbfaab223673104aabb882803e180b83bfd25137137a91e5347bc0a554bcc24b3003e795b
 MISC metadata.xml 552 BLAKE2B e5a314fb4006a3081b0f54b84bb35243dc1e56e6cf19b8500dc683a02e48b687c8a086785fc1aadefb6301aa7112467820c1697b141010b96ee9504213d21a61 SHA512 d8513afc41a59f83476e98b296e6150d159096939645afc964d48a95dd36e6add4b2cda9a2ef2a5034050616c5c08d6c6222f71a0a0e0f83250f2be570c1c990
diff --git a/dev-python/graphviz/graphviz-0.17.ebuild b/dev-python/graphviz/graphviz-0.17.ebuild
new file mode 100644
index 000000000000..befd64b4a916
--- /dev/null
+++ b/dev-python/graphviz/graphviz-0.17.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=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple Python interface for Graphviz"
+HOMEPAGE="https://graphviz.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="media-gfx/graphviz"
+BDEPEND="
+	app-arch/unzip
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+		media-gfx/graphviz[gts,pdf]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov --cov-report=term --cov-report=html::' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index a3f5817d5613..f4e139a97bc1 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,3 @@
-DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
 DIST greenlet-1.1.0.tar.gz 85043 BLAKE2B d9f5eccfe2dda528e5bc90bdc9c3992517b42c7d5f9d5549590b8f94003f715921585fa01219eea0348d6204b0109c4e342657fdf8150f09cabd2d6179e6e9f2 SHA512 13547917860d9a19f2fab519380121805d8f7801ad47b1584003833a5de66eb703373c71e67b32f13b770d429bcee6856b35bc6fc8afb7be598c2bf509bede03
-EBUILD greenlet-1.0.0.ebuild 621 BLAKE2B 13d40414ef75ebc22b0f644186b1b08e3541d7cda84e85d0a668af52707687ce2731bb83d425900b5200c2a4c9a85957b583dd5598c9c19c797bf9e3a850b608 SHA512 cfaeac8a8c70e369beb0094980f1d39ee83c3ff5e149bb312e4ba1b77ec1b5082addcb9f668dd51ba821e397f8544318ee1c692c3e6e7f224f847f3f033ca9ca
-EBUILD greenlet-1.1.0.ebuild 636 BLAKE2B 8312cc58b75017eb2468b0e184f969b0d2a43ad08273686a861fcf0f474f8203d0eb830865bba123c47a6d3bd54eace59aa4b7da959e87035bfb08bf89c0b48d SHA512 94da97e054882e802e6a7a26defbd349f5883a6764ee9246f55d6378acd178d4562bc8cb8308d8ab127a7f4e9475c6b2b8cf56c42ed0fef9c011bd599f601ef6
+EBUILD greenlet-1.1.0.ebuild 629 BLAKE2B fcaf199b1d8b9657639b45b0fed5f04cbca8a1a2f24aee2be3a49ada6d6583ff748693284724b1be2d1d16bc0a7bf3403cc555a81bc809ceb5f0a811266f21fb SHA512 8a4bc923718a42262bc49e2d230ef159df4d78f72de9d6f85188d14f9c6d5fc0c54ddc02d2e7cc90b1a342045956c090dfbab03e47c20315109c7b089f21a56c
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
deleted file mode 100644
index 378c8d4d0743..000000000000
--- a/dev-python/greenlet/greenlet-1.0.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..9} )
-
-inherit distutils-r1 flag-o-matic
-
-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 ~mips ppc ppc64 ~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.0.ebuild b/dev-python/greenlet/greenlet-1.1.0.ebuild
index 937b52748b27..1ea6eba1fd3b 100644
--- a/dev-python/greenlet/greenlet-1.1.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.0.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index c941705adf4f..a438368121f3 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,3 +1,3 @@
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
-EBUILD h11-0.12.0.ebuild 483 BLAKE2B 43691ca359b3dab403a72ad35fb47afeb007e8567bb5d7bbc16a39c7d01471964f83396f1c585f4a1a57f0ab113a3e3d617e896399319cb675a29b82fb5a872b SHA512 868bc03095a37f5f3945a72e4855ec30e0eca2b37bd2d7d22a4397994576e3860806eb6321b6ab1f2bd648d4386985ce657fb0ca9dc387fd3fba52310996996e
+EBUILD h11-0.12.0.ebuild 481 BLAKE2B 2f378c3365977c1c9be04d45e087b7b5d92fba0665cc55906970d1a8eb62cc617b22c12bef885c400198849d3a9a9b43b7f5367732858e845f77a699b43a225d SHA512 b26ed5c592d8cceb5bf3969eaa2a4418f1760f6ce4824c290e82f280b400911fa35212d4292c1caadff5269d491e28b2bc5e806f4ec42c5314d8c6cd8db7b501
 MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 4678c2f2d881..4ba4f935f5d5 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 774a615d5cd0..28889dee327f 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-python-1.12.0.tar.gz 88905 BLAKE2B 1e24cfa208f02a1068b0016ac8948358a3709eb4a2c1f73d75d8e3ee85bee7265b0da6f5cfc58afefee664a024becc57dfa3389f36c4e7ae0c0ae623944e51a3 SHA512 fc431041d2bbae749d5335dda0c8ccf6abcb3fdd8e3a467b50a2ff45e70f9b7a8378bc2b72c00be7c65cc8cf84e01fde7965c6bb731b7252d7da377648bc01eb
+DIST hcloud-python-1.13.0.tar.gz 89714 BLAKE2B 0d39d25c867e2433cec235b1ce101b3df8c5946cb4ccc7ffe658cb8a721eea5502f8fb2816491ac687a411a696c60ba4b1c602668385480d7a3645eb2a652c62 SHA512 4283b7b9be6add5ee6321645efc95b4bb77110417bff34327a533c416ee916c19511c35ef614fddbff184ee515fcf31bce740cdb6ad5c18ea7dd8e66c9760fc5
 EBUILD hcloud-python-1.12.0.ebuild 992 BLAKE2B b9dbea60ab939354671d428ceb8851d8195f9268a6f380fb542f9710b6ffebbaa5b345f9bdead549f828ff1207534837d789dd5bd2823f7940293c82f9d9c756 SHA512 2246a7df95faf8d89378cace8adb1e37bb739c6e7d319435238569d941c42639120c2300a9d87147bc2b25849c6e3fb758f88d4d91bd8cb68ab537cea3afdb31
+EBUILD hcloud-python-1.13.0.ebuild 992 BLAKE2B 55e2c8d323ec86318a0d77f2e9b3db2b778a728621af9cf5573ceae4dfa0aff47eb4c3dcb013071844959bf1b0c9fadc86e754e11b45a50354cea70de12dc68d SHA512 b22924bba14020d69609fcc82ccea8258257c424f4b936e72a6a1d1486c4a34cd7404b79329ab192f2db25afb008adfcd4f3bc85d9bda0dbce2f1aee892c8050
 MISC metadata.xml 482 BLAKE2B b58d0b4580285588a5d2078699bcc2bc2fbfdb3c207266ad7f798cee761added5f819341dbddfa27066e7037128065004694e21f043a2590dc54e3e4c6e2c688 SHA512 c3370f871cfcb333f24f293bf1435ef007d4d1d6d38573744e8efeda8910d1bf08685081fb9ef0a869ec134456231a36ca43e398e279d47ada7e4ffb5c645534
diff --git a/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild
new file mode 100644
index 000000000000..ca78be85c160
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.13.0.ebuild
@@ -0,0 +1,40 @@
+# 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="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	epytest --ignore tests/integration
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 7f42d1e4e3d3..9789f4f463c5 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -8,6 +8,6 @@ EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.3.ebuild 2206 BLAKE2B 5c9882609ad0a8a7c65d74790d59c14d09a272370a812a9d3f88186faac634281a0fd5dd592b5e2fe9d9b2266115681ee1c3b5b175ae3d1f41734e680d667f87 SHA512 c1090a1df81438e2623817f615bf406570009a99ada2e8e2c6ca0e159a7b3e2d86395eb7f21f86f6c86372ee3308012e42f89f944cee49715d67a489029c4f9f
+EBUILD httpcore-0.13.3.ebuild 2204 BLAKE2B d03b92df7e8b0127162e2c6125f0e88184a82e151254241e6c3b1c080551d159d5bf34dc0ed81669a1d6ad7d92b060100f732178fd8f66068d794c900aaa667c SHA512 cc7c7f37bd4abc92d431c7b0169832736e4e38493ea0e4722e5a4021aa5204c23ee1774c66a4a16509deb1ae0f41f0a041ad279c9c1e311f9b01a5c3b2daa934
 EBUILD httpcore-0.13.6.ebuild 2302 BLAKE2B 500632e564d8dea5633644e0fdb4686d298053694347367aec4f4c8ca44d7a311036f43183ec5252ae8a39ff54883deeef5b6fdbd22211a9bd803d1a71f2b19f SHA512 189e5ffafe30e95f82ffcf02dbb6033895c6d0b91caa7f9b619dfff1e28db1a68f9b3bc5dcc56dea7a0e41691c889bc8ecf783d918d68c85fd1b74ab3fdbfce0
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index 516a68d73f59..e43157c8ec6f 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 0354a6081b26..6afc5f8ccebc 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -7,5 +7,5 @@ EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691
 EBUILD httpretty-1.1.0.ebuild 1198 BLAKE2B 8f6feb8bb19893c4c74b9653ec90414d5131197cd36b5bc4d1dccffa5a49dd6155e2045bbed9d60995853560708c1a767b013246627a666f24edada682b25bc1 SHA512 891e9a72f471f5529f2a5d3c10c04ab55cd38d7eb97c8b17633fb6c6e521d7ff81b0353ddc70e649e1dae7cc9471f9e37d8f1cdee2cdcb967344ea0be44e0402
 EBUILD httpretty-1.1.1.ebuild 1291 BLAKE2B 8e312ccbf0070c4af60df4a98aea0db7f5acdbd4fcda701369bdd644342f8bd88fe793224f748e1904b464d76ab488d499735ce7b5c27e4d60e5dc50676f6932 SHA512 4e8691c96e9da6da9881a232b860f56bf24048f4c030de3c0427e4b2ba058dfb6d695851462f2e52d9efb0c0343797a537c5ec9af2bcb5d4b614315dd73cd2f1
 EBUILD httpretty-1.1.2.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
-EBUILD httpretty-1.1.3.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
+EBUILD httpretty-1.1.3.ebuild 1290 BLAKE2B 9a5f8d0cd03ec6bc20e799012d4f15fd815bd4223a70f1434198366c5dbedf0ee358c3728e51cb4e694c718275f1189c7b45be5733ad6f8feda9ca3a1520a10b SHA512 0eab5a37e9c9ef42a360f957c84644df06dc4e0d493d0755c1f3810458f06841df3fda91d5e97ae1f17e309abafa2883bb02ab3da37b500d996baef12531f5ab
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
index bf841f155b15..cb404053d78a 100644
--- a/dev-python/httpretty/httpretty-1.1.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index bd8d16c58fb6..f5ee35ec7fc4 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
-EBUILD httpx-0.18.1.ebuild 1313 BLAKE2B 68def2f215f9042245cbc6dc0f087da87450db00f24ec1b6882634ba7e682de347ceb13962de9689814024c83eecc62525fd01d00b55b9d075653f80ec4add09 SHA512 718acc217a2853e1cd17bf7c903b39d53d942139c88720e3f89bb7f3552c85ce75e614bfa4452abdae87607736889b04a85e0c925b6948ca916d6c670d72a426
+EBUILD httpx-0.18.1.ebuild 1311 BLAKE2B aabdabc7a3d4c38f89a5db92265aa76b1329dbe2c731159f08f55378a5ef78d0b49f29d742dc5895b20938d338ce3e0a9b63354cadf43a01475eac99c11ddc6c SHA512 2623ce502c30cb40e4e8f629248781f368a8944da809110ee259cd6cdb8108ad74fcd1940ab9b1d29fcbdabe52f3bbe6f6094a1e5e8f6809921281ebb3b288f5
 EBUILD httpx-0.18.2.ebuild 1547 BLAKE2B 7f267cb8f047aa1cf6c6ba635151d482730628c57fb080bb18c277b0b2e963c728074d537b2025e992b2351d3c0ee14169f0dda386bff5c710f9560075aeada4 SHA512 df6af32a04c4d9716f55261311101c62f6f5787aa28cc138933a16c7626e1dbb922a32957623a92a11d9c158e16027e3c86c31e4849b15518312255dab7df660
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
index 7f70c6b70ccf..2a51074bafbf 100644
--- a/dev-python/httpx/httpx-0.18.1.ebuild
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index a339fd6a8a54..ef624c780a5b 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,13 +1,5 @@
 DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
-DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
-DIST humanize-3.7.0.tar.gz 44002 BLAKE2B ec253c07a38c83d67038836998a7159afe7d1f3e1f0f5ea0f946f987e18bf4943d7dd48e2e156009627e1bda2140017bf99df072671008a6e1daad704b693292 SHA512 e501cdb4dcb603601624f5df9a04a256669f06ac594d8a3a0c83543d1d8503bfcf4d7198ff87827e2c60dd63897c23b722be7497179c49a9f9b05d07289de4be
-DIST humanize-3.7.1.tar.gz 61846 BLAKE2B 6ed6e35dc15ef08a88cd15211212cbd4194363889ff0dbe4e53d76adb248da948d688e4eddf5a93548497b1e1e02145431e1c157fd26288fc27f2b9b7b2c80b7 SHA512 152ee6030de83be34bdb40908427ca4f1461191ce417faef273b070a1d347a43f4a44182cd0fa79b8935c07d97679205285bbd6fa43352d2d9cada53df5f112f
-DIST humanize-3.8.0.tar.gz 64298 BLAKE2B ba367054f66351b7b48bed69ab4ba63251dbdd6bb56c21cbd8d7846401d4a2428f6e069a0219b5a24bfde173d6ed2ef3116f01551137b4c0c1eddd8c9d6fc87b SHA512 8301f461c60fd990e50a24aef714d78a3b42fb82d792ac01b088e05b6bf765dfa34e2257c1a75e3da279db3b8d837bd6434398f33578c946fa17dc1a45122f75
 DIST humanize-3.9.0.tar.gz 64229 BLAKE2B 09aeec6a92c8e2e104032d4c61f054785ff58ce2dda68c4f3acffb17c7fa4e262b28a24b7c06d33671ea18d2eb05c9bcc0a82d5491e60afa161ebc0041945bf2 SHA512 75aa8f9f6b07d4b65e5589c3f337a92ee17769ab8da6608147b0f1ec3965b95788dd90cf0d0cae1b7c9be689b44910029ee72e2eba39a60c9926b67726c74353
 EBUILD humanize-3.10.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
-EBUILD humanize-3.5.0.ebuild 547 BLAKE2B 1e7c1ac2157ef61f0885d14b939b0a92efaa7c2d2259b5dff8709b7be500081042791ea3de8b3354a4c71e671db0825029afa5b407e92b539fff2647f6bb3a12 SHA512 c6f99389b2225d05450700755005b546bea0987bc1ac470f2700e45fc3030712d7af5c03b00f239ebaa2729255d47fe171176d7e3001ef2b10470141a5d6e35d
-EBUILD humanize-3.7.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
-EBUILD humanize-3.7.1.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
-EBUILD humanize-3.8.0.ebuild 549 BLAKE2B b4ae479e1872c0c64c2e51eede1da98beca13b8457333336d2f1f75c6e849f6ecab8c807cc12c51bfdb7cf7c53a053f2d1d7281dde593a876deebdf3b37e4094 SHA512 12715667a633738b2727ecd0cad70d4532b40c75f62fc5fd6236b8f0a7b5dfdec3023c355cd08dfabe6ca50379106a3b512fa12815e98f2e2a7ef78302f1aaf3
-EBUILD humanize-3.9.0.ebuild 549 BLAKE2B b4ae479e1872c0c64c2e51eede1da98beca13b8457333336d2f1f75c6e849f6ecab8c807cc12c51bfdb7cf7c53a053f2d1d7281dde593a876deebdf3b37e4094 SHA512 12715667a633738b2727ecd0cad70d4532b40c75f62fc5fd6236b8f0a7b5dfdec3023c355cd08dfabe6ca50379106a3b512fa12815e98f2e2a7ef78302f1aaf3
+EBUILD humanize-3.9.0.ebuild 547 BLAKE2B 33dab2c67d880f84972528a538579c0c53d6850575b435dd621d3397e888161d7245af1c1f7627ae09164d75aff2f2a3f36c57aa36dfc13554145361f687d759 SHA512 fd88009835781655dabf1441a30b9124061fe4d55c556b4d228ff58a59e4d9a73e0e59d5cb411e08f7df79a4a00e3dee3d4e885426baeb92da873dca4c10d52c
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.5.0.ebuild b/dev-python/humanize/humanize-3.5.0.ebuild
deleted file mode 100644
index 7520e23c9527..000000000000
--- a/dev-python/humanize/humanize-3.5.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
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.7.0.ebuild b/dev-python/humanize/humanize-3.7.0.ebuild
deleted file mode 100644
index c806307de9e9..000000000000
--- a/dev-python/humanize/humanize-3.7.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
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.7.1.ebuild b/dev-python/humanize/humanize-3.7.1.ebuild
deleted file mode 100644
index c806307de9e9..000000000000
--- a/dev-python/humanize/humanize-3.7.1.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
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.8.0.ebuild b/dev-python/humanize/humanize-3.8.0.ebuild
deleted file mode 100644
index b6c00705226e..000000000000
--- a/dev-python/humanize/humanize-3.8.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
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.9.0.ebuild b/dev-python/humanize/humanize-3.9.0.ebuild
index b6c00705226e..2c5ae12b3424 100644
--- a/dev-python/humanize/humanize-3.9.0.ebuild
+++ b/dev-python/humanize/humanize-3.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index 3be1b75b7934..407743bed8b5 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -4,10 +4,12 @@ DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363be
 DIST hvac-0.10.14.tar.gz 301617 BLAKE2B b3d721b245b9f7b0e8aa5404599da8f3fde3fe10a5b3d70cf1831faeaecc6e1c42f0228c2511eb8d24ef56fbb2a971487b0707a1640e3a48bf01d3e4811992e8 SHA512 3b3b5c64df5c57679a35e09cd61d29090c950dfaa11f64b4c3f8442a3ccf6512cc2d792f60e035815e4c4857813ba49612e0f52c5da3670bd692116a6bd28469
 DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
 DIST hvac-0.10.9.tar.gz 291045 BLAKE2B 63c48b21e402a1af3f73e5b295061a2f82040cedd412fab69e8759e290a46eb67d1aa0ddaeb40c1638eefbc492441e238cbe4be114093015af6eabd99a0c0a75 SHA512 4af23583110ca4c2c9714f5234daf21ee199c2ac97cde01a220db6f5d89957b95c1e8b84904104e5a96ec39b54cea567973427a73ed7cae5806e794d37403a8d
+DIST hvac-0.11.0.tar.gz 306753 BLAKE2B 0300705044f6575ffeb9fa3dc28d6ee1139b6ce84f52b89920606b603355530823a1f2ec8ac251423c5a0305f3ea1ae15933e84dddb2e09c5d7880b5c0508ec8 SHA512 47226ba5113a4df48f115d02d2fb1fa7ab8b42895d38f7fad37c84814db71a57f4e455a9b46134bb577fbded1881e6272464b9f1d1d74142dc089bde03b0eba9
 EBUILD hvac-0.10.11.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.12.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.13.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.14.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.8.ebuild 1337 BLAKE2B 54e332ea5a21dab765c2da086cd35ae0ecb03f65db484e35cd84b0eb686f823f7d0ede10903e65b5ce824067c12a55ff22b62b6c8f9df7d5ad7238dc87c3da45 SHA512 cd9d8f51940498aa1749bee33833fcb1edae278abf764a87da4bdd01ce25ab944af827381b6ef232eb416ee878699711e1488875fca0b8ab29804bd1a29d7125
 EBUILD hvac-0.10.9.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
+EBUILD hvac-0.11.0.ebuild 1302 BLAKE2B 1e5f47e6b752cd39671ebe6212291872159e6a115069d5426088de090f3cf25a4a04884ea89a703b0e89b76d88f02dac50f034b805476e2d1915e065da0d6e0d SHA512 d8807072db9681d9778f56f3c3c0e49304fb14991d5fb14536b48aac01449aefa80a8ee2a79b2d4bb7ecd37b16916a62490ccecaaed06ee842a39922f61e6c49
 MISC metadata.xml 599 BLAKE2B 84158e64a8354d461d7a02cf871e3e2fe6b47d5983246d7bf01ce53467b68a2e45708b85728862853e4659fe7b0b514c2c2f268f67c660cd1948df9771233704 SHA512 6382293682cf7990487a76b88dcee4e43a1e679b751f8ae79fffb1ad0640db500ed16f9d75edcad919999f72858b7a6c6e86f0a1711c22c6394b5a8a8a2a2f95
diff --git a/dev-python/hvac/hvac-0.11.0.ebuild b/dev-python/hvac/hvac-0.11.0.ebuild
new file mode 100644
index 000000000000..18c424443e15
--- /dev/null
+++ b/dev-python/hvac/hvac-0.11.0.ebuild
@@ -0,0 +1,49 @@
+# 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="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# ldap_test is not packaged.
+		tests/integration_tests/api/auth_methods/test_ldap.py
+		# https://github.com/lepture/authlib is not packaged.
+		tests/integration_tests/api/auth_methods/test_oidc.py
+	)
+
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f8ddfa06b287..a56e394f19f9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,10 +1,5 @@
-AUX hypothesis-6.10.1-py310.patch 2493 BLAKE2B ffc3e9669407a20a2820a59980719d0a176348798a6aa9368f5249cae65cb7c8053f79fdf53d833709793b049bc2c3e4130ab3c9f166d48e5909da1ff07b86ac SHA512 c5762698d1a463ca942d024619453e5e89aeaf5b884eee099489ea91de71d82cf6797e661767cc77a6c84338dd4b989eb255b988ecc6938aa77418667ffaf048
-DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
-DIST hypothesis-python-6.13.14.tar.gz 9134690 BLAKE2B 821fa0baa47dd896fc5ec61d0a96fec3da225dbc35306e6cf684641262c9ff0b714ca95aff69daca4bda551033a67d90b411f0cc2abff8edd41e5d749939344f SHA512 74397fd77e6e70df918e0fa605180e2bfd509fb26ef8b4a86020524611a315950073c3babd65bb2d2ff65d39e027bc52da88c0125f422cc2493076398e733853
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
-DIST hypothesis-python-6.14.1.tar.gz 9135154 BLAKE2B 0fa62cf4b512acf433a94edd14b2bc4c2c86cdbcc95e4a2760a1914e85f1149d9a5db6b22222c4954d2db109d3bff877ca0e5e8ec6842ff5b3c794a211ea9b57 SHA512 b84776e2bfff130c4db7582defbe9bc55183d624b45defffebdc954ca8e1dda1dec78f921e1bc7839a1167c37bce693711cd500da547dc6f2a8fa610c0bd3540
-EBUILD hypothesis-6.10.1-r1.ebuild 1767 BLAKE2B 34c63c1f11e6400a4df180316a6b9ee2dc2b8d1eff3678e266379c0d19934f9ae4bcedcb2c10fc777ea1e872f5cf52b9c638d559c376d4ead2661a0b1587a657 SHA512 e639122ffdfcda78d53c50b5a59795f5b7e9c22f6ba203b7894dc4087a8ac0f510e54c4001a29c9870cbc12cf468ba3bf9e28193224381ea75a230125b3f3f66
-EBUILD hypothesis-6.13.14-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
-EBUILD hypothesis-6.14.0-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
-EBUILD hypothesis-6.14.1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
+EBUILD hypothesis-6.14.0-r1.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
+EBUILD hypothesis-6.14.2.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch b/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
deleted file mode 100644
index f81186a46e6e..000000000000
--- a/dev-python/hypothesis/files/hypothesis-6.10.1-py310.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27ee073728e70e930118a36ffa4f8123ce363099 Mon Sep 17 00:00:00 2001
-From: Zac-HD <zac.hatfield.dodds@gmail.com>
-Date: Wed, 5 May 2021 13:01:21 +1000
-Subject: [PATCH] Test on 3.10-dev again
-
-now that pytest has been fixed
----
- tests/cover/test_annotations.py | 4 +---
- tests/cover/test_lookup.py      | 7 +------
- tests/cover/test_lookup_py38.py | 2 --
- 4 files changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/tests/cover/test_annotations.py b/tests/cover/test_annotations.py
-index 564339d39..95ebea3c5 100644
---- a/tests/cover/test_annotations.py
-+++ b/tests/cover/test_annotations.py
-@@ -13,7 +13,6 @@
- #
- # END HEADER
- 
--import sys
- from inspect import getfullargspec
- 
- import attr
-@@ -116,8 +115,7 @@ def test_composite_edits_annotations():
- @pytest.mark.parametrize("nargs", [1, 2, 3])
- def test_given_edits_annotations(nargs):
-     spec_given = getfullargspec(given(*(nargs * [st.none()]))(pointless_composite))
--    expected = None if sys.version_info[:2] < (3, 10) else type(None)
--    assert spec_given.annotations.pop("return") == expected
-+    assert spec_given.annotations.pop("return") is None
-     assert len(spec_given.annotations) == 3 - nargs
- 
- 
-diff --git a/tests/cover/test_lookup.py b/tests/cover/test_lookup.py
-index b74eccc62..33cb78050 100644
---- a/tests/cover/test_lookup.py
-+++ b/tests/cover/test_lookup.py
-@@ -756,12 +756,7 @@ def test_compat_get_type_hints_aware_of_None_default():
-     find_any(strategy, lambda x: x.a is not None)
- 
-     assert typing.get_type_hints(constructor)["a"] == typing.Optional[str]
--    annotation = inspect.signature(constructor).parameters["a"].annotation
--    assert annotation == str or (
--        # See https://bugs.python.org/issue43006
--        annotation == typing.Optional[str]
--        and sys.version_info[:2] >= (3, 10)
--    )
-+    assert inspect.signature(constructor).parameters["a"].annotation == str
- 
- 
- _ValueType = typing.TypeVar("_ValueType")
-diff --git a/tests/cover/test_lookup_py38.py b/tests/cover/test_lookup_py38.py
-index 6a68254a7..db11777fe 100644
---- a/tests/cover/test_lookup_py38.py
-+++ b/tests/cover/test_lookup_py38.py
-@@ -14,7 +14,6 @@
- # END HEADER
- 
- import dataclasses
--import sys
- import typing
- 
- import pytest
-@@ -103,7 +102,6 @@ class NestedDict(typing.TypedDict):
-     inner: A
- 
- 
--@pytest.mark.skipif(sys.version_info[:2] >= (3, 10), reason="see issue #2897")
- @given(from_type(NestedDict))
- def test_typeddict_with_nested_value(value):
-     assert type(value) == dict
--- 
-2.31.1
-
diff --git a/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild b/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild
deleted file mode 100644
index b7536f7f4daa..000000000000
--- a/dev-python/hypothesis/hypothesis-6.10.1-r1.ebuild
+++ /dev/null
@@ -1,65 +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 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild b/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
index 536affb7ae13..9a316963749d 100644
--- a/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.14.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.14.1.ebuild b/dev-python/hypothesis/hypothesis-6.14.1.ebuild
deleted file mode 100644
index 536affb7ae13..000000000000
--- a/dev-python/hypothesis/hypothesis-6.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!dev-python/pytest-describe
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.13.14-r1.ebuild b/dev-python/hypothesis/hypothesis-6.14.2.ebuild
index 536affb7ae13..536affb7ae13 100644
--- a/dev-python/hypothesis/hypothesis-6.13.14-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.14.2.ebuild
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 278a870dcdc1..ea322f6b2f37 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,5 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.11.tar.gz 101117 BLAKE2B e316bd18a91b3d073b2bb24743ffcf5e6551ce5a9ddf62b1a30aaf937311b2d07de08d9abe01040de48c607d51e4cab121d778385f8336bc911409bedcd5fce3 SHA512 083dd600bc65f61c1aa41f87943b59a4f2edcbbc7a7d07d7a1375d181761edc4b853df87d4a2b2c0f3122f4f27ed10eb784d2dd75078418b50a471b1d5a0ad0f
 EBUILD identify-2.2.10.ebuild 505 BLAKE2B adbd3b5737c1bf6d8e809cc0d947f54d51af4d16526eedd4cd8409b773b0f37b9512a428e9febcd699c1491bae98f7c8e344f2b579f8302a26624e84c6016a03 SHA512 e1bee2e6abd986dfeaaf9003cc0febdff77754d6733ff27127e0bf9f497a00b1257683ef51454b66a37ce8c15c9dd839f1047061e25f5dd5fcd3fb5d07f627f5
-EBUILD identify-2.2.11.ebuild 506 BLAKE2B 604d1103e5fb710f2aeb448495f723d69f1309a797f6562274df56d63a19eac4a9c82782d96b2777332251d53fe2566afe0a2398c7a3b0fb076ba118ecb4de9e SHA512 ced4aca94d0e1857284abd9f172c05ff3f0627bec0fdf60f20ab1d5b1aa7b9863de429fd43cb6903d405d4bf560b1d796b63068655a2bff4de20084e276fb4ec
+EBUILD identify-2.2.11.ebuild 511 BLAKE2B 570fd7439d90d9f1426b18149d39a0b92afb147648dfe968b0971bcef3053d653617cb30e2073263900b3554ccf41802081a9e713e1f88ad33399431659a5d05 SHA512 d0e4d9cfc708807c79ba2a10547671732d87484ca44df21866c0b59fb846fee5e3cf1b4025c5c4c5213beeb4c7bd862d26c5d226d9e0f99c0d278d38f1267682
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.11.ebuild b/dev-python/identify/identify-2.2.11.ebuild
index dd2ddc4e73fb..939b1826a0b3 100644
--- a/dev-python/identify/identify-2.2.11.ebuild
+++ b/dev-python/identify/identify-2.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv"
+KEYWORDS="~amd64 ~hppa ~ppc ~riscv"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/immutables/Manifest b/dev-python/immutables/Manifest
index 881b5ecfbe38..7cc075487403 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,3 +1,3 @@
 DIST immutables-0.15.tar.gz 81297 BLAKE2B cb58142c3b833d529046f09a468b3e3964e3d36e4eaf0825f88b920e6795cd042e2fc837ea6d72000bbc9cbc2fd1de911e08b4f6d189e692748b49e848dfb3fb SHA512 cd0ee20f6d6218eaf13499e40971b6750009ff01a1aefcb7dd45c77ae841296b9d9184013e6e7fe5bdef93587f85cdb8ff459af29424a0077538666260572b8e
-EBUILD immutables-0.15.ebuild 475 BLAKE2B 240cc713a3ea59ba174ddaf2d20ddc1497d440e601d37d4132ec65a7e01cbf87bb6a8d867384ed9fbde2f50ad275fa545867057c79763b850866f4eabf053cc3 SHA512 d8d103840d270c69574c3b8960f0a89fb492b9cea895843f747f239d3fb3667cf12e358f5d55fb1e6650d86ec0bb310d8dcaf6990e51d5a773cceb3377072dff
+EBUILD immutables-0.15.ebuild 487 BLAKE2B 6eb8f45620525e4dd42aea5ae122f9c60e4a1ed5c7585967a7866a71d79fde296565b6e6aa7654f7ca6cc1121cc9ad0ae21a96899c80fa7d3ca2b0c9bef29902 SHA512 1b5e71a31832081a6d6537c8e3084ad29e3492cb2b9042000d6ca488a93a4357bd62c1bf7d4b3023786508604d3750c09cfe54148c0663869e5f607297748a22
 MISC metadata.xml 352 BLAKE2B 65ae089f4fcda6735dce5a7772e25b57c69f38e728073213b7c3d1c96382f22cb570fea4890ba1c9086a327b7e24cf1e58514fa6363a1ca595ea9c66cc4a8289 SHA512 96bd2296b24b710cf4a4eecabf3918cc49fb70e859989074d1c07f16b48dca7e2439a4f5f00e5e2283598216fa574621cdb69c78d7a3e7ee9bca144b3955d4d6
diff --git a/dev-python/immutables/immutables-0.15.ebuild b/dev-python/immutables/immutables-0.15.ebuild
index 5f661a4e7c35..2b0a05431a20 100644
--- a/dev-python/immutables/immutables-0.15.ebuild
+++ b/dev-python/immutables/immutables-0.15.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 50139a3df8e3..3bd7b74e3445 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,5 @@
-DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
-DIST importlib_metadata-4.6.0.tar.gz 39664 BLAKE2B 62278f46b0fb3428384ab52696de724c0b13409d2b80a07885beab34019fee9d8bd49c096a0b71b10801941ba9d3e66445acbdfcd589e6a44cec5ab7855dabdf SHA512 abc98e3dafc51f1c02c6a2bee8134c17d205d3ecaab301c0abf9a5e1bc0454fa8ad316caf78d764db88688271511f954c6eefbfd91750b5c026757436c63fbdf
 DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
-EBUILD importlib_metadata-4.3.1.ebuild 1279 BLAKE2B 9ccebd49fbb6f0af8c93beb89040b67f844b1311d089bfcda67790f900424df84830fd7a09d9066cdd8c84abfd5269082217fc7ada354fa757893c3a563d99c6 SHA512 594b68ffee5b91fcbf1577288f0b35e70e7567a93d3a99ba7f6be60b102ea3ce66d0c1c059597b2699d2b66748cc8f5de7e63cc54bac8dbb25f21ed6a545dddc
-EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
-EBUILD importlib_metadata-4.6.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
+EBUILD importlib_metadata-4.5.0.ebuild 1262 BLAKE2B 764a8124c532810fb8f76ea3fbc1a2ce68a94f352f4ec27595f99d42a9fdee037eebff73492f047bb68b44c5640877fccd715a19b5ec0e33d543216f144639ad SHA512 bae53e2a534148b86edcfc8feb5da606f298a4b8060a0ce26de93feedf9a9224b8c52f66421171d998504143821cc7fa6fb8e96bfc05ccc1415b50d09c03dd10
 EBUILD importlib_metadata-4.6.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
deleted file mode 100644
index d9c8a5523fcf..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
index e583ebb91129..6f7bf5590182 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.5.0.ebuild
@@ -14,7 +14,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"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
deleted file mode 100644
index e583ebb91129..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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/typing-extensions[${PYTHON_USEDEP}]' pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index c7f7e597e691..1cb7367fc3e9 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,5 +1,5 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.2.ebuild 876 BLAKE2B 037c9c8a54818b3325dc5d391187796f680dc11ab51605c48660f638a75863702de10f44187a6adae4a53631d023cbc0ad75f0823f21741a9747b9412d909d5a SHA512 c789368246b06892d92b69288b5881b94f80fd1ead3dc83e9dbe425a81064f066542cb5c12c6e8bdcd5325296d3673a908b49f72c9c01e0f894874a87a37a17f
+EBUILD ioflo-2.0.2.ebuild 883 BLAKE2B 6e5a60293a28646691a128428622f66e5b3720d59d5393627e0c61cce95b154c136f8614db8eecc77f025381fc9647f1917fcedb06966a3b17e98df72fa1ac72 SHA512 4ffb6a13d7417ac6ab6dedf900c288aaf2933e7ac047b78ce6566222de2ef023d76353e64cb11d62ee0b070746408a6e27b24ef14b993aabc6f5ef969875e268
 MISC metadata.xml 493 BLAKE2B f303d71fb596699fd8867406fe983144371e9da8143c3ee4dc4761f466503e2f6c38dbb81195d9f7c3c2a3eb40354d52401f66c231afc24eeba112966ee7a686 SHA512 2e787e4dd8f0d9f212da69c25f4a58e609d120dff641405708f08d206b07249acdbac2d6e151379c54f5c960e340f8f31c986f231fab74986d1db71539a87436
diff --git a/dev-python/ioflo/ioflo-2.0.2.ebuild b/dev-python/ioflo/ioflo-2.0.2.ebuild
index 368df270f7b5..a438d7011107 100644
--- a/dev-python/ioflo/ioflo-2.0.2.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0929696f8504..0e0a6f02fd52 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,11 +1,7 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
-DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
 DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
-EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
-EBUILD ipython-7.23.1.ebuild 3838 BLAKE2B a48aec0e4fe0de58169bccb994bcf0c19d8973d69496e2c19a4c9f8463ba76aa79312548d59bc7a11bb5a7ec6961c5cbdd97e05094cd7aae4e53928e5637aec8 SHA512 de1faf13bded5832d60748b48e98344a9e8fefc47bc2ff0e0090fc2579ee2d760ba65546691449c1d86d95de1a27681ecd23ac7de42e34f21449060310f79ddc
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
-EBUILD ipython-7.24.1.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
+EBUILD ipython-7.24.1.ebuild 3838 BLAKE2B 26db4ab35ee3aef7ef4c604c2ef6de13ebc998a6b6cf37fa4793cd7984fda1e406521aa8f11cf6eda87eaf2e840672fe48e6ed08f6490cf57cb474fd3c1bd056 SHA512 d6eb9f9cb7a5b2c537c65cfec76822d24762a42bcbff0a5ebdff6e91a5908986f3732f9e8dfdf03f2cb9ad151fe3fbc615cc63e7943afa2edc1ae08f309489ea
 EBUILD ipython-7.25.0.ebuild 4171 BLAKE2B 69e9ac23537c108dd0c07b3513c8b9324fed108c61a20ec0f908f906a73871ac285990c8baaff46e563c4cc6324f58214cf4b955dced990a8d6754c97c6397a1 SHA512 3e34d75deaf322826cd4a4681e8ee30d4fb566ff71150118df6ae3ebc489633da6dd705b005f7db6a7ba81b6acad0a8da4bf62d982a4b2a81994cb2f3f1c1ee7
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.22.0-r1.ebuild b/dev-python/ipython/ipython-7.22.0-r1.ebuild
deleted file mode 100644
index 657a62aa4b73..000000000000
--- a/dev-python/ipython/ipython-7.22.0-r1.ebuild
+++ /dev/null
@@ -1,135 +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_{7..9} )
-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 x86 ~amd64-linux ~x86-linux"
-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}] )
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.16[${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
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-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.23.1.ebuild b/dev-python/ipython/ipython-7.23.1.ebuild
deleted file mode 100644
index f0c9377c3818..000000000000
--- a/dev-python/ipython/ipython-7.23.1.ebuild
+++ /dev/null
@@ -1,139 +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_{7..9} )
-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 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.16[${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
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-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.24.1.ebuild b/dev-python/ipython/ipython-7.24.1.ebuild
index c085c76819cb..1bd68d6c4693 100644
--- a/dev-python/ipython/ipython-7.24.1.ebuild
+++ b/dev-python/ipython/ipython-7.24.1.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"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index c42f407abdb2..ad63538b3369 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,3 +1,5 @@
 DIST iso8601-0.1.14.tar.gz 12722 BLAKE2B bbf56603d976d9f015ce04ed61c246b1b57e4edce1a912ac7ac5c932d122ca3855e917a7993b3e2d7ee6ba9ebbc9be6c554e69880abc30488698d8c354bf8ad4 SHA512 a461eb6cd011fed1ebec583b80ecf85b542c80dbdb4ad0213131febe0b58567bc0852283443c87923662b85e125ab66642b876b16ddfc3698445dd80e67e0720
+DIST iso8601-0.1.16.tar.gz 19599 BLAKE2B ea09dc8f2d339de895e420e1efd6207b7138ba34b37186d86df099fc404a2880b146e20b904cddb69e4dbe777c56b41ad6e04191da8d2062d87b37af4e61c124 SHA512 b049de4c5fb21bca2e3183e82c86149ac7cab684ad8c7281cb8ffc2c0e53a86b00f68f260cff659c19f8814a35970462d2dbd06b21bbc42ed1507b583df7e25e
 EBUILD iso8601-0.1.14.ebuild 544 BLAKE2B b9b9f5f9a651864a618841501eabaa0e5f5c3a1d971b72b4fc6940c5382b7b80c97eea88deca23e2b682fb5b856ddaa4f1937d460d2c5646475811ab0c7088c2 SHA512 8f91107b30a8ea4bd58efb1f8d9108a0923b7f0642eef90339be9e93b831e44f930135749c415490ad22e5522070e8d015e33d81709650018bdd1c0483fdca92
+EBUILD iso8601-0.1.16.ebuild 551 BLAKE2B 0169a6880af0657e0ee28a84424503da6a6baef62a1e66b72da8a4c88b156f3f64a1acd11cf6b65fe2735e6f21999cf802f00a59bec5096390d5dbc02c0ebf8d SHA512 f3110bf5907f3dc850a91cfc2ac8b36c113772d59b0ececad0e4b147446200f8f7850d42216d6b9fa29584aa80cea5af975020756cb2d29775937e241d18e3ee
 MISC metadata.xml 394 BLAKE2B 11ec2e471953befe48f94577e708d873fc6aeca3ea72af7ae5d069badb8bc87511685de5acdc289e4d77cf1cfe99ec9ac16a9fcb7edba73adb48c8df7b2ab634 SHA512 dc0926ce7410798e86865bc067798027ec1b4be5fa9962db67248cc806cc3e5486f288df86c045bbc938f66a941472e49f2c17db2da9b61ed3ae5a4fe2f202ea
diff --git a/dev-python/iso8601/iso8601-0.1.16.ebuild b/dev-python/iso8601/iso8601-0.1.16.ebuild
new file mode 100644
index 000000000000..cc7b6b92433d
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.16.ebuild
@@ -0,0 +1,17 @@
+# 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="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://pypi.org/project/iso8601/"
+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 ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 5e3c2f5436c6..5ac91ac9e822 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.5.0.tar.gz 15453 BLAKE2B 53a3553f09a6c33734684477fe1228b159269a6a7e38aa8381af54f17162d1658be1f91157fd092544141bd086fdded32bec2fa0103c4c6978301cae3e199a04 SHA512 da566f1a6d8343d05c51ca3f4635212094ddbc84fe9b460dd7630030a9b5bb28c97ccb0de5928da50230a182985c7e5bce8903d4019ce5afb89067ad938dd152
+DIST jaraco.text-3.5.1.tar.gz 11579 BLAKE2B 22753a39b839b575796952e12adf69a10a876d45240c5461f72afddb14d58bbc8396565fb094b3c314ab6d9fbadd7008a7dd66e788f54f17189a48c54b980f1a SHA512 468a2338b82c4352dba0ab40fb774329f115010fdf3633adb860297dffc64c54fb006f85e4d89580923c1e9136168bcf9fd689e33eebee32cd70382bb402debf
 EBUILD jaraco-text-3.5.0.ebuild 774 BLAKE2B 6e34a9d25f5a7772314604ee0c6e96e05911569ebf859a2dcf5c4c8d7ef477b8735457d3fc9c9fb7263ae67dfa03a0210402a94c73185ff2c0b760409ebaf9cb SHA512 d41ad8f81b160375f96758145af86fa1e5ff70b0f7a8af500962bb2526c2db037ba1138d575608d4e189e389dd2ad1bf4d3f2c676e95b4d4ebe9e05d1fe39b7e
+EBUILD jaraco-text-3.5.1.ebuild 778 BLAKE2B 9b6a89284e7842dc082b60e64b706beff0cd75776330647659c305dbd5453a9dac0a156de843129a4cb1e69accff453b76d316902529e83938958b462771a084 SHA512 b7a99ac4a55c5899907a11f29989d4ef6b020c8fdd1671a6e66e1a7b27de4f23306694841dfcfe29a04fb49e76580ab5a54056d64b1199a19e889b9b8e4802e4
 MISC metadata.xml 655 BLAKE2B 6bd01547bc069cfdd2a6d8ef05d0f62b17e54b54ac3d45ce3c66d765a5db88c52750d3f80053efe8eca8c36163deb36268e5a1683e65813d42fe1f033306d4c5 SHA512 94ad62364c1159d64d69d8781ed42f642d3877c2e6776f0d863d6b89fd085199d03a65f251b9fd1c21628d3210160ef120250ad7956d1589b8e06207831d2937
diff --git a/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.5.1.ebuild
new file mode 100644
index 000000000000..0c032b9a238f
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.5.1.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 ~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/jeepney/Manifest b/dev-python/jeepney/Manifest
index be7d106abff9..4fd6bc448415 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 DIST jeepney-0.7.0.tar.gz 61236 BLAKE2B ec477ed0d96d7d82a256c7f62900eff0282ebec4545e30807fd62cffb419ed763fd8042bdd4d72c6cf43ac09d24af9cd86797b1baec61ad5965e51b3d669175d SHA512 b1fac480da0d8798b28eae30cb22ee97d4f73a11922f7b1bce86eebf938c2980414c2d026ef5a1cdcd95813724873700d348b04ba337aaac0706b2c8b38ea6c2
 EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
-EBUILD jeepney-0.7.0.ebuild 1205 BLAKE2B 4a9f93c53c0a5fe4eca0326046ae645c10306bcda750a76b11389f7d4b1c5001586f526db5d5c1a4078242a380c68f6867de68229f3a3e79abc88f26caa7c7af SHA512 c4d2a7747a95b4cb098940c881fbf5e89658bbf00e5abc1e2aa424bd8b2255f8c06f1de9a201be9099d370d7e2a1b15f3acb0fd70764198288ba24745f7cb1a5
+EBUILD jeepney-0.7.0.ebuild 1222 BLAKE2B 27408acabff65e66ba59ed00fe3ad21848272223cdd88fbc091af00bbe6857927a4c248b84555a33e40d54cf8fa95a8378da4f08a73d2311b63c511987c3d6c3 SHA512 4b3f4ef7784bbdd0ae264f5678f37ca325744aae3f3565590ca8425549485ba386bedeb6c83e0255ab132692f524c55d35d8d5db25a7146b09a3f0f8b471758e
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.7.0.ebuild b/dev-python/jeepney/jeepney-0.7.0.ebuild
index 3a00e0fbbd6f..b09285f5ea52 100644
--- a/dev-python/jeepney/jeepney-0.7.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 8b617c79f1a3..d7303d9590bb 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,7 +1,3 @@
-DIST jwcrypto-0.8.0.tar.gz 81782 BLAKE2B a3cfb04f099a747c365f870c53d75574cdfaf8b98373f37cc107ebca956b414b7d7cb78f8fcd6d3964528d3bc8a217e5c645bf6e82531e951dfdd9ca03472111 SHA512 784134d27ff7abd31e1069763969513ed45f81fd2c242b7ff7036413c35ef374d535eae0123f5561a8e4eb2630cee40056d1c66454288e1310c4cbedecaac210
-DIST jwcrypto-0.9.0.tar.gz 83891 BLAKE2B 873f6764d13ea80e8c4e1709fcf4e2a70cb59834521154b35cb94a51ce5cbfa7f4e2d079a3c096b013eef6f3a6adc4935cd3416b22f20b9edce01e95dc1910fb SHA512 6a2670aad8a3db926c4a6e54a62f3b698b717a8bc1726ba8f13e2415f574202e205cab76c79564280dcb2b3b4002a7c03c172d20761c70f76dc007a1ae26dad5
 DIST jwcrypto-0.9.1.tar.gz 86363 BLAKE2B d5920b9471870855bc131c171dc5515cc23fb9b94c38b33ce4894bcbe6fb5d0fa87e8b88f6470b8d1c1a1bc158d0dd09f51ace50baab03c8a8df59adc6e7e11d SHA512 245221d5e570918c1db9abdad72a0b03fb3fbdbb4db46ece441cbd75d43246b1b35bfd75e20718b8fa125bcaa85088cd776a7c204dd68e51e63818ae438848eb
-EBUILD jwcrypto-0.8.0.ebuild 737 BLAKE2B 2b2cc0dd327b7e3c3bf04fb948bedc4aa129d233d6df7ff548a40e2adcc298b6972b5773db31a11a5703eb512082a31230e35af0ae05f55b19c2a99db0078eb3 SHA512 b577f5e61a310740465de05e5a2dd62949a7d70993905c3a9441e213025de1561498971a4433dbc0d9479f505d12b0f69a533d17fb13b532d4719c3ebe85a1e7
-EBUILD jwcrypto-0.9.0.ebuild 821 BLAKE2B 69eb2cf6614eb8b0c2c689999f4bbb3e690add1730aa78e973d07e4209926bad015b0c49c85d73371372db4b58a61eb95949a3de815e066226d0012aca114ef1 SHA512 df3c770bb7f11b709e2dc970379b9f1bceb71468f4bfdd19ea780f730c86ae3750f4ce05b975fe764cd537aefbca4ef787e6105516f5d9384f7fba64e01f7dac
-EBUILD jwcrypto-0.9.1.ebuild 821 BLAKE2B 7b857fc0570fb85038d4aedea4b2abaf08b506fa222eb96df27c46cd727e175cbadf3345ca44d8a8a9981566d4d10361c178a3feeaa8a5f97cbd203466b40f88 SHA512 d91586f4428301b3bd14d5af47e9d88ebf9baff6ca9eb5ce2e98476107d8c3229217560db7fcb8e4849c188e4d30f294ef131f29b93b789c91823186325af50c
+EBUILD jwcrypto-0.9.1.ebuild 819 BLAKE2B e13a6aad1792fd51ffddb6eb4238c2502fdfe8fce1b722cfcfabd4012c3cc122d3757f4bb8e54477142fa2e021908bfdb2a18e44e2403f305a7ec7e1fa22ce84 SHA512 cd8726a1e8950ebc74358c95cc46a4d0b6324e9a38a1758b8afd2da59396c34bb39efea8b0d867e2cde8e58b6fd55665df7feea613df06748f98395927657d42
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
deleted file mode 100644
index 428fcc14e898..000000000000
--- a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=">=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
deleted file mode 100644
index a3d021af572a..000000000000
--- a/dev-python/jwcrypto/jwcrypto-0.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild b/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
index 99fd185f157c..8e667e7ee75a 100644
--- a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index 3e80559efa66..01ea8ee6a1e5 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,3 +1,5 @@
 DIST lesscpy-0.14.0.tar.gz 186505 BLAKE2B 6c7f4691c352573d081436d5f31ddacbd6b054810f07feafaf654a5c401d98c3274f86f03f68534f661b79bff3d708eb09bfdc0e3b9e800b7e2091060e64c370 SHA512 333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3
+DIST lesscpy-0.15.0.tar.gz 176879 BLAKE2B 942775e090d3fbc8af033163186d43650bf20967689459bedd87dba14063c199fa322a17310fde422e3d45370cc7fee3482ff2a388518c49b2b16fb40f241a69 SHA512 3e225dcd435b9fbf9b21ad7cae86612eee923946b0bafd502221a95df4df739bae8df62f33fe77a90ee8a1c12de05ba556b2d76a95b85c9d68d27ce6ae46a747
 EBUILD lesscpy-0.14.0.ebuild 487 BLAKE2B dff6bb39f3afafbe11a70f8dd03b14abdb0e5b6664dfd8f236d3688a88608400aca102083aef456ec4ef39a73b175ded66af81d499a6546f9933d527b6604653 SHA512 d150b3cf373c9cd399be71e1e5616552bacef307e7bffb20f113cabaf32143e1b0bd7ab4c4cf26b0c6fa017d92e6e159d9e39fae24eaabc56a15504d3d8aa280
+EBUILD lesscpy-0.15.0.ebuild 491 BLAKE2B 6bfaac93aa9ea6bfda50ca7439d141098a80993781338bca8ffbb4a0d730338f3d8d722f93337c6ecfb202d1ee3967a11c77f605c71f5bdfad851fe616ed89b3 SHA512 e7259409d3e3a807c6dc572f066dabb356cebcff7e83c3663324ae834c72f5989d3fe4c81b4c4b11341687347b405ccffa72892896998262d88749c8d0882700
 MISC metadata.xml 441 BLAKE2B c9c2bc6984c96c07afe8d866a5206ea1d64846137321c5d84c281796b3ffb240aef443ce2a380e44fb49d64ee05ac850aba23b83a2e4d5529c75747dbb55c248 SHA512 88fab7282fa26425cd6ad9bef796f763f80ea950ad855c20b1fcf327dd5b0cf3d99177a56231808fbb5f0358cf41abcccfbecc25e8f47e079ea977826fb2e95f
diff --git a/dev-python/lesscpy/lesscpy-0.15.0.ebuild b/dev-python/lesscpy/lesscpy-0.15.0.ebuild
new file mode 100644
index 000000000000..355dc111b941
--- /dev/null
+++ b/dev-python/lesscpy/lesscpy-0.15.0.ebuild
@@ -0,0 +1,21 @@
+# 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 compiler written in Python for the LESS language"
+HOMEPAGE="https://pypi.org/project/lesscpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 666e3ae5e369..3725c7c40c11 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 463 BLAKE2B 27b5db365d378f7d75a97bfe3c3b70c4b4d9ffe944f7fe5dffb7477ccf90d0c9cc18e9e7cc24f760372d74c01aae227c57a0c26a128f6390f7189deba92d7c9c SHA512 6321ddb395fd4c05c8076f5aa6ccaf133883afaff3bff98b0818175e693170eb5cde798cf2ad8c9d7fdb8e990d362dfdb4399b6b4ff001dc202d69bc3b935097
+EBUILD libarchive-c-2.9.ebuild 541 BLAKE2B 7d61c267e689f3185bbd040faa25aa330cce37ba071ec1656af63107c1e7212246ab7f25e8cd9d1331028153e07eb278be18d7cbfb6178d3634274586dd438be SHA512 11edbab9d4c5b0ffd79b13d2e5f770e7c3c33c670a9bbe122df057154c01a60842dc955bb20f6a724b3717d95273782adb5fbc9f133e6e67c1fde214b8168444
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index 836c869f14ab..be0363504712 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python interface to libarchive"
@@ -13,6 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 RDEPEND="app-arch/libarchive"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index c99008829fce..64b43c4833a3 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,3 @@
 DIST apache-libcloud-3.3.0.tar.bz2 1811722 BLAKE2B bfdacdda6bb39b3782915d71db6d736caa8a1d57c5120dac9020a1c4923ab08bf8983916fcac15723139b073858efdf178aa797dd592d7534a0b6ff35f8fc5ae SHA512 286ddd79b14633ceb59e1a4b015760a1e525b0282f3039f16c2fa4de940005da5fbde1b8262027103ca91c9653baed22d61dd136ddcc2b6886687ad8b27f3ea8
-EBUILD libcloud-3.3.0.ebuild 1193 BLAKE2B 873c259778092c31bbaf41d1a61a7193369f012204ef958dfe998ba1d32459933f8777d070bf33aa7ef59f8d6d918a04faed9158d3706e7510cb5053cc12df4d SHA512 393fea6dc4f23038c93f0d865d23a6672e0427ce12f93dd4115132c41f2940a5558fa192853895098c49c46688e56dc9b17acd52ae09d84ac84269ccc407a3e0
+EBUILD libcloud-3.3.0.ebuild 1200 BLAKE2B 3c278b434fb196fd1b39dab3962daf133aed125af9b001234795b6257a05c5de665de5c89f7fdbb4e48ecd6fe8abd805be2e02d2ee9ada49b5733f512e5d85a4 SHA512 70461bcc5ba5332259c68e18373736110f111148dc80d6df98b450ff43146ecdf5a9eb7f117b092f705c0535f7d5eaaf9727d3f8b4dc21efec48ac5d1b5bb9bc
 MISC metadata.xml 324 BLAKE2B aa05dc2d968f9550a607cc367c5ab6c3426a41e35cc9a29baaf25050978543fee5bdd676a4606c45fd9104ab6dbe2f2c2bf8f7c45d1b95805503f1cf20668b75 SHA512 809416c2bc54a84624712c77982b57734b6510c66dc731f517574949f13b2aa37b97c9ce4e5ea649262a4731a435187f271d0922e87bc647b2e696bfb40eab0d
diff --git a/dev-python/libcloud/libcloud-3.3.0.ebuild b/dev-python/libcloud/libcloud-3.3.0.ebuild
index db6fb2bc09cc..eae3be8212e2 100644
--- a/dev-python/libcloud/libcloud-3.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 3fa92874c4c4..8bc71c5d64e9 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,4 @@
 AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
-EBUILD libnacl-1.7.2-r1.ebuild 624 BLAKE2B 559734aafb12fa0bb12e65a8127eadceb720cb24ccd55522c3af276966fba962caf4e243c7877ad0c68cfbf23c9f171077d635f56dd2317159e830addd3dae0f SHA512 b42efbfb6dd6c0418d91e93e8c2342b2885b4cfdc829f17060b90d6cefb08475f49fe0d87233cd370c7c0d1b8e42b0449bfc1bbc576e83871a64042bdb2b3a50
+EBUILD libnacl-1.7.2-r1.ebuild 631 BLAKE2B c49e454bdaddee79475a575bb3012bb1ada8dd19cf3944239ae2084bf40d1e8c708646b9d5bf8eb53e2df916058c5cb7603eeda88b80893da375a07f003db8b9 SHA512 985a536440b91910563157bd151a45b566a5e5398cecd6fd86f9878334a2deeaefd2dd44d36d92b44dc223b6e684969092af167b8dbbd33ddcc59c0cac86d227
 MISC metadata.xml 495 BLAKE2B e77a0ee4b63cdc8594ff6dff8416db824eaf4a3fa50f143bcaf2c71b5e216078cd41ece0aad491240392896a06bf4dfb7f73dbd1e7e504999e1c32b642910537 SHA512 dd1c019a0685be6b3e1b6f124feeb0dd6ea0678e1f243504565bf467c62c3bbf4901990692b559c1e869d08bc4ee6338b8d7ae41410bc6a2d904d53283fd49b2
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
index 004612b55001..f699c1fc60b9 100644
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="dev-libs/libsodium"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 508e82aeb44d..62f858fcd395 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -8,10 +8,13 @@ DIST libvirt-python-7.3.0.tar.gz 216823 BLAKE2B 2f7ff569e1dc05ac013e21046eab2629
 DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a6bab0e252970d0a952411b91d08141edb1a7b53a7404e29426558502dec3f9260bfc815209c524a761b87a70004acd008 SHA512 8467a0af37849b64aab33ff1083f6feb82c39f6c732f53f407037d3f7add5c5007e16d5906e268576239d61ab8d871356fd3e476b8a64fa7aeb51b018383dcf0
 DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c58bff32cb59a0c3b18a93ff309dcfd2b60915c52cb907c3961289427da5e73c4cae973d4204c352b5892222255e05b576 SHA512 e266b04604a21c0c35cb6c080ca5279f3162dfc489fd5ed9542b9ff49567b02074bcac135897d1a8f2375a744c000dbd93b67831621744c2f596b16ca9116d1d
 DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
+DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
+DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
 EBUILD libvirt-python-7.0.0.ebuild 1191 BLAKE2B c1030acd572cf307d85b13e1bf5ed2bfaa165da32ce231d2d74254359eae67d80733349677a63532ea2e282303cbd9e9954f13a2d401a8db04cf289acd770d61 SHA512 7a60511c786ff65894121a094e905f76d018fe8163d3ea526bf788fc8beea81adc067658d82edf469615989b52e0216a469d7826855c481efd2b4ffb60c43496
 EBUILD libvirt-python-7.1.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 EBUILD libvirt-python-7.2.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 EBUILD libvirt-python-7.3.0.ebuild 1193 BLAKE2B 559037c19b568e34e157606b2264b933ae7a9e454b1717aa173799904ed56150c747b085ec4bd148cfcc496bbe0ceccc68ffa1f865a719026352237b1fe35ffb SHA512 d7e6b0457402a4e831e2f4286648c4cee086f7f66925d25ad4bbd4ee050123a3d953879edd094ce429fb97b1853e783e62c0be582a2e6664d8820912b9d44d6c
 EBUILD libvirt-python-7.4.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
+EBUILD libvirt-python-7.5.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
 EBUILD libvirt-python-9999.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
new file mode 100644
index 000000000000..f4d733c9c871
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index cfbd2265d868..476aace01939 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,4 +1,4 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
-EBUILD llfuse-1.4.1.ebuild 796 BLAKE2B ab72bf58f469bceadcf53bfe1632e89087784a229b9b223f09980cffab48030c2c08ab2b3515aeebbff4d6646ee70fd5e9a6c41fe6883ecace88d27647aa1707 SHA512 6c72b914d282a9ab4aca510bac58628ba1a1ea763b64a7e0e341556575355b3f91c2ea9d50f60f3fcb03b6730be026dd07bef015730c02ec2bf2704dbfdb25a1
+EBUILD llfuse-1.4.1.ebuild 797 BLAKE2B de7cd0e6cd513c2b47eafca035da4dfa97b4ae3cc21bcafd4653476906878047ae7cc74898e102ee6343e14f03e6abccde0556343c72ac8752b0f41e5764d062 SHA512 9507cb950d0ab7746e5c45493700c1b3a8498bd7633628c30e31c1bf433a060ad332495820b9565011680921dd5ee794ca8d28787e52f4e23f0a5a3f56c50ad9
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.4.1.ebuild b/dev-python/llfuse/llfuse-1.4.1.ebuild
index 0b4527b67c59..53c01e06a1df 100644
--- a/dev-python/llfuse/llfuse-1.4.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index e60e31891994..765ea625fa70 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,3 @@
-DIST Markups-3.1.0.tar.gz 20146 BLAKE2B 426c6f050868e423eeb7f01cee930b088c4b6f7748b7f198f03880cb7d6cc237575c6253d40631aad1601e193ff0e2b587906492c07b953903ee12422e06cb3c SHA512 eaf99b8f521dc93008e0e2519e5c6e8885609457739378d5af6e3aa044a9dd1370bf906a061d8a284d8ad4f9c5196c01a6d8dde3a4630898fe4711154cef7ce0
 DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
-EBUILD markups-3.1.0.ebuild 928 BLAKE2B 4327e366240016b1a138d54c1b64df9f6f07a2c63484e96431f3157f6d4b796d4f43e6dd78b05b0514d6476b6cd5feaa996e931b7b194b19bd24b081627cdb82 SHA512 e8336de0269333efddf51d09a28a9baca1acd91a4155e26ce40c646bdf3757092f260c307f74c37e5728bf8c607dcd1488aa807d1903759a9580dd4d543fa21b
-EBUILD markups-3.1.1.ebuild 980 BLAKE2B 7b83ee24ab073c39cd7c6727791db04443426551b8c47b3525d3892d6b9ad7e47f4a0e60d1c6fd9cbd4f5d0df0aa36da68aa3bee4bdf59d393ddea28b6f3b867 SHA512 6a8bcd678feb239f4bb4471e92ec9c5abb0c397e3a7f0469cebfb4e80d09e8d9deccbc6586fb4906767d3e7a9dc7d8c4e724a12c4e71ccc5b096256702d90be8
+EBUILD markups-3.1.1.ebuild 978 BLAKE2B 5b00c69a8ff4438686d1ae12874b9c1e8628f369b5eb80a7eb10fa336e4308220aeb333144c77b090d2ad14fadd26882269e5735e546e0572b3f81cc18016962 SHA512 370eceb9be0241f38e677dd5b4ae35c9876f54dbad0d36476e136230302cac60079bd70752d92382a321fc72bd73b2559e02702d977c5cf9536a563cbc21380d
 MISC metadata.xml 680 BLAKE2B 863bfbb8aeee26e72ad3c6e9cae490e82b67ed54fabf3adc11e98f8894d181e02cb0d174babf003cbdfec1f8a4dcc6e07df47f952683a46e7a4f1c6e3bb2e8d0 SHA512 8e71b06846e8ec4ce1cb2a4cc9aa4e172912ed9a77f76d6a7e9b475432e65d39fbb130a375f35ac429c398ff4d2b32e5ce99386668a88a8cf715660339a961f4
diff --git a/dev-python/markups/markups-3.1.0.ebuild b/dev-python/markups/markups-3.1.0.ebuild
deleted file mode 100644
index 6ebb4c472a0a..000000000000
--- a/dev-python/markups/markups-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	https://pymarkups.readthedocs.io/en/latest/
-	https://github.com/retext-project/pymarkups
-	https://pypi.org/project/Markups/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		app-text/pytextile[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/markups/markups-3.1.1.ebuild b/dev-python/markups/markups-3.1.1.ebuild
index c18b011171b4..91e91363b010 100644
--- a/dev-python/markups/markups-3.1.1.ebuild
+++ b/dev-python/markups/markups-3.1.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
index 3e501f8ba203..14d849a7f19d 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,3 +1,3 @@
 DIST mergedeep-1.3.4.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
-EBUILD mergedeep-1.3.4.ebuild 513 BLAKE2B ce6dadfeaec624baaa5305161ceb168d7ec157091ee0b4f521285db6eafc9e565acc10b241370ea3862ed42ed156a07c78ae96945deaf45000c3608f30f714af SHA512 9e729a875f6e5fa18c1bcf53569b29105d075277ea5bb4c80682ac5e867cbb6751b6104d3c50bb86155162c0cc1ce90a1d0377a57b5c4b826905e47396ff366e
+EBUILD mergedeep-1.3.4.ebuild 511 BLAKE2B b867f6b03bf4790f59f766dfe79399d0f4f1210712636a874de1d507da94f22dd85502740718e48a1df8e806a0ec426f6030c744e8f178206793a41e0739a367 SHA512 353de9220ef2b5dd4ad243397bb4f8ea667f96f8a5344cb8c03231dcb80a8450a54313ca034c8ed6c355a37655ce2466a42b96825c39a93ddcfe220ef067aa8b
 MISC metadata.xml 412 BLAKE2B 085413a8d8ed81d9d38d33f798513badf5c6e0c87c57faf17d07ceeb3e854e3389919508906001a7bcc9a181431780ab6358d85bb01b14ba7290e126c4622e24 SHA512 b5a17e3b5d5d434d12adeab6d6cce8f941c49a5da2ee9ad24a503fa80cb33c7b6dfab9d04cbeb004578802ae1cc5e8cef2b0b8af0ac45f7e7e6741c6a6d8339f
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index 0c2aa596d75d..691a71938283 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarketm/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source dev-python/alabaster dev-python/recommonmark
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index be238c017213..e443fec2b02c 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,5 @@
 DIST micawber-0.5.3.tar.gz 34550 BLAKE2B 045eebd018d8b1f52cca9f043cfbc8de528a409e42ad9f785cfa00bbe223546c98d2d182ed2dca0047b3e73428b318e8db712466813a781154a8a6654d8cb9a4 SHA512 7b5c7e3bb5d92a50a3488229c59c5ae95355410cc0aacd49be2d96372a2d6ab9169aa6ab066d49c72e6a8b80358b3937b358c4bb8027779c5132f0929747dde8
+DIST micawber-0.5.4.tar.gz 34963 BLAKE2B 1c311e2d1c8f32f81be466893bf1eb34f8c38901b168a97c88f2043aba1624fa8b6d12460c7470c3bbd720ae29af23ab808a9464b13ebf5ec193f5818b6f3aa1 SHA512 26879174071256fd3f95e92b0ea01b11a44eab767aa7bb43ff62221212ea0ab1ad33b67060e2dec33963abad599b864573f6a9d5a98fcd8f1a6633a3c73d7c80
 EBUILD micawber-0.5.3.ebuild 670 BLAKE2B 2dd787f7ac0e6835e177affda8b3c8ea23fdcb784b86946f8c019bbcb01a0961cb7c5d3433c0294903703344a11cc09ed67f5089529652e9c2db51210db50a78 SHA512 c0ea1c2826099c4bfe62a7f36a84679e017f3f78aedc0385a9d48904f898000aa596fe283621840c56c7d6f182a3bd61c53ca05767c9b5c6484513b86b25438d
+EBUILD micawber-0.5.4.ebuild 671 BLAKE2B 2e0c8ccc38c08c52d034ae6e5059bd4e2247cb65a9fef72650c6051fdee2d35aee685935218221144ae99bc7cc939a4a989d62cc8fbb7ac6014b3dac67746c50 SHA512 8128b2c9458588c20d41cfd4e2beedeb494ac3c9d429aac713e4ad6c5b1b98996b80db29ea76399a17e3edee3ce15155d8e31d9d8f60c509f7824e20950f363c
 MISC metadata.xml 392 BLAKE2B e64309d757450287e941aade812040543a73b56dbeb26960bd1fade3bd0e8b45a3bb04be4f4f0c9720c6ea36967d9e9715f793cfd57435c64c7dece1986761ca SHA512 210939afb78c7bab48debb24886a5b482215ba5fbaac0e7d7faacbf6781e6d1766ff97e61d94070048ea13d351996b5bd2e8a56e9395e8fb47e1f63e730f30e1
diff --git a/dev-python/micawber/micawber-0.5.4.ebuild b/dev-python/micawber/micawber-0.5.4.ebuild
new file mode 100644
index 000000000000..268957d38262
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.4.ebuild
@@ -0,0 +1,28 @@
+# 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 small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index d109a98df74c..c2d12ccba9f5 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,5 +1,3 @@
-DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
 DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
-EBUILD minidb-2.0.4.ebuild 442 BLAKE2B 6b5092dacc1675cc8b3a21bdb02e905e61afa543d727fd2df24d175a97a26edd7761d4a82a19c406e491717f351c2adbc167d8153b07822b2de1c10f3124d005 SHA512 c1b9dd78e7aa88a9ec4889c229255c839019e76c9985cd8f7ee04aaad5ec4419e20b350a77d9368ebfe7b85334b967f501a0810c4ab59545359636260528f3f3
-EBUILD minidb-2.0.5.ebuild 445 BLAKE2B 31e66d4c48eb5b1c2c0bd935726e9f8b542f980ea3c87ed89dbfbdc5a5a0cd5287c5598f70e8f626f3ca7da0f0d70c4dfcd7657c1af594cff7c4f781288f7af9 SHA512 ef239c76a74f9fae588be2391565deb5a53f82cf3719f07b73c949bf6bdd0838338ca5fcb95169dd344e6007223a8a02c4f73974d457f16a5c5090541f25406c
+EBUILD minidb-2.0.5.ebuild 442 BLAKE2B 6b5092dacc1675cc8b3a21bdb02e905e61afa543d727fd2df24d175a97a26edd7761d4a82a19c406e491717f351c2adbc167d8153b07822b2de1c10f3124d005 SHA512 c1b9dd78e7aa88a9ec4889c229255c839019e76c9985cd8f7ee04aaad5ec4419e20b350a77d9368ebfe7b85334b967f501a0810c4ab59545359636260528f3f3
 MISC metadata.xml 446 BLAKE2B 46a86136a6790fb2e9923525fec5e8b52420ab0342ca4089f2ca7ce55afe41d96bf39f55fd33af8e006f65e15f59eed09e0ec473ab72041e6bccee8bb06c51a1 SHA512 b29032fafb54b53261e748273f5cee899a91a87e2480057eac9aea9f170e2bda001fbdf1519349cc8e3d411cd64a1185f954920f461c52bb8652d87286207d92
diff --git a/dev-python/minidb/minidb-2.0.4.ebuild b/dev-python/minidb/minidb-2.0.4.ebuild
deleted file mode 100644
index 76b8f51300b0..000000000000
--- a/dev-python/minidb/minidb-2.0.4.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} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Simple SQLite-based object store"
-HOMEPAGE="https://thp.io/2010/minidb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/minidb/minidb-2.0.5.ebuild b/dev-python/minidb/minidb-2.0.5.ebuild
index 7fcf72270def..76b8f51300b0 100644
--- a/dev-python/minidb/minidb-2.0.5.ebuild
+++ b/dev-python/minidb/minidb-2.0.5.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index a9c0ff6deb84..5576f4c493c7 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -3,5 +3,5 @@ DIST mkdocs-git-revision-date-localized-plugin-0.9.2.tar.gz 367301 BLAKE2B ac4d6
 DIST mkdocs-git-revision-date-localized-plugin-0.9.tar.gz 367850 BLAKE2B 0bf02b9de2b9ee8c4ae36548ffab85a9c880fc89dd5a4f39961093e36fc0b87b53dce8269400c804fed67f5a3a3a2ec45e6486ec80706be0651b9ceefe7de6af SHA512 488cd20e7ce8cd8df4c277f3626b8d628ce58090791a1b7e36efbdcacf6bf434bd4bc3e73f0402fdc8cb60767e6d63fac56a56b0dfd4728d6a49438caf5ad3d2
 EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1159 BLAKE2B 393def0c9eed9f7002691b5cca836933220ffacaf4f6faf783118e33a60e760a2dc3f482fe578a835a9e17bd01581f7f60992918ccfa15b74a46fcd409963af0 SHA512 a8c330aa29186821bba5061ad871896cc48aed48a9915a33c50108604d03d451725d220d8b3b24c54941da37ad11e80c5498e903e8e659e75bd7322dab094bd4
 EBUILD mkdocs-git-revision-date-localized-plugin-0.9.2.ebuild 1418 BLAKE2B 44467533c6c6798a632954e55a6021c9e588a1e00cdc1451b70d1e73b572a0e186b0da6b85fbb7bdd9fbce6ea7ac55aef865c1082cc966cd4765d6482cc3f5fc SHA512 1b5f02b39038855dc7d006daff0e68115a3ff6c36c46794b4c82cc79d209fb8c0d9bd7e36a409c56bdc9084c92cab4e613f2789765a7012507b87dfe71716ba3
-EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1250 BLAKE2B 5f82f2ff6f82d0dda5fd1617a9905e80058270ab61fe9506de4d68005e8401285ae05c481ba5e0d655dc962b3000ebe6f65d15cd8630efa849dd6bee47921cf8 SHA512 d74d67f788a065c29226631f13f7adef598b56c3311d76bb42a37f588dbde33bf0d463537a114c452e8fef73c7c18d9fbf6a1ddebc45b71791fe45e50a2135e4
+EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1248 BLAKE2B 5e42b07bb574e864f91516ab0c7cbf7eb654a2c5a2ac2bbc1511b583d833c43fd5b20658459d10be5a32a2424cc54b1ab96c14dd228154400dee3a97538b94e7 SHA512 b384e200cc1416b14aa71ee9386399ffac59d7fe999a8eee780ea4de34cc57055e3ca452912631a8ed3507d4eac7c37a6686ae2eba000e4d979c542fbd603bf2
 MISC metadata.xml 595 BLAKE2B 930979c48f81e50af6d892a4c66f93851d862cf0e0562ad6e6f9f903b4aa6db3a3d989e7ac45ac1d5f5ebfce27bf718e143587eef5890695c86c08bd66050118 SHA512 58e5db1bd1f0e6c613ba2957fa4d2d6ff34c067ce29a67bf4171235f38a4cbd57c5d8cc5e5687176f6ac270798ee9694a20dc64a8b720fc03119b5964f8401a1
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
index baec4d97e38f..6d56c59ced43 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index 70e39e6fc6c3..5a27ef9bdd13 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
-EBUILD mkdocs-material-extensions-1.0.1.ebuild 976 BLAKE2B f1c673db7e500ce0f76edf726ab19ac3c201ec46f8beb8ef6c2d9ecc6455c06ad566b8a3a6628a8815d22726c8c6090c68b9b952f60e000e9e7aaf7102e928ba SHA512 fa813a88adafcf3a35745902daea4c8b261f88639a64d9c25536f44470b2a9a7682f4a6549ae78d456a9626e6f317bdbeeee7bab381de6c53aee4b33053cd713
+EBUILD mkdocs-material-extensions-1.0.1.ebuild 974 BLAKE2B b0995abe000be9ed652c8506070c2f82806bc5fe7451bc3217d7b43f25e68ae32cf665f16cd89f032e71e9f93430d81775d52ea5fc1185a57221b96f07d5b6ba SHA512 b9842cd2c791675d5da3093ee7f79b0860a558804c0253e5a69104567ea6ce01cecf8b4e95f5869c818a61a16fc0ed14e7f48f26d90331836745b58037881f9e
 MISC metadata.xml 450 BLAKE2B d5afa6fe4a8633ec7e42f01e9a35054017e11b4ca346e18c468b96baab394803a48f2241ab367dbb30055f9851b29de055279b062e4548cf6b72a1191b0fdf4a SHA512 d3a77bbb34d2f31023ec3186a1abea8399d20af672a2241aa94019945776d51aa96f8401542fd1476a3534763b390f54715d950c17b5227088777b223c5905c6
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
index e61b975d97e6..3c8c66fb5539 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # mkdocs-material depends on this package creating a circular dep
 PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2d96eee25175..23e4d9511b9c 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
-EBUILD mkdocs-material-7.1.1.ebuild 818 BLAKE2B 8458825ae0286754a3568cfb3cd8987e6fcdd09043b218f340f88d38330f86cc56e91846b2c18d07186a3c7d8ff4b4ed23d30d800f67c7c7ab8648b3ed1a0466 SHA512 13a2b6a2783b3e6368c84a30898a799d9b2d2dc4cacb9a7e0ffc187312e7ea123c8ff9975986795748b353ac251e869baf5e45c016f54afec3138060680a3cb9
+EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
index 770ffe961f24..7d1393d8fe64 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.1.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index d5df45439a96..89ed466490d7 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
-EBUILD mkdocs-minify-plugin-0.4.0.ebuild 621 BLAKE2B 9e35cf1f1ddf1db3f5a29ed4099cf5b33392a55e6e8a5f4239c3e0c388d76e46e7bf68a4f407f816fa29f8356569a1a30c723c51d6b00093785a052b381451ff SHA512 76c3b5558d78f43803ce0a2dc000dc111705881be1f2c1bf6f4eb8c0cfd0afef2bc1631c17d7052b49c4a78689206654d091a9e39facff53b5ea6e22c1299aa8
+EBUILD mkdocs-minify-plugin-0.4.0.ebuild 619 BLAKE2B 304c5b739b486cb0162b65853a0f51a61d26ddcb699d0939ed931707b1b8112451190bc87aba5375940d198c5246099ac18242f31d7e195352501531f53ba6d0 SHA512 cbad58096ad05a54300ae8319a1ad78280488974f2ce21b8af03ff99d03e67ece279403e255eba7548f7d78d453f61a510ce8174f294738005ea99a0272dccc4
 MISC metadata.xml 436 BLAKE2B 8526d6e7cfa9eacf74fded910cb20aa183404673b4f79ac8bbaebe300ab5054bd7540b31d7a56f3e26ed3cc377a75be9e204ebfd12ccdf1d2cbba573b7f417be SHA512 8ce9979defb138817298e45dfcdba9444ee8452d1f027b6ba2dd3104e872fbfc53fc97e36becea6d46cf182fea709f7fcbde6c59572ea72c6a913fc572a999d7
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
index 6cff175d5b18..b1cba873c28c 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 5f1fb3982475..92fdc6e0224a 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
 DIST mkdocs-redirects-1.0.3.tar.gz 5148 BLAKE2B 438e2751b4570e8347b06a67d86b0afbb99c9204cb0732719e3301d09ac70f268b0302dc9876d7dbb11f24a3dd4a6eba94c3fb3c765c21e934d72442a1ea37b2 SHA512 c33837473211e9ad13da23789f23242182c4f07fe662b448c17d3976f8eb6ee9acdd69ecb7836c025471862c3ff27c8e3bf9a7178596ec8abd940912d48ae9a7
 EBUILD mkdocs-redirects-1.0.1.ebuild 544 BLAKE2B df0b1da015351df4ced3ea65d78fbd02edb2301bdba6e8702cf5fdeae28ccf2934d38d5c55436c223081d917e2e1908a84e64e0f462b3bb4201b91b6962aee47 SHA512 f645caa7148922f8911027c0da213410baf6a40ce6211baaf4657966e383fc5244b63248d332e46fc88ba6ae4081653b9017d9702bc9f7cb6546d04372cdffad
-EBUILD mkdocs-redirects-1.0.3.ebuild 513 BLAKE2B aa1bf6f007694e6a652c638e966d0928b465ccceb7d8dbb6cae85253fbcb5d7bd0db4551e9bab4d002580aa6dcbd015549df252e4b181d7ec585cb8d9c38d018 SHA512 38078b9480ffe1a9012de29f84efedfa33c598d8bfde9e0b986df1836ab37558e73eb24f55d84cd8802e1330d60d9b83d4502df72593ee90c5b67d40285f0610
+EBUILD mkdocs-redirects-1.0.3.ebuild 511 BLAKE2B d05a906c588bbe09f5bcb11bb25531357cda5f626caa058301178d1742e1725a00ca13d6c12eea7f50f64eec75c8ef6344d274b78f3109c912d4afdc2647c36f SHA512 ca24b055fe722ecc673a0093a588358f303b4eb032ce687cf2199b50ffcbbeb7abfbe5039152c750f8a3e25d35d51d4fcb0599c9f871aa987a7c96770a85d3d9
 MISC metadata.xml 427 BLAKE2B d909be9be313ddf4f7930bcb591498a6194b2e574a2e73ff35be34c19198b4aca7c49c8f95db53810cfd4f3d5a1ba8c60b9ea4c1fd6ebd678dd48df4bc8aed8d SHA512 2013df82c0a0dfa0ca017c0022abee47623eb44fcf14627a622c259c8d400f560e1f1650cd6a648e2e75f0e40adb61a942ca1196ed32187eaf28934606346df8
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
index 9d5213fed30b..5bf26ec6b063 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 00e3a2c4ef63..5659de671f59 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
 EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
-EBUILD mkdocs-1.2.1.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
+EBUILD mkdocs-1.2.1.ebuild 2117 BLAKE2B 781052ab12bd9605e4b6ce320c8db679db1e84c301c5566f55396dcc4c7c8e67f8fbcef4f5e6e39f91db5196dc6609d0f6a9e94c0cee4bd443102c8567dbd318 SHA512 425390d7bedab31ce6fef549c7eae9f9104ec2b4708303b600b84ef0af408c6377770f61df47296b18fe45697248ee6bff814d3c3b22e01878e092ab2f390968
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.2.1.ebuild b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
index 842e38bc6ad1..6d276646c764 100644
--- a/dev-python/mkdocs/mkdocs-1.2.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index fd0b01813403..6ea28320037f 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -2,8 +2,8 @@ DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
 DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e28b0a8ed465c5c2c69700aa0707dfefea33bedbf87c00265ae5ce4bf9e3789a34b4ec195aef85e370b1f01470ba80c384669abf225486a312 SHA512 3db8aa9b22d24d0e374e5ef298685bb35c0a6b6b1916be12c756d540daac6e482d60c0dc7ce9662a8a05a71c1c75be9b8e0c0b8e7a25f495e2d652d91556ee7c
 DIST mkdocs_pymdownx_material_extras-1.4.0.tar.gz 41238 BLAKE2B d30f4d90822298c82bf9d7c5467d2f022664adee9c910eac82b2b35a740b29a4b01e4e5b61677ccfa98cdd9691032f67b9004065a405712b1d997b70615fec23 SHA512 a3131052d2b2d5619a487edcc5ea8b7b5386a4671ac210028fa72525610a0e86117ccaf3b095f64d2438c49e135a721d8312cae1c44de16bb699822e54b958a6
-EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
-EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
+EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
+EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.2.2.ebuild 561 BLAKE2B 086ee2f238c7cbcec3a4028cf7642387eda803de5584b128e96789cccb14727a8ca2d49554faf20b6ffbe992ee9e75acf12a3fda1a9d5bb2aee6238d1521c9de SHA512 7b72bc9630030ee807c7dc5aa6f3ea989899e40648c403e6f5e195fff34055d1616ed97b292b0225e2c55c6a1067d08707c23501f80b5ef13b38ffd6b93e201a
 EBUILD mkdocs_pymdownx_material_extras-1.4.0.ebuild 560 BLAKE2B 87b6a130990fde80ac940cc8a3af232b705fc0d29cf2d8b1d85542ccc2094d707201ff1d268bc3f5d261f0e28e5b7d52836be4b916f266eba8499f9e00bc5eac SHA512 805e7a4fe0675b4cfac9acba15ff762382fef062d16c78fc2e95aaeb9021cb233521038bbc5de7aa236b87d0e62b4083fff9ddd5d5246b430838dbeaa96b1762
 MISC metadata.xml 1166 BLAKE2B 7f19da6ad1ea3ddd412be73a28b2fb4e4c46f2fff047f404bed33fdc108d93008209110abd88843cf16b9572663a50c7ffb3be9abda9049318c5051205240e55 SHA512 37d55fb8a55e5a9a60f8b9771de181944022e691548c0f2fca52e0f343004369af4c7d4235587a943112f64e72ba34ce203f8ab81848fa86d523679b30cff424
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
index 463f6ecd3f86..3e74628e4576 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
index 463f6ecd3f86..3e74628e4576 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 3837a33d0ac6..8126621066d2 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,5 +1,3 @@
-DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
 DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
-EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
-EBUILD mongomock-3.23.0.ebuild 854 BLAKE2B 5c3ea50a873f09f0514458c84103b23a044678f2a7d61280e592a3a5caeda6e3452d2af268ba295ecac6a28d6fab56885f543320cd61bae576190787b34a2d0a SHA512 4c3058fcc1100bb47f944c0c5a82b580b8a3dd5919f9ab788761e29efcfb0ffda0b57a0f6a3ec38acd213f8f629cbed888879a517dcd708795a4806b0ff028f6
+EBUILD mongomock-3.23.0.ebuild 852 BLAKE2B a2187f0eb4d75639f632b76578c38854f58c3033998de599c621601d35a4eea8eacf0d2d9e0ab21e490eaeb3c527b4a56c375d260cd41cd3e5934a7d81212e5b SHA512 34600bcb6719444f155ee72d2a3f8656b0fdbab4623601d47f509570e1dc60ab2248c1d2243f2d9d9e6611b121d5cd341276d6e3f2b59f1a36e6ca50871fc199
 MISC metadata.xml 395 BLAKE2B 348ffbb9c7274a10413f5805e9af06ebf7dd5ccc3b4493d7f876cbf370cec2d42a16280648097e2c1c273cddfbb55417f0b33f206acba49a91685bef1cf6be75 SHA512 dc60cc89f839255497b4cd2f9fd020cf0e300ffc2944ae681ced5368d6e4dbe307e10a6752aa1594a2730392928016e6a7dade21fda3f4ab715d09c332ed5d9c
diff --git a/dev-python/mongomock/mongomock-3.22.1.ebuild b/dev-python/mongomock/mongomock-3.22.1.ebuild
deleted file mode 100644
index ee1a2071f1e9..000000000000
--- a/dev-python/mongomock/mongomock-3.22.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
-HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
-	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
-
-src_test() {
-	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
-	# TZ=UTC needed for date/time tests to pass
-	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/mongomock/mongomock-3.23.0.ebuild b/dev-python/mongomock/mongomock-3.23.0.ebuild
index c7b70822284d..16470a32ad6a 100644
--- a/dev-python/mongomock/mongomock-3.23.0.ebuild
+++ b/dev-python/mongomock/mongomock-3.23.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 6292e82a6f62..f2d3f8d0985f 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -12,6 +12,7 @@ DIST moto-2.0.6.tar.gz 1557871 BLAKE2B dd4c23758bc9c98fbd2b2a70af744daa245fc8b4b
 DIST moto-2.0.7.tar.gz 1565849 BLAKE2B 1c6491828a43156fd347bcce80f3440cd8d4964e28bab19593e29fd88aed558652b08c81c577312f9c612adc666ddd35fdd46b4d2d8fb82eef380210e9c62d8d SHA512 5df26f478909c57d4ba76bb7c6e002c37d7f604084c157744be32da93dbb705605a7a85eb0774cbf2c0083f7096f01075ddb1a119cb7ac2f3931cf58896f1629
 DIST moto-2.0.8.tar.gz 1569426 BLAKE2B 746313241d49558ab49d7e2116406f128a315a9fca40956808e7f901e91518551a1f75c95c9ce5c92534221d1db3e01a3baa2cef6cadab9a9d024cc30d8ce0e2 SHA512 5cf1a47c97100b76ad9b69787ce4df00f24f93ba1a36a242cea535ede649af457ff043b44f1cce4a4e44b6735844652f69271f18edac0748b636f4e519545018
 DIST moto-2.0.9.tar.gz 1614328 BLAKE2B 0bb9e3dcc0c25476b7fdabeecc31be6904a21d6a77f6ce3d9c9c176625873d30c55321c8939ecb8bbc91ee64faab9cd7231150dfdcbd4d5d7d3dc8eae614d9f2 SHA512 41b32aa192dd5c5052a90f345f29e696f9cc6abb3698ea0b738f8805fc920f4abf7d418a64aecf6efd66162aad631c88754d5e4e349ca2ba5b393771038219cb
+DIST moto-2.1.0.tar.gz 1638267 BLAKE2B ee778cab1a9a448408bbc495a148201bb016c2ba29076062360db23d86d725758303c32e1fb1a3f9e11112deb1cbca686fc956ddafd259fd942654510ba12147 SHA512 cae18324200d827a1750c5dbe2df2ea68dc66a5b8ff40b4c873f7511d576417c1a2b20203cc126d84b99b1aec5ef8700825271893933e6cc4bd61c0082b9e9be
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
@@ -23,4 +24,5 @@ EBUILD moto-2.0.6.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668
 EBUILD moto-2.0.7.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.8.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.9.ebuild 2251 BLAKE2B dfbd64deaf75259e39927cccaa72be0634304863cf413828e07c49e160a9c0c14a50b0d3e4b5d34232d0cb7c579cd1e49eee22c6ad4d31ee9b889a89fd7bf602 SHA512 f99521935ac7d9d64f9954166caf37a2df6b50e8ec862100e320470ccbe7372d3580eeb9c193b288d5ac28407b055f73f26b1ec895e446d20f341c3f49845c35
+EBUILD moto-2.1.0.ebuild 2403 BLAKE2B f61936ee276141c887613a85ae20234e8cf6358005af3e48d2a441cb3dc74e0c8f82a6fbae511cd8ac21c00ed8decc4e88aa96f9586bb1c4bb8fe752c61d07eb SHA512 3209e5a97ebad0b689465bbbe48d0f1d5f2c34230f9b917f4bb4d8d6453dbefec90da1b844a01046aabee531e2dbd99933f4b01f74d47271f2ca32bdb877cbd7
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.1.0.ebuild b/dev-python/moto/moto-2.1.0.ebuild
new file mode 100644
index 000000000000..97c46227e99e
--- /dev/null
+++ b/dev-python/moto/moto-2.1.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local ignore=(
+		# incompatible versions?
+		tests/test_core/test_decorator_calls.py
+		tests/test_s3/test_s3_classdecorator.py
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network' ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index c1bf906caef0..f8bf899325a2 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,3 @@
 DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
-EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B 06db7a6dd3762af975eaca01504c092b251cc8a285286dfd056adff7e149566cf2eb70a3379b3beaf3267e42b47794037dd9fb6d42bdc889f88fde6d6223e94e SHA512 33b654ad64c1b40d699e36720717fa1e911a20a15ffb424cfd9b51d85cde7e8af94bb7808cf1b648246458e17bb59d66fc45ed8f3fbb715d1f6e162686e723da
+EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B 2bb80a882e89a374199fbf066e226f9a53487f806f9c24736aac39bf39d16db808daf303a9f82f364f0eb1cecae1cb0ff00e3833e1f6fec165d989de60acd31a SHA512 2d7b5bb31d6089d66a119970aeccca99b21d4d6517d445360accf54423d6eb1394b5ac0fb261cb942e7857b05b755657a25c8c4ef4575016aa8a624dd23309fa
 MISC metadata.xml 452 BLAKE2B 39030b9d85edf373418952f1986d9a1b4c5a73ca191112d9e979b754eb12891f16a522d19a4d4278853ec4b07aaaf14537ed64eed658886c02859d8a451eb81f SHA512 2eec420a3b59460798f9d8504d86a8d01afd309867f0bdb0f46f5a87484c06f8398221946bff4d06c150cf8085a6cbc15a9e61ba815519e696a26376cc018fe0
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
index 3608913aab40..d547b7438f37 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 742441f2fe6c..f016236fe3c4 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,5 +1,3 @@
-DIST nbsphinx-0.8.5.tar.gz 145770 BLAKE2B 734ce1081aa18b670f15d00b79930af5fac8a531a9a6d645ad903fcea537cd95561f41360c3028a60503bf878aff0d7105a0a753563ae5bb70ccb68db118e761 SHA512 1fdb52741e01afc7e3a67d97d3edee14b5270a3404da607c97c116b839ba23c641b2d3e338df81db52bd677d71861c62dcc08184ef92165d6a53a6841c1a96e5
 DIST nbsphinx-0.8.6.tar.gz 146019 BLAKE2B 106c121e9306c1b79771d49697f125b7c9272bddd9859b308d272e69cccf38fa306330bac01e8744f1a5a1e6831f63b73b43b0a2260eacceee4d2ff6c4ae61ef SHA512 11ff82be0633b3a2af2238d9dfe4406900804caf494885a5b3ff22f651c8c43000dadf83546ffaa85873901ef9625c2e786e53e866c27141fd9e9d58927ebf14
-EBUILD nbsphinx-0.8.5.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
-EBUILD nbsphinx-0.8.6.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
+EBUILD nbsphinx-0.8.6.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild
deleted file mode 100644
index 6d626dc40a76..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.8.5.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
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
index 94b3df799087..6d626dc40a76 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 66053b4e052f..b93d6c078c96 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,6 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
-DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.10.9.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
 EBUILD netifaces-0.11.0.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
-MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
+MISC metadata.xml 450 BLAKE2B 147759d8c03a11a4dd618cc134e7322f34b2cd542049d948cbfefaa4b4486cb6d90e61b15caf8f71cd300ebfa05a88bc908e83f51cfa044ad26e2276401e74b5 SHA512 6fc02f3284f0603ad1cd82c896856f2cee2d4cb575fc0c44782eec05012fe15f73f555f61f0eb4e4d7cb9f3ffb9cc2db27555b9511738766e1d39249ead24b60
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index e1a6f820cade..286c15195705 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">netifaces</remote-id>
-    <remote-id type="bitbucket">al45tair/netifaces</remote-id>
     <remote-id type="github">al45tair/netifaces</remote-id>
     <bugs-to>https://github.com/al45tair/netifaces/issues</bugs-to>
   </upstream>
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
deleted file mode 100644
index 9d457ffccb7e..000000000000
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Portable network interface information"
-HOMEPAGE="
-	https://pypi.org/project/netifaces/
-	https://alastairs-place.net/projects/netifaces/
-	https://github.com/al45tair/netifaces
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index a81e628c4797..5b8926ad937d 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.6.0.ebuild 477 BLAKE2B d8b40745d5fa769adf2a43b955e04df728b50eb21a376cb2c5cd4c2567059749e7af668c608588d4d7f919da3831b433fa94d044781915ef0e734c7f23b6d424 SHA512 2269ef3d5681286927223cd6fc08277c314bff6824ed2af0484bcfe22bcbfeca3ac315eb8aa6152e4d4a95d1125ab7edde3c0b8266084d16eda8b46bb15606c9
+EBUILD nodeenv-1.6.0.ebuild 482 BLAKE2B f369eab23e330156d4e591f87d1447ba6b44735cc503a85588f460dc15fe0c2afa2883481ba8310a2e937e57232536e81e064ca7f254b8a7281d6a16b67e0503 SHA512 f669c43ea174e600992b77361c7f6bce9d90d6a65cdcf57086ad8cd45938d986852fd7c240e334682fe8f15f0e5821b4d268c10b851d502ba09185ccf58d0211
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index ecdc71d1dc2d..1b1b6d009af2 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index f84a0b9a70f5..710f93f4de2f 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,3 +1,3 @@
 DIST ntlm-auth-1.5.0.tar.gz 41826 BLAKE2B fb313cdb4f1022e0cbc1ffcb048a587baca400a75e053ea8943d960f21746e847080db20169f55e6a3060a8b8502637ce7dc269b66bdaffe98c3f769b2b22358 SHA512 cf08b23e49d45c528404b70b6be88f6c3edee9fd0d4584f3962931a08a0982cdad4089963a95aea911b6eb4db32a932536cf6d9c02c292cd447e0a9c6b3b802b
-EBUILD ntlm-auth-1.5.0.ebuild 538 BLAKE2B e0fc0bfe7701cd27052da9d48fb2795ff31011ff5bb82e303f962eeb367cb0ab6d7aff095eb888d664208783c3ce4cec27ed54fa152bfe46e80cae53a3684b3d SHA512 45c0b651a50119a556c6a3f39599a9d237cdc6a6ffb7ccf77b033c01ec15e6b9955735598bc4b1e722e722b4bf1a3c92e5db58bf49db377cc85d28b4cf1f556f
+EBUILD ntlm-auth-1.5.0.ebuild 545 BLAKE2B 5e02bfd4d870dbaa37c62fbca4ec22f1ef1d6b3914f5962a35e5bf4d5315c71283a28ce3606b38e4352baf6c182b0492b82c6ab96c74831d41728cf70496588a SHA512 e271a3557d7d7485f0a97b9695da6b2016ed0f4764b1911f67050ad4d30b7c79b7fc481aa67483db6d21c696936ad45149aa2e3883255d57d71eb2cee9db4936
 MISC metadata.xml 508 BLAKE2B e1051ed1d65f86585a5948a4a97576d643e18937a6e7860e46aabc12f420b243dd151ae66804e9df26e5e877309a93a2a8580db9ac058b34914236b6d49b7313 SHA512 4787aa1fa219a019371ced0db59d1e0d9c31309c95e1dce467a75d2d54a9013aa18c9c242cda6a2e01f43268058bbeffd6f38e43d8ea8a23903c8b306a7026b0
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
index 087c78f81582..97883cb51cbd 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index a28cdbdbce4b..cfb0da80d123 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,3 @@
-DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.2_p1.ebuild 1254 BLAKE2B 899bd020ae001477eec6359a8ed1fe41d3d6f82009517e90bc177ebf4a8e6c2b661e61d4acd01ef4ae79d16f57c3c0eb856dc527cfaa40fb1d249b4e4b3e847c SHA512 c2f408169d0c9d30c074f7da8dc174e8225f35ffb28ab6b84f07261b43faba5f58f7082bde99e5b397120eea10e3f2ab6e2e93fbe3cb2f9caa28b4733c73d139
-EBUILD numexpr-2.7.3.ebuild 1217 BLAKE2B 1b2521fb96c8a93eb6f7a16859db9cdaeb783e4039830ffa88a67cc38ff14a2325fc44cd70f48bb147057b3fc66759bec4fdedc4cf0fd95e0fb3cdf09f160487 SHA512 7faf0405436d4c0a8122729761be87cb3c70bed5d1caca54ac727bbac49b1b6bdc099c2ff59e780ea2d70d15dabd54a31e7c89320fa2e55c518b6a8f827a20fa
+EBUILD numexpr-2.7.3.ebuild 1215 BLAKE2B 6d2490c16549f2c7033375b9c137fe0a59354c2a36a36d1ee900a49cbc6936a7b50824078a371ecff28b8a51473f17c993d154bbe36c4061bea7c834c8ab8907 SHA512 eaba741b531bcda54da607ab0e37d3ce9fa12fd25f8e109e81644363b8e4f7b0577fb83e755f0bc04a5943063c5ddb35585643c14ae3957382bedf25ca0d0f00
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
deleted file mode 100644
index 679730c0dcac..000000000000
--- a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
-HOMEPAGE="https://github.com/pydata/numexpr"
-SRC_URI="
-	https://github.com/pydata/numexpr/archive/v${PV%_p*}.tar.gz
-		-> ${P/_p/.r}.gh.tar.gz"
-S=${WORKDIR}/${P%_p*}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
-
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
-"
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" \
-		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
-		|| die
-	pushd >/dev/null || die
-}
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 78f0a10f5478..37cf6ffd3eb7 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index dc4745c89af8..b6f171f76b1d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -16,6 +16,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
-EBUILD numpy-1.20.3-r1.ebuild 3725 BLAKE2B c7ffce465a67bc7e94c87d472138b55270ce1c3ab90f4a0fec4c83ffd53cc478dc2b1340e1571f642c18a6c7d350a6211d425c6760e93ab533823176fcd0a73a SHA512 848823fcf321840855e4fc89efaad6521d168b7d5c133ac1dd81d8e466eedfaff346ca6d2832b17477b3b36746db0b68869f3fd06ed243d78b83f6cadea0e121
+EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 47910e45729d..7a4ba831636c 100644
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index f3dda86cb811..21e77b2b3a2d 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,5 +1,3 @@
-DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
 DIST oauthlib-3.1.1.tar.gz 161395 BLAKE2B bc127841a16429364191a69777741135594366a5c99b32f063ce9bec4b6a3e9b7eb67515aee4da37f26cc2e8b2a2450fc708a21da7e4944861b9adbd9e112018 SHA512 1c18f265a6017a6f2bf77507f5de095b439be36f309316993b547ded0f306461b058dcb85dc245bf26f65a9c77be44ca38f9053f3300a9b5cb92332b61a7f307
-EBUILD oauthlib-3.1.0.ebuild 733 BLAKE2B 724548ecf8f9ccbfecc76babefb80be4eda3d9411b44ad15d44caa37287b878722d02d8739e13a3e78167a524275b1af5c0859d38c48c421fd05af37105ec952 SHA512 cfcaf21c9b4f8f2124655ffbc41016362941e8af7ae50646c348ba02d8b2aa04296ffea26d491fb4d857da01a94681f605c50ea97b106869733c50492be349a8
-EBUILD oauthlib-3.1.1.ebuild 734 BLAKE2B 19c4b6687918b673508799f67977d76b8752c2a6b3d33adcb329c209fa2c26bba09c03c2adec6ac2c26b8e03f3b47d01b08324c6992e4f937f6fb9fa6e32bf51 SHA512 87ecdea7943b2f01b8c7dfbfe2c391cea1825bfff6f3389b53b0c247932a33fad4efe39f86c2777468495f5680c2037938869ecb3a2d9bfc9c6866ff9d799e2b
+EBUILD oauthlib-3.1.1.ebuild 733 BLAKE2B 306e3543d8b3782d93878940837308dc70c35c7c72725ee9cadf12f62e54c1cd709bab55055833cdb94830a5d359c552efdba85ea0ed9be013a5f0ad34e667c9 SHA512 5dc9c415db00516890c0a4a5eb75b0bfc942c8c77598ef0c542e218201edc8f39ef84d4a4fc1c514643f5a085a429796027a515cd1b7c41eb79c9637a9609ac4
 MISC metadata.xml 368 BLAKE2B 537cbafa42a979bb60e657d4bfb49fb6dfa3d6a0c749af96bc4daa6d1c7ad070026d9cd0b089426b0f9a5e07ce609325484f66bbfb9a275b31ca1552acb70058 SHA512 9c38212110ac83cd19c1397ceaa7ec1451e58d41400084b3bfff0ea8afe14ff72a161dd9726950cc31e3ab6b5efb4962356de92f32a3c50e3e61009e40627297
diff --git a/dev-python/oauthlib/oauthlib-3.1.0.ebuild b/dev-python/oauthlib/oauthlib-3.1.0.ebuild
deleted file mode 100644
index d3e0b6c1dd96..000000000000
--- a/dev-python/oauthlib/oauthlib-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/oauthlib/oauthlib https://pypi.org/project/oauthlib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-# optional extras hard set as RDEPs. See setup.py
-RDEPEND="
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oauthlib/oauthlib-3.1.1.ebuild b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
index 3695af141ab9..0f8ea8ae54b8 100644
--- a/dev-python/oauthlib/oauthlib-3.1.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 62828d3ee95d..7f343b76787e 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,5 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
+DIST openstacksdk-0.58.0.tar.gz 1021818 BLAKE2B 530ec940b958d5c9b1a1caba71716201172e1141ebac208b26ea512732be152ccc6e928d20e38964eb455ff47fd6f42756d3f9af19800a45104b631d45d312c9 SHA512 94bb317e9f79ab419e5a0e7def4510d6686e3b8585721c15bd1f03eced5e8f45509cf925ed2b3e51a19ecd2d3e28469343cdae5a3df549f35bb61c448add5caa
 EBUILD openstacksdk-0.50.0-r1.ebuild 2638 BLAKE2B 21a753825ddba3277859677193c846e5d020a7a0068bbd0cea26556c20b91a6e45cde24d2ec2f232c87ea17c50ff78945ecea8c6363d328aa5bf88e72be73749 SHA512 1f38aeec5277791395340e3730da0a3bd9d136b4a97cf9c0e62849746a01b0f4e0a1c9cc568c27102a4651eadacd57e66f6f36b088f5c0d31fdd1e010e41c9ee
+EBUILD openstacksdk-0.58.0.ebuild 2641 BLAKE2B 9822fc8e057fb026eb11d4e46b5a5e9bca38e955234cb55579b1aa197d73f7b508980e5ec4baa799e7fe2173e56b0afea7ce066e3021c2b901ad6d2375bdd9fb SHA512 b55db7fa0b74b3b13f9c5bd643e0e37ab2ba87df9c26120091f7fb0db26883d1425914a27848983c16aa65e41daa1e8c5a4662f475b8501cca6e7436be38db62
 MISC metadata.xml 523 BLAKE2B ebaf30ed0d1a7740cf6ab3d1c4166d425c52bc729aaf44984905e658dc6821756c6d652dc3ace972e0ecff1a3331147c8d016ef828f99c5fe3c1c559cec92b23 SHA512 82035e25a5b7090fa89cf36e623a972de79884ddbfdcbc3d425e989230a9e0a458048cc352f353ff9fa4c7520cd5c4d6da472862dd919c706839661499a4540b
diff --git a/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.58.0.ebuild
new file mode 100644
index 000000000000..d6cfb7dd5331
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.58.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 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+
+	# broken with the current version of dogpile.cache?
+	rm openstack/tests/unit/cloud/test_caching.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 2d03eae23442..dbb6a489d6d0 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
+DIST oslo-config-8.7.1.tar.gz 160536 BLAKE2B 71221141226024b6e7257c74afd082f297980bd45091de1a30c526d52c5514b970983c9389b82bb49283ef2176b7fc408f4b7f3fc29f9d6cdccb513652b7bee2 SHA512 a76995ff12204968fd9a52ca2922a89039858392b21befff827bf02c3466e365251d90e2d02894a50bece32751e9f5f86a651768665f404de2d3a438e53f158d
 EBUILD oslo-config-8.3.3-r1.ebuild 1343 BLAKE2B 278b0a27e97fbdc0e6e117053afaed3f491af46e2bdac48c69274f70416c763fb5245c11b3e0f7f874c00cabad867b5b19649cf371d9a989c01183d166f991a2 SHA512 32697eb830aba5a94120174b00eb3b802424cb78ce701063ea9072fdf7e4b3bd5664a40f72163a5827d2413fad1086bb4340faa12923b4dbefff6721ccf3dfe8
+EBUILD oslo-config-8.7.1.ebuild 1343 BLAKE2B 120d5d58bbc19bf4971c347f00b526de9ace49a563e20980cc5431308dad26e9e623db2bdebaed3d122dadb29edf78ad6f082dda4e567cf80c6401b977d36aff SHA512 b60eece73c43e521b25bf4987d7b505ad3c2ae76ba1c0476b210ab6ca577fa475b079d22d0f334f52598bee883fcdd5a3c37c2d843a2f676df796f4f229ef1f1
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.7.1.ebuild b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
new file mode 100644
index 000000000000..e0f0e4b92ca8
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.7.1.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x COLUMNS=80
+	eunittest -b
+}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index c9cb4686a265..3725c604f79e 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,3 +1,3 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0.ebuild 727 BLAKE2B b31ac8c4de40572b2849b733afb2c6dc604921904a244b23059d8d2d725326acbafc0934983951858c28ac7091a39875a32e1f0b68a8be0e164fe856e9e6c8da SHA512 4800e54fecc267401fe65cc6b8b66f8403ada73a72988d4b13ed3aab03d75a19ea6abdd539f1d0651b5a5ef5a0d0a0d32dae92cd0ef9420a8caa98cda6ecc001
+EBUILD outcome-1.1.0.ebuild 744 BLAKE2B 3d89e842c1157a56f4c9d8f77ef18c424fc6112642a5d41a59b885a04a986611da992a6938471099264016ca8444184568bc9303089d31c414b292569d929d7a SHA512 f2b65755315d0f0b219bc52ab8abffddfa3d2781a1dfe1d0e5a21a4729a7eca87260bbc48308c83a58416670c97bb3aa2a383eeba49ba921535d6b64532d7267
 MISC metadata.xml 412 BLAKE2B a6981a62dd453c13e7568abd6842a1e800ac403566f6a719bde8eb2cf39e85d2d23790af491e44e00219937e8ceabda6203b9a9bb94ace8b42a3b1df9303607c SHA512 ac1240cfa6facb9a0703052eedad4b22c7176a7f1b6b191ddc52b80a9de4087c5edc910cf1c9906f5ffac0d74f4b6fac18cab8c34d5f478ce6146aa78768ad0b
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
index ed7fdd7e6c1e..5a68cbd75ae8 100644
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index f36595a4977e..36b970223539 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,5 @@
+DIST pandas-datareader-0.10.0.tar.gz 259641 BLAKE2B b8a5c7aaa76b30abd9297c820638731fc5d81b5ee2cd1a016c1d8d10dc237708b913a4ec505b9a703b02f470413725f58fa4cbf54ba70113bfae5d0ffb0875b9 SHA512 b078122c6c0a614aa5b55151446b830dba64382b0570761ac80baaf362ef8121fac2c4b53b8cacc367bf985ef1ecc16d44041f1d1f4b13fc1024fe6ab74f1d0b
 DIST pandas-datareader-0.9.0.tar.gz 261026 BLAKE2B dc8211ceb718124095896dce9de0d752f2c5c7bce022dd5197a6b3851ad8727e298b34d0657f76c9c40ca31b1cf76d8a467af251aa9131f921990e6f4f9ec25c SHA512 5ef2e06b6d02e2bc213387f8649e02c9ebd6df679da8ce433d4e8dd2c66e8cbc214a9cf9a4bc83ac2c7ad917cf72a9e6b09c9398623718736114efdc2c3e2815
+EBUILD pandas-datareader-0.10.0.ebuild 1138 BLAKE2B 521dc29343e42285a89dfa11cfefe32b63451a4711b7d13727f7270c8327485cdc3609e684b45d54b31d6fc2a14d58cec87aa6e6f7af6edf9b380fa73103003c SHA512 99efb1f1ca2111feb06c482d24dbb6f405c9faf8adafbc4e8166500c65d45348ee1bb24b3959a0b9a53734750a4bb1f5a26685dfc78368622641492ab1c75660
 EBUILD pandas-datareader-0.9.0.ebuild 966 BLAKE2B 4c6f49be7b8b57dd9167046d665109fd45fe96889416460e5fb55e012dd0c4ba03c05a65d87bad462336fd4ac17a7d564869e24cc58c883c3ad85d9a2600ba00 SHA512 1bb64bd7cb35e8f80e3f54a86737fee4222f2052944ab6f31a63a2e5891ff6cdff59ec181ddfa5674cb1535d441f9f72c95002a45b42d05702457986ec314f6e
 MISC metadata.xml 778 BLAKE2B aefc06a42b2978ea58cbdd08eb89421205280459a539c6e98ed2f4930f8f9f790a2d2a79a10efa25a6fa65a932cec64a49cdd0bf64c78b79951d8c06917db7e1 SHA512 e5e31c35cd34c82273cde55dfa51b0513fde2c4e69b6db9c2f0c83d8cdf53b85f42dc02ccdcfcead16f9e7e5d457f598096056a88b6ce419c30b645737170698
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
new file mode 100644
index 000000000000..854753e74aff
--- /dev/null
+++ b/dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# 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="Pandas DataFrame extraction from a wide range of Internet sources"
+HOMEPAGE="https://github.com/pydata/pandas-datareader"
+SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	test? ( dev-python/wrapt[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# looks like minor numpy incompatibility
+		pandas_datareader/tests/yahoo/test_yahoo.py::TestYahoo::test_get_data_null_as_missing_data
+	)
+	epytest pandas_datareader --only-stable --skip-requires-api-key \
+		${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index f81536eec6c5..f2843b35cd31 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
-EBUILD path-and-address-2.0.1.ebuild 464 BLAKE2B acd139fd4d711c5b2557dd04c8b979f70d734819d4729b602c2f0b0b2de9388f628c6c247ef1abaaf2888f625fac6bf82a23b7ebd505476ad8cd99f29ebf01a8 SHA512 b5b5230971f9eb728c6345b2ecd2799517219a45cacad7e114c1599ffb3924223ac9e25d5896778f2186c5582a2dc9cd7939dec344e774074e4930378f37437a
+EBUILD path-and-address-2.0.1.ebuild 465 BLAKE2B adef4b81ad264173fce2b832bf2f847dd8ae447321addad0f940ef11384ea293a2863bf69669e6faf22bcd6b7649e95409141e51e38acb74d0963d7ae01e4925 SHA512 8f6baa7b345a8904a0bf7b1244e9e4ace6d09e3fa0076cab06194030fddd000a5b2ea7b27cab9ed4aa3a0ad91b70d5b06285992bff80ac2c9a1a9b61473c7be4
 MISC metadata.xml 483 BLAKE2B fbf94e2696f78ef6fcc6896681f099a6e24544c731a713c3c18d40de6b953c42a26aafe1460d2472d4f7666d137f50d8b250c4fdc509b2b57915d1548f2c44bd SHA512 ed626cb3c0d04cd78d5c9feb2148da4eb14f7101cb1c38b3563976b7e4ca62a14a1310d35969839a2eb239ba6584512f8479e0e5ee4a859b9902a2b22adc13ad
diff --git a/dev-python/path-and-address/path-and-address-2.0.1.ebuild b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
index 3d9dabb3977b..f592333b0391 100644
--- a/dev-python/path-and-address/path-and-address-2.0.1.ebuild
+++ b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 34acdf5b0697..702340202673 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -2,8 +2,10 @@ DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2
 DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
 DIST pikepdf-2.14.0.tar.gz 2309588 BLAKE2B ca0af8ada258742571afa1133ba5ea282ac7a44dd34b5ebc24091dcd36629ac97b1c7b0e7e65cf86f0933a13423b9b5011d53ec75cd7b0bd614917443e72b793 SHA512 3b6c61f14581934aca2293b1d42be1303234209bd5fdd24216db57df765470591d5252b912de9b797f885cbd52ad610666d86ddfd1c279b97b1058cea36eb378
 DIST pikepdf-2.14.2.tar.gz 2310009 BLAKE2B 1afddc090e8e92c57843fc25cd7a6c8ef75e4f9c46144b10e91a96747b0a800a38715ace4d9eb5a65944b4495531417e8a34d7c34e1136f04df6c2c359ac2771 SHA512 cad165078bb634d6e5202ff71ab8d11f89a47974a3dd33c237b804f2784582b739bebfc6ed99664c98cf274c16dadb718a81d95710827be711e7d7d4c9ce5f77
+DIST pikepdf-2.15.0.tar.gz 2310862 BLAKE2B b511f9e721174c28898ccf0a00c84162b850b911a08815f400ba7269a9860dfc4b77b311139cad30fd6817a09938d360f8348d9d42a5bf2cc72e630523835644 SHA512 d43cd5759d053416ed4ac84150a979175ade970ad7f3128641549690a47113656739694af0589ba9f7202410be08698e048a38525d9ce108090283d9f1546ff3
 EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
 EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
 EBUILD pikepdf-2.14.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 EBUILD pikepdf-2.14.2.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+EBUILD pikepdf-2.15.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.15.0.ebuild b/dev-python/pikepdf/pikepdf-2.15.0.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index b6f1fa0438d2..678fcb87debc 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,8 +1,4 @@
 AUX pkgconfig-1.5.4-brittle-tests.patch 546 BLAKE2B d80db0a12eee8f2007075015a46038beb3674fd89cb57105f7a0c2d8164572a3aa45377bc52a3937ed25b4eebcbcfe7bb347ca56bdc0db5d2f01901454fb4dc1 SHA512 f45782fb5330cf218b9550375f2b8f35ec82ca6bfc8a3963736a7cfbdac06a8d1fbe979fccbc78caecb7f5765f46e07f28cb3333f32f806825de2bd2e4365684
-DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
-DIST pkgconfig-1.5.3.tar.gz 7310 BLAKE2B 361439cadf3f21a76d379a8b7eede9d2c73fa114c5816e8964b7086e867ca0d089dbcfdc219ea0d481934940fcf0a0ca2398b0850448bd3e577befb1266034a6 SHA512 00cb148977fb2b25d747ab1aa8d99deaf250df67d8c3ec0f47160714aabce4de3d96cd43e7292a8e4ccf850de1aceabc96d5516995365da088e00a731d538c24
 DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
-EBUILD pkgconfig-1.5.2.ebuild 572 BLAKE2B 89b889d939b11616e7b5eca89bac2d4277c33aad92b2ec2779825295d77ffb4e73b1eabf79f98a6d06647e3aaa4199d030288921bdece66e477239e916c099b8 SHA512 f0211e5cdd45fca40cf84116f84ec8fa68ad135d821416e7f0b36a5e23d9754904889df7ed9c73739d0d888e6d44673104b30c71f971c4dc60e2f3040f83b89a
-EBUILD pkgconfig-1.5.3.ebuild 576 BLAKE2B e2f64c528c8600a2e8b3a2022b60cddf4357017f9890c59a70b3abb21d0e301d22d747df3e731d39a41e8df3631a22dcfd661f2352c0604af85de0fdb628ba9e SHA512 6900df90c589879f31e366b28e1f5200ed1675a3385c936b705518e9181b391713b6647f3a4d90da9fc78e7ca427431d6a3f65445dd5d9a8193fd49f3c215243
-EBUILD pkgconfig-1.5.4.ebuild 628 BLAKE2B 3b73a5fb811d22156ac8f0f0353e805cd4243d5e748dc9f55575991807daf83b296671110d14667661922b5f6eb9f3af0f2cca2dbce06724b5dc98838d89e0d6 SHA512 8977cb9744c51d3c7931a19a3c6f65e31939eea3ebe92271996c83d1faa3cd9e4cac4c35a39bd0a85948121a133b6958bf92a570cd1803ec6ce7681b82a13de7
+EBUILD pkgconfig-1.5.4.ebuild 624 BLAKE2B d76cf08bf29092890e079aae24a2897015108ecf1618dde8b5f1d0da98242cebea18b33e8f8cb5ae52aeb714915029be9b712818c5375ed4e4a71fdb64cf81ff SHA512 206832f16380b46d2df65b429eb6214ac4f09d14f4fff9c3de435d5337dbdecc92fb2bc8019115c8216cf204921e358b6bb8d2ccee0057d352ef0256dd1e0023
 MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
deleted file mode 100644
index bc417b9d0993..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.2.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} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.3.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.3.ebuild
deleted file mode 100644
index 829058f080c5..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.3.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} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
index d4c0fd9d2b37..6a2f42edda33 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/pkgconfig"
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 463a31c98d84..783b0c32a98d 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,5 +1,5 @@
 DIST pkginfo-1.7.0.tar.gz 37209 BLAKE2B 70e2c7d69d4b9b5544017c0b0c388e375060f063a35a3467a420d8819d77eb0e9772735db78c0ad03560aa9e35dd0485945517f305056bd52d435e2462a3878b SHA512 0e41899fac552e6a3c401c7dab3e3cd57f31cc5f052e07537f15b699c85113800edac27d232571ecab4852fab1d73374eca381d1ab70c9a7461bb422ff03de3b
 DIST pkginfo-1.7.1.tar.gz 34280 BLAKE2B ad928cf80423977e5944e3110150afb3e5ae416bf1fd28aec8099c3f25e41956b49e4134cdee5e0621e5bdff44d7161c3b1783b3c6d15555eee86e2e14c29fbb SHA512 5b6374e45e7ccd68f3a28145c2fc350e630e97fcc5e97d46d05c32f0958a51e4713487b809099ddf0a9ab07840f7fb4409438ab7b7a9b0b05e94d292088b2c26
 EBUILD pkginfo-1.7.0.ebuild 670 BLAKE2B 31940e10fc7ebdc0efa3dae6b747ba2aedea057fa544202a2a2145586fe4a6a1a7ae66ec5f7ace67442379cabd2d9adc35710076e1f55de56459be8bbbb68d41 SHA512 affe6071bba09aa82a2719e42906a03a7c4c3343039994f1c5b2303ac0610b8f07343a6ddd33f0d2660e450399ed7b47779e3bae4c5768e0c10af138b4d2047d
-EBUILD pkginfo-1.7.1.ebuild 535 BLAKE2B a43378212cf468144387af910720c1dfc997ea732de2df69f515b0074ab7c8977809f40f3896f09ae819110e642719a65b828a599b54eef8f76f53d3f919eed1 SHA512 4baf561f206d8230c5e3fc3ade58fcf5a0bb07b1ebbdc7e26dd38969cbf2297943c928551d2a2e98b0e4cddf179db6c78a23bdc9fe494d169d1f260352f55b9f
+EBUILD pkginfo-1.7.1.ebuild 542 BLAKE2B 06699f587be520d7915d7981a586692ce110c2df7237810640b09bef0ae028dfb19f4f6ba09bc218dc40574f069b170ac730308ed73b64a397497181cdcd2d3c SHA512 5432fb0dd569c2cd7d81ef65c0b80d08b783236b8a6d2fa675bbf158a2abf046c972719687a1ced60bb9b0ef1dc9d36d10e49d222fc05698c884b910aa0edbe2
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.7.1.ebuild b/dev-python/pkginfo/pkginfo-1.7.1.ebuild
index 3e5a9ac19e76..eca35489b8d0 100644
--- a/dev-python/pkginfo/pkginfo-1.7.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.7.1.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 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 distutils_enable_tests unittest
 distutils_enable_sphinx docs
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
new file mode 100644
index 000000000000..d8fd843e8ae0
--- /dev/null
+++ b/dev-python/platformdirs/Manifest
@@ -0,0 +1,3 @@
+DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
+EBUILD platformdirs-2.0.2.ebuild 594 BLAKE2B 6ffbd439318d426e4d929c4f06370e6bdfadffeb90650594f1091af512f6bc1e8880f64a05e521d79bd407b66fb0f8f7fd3264c01ac8be79212b1352c8ebae81 SHA512 ad6637b33ff03b9f3af792f45fc090dd4840069911e85996b3d5ab874e54e0e9a3235536904bfa945c88e58b0b9308d04a838e31797873ce8e33a200e8245bbe
+MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/metadata.xml b/dev-python/platformdirs/metadata.xml
new file mode 100644
index 000000000000..37b79471151e
--- /dev/null
+++ b/dev-python/platformdirs/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="github">platformdirs/platformdirs</remote-id>
+		<remote-id type="pypi">platformdirs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
new file mode 100644
index 000000000000..854f3231a6f5
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -0,0 +1,24 @@
+# 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="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 9d81cf2ff426..2b8df63e6bc0 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -3,5 +3,5 @@ DIST py-cpuinfo-7.0.0.tar.gz 95887 BLAKE2B 8f5764db94faf41dc554353ac2a21416998ef
 DIST py-cpuinfo-8.0.0.tar.gz 99791 BLAKE2B 95024b488142e3bbb2eaa69ffef229ac27f1cb55e297fb8de050ec4c410c1b13dbf674936365d84c5c473158338dd047f6dfba58c2a7dde4e21232af356ab20c SHA512 77351f9f2fd33b09d0ee998dd2b3eb971bbe9094bee5636356d5a5a2747ebba3c112cccfdf929f77e3b7de3c745f98ecfac8edeb0d84fede100b637b554d4fd9
 EBUILD py-cpuinfo-6.0.0.ebuild 528 BLAKE2B d600632563dda508e9de69ef4120651646b82a9c919051261faa6b2e303f6a1ace445a431e7540eb8f3fd9c76eb0588bd1840bce67a626527e96c22a1f1b79fc SHA512 d3a4fa095d1460c345b1b3046c3ab08bce7059d3b6a7256dc52ef5cd321fa93fdeefaa77afc475ee3d4a49fd5a5b979629552add27fe5defe84d31e4df58eb86
 EBUILD py-cpuinfo-7.0.0.ebuild 502 BLAKE2B 8da0ce27db88039ea6c7e12f015433a466e440006b6e24a0d14c8a047b8abaade732757e3a276419b24844b156b4052abf67a3e4f5fc56355ea0eee63a9182a7 SHA512 884577429bf5fb17eec88d51836945657cc6ddb14fb4d693d9a5d40b181ca98e47c20a98d1a9dfcc9fa057a49e7639c8e0c59560fed396c5e51234482d812a00
-EBUILD py-cpuinfo-8.0.0.ebuild 472 BLAKE2B 746a00ba70302348cea2d27a1da56957afac8ab18352cce15c67e060773af44584317089d171fef08494e813fd6810f9e1cd61077186c67bd876d780ae6ce80a SHA512 1358d618a32065cde3d86609bee08ec59def01c8d31c1d09b2ba626b53749c598936fbcff069ce7ff5cefbbd822eabb1edc13c4866f1cfeb542926b73e130104
+EBUILD py-cpuinfo-8.0.0.ebuild 479 BLAKE2B 42b5bba08824cc62f278a9045f6e8db6b33f04abfbbe9fe47ebf04b51fc2face05a23577e1bb89200c50aa51ab4ec669e7ee60de06b188ea6defcf292e29827b SHA512 30164a051144fcc2d4f5878b1a789459414fb4341d4d567126cc1725004a42618650ebc7aa7388a25f005ae7882650e2e72895210551947e5c1fdd93f835eb5f
 MISC metadata.xml 531 BLAKE2B bc7a99b8d7291478da528dfaddf83ef3297f97ed7b1516a81291f36fe7387c7611b4ad84cad47a16eed622a1976e6e418dbc7a2d9e4a853ecd60bc991c1ee438 SHA512 e951485f6fdcbfb48512aafab5fa3bace39dc72a327888de2e38dc209490a5d7e897974b45e3fcff3fac965cc1e283a8a2bf15ceee131c5a48dfb593044928d7
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
index 6fa77056b701..4fed92486e6e 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-8.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index a502a5bcb3eb..bb47c1e5980c 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,7 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
+DIST pybind11-2.7.0.tar.gz 666200 BLAKE2B 4f78493ecbea5068dd9ab6771c9b33859baf3e14a82a6a3b361a11620ce6495763f94acca0c0a9512fa92343fa2ff91fa3e2ff7f30731bdda823b2b3fc139302 SHA512 529596c8762f463868f942ca9c4d3e4ed141bc09c734defeeace2b0250234c3359ef1f231997389fbffca849e01ba1feb8d7edc385745b6d964771aa67ced720
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
 EBUILD pybind11-2.6.2.ebuild 1090 BLAKE2B d257373dc4744344f2e862ae70e35e620e4af9b0947e53ab16255b5d3018defe9860f48f6b72952ee817c7cfade63b3153120500f0a0558553ed5ff7bd39837c SHA512 7ab5833a1cf3a908a0b20ec135926029738a44681ddc346a4c0a5a220cd9ff850bf7ac2739cf25a996e714cc7e34e5ffb604378c1a76dfe0c8f6057e01d75415
+EBUILD pybind11-2.7.0.ebuild 1093 BLAKE2B 554211e048af6889ba187b6685d374cd1784395c8a5b87c30a04929b967987ea0cf7c2c8fa0dacf218dd5b7621d871ea77e2982b20f21a9142a8de88236e5d3b SHA512 93d2a3fc91065335b4e6165c910a1e5afd553f7e295fe67da427f35fb744447b0cfaac413f58a7be60e2d22be5d3f955a675353fa5c1bed834ec5707d9c8ee68
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.7.0.ebuild b/dev-python/pybind11/pybind11-2.7.0.ebuild
new file mode 100644
index 000000000000..b477308fbbe4
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
+SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index bb7944768255..9656487a6210 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,3 @@
-DIST pycairo-1.20.0.tar.gz 344370 BLAKE2B b72a3dfd3ad6332f6be2c0fc0650ef87d97a51881bd239421cdb6355016e952093f9fa05b7872d7cce4a50bc4bac27ff0fb4c11e446e51ada9d7c1adc019a175 SHA512 d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266
 DIST pycairo-1.20.1.tar.gz 344639 BLAKE2B 7327a1b9aacc62eb7b2630ac2b9ce43ad7a44e60cb749b60a2973fb9036a84c1f3f4264da428d720158a5e32cd47f679d5956ebf3ce094e75d742584a68adda4 SHA512 bb2340170c1d39d50dd8ceeb1b6ceadd96ddbd27d78a8a5b7dadf7dc427558d766f65d62e1ceeae19ab200e7ffb5ad122b5e51daa8ef9bff08fcd97a44005697
-EBUILD pycairo-1.20.0.ebuild 1114 BLAKE2B 9d4513890596f702d48fcf67a67dcbd3026759afd9b5e209bcd4a3c1ac80cd1afe6ee0b513806a4517c6cc4ff683337ef4a561c5cb4fceeb73bed629ab31e9bd SHA512 117dfeae67a2586aa32ad8a14eea43e895cc2ae010516234228c5509919adc3de3ccc1a9034ef05abed374ffb76d74d83a86e0b8c124ec68bdb9b5140e4a02f8
-EBUILD pycairo-1.20.1.ebuild 1122 BLAKE2B da9b18fef5d40e4435a005bc0f0d7337af55feb65b460b161f11430e488cbae83b287fae6270c8ab4770955cb58f3703e445ba4064fe293e868cfdbdfd73e5a6 SHA512 4a3b82e0baebb7b431daf0675648df00781df81e5a80f3536fd66e861f4d4dca8db92c3a0d428d9ebf9531cbefa621dac92932bb91507c30e54ca51559962281
+EBUILD pycairo-1.20.1.ebuild 1114 BLAKE2B e05793de1c1559b8fe2225ca2bb720c4e213344068f827f80e7d68a237dff969891fa9161167989585cf1e40659aa5d1f213203c0b083707b2e143c190a72147 SHA512 731431901ede71b19fc57897224f1893af23daf9126261cc99e661da9c25a0cd04ff5ae4d6f6c58d4fb2218859b493d5f3fc484070c86bd08ff6f21b29c12643
 MISC metadata.xml 310 BLAKE2B f27144a3f463297efa01ba4b6d7198f455c9e62470e56e004cb2cea621e4f1f7d3adfc45099a60fe54d670debd0cce4aa68e2b34e756df8d593a150ac040d97f SHA512 0280f0bba6101b163ec1304d7f8fbc36d00d86cd7ce6f8c671dee74f7931aa363f5887c85cd8d582d4ba0cb78753a61efdbe38e072d68511ba3a66ac36aa490b
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
deleted file mode 100644
index e815623d2dec..000000000000
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests setup.py
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.20.1.ebuild b/dev-python/pycairo/pycairo-1.20.1.ebuild
index 1e68e62256d3..46b6f9bda451 100644
--- a/dev-python/pycairo/pycairo-1.20.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index aa3efb27fbe3..dc8d67cfdf60 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,5 +1,3 @@
-DIST pycxx-7.1.2.tar.gz 150865 BLAKE2B bbf78d88ca13fafee1239c354167b56cef2f1d56d20b0fc81d9a5d7d82096ab5d6a88802f411719cc490179314f87ef89b1e53c2b8a3a784566f9ff9d16d7cc8 SHA512 67f8d8d1ec6ce63c39695cd56c3276767d5cb4b6cc2fcf7daf5aea4bac11114f5a1fa4784ecdb35be708859cf07fc88c8e9f00b7fc808169708fd0eef1056a63
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
-EBUILD pycxx-7.1.2-r2.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
-EBUILD pycxx-7.1.5.ebuild 920 BLAKE2B f272ec40a63328845ea0c0b3b126e43bb2cdef89f9d9b9f92acec6c492d55009d9223409cfdc3f22cf18f8989c1b55839c1a4ff35bab09aed285c531521371aa SHA512 8f19f3f9af119f1b5d02641bd449a79e2afada5483321d3c6e4124674931d0c01a06bd870a4617ba1b8130f1bd5842f6ac1625a35b2aa8aa91b4f74fcecb4f2d
+EBUILD pycxx-7.1.5.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
 MISC metadata.xml 666 BLAKE2B 0a8399e3ae824bcc0eb1e3de5975bd8f13784b23e4f46cb721759ac443c814e431883a99c997f58cca0b9cde91ebc483e1723968ade62fb52d5347f8193cccb1 SHA512 4a948f43e4d44c47982f3ad341b60390bd57e1c1aa3eafd0e20bdf1a8bf4f861c446db90bfa3bcd6c7c206220ea3d5b884805b02ee6efddfb8c5dab4578aaab4
diff --git a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild b/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
deleted file mode 100644
index 6054ebaa5c9c..000000000000
--- a/dev-python/pycxx/pycxx-7.1.2-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.5.ebuild b/dev-python/pycxx/pycxx-7.1.5.ebuild
index 24dbb09ec861..6054ebaa5c9c 100644
--- a/dev-python/pycxx/pycxx-7.1.5.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index de79ce1060ad..9121758d5256 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,6 +1,3 @@
-AUX pyfakefs-4.4.0-py310.patch 10794 BLAKE2B 88da28df915be0fc9416972238dba6bd109eb8cf91207db609a0c5cf7a7377d0c11ac5da8a262306713d941657183a4780d8b919b796bc555faaa549dc229938 SHA512 a3a84c09c55feb27e375f04d8950b6dfbbe48e57f41beea3c799f278f82a9cfe9c1ed6af1a4f2a1bb3cad8b421a6492895d6f29712be81ebf69e1c1330ecc36b
-DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
 DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
-EBUILD pyfakefs-4.4.0.ebuild 753 BLAKE2B 5e24605cbbc6f544344db431610089413798bbaba684b9b21932a6042332c103f8a28eb4bc80c9cff440ec434c9c55f532c20e046f901d64311432dea63987d6 SHA512 1a70326d1c5c6b456536e5987060ba581f4b4a5d0a9b147ef8e3e4d3a8f16879d91b3c06b2403f633fceac948da06609696833d390b2ab48e681501eea67e4d8
-EBUILD pyfakefs-4.5.0.ebuild 716 BLAKE2B abf1044d03473c964214f5f7e36cf36ea3390b486d54c6b078a9963b740e6454f0cd5cb94b50049c27046c3227725194ae7efd46af2e0800f26f3b4271d2ad0a SHA512 0d5a6dc807f05881c63147de4478cbdfdb5e7616e10ee1beb39c3590913acb3cc1d9be50968d592d917018403b1835b2759b9ddf8c3d37e7c29d7c5c65d5cfad
+EBUILD pyfakefs-4.5.0.ebuild 708 BLAKE2B 02def91440e97caf02b12247f2ee7ebef8409f574f58cbd0c82ed02c0f0532037843bf5f63aab26f63d505db731f7b5f2a0de3fd2f21de0762d83e001fc554a3 SHA512 d88d36a2f8a045a487ece7d1a18c2d3202368e666b0528d3e0a21b46d67533d8541c9d28c989cc84e312fe9276b14a37e049fb45cfe2ca0f04c103869419f9ec
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch b/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch
deleted file mode 100644
index 6ef35df7d1f8..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-4.4.0-py310.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From a8a70bb7746ba24aa60c9915311e1ff5b402146c Mon Sep 17 00:00:00 2001
-From: Carl Montanari <8515611+carlmontanari@users.noreply.github.com>
-Date: Thu, 13 May 2021 22:44:45 -0700
-Subject: [PATCH] Add support for Python 3.10 beta1 (#594)
-
-- add Python 3.10-beta1 to CI
-- adapt fake pathlib, fix pathlib.Path methods link_to, getcwd, lchmod
-- handle dummy encoding "locale" introduced in Python 3.10
-- do not test extra dependencies with Python 3.10 (some are not available)
----
- pyfakefs/fake_filesystem.py         | 15 ++++---
- pyfakefs/fake_pathlib.py            | 64 ++++++++++++++++++++++-------
- pyfakefs/helpers.py                 |  9 ++++
- pyfakefs/tests/fake_pathlib_test.py | 27 +++++++++---
- 6 files changed, 109 insertions(+), 32 deletions(-)
-
-diff --git a/pyfakefs/fake_filesystem.py b/pyfakefs/fake_filesystem.py
-index 1e9bfc8..971dc93 100644
---- a/pyfakefs/fake_filesystem.py
-+++ b/pyfakefs/fake_filesystem.py
-@@ -114,7 +114,7 @@ from pyfakefs.fake_scandir import scandir, walk
- from pyfakefs.helpers import (
-     FakeStatResult, BinaryBufferIO, TextBufferIO,
-     is_int_type, is_byte_string, is_unicode_string,
--    make_string_path, IS_WIN, to_string, matching_string
-+    make_string_path, IS_WIN, to_string, matching_string, real_encoding
- )
- from pyfakefs import __version__  # noqa: F401 for upwards compatibility
- 
-@@ -293,7 +293,7 @@ class FakeFile:
-         if st_mode >> 12 == 0:
-             st_mode |= S_IFREG
-         self.stat_result.st_mode = st_mode
--        self.encoding = encoding
-+        self.encoding = real_encoding(encoding)
-         self.errors = errors or 'strict'
-         self._byte_contents = self._encode_contents(contents)
-         self.stat_result.st_size = (
-@@ -430,7 +430,7 @@ class FakeFile:
-           OSError: if `st_size` is not a non-negative integer,
-                    or if it exceeds the available file system space.
-         """
--        self.encoding = encoding
-+        self.encoding = real_encoding(encoding)
-         changed = self._set_initial_contents(contents)
-         if self._side_effect is not None:
-             self._side_effect(self)
-@@ -1177,9 +1177,12 @@ class FakeFilesystem:
-             OSError: if the filesystem object doesn't exist.
-         """
-         # stat should return the tuple representing return value of os.stat
--        file_object = self.resolve(
--            entry_path, follow_symlinks,
--            allow_fd=True, check_read_perm=False)
-+        try:
-+            file_object = self.resolve(
-+                entry_path, follow_symlinks,
-+                allow_fd=True, check_read_perm=False)
-+        except TypeError:
-+            file_object = self.resolve(entry_path)
-         if not is_root():
-             # make sure stat raises if a parent dir is not readable
-             parent_dir = file_object.parent_dir
-diff --git a/pyfakefs/fake_pathlib.py b/pyfakefs/fake_pathlib.py
-index b43b178..09933fa 100644
---- a/pyfakefs/fake_pathlib.py
-+++ b/pyfakefs/fake_pathlib.py
-@@ -53,8 +53,8 @@ def init_module(filesystem):
- 
- def _wrap_strfunc(strfunc):
-     @functools.wraps(strfunc)
--    def _wrapped(pathobj, *args):
--        return strfunc(pathobj.filesystem, str(pathobj), *args)
-+    def _wrapped(pathobj, *args, **kwargs):
-+        return strfunc(pathobj.filesystem, str(pathobj), *args, **kwargs)
- 
-     return staticmethod(_wrapped)
- 
-@@ -94,19 +94,24 @@ class _FakeAccessor(accessor):
- 
-     listdir = _wrap_strfunc(FakeFilesystem.listdir)
- 
--    chmod = _wrap_strfunc(FakeFilesystem.chmod)
--
-     if use_scandir:
-         scandir = _wrap_strfunc(fake_scandir.scandir)
- 
-     if hasattr(os, "lchmod"):
-         lchmod = _wrap_strfunc(lambda fs, path, mode: FakeFilesystem.chmod(
-             fs, path, mode, follow_symlinks=False))
-+        chmod = _wrap_strfunc(FakeFilesystem.chmod)
-     else:
--        def lchmod(self, pathobj, mode):
-+        def lchmod(self, pathobj,  *args, **kwargs):
-             """Raises not implemented for Windows systems."""
-             raise NotImplementedError("lchmod() not available on this system")
- 
-+        def chmod(self, pathobj, *args, **kwargs):
-+            if "follow_symlinks" in kwargs and not kwargs["follow_symlinks"]:
-+                raise NotImplementedError(
-+                    "lchmod() not available on this system")
-+            return pathobj.filesystem.chmod(str(pathobj), *args, **kwargs)
-+
-     mkdir = _wrap_strfunc(FakeFilesystem.makedir)
- 
-     unlink = _wrap_strfunc(FakeFilesystem.remove)
-@@ -124,13 +129,21 @@ class _FakeAccessor(accessor):
-         FakeFilesystem.create_symlink(fs, file_path, link_target,
-                                       create_missing_dirs=False))
- 
--    if sys.version_info >= (3, 8):
-+    if (3, 8) <= sys.version_info < (3, 10):
-         link_to = _wrap_binary_strfunc(
-             lambda fs, file_path, link_target:
-             FakeFilesystem.link(fs, file_path, link_target))
- 
--    if sys.version_info >= (3, 9):
--        readlink = _wrap_strfunc(FakeFilesystem.readlink)
-+    if sys.version_info >= (3, 10):
-+        link = _wrap_binary_strfunc(
-+            lambda fs, file_path, link_target:
-+            FakeFilesystem.link(fs, file_path, link_target))
-+
-+        # this will use the fake filesystem because os is patched
-+        def getcwd(self):
-+            return os.getcwd()
-+
-+    readlink = _wrap_strfunc(FakeFilesystem.readlink)
- 
-     utime = _wrap_strfunc(FakeFilesystem.utime)
- 
-@@ -461,19 +474,42 @@ class FakePath(pathlib.Path):
-             cls = (FakePathlibModule.WindowsPath
-                    if cls.filesystem.is_windows_fs
-                    else FakePathlibModule.PosixPath)
--        self = cls._from_parts(args, init=True)
-+        self = cls._from_parts(args)
-         return self
- 
--    def _path(self):
--        """Returns the underlying path string as used by the fake filesystem.
--        """
--        return str(self)
-+    @classmethod
-+    def _from_parts(cls, args, init=False):  # pylint: disable=unused-argument
-+        # Overwritten to call _init to set the fake accessor,
-+        # which is not done since Python 3.10
-+        self = object.__new__(cls)
-+        self._init()
-+        drv, root, parts = self._parse_args(args)
-+        self._drv = drv
-+        self._root = root
-+        self._parts = parts
-+        return self
-+
-+    @classmethod
-+    def _from_parsed_parts(cls, drv, root, parts):
-+        # Overwritten to call _init to set the fake accessor,
-+        # which is not done since Python 3.10
-+        self = object.__new__(cls)
-+        self._init()
-+        self._drv = drv
-+        self._root = root
-+        self._parts = parts
-+        return self
- 
-     def _init(self, template=None):
-         """Initializer called from base class."""
-         self._accessor = _fake_accessor
-         self._closed = False
- 
-+    def _path(self):
-+        """Returns the underlying path string as used by the fake filesystem.
-+        """
-+        return str(self)
-+
-     @classmethod
-     def cwd(cls):
-         """Return a new path pointing to the current working directory
-@@ -722,7 +758,7 @@ class RealPath(pathlib.Path):
-         if cls is RealPathlibModule.Path:
-             cls = (RealPathlibModule.WindowsPath if os.name == 'nt'
-                    else RealPathlibModule.PosixPath)
--        self = cls._from_parts(args, init=True)
-+        self = cls._from_parts(args)
-         return self
- 
- 
-diff --git a/pyfakefs/helpers.py b/pyfakefs/helpers.py
-index aa3959d..08962fc 100644
---- a/pyfakefs/helpers.py
-+++ b/pyfakefs/helpers.py
-@@ -57,6 +57,15 @@ def to_string(path):
-     return path
- 
- 
-+def real_encoding(encoding):
-+    """Since Python 3.10, the new function ``io.text_encoding`` returns
-+    "locale" as the encoding if None is defined. This will be handled
-+    as no encoding in pyfakefs."""
-+    if sys.version_info >= (3, 10):
-+        return encoding if encoding != "locale" else None
-+    return encoding
-+
-+
- def matching_string(matched, string):
-     """Return the string as byte or unicode depending
-     on the type of matched, assuming string is an ASCII string.
-diff --git a/pyfakefs/tests/fake_pathlib_test.py b/pyfakefs/tests/fake_pathlib_test.py
-index 5dcc57f..efea509 100644
---- a/pyfakefs/tests/fake_pathlib_test.py
-+++ b/pyfakefs/tests/fake_pathlib_test.py
-@@ -378,10 +378,11 @@ class FakePathlibFileObjectPropertyTest(RealPathlibTestCase):
-         # we get stat.S_IFLNK | 0o755 under MacOs
-         self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o777)
- 
--    @unittest.skipIf(sys.platform == 'darwin',
--                     'Different behavior under MacOs')
-     def test_lchmod(self):
-         self.skip_if_symlink_not_supported()
-+        if (sys.version_info >= (3, 10) and self.use_real_fs() and
-+                'chmod' not in os.supports_follow_symlinks):
-+            raise unittest.SkipTest('follow_symlinks not available for chmod')
-         file_stat = self.os.stat(self.file_path)
-         link_stat = self.os.lstat(self.file_link_path)
-         if not hasattr(os, "lchmod"):
-@@ -390,8 +391,9 @@ class FakePathlibFileObjectPropertyTest(RealPathlibTestCase):
-         else:
-             self.path(self.file_link_path).lchmod(0o444)
-             self.assertEqual(file_stat.st_mode, stat.S_IFREG | 0o666)
--            # we get stat.S_IFLNK | 0o755 under MacOs
--            self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o444)
-+            # the exact mode depends on OS and Python version
-+            self.assertEqual(link_stat.st_mode & 0o777700,
-+                             stat.S_IFLNK | 0o700)
- 
-     def test_resolve(self):
-         self.create_dir(self.make_path('antoine', 'docs'))
-@@ -968,7 +970,22 @@ class FakePathlibUsageInOsFunctionsTest(RealPathlibTestCase):
-     def test_stat(self):
-         path = self.make_path('foo', 'bar', 'baz')
-         self.create_file(path, contents='1234567')
--        self.assertEqual(self.os.stat(path), self.os.stat(self.path(path)))
-+        self.assertEqual(self.os.stat(path), self.path(path).stat())
-+
-+    @unittest.skipIf(sys.version_info < (3, 10), "New in Python 3.10")
-+    def test_stat_follow_symlinks(self):
-+        self.check_posix_only()
-+        directory = self.make_path('foo')
-+        base_name = 'bar'
-+        file_path = self.path(self.os.path.join(directory, base_name))
-+        link_path = self.path(self.os.path.join(directory, 'link'))
-+        contents = "contents"
-+        self.create_file(file_path, contents=contents)
-+        self.create_symlink(link_path, base_name)
-+        self.assertEqual(len(contents),
-+                         link_path.stat(follow_symlinks=True)[stat.ST_SIZE])
-+        self.assertEqual(len(base_name),
-+                         link_path.stat(follow_symlinks=False)[stat.ST_SIZE])
- 
-     def test_utime(self):
-         path = self.make_path('some_file')
--- 
-2.31.1
-
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
deleted file mode 100644
index 5e06b22143d2..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.4.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 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${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"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
index ba7f47bcc382..0eb0423563d4 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5c8dea3235a5..38b87e406824 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,3 @@
-DIST pygit2-1.5.0.tar.gz 255958 BLAKE2B 696a4c39920e7f66962b69d2a838c55bfb6f96e7e5ee56a39aaa732926accc3bb6331042382fd22f377959cbc129be0320d94765d13db95fdb7c7f87a14f7608 SHA512 3f915c855ad08641391565906023d231550a38d4e7f8938fad4634a30e2ee1c81e2a0d3289052426e21d2c14814300a0f789eaaa9f3e62c3ece73cf53803bb80
-DIST pygit2-1.6.0.tar.gz 265798 BLAKE2B 8244cbcecdd9b9edcb8fb0cfbc2024f1d36a01c8a3e519e05770ca80d7a482393892bcbd4a61402e7622b84f02909a2a36b9767273d6322a94a15eb974fdb8fa SHA512 c051ce09d227b6ec0c7d3068b5b0220f5c150936d788462dfb3236c97954f9b76f6a1fd61cd42e604810582e3d1a5bc8784fc51c9fedac66ad1b42af580af494
 DIST pygit2-1.6.1.tar.gz 258338 BLAKE2B dc223e2a5231728c42ca7e0581483731fbab6ee090cf4aeeb27f186973b3c753fdf54c89679a88b97d834d717135f9b8f9a2adf492ed8572affa938c79d0f905 SHA512 67a78313493ba096cbae6805bda861495f33644fd180b5fb1cd99dcd226ef5a09ee85bd27d04d0697ef15503a4e902aa1384980870551f430fd9560ac949fe2f
-EBUILD pygit2-1.5.0.ebuild 922 BLAKE2B 1194e0c9d03c3fa228c6a42d7bc17ec367d412648ae81b6d25e018d159905ffe90e52ef8f517aba36a71d22291e3b346a92e6867eabb9ef4aa4345277dae2a9c SHA512 03cdfa2c18acfe175da8ed168bbc3202a20141fb3d2094261296b2ce172ac72bd94016f209ff9e4f72f9fba662339e35128c04e8389695269204f294bb616b5b
-EBUILD pygit2-1.6.0.ebuild 925 BLAKE2B 3661015b79daa9bc00d7c5378eb1c540b1652562faddf85ee99ab2c3ec67d15eee66f00deb6ce0ee72e1166ace5dfc4992d478aaebd012f531d78f1eef403d26 SHA512 c1274ce98f9abecd8010e7bbd2a38f7b7ff94c12a9d1cc1a37c59761ef78693d359eef7e26558ea43cbca8725ce468cf2d8455ab06de18fc8ba2f906965a0abe
-EBUILD pygit2-1.6.1.ebuild 925 BLAKE2B 3661015b79daa9bc00d7c5378eb1c540b1652562faddf85ee99ab2c3ec67d15eee66f00deb6ce0ee72e1166ace5dfc4992d478aaebd012f531d78f1eef403d26 SHA512 c1274ce98f9abecd8010e7bbd2a38f7b7ff94c12a9d1cc1a37c59761ef78693d359eef7e26558ea43cbca8725ce468cf2d8455ab06de18fc8ba2f906965a0abe
+EBUILD pygit2-1.6.1.ebuild 923 BLAKE2B 8e2927d2c74fd1f1217fd1aee7c553fa624f744f1958bcb7e715ef8994d73b6e2334ccba47a9d302979951a9d5568b0e9399160bc3bfd5f663866f176fac1e01 SHA512 98a6eed6802b240f748fcb636497bc14b38f4b14b27ff1553d9d23df031406f0e12b7034a8d9f4a03303671c8310c14c8d6c342f847d98a039c2a0a70080c7ac
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.5.0.ebuild b/dev-python/pygit2/pygit2-1.5.0.ebuild
deleted file mode 100644
index 3e10d2d8997c..000000000000
--- a/dev-python/pygit2/pygit2-1.5.0.ebuild
+++ /dev/null
@@ -1,40 +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 bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.0.ebuild b/dev-python/pygit2/pygit2-1.6.0.ebuild
deleted file mode 100644
index b69f1d68cbe5..000000000000
--- a/dev-python/pygit2/pygit2-1.6.0.ebuild
+++ /dev/null
@@ -1,40 +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="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-1.1*
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-
-	# we need to move them away to prevent pytest from forcing '..'
-	# for imports
-	mkdir hack || die
-	mv test hack/ || die
-	ln -s hack/test test || die
-}
-
-python_test() {
-	pytest -vv hack/test || die
-}
diff --git a/dev-python/pygit2/pygit2-1.6.1.ebuild b/dev-python/pygit2/pygit2-1.6.1.ebuild
index b69f1d68cbe5..69a3e8d9cbe4 100644
--- a/dev-python/pygit2/pygit2-1.6.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.1.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.1*
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 4aa91ea0fbf1..6c9b3239656c 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 734 BLAKE2B ed35a25827668ed5ae2ef74170cd83c20f56989e89401037b878bd7d884e798e0451c167283712c3b25d735ddea72c9291b24fc7542f78bcfb35cadab37fed99 SHA512 e0962f74457ae1a742a8a5270238ebe2bd186d3970c4e07a625df073fb125781e012c6526a59b58647fa021e69474642d8852ab0b68ca79ab173ceeb73b6b40d
+EBUILD pyinotify-0.9.6.ebuild 735 BLAKE2B ce89673e9867029b172ebd469b8908103a05eadf2772347075eb7f919a45f9fd74a7e87e92a06fe667a6faf010600516658915d377a20945984fe517a4b0eb56 SHA512 556b10149750474008f6389d68f4a1e2e982755719e0643a591605490c83aae8b24f707d1f0f930ca1bf1ab1301712782afac90b1b3af61df9f61e868c708cb0
 MISC metadata.xml 367 BLAKE2B 5c08d19d51faf9166d5ef8a7660a7c50fcaab71709b68e8dee43ec6d06e02eda7bc5781b72631f8e7b877431e458aa21460c8aaa4d18132d6fe107c158c4033b SHA512 0d8e82046735575615d9bd70b3fea5a9c529368cb48b16fe1c3eb0ad850676b143846cd772ce899d259f764bc3b6260e257ecca3eb50be70d2df6e08feaaf810
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index bef1ccac9373..63be1629b761 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 3f84b385b984..d8f917c870c8 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,3 @@
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
-EBUILD pykerberos-1.3.1.ebuild 1276 BLAKE2B 3e0d4f901777c3198c986637dfa95d61b7729881c3687cf9b2fc462c5f9bfb7c108e8c179b18bd606e25e39fbf3341df610961b89137f4b160740be535d606d2 SHA512 b815bb91818fc186a1ee32ccf42ff31d61104c2569a4acc96472fb815592e74f48c803ef13b52cb61cb77c0925a32e89facae3176284718b2fb9875f3544c1d7
+EBUILD pykerberos-1.3.1.ebuild 1283 BLAKE2B 19ecf428a0c437ddd2fb5786cc67913c884625be7c9eb220a6a40ec03a503f4cc2dd62e8940a644a99da808512bc1444da38b65bb109bdeeee48601ce689cb90 SHA512 9fa37d66f2c00937a1b23aa675d4faf15c65cb3dbb36e9821965140f65d257bc8d0ad866d1333050f6f9bba8712d301471046765da61dcadaa1e0bf43e696d8b
 MISC metadata.xml 371 BLAKE2B cc0afa6647f1f23014d9c89b3efc9f16916f6d703b2866ceaaba5fb3ad3899f18823e7eff64fb55bc265b3159b31b0fe40c302e92f9ebacedaad597a77686230 SHA512 77d94cdf0eeac0b8cf610e916a59d4b364c0196622515fee47bfae41a226f8acbade3d2dbb760b53696cc71f4b1639ad7de670e633172f6142a48c96969e8f33
diff --git a/dev-python/pykerberos/pykerberos-1.3.1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
index 09b808a4d4c0..671c5af6453d 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
deleted file mode 100644
index 249fca122a7a..000000000000
--- a/dev-python/pyls-black/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
-DIST pyls-black-0.4.7.gh.tar.gz 5166 BLAKE2B 46ed7dc96b9f3b70edd1923133b39169b37f0d2d909bed41742690920dd7ea9b935dfa17b8d8f8ab43d9e3b3e18a99811c015ae5506e950e8775df8a34c79a83 SHA512 a68861a8283ab9118fa0a5bad6a751d5ece422813de12c98eba624d97742cf3f4e0b02d3afa43fb129bac00c54b9b2702bafd590d2d1489bd4af773ee68db7b3
-EBUILD pyls-black-0.4.6-r1.ebuild 588 BLAKE2B 5be9ec47d5b4874b489969aaeec5af60eace5bb2c3ed1388f6b3ef7ae4b7f606a38a16254ed2f46c1a996bdcb73a147affca934080eb3e35be02c6557eb28b8c SHA512 3f020431e190add9ee08c322634b8903fd702e693f0b4c234385142be66e22b3990e9308ba69c7f5861214c3d784f79fa182ccdc0cc1353b77e9d7d18b6747dc
-EBUILD pyls-black-0.4.7.ebuild 590 BLAKE2B 19ef9d5650f496c581c28c9364eaaefdeaa56b8bc510a165d60d67faa527c22ff13b1033897fee48bb6e183667f3e7365f2ea8f35303939794b16cd302df54ee SHA512 02c2e64ed715be64b3609798293349dc22bf4f60203d4edcc6f785e6264c5eba09364de8e8bea4a2cc9c4d3174040ffe2e514090570caae63c9c3a2afd0d3028
-MISC metadata.xml 412 BLAKE2B 7222f35dacb0ee8c88e71efc1f9c11c4f029f479102dc2410dbc0d61e7cbf129fbc76bfc7dc62f0ee784a02ff92b8c90f74230e6f00988d455e8f0266e39ec51 SHA512 6059d5f251b81ef9a2b29d379b3d19859e4f8f1aa8588044f1a36a69aaed932840cc9c200efcedfa7ec8f918d8cf1d9ce45b89d73323cb2b872a2e14cb782e18
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
deleted file mode 100644
index 7b06e078f1b6..000000000000
--- a/dev-python/pyls-black/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="pypi">pyls-black</remote-id>
-		<remote-id type="github">rupert/pyls-black</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild b/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
deleted file mode 100644
index ed69ccf14ff8..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.6-r1.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
-	https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/python-language-server[${PYTHON_USEDEP}]
-	<dev-python/black-21[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pyls-black/pyls-black-0.4.7.ebuild b/dev-python/pyls-black/pyls-black-0.4.7.ebuild
deleted file mode 100644
index 825e437521bf..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.7.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
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
-	https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/python-language-server[${PYTHON_USEDEP}]
-	>=dev-python/black-21[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index b24595c2d570..ccd5fd333620 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -2,6 +2,6 @@ DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9
 DIST pymdown-extensions-8.1.1.tar.gz 650451 BLAKE2B d72b4ff60747a5f2142b778d75ba438757f35e1bb45d1cf005c9ec7b187b8c6aa1e890ca1bf01b3a202dfd38c8f813c928041870a30bb2e0fc035e2a5ff9809e SHA512 a1472858b6afeb9b582cf97a4471e09e25dddcb0504d58f8aa703802fe0c075a0af2fa8e1895f02b48b5959297c37cd1feee789741d93a1739f9d19c3341b108
 DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00780ce081f9006a0d067c98c369433c147e42b93eab0dfaddfed6f93030ab32f0ae1c7c0ac3c08a1f7f07fee15a1be1a398 SHA512 220465b2a2d0f9563c119dae61d2527207a4f3a1d24ea1b1585997c9c23c4a7c0bbc23b4dc7c551e533ac3af20c7852cb7b8cce6dd3908844aafcd801d20e14d
 EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
-EBUILD pymdown-extensions-8.1.1.ebuild 1187 BLAKE2B d06ab2588741497006b6d79ceb4ed139dfc194c3bd38eb72878bac1aed762679cb9b3a1a040072323d54fd77d766e60285c501462e48174cb7ba0e4c7a3282e9 SHA512 8834351713a8403334c5022210d3a4c915bd99fdad7b97ab8621b8ea104b5060e4871abb624b593936684df6a8c44414dee7a2e711e0e6e75d6e022dbd172030
+EBUILD pymdown-extensions-8.1.1.ebuild 1185 BLAKE2B 42b00568115874f4cc6a7b0ba2dae3f34ecfe2463217f1c0283ced41f0140dd829eadacbcaccecec83a2aa0ebeeb27bf995de77027b5694a299b88e84a4c84c0 SHA512 e6a1fad2389362f42133bd54c13b8efa76f58db17c8aedc23b34538c2731433707117d88153b4ac914896ccdc08ef3d595478ce1e3ae55ef13f7ad8f9d60ea3f
 EBUILD pymdown-extensions-8.2.ebuild 1186 BLAKE2B c6b96e35f20edf2cc4739d8a48c3b5841da2600db2cf89617a9d8182ca2b87566278cc95e5e47b00e1baf28b87509462453285390d5db553846b3d4aea9f8686 SHA512 cf453c3792b8d8d9bda0713d24aece7e855797f42190d8d7f2e6df5046570303ac12f5447291e8691791ee1131fd29f6807b610e1fd100bdb555d955ca041353
 MISC metadata.xml 535 BLAKE2B 59f4bfe8eb59bcd482ed28ccb76baf82c3fb3ce15a3cf4fc342dc5ca8d0a0c47af6013a7c5d7888e93c1be22eaa326488580f3ff7764629081b754a2c650fb23 SHA512 a34f70e7d2acb37cd2aeed47b3b0d39899cde7c52450c83970e1b3b54575d32b621601783b6f29df8231985860d3ee9d59e9b007fc69f3cec4f2a2db1cfecd00
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
index d0916e0941d5..53d62a8818eb 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 127a068fa36e..4f2d9f12616e 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
-EBUILD pymdown-lexers-0_pre20210308.ebuild 558 BLAKE2B d98ba583587cee81e8345731e11aff62a000d14c01f843fb09cf942551107fc2b026ee4cd31a2edab9796d0a6009dbd30523e21367fa2f6b3b0773de32a55a7e SHA512 9915aee7074fb0ca123f36edde001054d64ada8151a1127c2e6d801f624f6d02f55629ddb853cf29f8fcb4bbdb2c01ee75b839518350adf0db9d7bf5f5cecbf1
+EBUILD pymdown-lexers-0_pre20210308.ebuild 556 BLAKE2B 554b38a1aa7a4703cdc31c948972f2fddbbf14ee55a1e7902442a505cc355099cb96870dce13015d7b39b7f58f8f389e547e488af0a24f0ab5508f6873d0f185 SHA512 d5cf32b8f8ce028255652f2cd12fc15de7d89852b4cd456f17e3598c5f95010e539714cba9f20bf159dd0d4081ddbabe62ab2dcda37ea4b26e569593d2aaea43
 MISC metadata.xml 641 BLAKE2B 0dae0d22b6178cbfc32aa39edae5fad524fca8a26fc1b2b38bb1b07ee3c7296a8161dab003b114b2df0532bfead33beef86aa113dde8f74a374d0cd45ffef91b SHA512 9cc74eebcb0b409b11ff6135a4940c3534d7309bf9845d0948686939e7769dd86dc963209343f6950d5c1273c0c6f04ed3fe44c6d4ae1ffabfe2e98af8cfd7b5
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
index 5e7103789cd8..6c4ffc243f19 100644
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index ce833137140c..7e7e68fb9349 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
-DIST pyopencl-2021.2.3.tar.gz 450895 BLAKE2B 0395ee6ef32baa57fe9df0c9960f5d761cfced1cc8b87e51e7ebcc7cda6a6b651fc491acf6be525239576fedec2a8375935799fc77568e131dcb26436a59c6f1 SHA512 41ef44eac0112ceac15c1260198a0bd642c244f3ad45aa1d7feba70b55a3f257ce01f7c5a8eaf2ce1df263492452055286caad004101d8bdb2d4f7307fb339be
-DIST pyopencl-2021.2.5.tar.gz 449527 BLAKE2B 922970c6aa93d2ce600c1e107fa3303c42bd44a264f7c38b30c8d2c909ec12e4cf8fa21dbaffa558c7b183141802ac13fe1a1032230b611b56503cfbaeae40c1 SHA512 a8784e0c6ae9a3c2d8f463405d5bbfe4ac1df138fd5f1ca8ce622afaab787333574c6ee8f4a828c09dc36c1b7a5df8fbe5d70e2236be32d457c3e1cbdeb880e5
+DIST pyopencl-2021.2.6.tar.gz 450194 BLAKE2B be9d0bf653f77d33a4337deab9189a5a9031ff50526444283c6fb9f8625d0451cb211ff703b5eb86c18beebb973f8f7a7cc93da3efc6bb4e95cd533d633fde93 SHA512 b7bea4903a34104c538545c611554c1651ae7a94ee56d8c7129a88a9e547911fac085617b4238fac33534c9b981bcfdb9fabd716456a86fa428cfd42d9cb128c
 EBUILD pyopencl-2021.1.3.ebuild 1491 BLAKE2B 627fcf87c2a199260cb4697729d7fffe01dd0da7e0146fe6c981a7e2673c97496bfb1d90fd5c7354b64bb7a7f871d46b692855db6111f9cb4f559595de0f90f0 SHA512 820bbe51273f64d1f5aa2e781e68baebbc6ebe014b281b3c477876442e9a218d3cdad26b693aaacf48fba07df450d4c754b7356c140c553de9e6908b6af6447e
-EBUILD pyopencl-2021.2.3.ebuild 1495 BLAKE2B 31a08609895d8c8f7f7e3578bc02a13d4be00b0bfc3c18fa72790b61294e8b139aafe497e9acbc3aef4556b001bbab8189a6032b116a76e82d2bd36ba4c78f84 SHA512 8aa8bc4ab3bf426cab9e441489c0d537e51306ebef8a5fe2d26f7e6cb37599defd807ec140611c5d0fdc6e6a139ab84eb8d8a80bbbd43820b71bd8dd04863571
-EBUILD pyopencl-2021.2.5.ebuild 1405 BLAKE2B 68d74cea97af5cdaf30ab8ec8305410f1b9cb64bc5763429111c0a818e7da8ecad1de916779acc8f4a2ee0b1195205938d325a61cc5a55ec31eb0fe685d8742f SHA512 99ae298854a27a57682f2932b952d5e0b34f0c5a7056bccc06169a37421304bcd9e5a2232ddd730f83018a1f46a5e07ce7926bee7e51ff96f46b5019eb5a87d4
+EBUILD pyopencl-2021.2.6.ebuild 1405 BLAKE2B 68d74cea97af5cdaf30ab8ec8305410f1b9cb64bc5763429111c0a818e7da8ecad1de916779acc8f4a2ee0b1195205938d325a61cc5a55ec31eb0fe685d8742f SHA512 99ae298854a27a57682f2932b952d5e0b34f0c5a7056bccc06169a37421304bcd9e5a2232ddd730f83018a1f46a5e07ce7926bee7e51ff96f46b5019eb5a87d4
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.2.3.ebuild b/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
deleted file mode 100644
index 32a5237b3e9e..000000000000
--- a/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
+++ /dev/null
@@ -1,57 +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="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl"
-
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
-RDEPEND="${COMMON}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${COMMON}
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2021.2.5.ebuild b/dev-python/pyopencl/pyopencl-2021.2.6.ebuild
index 9c4b6ac92a78..9c4b6ac92a78 100644
--- a/dev-python/pyopencl/pyopencl-2021.2.5.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.6.ebuild
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index aa40231d792d..5e7f6e260a26 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,7 +5,7 @@ DIST pypy2.7-gentoo-patches-7.3.5rc3_p1.tar.xz 6932 BLAKE2B 730c52170dc5b6e893dc
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-7.3.4.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
-EBUILD pypy-7.3.4_p1.ebuild 4832 BLAKE2B 080ecff775d6d41f2ded992943f01c485da9dc3af9393abf3a38a2b4ae750585f89ad367c988bf9ed4592fe1db57676b1a4d3cf0363018e0a74bf47a0a18c47a SHA512 461e1ac7cce22891ee37b232c6156e8e829a127b05d7d358d2522a44c4e3df03c9feb2d88706d10d3ed2fd01d11011e18296d5dac8bb28e79de99a2abdce7472
+EBUILD pypy-7.3.4_p1.ebuild 4830 BLAKE2B e71ef5eaf761e2b805b3130c5f008573c088dfbff05ad135bce23e62549f5c1f3570c2c98486d2fe8e852e662574e27e089db25c14543994c31a5bdddb7915f1 SHA512 9c53907ede4770731868c4343923bc929824c63482bc090bde040874544a056aacb45df1a6b2b098febf658ba050facc3ee650275cd62b91dc8044e875612b23
 EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 EBUILD pypy-7.3.5_rc3_p1.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.4_p1.ebuild b/dev-python/pypy/pypy-7.3.4_p1.ebuild
index 193e85b762a2..5900a0ab55e7 100644
--- a/dev-python/pypy/pypy-7.3.4_p1.ebuild
+++ b/dev-python/pypy/pypy-7.3.4_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 2b5dc40c4879..198873509ef8 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,3 +1,3 @@
 DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
-EBUILD pyspelling-2.7.2.ebuild 1341 BLAKE2B 7de879854980c9690de5459caf5e620d06fb691a2077d2621a187964f7d8ac2201a0398f64b0da0dff9e575f857c9549b04273990957318b46657a7d634db7b9 SHA512 e8c7626558166281791fa12e17d2642fb3a3a6b154d31f265ec0084a64921595ecec32f2fe6b90713d69491537e37b69607afeb86c16b9c2bfe62ec272ddb525
+EBUILD pyspelling-2.7.2.ebuild 1339 BLAKE2B 96a39eebeca78294d1953d455a4565d90a2aedfdb3296e7f7e87c7ab7a21e36a0f1336dab2a23bc1601c1b5d0cc5b0686c4ecf84e8845153d8f4ddd5aa4ef9e3 SHA512 a87e64846eb564529264ed0144a1ffc956ddc6a508b4ccc3d88e733b7cfd419c877a3aa6085596f361c7857827c5e58b1073b3c8d24da8d7d087fe2c3dd5e4b9
 MISC metadata.xml 1922 BLAKE2B 0c37a511b81e5cbd3c859848c6dc5d6956534534a21a680abe897692e7da6f399d0cf9c0fbfde9e2246cd20fee7c7884f26c4a3362532b6888346bd559cf11b0 SHA512 64ed2646fb3210997ba08dc3a4eb33299d30015d4060d0bc3a24221ca1067aec99c907efa870092b3eafe1d5724524022d74d8f6feafba3013b65f7cdb8b2f9c
diff --git a/dev-python/pyspelling/pyspelling-2.7.2.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
index 3d26b00785e9..c22deee77eeb 100644
--- a/dev-python/pyspelling/pyspelling-2.7.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index eab7bc63e7ed..2e8759819115 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
-EBUILD pytest-django-4.3.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
-EBUILD pytest-django-4.4.0.ebuild 1290 BLAKE2B 5485f3b3a0685d11d34267831f9c41e2dccb086e3873b7cfec931a1ccf719d49bf037bb0e0dc2c1712a3a9f9a442b6787576ed7950c845b4811d05576b78c7f9 SHA512 bb0d2381f2d5450565f064d923488eb6139cd47f426deaf598bc6d7525c1ab2263a005be86f7a64473fd985b5a9cf04966df56dac10c96dd9bd05a73491ec542
+EBUILD pytest-django-4.4.0.ebuild 1286 BLAKE2B d897dc82fa35a4e9fc9d3eb2d71bdbcabd36451a873ac04bc890d179dd1552c73fe4e7bbdaf6378b919ecb8186e048420d181a5c1f56351f324a4fd18ddfd8fe SHA512 b58642feb8472dc8ec0081173ada5c6535b58d206304acabc48c48516dd6e7d3531d0b1812b705a88d22e139bfc5b9506da1040ad57fafa3aadced56c2bb5059
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.3.0.ebuild b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
deleted file mode 100644
index f5c36d290b8a..000000000000
--- a/dev-python/pytest-django/pytest-django-4.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.io/
-	https://github.com/pytest-dev/pytest-django/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-django/pytest-django-4.4.0.ebuild b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
index 8f1caf61c800..c106be4d96c2 100644
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index dabe2c99a1c7..8af4a3b88b59 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
-EBUILD pytest-env-0.6.2.ebuild 444 BLAKE2B 637057885a5fe01b05342ecdee6c12ab116cad3438173041b2eec1dae58533acebcae0d20794b8ea6cbd774a0c1b3d8ad022a5ba8cd5c1293df5d2d5af74977a SHA512 9f5d18f32638bc02999536f24a95270ec37a273bd549e88afeb05772234afd00c03d1f459987effb446ba028a87595324d3f3be88b440da1c6cfc3dfc5694d4a
+EBUILD pytest-env-0.6.2.ebuild 449 BLAKE2B c4d50baaebb0d4521e622423dfa9aa40b94986c9a6cb418c74dc06d64ae88b3dbc164f70296247e2e49dbb7170b21e8a57a4ee0b79d1bc97452322fd38478b9b SHA512 9713ba407480c7b978850f77e0eaf9e1a790f725b235a6ba3e0287c910b4cbe0acb2cc17460ad0411f644285c02ef9c3c41a35ae1833e1810bb3e26ceb54dfff
 MISC metadata.xml 382 BLAKE2B eb1fdd8ca4d109c876623b0bfc00b9689e3cbd34593ffc00e6738f143f797887f469eb3304d084e3665eb3566365eeb3dd87452c60279da2f839becd1950a990 SHA512 2262a2ea6b21b75e76f056122ff0dc21e3a5970ab982de1d5b6156105bfdf1e3a7afa2ccb2d5d9e9f57b18f74b3c0ce067d87048829cc85c917d86424e816f94
diff --git a/dev-python/pytest-env/pytest-env-0.6.2.ebuild b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
index 1f49f7caae58..bfa82056efcb 100644
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa"
+KEYWORDS="amd64 ~hppa ~ppc"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index c7164d0dd624..2a3f66e3dbfa 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-v2019.1.8.tar.gz 10274 BLAKE2B 1d232817e99909738f7f37466ba22fbeadf75f4fbfdd9b61790dd79418bedbce4ee219e5102ee2db1709ba991e323ce6edffc68c4e3a657c58cb628b505de098 SHA512 d5f4db3ece8b0e1719c4d1213a5e07a3c53257b089d3d74f90cf86f21a7951983a95286c7753f5e9486acc7e482d79c2a95d5a7b8eb22e19c7048db99fa3c421
-EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 822 BLAKE2B 1e6411d1145360e4049a703b94e01ddba7214bef7b31f405092fe1dbd9bd5b98127369f692f111585694c6bb74b04f6a5afadf4a7164b58272048038291d9600 SHA512 3261593e567e887ef310c852ed2ce804dbbf278392ab0e1c29a2c24971d128bb85f70f4c520c237c483228173feced754887d83a7a86a63634024374458fd665
+EBUILD pytest-helpers-namespace-2019.1.8-r1.ebuild 829 BLAKE2B 345691a4f76889eaf53383b98c90a4180928c1e30d5b1e392ed2f9105dfa6dea85d9a8e40ea12371681eea0ccdd3bd5774dd17c2ea52532aabeb807c5f3e561d SHA512 af664d73031b7474bbda6e117034cfd82a9a1c2291a5439cd8395d18041aac1dae2eadebfe976c4affc4ae752da3f6b5bda8ab513b1f80a5e62d02a69daa6479
 MISC metadata.xml 415 BLAKE2B 6a073523c1bc77be20e0332514be3e351f5d83a22b5b03f4445ef136c37ffa07e779e32ae9f254306f2af2541ab47b2246ba7556a954b135b0fa70467688b09b SHA512 52e0c48feaa7d06214876c9efe87eaf0f27785aa095c013c5d6365e2a277eb56ef894a1bf5de754779d84ab38ab6deba2b5a68aa338b8d5735c6942beb214bc2
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
index 68cca9d51a2c..37fea95827a4 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index b02cef2e7f9c..602919263233 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
-EBUILD pytest-salt-factories-0.121.1.ebuild 1732 BLAKE2B 40b25f2bfaaa83760dc91ffe291c49a6894f02216ba19f5d02d060c07a33f213e3b8dfbf3c64d752066df1eb40eec249433ad18410b407a8a8dd2b864d5f9c4d SHA512 0efe47206b8b0eaf74e56789a7fb3385c0c93ceb7d85271cbfa9d70d0ba813cbb0e71a50f9a5ba1b4a42757ff4d8d89131ee15457fb76bbc616da87999703211
+EBUILD pytest-salt-factories-0.121.1.ebuild 1739 BLAKE2B 2af58377499c95034448eb9701207cd0df64847757290e58c1e9165d2c5116a6c5fc4791e9ac0b3a3c60d90024d2465227df391011f00d15e36dc04ee23cc22a SHA512 906121fe13c0285af7329b42a3688ee18f558d32e856a84977434130b32a44c8235f374f01c3333db2878904753ad21ca0e32d977c98cf46b298aa35becdec7b
 MISC metadata.xml 357 BLAKE2B b94cb0c96e720905214dd706d61a7280f2209def7f2eaedf553d83204ee49fdb4c6f668531bbc39f9bc0ea32a728293d1c7892b6c1eb8f2babb185cd32b5d709 SHA512 ed4155a008f387aad4cbff6a314c5240484901f0bef50a3225b16ae1068ee4e01288b4c3692a9a075785c98140a20d51d17b44504eb77da3436ddefb3c0ce017
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
index 9242c9775557..ade1afad5dbe 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index e67d3bf4bb60..226b19e71403 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-salt-2020.1.27-r2.patch 744 BLAKE2B 43eadb0fb01406efb9e67388a6b0ca5a021ae6ec622ec5dd5dfb1ab9575489c711dc805ce64e1373e4a0044490d71132ff4eb9584f3e9f2fb043a168d18d8349 SHA512 b0a0d56dc7d5ab43a1970488128c97de5f2c266523889896cab53040cb8eb426bda88cd8d641d706b6d09fbaf1b3f439cbfe947264cc004e766e6cc84350076f
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2020.1.27-r3.ebuild 1118 BLAKE2B a4c0e7158b9c7b97e9677415a99a0c382581a394fca6f3d89008ae7d1f4879aab41a6cb9504690373c0a9c6b150bd3bc6f858d22ebe335a4e7159802453dc98f SHA512 d0266bd26017043833368f7553d054edebfb39ae0fad5c8f21e808a92f8a2b09c0c871e0cc1123010184e48f6854465bb66a2c041391e4a0597b6d9a0433b7d5
+EBUILD pytest-salt-2020.1.27-r3.ebuild 1125 BLAKE2B 97653e44532eb94f12e62a998588c8263f1e642038f32b83544621c1e7d046737187a9d79d73a6ef689871f1f476da390c718ce228fd1f4a78641cbeb567576d SHA512 dd7056b03b43e5c6924d46fa7dbb15413d75b556a594f02ad6c1eb42a39e7104037d511c7d7e064158e0a012f7f737f5ab4e4d31e429890393dd5913d3099881
 MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
index 71b7c59306f1..22e46b7878fb 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 # See bug #740882 re salt/tornado dependency
diff --git a/dev-python/pytest-tempdir/Manifest b/dev-python/pytest-tempdir/Manifest
index 07d3e1cebd75..71a56719b4b9 100644
--- a/dev-python/pytest-tempdir/Manifest
+++ b/dev-python/pytest-tempdir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-tempdir-2019.10.12.tar.gz 9859 BLAKE2B fe4d32d2de3d577952b90a811c38f1cfa0c16badf9115a1b70faf07f0123e29935c01bfc3c1b9c616a0eeb3e0da9f42a4415687a4862830e0edea505a99dfc04 SHA512 d6f8994423d9be90f4be20878f980ad4604475ccd4b65975cd3cad357c2d6a2a7bb8623e4ccd7441437ad72b7899d8b59ae19ca3a52c35a6c24456e44b7626de
-EBUILD pytest-tempdir-2019.10.12.ebuild 643 BLAKE2B 09379357f9edcf733b727007e48fb6bfa2549039688869c5b2841f54d04798aebad2a6fe51ba45820c84e017d33c8df9cb1ebedc308b3880d6a39b76fc8b12aa SHA512 93b3ae6e7e05071b62f608ca7f74c30dee24bec7b50da7c565db6f620d6eeed3e419249026c4f26a19c5d644d1a8945ab1206081e42e478467ebb95874c8cf99
+EBUILD pytest-tempdir-2019.10.12.ebuild 650 BLAKE2B 5ece3b87dcb9fcf28b757198af4f049a5f2c8e458107f109541dc00be6bb9b6dd814f8709f947857526275d2ce5a202bf1be961114ec2ffdf8c94e68ec29b67f SHA512 c5676a39f3aa7b7a123df72481e89142cbe1e373254a4aeea2ce04ddf2bca98449d186005c792ce4cfd3d24429e252dc8be7b7fdf0eb1c973ae5203798fc35be
 MISC metadata.xml 326 BLAKE2B 9e3ebe5f21ea79c1bcf36480d71363aacbd79499aa6ad5c2189aa08f4383400eed646a05c5f820bb803405fe198b4981cb5cbabe737c89a5f92e723eeac13285 SHA512 a221e01e2f66ab996b06e4dfaf6c8ffca79849e635ecb5f443574190a33e934b8e28839d142571cf8eb1f360ef418ed529b60a60fe5d99c0ba208e37cc0bf784
diff --git a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
index 42bd6f50ccbd..f347e2e070f7 100644
--- a/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
+++ b/dev-python/pytest-tempdir/pytest-tempdir-2019.10.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index 08fb1e64efa5..d4944b5c63ff 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
-EBUILD pytest-trio-0.7.0.ebuild 1084 BLAKE2B 9ac8375cad78d0ba31f4a0aeb7be8df0a4306de898a144b6c29f903e13358690a828c90e3cad36f661343058147a19f1a3e0af3f97df79e6c46420a6f57ca2f6 SHA512 b9b075ea6a20475f02aa7364020b0b7899531b69bd8bfa0c02aecd30d91459eef50c0f3c4283d5a0d2e03db27fb43f15321a3b3fe8108373c7aa3a44667117ce
+EBUILD pytest-trio-0.7.0.ebuild 1101 BLAKE2B 28bb8ffb9091eb3c837df4f67e37a534f819df97ecfb5325c9f1470a85d1ffba597c389e1962c205dc37812eabb28154d96900442260f242f5e2cc71a8fe268c SHA512 4c407e6a2a8f4611aa3bcac144baf4189735798f7b5d47c6210a1e4389b4be43ce2898968a1c82a05d9b1904b6c49f52d78af3a60386750cd73f84b7d2a0aaff
 MISC metadata.xml 419 BLAKE2B e4bf5b235b2b851e2677e138ab488308deb5265d00afa1c5ff2760e817c7a8c9fdbaeb095bf63ad6c9ff0a5dbb60df5c047b6ab9564c590becb7da76a3258db0 SHA512 1d21a7481afb771ee6507f6475f9460bd0f8441de68987e2a31923091b33bba4a9fe5d6a8ec0b313d8277942656388c1ae6fb9b7cc0de601655762b66b111e0a
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
index 7f687059bbc2..11892c344258 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c9ad7b78ff18..89a418593031 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,11 +4,9 @@ AUX pytest-6.2.4-py310.patch 1288 BLAKE2B 7fc0054de8a991f71fec041372839b8df52da5
 DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.2.tar.gz 1116980 BLAKE2B 7e74050f01fdc4b1ba8a6d703915b0d707305e6e8299917fff8e0cedb873f998c9a904728b77e7234718016ccdac15d491d10411c582d1bfa60d2450a8a2fa7b SHA512 a81def83759c550c169b3db8ed43b4df40433a88acb663e2e9422ef562149ed52041724b7f3cc5d0d6b532f2243a8d9a9614ffbcd87ed571f7fdde7f036c2297
 DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
 EBUILD pytest-4.6.11-r1.ebuild 2471 BLAKE2B 159e689c5597088979d0d1d0e9be37b0128f2a3bfe54cd0bc11ab6c4d7c26fca121a0bdaeaa1621964aa24d8b03580f0a00663a1b77a6a62195d031deb1bc712 SHA512 4533c66af3f820c63437504655af8607923ff0b0d386a38073dd32eaacf0f47043d3b31e6cca1aff353aeef7b82ea747737270db1e8cebbcb2fe69750fe24898
 EBUILD pytest-5.4.3.ebuild 1938 BLAKE2B e40cc338970d931c7cd51b5a6377f5d73cae21789fcea2a6f2b401f92fb9dbe6e12c45b3357a10b76c0d6bc11708f35b8fc65a3b7084328b5664c0ad2baa6c77 SHA512 dbfc71f4a77d366a1eb55d38a1c8f209f6e6d42fe22d0604a5695d8e99faae05883b82fec45b7192399ccbc7bddc25997291fca9638edc01d961b292190d25e1
 EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B dddcee1dba302a810b80dd9832edc6af6f044ab728497498b5b4b762dfbe383d7255fce15b0615c37c3857ee2353546de2ee6b7093b01651f43ad4df7cbbfaf6 SHA512 e9ba570887b4ff0889abc2db20b3de2e634be5ba5ba60679f45c466006d3f7626c329c65f427b1cc6ede1942d2786ef4da44528a82d8be09752e1e028dcad2f6
-EBUILD pytest-6.2.2.ebuild 1680 BLAKE2B e415039d858be4f81b542b7c82d1781c61cad61c52575b145d9781057af6d12490c45a85d583add9dcf1555b0932a1db30beea6ecee45f9b7bcfcfcc2b62875b SHA512 0e4d8dfe3eed27af6c5ba337928ee417776b64dbaeb0dc8e8f163f6c7b3c62ddd0906f4a94250b21651bcaa088f865a7a485907123fe45a2a39b98b018e5c3af
-EBUILD pytest-6.2.4-r1.ebuild 1721 BLAKE2B 930d9090a3cd0c3e33d0b55bfc73711721c49fefa217d554be5d029966e00275c6b1694853cd5ec3832331e4df9ade9f0ba4a0539f3b053ed4519b4d5dee40f2 SHA512 ddf8d993ef02a0df97989c478896284a587653d57b0002b9747785aaf96e2c16502a7cf54c96ab1e9b5f9da15182d34d7bbe133a52f28fc263305d8e6ab4e2f3
+EBUILD pytest-6.2.4-r1.ebuild 1713 BLAKE2B b410805cb4f066f290490eb30ed49f9612b1090fe1fb5ae6c3e3f25e4b4225a77356e30ac68bc7a13081f15af4d971a49d19b233e099895304b465f9db6c5be8 SHA512 f7f7aed5d4655e3412250117f7015867e48e6b7111e95f3bc2e70d0791b662eb0cdb3f76b55ebef67051e5df4f61be7c36756045f02fc2324673c31c3cb91e2d
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.2.ebuild b/dev-python/pytest/pytest-6.2.2.ebuild
deleted file mode 100644
index 68c99e5b183b..000000000000
--- a/dev-python/pytest/pytest-6.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
-	>=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-python_prepare_all() {
-	# fragile to warnings from other packages (setuptools)
-	# little value for us to run it
-	sed -i -e 's:test_no_warnings:_&:' \
-		testing/test_meta.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.4-r1.ebuild b/dev-python/pytest/pytest-6.2.4-r1.ebuild
index ced1fbce5e57..de8a62049379 100644
--- a/dev-python/pytest/pytest-6.2.4-r1.ebuild
+++ b/dev-python/pytest/pytest-6.2.4-r1.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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index 86fb94f95d63..03fb8bf1811e 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,3 +1,5 @@
 DIST python-backoff-1.10.0.gh.tar.gz 15546 BLAKE2B 4e2ff1f63a4659c9dbf3135f32da44d4c127909178ffe0fe6935cef43558d61087498d0cd31260396da0ccdff360ee1025db2c0347fb865468abffed2f4adf49 SHA512 9a874a12462c56e8559d2d3d85508f546c397c9d419d1d9ab81d9a046d27b338068f6baeb768fa78b43eccd299de71ec7d1471c4fb153f8c02e6f7292f56b285
+DIST python-backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
 EBUILD python-backoff-1.10.0.ebuild 650 BLAKE2B 35dc9679fe73c508d9195200938545769084c06a61e08c2f52d3640743da205f0a3ab4730fb3137334388ea01c873a3a6ac1adf90326bf281fc015ec65e8d870 SHA512 523df6c47ad667885884ff686175244f555a7804eb073ea00ec0955030fa7a05ca9b9f4eb00ec1c3eee88826a5659d27f805e4d749911d122f960d6995c1dd32
+EBUILD python-backoff-1.11.0.ebuild 649 BLAKE2B 0e3701d5ba806bffd57f2c1323b69dff208c218fb7f05b54ca3cd6ac341fa8fc9d73af9747c81ff94680a66194b2eb089e9b7cc92c0f81844b44e3c5e5e969f3 SHA512 6405271093cab8a9c5d38d898ba82214ee99e475fd2cb23bafeb233097f6c96ab7d660c95f307d0b4bdec24dae165dbf0335dd0a2ccd075cfe944716728019cb
 MISC metadata.xml 386 BLAKE2B ad575b5fbec1d1816f4405f05e092307346a49ea9d70f38ac2429823efd2dd5538a5b5c039014e948bc1e1bc4b7695c62dc90345a232389c185645f11120bdad SHA512 83267ec512b870806fd0cd9d0c8bec3d9a42c8e54b0121b6345f1188626812efff0978cdc727f955bc2b02901741e69a9b20e9370454ecd7a6d8ef562b94a520
diff --git a/dev-python/python-backoff/python-backoff-1.11.0.ebuild b/dev-python/python-backoff/python-backoff-1.11.0.ebuild
new file mode 100644
index 000000000000..0d27ca00ec2d
--- /dev/null
+++ b/dev-python/python-backoff/python-backoff-1.11.0.ebuild
@@ -0,0 +1,25 @@
+# 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=pyproject.toml
+inherit distutils-r1
+
+MY_PN=${PN#python-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
+SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index ca031abfc524..c7b7050f4c76 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,8 @@
 AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3537 BLAKE2B 7f36974a98f5e6ff1961e91542e7c0ff8ee1d62ec4a400a8d8e09f60625660a5d76001855f876aedad7a66980fc5bab8cc2168436e8eddd9f2acfda0682c96cf SHA512 f540e9fd12d98d4d9ea2033187644856d7c7591e4a68f6143fb9335ff367a5b82f0dfdac90ba1ae8141d46a92f6a29015bfd71640fba60967571de4dfa8648bc
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
+AUX python-dateutil-2.8.2-system-tzdata.patch 3495 BLAKE2B b3d5ca203731932044f16bcde48f8f981f6907ce8a9319423d41eb0baf62331d472c1a5dd72ec3ac1f059296423adaea18bd4ea6d660add56cfd73ea86f26bf2 SHA512 44d2f3f9f0c04401cb545dc0a757b682eb3a9a66e63cf64121e75243cebdfa53945c6ae9bf197cb6b754c9732e9407fc9384aa45b2d7181740bb1ae23af718fe
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
+DIST python-dateutil-2.8.2.tar.gz 357324 BLAKE2B 060f97280b63ed70e6d83fa5696af6dc3c729cdf5bc48c7a90e3e59eb0cc0360e5205536685550330d64ecc9b6e40ca12888409d6819dd136b17a67add2ec4e8 SHA512 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c
 EBUILD python-dateutil-2.8.1-r3.ebuild 1340 BLAKE2B 8f8e2e3d36045f209552b16a6df0e5648a7410865b0d7116e747bac5a59a13a9e72d9583a953b14569ded3442bc7a414005b77f2952368e2d98f10b3a4c3a373 SHA512 38476d0ba7a9d468ad98c98000e65304afe65495d4e90c5294425ff3634102268956b976937a935aec70aed31faec12164cc993c49330f4cd8f775643a917fc6
+EBUILD python-dateutil-2.8.2.ebuild 1112 BLAKE2B 2029671dc44c981f31e18aa53a3d8f54d6ead96e96b2d9c2b4c61fa47fdadf0b25914028607c1d5eb8b4237b2bed424b9bef1ff807f7028ed84c601739ef0af0 SHA512 c26177bbc9348e49b285b8ce6eb7a9e197ecd7253b161d6bdf89efa10dd18836c6e1ce351fef77454e73a8953ae33dee9f9ec4df1a4283342c3538060583a21b
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch b/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch
new file mode 100644
index 000000000000..3790a29b4213
--- /dev/null
+++ b/dev-python/python-dateutil/files/python-dateutil-2.8.2-system-tzdata.patch
@@ -0,0 +1,104 @@
+From 907459c6f632a87fce5729f6eebd2adf5b94e577 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 3 Apr 2018 22:03:32 +0200
+Subject: [PATCH] zoneinfo: Get timezone data from system tzdata
+
+---
+ dateutil/test/test_imports.py |  3 +--
+ dateutil/zoneinfo/__init__.py | 25 ++++++++++++++-----------
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/dateutil/test/test_imports.py b/dateutil/test/test_imports.py
+index 60b8600..b9f517c 100644
+--- a/dateutil/test/test_imports.py
++++ b/dateutil/test/test_imports.py
+@@ -168,9 +168,8 @@ def test_import_zone_info_from():
+ def test_import_zone_info_star():
+     from dateutil.zoneinfo import gettz
+     from dateutil.zoneinfo import gettz_db_metadata
+-    from dateutil.zoneinfo import rebuild
+ 
+-    zi_all = (gettz, gettz_db_metadata, rebuild)
++    zi_all = (gettz, gettz_db_metadata)
+ 
+     for var in zi_all:
+         assert var is not None
+diff --git a/dateutil/zoneinfo/__init__.py b/dateutil/zoneinfo/__init__.py
+index 34f11ad..e3f0f94 100644
+--- a/dateutil/zoneinfo/__init__.py
++++ b/dateutil/zoneinfo/__init__.py
+@@ -1,6 +1,7 @@
+ # -*- coding: utf-8 -*-
+ import warnings
+ import json
++import os
+ 
+ from tarfile import TarFile
+ from pkgutil import get_data
+@@ -10,7 +11,7 @@ from dateutil.tz import tzfile as _tzfile
+ 
+ __all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
+ 
+-ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
++ZONEDIRECTORY = "/usr/share/zoneinfo"
+ METADATA_FN = 'METADATA'
+ 
+ 
+@@ -19,12 +20,14 @@ class tzfile(_tzfile):
+         return (gettz, (self._filename,))
+ 
+ 
+-def getzoneinfofile_stream():
+-    try:
+-        return BytesIO(get_data(__name__, ZONEFILENAME))
+-    except IOError as e:  # TODO  switch to FileNotFoundError?
+-        warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror))
+-        return None
++def iter_zones(topdir):
++    for dirpath, dirnames, filenames in os.walk(topdir):
++        for f in filenames:
++            if f.endswith(('.list', '.tab', '.zi', 'leapseconds')):
++                continue
++            fpath = os.path.join(dirpath, f)
++            relpath = os.path.relpath(fpath, topdir)
++            yield (relpath, tzfile(fpath, filename=relpath))
+ 
+ 
+ class ZoneInfoFile(object):
+@@ -48,7 +51,7 @@ class ZoneInfoFile(object):
+                     # no metadata in tar file
+                     self.metadata = None
+         else:
+-            self.zones = {}
++            self.zones = dict(iter_zones(ZONEDIRECTORY))
+             self.metadata = None
+ 
+     def get(self, name, default=None):
+@@ -99,7 +102,7 @@ def get_zonefile_instance(new_instance=False):
+         zif = getattr(get_zonefile_instance, '_cached_instance', None)
+ 
+     if zif is None:
+-        zif = ZoneInfoFile(getzoneinfofile_stream())
++        zif = ZoneInfoFile()
+ 
+         get_zonefile_instance._cached_instance = zif
+ 
+@@ -140,7 +143,7 @@ def gettz(name):
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].zones.get(name)
+ 
+ 
+@@ -163,5 +166,5 @@ def gettz_db_metadata():
+                   DeprecationWarning)
+ 
+     if len(_CLASS_ZONE_INSTANCE) == 0:
+-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
++        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile())
+     return _CLASS_ZONE_INSTANCE[0].metadata
+-- 
+2.32.0
+
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
new file mode 100644
index 000000000000..3ef5ec777d0f
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
@@ -0,0 +1,45 @@
+# 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="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.io/
+	https://pypi.org/project/python-dateutil/
+	https://github.com/dateutil/dateutil/
+"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/python-dateutil-2.8.2-system-tzdata.patch"
+	"${FILESDIR}/python-dateutil-2.8.1-no-pytest-cov.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 9c905995d877..1b7621eaa2b6 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,5 +1,3 @@
-DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
 DIST python-jose-3.3.0.tar.gz 126578 BLAKE2B d1279d2a0788b4d395e760ee3a1b2ce8c9340ad12ebe103cb1ba98aea33566cf0134d5af75be9727fff96adab4fc88f1b471ba9ea7d36c16de10587a9efd1304 SHA512 de7147cc6e12406d6e459c32829acae46395acba727c53e65bc05f4794ee3050eecd355e3ae2e87f4ebdbd871f53822eea08a10f25d7ca6088fc6128dc7d9637
-EBUILD python-jose-3.2.0-r1.ebuild 1252 BLAKE2B d2a90b8cb648ee500eb53e177793101d5b6bb3ff3b899327fed9cc34ff27e4f7028bbb0d3a23d14373279aae07642fff089e3a2dcfa593492ca7a30fff2236f6 SHA512 fb8e25206927f2df6513e022fd2633cee0eaf709d55410eac69555a906161d5a41df96e7d8f4072d880631b5fedf22ea76b6dc8211cb59271d4ab93932792dd4
-EBUILD python-jose-3.3.0.ebuild 1045 BLAKE2B 05a04f299dc5c336d2ce2df7658453fc9137d13823af2cadde8b9ebbd001c9739109c38043f6bebb4bf64acc5554cea44fff7014a0347bce2d8998f0da4a1039 SHA512 97978a1ca6885f3521486411d5286c25ce21957a3ff81684316e3fde1f53fa3b5c9b4655eb086b6839dfc7c7ce8907c31995267393e441b2fc3937d707f779ae
+EBUILD python-jose-3.3.0.ebuild 1043 BLAKE2B 929b999150b6123e191b3d64d11b64b7a2ab8c49557938d4c27211800e671a6b9b5a4ce2931a5a48229c5f9140f70944bfb8074a146ea58fa29a3de9e048ee51 SHA512 368b5f6f72400d5dbafbf386708b6639bfcfcecb4f106d3bba382f512e470b4a1f2bf89ab3230f353206a151ea24f7881a5496856113e6053aaeae7e289c04de
 MISC metadata.xml 569 BLAKE2B ded16eceef718c98d5b51e15f3342262f07a57626e4f83cc851d0505112938351c0cb01e74bd9ac2bd190b2ee3f1ef4c5b748e37c7128e9b1861a48d2fa6e3e5 SHA512 9d2dee6efdf0bf24fdfac3b55a213331ec0696e58f8f101758efca0d56477c666ebd0184a573ce53c93cd00047b06d33f9bc4de33a43f96562f77a8c21a65747
diff --git a/dev-python/python-jose/python-jose-3.2.0-r1.ebuild b/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
deleted file mode 100644
index a896c8929b37..000000000000
--- a/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
-HOMEPAGE="https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/"
-# pypi tarball lacks unit tests
-SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.3.1[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	sed -e '/pytest-runner/d' \
-		-e '/ecdsa/s:<0.15::' \
-		-i setup.py || die
-	sed -e '/addopts/d' -i setup.cfg || die
-	sed -e 's/sphinxcontrib.napoleon/sphinx.ext.napoleon/' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		tests/algorithms/test_EC.py::TestECAlgorithm::test_key_too_short
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/python-jose/python-jose-3.3.0.ebuild b/dev-python/python-jose/python-jose-3.3.0.ebuild
index 5623443b5629..3b1de02e732b 100644
--- a/dev-python/python-jose/python-jose-3.3.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 # TODO: require only one crypto backend?
 RDEPEND="
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
deleted file mode 100644
index 2c6374804614..000000000000
--- a/dev-python/python-jsonrpc-server/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
-DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
-EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B f9c096ed5ed2c0c762c301431193ed80133ab21c09b8c26187618f0b70a83dcfc1f4d665e452bc9ba694dcd10568db79786b7d0968d2c9955aea11c01e3ae147 SHA512 1a78d051d72373ecf324abbb6bd1e1c0bb8120c5c3f32208e2062cefc781b936802defabac414699518efc3220359630d61da6d4674cedeb5dbf0954461cb662
-MISC metadata.xml 366 BLAKE2B e8d4fa851e8430fc170e86701301b78af07fe2619a749aa5ddb21bca3faba59407bfce4e727b2dde95c52b9951725b2367c560eb3479de48ab5052f6c30ec222 SHA512 1b6b62d650e143cc4c0de9047b541489f9db4da3fd654e27bf8d8622e428a8a3e587ecc8bbaea8248e964b2d25c28d6ceb77be57f06704bf90a2f6baa18c4f4e
diff --git a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
deleted file mode 100644
index b639d69bbd04..000000000000
--- a/dev-python/python-jsonrpc-server/files/python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/test_streams.py b/test/test_streams.py
-index 6985aec..9e64489 100644
---- a/test/test_streams.py
-+++ b/test/test_streams.py
-@@ -119,6 +119,7 @@ def test_writer_bad_message(wfile, writer):
-         hour=1,
-         minute=1,
-         second=1,
-+        tzinfo=datetime.timezone.utc
-     ))
-
-     assert wfile.getvalue() in [
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
deleted file mode 100644
index cc81d1f0619e..000000000000
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">python-jsonrpc-server</remote-id>
-	</upstream>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
deleted file mode 100644
index f19ac1fc6571..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-)"
-
-RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-fix-test-with-ujson-3-and-up.patch" )
-
-python_prepare_all() {
-	# Remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
new file mode 100644
index 000000000000..fd2fb09cb625
--- /dev/null
+++ b/dev-python/python-keyutils/Manifest
@@ -0,0 +1,3 @@
+DIST python-keyutils-0.6.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
+EBUILD python-keyutils-0.6.ebuild 703 BLAKE2B aa0847246a0e2a527865ba06e02051dc2c3b4c9d3bf2e838947960a9b40a037646938c74c19ba72c1a0565b5f941bb7697deadaf4855bc349cb99d26de24a694 SHA512 da1fb4c3bbb7e5501803b273a5c0b0fdd04e1b01ff75ec6a1fb5e59a7217732f60144f63d17ec05e64cc84dd6ae5f2ae2e29cc0b5e0dddc307b01d9eca1a54a0
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/dev-python/python-keyutils/metadata.xml b/dev-python/python-keyutils/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/dev-python/python-keyutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
new file mode 100644
index 000000000000..3934da52194c
--- /dev/null
+++ b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A set of python bindings for keyutils"
+HOMEPAGE="https://github.com/sassoftware/python-keyutils/"
+SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/keyutils"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	sed -i -e '/pytest-runner/d' setup.py || die
+}
+
+python_test() {
+	ln -s "${S}"/test "${BUILD_DIR}"/test || die
+	cd "${BUILD_DIR}" || die
+	distutils-r1_python_test
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
deleted file mode 100644
index 90011ef1965e..000000000000
--- a/dev-python/python-language-server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pyls-fix-test_folding.patch 1238 BLAKE2B 1942a7d0b21a25310c2fe361e7a91cd122b5131e75fe2a73e2251a8af7d83678dcfb04e2332d3f7d1bfe9c82cb2d14afff59e354b116169eb5323a245ec5b0a8 SHA512 688036513cacc382159cc8872d55664081020b29e530a4695863dec9bbdca7f728398a55e4b8f1359b0226cbc09d4bb791fda9294ae3141ab1b2797493f2fc32
-AUX pyls-jedi-18.patch 2620 BLAKE2B acd80d45c93096f8809f901381e04ac88a869c8198ddc30991ecde98690567df0740334c07d870b8bc9ccf149fb0534f2f4d03007493189c1a6e853e5833ac96 SHA512 804308c6ce4d6189bf65f33397550d10b848e109a7f547f4bda80e9a78b68921225369667d9c72c3dbb954bda8a35af038596fac3b4ae026f952776f9bbb2c16
-AUX pyls-numpy-1.20.patch 2387 BLAKE2B 98178536140797b12e0725d407ed65df772560eed8cade7d00a8f0c7ef691e8a6cc3141babbd337da6482e959b32c7666eef6ce35de41ec1a52328aee5b8c7ae SHA512 c5708708da39ca18162a567f8006a59b5255e3a46c209b1ed7a0e309280cc5fc606c39dbbd259f7103854ccca9123fb478ebbd95bc0ca420343672b453ae7bd3
-DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
-EBUILD python-language-server-0.36.2-r1.ebuild 2609 BLAKE2B 47972e2b5a39aa5f26f31e753aa9861accdf0aae48f9988d9c3172e7a59efac002ca1f139a9e9a91995cf2a887cf1781b826eeb0c01a796a6027f629758edbfe SHA512 032c5bdf6bb8f29787d75bbe4253bf0c4d72ce53f37155533c826aec8758ea91174581d72f458dfa9e86c1920ab6586a6092f47ed6a6faf26442000c8a7721f4
-MISC metadata.xml 367 BLAKE2B 5ec493b91dbf785b84d4596f7f019f3be92e239cc1effc38fa7b98e762d06ea60c6ab8203aad5bb5fa4b4fecd7fcfde5a1397469b179ecfec720ce06187dac34 SHA512 57e659d74065826e25af609c7a1c20f540b1a67fddea4697602b16901ee4905883742377284795baf4c8a2eab4716afaf209761d684207941a3406f0d55ef92d
diff --git a/dev-python/python-language-server/files/pyls-fix-test_folding.patch b/dev-python/python-language-server/files/pyls-fix-test_folding.patch
deleted file mode 100644
index 6980053bf48a..000000000000
--- a/dev-python/python-language-server/files/pyls-fix-test_folding.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d3c52c7b9debd73073650d22a3aa6e86d5491aa Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 1 Apr 2021 21:33:38 +0200
-Subject: [PATCH 2/2] TST: accept folding of decorator parameters in Python 3.9
-
----
- test/plugins/test_folding.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/test/plugins/test_folding.py b/test/plugins/test_folding.py
-index 05f0cdd8..91ac0f3b 100644
---- a/test/plugins/test_folding.py
-+++ b/test/plugins/test_folding.py
-@@ -1,11 +1,11 @@
- # Copyright 2019 Palantir Technologies, Inc.
- 
-+import sys
- from textwrap import dedent
- 
- from pyls import uris
--from pyls.workspace import Document
- from pyls.plugins.folding import pyls_folding_range
--
-+from pyls.workspace import Document
- 
- DOC_URI = uris.from_fs_path(__file__)
- DOC = dedent("""
-@@ -146,6 +146,10 @@ def test_folding(workspace):
-                 {'startLine': 62, 'endLine': 63},
-                 {'startLine': 64, 'endLine': 65},
-                 {'startLine': 67, 'endLine': 68}]
-+    if sys.version_info[:2] >= (3, 9):
-+        # the argument list of the decorator is also folded in Python >= 3.9
-+        expected.insert(4, {'startLine': 9, 'endLine': 10})
-+
-     assert ranges == expected
- 
- 
diff --git a/dev-python/python-language-server/files/pyls-jedi-18.patch b/dev-python/python-language-server/files/pyls-jedi-18.patch
deleted file mode 100644
index 1410f3a81dd7..000000000000
--- a/dev-python/python-language-server/files/pyls-jedi-18.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 40afab312a6bf0dcd620c82e59555ea2967aacdf Mon Sep 17 00:00:00 2001
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH 1/2] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
-                         not sym_full_name.startswith('__main__')):
-                     continue
- 
--        if _include_def(d) and document.path == d.module_path:
-+        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-         'configparser; python_version<"3.0"',
-         'future>=0.14.0; python_version<"3"',
-         'backports.functools_lru_cache; python_version<"3.2"',
--        'jedi>=0.17.2,<0.18.0',
-+        'jedi>=0.17.2,<0.19.0',
-         'python-jsonrpc-server>=0.4.0',
-         'pluggy',
-         'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
-
-From e442467312fe967bff5f893b7e3f92da133182c8 Mon Sep 17 00:00:00 2001
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:37:25 +0100
-Subject: [PATCH 2/2] Curse you Python 2 on Windows: os.path.samefile not
- implemented
-
----
- pyls/plugins/symbols.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 69a09fe9..ef8e7fb8 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -36,8 +36,14 @@ def pyls_document_symbols(config, document):
-                 if (not sym_full_name.startswith(module_name) and
-                         not sym_full_name.startswith('__main__')):
-                     continue
--
--        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-+        try:
-+            docismodule = os.path.samefile(document.path, d.module_path)
-+        except AttributeError:
-+            # Python 2 on Windows has no .samefile, but then these are
-+            # strings for sure
-+            docismodule = document.path == d.module_path
-+
-+        if _include_def(d) and docismodule:
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
diff --git a/dev-python/python-language-server/files/pyls-numpy-1.20.patch b/dev-python/python-language-server/files/pyls-numpy-1.20.patch
deleted file mode 100644
index ab1c5032ff46..000000000000
--- a/dev-python/python-language-server/files/pyls-numpy-1.20.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 48f5eca25c2da064bcc9aa0fefb5de525bec618f Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Tue, 30 Mar 2021 20:20:08 +0200
-Subject: [PATCH 1/3] don't test np.sin hover for numpy 1.20
-
----
- test/plugins/test_hover.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_hover.py b/test/plugins/test_hover.py
-index 2302b865..f36bcb29 100644
---- a/test/plugins/test_hover.py
-+++ b/test/plugins/test_hover.py
-@@ -46,9 +46,13 @@ def test_numpy_hover(workspace):
-     contents = 'NumPy\n=====\n\nProvides\n'
-     assert contents in pyls_hover(doc, numpy_hov_position_3)['contents'][0]
- 
--    contents = 'Trigonometric sine, element-wise.\n\n'
--    assert contents in pyls_hover(
--        doc, numpy_sin_hov_position)['contents'][0]
-+    # https://github.com/davidhalter/jedi/issues/1746
-+    import numpy as np
-+
-+    if np.lib.NumpyVersion(np.__version__) < '1.20.0':
-+        contents = 'Trigonometric sine, element-wise.\n\n'
-+        assert contents in pyls_hover(
-+            doc, numpy_sin_hov_position)['contents'][0]
- 
- 
- def test_hover(workspace):
-
-From 3ee06dac069e27edf6231651ae27bff78ae8aaff Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Tue, 30 Mar 2021 20:21:20 +0200
-Subject: [PATCH 2/3] test snippet support with builtin instead of numpy
-
----
- test/plugins/test_completion.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
-index 247c2c23..91df89cb 100644
---- a/test/plugins/test_completion.py
-+++ b/test/plugins/test_completion.py
-@@ -216,14 +216,14 @@ def test_completion_with_class_objects(config, workspace):
- 
- 
- def test_snippet_parsing(config, workspace):
--    doc = 'import numpy as np\nnp.logical_and'
--    completion_position = {'line': 1, 'character': 14}
-+    doc = 'divmod'
-+    completion_position = {'line': 0, 'character': 6}
-     doc = Document(DOC_URI, workspace, doc)
-     config.capabilities['textDocument'] = {
-         'completion': {'completionItem': {'snippetSupport': True}}}
-     config.update({'plugins': {'jedi_completion': {'include_params': True}}})
-     completions = pyls_jedi_completions(config, doc, completion_position)
--    out = 'logical_and(${1:x1}, ${2:x2})$0'
-+    out = 'divmod(${1:a}, ${2:b})$0'
-     assert completions[0]['insertText'] == out
- 
- 
-
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
deleted file mode 100644
index 46b054f2ca60..000000000000
--- a/dev-python/python-language-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">python-language-server</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
deleted file mode 100644
index 19de44f065be..000000000000
--- a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/autopep8[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/pyls-fix-test_folding.patch"
-	"${FILESDIR}/pyls-numpy-1.20.patch"
-	"${FILESDIR}/pyls-jedi-18.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# allow the use of jedi-18
-	sed -i -e 's/jedi<0.18.0/jedi<0.19.0/g' python_language_server.egg-info/requires.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-podman/Manifest b/dev-python/python-podman/Manifest
index 537499301b7b..1231e1621af2 100644
--- a/dev-python/python-podman/Manifest
+++ b/dev-python/python-podman/Manifest
@@ -1,3 +1,5 @@
+DIST podman-py-3.2.0.tar.gz 165514 BLAKE2B 7e25d160b98e45cc147069249d850b3a3d6dac5227942d90ed99b8313befd9db04a6423015ae56959a53eeeb49958d9067eb6fb7127ee55bf50ebfcea617a220 SHA512 8ef165847de5fecd81e7b5564baeaa0298efd4d2e6f12e1dfe958eed77f945d9375d90ba93a8ebab4b090b228d451e96ce49d08288dc3daae1255a05127b25c7
 DIST python-podman-1.6.0.tar.gz 28733 BLAKE2B ef36b80d99be07def311c2a8574cc36131760b39f0c80fb8707fb99ec9c2234e297724fc662f936217f9c2ec24fed0f57fd680702fbbac0e8411fc7c90da0577 SHA512 e7d730f8cfef0944df82ee73edb858e3cfd76a91dace98a2638341a1eb3ba5b9076d52f2f634cb4a94e082a83553412cdb1c5b79041d5bf4615998d67bb4a03f
 EBUILD python-podman-1.6.0.ebuild 823 BLAKE2B f53c3b33eaab6ef349942cd7a293a91f11b1902d4dc9f7c011b01770de58079bbc7d9dd1716b9e5dfd86fca7a7acbefa30040eea05218e5cc67f47e4ced00ee5 SHA512 406df830e9a0d9d57beb33df9267fd103be8353cd7ff2925c04deb1f575857818b85f9009da4af473ccbbfd424bdf66f0eb3192d9da8133968a36779bc29e8fe
-MISC metadata.xml 377 BLAKE2B 75e5283150b5ef215448569254a4707ed648adc52a99664775fb21e1d49c4a0af6b6b559c5829aa759a20412a0f36b73a28b3375e5310b76a2648652e82e6fce SHA512 db373251d8bcd61548e6f173f071b399f93f253d311195f74ee2a07ac0440d934a7b5a1f838a8629f986dc6032780a5bc0be3b6665127d610fd7fd28586f143f
+EBUILD python-podman-3.2.0.ebuild 1044 BLAKE2B a9e0fb891cac4ef6fd2a973df6d0472a868ba45966f76360a93a4a924535be7abf9086797106ac6f195c0d0539617478489e5fc831a5261097198516651564b1 SHA512 f21cf86bbb0f9fbefe1a31294638df3a3f2678c1935d8d47605b32a5a245f6b27136e179dfb9905fc0b243caab93d8db49b3b7c3249bc9f19c5cae0a6174d2f0
+MISC metadata.xml 478 BLAKE2B a5456f4437b36f5720e217997a25f414eda48247d6720cb67b43034e1eb9748d1058c818aafc5ee342f7c4aec7789c2706c05fefd321d8f74bec475125af00e0 SHA512 c2513eb754a47f0c4e72cfdbbd3cfdded27fbcea247439531a3ac5ff74b7f346d2f9a03a17a4fb8fca8853b76c979eddddf4800d322404a9a9ccc1a8e6dbcdf5
diff --git a/dev-python/python-podman/metadata.xml b/dev-python/python-podman/metadata.xml
index 1264cba62cca..345f5fb9555a 100644
--- a/dev-python/python-podman/metadata.xml
+++ b/dev-python/python-podman/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">containers/python-podman</remote-id>
 		<remote-id type="pypi">podman</remote-id>
diff --git a/dev-python/python-podman/python-podman-3.2.0.ebuild b/dev-python/python-podman/python-podman-3.2.0.ebuild
new file mode 100644
index 000000000000..58c9d7fd927b
--- /dev/null
+++ b/dev-python/python-podman/python-podman-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# 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
+
+MY_P=podman-py-${PV}
+DESCRIPTION="A library to interact with a Podman server"
+HOMEPAGE="
+	https://github.com/containers/podman-py/
+	https://pypi.org/project/podman/"
+SRC_URI="
+	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
+	)
+
+	# integration tests require a workable podman server,
+	# and it doesn't seem to work in ebuild env
+	epytest podman/tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 5bfad814a2f4..3e2288e9c18e 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,3 +1,5 @@
 DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a
+DIST pythran-0.9.12.post1.gh.tar.gz 3612135 BLAKE2B 1c0650d249a0834a488aba6f48d1130b8897b4b220523d3aaa0f7557609f9cfcc208563980b6855132199fd394b45404c4c15c961380ea2089121c5c9eea65b2 SHA512 71a9dec2ca9eca85a2b3e52022e262135b4f1642d646bfc66323bd8b7545a11351d70aaec0fd90d82dc0ba23ec6733a30c8d807e5d90ff5c208d2995a6ac6f83
 EBUILD pythran-0.9.11.ebuild 1183 BLAKE2B 7c810169aff4d52fe1d23dcbb0dcf75a61f342ae4b2e7f47b01c8ae966389638cb38700bf06fa3e1285d8664706dbb6c6bbcef528a0e76652bb0bf5b8d5b0dd7 SHA512 53c038ee10e4411ade77b3917554f46a38354cd4855e854df6842654f4ba3d6c3ab616d4898ba164bfea2c9b38939ea2aee8b7adc6ecca25625534bdea7fde6b
+EBUILD pythran-0.9.12_p1.ebuild 1119 BLAKE2B 9d5b29d81e994b29b5463d6b9a3cd1dedd732bd2a15315c0fbbe3489873d1e8cf53d2abf1a0a8a7a1960da57bb79fcdadf12eb5aac08b05805a6b25734dfd850 SHA512 cc528373ec1f9d0cf50256422dd8f074b4f9066b578004e45a0a25fc99ffa9224591897d50f2cfce6266d83cda5e239b2a93f1c01d83105c970dcd999230e8e5
 MISC metadata.xml 353 BLAKE2B 3584e4357ca55b22b1bf1c707b22df13999c358ce3968fd968c2cb94db6014e325b6782b8bb2b6e97a7a6c584081fa974ddf01ea88103b51cbd0bd2b49300bb4 SHA512 13435a1f1b2de15e825165e9d71ad3f12f29f32fe55694b7e504b76a5b6738bf4ff7b2626b0c956a1edb66d744b3589dac320eca4af0db5e6c55f3ddf537550f
diff --git a/dev-python/pythran/pythran-0.9.12_p1.ebuild b/dev-python/pythran/pythran-0.9.12_p1.ebuild
new file mode 100644
index 000000000000..6cf9f49801e9
--- /dev/null
+++ b/dev-python/pythran/pythran-0.9.12_p1.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 741e97943c5d..f44bc948bfd4 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,5 +1,3 @@
-DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
 DIST PyVirtualDisplay-2.2.tar.gz 40882 BLAKE2B 8fb2227928c8475994e4e54a42dada2b1921678adcec562d9658e01edc0e356aea714cc9a507c93be66d9c61dceeaadde4f22cc636504f4403e985ac2df96248 SHA512 33567d12fc63359869e4baa2413794e9caacd147a5b6ffe2ca79e1292f6174ff7e04371fac5737002fccc6654d0a5dd44907fac774b666ca10588185c5c5f7cc
-EBUILD pyvirtualdisplay-2.1.ebuild 1130 BLAKE2B e09b3b90e6867f9a31738696ea25bf50e341e7f076dcd045b1eb686df36e1c3b0c432636f5f56517472c28298f6b58dd5d9c2650beb66d8af2ef868a30dfa6c4 SHA512 dee845a6a462ba14b0c2091f616a3928522f58b613d86b3f254d931eba196f654d039c62888eb2a3c0263269319776450fb89309b3ae22c8b1115f032b9dcd6a
-EBUILD pyvirtualdisplay-2.2.ebuild 1133 BLAKE2B b8c5b468a7516728da6f0bb9d6b6b4628a4852b6f65483a6b85912c286d7cc8f66d3714c25a81ab1094a6f4e75e45f2688ec75a06dd43db424e75898171a46e7 SHA512 5c8d43fac9b06b697db7374e09e34ed11ac4ea4f83d1de6eeaf1771bc97c6f44bbac9ca1ee262238098b7bb1d671850eecba44f127866422232246505962a5a7
+EBUILD pyvirtualdisplay-2.2.ebuild 1131 BLAKE2B eb088fec885e10696c04bb4e202168f476a69b4215ca0e669b2d492ce12ceb97498cec1ba98d7214b04e83a3c1a0a1393fbde80fcbddda4963449aef30e5dbf3 SHA512 1aa8a3d997f9ae67a0d148aaa0838e808bc0400b3fed3d011e4f0cb6e7f5ac2fbb1cb16299ccc0265a6ab14c0159277e8726800e88a6a7e6d949467456601df7
 MISC metadata.xml 462 BLAKE2B f073d91b8a3d4abe16621a1f22c7e00b650dfb74ffe5685803c2b1dd828d1f4cf7f182b008077daceb7bb43ba740901b5edfc8b2c5b8dcb6509ef6eb670348d2 SHA512 4c68e76fbddc9f6d840287dc38c5c869c6c258f160dcb684da50d0bb7749f0ed3580e638eb5b4a6c2fc38b66909afe0d502fde0a9799e0ef362016e8429a2451
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
deleted file mode 100644
index a43d0d517c0e..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_P=PyVirtualDisplay-${PV}
-DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="
-	https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
-# tests hang in xvfb
-RESTRICT="test"
-
-RDEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep \
-			'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_7 python3_8 )
-		dev-python/entrypoint2[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyscreenshot[${PYTHON_USEDEP}]
-		~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-		x11-apps/xmessage
-		x11-base/xorg-server[xvfb,xephyr]
-		x11-misc/x11vnc
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
index e61794a73854..96aa8f862014 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
 # tests hang in xvfb
diff --git a/dev-python/pyyaml_env_tag/Manifest b/dev-python/pyyaml_env_tag/Manifest
index 6560137ea140..fd0ea02d1eaf 100644
--- a/dev-python/pyyaml_env_tag/Manifest
+++ b/dev-python/pyyaml_env_tag/Manifest
@@ -1,3 +1,3 @@
 DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
-EBUILD pyyaml_env_tag-0.1.ebuild 514 BLAKE2B fc07f7efbc7f11f7e25ecc9b8b611cd769600929bd3452dd1e9111f8485e12c4cfaaed6f7845d995e53bb912ac31a35b5d66cc63f6db047f64d0a2f93ae13409 SHA512 a0bd7cbd648e33408bd239c4fc3f7236c589f431a9bdd5fb95176dfa0d107f78a7801f9b98d64e7e7e8f257ff885842b5d4b651361aae48345f0439d456a5020
+EBUILD pyyaml_env_tag-0.1.ebuild 512 BLAKE2B e2c3ce8b1984f28344092ac7e5ccc7e81cd7834b0a4c82c59ae97fe0f7530acfa50b0dc5787cbef7ae710577dbfc7260039f3ad8b4360ef886afc500892e456c SHA512 24dca4911336858fcb126de8dfe7af8ca52b5c5dde364b27437735254a5bca1b669b4eeff35714927b500d4ecf403ba67b475cce11141c1a4a001d4807a25b8e
 MISC metadata.xml 420 BLAKE2B b74e2b5f8cc876a6cef9ed5563bc2d9cc67bc14f6c0849ea6dd46096c66634a20c9ccf48fad3c0ace735f3561e457f5b205b2bf484859f242df955e5c28d171c SHA512 f6d40c3fe1b8b99e65296d078b602e733a380e89a01ef8dc9728e4b15ff1f34cb15c23b26863b0fabaacc2bc275c24e9d4f99dc042345e7bbd8dfa80a82e5c20
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
index 4abd9f92c604..5486fc522427 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index e56360d21934..2579025a8dc8 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,4 +1,4 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r2.ebuild 942 BLAKE2B ca89b2ea0f37d2608e37afa6a893bab336b566973683ea0fad8e4a0cd4ce5a33721af845119b4e16e5b262b31a8a5e51c9a73b491e1897a39ef969d60ea38229 SHA512 ba3460bf49627f306fb394e9ab388906a5707d4e15091b6002ccc849a626e9b738644826f76d8bc713b3868c2795580d2eb2d956127fe479383f3d3fa38221b0
+EBUILD raet-0.6.8-r2.ebuild 949 BLAKE2B 63eacb1a51c4e047bc5a189a1183200c3061ebb55dc6050e3bdf5d50a938cb2481cd2ba3af93b2df6df1c8bb99a4b07f785781ccd68a97555a28eeb62ee0282e SHA512 b3f7cd9aaeaab8fd4d694a627229fe49022ffc6250d57978fe9463edbfb4c9d3c20c77efe4e97f60c5ccf15f5c529fafa94b0653e6c6b49752b2515f38d41d2e
 MISC metadata.xml 474 BLAKE2B 8b186f4c18696c3df8e3d6b29f5d45d3c040156a473edb5066fa79f449642e4f1a3274974bbfc02733cf9ae3bc04b22c06cb8ef80b9962d14b4ee26dedc329d9 SHA512 33760bd0996fbe1d95e4f4ed658eb4a6c221b4c8911842db2e0f443d317c9c079ecb5a8e8f5cfea1c47531a944c6d79b4f4bd29775ddef6cb6c6008c4f359e15
diff --git a/dev-python/raet/raet-0.6.8-r2.ebuild b/dev-python/raet/raet-0.6.8-r2.ebuild
index e6a8e72b2ee8..4e01ffe5e227 100644
--- a/dev-python/raet/raet-0.6.8-r2.ebuild
+++ b/dev-python/raet/raet-0.6.8-r2.ebuild
@@ -11,7 +11,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 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index b1323834d097..b9ba9531846b 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,7 +1,5 @@
-DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
-EBUILD requests-cache-0.6.3.ebuild 1141 BLAKE2B 40673e1032da1b5e785d6984b657a0e019ecd4e21851f5e8c36b28aaa66510a90c42b25cfdfdcdae6258837a6691d85278b1b7d2a3a3403da8bfa8981d0a455e SHA512 8df533649ab6ce4a5d137f542236d9a0804bb305b8e3b050ccb0e5f9591c51e4b49a6ad7e4b404a39164eecb7f6081715cd584b2e11b76f075fe6a605bb563f0
-EBUILD requests-cache-0.6.4.ebuild 1143 BLAKE2B e58329455d2f3b0d2ab391b55f50a6029f36288bebbc2e8b00b4b8ee97f6b0db034a74973bc4b69555cefe07d4e653bd4ece7fac1c0dad536509bc5881c1104c SHA512 75325063b3460c8ce23cc7b3fd628cd5dc9f37cfadbddef37fea164dc8e412867a3bf3b27f14b261d79beac0134ecd4c60c94022bb3411a648ec895e558a76cb
+EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.6.3.ebuild b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
deleted file mode 100644
index f3c4e497d2ba..000000000000
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest ${skipped_tests[@]/#/--deselect }
-}
diff --git a/dev-python/requests-cache/requests-cache-0.6.4.ebuild b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
index bf347f9dcc78..2a55fc474fba 100644
--- a/dev-python/requests-cache/requests-cache-0.6.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 86c8b8cb56a0..851f0f1e8402 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-1.2.0.gh.tar.gz 23310 BLAKE2B 647dff76fbb47b9b972f403a9fb2a10ffab5e1915e32977e65b5f5c1cb206ec1b9fa884e12d687761087b2f7f4cb9e8bde631b68140cc50dbd9561a4999bdf55 SHA512 55458773cbf14a468d22d0b04186611385ff24fceda85052e69981bd6d4fd32a46f96b95fa36724b72fd9719485b2ed8906d1927284157e7bc685c0c42c2312c
-EBUILD requests-credssp-1.2.0.ebuild 878 BLAKE2B e34f9d4128167fea6b02f068ad883e34f15d7729eec1bd93dda0c781df6a4f0b70f2d7c08176dbcbef6fb7cb9fd7ff1d3e20d33cf90b4fb79eadfc267ade06aa SHA512 7f1011afb81d94bf4ae81a99d658c02cc27d79a8c9337b7a0a8e284cdccc4db646d31591bd909afe2c66f151f055b03f8e54e7c37fef4b79820b5177525e0757
+EBUILD requests-credssp-1.2.0.ebuild 885 BLAKE2B e491e7a93f7b35ef5f69889d0938f12fd4a1a4155b25187be025ca39212843292dbf8d404d3ad88b9b7b5f36b620595b45a285d07c6987a05a51e22c31333837 SHA512 cf9b9e1b1362a84be1fbfe9c4bd9c0d7303e2fa136d4eebbfc0a1aba7870a3d500eb0a88ab5692a9e0b402f511f78567f1382507059fb1af3b99afcd9ff7981e
 MISC metadata.xml 348 BLAKE2B 6f396d41aa8ae420dca6b00843920f99b4935e8d02b5be72dfa997ea1c22e1e34c742e98ab3ea3ec326740fe99133e71f9f3cf6b2a4209cc3e432a3fc59fe7e9 SHA512 a180aa3a93ac96a63fc25acffc9ea11a7b0eeebe336b046ba5d38594c84bf4056169e4fa0d1e0e8f660a19f8bad31321bc304028846ef8d1d9fe99e839cb9754
diff --git a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
index 80e0ef853fae..b5d40075cda3 100644
--- a/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jborean93/requests-credssp/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 # Needs unpackaged pyspnego (https://github.com/jborean93/pyspnego)
 RESTRICT="test"
 
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 44d3fc9af13e..1a0b5e3f5157 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
-EBUILD requests-oauthlib-1.3.0.ebuild 872 BLAKE2B 08f496bb01558c8e4cfcd269ccf0efdd67fa288acf4ecfd3e89eca368ee2b60a39886c7dfc0a8b1e496d777e855c213a305c4285ba71cec857fa448b10a43d14 SHA512 af0d60d87f050f4e89533e1373e7782a7ff935d84a82eca60e24040b856ac0215caeae26c17dc982d2709dfbe2abe3cc0b8b1867a01aff8ceaecf67db19a4888
+EBUILD requests-oauthlib-1.3.0.ebuild 918 BLAKE2B 487b6785d0b110ae57ad2a81901364d7109d636275f9f0d44c050de7f34b9ab9d33d878df187655bd5458cd3182fbc718fc8a71ee26eddd2aaf8724e5433274b SHA512 2884f3b7b287ba935ffc928ad896b0bd7b9e522e83ae00bdcc70f58f50fbb38476cd462a9b281f1eb37a14bfe8d600dc714f855c49cf85ada681c1faf9da73be
 MISC metadata.xml 386 BLAKE2B 2e2afd7ed7d90551f20f4917132d686b1c03f24cad9c55aa9f06587ec5988709c7e2cf602b5dc16f06ea345c5f1ca3cbbe7eab282e460658fd04a3aa99f4666b SHA512 ab2b57e2fc4308c5d6e27cd567a1a5cb45698b7795887c1cc3122617775c76ba6c7141cb3440a84c855fcd5cbcc567435c4ab1127483e01b1d5941b6c8ab2a09
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index b3518a21213a..0dfb8b55327e 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="This project provides first-class OAuth library support for Requests"
@@ -23,14 +22,15 @@ BDEPEND="
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
-src_prepare() {
-	# require Internet access
-	sed -e 's:testCanPostBinaryData:_&:' \
-		-e 's:test_content_type_override:_&:' \
-		-e 's:test_url_is_native_str:_&:' \
-		-i tests/test_core.py || die
+python_test() {
+	local deselect=(
+		# Internet access
+		tests/test_core.py::OAuth1Test::testCanPostBinaryData
+		tests/test_core.py::OAuth1Test::test_content_type_override
+		tests/test_core.py::OAuth1Test::test_url_is_native_str
+	)
 
-	distutils-r1_src_prepare
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 9cc7867cecac..1fefc53938ab 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,5 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
+DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
+EBUILD requests-2.26.0.ebuild 1393 BLAKE2B b4ff97cefcfd30b21832983eec288313728875fbfcecb6e426c3fc1cec09174bf381451d1dbf1fa358a450600971f3bc0666eb96122697debccfed33957010f8 SHA512 9b4497c62a0514ba9ad0035a58b391c5925733f3e1d40896f2373b6485f33b883145714017ab73917177695b986e187f41f7395ce9272432953d49194e7fcdc3
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
new file mode 100644
index 000000000000..2d726cc23334
--- /dev/null
+++ b/dev-python/requests/requests-2.26.0.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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# Internet
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		tests/test_requests.py::TestRequests::test_https_warnings
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index a84c4a89f2b7..d7082d1aa605 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,3 @@
-DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
-EBUILD rfc3986-1.4.0.ebuild 676 BLAKE2B daf4a3ec5f79890d8aca2a3d51771516ce3d1140b17b5c39106374dc0ddcb1c876b4380078e9d12bcd9c12f821db6dd1bc10aa1ca25b33ac962b101bbc9e3ea1 SHA512 53d5ab9961f21fe91cd5091353d1a0f1969c79d8538a5bf917fd08d1bdcda5e0605dc707878419921cdbd80da3fad927466dcd20a3333f425c05f5754cd5498a
-EBUILD rfc3986-1.5.0.ebuild 685 BLAKE2B 37979b8caa609651053475d790f715eeb36a30242a7e72c086f106d4c6ef781ea9261ba4864fa9497e6957b14a0cc5737e121cbaddedeff4bf89c6daa52fe87e SHA512 08b1f069eec4aa56d60120163dd59ffb671a4d57abb7cdef165f6a0d0b1d77de8d0c0b6e82aa1ea2d1ec9e3e353df30b587e7514044db02f0c9b04c500da99f0
+EBUILD rfc3986-1.5.0.ebuild 677 BLAKE2B 6f8c27f60bbcd7a147221d969690bb1f67558a6799f4245d0ba340e62b2cb1a9ae646c6bc62ff56a4ddcbbaf4246dbc142af0c6c4ca65936fa4e64ce1132cffa SHA512 c524b8f6e8d0564ed14cbc7a4cb951d476e484f0b9bd625789d75fcc5aec234960dbc4992ffaa466df20145c6daabb35884ad46c08d44869a1ac945cb1f18d88
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
deleted file mode 100644
index f57899e0bdd3..000000000000
--- a/dev-python/rfc3986/rfc3986-1.4.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
-
-DESCRIPTION="Validating URI References per RFC 3986"
-HOMEPAGE="https://tools.ietf.org/html/rfc3986
-	https://github.com/python-hyper/rfc3986
-	https://rfc3986.rtfd.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="idna"
-
-RDEPEND="
-	idna? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/idna[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
index 3136ab2a64cd..9a5d1047575c 100644
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 9b7b5275f6b6..6012d9852b0d 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,9 @@
 DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
 DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
+DIST rich-10.6.0.tar.gz 16244447 BLAKE2B 79012a211e8f5510fd4cf0f2580971c51fee17a1e38905abc8227ba07eed1f2d25b7c356ecc907043a9e1898245cb6927cf226218c0ba20344865c1cd0a4a160 SHA512 59b777ef0fe3efe67138a7dbfc0c4e813b0a8c3d46adc6526b07241483919e0f71b478c0a66f3e0c207fcebdc0d639b7acf989ebf914c0e0fb6953029f0c9a16
 EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
+EBUILD rich-10.6.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-10.6.0.ebuild b/dev-python/rich/rich-10.6.0.ebuild
new file mode 100644
index 000000000000..6d4831ee5fd9
--- /dev/null
+++ b/dev-python/rich/rich-10.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 276a0b81ae93..c12b83cf590a 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,5 @@
 DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
+DIST s3transfer-0.5.0.tar.gz 133535 BLAKE2B 2ce9235fbffc4c42682345873becac6f0d574ac44de523e10178bf7d115b261acbd1753b1a41ca301b72fa96a6a93314572fe12ea4d286a325a0a36e3cf56b36 SHA512 e34d115d149f8f9715fa0147521eec63a5fd672ee513d690248fbca73003cf4c9e43775bd5b3616f7ad3a6734993a1c8b2ba789394d338a8ac4c841a0e51999c
 EBUILD s3transfer-0.4.2.ebuild 608 BLAKE2B d9c4554716475f82c88fdd395453ddf699758b8feff01da7c46e78d5a5d47693cb5fac87944d477931dc793ed557c46d1116f1bab2a4267c7a0e41f7f97fd8b4 SHA512 85cfcff25ba906a8811944990395565104aa009870b8926b1e75e8b89830a775f8f20b36beb07003587625a6452922ab14053e03ec047e59f518e28466da67d2
+EBUILD s3transfer-0.5.0.ebuild 615 BLAKE2B cde32893d10c8ae3da9c9fe8b686c139b8dd3f29670fa776cc01f2a2e5a57d146a1e2899091e9a8b0f86b40305bd01535f314f3e2d1f24102513132678b9a170 SHA512 665f2a152bf6367d2bb10e42526c8c7a77ca365fe076d2296d1729ad0bf6b4b2d6772ed99e3ff3313b62515c1bcafdec978cba123462f8629cfa9b78eb9d681e
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.5.0.ebuild b/dev-python/s3transfer/s3transfer-0.5.0.ebuild
new file mode 100644
index 000000000000..77bdca772930
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.5.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} )
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/simpy/Manifest b/dev-python/simpy/Manifest
index 84ff3868f71d..a5a8a50e2ec2 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1,5 +1,3 @@
-DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
 DIST simpy-4.0.1.tar.gz 410082 BLAKE2B 09c6f29d2792ac15bb4a3b42a1cdbd4d342aca0ef528aadbe37e01342534645939c9663977230ec7f6f1542a4354925e25f0c5b3bf6e20b29b6da2e69f3d5a90 SHA512 5cc4baada79503e3c2f2425b9f7f00d68f263283ff0cae048fba86665c4dcf70590683f6b7df50d1c1a914ac7cb471ed4b6850676030bea4a3a70fb40eb2cdb4
-EBUILD simpy-3.0.13.ebuild 836 BLAKE2B bd8b350b7df69d77c4b62ef4a91f5c4377ed3aae2cd372ce1c4f46d61fa176cd683b1bcc40ea8cf19b866bde29618e034190d6631af0a67f6892b2e19a76670d SHA512 c292e68f8d5f5f6a04342ba18e803f283125049d7ddab9b7241910f8249a3be24fda48c417bbd41f703d5539593fb896a8bb0c1d573819d9c1ccde88bfe86faa
-EBUILD simpy-4.0.1.ebuild 896 BLAKE2B 583ba15835e3b4ac163ecd8ba41bdaec160d3eab0c6e5edad21367fee2a06ea27dfc088bd50361247d1384319f12674c148c347e0c295023a5eb2d1d5c9bf325 SHA512 1164b2445a0422b15e43407603861839b40bd68cdf6b95e4ab4b58f3bd1536b281ea88bcbf90bf00a09b2758f9e1b4135fbd417335ff94b275698be5851ebcb4
+EBUILD simpy-4.0.1.ebuild 894 BLAKE2B 5c435abdd2d49374a29c53e27e19c75921405773acd69499696e56150c2451eb2543744bb349895edb111794b43946ba5040a4464e586007c265969d9d43b5a3 SHA512 89bff8e1e5566415afce1fbcf51ff3fd444f15c98480e4631bd3a90e59a5454dcce1e2d625e85613a68f909cf72696998f2c79676072285011be6d8be2519c4a
 MISC metadata.xml 383 BLAKE2B be75ad8df2181d19f5d653278454051eaa5c455fc5ff3882cf8e11bb50787847fbac3db1e33034c3f1372a82a15227d494f71af9644d6aee42069b41fb6b4f17 SHA512 fe339084efea01b5fe7375a1fbb2a8c21105164fea3881de4b5499771d6c649f6cbadde20cca9d02050d8a143311d2bcabea48dc30bd518e7e3ff2bb2f1ab169
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
deleted file mode 100644
index 132ffc2dffb8..000000000000
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="${P/simpy/SimPy}"
-
-DESCRIPTION="Object-oriented, process-based discrete-event simulation language"
-HOMEPAGE="https://simpy.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-python_install_all() {
-	DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-	if use doc; then
-		pushd docs > /dev/null || die
-		PYTHONPATH=.. emake html && HTML_DOCS=( docs/_build/html/. docs/_build/doctrees/. )
-		popd > /dev/null || die
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/simpy/simpy-4.0.1.ebuild b/dev-python/simpy/simpy-4.0.1.ebuild
index 89b69982a180..86288c2b3512 100644
--- a/dev-python/simpy/simpy-4.0.1.ebuild
+++ b/dev-python/simpy/simpy-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 9eac73703042..681c7175939a 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,4 @@
-DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
 DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b36fa31a9dd315e363fc67e36d080df0dc70d82e65c6802c41377c2e98f56ff4e23cc5e9a92165c3d3b7565493f SHA512 5a59fcbb901e6f4456049f1ec2bbf781b1ec7c5a3ad4b66216d4c5daffa7f0606f74b941647fe2b53e6c8cdc476371305c7b7a2ca24d21450e19548f888be3b1
-EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-1.7.1.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
 MISC metadata.xml 529 BLAKE2B 233dc2ff554368323e79fc11d7763b69d10e08a013789e19ad95c0ff2e7a392edbbde47f1811d69bf5b930824db4e399cb99d11dc90da2cf97c2347911c1f60f SHA512 8a6bf6d00fc0de5f3e12be9049ca25de2d866e5ef4352d9e1075676d9c6b66ecdee832b947a192b60832878be976666f131fab01627339a4f4406aa740ae4b25
diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
deleted file mode 100644
index 19974e840958..000000000000
--- a/dev-python/slixmpp/slixmpp-1.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 088b471218ad..c3d23d1a2c9f 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 692 BLAKE2B 1fa93eb766d2af0d4c2d2e16234c47e4ce5ea0c8a4c28a5faf978024199839cf0b3170d4fb89fa487c5ba46ba2f5fbd7326b701a2fd9134d91eeab10fe58fdf9 SHA512 a144200fcce459c4344596153c44ec2972428ee1e4a4933d8f8af8d13bffeeaf3d4db973714bdaa2c62f4dd582a10cf167eae4fb23ceda564bbce01a18a562f3
+EBUILD sniffio-1.2.0.ebuild 690 BLAKE2B d2223e5c286f3786d7f423ba546257c30d8405f4f853956d6422b13e901ef21544b620f80a8a2d502c4872fac30ac5d4d84200b9737d51ce22f5e9c7816ade80 SHA512 7623d40343fd6881d6df72a5c2bd2f84653ef9c39bb86de1eb84abffcd0b516a97cc616479e9ece7e83bc4eaa03635dd8bd66e50af1d4588079c453d0660fa81
 MISC metadata.xml 393 BLAKE2B 1e85a6ae107eb5dbdbaebf54211bca24f605c8b40d8dc9f941a485a5dd6714c9e6b69646e627d6fdfed874f5ecbc4217b158c6be66b392e583f4aab24fb4c609 SHA512 ed60062a1393a7a3bc73388ada684e70a51fead79e3bd5e4cf3fc14aea6ff133121f2fcdc68ae0277c0bf2290d3a0f18959d00eb835534e16abb58b19c7b0f9e
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index f33ec1b18fda..d05a53d6dd3a 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 57a841d86904..20a1d5b86868 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
 DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
-EBUILD sphinx-panels-0.5.2.ebuild 687 BLAKE2B 299300167bf675d0c93afd131180eb8828831f349c9dff260277108d456ce55b2d1fcea21b2a5d9883e68e4e4a53bc4d2717334d2c62aa4ca8c22d8932cdc54a SHA512 845224a377c62fef4b30a551beddfd02e0db89eb9d09c5de15f149a764d3c499b402ce01aa31bea63c42afef1c2280fd9df342ffae2f8774bb4fe527e6868ce1
-EBUILD sphinx-panels-0.6.0.ebuild 688 BLAKE2B bba52262bf93fa85cbfb17e9e9c61e9fa874b26a9229f93893ddab6ec750ee26b12c5507ae8edd0cbed138b0882055e5238236a193967dfad18d01ad6285eced SHA512 2fb5a0249b925e6cd64d417ce56cd5adba01cdc215faeb4e56afc46daaefcd0dc73d495a3bb9d995a908a1f7e76600ceafea23fa5beda12387d8d60f19d075e7
+EBUILD sphinx-panels-0.6.0.ebuild 686 BLAKE2B b26b7edb5419644eca087c65ab32b6567e89b1471a6f9d808aada00332690f8d16336453e6885a2b21b9ab38f9c7535a01e1e5e058bc1f89a7d42b789c04a2a9 SHA512 6395879fd8d8dd0a64e73da984321ea5cd76b32d9d534859ab2eaf22b6c2773252c0ae8d9a2fcaea2f161eb4c1e3360494ca335944922a224a854027e5ba3c9d
 MISC metadata.xml 358 BLAKE2B 0b9979bdd35a02a66c8a0ba8bb27e7170ada70a9506ad8bf320288d4a40a04a75f8481bd6d084d49569131154e689277fdf43c7120e6c0927c373b4a4c922403 SHA512 a8a585957fdf380ab763cc95cf455a927c6bb0558cce5f0429ba43da72d2655ab15cb6f06f9e5360f24f854f275e0df67ec573167c02332a7dc3912e96b31b3a
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
deleted file mode 100644
index b61ecf063b9c..000000000000
--- a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for creating panels in a grid layout"
-HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
-SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
index 3476ddafa385..644f9878ebcc 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index a3930da8bbfe..84bf005bad1a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,11 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
 DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
+DIST Sphinx-4.1.0.tar.gz 6302885 BLAKE2B 7e2eafa236173c0fe7d761d1692ff8bb0c12ad8fae2894e2088fff0415d085a3ea652c59d4efc94788829c4261cbee161d85a5c35d6a282fb1a201f658425bb7 SHA512 482378b85b51e74bc2c841bc5ac7b7d5a0034b28e62d36182972439a1e48ce5faaa82e6c3daa35ff6a3f1b1ed1c4187564c77806e6d1804dae0f2c24262adbe6
+DIST Sphinx-4.1.1.tar.gz 6373009 BLAKE2B dd19089149d626a0a65af4ff1cd8acf5a5ea8d00b6c940d2d7c5e1c459ae37d993d82652114b9144a80971275a6e346942dce9a6a3798220dc77e0f88d8fc2e1 SHA512 6250fa568f9952471f3cb433a1e7a053c779540c0c049d0e0bad4f2b754935f8c9f351a297349bc15f1dcb4b152a550771f2f381b2eee92a68759e034fce23c4
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.0.2.ebuild 4294 BLAKE2B 192a601e803f47438f757baf4f0b981a19802c46c6f0299ac3990ebd5eedbcd8ad37ed6b378df3b03fda92b92db6d2d955f917c7c52bc7b4184a7dc988ef8e82 SHA512 ae00b4d6e7455fa035fcf5a5a67fe9fb9e7d0a72c8b1b5bcda75152378e855213181c294f773f1bb7b974ef3adc29dc85a3aba92af3f025e4edf9075e7038cf1
-EBUILD sphinx-4.0.3.ebuild 4301 BLAKE2B 96935c2160318d1cf0319b2a7d6d0a07922c2648a22ad7299d25a23cedf2eb48e2bdc7ee2002a852eb5e073b26a8ac07ea23e874da8110313cdccbab66863bd1 SHA512 d45a38d1d526c9f5b99fe5a37eab96178d449cfb9fd5ec6a5149768db007e97ca492876670232ea0ef8c57559aa275e77b833213d266eef4882dd92037eff9f3
+EBUILD sphinx-4.0.3.ebuild 4293 BLAKE2B 70552e6b75fa50af4d5af1aa491e7bc8f1aa3103e609c7cfec110ed466d624ec4d0bc1e291157d59383e25bdd4b7d90f794e0213394713b323a131831fcc4001 SHA512 01192407c223cdc47861631e4f211d526ae4f3c9546b91bd75d7a09d05adf9d8e53c8cb23eadcaf5a8cc7acf90772a0a0624df1e92146f81b17273b4dbffb16b
+EBUILD sphinx-4.1.0.ebuild 4343 BLAKE2B 78d3a74da8b013e5d80b0731ad1a6f5b19ae1e991f96c1a28b03234822f78ccea813275ecef944b75d16f75908d7ebfdc6b7077e291a8b86b4bb7f2d5833569c SHA512 b560de6ba97660341f97b3ad657fc62bd3d2ac56e749ec0576cc967da54698481e365300c95251d257a393209aba97bf13e6ea2b508a4d77f195ba951c8dacd5
+EBUILD sphinx-4.1.1.ebuild 4359 BLAKE2B d274c51e81c11455ac5c7eb17891ef9056b6f8bf26b75413afff72196df610c15ba5b1c9dde354e8e495a9e910bbfcc7f33cd207eea5741a14fc6fbe3aa03356 SHA512 09afc62e84ded1a76f1b967962fd8f33e77a4e2ca2a1e61883e1990e4cad1074405f38c3f9e6c375e1ea37af15acd3498d5254e7a459d264556e455d5f08ed05
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-4.0.3.ebuild b/dev-python/sphinx/sphinx-4.0.3.ebuild
index 343eaaf18187..938ba29ebe50 100644
--- a/dev-python/sphinx/sphinx-4.0.3.ebuild
+++ b/dev-python/sphinx/sphinx-4.0.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 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 ~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="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-4.0.2.ebuild b/dev-python/sphinx/sphinx-4.1.0.ebuild
index 7cc217f2e354..998f34e2eec6 100644
--- a/dev-python/sphinx/sphinx-4.0.2.ebuild
+++ b/dev-python/sphinx/sphinx-4.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -36,9 +36,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-	' python3_7)
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
@@ -60,7 +57,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	"${FILESDIR}/${P}-py310.patch"
 )
 
 distutils_enable_tests pytest
@@ -108,23 +104,27 @@ python_test() {
 		tests/test_build_linkcheck.py::test_defaults_json
 		tests/test_build_linkcheck.py::test_anchors_ignored
 	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
 	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
 		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
 		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
 		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
 		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
 		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
 		tests/test_ext_autodoc_autofunction.py::test_builtin_function
 		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
 		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
 		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
 		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
 		tests/test_pycode_parser.py::test_annotated_assignment
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/sphinx/sphinx-4.1.1.ebuild b/dev-python/sphinx/sphinx-4.1.1.ebuild
new file mode 100644
index 000000000000..4a19323cee98
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+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 ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_enum_class
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 8f44993c71b4..6a2a6e39ea70 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-htmlhelp-1.0.3.tar.gz 24248 BLAKE2B eeb7edd0bce99621ce6fa3a2bb9ba90a619af18403c8b4b0148a7d20fd3847f418f35bb1bb413531c0799b5b98be7b45aca51aa5c8120d9c997abb86ab0b0f01 SHA512 f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4
 DIST sphinxcontrib-htmlhelp-2.0.0.tar.gz 28144 BLAKE2B 09b0d9bcec57140278c4476fa0bbc40d359fc167d8ea891a1585fbdeafe6eb0b52442dbbc8d1d5b6edb3953b04fc29a71f6f74e58a281ebb0d79e5a30cb02749 SHA512 6ed673966615f3e818e00de4b7e59c27f0a0d7b494294f804540777c580480870c36002c08d8ad626b7b41a676fe40edc0b0b5ffc6ad8080f38f59c24e157636
-EBUILD sphinxcontrib-htmlhelp-1.0.3.ebuild 880 BLAKE2B dcdf06525954627e866d02f8e46df726d52794334da88c5a4b86768cfe32cb1459e9e15fb041f6077d6770b011ceb7ecffbd9b8b6debcd06f630317fa836d785 SHA512 fde00e62f1fe8244e6b0883344b0ec2cd01a0aa2aca6229bc0d20eeed32d79ecbd1e008774780edac645cf64bfc2d019c792d23a206a832c3694fd9d8516de40
-EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 891 BLAKE2B 40f614f66f0584b0a516dbfc722a6b3b7397cebdf81e2a5ecc88df69767f0b334643ecfc7730172376113cd27411ca85206e64a3104d323add50110ec7f1e79b SHA512 11d207abf7f385a3f941bf01cfcab0a1f7ef3b35cb2370fdc2d3c8839becadf08f61b285fb2329f09bf719bd94d5028b0171fdd50089b07c4b3532694389f9dd
+EBUILD sphinxcontrib-htmlhelp-2.0.0.ebuild 883 BLAKE2B aa2b85973abaa2d33882f9dbb6d42bfdaa43fc10e5f035d09044d22c942597ceadd444ba4e1fc01e20cd2539cc28e1c98f8927d1fe366f693f311e5e688ba7e0 SHA512 6f4ce3de37a432462cc56bd8671f1f3f5bd718026c794031dbde466db399e542d94075e855e46158b86b2703a1001b74ab2614467dab84317027e12b779e0a5d
 MISC metadata.xml 398 BLAKE2B 84cee02bfaa0420c3bee0d1324270b84678a306904ecf3b30237d4ad7ceefffd97528109552e00d3aa1b2ad4eb6d9cd0e10341fb122c7a1830031870c1919dd8 SHA512 63c17014837ebf2e8bfce709fdfcd9de27c0071aa527a790c6e1e66c1246ae6e4635e8c30b7b486c9bdc727d7e044bfc30d848058bfb4eafe3eb8c32478a5b69
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
deleted file mode 100644
index bdfa2f9fc3ed..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${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/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
index 14ab5ad12120..b94a7f8825b9 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 91ca568e0e80..7354b569b36a 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,5 +1,3 @@
-DIST sphinxcontrib-serializinghtml-1.1.4.tar.gz 18647 BLAKE2B aa5dcbacf28a0433cbe86d9da3f6dc5859ec6148f74714654f5095ed1f21042e0d4ab1cbfb1bc816c1de40136ac51cb6f78c913cebf5465a4a11c25b22b36a14 SHA512 d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0
 DIST sphinxcontrib-serializinghtml-1.1.5.tar.gz 21019 BLAKE2B e2da8b1e1300a327b8d508ce98e7c0d3eff1e0cea28cd874df4fbd9ed0bd4de6c17e107e622ec72e00bb237025ae26b2c5aaa33b2156cee2fad7c8f8d2c65ed5 SHA512 c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
-EBUILD sphinxcontrib-serializinghtml-1.1.4.ebuild 900 BLAKE2B 91819fd2ab09f086d43eb83e921a39feb186fe8d1b457981cccde0b20552fc4227542c767507b73e6b4241f5d53de6fb40237ba1b0a4f6e4f8f2273275dd40d5 SHA512 22a872ee63762ce8e34a3e96b9542189a927f1480b5b8914f05d7b6247fd4e17f5f67806fed9be17077c4a1ac197ca45b1be4e2721d91c72c673816ca4b62eb4
-EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 868 BLAKE2B 892609bfae5872d24613e3f828eb4df2fba8e44f822c8726a367d79d034f954b1b808206c8caa4891df9585f15fc9a81ea4a98d11043f756d709ad8de846d304 SHA512 013eea94bb100f1b5eac099a53128f2c10b30a965694f42477d29858ffec6fc4ba2e6ebf19af765b0f8190b8990feb1b855aa2d4fa1150d1b3a22d3881d357b3
+EBUILD sphinxcontrib-serializinghtml-1.1.5.ebuild 860 BLAKE2B 6e51b03384cc721f8694ef7d3d53d4319a66a5995b12064988529decd6d6378b426eda5ec0f457cc31c75a93597186fd8a27eea33e78242392992d031d2ce8c7 SHA512 bb4c7d7b617419db0225de96db9933f6d275c14d4ccf885df871e2ff807e1cb518ac2524af8f8a47985b16c517697de7f271318dc3d490eef6f455ce481a396f
 MISC metadata.xml 436 BLAKE2B 1ff1b18113f36620c2fbab9af2fcb1ba8e827f5a3aa3ddd0eca46d40afbef8c6835f0b0df1e49e9783974aa536d1450f5bdfe8c5e1764e17339f5ebdb8dbd74c SHA512 ce1452b75f6f585ff90a1da0b6455693b18f462ec97bb4afe1ddefa2a1a684fcf87928a35911ce0fb99f2f4f039ab580bb4f17efc375930d57d788a00084936b
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
deleted file mode 100644
index 8a5b38c3c9eb..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension which outputs outputs serialized HTML files"
-HOMEPAGE="https://www.sphinx-doc.org
-	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-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"
-
-RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
-PDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND} )"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
index 7169bf18a7b3..a6e047c73b14 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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"
 
 RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index 9df0ef4cdc95..f71ba49be7bb 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 962 BLAKE2B bbb6ce74523683d14759af7cca9beda5611293d93fb64a6069a7d8827613b73ba4d92114f89a794ebbdbe387c3f7bc1e833dce529fe617fccdd5ce2945660abf SHA512 3fc2e95b83b9818164a70cf5b8657629dde0e82b78ebc70783aa4fae9d7760784e6eda091d42925c26cf824b86435b9c87251032d18c8c3bd32a59199852edda
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 979 BLAKE2B 8564e8ee80e444728259dd7761141c8972292ae7aa7a23e27d8612e4c63e0f65668ba0974f5abca8dfadda27bcdbeba702619ba5b2a16a69d317434d833fac3f SHA512 562169728184180e4fed07a34c5e72c7b00123cb469ccc91e4e9a1c177254ae1d25d6b9d0afd436fcc3108d540b1f13d597c14db70130c758757d359c94f12c9
 MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index d8b906e35f57..e192519714d9 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 5eda6cd45deb..75a893f38314 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -4,9 +4,11 @@ DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc4392
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
+DIST SQLAlchemy-1.4.21.tar.gz 7701480 BLAKE2B fd7898844241e381df1356b33f42c99f1d91e50cdf702d3d04302225b64ba7e5bd4ed0d140b1ef2c6a3c4480c282ef3aa6f1301083de68c63d4b86448a9420d2 SHA512 90e3e63f339d784bf46928031c24804bfc2221044e08061f3da7db9c905013fbf4f0cada3b870a1662234b0169a51a678ff6bd837610ba18ab7cd1eea048a028
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
-EBUILD sqlalchemy-1.4.18.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.18.ebuild 1690 BLAKE2B 4a31c38037057fb338e12175331a2ed3347612c9df5c3817c0717d165d9544a204e55514130fd4d8ce3ab533138c2e9ef9f070d09815dbc2d21af82f76921ae1 SHA512 23f80e868cb99d48aa52da3881e210bb86e9576f339a5376c2922bb6b5b3f4f4a37c45f70ff8700557d157b19261937e45eab5b9f696671ae76c9e0579e9640c
 EBUILD sqlalchemy-1.4.19.ebuild 1704 BLAKE2B c6e674ffe8efcfcaab23945ff90090411622da56f9d65414a0c849b2f01bab12904c4a79c71383b4fac21aad265e6dc83a4543adb532fd44ae84aa7079185981 SHA512 1e6cc2c24dcc02930e1687d9c0424b3a98baa6e4be7182e65beea5c836dd0b6396d47abd84c0927d497a34b8cfa39b1dd84449753a471dfd99e65dcbd21c64d9
 EBUILD sqlalchemy-1.4.20.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.21.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
index 144d57d9ca1b..619a4c03c66b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.21.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 025af926c682..2d0919b00c5d 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
-DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
-DIST stripe-2.57.0.tar.gz 216286 BLAKE2B 9f2c3b7d4ae3f100647a1cae32d09f258703890eb97637ab2a9d3fc1d2fc30eae7042e4245d8f62a5cb4a5226337a7b22813d992842326aaa57d7ecb3a1da200 SHA512 c63efabc8febe79a01167ad4c166d9498f8623a3b1d36c292a3554cbacfc6aada1bf5ec720723b5a9de6e5c4fb770b8f44d1c95289aff4394a70a0301df61e93
 DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50749a5c3ce2e1704dbe04cdb99abc90b6c8837afbc3e086551e8dfa72baa3a5e68edf2ebb4e30aff157fb3ce8c SHA512 eee6154384fae69632e5e9ae7f972d97915b07da85c9f1af3849f5b9fea1e6f291c3d3e5b0e319c0d6dc0c035fec167f7711f650032016d3eb4709b333f3d5b7
 DIST stripe-2.59.0.tar.gz 219952 BLAKE2B f59d7e7f7c03f620dd2f43b5678208d72de0f947bf748c9c41d6782a6b01450a0547ddd5972a731fd1b8187479e1b813f890993ae097ec8c32acd4691256a4c3 SHA512 f27ed8457d1097aac43aaddaf39b8d1d9df25e837160407edea354b2fa8faf122ed86a9d36583ff56885e22663b230ee63af04baab0edad2711f3c691c8de51c
-EBUILD stripe-2.56.0.ebuild 1720 BLAKE2B a9d99433b7d151404034b4f8f8e54f4fe48bf54235a337bc2d682ee6b4f622f2765ac8caecf82c42fc185fcb16f428de12670bd8af6de839658c8a52a3158a3c SHA512 90bad27eaa41834eab73abfd0d2d8093335854df0758d7d01a52f97d1dbd03195b0ae430f60f5efa7427ce161b31a2ea10c6fcae0c521b8e735b584671219aa7
-EBUILD stripe-2.57.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
-EBUILD stripe-2.58.0.ebuild 1723 BLAKE2B 2b333392240a5fd20f5c7165fd2755a607677d2ae53d86c3ece65b7cdb81c1f65b9f1d0ff9ac2d8602ed50f290ce55f68ff9c0c38fbd8a861c3923583224865f SHA512 bf9e36a0c4957439ec88432125db54eb237e9f06195a3f252d3e5c846e8ddd4647471de433777f2e664124d5ae8661c04aac47871299f54623d45b60698cbfa1
-EBUILD stripe-2.59.0.ebuild 1711 BLAKE2B 0591488ef7dde4e4f172a77ec289362170f9a033c98e57f8007f9800148000e4dc6a18d52e410cd53f12671c3a5b7a228d599a1bbdc92c3dc25b3bbc712eac2f SHA512 ce1db42f27de81fc1dc326a60f4f0a2f2ddc64b2f96c74890861285739845aaff8f5dfbd1967b2d2f30630277523d315e913e7386c6b79d7cb8573e7e7670d50
+DIST stripe-2.60.0.tar.gz 219649 BLAKE2B 208826e62560f6e9acb5016cecae4f3128106d562f8b5de6caa106179f6991376bacd679ab4cd61a973a60f68a84aebb673d17c1ca8d10541c2ab4a1e761da0e SHA512 eaae2356ed83285713be6396c071b8f5761ad0ff651691b1560b06bca190a5c5df3659182e5a25e8d286257046162f32755854f0e382a280cb63180478114502
+EBUILD stripe-2.58.0.ebuild 1721 BLAKE2B 4a4d3a08a98e2ee9d1fee8cea34c3ef399e754a7f8fd5394f9ed810f89c9e03dc1025f0769d73f4b14842a0dbae9e016b17696c9f9f8e3e9f2499da2c2aa7f31 SHA512 233490a7aaa47b577b8930fdbfff9966eb3e6ee2f12b1af3118594356b30ab071c155ff38eb8c7bc2c706eaceed0c3a93b346d7dd9579f034491287dbf1605d6
+EBUILD stripe-2.59.0.ebuild 1711 BLAKE2B c8541c9fac95ff02cb6a4168127f1001177e8683c2fd19e5e0f8630ca0b68a63e94b712089538c3e5ad10bd6b2dfd918d010939cdf9bf9b51295681e9b7a031d SHA512 9c122483a9fc30275e8d01bf3de17abe46750c938a89e32202c3192576effca0af36c8a30d6837af2f3e5b9a8c5d1924e2a0f3d6ef257ca21fa6980dc05937f0
+EBUILD stripe-2.60.0.ebuild 1711 BLAKE2B c8541c9fac95ff02cb6a4168127f1001177e8683c2fd19e5e0f8630ca0b68a63e94b712089538c3e5ad10bd6b2dfd918d010939cdf9bf9b51295681e9b7a031d SHA512 9c122483a9fc30275e8d01bf3de17abe46750c938a89e32202c3192576effca0af36c8a30d6837af2f3e5b9a8c5d1924e2a0f3d6ef257ca21fa6980dc05937f0
 MISC metadata.xml 371 BLAKE2B 46520a75a660c8f40fe56dca2ac8536e4c680cee8039dc9f2858916c4f669a70220376f6c5a9d6a6cdd1b62bd626110b1c93f9c1383520b56b3c0c98d310734c SHA512 e2bfe317401810b10903c05ddc9ab3d5eae2873440bcc1ab3363ac7c1916baf3b06a0c4c3b6bc521fd4e3f2a3376e540c93a76c4d9b5e8c308d5af2c7a9525f7
diff --git a/dev-python/stripe/stripe-2.56.0.ebuild b/dev-python/stripe/stripe-2.56.0.ebuild
deleted file mode 100644
index dd6df66c4651..000000000000
--- a/dev-python/stripe/stripe-2.56.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="https://github.com/stripe/stripe-python"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.58.0.ebuild b/dev-python/stripe/stripe-2.58.0.ebuild
index 5499e1b64756..d898c3a09953 100644
--- a/dev-python/stripe/stripe-2.58.0.ebuild
+++ b/dev-python/stripe/stripe-2.58.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
@@ -20,7 +20,7 @@ RDEPEND="
 DEPEND="
 	test? (
 		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
+		>=dev-util/stripe-mock-0.106.0
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
 	)
diff --git a/dev-python/stripe/stripe-2.59.0.ebuild b/dev-python/stripe/stripe-2.59.0.ebuild
index eb4fd3325e69..b8c67ae0502c 100644
--- a/dev-python/stripe/stripe-2.59.0.ebuild
+++ b/dev-python/stripe/stripe-2.59.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.103.0
+		>=dev-util/stripe-mock-0.109.0
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
 	)
diff --git a/dev-python/stripe/stripe-2.57.0.ebuild b/dev-python/stripe/stripe-2.60.0.ebuild
index 3895e0af78a6..b8c67ae0502c 100644
--- a/dev-python/stripe/stripe-2.57.0.ebuild
+++ b/dev-python/stripe/stripe-2.60.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stripe python bindings"
@@ -17,10 +17,9 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	test? (
-		${RDEPEND}
-		>=dev-util/stripe-mock-0.103.0
+		>=dev-util/stripe-mock-0.109.0
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		net-misc/curl
 	)
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index e21ab4c95e84..69bbcfb789ac 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,5 +1,7 @@
 DIST tenacity-7.0.0.tar.gz 33874 BLAKE2B 485b35058e246ac7c68a2d92a4bd30ae182d382d4258854afb1e61d0b31cd1674bfd92599b83425f4e9a92ca4c38e4a91b72a17d0de6f918474ebe59e6bd2d66 SHA512 a627112df19b9f6d1c53294daad7fe1b0aeaed15e6ec07054228575fbc76ca5c22f560ddd6fc176c5c22141669423547ba17f1e33c7d0e7e92d0188acad065c4
 DIST tenacity-8.0.0.tar.gz 35483 BLAKE2B bde48a9682d1ce661ec6a35387c8a3931e60f61ac605b95637ce88176a5346eed54047623d0ee116e5c6d279f265d9cee0fd69e2b805c50cd7e06390d6952813 SHA512 f9c8b74d53dc4973e833a2d2625d15b7f40b813b1cfe389511c1083e738d62b0793dbfab73ed13a9e88cc65a17d2c6d8b0a571f13732a26f4c957e16dd9bbefc
+DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
 EBUILD tenacity-7.0.0.ebuild 794 BLAKE2B 68db54a8a2ef401c99e796f4b1d7a25464740e7c12035debc70ec337757d1a828438b9cb926e99498583913afd28f103351e2e2f3ce2b695ac0cdd3e97fe4dbf SHA512 c6f937b7db7bc7c24d21846ad6fddfc9a46d137a2b24011ff9d76cd5ebd14dc9c86410f016fb292011d533112d89a3875576564afbb4961a8bf760f83345b43b
 EBUILD tenacity-8.0.0.ebuild 690 BLAKE2B 51424a9af61aae104788dd382cad89c2b4852ecd19385c878602624fe5214975d1ee457496864851e1462de54e68a0ec4359703183a2c9d2ae26b910919c7e50 SHA512 5f9852a46b8efe768fa02a1082aae3872340bb040736c10d20955a3f9a5a5625daab945393627eb3705d656a01f63118c0c9b0b78fbd2a42f076e7ab454f4afa
+EBUILD tenacity-8.0.1.ebuild 690 BLAKE2B 51424a9af61aae104788dd382cad89c2b4852ecd19385c878602624fe5214975d1ee457496864851e1462de54e68a0ec4359703183a2c9d2ae26b910919c7e50 SHA512 5f9852a46b8efe768fa02a1082aae3872340bb040736c10d20955a3f9a5a5625daab945393627eb3705d656a01f63118c0c9b0b78fbd2a42f076e7ab454f4afa
 MISC metadata.xml 855 BLAKE2B f8202daa921e00bbf7beee306ce1ae06d7a65784945c80417666f6924bad97af08b45fe761e79ea2aac4331552d8d146f45d1e086567791eda1a1bd78f57ce39 SHA512 dcb03bf33c2f0de3e945e0a9aa997c7a8896aa49f1db22c6de4185d16b41fe26e0a28b152b28014c6b4fcf2bef9a143f6d96f8b089d357b6f2b2b128b87cd286
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
new file mode 100644
index 000000000000..4d837bd1e2de
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.0.1.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=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package typeguard
+		tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 829cee26b602..212b7e8fa068 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,3 @@
-DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-EBUILD terminado-0.10.0.ebuild 802 BLAKE2B a2c30c51e7dfd3b8307742708d85a87619da630bfbaa3fe81075d1eed96a9e4a41222e26046e21d417be164bca8390ab517b7d394f787f616d8582b1b06d6d9e SHA512 1205e475152844790ed927f7302486c15d4532f8e1e3d7c24cb7eeb969eb719361d6bfe1909d77aa00f3ad969a7295ced9f7d70cacb55feb9e8e0ca7b1385d28
-EBUILD terminado-0.10.1.ebuild 811 BLAKE2B 1107a705e5b0b85509ee821741d336585b42fb8243a98dc3c91afd6c6e16ec03ff028776bb23d102a949f7d068c24e9e0e9b145306801f54f65519c76bffd2a8 SHA512 ca2e46800d1e7243a34680a7258093cf25c8c63ae9bfcfc1f8bf9713aa727406ca1665a2fe0c49a122b3ce7929a7f762b21002e96c074ee700eaa969648119de
+EBUILD terminado-0.10.1.ebuild 809 BLAKE2B 8f3f0a83261f53e307f501ed29bf6ba2d55e039d400a24bfb7708c64d9857fbdb5af801b7b93f9113672d8a992c0883dd424935e55de727568794f1fb0fb5754 SHA512 55a12ae5625804379275ce5237523d6929f5a5f053c07b209f95fa2e39fd32053dbb5190635b87d3f36788947099290c106a5445134ef8d492395f0cc14174c2
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
deleted file mode 100644
index 07d6bc81835c..000000000000
--- a/dev-python/terminado/terminado-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.10.1.ebuild b/dev-python/terminado/terminado-0.10.1.ebuild
index 381e53433fd7..f94f8bb0b938 100644
--- a/dev-python/terminado/terminado-0.10.1.ebuild
+++ b/dev-python/terminado/terminado-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index e6b3d5662c90..60caf1b518a1 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,5 @@
 DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
+DIST testfixtures-6.18.0.tar.gz 121584 BLAKE2B abf90012fe79d148c44d72a8aaa5277c95a33933c7b753eecdcaeb11279b4439ad9ea394270e440d9681c22789a17738d367b66adf3d04cf6e6289713c1ead59 SHA512 e6552e6b1837ae4ee4754ce3675bdbf2a68d8e46b892382bd8320290050f2c296348ef6310ce3ff46962bf1978c351fe2cdb853a73c9f800f68818f81d5caec9
 EBUILD testfixtures-6.17.1.ebuild 1106 BLAKE2B 2576814009e806ebbe03dfb62b966456fc060146ecafba73010d002a520132184f4056a36754af34dccd9a11464f1d5ec6473970d2cffcf49a115a7616d8de44 SHA512 102be0baf5c3b52fa8a7190fa747e823faeb0ed1e55683d2f99976d384d3bca82dce142340d6cade3d3bceb33c2130cb4ed2f17656edf1265e8c2242f7820b15
+EBUILD testfixtures-6.18.0.ebuild 1109 BLAKE2B 15c8cdcf5b433b32c4138a7d2060db19bbddf192ab326c4a0ae3907026196b3817f2b8c2a75919a69861748abee41ac0c7072508cf10784bfd45feeb1b1f9eaa SHA512 dcd27bff5c81ab2c204dc861a70a0bbf147bd3867bf36baf03401a966a1f33931f272e360c063e717018c10d74f16597707148048bac3911bcb02780519d69a7
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.18.0.ebuild b/dev-python/testfixtures/testfixtures-6.18.0.ebuild
new file mode 100644
index 000000000000..a0872c1838ea
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.18.0.ebuild
@@ -0,0 +1,41 @@
+# 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="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
+
+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/testtools/Manifest b/dev-python/testtools/Manifest
index ff0488d757c1..b2ce524cd96e 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -2,5 +2,7 @@ AUX testtools-2.4.0-assertitemsequal.patch 869 BLAKE2B b7fe42aa06c20c0c281d27553
 AUX testtools-2.4.0-py310.patch 1325 BLAKE2B 3b7f3b370d2ce5b98e2a80ca438eaba4a224bcbde0c5f4307baaa5faf1b35f8dddf77b5fca8b45c6870910fbb784ab064c0178f8d77d7cd644c44ca94f2bd62b SHA512 bc96d58c2dd1744a7381d1418a000f213ce2c9253d54ed63fb11e686d05d684edb9e2873f0b15b7b99d5ae3deb1d435e4512ece1d1bad96947cc6654a7e6ad13
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
+DIST testtools-2.5.0.tar.gz 235399 BLAKE2B 62d62cd12f19eb3fad419dc06e7f0152bf8f70a9f60927b1d791f2905b34e13199ceac93b3d30735acae2c5db1e8554cc5a7f6c8588d1f05fb213c424e90a12b SHA512 6adbf9e90f0647a44130e99cd94e4c0cbfab3a1b5c28b6bb124d061defe69d8043186cfe554099936effe16a6b07d59927bfeb6820f5a0fb34970ff243030fd4
 EBUILD testtools-2.4.0-r2.ebuild 1845 BLAKE2B 2c51488922d8a57965fbfb779fb475aaf7d38cdf814a4c0ec8c722605187c301d45bc5fada426e5b1e1414335f881366834a823546bc345e1977002d3093094e SHA512 f09cc00b946a0f158b94da8639e44887e4d7c6cae754277b9a166ffb3292ced8bad7085c31335b6cca834b8b8eb19b4a7f781c6e13fdde365e71bdc019589165
+EBUILD testtools-2.5.0.ebuild 1124 BLAKE2B 365736c4ea8c6d6bf14b07c4ae39e9a96e65ff48e973a8cc5e9d21d1275699ed7fd294f4c907d842eb0e484e6214b065652abaa18b4c326c630ef84886ba161d SHA512 8ca227329c24bbda59653a700a87d25f55ed5bfb7a3e4f0c9a9d55f1b385b69ac448811cffe775a0b6aeacec69a6b6905c435adbb57a3c8e23c3686e89569ab1
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.5.0.ebuild b/dev-python/testtools/testtools-2.5.0.ebuild
new file mode 100644
index 000000000000..ef5d0f959a0d
--- /dev/null
+++ b/dev-python/testtools/testtools-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# 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="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P: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"
+
+RDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
+		die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index fd93772f44c7..b45037d297c8 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,5 @@
 DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
+DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
 EBUILD texttable-1.6.3.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
+EBUILD texttable-1.6.4.ebuild 662 BLAKE2B 6ccbd82aed053f4ce17d43c639af43dcb6a39623ae37ab5fd9521e5a72d216477470836b5d1bd17d2408da0ca5f14e9943107d83baa095ced8a1f18abaa6b153 SHA512 cf333b294b3774eb1b813c0170bc27001bf9f0f30aa5a78373c0c30f691fc6f7bca915ce4aaa1bc8be8785b45a650006e7bca11251b86c032080cd1acfdf9d66
 MISC metadata.xml 415 BLAKE2B 11ff7752eaaef7044c1fdb52bef9a06af78430db5a83c4f502eed9b93417bfb6ed0d93ab5ced5fd979e1dfbec35b37f76018aa6bc8c11c64fb8e31af947b175f SHA512 b0eda5e903c15a6de61d24b01a1b97b6002bd40e51291fa74c2be1b1a54b44641354863b7c83a60c02609582fea55dc38e0cf8b3ce126a26c7d437aca77cc0ec
diff --git a/dev-python/texttable/texttable-1.6.4.ebuild b/dev-python/texttable/texttable-1.6.4.ebuild
new file mode 100644
index 000000000000..31621be8f4f9
--- /dev/null
+++ b/dev-python/texttable/texttable-1.6.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests.py || die
+}
+
+pkg_postinst() {
+	optfeature "better wrapping of CJK text" dev-python/cjkwrap
+}
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
new file mode 100644
index 000000000000..b399d4d800de
--- /dev/null
+++ b/dev-python/tomli/Manifest
@@ -0,0 +1,3 @@
+DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
+EBUILD tomli-1.0.4.ebuild 553 BLAKE2B 734bb35956cf2734f19d45411f29fda96f0d8a4dee404ed6e0b72ea95ec3e878cb6104e3ea82d85f6db744b92a4e540a9649bc5eda4d8d441bdbd8cf6bfcbf0f SHA512 2e2f5ef55cde44761eb4a879004faa4c03c23820702f1e2659860f8a2429fafd1a1ffbbf274123a8dd6247fb553b18c7ddb713da63d33a1743a18f477181e7c6
+MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/metadata.xml b/dev-python/tomli/metadata.xml
new file mode 100644
index 000000000000..8a278aa4b565
--- /dev/null
+++ b/dev-python/tomli/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="github">hukkin/tomli</remote-id>
+		<remote-id type="pypi">tomli</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
new file mode 100644
index 000000000000..770d80a88e1f
--- /dev/null
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -0,0 +1,25 @@
+# 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} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A lil' TOML parser"
+HOMEPAGE="
+	https://pypi.org/project/tomli/
+	https://github.com/hukkin/tomli/"
+SRC_URI="
+	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 42ba36c60bd7..74775d93d184 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
+DIST tox-3.24.0.tar.gz 304960 BLAKE2B 5f6256d27d75651929f2d4d511f6137f20c71ab44c57e5b908c0ba92d5d7998ad5df69bd937a963bdf27625eefb222b9be2c7dffbf44684092ef345f4e33d0ba SHA512 94879cb65c1d41cfca02b23c7d540b93f5d3667ce72135969c584f09e00e3a246d80851f7cefad1e199f0a56c526e4ffa31c2938428b6632a38ad72388925dcd
 EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
+EBUILD tox-3.24.0.ebuild 2135 BLAKE2B f78d5fe7f3a27431a673c4175b93454d60d315c15b7ad0d7175b68827358319c5325b2de26a304f6a26a98885d69ed7db600f6388f68d7adae95c0ad4ac692fe SHA512 ebf3832e9b2b5c9814a53b134f95f8b0c6fda3b1ac3bb234577c2b22e39839c120ce978df29a9c43d2ec4313fb2d2207c23ce15aa73e885888319a7278bdb2ca
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.0.ebuild b/dev-python/tox/tox-3.24.0.ebuild
new file mode 100644
index 000000000000..4fb372991c77
--- /dev/null
+++ b/dev-python/tox/tox-3.24.0.ebuild
@@ -0,0 +1,69 @@
+# 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="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 915c87e7dc69..ca26fa35540c 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,14 +1,8 @@
 AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b40373c5c3d53107a5f31acbb71fa45c693511eb2efe14e798d65316435ff79d0c81412345484330d31a5ab79541d688f83e3ff3a0bbc SHA512 bdc2d9341abe62ca2fd34b847f8942e9747082d800bc152e17330b04d89b6f36e92ff1868b2ea79684ded038295c8593129a4779dfdb0b12587acd8d8e891a05
-DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 DIST py-tree-sitter-b4db17e4d43f27a040b4bf087695cc200512e4ea.tar.gz 13411 BLAKE2B fa7e7f969a9136286ef18220f5776def84404121f9b7cce35422c925e194380d4a5a3fadc3da50d2d52d85f4100abeab1456e9749f93be20af9f3dd0854d5177 SHA512 4de7084928990ae61628599a8d6440606d70589b8becef6ee58ffdc1ac632660d050cab3947727dab6161dd74ccf6b9f74e83bfe4ff30c41d01caf25fbf6b8e5
 DIST tree-sitter-0.19.5.gh.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
 DIST tree-sitter-javascript-0.19.0.tar.gz 257637 BLAKE2B dc28bcbb003d623f5930dbf575f94f51c00eb008a77ba080f05e730fae63fb24d29c02ebb62d179a59d0f9cb8a02dbd3971440f299d952b1ec29b25bc6d21e34 SHA512 ef842787742e76d2534528ec710800df91958feaa4ba351558b5315f58a4bd85c729d088d139e15e0395726a690a97c05e03846c9176af0fd482777ae57087ed
 DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38ac527b7b9676cafd8f53faaee3d10316f91decd30c02078b1bb785a474615ae58e6edba1b28bc3311e6ff094435e5f53d64cd6 SHA512 df7c72f988a62af0774df1b3a60c86397725aaeb1e2ffaa9b1295ab22eec09bffaf391cad20fb0d08a20914b22af430c2248c26cad179fd68c9f2b32419c0b60
-DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
-DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
-EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1287 BLAKE2B 3a1f9ac9ed82bbb3e79f52f3a51e7af8d66d1b559de7fd0646e73dc142819c8a74b11a4199cfa612684a3b0d17d8b0b0cf244e0daec3bebfe67eed73d1931221 SHA512 89fa71cbfde8ce26136a74911cb40a3e9a14771cb6dbb2039e6c50eb7c9102b0292e45bdf4529d45904cd7c56caa4ea41430cb78ca47496e9a4cdbda698c84e1
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1279 BLAKE2B c4a0bedcd484ba1e68392ec89b156df6b3f317fff921600033e82d43038efab715552e2999851ca1ebace2a63a900a964876ad0bd00a8c1a13578b8b0dacb2fa SHA512 c11bc9c4ccea1bfb94c593dca294fd940c686f30b70fe039e7f6f043865708d688fac8b2216e29c1695b07c2014e6a559a6e8c8c94a7daa4b2fcf7214571216f
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
-EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
-EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
deleted file mode 100644
index 3e348d16eed9..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index fa217361cd3e..7b8530aae75c 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
deleted file mode 100644
index 4204b16be7c6..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
deleted file mode 100644
index 9f91d8ee2512..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.2.2.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python bindings to the Tree-sitter parsing library"
-HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 53b2a01a2517..37052c7a3d74 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,3 @@
 DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
-EBUILD trio-0.19.0.ebuild 1443 BLAKE2B 65575f22f8838ce4dbcf24543e1124f2146f42920e187e3443c96e3c830e8cba49f1e6fa93c6998f304e410b690e860a5433943655fbc859723eb1c84642dbc4 SHA512 297cbdbb35a8e8fc016de8f702d40009d6d2281ea8dc041880a57f9d561eb81d4848b7aa7c90f44ea24b8c2cc2de45fd38510096e3521001a44dc2436b84c088
+EBUILD trio-0.19.0.ebuild 1460 BLAKE2B b84e95bbbd38381127ed4d2143768cd2f526b37315973017c14eec294eb277598b78e82778b22c9ea27115ddd451bb9668c93b3ff0cef9ef2967cc2d22d8d401 SHA512 dfdc72c7d6976b4872cc2e96fbe556d02c734dd7d270d5705b31559e41cc3400b56e1bc5b95153289260517db71fd478466aed6deda2962c0218dd51c1c715c3
 MISC metadata.xml 1958 BLAKE2B 303fd88e174740b04b8a3f5f7c4b55fb6279c54d7682dd455835a7071edc66c46b31833cef66f4880e4c047c783b928af81a1e8e9fd1e4f9303cee337bef103e SHA512 e916d2dcaf9ac82be7a1163d67017640c227e707589e830072f1af17328f77d3b721bb6014b99c53dff575a6c7448767056b436f50438c9ad04f820d1b292de1
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
index 2a8335848c48..14c8b8b5850c 100644
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index ff7023f0e2d2..16b6cc1655da 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,5 +1,3 @@
-DIST trustme-0.7.0.tar.gz 27853 BLAKE2B 97313cfe10260c67e29b470b9b65d4bb190b6e3be9b6944599a3c318d87b984f44abfe581420cd0ef29afc8165029c67129104cfb7ccf9d68e3c686424de34ec SHA512 3b2aa69dc617c04af3a83ca424ef19b5eaf37495ba4bc5cc55004016a9ea63c8df3585bb7fe52709b1b18a2a55e51d6a1a2b21ebc12c57ac18133b20c958b1a8
 DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
-EBUILD trustme-0.7.0.ebuild 810 BLAKE2B d20715d66309ed04d5d8684d4288be5fe911d87f0c56e2a24b11028a76ec1eef6ca32cd5e8be04beb49ec4b7983153e3e9a734c64d0b2043ff8b11b79869dd52 SHA512 dd9b8da40c86ab314137db96d5dd2e42e8cf3b25084159ddf0ae4803f1b21c3ba44d2b72a8b4b1de5e303295cfcd89bead23a6b09dc491d25de82913c5dbb872
-EBUILD trustme-0.8.0.ebuild 818 BLAKE2B af89986268058a4b962b9b0f4321462723d452a6fae079c178647bc7a81387385c22bfcd972848b3e7216f9d80a6d983043547e748f8740092fe06494e723446 SHA512 0a6cc8ba403f8d90944bde1161f2dfc7746c1ffed881658836edfa7ab96b3c8dbe5a14c5633504f8ceaa6600ca1bbeacf19c37ee2f32c3d4c1385f9ef6a9501d
+EBUILD trustme-0.8.0.ebuild 810 BLAKE2B d5dce7362c72101be2512db8bcf8f28eab7da67f4fee249df7bdf799ffc55a4cc30ffa4b97abc65496bd5cf7f405f19919e2d3bac4bd254b963e708d55a213f3 SHA512 c6f5129605a6f4e8cff554014627298a0c2d17d19bb396fd949cc3add5b13e125be80dae3608480f7b1f0bf1b1ec1294daeb0baa7fd62b4815d1046367638178
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.7.0.ebuild b/dev-python/trustme/trustme-0.7.0.ebuild
deleted file mode 100644
index cc2a08a03187..000000000000
--- a/dev-python/trustme/trustme-0.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
index 92cbabb2bb37..b56cc1f32e33 100644
--- a/dev-python/trustme/trustme-0.8.0.ebuild
+++ b/dev-python/trustme/trustme-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 81015e682a04..06c1e708871f 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,3 +1,5 @@
 DIST twython-3.7.0.gh.tar.gz 373183 BLAKE2B a84e10c1d61736af3e93f265d92104dac15d5f7a43d7fbdce4e8c58b641f671a1c4c10f44c5b6d6ce9f0646860d35c14414b17e84daeb74f6e2c8871207b6fd4 SHA512 33eb35ea811ec1964fcd51fad54ba53d60e6caf3b5b7d11ae138f7228be9fb1eca7a02b1c6699a62cc2f6c39e035cb5a28f53ef67a98d019cdf91c9874867871
+DIST twython-3.9.1.gh.tar.gz 372933 BLAKE2B 3db7f37e284ec83546e4f93a23e34c21ce9853e6206b62353e36b738ba591acadc55fd3dbbdf8cf7d74e63ab9966b9cdc7f49c5caa06e165bb7107b350509835 SHA512 e64d623dfa7ba2e81e09f9d8e784851b44201493d128ec576c4b5a9abc88debf1ca78f8a12933e0cd0a6b495012fa951bb62ea5d92db11186b37747b8576174f
 EBUILD twython-3.7.0.ebuild 900 BLAKE2B 11d5468dfd9a83fee82fbab7edd46933235894218eaeb38285b40758c5fce52eb9b736109deae083b728082bde8667c91aef209cff9b8ef22bbfe60334cc7da3 SHA512 3561737b9e2e08c13e0c7a8355b14539de2c53069ab39533fb9f0661ce6999e4005077b45942cf73225e3917a38da503f656589d6b4aa65812e8289644d17797
+EBUILD twython-3.9.1.ebuild 1191 BLAKE2B 63f4650af8fe26f89cff21a7098bbd670b4a1894e8a9bf98b44ab936e1a6f92d39ad3e225a9106a59907e8ab052a285be2d141f08077865957d23f98645873f4 SHA512 ef1e309c82e5fb6d689309c46e75eee7a1f5b028af3408a077f482761770cdd46000872c853b9e04b4809c0d193f9a7a45ff52324a9d89213999d7fbf0925034
 MISC metadata.xml 381 BLAKE2B 8c4300189076c3f5cb8498a4aae6ce79751ccc3b51295ac6c75b8b290f71cc9f0aea946a7d7c4e75434372459aedcf7d0286c31039221c06e48b945904e35814 SHA512 6ba06a2be42b96f85609cc2a10637ff911228a8f0a5b5fa1debc3d4c6ba6d9e57462f09cdcb96e12f75544fd3a161d5e3ecb5a89e8f50fa152dc7ccc795048f6
diff --git a/dev-python/twython/twython-3.9.1.ebuild b/dev-python/twython/twython-3.9.1.ebuild
new file mode 100644
index 000000000000..88ff3fa034fa
--- /dev/null
+++ b/dev-python/twython/twython-3.9.1.ebuild
@@ -0,0 +1,37 @@
+# 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="An easy way to access Twitter data with Python"
+HOMEPAGE="https://github.com/ryanmcgrath/twython"
+SRC_URI="
+	https://github.com/ryanmcgrath/twython/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/responses[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests are largely unmaintained and outdated
+		tests/test_core.py::TwythonAPITestCase::test_get_lastfunction_header_should_return_header
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_for_missing_auth_data
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_400_that_is_not_auth_related
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_401
+		tests/test_core.py::TwythonAPITestCase::test_request_should_handle_rate_limit
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 5f4c29cb3ba3..5bb3aa6ca52a 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,5 @@
 DIST uncertainties-3.1.4.tar.gz 148897 BLAKE2B 3e94b61ff6aac42a7910cafebee5b440541a020c58bc2ce402d0a056b5d278205f4a6556bf49073f5ded305cfa73ba7e9095e71d3963fd9b73e2e9e19ec360b5 SHA512 209ebbed1f9cf99e3263f6470b04fc737c6d34d878f7eb1d2a7df7e63d4d42b0460391a08f99d8fe09df8f7f0e1de8a8e6c2cbecaedc7f0373ab06d05fbeb955
+DIST uncertainties-3.1.6.tar.gz 158419 BLAKE2B 09582936a9b982efeee6cf3c99de568ebc820940ca2bfa1e4fd10edbcbd9447e7711158f8b98567a506d6c5a9ecf63b6e21d296c7f8d8dcbbaf4c2fb6a571355 SHA512 8835ed851d00bbe830770e57bc89ce57acf291e6cef2fca59897adb75e1e2de456da3631f73242ade20f567358b1d727b2b7f5df02e2f3e0cd8d861e81a6a211
 EBUILD uncertainties-3.1.4-r1.ebuild 794 BLAKE2B 3b880adc7f3f46c37a4b22253978397d653c609fb01cb38dc1405ac61ccfd476e2954e0cc0e0d699feae47145fbb105e7b26b3fcaf06184621d76d170aedb8b7 SHA512 e67922cf772593baf0b094ef05f46b4858f929f35b2443f0165a392a1a24990f7f7b8f4ae56d3ecab8928aa94285f671333c8048117783be3d3e846f09feaa4b
+EBUILD uncertainties-3.1.6.ebuild 793 BLAKE2B 12202195860e0a3ebf7d4f8743e27738b0f14efadbfb9f5ef4a1b1b430933aeaeac76c2cabaf00b6ca3a470c0d40eea30eb5873f61ec98062704e6a8b9ae9289 SHA512 e712ab8d227501f2014c146a26b5561da08e2e9421646dd7fd258804e60ceb69076081d642fac56ca4928e350e307912373146e1738b253e070d86394938af3f
 MISC metadata.xml 859 BLAKE2B 54ae46c343fada9aabb973c5297eccb0abe7299a2a1f0009df1d083698c91ce25339cf63d77857febee0798b27a84ba83dde95e19255f45f8cb0141c6a009954 SHA512 833af2fd16f097d61942c7f9323d8e38688eead6d5d10ae8e7f2547c950cd53ab6ce28f434d2c1bb2f15b71ec55bfc30b8bd53a94a0c5f02e824e3ecb08ecc89
diff --git a/dev-python/uncertainties/uncertainties-3.1.6.ebuild b/dev-python/uncertainties/uncertainties-3.1.6.ebuild
new file mode 100644
index 000000000000..96b4e0d8f983
--- /dev/null
+++ b/dev-python/uncertainties/uncertainties-3.1.6.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python module for calculations with uncertainties"
+HOMEPAGE="https://pythonhosted.org/uncertainties/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 6fb55b85b2fc..cef081279a40 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,8 +1,5 @@
-AUX urllib3-1.26.4-test-ssltransport.patch 1267 BLAKE2B e82ae435cfa8a2821f3f61d91a2e4f9011c5f68d37fddd1a40ae4658566db45717379c48d11299eb260c2f8816f416ac69b0379b3c7f925075ee9c1051aab1bd SHA512 bf5d2bb2b48444724ee1cfb87f4a84b3a63cd6ca598ba4d92a44bde71c66a35b815905de51fe027abb2eea63ae353dc0df2338ddd4f819f678f8a39b5c6d685b
-DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
 DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
 EBUILD urllib3-1.26.5.ebuild 1962 BLAKE2B 619160dfebe98b7497545a2044c4af5522b54d3b53a956c86041bb50588562784feb41c32faaded7feb7769e364029a695decd7a22ecc5c5673a4bba5ece4aa6 SHA512 a54a2e38a40e134c8cf8fab84b99f5a810ae89452a0204ef12ee695b3aa3d616887b6ec3d908447c2f807a258050bd55ecd4a05687f38a7811f82486cf9b454e
 EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch b/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
deleted file mode 100644
index 346574fec91f..000000000000
--- a/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/test/test_ssltransport.py b/test/test_ssltransport.py
-index 72b06b006..98682bd43 100644
---- a/test/test_ssltransport.py
-+++ b/test/test_ssltransport.py
-@@ -246,6 +246,7 @@ def proxy_handler(listener):
-                 )
-                 self._read_write_loop(client_sock, upstream_sock)
-                 upstream_sock.close()
-+                client_sock.close()
- 
-         self._start_server(proxy_handler)
- 
-@@ -274,6 +275,10 @@ def _read_write_loop(self, client_sock, server_sock, chunks=65536):
-                 if write_socket in writable:
-                     try:
-                         b = read_socket.recv(chunks)
-+                        if len(b) == 0:
-+                            # One of the sockets has EOFed, we return to close
-+                            # both.
-+                            return
-                         write_socket.send(b)
-                     except ssl.SSLEOFError:
-                         # It's possible, depending on shutdown order, that we'll
-@@ -322,6 +327,7 @@ def socket_handler(listener):
-                 request = consume_socket(ssock)
-                 validate_request(request)
-                 ssock.send(sample_response())
-+            sock.close()
- 
-         cls._start_server(socket_handler)
- 
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
deleted file mode 100644
index e0026885ab4d..000000000000
--- a/dev-python/urllib3/urllib3-1.26.4.ebuild
+++ /dev/null
@@ -1,97 +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 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-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-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-ssltransport.patch"
-)
-
-python_prepare_all() {
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	[[ ${EPYTHON} == python3* ]] || continue
-	# tests skipped for now
-	[[ ${EPYTHON} == python3.10 ]] && continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-	[[ "${EPYTHON}" == python3.10 ]] && deselect+=(
-		# Fail because they rely on warnings and there are new deprecation warnings in 3.10
-		test/with_dummyserver/test_https.py::TestHTTPS::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_default_tls_version_deprecations
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_version
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified_with_context
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_context_combines_with_ca_certs
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ca_dir_verified
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_correct_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_wrong_system_time
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_default_tls_version_deprecations
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_version
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_context
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index dd46542d3fda..ae1c33d9215b 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -3,5 +3,5 @@ DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977b
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
 EBUILD uvicorn-0.14.0-r1.ebuild 1281 BLAKE2B 822eb226ea59ca2daf2ed0fa81f97c30a1dc678d07684ee10bfe604cbd30d2bb0cd70c5b4bbb64c180bba9f605570546bfa81f457b40371edf672eb10f4689ca SHA512 c7e2629d574374a45973ec87a8e19d2157c449b727948116aee9e35d288bb5eb4c65fce223ac72693fe6dd84f7f505b8114504984ea89a3ea25f5e29495294b8
-EBUILD uvicorn-0.14.0.ebuild 1433 BLAKE2B 4d49fb57499a1e194296a500aca200571e19a4d25e08c239cd34a885e231f5131465e81077075ecaefb0a1291a6f9fb5671560dcf12c96c492360e04ef699907 SHA512 5150ae53a21b71bed057d77b26d0f57c39965dde04768d356569a705898f7cdd5f426d17c5dc5e2cbc546f442d4d66247977f679520539c39bb6117f6b0b414c
+EBUILD uvicorn-0.14.0.ebuild 1431 BLAKE2B 612bf782686c9814f0a497ca129148c91c4eab5c5078c57d330036e6d99c07bf7a0e442a7f7d722fc4db941a808551c525464e7282ab0cbbac454ecb30e706bf SHA512 5ab7ae041de478d207f5d9423f4da448d7f8c9465e25303823de9b27541d34ef8eb1255dd65640bd7e58f1a1ba02c97e1aabb118fe433e86df4622bc4a11bdab
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
index 3b12bff47fdf..a58ea4472de1 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index c88d05b32dec..120163e651eb 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,3 +1,5 @@
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
+DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
+EBUILD uvloop-0.15.3.ebuild 1181 BLAKE2B a39d893114caee875a7f414758c55c6dec6bb4fd55409b1a207f9ecdddc1e1f07a264458c198ad77b7d72f1c16054689065798836c90decb2f20fdcbd4718df7 SHA512 39909e1d61d8eaad914fb1d02b11fc3711d499ba7e276edaa55d065368550e71d8e2a3b70e63ece07f92f1ad0e09a2c4eed50ac6868ea1298255381eaff7e87a
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
new file mode 100644
index 000000000000..35aac31b4a0f
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.3.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 50e1c26ab9fd..87525cf56bed 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -3,6 +3,6 @@ AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590cce
 DIST vdirsyncer-0.16.8.tar.gz 115819 BLAKE2B e0140718a1b41875421a7094e02cdeb865c500935e0c97bc18a614551586d79682641726df1a96e17a158604ed309f713f4caf4a484025eca5fbc6acbbe18f97 SHA512 12cb50f592085af37bd9c4207c0d31fdd38fc2a44712eb6288b12e7e7ee9af82070d1d405fa9579e935e545e6c92aafb6f8334ebde4976c4eb9412e78e7c5ada
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 EBUILD vdirsyncer-0.16.8-r1.ebuild 1665 BLAKE2B 174aa65ac2b9177810b81bb22c7411e93599f91f2c624aa12fa2279e645280c800bc1b847dc7c096a67cfd4fb118788195905fa8a39c6588fe5803c553ad92ad SHA512 b3f8a0a58a3020f3870709c12f3125f87f2812c0883944204b065f1137a97f7ded95bfa9a33f887588404ab8e71f2bd7c0ce305a85590df978cd8b5722227cfa
-EBUILD vdirsyncer-0.18.0-r1.ebuild 1660 BLAKE2B 990d86787709a64738122a42fd9485c01ca249ad412b3acc6121ff4c4e911e7ed6464c15945ad881e3944e9c64b743d49daff55bad5edcd1f5556b8d0b14c137 SHA512 0c72e65ad73e60797519fdf5315835f1083f934a1bf7ecfd000a7d2d0a7caceefb0657edb96215cfe5b9e2b3167c9f8237a0c9fe07f7151478cdbf54f0c3b222
+EBUILD vdirsyncer-0.18.0-r2.ebuild 1664 BLAKE2B 8fe1cc11994e6041efc716a7a09a0964496a1e0dc6ced3063196243f893bfbbbe2f3a4b903d26c582c55f9b637b00eda7c4396917c26d99b1c56b578a7a719e7 SHA512 10388b153f0415962b204ac238c01f89b6bba06c30aece50cb93ab48144548c099a6660ae0020a16759fbf7f6dd928fc4e5c593013959c28a17233af04d5a5eb
 EBUILD vdirsyncer-0.18.0.ebuild 1502 BLAKE2B 4934fee920fc9aa7c9f54fc2afb7c96654009e2baae8a05629d45b44955e86ea57892ceced4109b4bf1ab1c29aba03785f5eb530e4522f13d47f7599ef6650dd SHA512 74781a7582a99b4731a15143cdd15b90c70b4aef609984561705e9558c4824e39846727103a5345966decbfa6a4b7f42a8cb89a6c529e26c38b5b592509ea985
 MISC metadata.xml 474 BLAKE2B 8ca29c2fdad6e97ba0c97240aff16ea6d2a2916344f78717521e28b20ebee3c35321d56333a736339278e9352a2cba182254078eb4ec148e858f1f7fa8638d5e SHA512 d8cd3952f9b86a7fdf7f38462a784fae8e59058157ca6c86929c05d8e06337af3af3980812557cf10bb6308a4a971356fdcbcee551be22f3cb5bbd154ee8c80b
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
index 21d72fd5f54a..a701eaebffc2 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r1.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
@@ -59,5 +59,5 @@ python_test() {
 src_install() {
 	distutils-r1_src_install
 
-	systemd_dounit contrib/vdirsyncer.{service,timer}
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
 }
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 53837ca26474..e2b7c6a72263 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
+DIST versioneer-0.20.tar.gz 50634 BLAKE2B 4a64f311b5b7028f15a20c8111f462399bf49340b6ac42272af20427fe5ce722c9d589c04dcb66fe66782ad3ce3491f5fd4807ca06b3caa2342fe3750bedc1be SHA512 7751af838639f06f1f87224b3f87e5d466cf11f32e4da35646a1ea84ba8d21901d47137fab6bde2632f5aaecc2f90f9bbf5968d3fcd3b074e5145762bdde1ae7
 EBUILD versioneer-0.19.ebuild 867 BLAKE2B 604a83efa3527d3b3981f247401d775d6f48bc2d2a79963429b7df09db63546446abe5f8fb20a5cb934eceb5a12708a5bc3bf8965f891c80725f4f5a56b5d28b SHA512 47556240dff382f65a669d74f8bb12299821c9510db2273bf3bbb8b2b93957a2e6d6698be2a0d6cb33ee1ad0da66edf6a9b1af42c8400df5323d21084daf2dfe
+EBUILD versioneer-0.20.ebuild 870 BLAKE2B bcc4a2cbf24a280f0f6b67fb33b972efddf75eeb21a6eb08a921c3c33aa0a93e04242fc3c8967f15649c82f14ff8a347c3a11b87fdc865479de4b4133da2e3c2 SHA512 9a9c17d977aa87fa43b467f5f28d546bd1011d1f7fa17c6e7f13c9ad7eb961cfacb9a96b36f35acc9b41a732b3eaae435accbb09b463fe0c8b733b1bfdab3f5b
 MISC metadata.xml 425 BLAKE2B 70d2a29bcd352f61add9b6ec9f302712d3f14556c3827c55273b4b2525c7f1b36c4ae2b2e4056aff955e864128d9e106b1c0a0424129818082047af19d8bb03d SHA512 4e2f07cd10a1dceebd43c8bdfda3c546a924b5283bd31417cecfe5b5af6b5868915f9e3343694a503c51bbe71fc9644c39f9335471b0ec98fcf780caa20f49c3
diff --git a/dev-python/versioneer/versioneer-0.20.ebuild b/dev-python/versioneer/versioneer-0.20.ebuild
new file mode 100644
index 000000000000..299d280fc6b3
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.20.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
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py make_versioneer
+
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	"${EPYTHON}" test/git/test_git.py -v || die
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index c1b47ca7529f..a00fd3e1f965 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
+DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
+EBUILD virtualenv-20.6.0.ebuild 4257 BLAKE2B fafac98f404cf0eac5065f36b0d96c6e6475483f1170ece02e8577ea80b8b9c53f25e493abe01fb9db99ab0646036ccccf669c8501b25db51c208564a7e0a372 SHA512 e3f1f2f6142b8b8b8fc6831776bb68039802ba16e702c1da4f0dee5c3cf33795cbf665dddce466e327ee18ff4478db1f46607f533e9731390c8377d0e583772a
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
new file mode 100644
index 000000000000..15279072aa1f
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
@@ -0,0 +1,99 @@
+# 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="~amd64 ~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}]
+	' python3_7 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			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}]
+		' 'python3*')
+	)"
+
+# (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 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 ]] && 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_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 ${deselect[@]/#/--deselect }
+}
+
+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/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 2be750e5eba1..66fcb7dd133a 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,5 @@
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
 EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-EBUILD wcmatch-8.2.ebuild 1293 BLAKE2B b16a00ed341661f5623d87b8934e1bf3c6cd3c5bedb1b6c26bb8f4c6b657bc54197762700a8226d99c589c36672f12963d51e1b220dce97b501de3d461b0e8d7 SHA512 9ca84e9a8969094e7a51e90675645f9e14ad80482cbf13374eb06df97dc8282a42ab5d543ad787304c4637c1c188fc32d6a104448cabebadd9c91593bfaf7942
+EBUILD wcmatch-8.2.ebuild 1291 BLAKE2B 409128876860780c14ceadc564c6fc91c47f0663e7541b16b98efa7f963a4cfbea875ee0a77492cc931c00dc6a55d67d634c384d5fa98fc2e56a9fb15c454751 SHA512 c3f5e658f2b3ea4ff157065b5b93838b0f07b336bb88df2917bc99600a1fa783a2e61a4e1956a2eea3f9560a5dda43feaee0b587306692d9764decbf27bc329d
 MISC metadata.xml 3086 BLAKE2B 70a8843ac7d26d1ff596516cba4307a7e15ebf474997ee65edb44ba4d626b58ac75ba52158f90c471cb2b59bccb89eef22afedc0d6e18b8d6fef1faf1c361a36 SHA512 074dd8d50af976cb98853b05716adedb4abb848cce120f07967c17e7eeafadd3bc25f6cd1b71421aab80ee6652b72935677548b33ca2ffec7c18c79abd3a3ac2
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
index 780c9e32404b..445b9af017e2 100644
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 5e6aa7667aa4..a480479f1b94 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,3 @@
-DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
-EBUILD websocket-client-1.0.1.ebuild 761 BLAKE2B 3c42e21cf50d7bf6edaf5e5799b98f86c4f5be718eaba47b7343439dee6c8e3b1e0b112c1d696dc9f6e4d5f7ebf37b8726019fd93d2cfd22986a4645b2edd5b3 SHA512 d9a9009813c17e358f4ba56182358c9a5af790a60d6e55f069d09560cc8b012284e807d2e3d6be7f156ca3887a5cf0892802ab0529ae13d1f7e2539820eba453
-EBUILD websocket-client-1.1.0.ebuild 764 BLAKE2B 47c0a056ee6c554fdff113986e69f5129964674bfa898a2bfd4204a7eee0fdffa1ece38151770c8b41978fb9c6eafe7ad526c2030692f08d5cca72d293e70a84 SHA512 9aa15924970489bdaee10bb79e84f17607fe5a91fb11b872925c82d6daa5af44ad8fc1b8a31c6067e14284a5f7af8cbe903fbcf692dd567ced48f521983599fb
+EBUILD websocket-client-1.1.0.ebuild 761 BLAKE2B 09a7a7ec1110f0d9b5c43504139c555f2777d2f3a12071daf6900ea9210d18d620506b7795f2e11ae353e32b0453557cb8bf901d2aef36027c000958c9b85495 SHA512 1607c7cac20dc8e8b8b6be41bf74d74acaf607c51ddef355b85e5565c5094355d69ecec545207ad248387a75b756de933fc2b0cff4b9df687c9e33a2fb233268
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.0.1.ebuild b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
deleted file mode 100644
index 8dd24d35ef7a..000000000000
--- a/dev-python/websocket-client/websocket-client-1.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# Internet
-	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-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/websocket-client/websocket-client-1.1.0.ebuild b/dev-python/websocket-client/websocket-client-1.1.0.ebuild
index 0f8d234c04a9..4465217884ac 100644
--- a/dev-python/websocket-client/websocket-client-1.1.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 4bbd2b246277..7d8f5061f653 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
-EBUILD websockets-9.1.ebuild 482 BLAKE2B c8fadba95a9982b02f659ba823ca51677db596941d128cf4195ba33bd8b4bc7d49d9ad3730a673d428598dfdf60a4bc3d6d1e633d0e08058c607aaefeffba727 SHA512 f84fbb3a6de96aa941cd6f31037055ab455a2c869cda5808cd8c4ec016b1c0b087419a594e64f142551cabf2d14b890405f3b875c7d9d2ce3fa4c73c48d119d3
+EBUILD websockets-9.1.ebuild 481 BLAKE2B 0f681992c42ef67af0039703686dadc7e1841f4cdbbc6dabebd303b2fad9bde9c44749bde580707c6749050d6e370fef4dd814a2d090a5c77e56c868735b7e7a SHA512 2a886bb574e9ab7e9105bd69942fe57fa5f798bc2a4ff976f2774e754b3c8b52f2f861074bf431651922f225059b86283111b64b3d56f5acb63bb85ef3012a8f
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
index e4f500fb7ce9..a41e8123dd58 100644
--- a/dev-python/websockets/websockets-9.1.ebuild
+++ b/dev-python/websockets/websockets-9.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index dccefa42bdae..c1ec50d5f5dd 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 537 BLAKE2B 8ebeaae8c56824ddcccc4462681fefc9b70861e4211e4a4a4ec16b9b07cb80179392f65830e372b244606849ea07fce2d20d1ace5eb0732453d8b3d14ea0dcd1 SHA512 e64585bc49eaab38b2e772792eb09cf68c454ca27225b565dadab407458598bdf65e5c1f0e4aa3509e0d8c36a27a1de8f7a1d0717e4c0b2eeb63c1eb143e2fcb
+EBUILD wsproto-1.0.0.ebuild 535 BLAKE2B f7eaf6a387aff4e1fb7b7d2356f4d884c095f6f62387b10d61b918b4fb3a84baeb74833a2e91e18446b8850c36cca220e103b9a265c9b97f5d6f1e7b01d27cdb SHA512 85b7ac12cd58fef469490bb6cdeb32cd27e1d4808a0c7a78429788ebf93049c5a67f33be0b005465e80028fde3c177a95059316b482269cc62f7bfb1d47674b2
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index 67d781f6a895..d900b8df44b7 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 2aac06fd903e..de27c8a5feeb 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-2.0.2.tar.gz 19946 BLAKE2B fde2f4f30fa1dbb5d4778d82bcfb347a5b8f89635df6c298d0dc509a194c528b653a1cbe4537c878bde4a8b987852ca51e37a70b6c35f96c9882c5b1b277dd36 SHA512 2b5d2a259e55384426940e6284ec9f964f4f0220b8cb364606c938ef6e1717d40ddbc3730732dddc86d460f624ac6161fe5ab55c276aedba9187a79d9d53a60e
 DIST xapp-2.2.1.tar.gz 20739 BLAKE2B 11f3b8964aedc726235d1c9350b159ed5cc0e859f33d6390d06e8df225eb86d0d6a392d16023a460ae0dad69f4a65b3cc8c3a759e8a4e5abab491a6d71ea8ab9 SHA512 2c03a6201404d7c792e12b10241309c912ca6b1daaa56aa0867ddbb16af053f110e4cb05da969b1800678d60acc0e6d19fc097581e6b195fff9f68acb48505ff
-EBUILD xapp-2.0.2.ebuild 561 BLAKE2B 1f414320c5c90b1327885ff87a7595981531624c770ff49a992be274a466c170ea6ae6c1c99cd71904bf3507e535bb74a47592a7d1c04c17055ac90025783125 SHA512 3a13b8c5a56f9c0099b13b0a5b6e3172e5c8b08e253ac5adfee0522e3a405648af543e18a925051052b438d2eb96e0183dac89af57923c6cfab40adedce39ff9
-EBUILD xapp-2.2.1.ebuild 571 BLAKE2B b3981de1dc023c0d7d74a348cbb69df543bdc0f5295be7ee476c258623fc492846e724f896e91d658c823df5913bbf5aa451168d2f792116bcff28f6bd87471f SHA512 e47eaf052fcf960c5e3c9cf6592f2be0e46235b20eb0a770b52e97548a0fd20c20479a5bfe12a795f9b5df37cb3ea82bebfa7e44fd85693f41891d76bccdc800
+EBUILD xapp-2.2.1.ebuild 569 BLAKE2B 7dd8c9e30701e49a3516381944076e6116959535af8af142fd88568e8ec62b18acd31c95256cd7735fdec0a668e8f1c8f9518d7c73e6da82eb39ddf1d651021b SHA512 abf20714fcbd946f36774f69d2ea4a78eaca067505c29cbd015675429cff576ca72dd9dbe0da1c4119e5edbe19c031ad0f876d95e71db3e21219ba1d6c57ef0a
 MISC metadata.xml 515 BLAKE2B f15f4815cb83df69629385add9d7e08929a06ba83d988177ee0c2702ce1ef2a660539596f8befbc581d3f83046e03f87d99df4125dcf977067efae15bce8eca4 SHA512 dca7ce42a549559511a915a714ebcbdf2a94b501d361d67fbffefe646e767762184f7e6ecc8d7915cdbf4c73d88a17b29a1aa538f2fd3e9fdc1a6f2c5c3a3fee
diff --git a/dev-python/xapp/xapp-2.0.2.ebuild b/dev-python/xapp/xapp-2.0.2.ebuild
deleted file mode 100644
index 32cca5c4e63e..000000000000
--- a/dev-python/xapp/xapp-2.0.2.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,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for x11-libs/xapps"
-HOMEPAGE="https://github.com/linuxmint/python3-xapp"
-SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	x11-libs/xapps[introspection]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/python3-xapp-${PV}"
diff --git a/dev-python/xapp/xapp-2.2.1.ebuild b/dev-python/xapp/xapp-2.2.1.ebuild
index f61e9693a730..8e2fd9f17843 100644
--- a/dev-python/xapp/xapp-2.2.1.ebuild
+++ b/dev-python/xapp/xapp-2.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index e2d6c881ff83..3035e1ac2421 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 677 BLAKE2B 7de5fb7d9a6d5f332e7ddf1cd8c0494dd4f843e20ea726788818af6879609d3cac8a35815912ba379e24ce6e2166655264039efc49c6bbb8680c5e262b48542c SHA512 8cd8eb902f3c88281d02da9489515e92337aa0f0ef7a44ff4c8a0034d6b8902d7181acccd3637d44f4a63a247d78f4c6e9ae3a0707e99b1fb1a733e45f16ef66
+EBUILD xcffib-0.11.1.ebuild 684 BLAKE2B 4aa229f01fdb68e73f77ea92bfa21d41a402922656c2a6b6dba4d0c64cbfd8230cfff28c884f6a612b2af0dfb2d267ea081bfd32b08471116ee1957cae366a75 SHA512 fb4612ce2478dc9172aa48482a98a578f0171c60c8704f193b1e3197f641dbb83a7a7307ea9724e68e00b570c0f24342c8b380e3435073615eaacc1cdafb0d75
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index c9185bb6b8a5..b76474023be7 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 15d3ed008e63..b812af578d80 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 677 BLAKE2B bd6c1237d3f37092ee94d38d77945d012608e472d9f49f4e9942d8093d1a436d52b1217e647e23677359e09c898535c40df58cffb59c33207de3158793172e60 SHA512 0273ed4a2103451b72397976b7aaf50b8d562c82f9a4f4735572284f70ce815d2ac4030197b553ce038ba7a8890e8ceaf83df937cf5368a2cfc28e68eb64cc59
+EBUILD xlwt-1.3.0-r1.ebuild 684 BLAKE2B 3d96b142de98d0e028720d75ea58aeffd34ae01fa0240a6499ab330c6e2d683398e96bcbbaf61aa78afb89cc8409c67f7367cd6a8d98e21621cc5dbaafdd6c89 SHA512 6286687c5d3df1a4c26c6bd9fec68a50e661c75da83d68110755e262c7939cf6bc1b02605d8f7cdc132d48ef915157562e9b38c622422e1a3db43fa5dd97f585
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index d6f988af1eab..ea04e843e3df 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 431ee2d98969..2729013bdf08 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,3 @@
-DIST xmlschema-1.6.2.tar.gz 367141 BLAKE2B 32a1e4924765badc268d2d68458c4d6d0409c5f3b4e0109487cc538aec300817cf0649a43f77990e82b2c54252b2ab3e0593a503c217893661480f1632491f41 SHA512 5aaf022451fa069b2361af542d4d864995e8dae7d50f5e66a5d5567b4d8511bb46b5dcec68a780e89025ff02f5bbb6311c4fcd4fb17f6c24c0c02b00c6b4a341
 DIST xmlschema-1.6.4.tar.gz 369270 BLAKE2B f3b98f0b8b4446dfa67da778c6b63585a894f4dcc9fd7ea98637ccd54b26e63aebc7f3fbc00e13ce43730b88da0f773a491917d5eae9301b5d22f6efe620473b SHA512 7e13d20a6add1cc5b6d0f732e672be3eeeb2f107fd2031cd5c22d1059d24b7d818c534817ea115d0c5f011727175bdcae71a0b8d55f1d6bd263a7e38286c26fc
-EBUILD xmlschema-1.6.2.ebuild 776 BLAKE2B 0b817a920dd8e9c0225e4422555f3dab1fc85e5339fed940e0dcb90d7d05f0c06bdfd0e52a8d7ada5a021e4910c81c9e7cc802acedd9ecce76aee65fa145d02b SHA512 7687a1b298d768a761cb14503fc9ec4894132c549933137add5a833397dbc696372e4ebf30f30a04dc49629a9462d9525d141e8e9b9e8594e09bfc58d2c4a6b6
-EBUILD xmlschema-1.6.4.ebuild 787 BLAKE2B c865d0370163362a19b55bb6cced1105a23891b003bcffeed135dde62d94b76467c599a72162c45c4917b2a70fb9821ae340adfa566c91a775360b218bd3d78d SHA512 e986709ea63b9e0842e260333f1856e3d171dcf854f611498819bd456300203103a2e0e939e146942fca032d363cf7d16aa4d8107f154d0b9ddce246c0274139
+EBUILD xmlschema-1.6.4.ebuild 779 BLAKE2B b122698cef27e5e87ea640ba5c33838efbec2ed1f70373637046b666ac829fdf8583368d4ac325a02f782eb0b25771f7aabffcf3b2b5a2c4f281ec97c7e27f26 SHA512 392c42ad67bf932549a56d1f2de75871cf8f49739c110d84e4d61f5db02ed410d3374ecd2612288552b07dc87f0a0d7ee1af2d5c3f763c521031f14c2a9b00ec
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.6.2.ebuild b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
deleted file mode 100644
index f53fafca8870..000000000000
--- a/dev-python/xmlschema/xmlschema-1.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="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 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		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.6.4.ebuild b/dev-python/xmlschema/xmlschema-1.6.4.ebuild
index 2d0e12ac9848..f109c54be1c3 100644
--- a/dev-python/xmlschema/xmlschema-1.6.4.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.6.4.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
commit	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree	555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /dev-python
parent	4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)