gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-python
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
743 files changed, 5824 insertions, 5417 deletions
diff --git a/dev-python/APScheduler/APScheduler-3.6.3.ebuild b/dev-python/APScheduler/APScheduler-3.6.3.ebuild
index a1d1d280c8a0..8f1d7466fc1a 100644
--- a/dev-python/APScheduler/APScheduler-3.6.3.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.6.3.ebuild
@@ -1,10 +1,10 @@
-# 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=( python3_{7..8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -15,18 +15,17 @@ SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		www-servers/tornado[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+
 # Tests that are known to fail (some may be triggered by network-sandbox).
 test_failures=(
 	test_add_class_method_job
@@ -64,7 +63,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index b9b8e6b4902a..c7e160e57031 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,3 +1,3 @@
 DIST APScheduler-3.6.3.tar.gz 96309 BLAKE2B 6dcd49ec3ebe4f815a7fd2594c438dfe99d9de720a4319a3c7c202deba1235740e478357dd78ef74ec3610652b23a58f23c1188fcddb3b2e48b160895f3ed06a SHA512 4c348a4f37a7973633554a69635f334b3c293c8942fe853b309b4b65335f5d4d553d7d42fd4661b0e6a36f5e97446d296a2c8971bdb51dad3bc8ee6b6d3b20ba
-EBUILD APScheduler-3.6.3.ebuild 1830 BLAKE2B fba93aa327d6526694a5ac7dfde1f5119813b7d56ed557bb85e68482d2dc2c1f928508fafb924e35684650f746bf497aaac78bada2f89b90d9f2f2e22f05e6de SHA512 16325c915407ac6462046e7621df791c2253eedff48776b7f4b267e06b14c1d18e9f636535fef51fc7773f38a1c14eb21a68bb0b38ff00e4ca23a0b37d18a543
+EBUILD APScheduler-3.6.3.ebuild 1707 BLAKE2B fe0ba80d538b7b4f3630f9074c283d61fd79b5543f3a9977b672c338777cbabe38619cb3b7f85ec42fdc07f1b798a4679d1420d8c18e5161d8d29db62e4d9e62 SHA512 08bd97f385b731cccb8299cf6487379ca6945d455b7012e3c956043fea26700b96d1c7e508cd5d4615907416ecf47d218e1d31d8ec0d856a19bd1a9d0d187eb4
 MISC metadata.xml 403 BLAKE2B a9cb9d18b06c206a2a3b89fe6a460dd477db5d591fad97138226e9caba4fd73512f47fc13d23b383d868cf9ef4cee74b4b2140e5ebb51c8c8cc765bad8c64c20 SHA512 b029f17fe0d3c8ab572fc92c45c41659c3c3dcf5bb487d1c862d65fb9f1c4215bcdade0958c3044117c97ca2442cb08dac89b3cd2817f143f807a608fcec5004
diff --git a/dev-python/BitVector/BitVector-3.5.0.ebuild b/dev-python/BitVector/BitVector-3.5.0.ebuild
new file mode 100644
index 000000000000..5d7d432a1026
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.5.0.ebuild
@@ -0,0 +1,20 @@
+# 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 pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 0293c587464e..5590e8ed0dde 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,3 +1,5 @@
 DIST BitVector-3.4.9.tar.gz 128306 BLAKE2B c9559596dee2d9315e9a906e24d4d67ff74c56e2a0f94ccf7dafd360a5554b46f61a7e7e5bc30fa6a4175c97f6d42022468966ab123250319d36f65b23624079 SHA512 be2144a35990b46aa2cbd71d65db51baac5fec65d4c91a1e2222857b307c96f5551adf1c5a86f145f01fa895465b99bc02a485d5d7a43495dd1e05b9a0d9d513
+DIST BitVector-3.5.0.tar.gz 161704 BLAKE2B 0144d690394f0b9300b6c53429e3062a97a2d04513cf282a6f738bcf721f758c285a739db0c90c4c46bedd382bbd14c910ed59bc660494660151447f11de56b0 SHA512 c303b77f0f6ea4fb80233afb09e0f830e0beb8cbe17d9bff242a4b6465ec34a5621b1003f5cb8e139460a27bb4fb897960e3dce92eb30b95bef55aa6aa5f0827
 EBUILD BitVector-3.4.9-r1.ebuild 634 BLAKE2B 511b982241f6755b3cdaa8a4b9952cffad03a1e4d7b2994539435bea8cda271843b0d289c255aafc33fce78799606cb5f672550cdd625dfff3c766ecf05123d1 SHA512 686b7bc58a053361c8e16aa4460d080c30cf0f97fba1f28a543e26f76af991f1a723d7598be7cc45a917a8c4dcfcbbab3fcda044ab9b071472f8399cbac6236c
+EBUILD BitVector-3.5.0.ebuild 578 BLAKE2B 309acd76087ca54cc535bffad66bab8f5fe6ee5d4e212c7e16b05393c7edb42270d25da55f5b9b1679a8b0c677802524faab4c56b69998ccb8a7e0fea03a665e SHA512 167a6f3bac4723119f2921503925c66de9dea02b3dc1322a6730f148b7db7fa8dd20d4c27248aae14ffd29d00c5a697bee7a0fc12615c1c968a334f7b09bc668
 MISC metadata.xml 419 BLAKE2B 36f8dbcebc7fabbff0be1eebd52558eead8092cb15dbdcf5a816ce834c4486dc3743022f11b8d8944fa6e055b3450a7a45f2327617289b562c07d8057966c990 SHA512 dd2061a42827712b25efe3b0ac14db337945a89405506241a199cd17387c138361155e7e42bf8a3b9e75a03ba008957f376b2ec3294f05308cf07395b074ecdd
diff --git a/dev-python/Faker/Faker-7.0.1.ebuild b/dev-python/Faker/Faker-7.0.1.ebuild
deleted file mode 100644
index 44adab5d87c2..000000000000
--- a/dev-python/Faker/Faker-7.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 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
-
-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/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.0.0.ebuild b/dev-python/Faker/Faker-8.0.0.ebuild
deleted file mode 100644
index 44adab5d87c2..000000000000
--- a/dev-python/Faker/Faker-8.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 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
-
-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/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.1.0.ebuild b/dev-python/Faker/Faker-8.1.0.ebuild
deleted file mode 100644
index 44adab5d87c2..000000000000
--- a/dev-python/Faker/Faker-8.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 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
-
-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/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.1.1.ebuild b/dev-python/Faker/Faker-8.1.1.ebuild
deleted file mode 100644
index 44adab5d87c2..000000000000
--- a/dev-python/Faker/Faker-8.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 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
-
-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/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.1.4.ebuild b/dev-python/Faker/Faker-8.2.1.ebuild
index 0b94b1e3251f..0b94b1e3251f 100644
--- a/dev-python/Faker/Faker-8.1.4.ebuild
+++ b/dev-python/Faker/Faker-8.2.1.ebuild
diff --git a/dev-python/Faker/Faker-8.1.2.ebuild b/dev-python/Faker/Faker-8.3.0.ebuild
index 04ab1b4bc461..0b94b1e3251f 100644
--- a/dev-python/Faker/Faker-8.1.2.ebuild
+++ b/dev-python/Faker/Faker-8.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python package that generates fake data for you"
diff --git a/dev-python/Faker/Faker-8.1.3.ebuild b/dev-python/Faker/Faker-8.4.0.ebuild
index 04ab1b4bc461..0b94b1e3251f 100644
--- a/dev-python/Faker/Faker-8.1.3.ebuild
+++ b/dev-python/Faker/Faker-8.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A Python package that generates fake data for you"
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index dc394c1a75d3..6d884a8ba2d9 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,17 +1,9 @@
-DIST Faker-7.0.1.tar.gz 1143226 BLAKE2B 0c5db5c718cb9d32e3c87d44e7fa66c8cf89a99f69988935f94a64460852d6c1f1ccb6c069795a6ea807c8de067cc3808121da7e07d8fdb326e27cb345141c42 SHA512 9a1aefaacd727bbf2e94239620948900e8bd33d5c3fa9cc30814850433cc5bbd4392d1f1d9f2c51d10e77cd1645d2d6919254663b438a45a7e1694988c58ac92
-DIST Faker-8.0.0.tar.gz 1143250 BLAKE2B 594b21ab72016cda550e27d53b032b4e7fffa2554ae81da7291f0d1ad1c63c54a5f849a5c528af1d8357d60bfc92235020c459cd025e0f5cda4b6fd4eab50320 SHA512 612ac59d2c88584243f9b7ff69c92d0dfb69394d419eedc18829641d53ebceca2ab5598a60500428453043a53c53d7716a1ac265ecc5e3a423fcbaa6d69f375e
-DIST Faker-8.1.0.tar.gz 1143544 BLAKE2B aadb12b681f335ff850c20fd9f3202520f265abab9844f4acce51a7c9435e74e5fd8faff8d2ca1d5d0b0ee7c786c05e2968ef84ecead4ab74b65d500876120a1 SHA512 d264b9740e66248b2dbed1331c1d632b9f30e9f7ebce0ff9e03b7f353da14b493a006af1deb0efdccc7911d99e17f741ed3196d76fc17d2b18af42dd01f052cc
-DIST Faker-8.1.1.tar.gz 1143636 BLAKE2B 458bd0bc94dbf9dc60f5f1a74824390a3166dab7328274b087f299dfe637cc0ed728485ebc9418c2877bab7c05718ca1d9a592ed66a6bd4385585aabaeced8ea SHA512 705c890bea67176627eccc5a526cf20530485f1503813f09616d33a5407eefdea0416a6813b9efab719728b89d8be77cfef39d7297731ce3324852a9305717bb
-DIST Faker-8.1.2.tar.gz 1143566 BLAKE2B bfef745578e2f33aef4ae925f53867e0c6335d03e8d2950d035a17a4e2efde959f841f62097708173ef1acc22511fcb6e2f81666aa8ba6e27aa0e5f1f63714e1 SHA512 da989478b122a6e583fdc1de2481d9c81b5f8c5a9c7274fd49dd057e8f2e417f91f5dbc160b0fd5a4b9ec749d3605e54dc20fb603ff36ae75a9d4fad827e46f7
-DIST Faker-8.1.3.tar.gz 1137819 BLAKE2B 12ff3c4d19df2138c7089d70b311a0191345c09c66ec01fdc961af6d0af069509bee41908eab0ad7af7aefa08e6706f651ff537abc3378c1afa007120bade3db SHA512 bad2d477b4e5225d8e1d1436157cf951f259bbb6ac09d99ddcf38ab953862fdfe953742dbcca0bbb40376f386be41f3a788dd85d57b66f1e19c626e699d23620
-DIST Faker-8.1.4.tar.gz 1143731 BLAKE2B d87a0aed1393d3e837a8b434d126581be39f456f052a01b1e158355643c7ecb2de084da7f9589a5e7e5b07aacd0da8fa844295d1075c7a18e195a4436b04c689 SHA512 e04c4bd9c2692957922f6c5282ac158babd4bdfba2afd79fbd2e26349b401fb13754643e283ced4f9fc235c6255e73c73a8705b7b419f8dddc253b63a8f8f727
 DIST Faker-8.2.0.tar.gz 1144105 BLAKE2B cac0e083fb91c4eff99b4a1af0c4acf665d2c7dd45acb21926341deb5ac27c6837ed59f9f157f1c4f26810d9844f432dc857887c6d1dcb44b67cc7713fb4ed41 SHA512 4d7d98c2f12f60ea2c690cf4647968181efad4f9940c63ae11dee66e3f4fa45f893711ec6c832b55be9aeac618984206af1ac56daf9af3f2cf5f84ebe4271c2e
-EBUILD Faker-7.0.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
-EBUILD Faker-8.0.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
-EBUILD Faker-8.1.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
-EBUILD Faker-8.1.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
-EBUILD Faker-8.1.2.ebuild 677 BLAKE2B 3083e57a83ba9f71bf5182aa05b74f5319a89506c0045f3a873d4e85a2cc0581abf7db8a0340746a78a1beafba8741bfbee402683dd16970f22bb474e516e198 SHA512 0cc1bb44b29ace95e929dc634280ffd95d4adae63094c920c1784f8637b464e02ceece2a9ebfef7e3dc0df2cbbb3d2bae006812ea56d60144efc45515856afb5
-EBUILD Faker-8.1.3.ebuild 677 BLAKE2B 3083e57a83ba9f71bf5182aa05b74f5319a89506c0045f3a873d4e85a2cc0581abf7db8a0340746a78a1beafba8741bfbee402683dd16970f22bb474e516e198 SHA512 0cc1bb44b29ace95e929dc634280ffd95d4adae63094c920c1784f8637b464e02ceece2a9ebfef7e3dc0df2cbbb3d2bae006812ea56d60144efc45515856afb5
-EBUILD Faker-8.1.4.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
+DIST Faker-8.2.1.tar.gz 1144260 BLAKE2B 3c523e394043d2294e9973c0a2764a7c7961ea89b45efecfefa7a094e2b4ffa81513e9ca6ac321e5b2b05bf29c62ae37a4797ad210172d5e988dbd80d8b0858e SHA512 58e6fc188dfb6ef5f5847d2d7966767eb71df66752858fbccbf984afda2d25f6a6b01d2c9446e7b1c9e57bf3744c0e1f89202e0079b01e139789f384e3cdbc17
+DIST Faker-8.3.0.tar.gz 1144870 BLAKE2B fba95fdc3023dc583345d0a7890b4ac6318ca87157270e1d844a2978bd2866c1cd8e8a334e41bc0b8689a1c8814a5353ab4adbb08af49a31779217d82b913ce6 SHA512 7f046e60636dc7c2a584eb75e832a674715424b91de5eac6dba423d40100ce44b5baec178976bcf2b00b5edb81c5796f5eeebed0572984e7740c9e3279afd51a
+DIST Faker-8.4.0.tar.gz 1146293 BLAKE2B 9ec37d76ebfe486a9671f5fc97e321420b9cf83811894db4f7264430f441ab63309e2abed0b5c900467685d7fe979001c216a9e32323c764867f127025706558 SHA512 03abef5c85edccf924191f2bc5be1dd64d56f827bc4307fed16becac7981c0340fa900748e767f2bbbf37721075c03ac068892870f2ac895f8d748403ae8bb08
 EBUILD Faker-8.2.0.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
+EBUILD Faker-8.2.1.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
+EBUILD Faker-8.3.0.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
+EBUILD Faker-8.4.0.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/GitPython/GitPython-3.1.14.ebuild b/dev-python/GitPython/GitPython-3.1.14.ebuild
deleted file mode 100644
index ef1dd01cb94d..000000000000
--- a/dev-python/GitPython/GitPython-3.1.14.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}]"
-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
-	rm test/test_installation.py || die
-	# broken with git 2.30+
-	sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.15.ebuild b/dev-python/GitPython/GitPython-3.1.15.ebuild
index 8ef11c27bd36..66fe6caf3dd0 100644
--- a/dev-python/GitPython/GitPython-3.1.15.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.15.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/GitPython-3.1.16.ebuild b/dev-python/GitPython/GitPython-3.1.16.ebuild
deleted file mode 100644
index 5330b5031497..000000000000
--- a/dev-python/GitPython/GitPython-3.1.16.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..9} )
-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
-	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/Manifest b/dev-python/GitPython/Manifest
index 7fdae5782556..fd950789fe4e 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,17 +1,11 @@
-DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e877bf3dedde61665754c1d4b14b98d0ddc863666ff1dceb313174a908f8fbacbda0586e53e874a1397e6eeb562cf1ddf1f SHA512 ecd570bdb85dfa64f42ce447bf381868d584eb56897954d893ba1f1ee193fa4e45f3847fe842a67276da0cf155a2501ed4c25d34d300a9776b0f068b659ba014
-DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675
 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.16.gitbundle 4864707 BLAKE2B 9ff8a9b86da47c03de100a12c93cf97dfc0a30a8cd50231ec8f8f1363b5b38d945821ad099d89d1f39a6cc5b4af92069b20f448e9a3c81d203aa37b60907959a SHA512 69f1e7b413992161a90e5d34a877b5e942f85463f5bce453762f88fe96ffaa67ade418e43286b5aa6b1a0a8c009da49c5130b147eeba69063fb46f6a1783ce49
-DIST GitPython-3.1.16.tar.gz 178271 BLAKE2B 1093497756ccd4a6e5329ef8858a23ead6c7ad335e316ab6aef59ddefd226021d8001646d560158c9013abe954869c521270f753a7b2af3a1833dcc6bc40a8c4 SHA512 34e43d1b26721256c46d5c02f9c1b135180ac068c141b095bdb2b24828c8e1cf875216908bb3d4a2d1439c589825adebcba9cbabf8718e0e61625fc7f91727b6
 DIST GitPython-3.1.17.gitbundle 9249795 BLAKE2B 2c647de0e335d58d85eb5444e52f93adb13c5e2cf9a6272fa26a7fd68bc1f467ab2134ee88a4386af03b9816cd568b7366a202480ab0fd7540202b5757a7caf3 SHA512 576082e3f6f741183392e3fa51c3ed0f3c6de668562f07ead14500644afe01ea5d667a1c30f3a111326b3bcb320b42eadfeefb9eeccb699cb19661b330321a6b
 DIST GitPython-3.1.17.tar.gz 178303 BLAKE2B cc4a89c6d5ab8ae59439286ed4159aa4e6cc936e5ef011eecae2ba79010eb13a2e7e79635e1f89bfbc32dc58e4a6f11c9bb13f164d8111178b3302a2780d599c SHA512 c87d9de510f245a64d9df68f0e5c07744eef21669ef3beb81f2d0aefe4299f1cb4cfd2d37b87120b21781aea06fa9f8b2ccbfda1f2648c92cd9c73506b953ed4
 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.14.ebuild 1690 BLAKE2B b7cb06228a18a6458c280ace5d2ccb81970600d4bc4dabf8729d83968d2a85adaa95e2b4a46c116299fd3f8a12d0aed34e465a5a86995a4e8101861390ac0abe SHA512 955e3ac9e207b59d86155794ea933c81bee0271e2a0e73b053b48be8b084d01a8dbb3cd00770507165d1ab66a01535d0dd5e05029f9fe3e047eff0e663f86a54
-EBUILD GitPython-3.1.15.ebuild 1727 BLAKE2B 48cdb88d4e5a285bec76d4351b65e68ac5705de3ee7d04c86bc75916f8e608dba680a82183cc95d14445104d14e5ee1dad590d3755efc45c0f6299e36a119408 SHA512 948297e14a8137b4522f07e2e638230c8a204695bf9ea9d41ee96a2180403c6cdf12fe9977ce2e71e2300a1b5fc48d0bd968bbe69af487c9da1ae6f5380cc6df
-EBUILD GitPython-3.1.16.ebuild 1870 BLAKE2B 24db0858a000d6350f80245d1bfdf300bc69222514e7e9afde142c347c9638531e56a5a81749d7e2fe1836123363f5dee31d479ac0f633bac474ad7fda56f986 SHA512 64e3e85937260345768f234a8f6ee8ddbf7236133e39d524afd6f17af802bccf2b9affb3709d7cb3f2c6c5060c5a29accfe3c29976ceb15d7673004028667938
+EBUILD GitPython-3.1.15.ebuild 1724 BLAKE2B 41e1ade8e6d756561c3bb44b30dd00517a6dc0065e6889366a9c2366c1c51461d15e1c7daec35c24f91662f2bd856f99f69dbe78b83b1460c164367d9913740f SHA512 18c6d02db8ad8895a55f63925c9d28e76a74682872eea299d2cef016b15ef14455619ca9ab9f4b22cacbdbcaf40da5d6ca72b8c63e5abae64e1fdd60e354a956
 EBUILD GitPython-3.1.17.ebuild 1931 BLAKE2B 181671fc07f158ae02d7079ff0d738b3923e087e555c087faca0190c90af1bd393d73723138833a72af65db0472e607ed7b17f34b7371fde6958e637c52bab34 SHA512 c135f30c675d31ea2f3b0008d2a6606373f203e60e908cafc61ddadf36ed39ae0264ca2665e37c0f86251218e382d50d8c83d650f8014df9ec31e4ed5482048c
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ea6021198e08..5c6bd818080e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index f7ed28011767..6c1e4d73b6aa 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,5 +1,7 @@
 DIST MechanicalSoup-0.12.0.tar.gz 44505 BLAKE2B 7c303f7ae4dea12157d5c845a4dcdc6923e76d3565debd88d2f43e2cfc29a503feb6accb969839a39b1c4071b029f53908a12902a5c4f175f0383da227224c55 SHA512 6cce80ea5a90e7f19f2b13749f6ee48222d973af66cb350ac867a554580b0d619defe5a93741e6ec8aa808c585a8c01703158c7484521ac069977388de8bb7e3
 DIST MechanicalSoup-1.0.0.tar.gz 47572 BLAKE2B eace6cc4eaf50f01f8a7816d4d87a9345676b6921c8fe46b3280ac83463b241b2e6175b91ee1a5f907635c07ee8cf66324cb2e7938736b81e9a4f849f9159548 SHA512 00e2c5220c065b517301d9381a9bc5019f6f75dc5951a5ab4427fd7939b296b6b33a20b8f8a7e82c6feed2c9100e3481f38a424d63065883d71a6927119ad88c
+DIST MechanicalSoup-1.1.0.tar.gz 49270 BLAKE2B 947b35d819dc69508595adcfe5a0c8e6bd34888c995e9c3931613498ee1ca840ce16a14359aacbf9d40aa4f9ae59d45d14da5a150e3ce39ae7e72f587c94820e SHA512 26eaa54bcd1c0aac26504d7c482ed001830a1c79bf48a3055cef92348e9336887bef86cda68281911032159a3404a1f4ee8de9b6516d7d767cfd6b3b380c4ebe
 EBUILD MechanicalSoup-0.12.0.ebuild 1135 BLAKE2B 1838a181f145a30f89545ec6c6543a878010e547cec1251a336dc0d36ef2d1acd260d6f9bba3fc7c8d5763fd85c1e7570823075b1fa2f3b1bb649036922cbdd9 SHA512 50fb4c0601fe528d8e3bb47cfd66fcf8f67fc808673ed761d7a24e209f0e5189c18fd4214c22e4fe50947a47dd480b0a558340c8c605310ee6146df3f8d873db
 EBUILD MechanicalSoup-1.0.0.ebuild 1135 BLAKE2B f061513d3ce079c5f3d8fcb6a6f643061a51e9009cc23a63eb2412894d8a452e5f257b3f9fe7d4705e765eaf63a8aa689635caaa8cc3923532f4a67ac1be6c03 SHA512 78135892a45d7929c21d66b5914fcf5764aa1cf11b3f068efb2f419299d87946425a8657fc1595b34f768c80eee87110474a4b20553d6cd2e05d46101456a55e
+EBUILD MechanicalSoup-1.1.0.ebuild 1098 BLAKE2B 8b023d5fcdf5d8e4a0f689522fc90e15d25c16cef54a1395c581d87581754c50b2ec12cc22a8800eafb7d0694363193a843607d9a71d1aec647197a11ed000a4 SHA512 df31774759d01579511244e6c0327fb164bd7c4c2555ed42e7a996ac3bbb81f529168bdb93299fa639d38084c09bcc07df10ef54d6d0a4edc446523c5ac2c894
 MISC metadata.xml 550 BLAKE2B 3347d385f75d19c6036e5d71f026deb04eb968d746287c4eb54e14637b6d5079e05dd2037cc4772545992916fe25f545f64b4fe857ebc4b430522e0015bfd65a SHA512 d2b155b167ba76c4aeab5300efe8350407fd884374fbfd8575820e047ecb51acd79ad2112b84e6904ea42d79847f35f50950a2080c8f2c20a621da519023357a
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
new file mode 100644
index 000000000000..c110cacf2a55
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+DESCRIPTION="A python library for automating interaction with websites"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Override pytest options to skip coverage and flake8
+	sed -i -e '/^addopts =/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+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/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index dfb39976b01f..10c5b47cb178 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,3 @@
-DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD PyQt5-sip-4.19.24.ebuild 2050 BLAKE2B 27b6b0e239c8a3bd6c6baad5fdcd54841efd837c964871c23e2863b0119c6c422a4ffd700ad7b86669a72be6265894ddf4c81f61493ce8ba9f9cdde9ce971d38 SHA512 e9456fddec595c94939fda72c2ccc9d1ab74ffc81cdaf96bb18af9dc1d80a416c2c535593cb1c66ee7277fa2742ae612efb29ad61078560bbc66c8663f28155b
-EBUILD PyQt5-sip-4.19.25.ebuild 2054 BLAKE2B c7e8afab358629231f45960fce9fe0eb06c04a0b9a636a06e79b8d8fbe595e0c03aff4921f6ec8b26f79e4a1a73f802808d70b6f3a1a7d6a9fba181458142550 SHA512 2546957e724657684f1373304a4f40098b1a768b89822cc36787db2b4edd2cc70c4836a7e14c80e045ef13eee2f3447cca9162255c09e7472e3cac1df00e718b
+EBUILD PyQt5-sip-4.19.25.ebuild 2051 BLAKE2B 2eff81e174b9246478c4be76aed4f4546293a9a8b99a8cb70556bcf385dbcf5430adeb5b7d07aff0ef5734ce5d39a826061e38feca9f5842bd24ffec8a4c3e73 SHA512 ef4d11451141842f40225a6d9b8e3173ae471b4940ac08d122d66ddbfea2d36a8ce47d43aabd69f1963366e8d9c38aa23ec6163294ac75d78f4c692d860c0d1e
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
deleted file mode 100644
index da0dd4eab147..000000000000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.24.ebuild
+++ /dev/null
@@ -1,90 +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 python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!<dev-python/PyQt5-5.12.2
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sip-module PyQt5.sip
-			--sysroot="${ESYSROOT}/usr"
-			--no-tools
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
index b58bf735689c..127cd8d968d1 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Private sip module for PyQt5"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index d21d15320351..dc35dbe412a9 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,3 @@
-DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
-EBUILD PyQt5-5.15.1.ebuild 5645 BLAKE2B a06619428dfa12b27c28cfe0b62f194c5f1be48ba2bb3e937eb6225d865b0e111278b76179b22fc4518b327c729b043ee09569acaf61c6cde43595f33f3bf282 SHA512 d517c4203be97bfa91d7607be81f18387a5274ff4b7e7759f422a69c7260cef9e3d76fd05927fc87c7b396f8260bad69768c06378141ea69af7a62caacf8ba2a
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
 MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.15.1.ebuild b/dev-python/PyQt5/PyQt5-5.15.1.ebuild
deleted file mode 100644
index 68a444e70568..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.1.ebuild
+++ /dev/null
@@ -1,190 +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 multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network networkauth opengl positioning printsupport sensors serialport
-	sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	networkauth? ( network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	webkit? ( gui network printsupport widgets )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.14:5"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	webkit? ( dev-qt/qtwebkit:5[printsupport] )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	if [[ $# -eq 1 ]]; then
-		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
-	else
-		shift
-		echo ${@/#/--enable=}
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			$(usex debug '--debug --qml-debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt5_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtXml
-			$(pyqt_use_enable bluetooth)
-			$(pyqt_use_enable dbus QtDBus)
-			$(usex dbus '' --no-python-dbus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
-			$(usex declarative '' --no-qml-plugin)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable networkauth QtNetworkAuth)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable sql)
-			$(usex ssl '' '--disable-feature=PyQt_SSL')
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D}/${PN}_tmp_root
-		# parallel install fails because mk_distinfo.py runs too early
-		emake -j1 INSTALL_ROOT="${tmp_root}" install
-
-		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
-		local exe
-		for exe in pylupdate5 pyrcc5 pyuic5; do
-			python_doexe "${bin_dir}/${exe}"
-			rm "${bin_dir}/${exe}" || die
-		done
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		rm -r "${uic_dir}"/port_v2 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 823344f01842..7c4af6ee1466 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,3 @@
-DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
-EBUILD PyQtWebEngine-5.15.1.ebuild 1665 BLAKE2B 54109cb1dc1141a6efce562ec846644dc8944f3592b2d1d3a7ef40d149fdd175e9f2427907a7470f74b192eafd259bf32d996398f9734c29b37972f472bce51b SHA512 f7771fb68456bde951a1ed70e93636adde85c81f95cf1942845c5d4cf171ad18e89f72d1bb47c9b3752d6e92904990d44e293fd0c73a518f5e29deb61001c98e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
deleted file mode 100644
index 83a814d1ebc1..000000000000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1.ebuild
+++ /dev/null
@@ -1,75 +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 python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--qmake="$(qt5_get_bindir)"/qmake
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Fix parallel install failure
-		sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
-			${PN}.pro || die
-
-		# Run eqmake to respect toolchain and build flags
-		eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-}
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 8eef41a19238..393ed919a27e 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -1,4 +1,7 @@
+AUX PyUtilib-6.0.0-tests.patch 510 BLAKE2B 729853aaeebbb3de8ed7a9a8e466a5df3addcbd755e9951d3745ca46a13c8a4b42844b80392c687acb586d8f4edfb04f43fe158395ad1e7f92ec1df919b93bd9 SHA512 3779c4d0c20b967275e67091500b00d7fae3c5ad655e518a50dc653eb11d17c468a46ff67bb928f1652b4cd95c81cff724f5cde875e1e5fd8667c76312c9ec3d
 AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58ad6d8610de0912397e626704ff6921ed54869c0ea2e7dd1567070e5061fa424d7749236cd2e8321d17a6b60ad4a8 SHA512 00d838e4eab285e7eaa1fe802abd1fa22f3a662fd10220cc3811fab6d9025dcb327811e13ee13f2102ff1ff2b8b132a10c32cabfb94080940dec691b6a890298
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
-EBUILD PyUtilib-5.7.2.ebuild 1220 BLAKE2B f3f8a5189e8fa91e8ea6113140311ec5f793d332b1d71165af3f71db08a5db0926f373f8412b924655be6de1e2b0aef797becc64fa052288e11d4de9c406cee5 SHA512 f51fa7b036594418e3dbc985b117ef62628b0313d30044ede6158f7a7089264c50290417cb7836e491fa6c08729818ccf42a2c5b0b1710db86805ff48d5dd662
+DIST PyUtilib-6.0.0.tar.gz 1569916 BLAKE2B ee4085b597e928c5d6602b647f122c562f2e05dcaf300217cea9c5bc652f6acb5dbe5a075cbbbc1b81497987ab5c658f86cc3e44e16cae02a37d546b2e925a9b SHA512 7841a84ee8d66d2d7af3db810e4d787030acbd8e3e81c3f61251ea160931feddeab6f4d205977a411964359f1cb7e7e59e846593c113093e01c48b81784f7477
+EBUILD PyUtilib-5.7.2.ebuild 1222 BLAKE2B e0e4ade52f636257729c1af0bc91cb7867409654e81177e63a9a337e7bd39f8d13b57c1a2061f07f5d64a42c06226493d2c937dcf371ce304dbdf8bc7f463a03 SHA512 64d5a8cbd2d7433a460931e32f3d592a12b3aa1610706f4c6267491f46d5839202b887684b02f0b82f697806a97af9f997da01ea72a3e6a49e70f18e15325ea5
+EBUILD PyUtilib-6.0.0.ebuild 806 BLAKE2B c4090cb1994ec31b915ab78f87042621ab99b8e75edcfe2ef21fc244f0b9b64022dd10917ae09154a107d23015186c7cbc6dc98eaa9685b8036ceb8a26429cf1 SHA512 0159aedc047724be7f65ecf648d3c51bb0b8aeff34f450509600d7747c798572f82fceec2cf0e4cea187446cabc31250a80fd992cb7ed52cd17fd0604ac7f540
 MISC metadata.xml 399 BLAKE2B 035eaf4d0580b3df7e40a804be2ea3627872a6547d4bd47e6be414df760fa910c9689dae45a161cef4908969c61f4caf63175c3b45fb94bf78000e89085697ed SHA512 673f97cb37989a8526680d11f38dca84de990d3cf18c2cbe68ab1567146a2b03784c40e228f336096b1c45e86434b5b42b92a18ac09df88e423de999d316ce86
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index e1a416226724..e1418c3cb92e 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
new file mode 100644
index 000000000000..d0f3e6c38855
--- /dev/null
+++ b/dev-python/PyUtilib/PyUtilib-6.0.0.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python utilities"
+HOMEPAGE="https://github.com/PyUtilib/pyutilib"
+SRC_URI="https://github.com/${PN}/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN,,}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/PyUtilib-6.0.0-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${ED}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+
+	local -x PYTHONPATH="${PWD}:${TEST_DIR}/lib" \
+		COLUMNS=80
+
+	eunittest
+}
diff --git a/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
new file mode 100644
index 000000000000..33dcd4605818
--- /dev/null
+++ b/dev-python/PyUtilib/files/PyUtilib-6.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/pyutilib/component/loader/tests/test_egg.py b/pyutilib/component/loader/tests/test_egg.py
+index c8674d0..7126e5c 100644
+--- a/pyutilib/component/loader/tests/test_egg.py
++++ b/pyutilib/component/loader/tests/test_egg.py
+@@ -23,6 +23,7 @@ except ImportError:
+ 
+ 
+ @unittest.skipIf(not pkg_resources_avail, "Cannot import 'pkg_resources'")
++@unittest.skipIf(sys.hexversion >= 0x03090000, "Example eggs not generated for python >= 3.9")
+ class Test(pyutilib.th.TestCase):
+ 
+     def test_egg1(self):
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 2dbd1edd9b11..1626c4f9de1e 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1,4 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r2.ebuild 1843 BLAKE2B 59c654a4b01a6ac224f52dfbaf76b9e8fd4d700f86cf19e9e550fbbbe9d902eab2df7c635c14ba9ba4dca765f8f5eca2ca1b484795357df063484decb8c65f6b SHA512 c07139bee6407ca790c96e75eef4697e4e4463f32627438b8c4027274eefcf9dc7718ab03725184885d9ec020db966ce253a4733f7009e79947dff725643f04b
 EBUILD QtPy-1.9.0-r4.ebuild 4991 BLAKE2B 4ba264b82b412c0e6d8be3695beb0289cc459ce090cbe14dc8a512deba70bed9a740e9536ce92378c7bc3b82f3396cf1fdcd3b3518801d901ec616b064771e75 SHA512 9d6e0404eee155d8dc0f955a3f0a3db83bc550f67492c273241dfaf76ff6b055a926edbea8adfa5db20f9c8438d6f20a3317252f106ad0ca7fa3193d64fc4027
-MISC metadata.xml 2803 BLAKE2B 98036d01bac06a15e8b4cfec09151f687cc1c9579b29171bca1645dc18e1c4bc3ffb012899e2b3aad859332d39758232beb705e9949f9680157960d32828658d SHA512 0faeb7d93657eacaaf24b0575770cf409531e914b8355fc0d6dbba0d968905f78146ca0695d9a17651f4c9d2ae98d183c29c8eb9ee1ee7bdf9e100bd29d5fb9a
+MISC metadata.xml 2827 BLAKE2B de510df924a4d14ee8bbd6872e263b149380bd95ac71163aeb70fea9aefc4b197a8ca3d66c20a7e41131e6d7776d104cb33e6e9db919e2733bfb649a927c7341 SHA512 24b7e2e13a8acb2c6019d37231e39ecbee79175f523ddbb9d1cf9a560271f4c96dacb9626ad47bf278e43a5fe6a3a9d13bec5749860d494efcc61e9877f46c69
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 605a0838da71..9bf18f126510 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -44,4 +44,5 @@
 		<remote-id type="github">spyder-ide/qtpy</remote-id>
 		<remote-id type="pypi">QtPy</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index a1c7b30d363f..c4402fd720d5 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,9 @@
-DIST aesara-rel-2.0.6.tar.gz 8020607 BLAKE2B 0a51936fe089061038e9dd60e210d7a0820438a03508fb1aa7f843c9c3dbba86295a7e0471f97084e7ba87e2a771bb640a6f87ce974b219767d2344e2a94b190 SHA512 1370cb4408b694d5b97610229951cfa9e74f42c10347eff375d5aba0aaa60a7c88f5db2a7c101ec6916a40d6cf12b5646e7422dd5e9617f414619d79c55f02fb
+DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
 DIST aesara-rel-2.0.7.tar.gz 8020485 BLAKE2B 91c02c5d6826694b08bf3276f9c08e98f5a68a34b7d4a4f4813b44794f625cb0b67677fc8eff8496f19f84b462b30d740645b19b3031640a550b8b07288980ef SHA512 63f636d7293127b21196072fd05edf25f2d03702d5568308ddb35c2d425100aa4087eb282f30a123124e43bedbc82d84209293c2d2de6f598c7b3b6704fc38aa
 DIST aesara-rel-2.0.8.tar.gz 8043104 BLAKE2B ceb4f34b2017516d8d75855eb17fbce8a28ef35d2dfa22c2221f95e910b69126f6d2070654377bebaa8c149bcb13ed1e37c0fd145cad96ddf6875642a6882b2f SHA512 1bcc149e3c55eeaa4522afd48df63602b32b1702402cd269b30c85ec6abf0d4b446a3593b8247c393c2ad9f74176ebe94e7c86a94ee58b91fbdbef69dbc9acd6
-EBUILD aesara-2.0.6.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
+DIST aesara-rel-2.0.9.tar.gz 8045090 BLAKE2B 02f8480cd3c1f843d5878a968514ba9adbf5eefa4f36e4ae201d79e8483dc9d04dd890fa30443aebd3a1520e16eab6eca2478b88bbd6acbbef14b61958a2c8b9 SHA512 bbb300bbbc74fed4e95613efe8eb5b29b932fc201900d340be7ef425c11b56f4e627d9e8c45e290c42a122db45af6639c40ce5bf2bc01895d56c43416a8c3415
+EBUILD aesara-2.0.10.ebuild 1884 BLAKE2B 7c686fdcf57e7a261037c52acf864b43f5fac125a508f338cd7a2f8fbc58023219951391259b347ae842b6f9091da8e5279975f1ee2008fc5004bbb7030fc687 SHA512 70ac7c0eb1daec9dcc02c679e33ab9bac92d7a65750f6996f4357a6553f853898ead2fc7b2e6923fccdf61c6e377e163f8c4fc808f909bf513666ee80dbfcb83
 EBUILD aesara-2.0.7.ebuild 1861 BLAKE2B 5ed93e3b26eedd7756e2003f58269272e8a27856b0e15da6559fe9691ae91032bb6b83236d826180423ef2a3608781c83b490109cf0a06e450a62460be353501 SHA512 6af662894aa6a79a5a553e0b28cd43aa6c6f64fac89f88d87e15a3f9e3db6fcf7d6dffd729616e89b26183198b2d29bcb6df0b17181617119991d67661100abe
 EBUILD aesara-2.0.8.ebuild 1884 BLAKE2B 7c686fdcf57e7a261037c52acf864b43f5fac125a508f338cd7a2f8fbc58023219951391259b347ae842b6f9091da8e5279975f1ee2008fc5004bbb7030fc687 SHA512 70ac7c0eb1daec9dcc02c679e33ab9bac92d7a65750f6996f4357a6553f853898ead2fc7b2e6923fccdf61c6e377e163f8c4fc808f909bf513666ee80dbfcb83
+EBUILD aesara-2.0.9.ebuild 1884 BLAKE2B 7c686fdcf57e7a261037c52acf864b43f5fac125a508f338cd7a2f8fbc58023219951391259b347ae842b6f9091da8e5279975f1ee2008fc5004bbb7030fc687 SHA512 70ac7c0eb1daec9dcc02c679e33ab9bac92d7a65750f6996f4357a6553f853898ead2fc7b2e6923fccdf61c6e377e163f8c4fc808f909bf513666ee80dbfcb83
 MISC metadata.xml 402 BLAKE2B a82c76dff3cfcbf83936f2815e15d051d4ab26a739a970848573f5856610e763d9f346e2d265b2d38e53460df6bcba879ce50d6e60bffea77af6052d03d8dc5d SHA512 f3c86b74cbaaadb63bb98ffc2a3e6e1d121c141b33edd574cfdee3652a43e9f8b05e3276050bd407f00ddbec1d6fb6eda87983520075ad368ab8792e0ae17143
diff --git a/dev-python/aesara/aesara-2.0.6.ebuild b/dev-python/aesara/aesara-2.0.10.ebuild
index e637143ab45e..a930578b0362 100644
--- a/dev-python/aesara/aesara-2.0.6.ebuild
+++ b/dev-python/aesara/aesara-2.0.10.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 optfeature
 
@@ -47,10 +46,11 @@ python_test() {
 		tests/tensor/test_gc.py::test_merge_opt_runtime
 	)
 
-	distutils_install_for_testing --via-root
-	pytest -vv ${exclude[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
+	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
diff --git a/dev-python/aesara/aesara-2.0.9.ebuild b/dev-python/aesara/aesara-2.0.9.ebuild
new file mode 100644
index 000000000000..a930578b0362
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/aesara"
+SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 575d0f418126..8363340b4045 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4.ebuild 2643 BLAKE2B 412f7cfb6de73eddc715ade9a69cdf892c7c2e9b33bf7eff1d2f6564d9cdb9aea55ca614d5e46b64fcb98ca81f0682eabc6a5fb2a53277a987212a84b77feaf3 SHA512 8aa58268f293fc2750743f777675edece1cd93dc547b23e73338aa1ba347f833612a1b5b6ee8f37ab902af185abb6f47e7fb99e6ecf91bee420c178169709b29
+EBUILD aiohttp-3.7.4.ebuild 2564 BLAKE2B ae2a5c1737817fb6f34de4919c5669c1498415007b707d109a1f1b7a9183bdbec4be6fa1564563a28844ea656dcf88e06ad6fed266e800ba5dedd4421fbe5b0a SHA512 7c69ebee9ea38b252c165112a774d55ac3ef9431a647bff55c494b114063a8532a1934eafabb3f5d383f75640dfd8afc58bd371338e0a7d5ab3fcfe118d1ded5
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.4.ebuild b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
index a3a21c4b7e49..f90f64776cf1 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/idna-ssl[${PYTHON_USEDEP}]
-	' python3_6)
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 6fd996836b3e..3aa9d8e384f4 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,11 +1,11 @@
 DIST aiorpcX-0.18.5.gh.tar.gz 65622 BLAKE2B 68b91e2cfb869c6971efb525fd35132c38ab9092362944fa77476bdb33f076f8415a079d97238e2c4ffbc6c9df596b468c2b6640389a11d1607b1a99aa8dc68d SHA512 5eb8417ce2ffb70208aec79e44ee0d8671c4cf86745f2d8061cf013c4ad17f83db68ed3ed43ef61df196e4ef073a21f9a4e22df46b00ce3054babf98dfcd1eaf
 DIST aiorpcX-0.19.1.gh.tar.gz 72903 BLAKE2B ba3da1bc1f8d83ec6c6d2189aee554b4b819b601d366d0e8858ec73fe6aedddf6a6ed00d56d66c38d18ee44921a4cce7cb83ebf05aec9348355f88b8ed67e1a5 SHA512 b71edf335ad78b1d46b2b23dcb102b29f988d32f75571b881e2ce3471bf48c7ffc9bf509ce1cafec036662bb06d6f90598304c207f416b4124a7b02fdca915e8
-DIST aiorpcX-0.20.2.gh.tar.gz 74627 BLAKE2B e5a33dfd8ef0c18e26cfee881fd7515437598628bf61dfd86a34f0a758474abcf257c7afcbf0ee1d11ed6bad44596289efe2261d9ca7ccc26e7d949f05b3ad40 SHA512 af63d51bd21a045d71073ba6cd030834f8262e393eac9c44e6b33a2b3cecd86a5d2a6a0ed7ab60d2362e99ab38c801abcae1ada368a533d8f7fb8b616c43e582
 DIST aiorpcX-0.21.1.gh.tar.gz 75205 BLAKE2B 5190e8bedf9c605f57d469f351d0cc3bed0c1fad53778ea0f29c02615b0ca816a7bbc60b863dc613f72c67455966ef3ceb31b825eed3cead25f47c29012f7ce5 SHA512 c77d4bfe72f2cd4215e15330c60aabdeee9f4e1613ba5dcfedea9368c85519b36ecc7dbfa2f6682df7d802204b9cea7c9a889ee479dcffbc728ee0c112039779
 DIST aiorpcX-0.22.0.gh.tar.gz 75160 BLAKE2B c9aa55c932546512019c058dd29d397bba79638a56aa949d69980abd56b4d024e9d1f99e96909c2256cce1578ffaf55b14b95d0adf77752180fcbd8ab997555b SHA512 a65202f8233adac587c98da812ab27a26740a21a68df431bf0394dc3df37f3cb15c397c6a9044201b4a1a8d6bcc283a7cf7b4dd27885a2ea0f5942cbbfc6f405
+DIST aiorpcX-0.22.1.gh.tar.gz 75206 BLAKE2B 92c481388198fec94faa10482ad4195fe6dce5ae4aa445ce2812e1e81e084c629712b87a3c157aa33ae42335c1a96bdcafa5e389802740fcae8eb9e4aaf43dd2 SHA512 3484da36ce6042d8d4c6b168fd2326c0fc77a825691b95631e54510697708a27ea07e9a808445d504056432adf04f04cb0bc28d4b7194c55c1995096bb938b4d
 EBUILD aiorpcX-0.18.5.ebuild 861 BLAKE2B 6f13104a6bff221918e00c198b3fc3596e43dc37102d4ca53eec9774ef0f237d0bfe7ea3ab002584497ca59f448fa64e70dbc0a6fdf4d25c55eb45b0e8af03e6 SHA512 ce74a01085c864f0427da094a6073fce2a002dc32ce93ead0d03b671ec0d25d2600f7be278ba2621ef35d1ee00bc96922f2c0a18d9c97a45d3fae1ae2177ab1b
 EBUILD aiorpcX-0.19.1.ebuild 861 BLAKE2B 866c72aeaf7525b91bb1eec97bc933944a78a33f5413e9976881100c4c80ca42b4aedbd3af4ecdc342530e4b6991b4cfe48987f11730a76b6999aa9ef79cb6f5 SHA512 b4546861f9523c91b95c098696b7c75ef62706f925400516458be4d5cf9e3b32f9ebd48ee07d25d7901b1df8b5f8daf86dc574e1c7ce093671928d5a9c289585
-EBUILD aiorpcX-0.20.2.ebuild 863 BLAKE2B 59fd6bb30d94a00014f1591f15605ea87281b8181535e4388379029b783dbaee85a6482ffcbeb89b9eab4cb819ed030284a9a562fd528b42cad38941ab9a04c5 SHA512 0913a68d34dfca6dcf38d9d73ad63b2641269e7ee49b6a80b3329e8bf2939c544cf6763c952c9b8a65e82de25f132e7c7bcf0774f06fc896e405dfd87a91bd7e
-EBUILD aiorpcX-0.21.1.ebuild 820 BLAKE2B 73ce103f602df8720d8eaf7b1011ac8d3a2bfe3ea905faa2d39c6a2b9e7b632e83ce723a092580044ab58d37e185a39c7ec2c27bd6010ef4bf50f7c591faf082 SHA512 d70251ec2a85ea4b534eacf74c43016f49a9453b26c42929380108245eecd5695dbba56e4c3887ad41655ee0566ee779caf68c002f97ef5304301a2ed60a7f3d
+EBUILD aiorpcX-0.21.1.ebuild 818 BLAKE2B a5c074310e0f9ddf2014558eb950166fac2c2312dfb3ff604e5a1c3fb08600cfc7b115bb3bf0410837ea39c3fe3e56a606cea4d7461fe8ba0c997b281697dfec SHA512 f9b33ccf24bbfc6d1c554450968e0191b0c34219f13af349a6b591bd33327d0de93312e99e57c4f68fb1217d7773221310aa542eb134074646b23772ab98b481
 EBUILD aiorpcX-0.22.0.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
+EBUILD aiorpcX-0.22.1.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
 MISC metadata.xml 405 BLAKE2B 6e2904d4bba224f3ea6898a0050b43aebb88132ab641533837cc39f2404b867aeba63f0466827199a4a4d54bce5f08376328dc1f3a9e50965be06ebd8fa02133 SHA512 5877ba7a1e6d5cd3bd6a5d1484e7abaa524a16d880c15e4b78d47986be8de8d290ebeb0bad628ff3d68d8dd7a85930d05e56c6954ec8e78c6f4e73530f27f12b
diff --git a/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
index 9d75b7b8a4da..fdcf3f0fdc8b 100644
--- a/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/aiorpcX/aiorpcX-0.20.2.ebuild b/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
index 89eb9710f38e..8ba0167288fa 100644
--- a/dev-python/aiorpcX/aiorpcX-0.20.2.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
@@ -16,7 +16,6 @@ SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	test? (
@@ -33,6 +32,5 @@ python_test() {
 		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 21f0f4542ef9..71af92c17ee3 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,13 @@
 DIST alembic-1.5.8.tar.gz 1154284 BLAKE2B 704a7aeb15fcfae8746238ef7ae4533ecbaaf83ab9248035c35cea343a4d02e02c00dfa3c8186826a437c839053fc6292c3f8343945ca32273ee608f6572f513 SHA512 e68f3709ed969764cff4c9f755781a10123631d2d07a970674fda2226c84cb92c140bc5ae81e44c8b279823718d4f0544236d260fd04fb7107f3d8293c85b4f0
 DIST alembic-1.6.0.tar.gz 1166934 BLAKE2B 1d1473ca55bf2e5f8f6dcdf2fd7cbd5246e11e7a14e5964a5891c60e5ba814eabc2fe8550b87317c3b57268f649b46c6b611ef1b2c81b5a025ca4e8e537660c2 SHA512 bfef894f13762420128b01d2671639de6361848387d4661d92bab66d8c5820ebe9ede62d335b4cc5915f60378e20a02a2b2664a7bf815294fb4cfdee7414dd33
 DIST alembic-1.6.2.tar.gz 1167842 BLAKE2B 0b61282987e974e81b1007d4a66620b1ac2393b175f91011d0d6c450af1038a9ea553f4a7c1906b2e463f7b95617a00629f337547788821b250373f0de18d0b7 SHA512 d5b23812d3e65e9642f39e2596ab86773476a77959938f518438d7659c2da5436432fdc020a5fbda33fe866a047d9558f7a4c5eabe032a6d3f2e6d04ff7928e7
+DIST alembic-1.6.3.tar.gz 1172826 BLAKE2B e405589352bc06b6a80e532e564b69b7095e57ff150a519654737c9d5ac43827d1ddedeffd12295419eb0fc7555c346cdf0e32fcc21fcc9c301015fc0c9540f5 SHA512 4a73e67962d44de719b9873e4b61153607cb2ebcdd15a19172fc4ea641e2909339ca448e83fa8ecb871a270ccd980f16fcf4a880e9742a177649c4dc44cb30cd
+DIST alembic-1.6.4.tar.gz 1173603 BLAKE2B 24c7a7f5431db4856ea7f7ea7095b1a992e5c41c1d94235098b6c93b6a9dbd6b0261297019b01e1274a466d5b9236d6c0890a08a8720191f77c20973e1b07afa SHA512 019268060d0552da87d0ab4d624d53f2c7460dfd3018c2643b71adf0c7a574eeb92b238d777c786ecc6f9bb94e8e25655f07f64258b17b9cadccb7ba83a091e4
+DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
 EBUILD alembic-1.5.8.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
 EBUILD alembic-1.6.0.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
 EBUILD alembic-1.6.2.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
+EBUILD alembic-1.6.3.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
+EBUILD alembic-1.6.4.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
+EBUILD alembic-1.6.5.ebuild 739 BLAKE2B d9f6b79bf5e2f4e5f49e152ed1d7638028d53a9ffa6ee08fa4b04dba015f0fa9c63476f1b09ad3781118d6ac7eeb402b04a1d3b8c60205c6396f8ff5377d485b SHA512 866884c8426bea52b7af18bf567df01dc113353702d22700f1000b6cb08eed76eeafd4d2be70958b3d4467389a1d835f98e61d38a492bf49a522dbb258d94d41
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.6.3.ebuild b/dev-python/alembic/alembic-1.6.3.ebuild
new file mode 100644
index 000000000000..6105a9e2d89c
--- /dev/null
+++ b/dev-python/alembic/alembic-1.6.3.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alembic/alembic-1.6.4.ebuild b/dev-python/alembic/alembic-1.6.4.ebuild
new file mode 100644
index 000000000000..6105a9e2d89c
--- /dev/null
+++ b/dev-python/alembic/alembic-1.6.4.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/alembic/alembic-1.6.5.ebuild b/dev-python/alembic/alembic-1.6.5.ebuild
new file mode 100644
index 000000000000..6105a9e2d89c
--- /dev/null
+++ b/dev-python/alembic/alembic-1.6.5.ebuild
@@ -0,0 +1,31 @@
+# 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
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index c4924ca7809f..0c0744dbef44 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,12 +1,5 @@
-AUX apispec-3.3.0-tests.patch 697 BLAKE2B 5bec31aa9f049547921a73a21f5065da40881e1f587a3924f2ca2aabc1876c9d9026cf9c77b8111427d8315b75dc0ed13ee29c094b3336436453e9ecccdaab5e SHA512 b4c764b340b3630dfc3a2ece59858d6e2f03d4718e8b57f828a8db51954cc7c6656e0a6af8d1e6eee034cf4a2a2226cd170bfa3a0b687855ed2e1d52a67834e5
-DIST apispec-3.3.0.tar.gz 61687 BLAKE2B f1bcd212494d9196441e44acd4fd0d06063d7f80859ce49cd50dd5a4cbc4ddace974c2388031ddc8ef015b44f10a8f5d97c6d0f4fed96c1336dfc7282fa7c173 SHA512 c94cc48702ced17baa01175be2ff261dd7203cb0f49477f4be633080ef5f8029e5654579609370b4c1cd852d71f0b6fc116a05ee34515b22e7a0877a19d49a27
-DIST apispec-4.2.0.tar.gz 63046 BLAKE2B 4a6729975e28d22a23b0574f8298f3113ed89cdcc7d01e3086af82354d4a61b4a82420ab7ca7b66790481dd8e3232ebe80319266fb2de54c0aa8c6c3a7fa86a1 SHA512 51187a80f8ad260bd0a89d4a882d2517f56237a6cfb0596cf29999e3fc42af0700c88037ba205a4e7f51587abf8b1db5dbae7ee5d98ae55fc9fe2314f69fa656
-DIST apispec-4.3.0.tar.gz 63351 BLAKE2B 3d5836df242cc0562ce9e8ef47dc352cdb415b8e33b86e835140d88b4b87b7aff3db6d975f3fe7d7541be0e19bfcc451dd9a909ab4b830a35191b5b624930132 SHA512 c42b47697948b4d111bed83b71e2d7e6e7b9972bc44cd642a579444019c468acf6a0c9411273d234b8b2b63d2cfcaaccd1f9d125cffb0d44701a6025ada4a0f3
-DIST apispec-4.4.0.tar.gz 64266 BLAKE2B c87ed439f6b7ca57f89ce86f384362dc4ad4a32663b89ea3b5f5b6600015147c5c5a78aed3555b79715f3283165aea37318f2910dbdb675cf58680df45281531 SHA512 677d7d823a3ea4bc65484a1524a2d8fdea0f4690e69d56ae7138bca0461ae1ddd3cf34c20bb0d4f1a6270cf9895c053a4a0c0db8e5fd975da8fcd61b123532dd
 DIST apispec-4.4.1.tar.gz 64424 BLAKE2B b46390659334f5ce5aa83fd15207f5d1ad6d0e9c530f9e7d2b1a0f6a787498aad065153cde9237ce1ab408256e5cd698bbc674dc0316eb4ed16b874ce34611c4 SHA512 fea0787598ca93711eaa231675f97623eb3d6eb224e11c40e66857b95f48724618bf7a9bfda476b56c1c96fe70bb61675966b1f3fb073fe3f7e4da91e78d3d90
-EBUILD apispec-3.3.0.ebuild 744 BLAKE2B 0311796a7d4b89bba060af564c738a8de6222d928f2ab8d2969492d68b0ca91effd9704f039458d8683c9d69cb273983613b51ab2faa84b1c0989d7e44323311 SHA512 ff45807bdbda616f267d80ec26863489906a74fb0f61c4e513608378cd8463b96be8e4054dcb1d0155f5bd093cc43b552302d26240575c0b37f9b0908c102960
-EBUILD apispec-4.2.0.ebuild 918 BLAKE2B c03e6a50bd745c964565716f1ea26d7a4175a3fa63ecf2ec5b1cd7e3c422d343d28f89e45e09ff97afae4e929e8dfff7f97947092f74bfd568bc08ffc46300f3 SHA512 77bff5d3ae51a5bd9eac28036772b5e388f6f7141ad99a254cc97777df666c6690b9229c3cc7f3b00fdd197d978492e7ffc81ffc103108539e6c85bebfbf15b8
-EBUILD apispec-4.3.0.ebuild 949 BLAKE2B 540516d3d9bc6d787499ffad6b65426b9e3f9fb1f0609bf3f65ecd6e42fb7b23cfbcc6c41e51c5c5744b5a8bd10d675f2921046d43cd25f300db586307fc89a3 SHA512 bf4a208f4f650641c276ae1bca69921506e4c0fbaf11e7a4327266e7859971f1bc43abb86fc359e5b564088bad60fdc0c427364dbb38b389f79b26fb720dc00b
-EBUILD apispec-4.4.0.ebuild 906 BLAKE2B 2097f9a44c2f44df1369417175d24fa877ad8a3e02e593b28c1d6d85c16233cefa034d552f72276f47e264827a67cd01e19f41055eceb122a418a55f8ec72743 SHA512 6e3d2538de1f3c1874e4725130e2e0bd9145fc0e2bee93ce6900d85669e82db818174833617ea023b3b3adfed51e162747aed48a2680003782f7dd969b80442f
-EBUILD apispec-4.4.1.ebuild 906 BLAKE2B 2097f9a44c2f44df1369417175d24fa877ad8a3e02e593b28c1d6d85c16233cefa034d552f72276f47e264827a67cd01e19f41055eceb122a418a55f8ec72743 SHA512 6e3d2538de1f3c1874e4725130e2e0bd9145fc0e2bee93ce6900d85669e82db818174833617ea023b3b3adfed51e162747aed48a2680003782f7dd969b80442f
+DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e1771186eb8ea35f469d7c65b8d5bd6319af0ee32539de96ce5ff1889a15d74ac764d7bb9d0b415648af87d28db SHA512 8f8070ec1a084e5c5dda02d30103ff25a2fe096839aa2b1a75858297377e312e29a2d1cf4d373a53b7bffcbe9108489c2a2516e0e053c2de12ef90044b6b7e17
+EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
+EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-3.3.0.ebuild b/dev-python/apispec/apispec-3.3.0.ebuild
deleted file mode 100644
index 9cee34921ac9..000000000000
--- a/dev-python/apispec/apispec-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/apispec-3.3.0-tests.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/apispec/apispec-4.2.0.ebuild b/dev-python/apispec/apispec-4.2.0.ebuild
deleted file mode 100644
index fb3382c1bafd..000000000000
--- a/dev-python/apispec/apispec-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/apispec/apispec-4.3.0.ebuild b/dev-python/apispec/apispec-4.3.0.ebuild
deleted file mode 100644
index ea727b22fc6b..000000000000
--- a/dev-python/apispec/apispec-4.3.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="A pluggable API specification generator."
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/marshmallow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/apispec/apispec-4.4.1.ebuild b/dev-python/apispec/apispec-4.4.1.ebuild
index 9e530e3935f3..411599826ebf 100644
--- a/dev-python/apispec/apispec-4.4.1.ebuild
+++ b/dev-python/apispec/apispec-4.4.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -25,6 +26,9 @@ BDEPEND="${RDEPEND}
 	)"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
 	local deselect=(
diff --git a/dev-python/apispec/apispec-4.4.0.ebuild b/dev-python/apispec/apispec-4.4.2.ebuild
index 9e530e3935f3..411599826ebf 100644
--- a/dev-python/apispec/apispec-4.4.0.ebuild
+++ b/dev-python/apispec/apispec-4.4.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -25,6 +26,9 @@ BDEPEND="${RDEPEND}
 	)"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
 	local deselect=(
diff --git a/dev-python/apispec/files/apispec-3.3.0-tests.patch b/dev-python/apispec/files/apispec-3.3.0-tests.patch
deleted file mode 100644
index fb2ffc549207..000000000000
--- a/dev-python/apispec/files/apispec-3.3.0-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/test_ext_marshmallow_openapi.py b/tests/test_ext_marshmallow_openapi.py
-index ab1b0b8..d151a32 100644
---- a/tests/test_ext_marshmallow_openapi.py
-+++ b/tests/test_ext_marshmallow_openapi.py
-@@ -454,6 +454,7 @@ class TestNesting:
-         assert "breed" not in category_props
- 
- 
-+@pytest.mark.skip("test requires extra dependencies")
- def test_openapi_tools_validate_v2():
-     ma_plugin = MarshmallowPlugin()
-     spec = APISpec(
-@@ -512,6 +513,7 @@ def test_openapi_tools_validate_v2():
-         pytest.fail(str(error))
- 
- 
-+@pytest.mark.skip("test requires extra dependencies")
- def test_openapi_tools_validate_v3():
-     ma_plugin = MarshmallowPlugin()
-     spec = APISpec(
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 4c90089f79a2..9e3bc2923af7 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,6 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.32.2_p1.zip 679785 BLAKE2B fb58a60f95a677a805b0347a0d8876e49c657092deeadb60a057f4afc62031313faf5a86b600d1d306e42f305c9af599d2439a7051e400cbba2d9185c213d5d1 SHA512 718de699c43eec139747f63c3c26da206aa20f104ec1c478009d29cedff7a432138726131b2458ecd3a67675254af77e94e50e8e96a208600fe2a94aa9d924c7
+DIST apsw-3.35.4_p1.zip 685034 BLAKE2B 5845e5fcb286c587367955c33fbee9aa4b0687af666f1d50f35f5dec8e756a0fbcf0fdbd120dd3c7a78df1f05d8eae5a973a8a71fc8a6f4271fff7d83b399013 SHA512 f420560e5821bd6305705ee6c14174f1770f4811edcfe152cb1f2ceae4295f13c82552386a7ef42c5ce88165e88bd2080b4dc2809484598522914d99f2469135
 EBUILD apsw-3.32.2_p1.ebuild 986 BLAKE2B c5af577aa9ff6a9fad4d7392d83a6a2b6f6e13149ea02f1bf73f788d87dc5e00458622188a006e211adc1c1f6d6296b29a2ae96e3759a216876c86fb79e8fac4 SHA512 cd23407a45171ae764713803c68fa5cddf693c8044e93bbdbfbe55745f393efa38e88d186452ad37b0a3be8a20b431d818a04f3f8f624a50bc7760e25c6d3910
+EBUILD apsw-3.35.4_p1.ebuild 1053 BLAKE2B 4d44e62fa84781ffec1ea52d92055780e888a402285a5c807c3d1ae363f600bf14e9ecbe96a31b2b2bd115149912ffa3eaf53a3bd206ddfe4e913d326f7c8073 SHA512 6f91f539b59696b89c6e073858ecc75a16e60e5308959c3e2708dac53ed7caf54f2c48cdecfa7e1ce21be9cdab21f1ec7c2b45c9f8d7457af4605c3d1703d986
 MISC metadata.xml 699 BLAKE2B bf19c9247293e0352ad99f01a8cab2e64a8ca9af974849eed8b270dab4d5dec4bd803f3b5e29f433df8a0db9a596faed84a6fa4422db2eef5061f6acda63dcf6 SHA512 b8ed61d9356fd05fe274e6634cbd7ffb47ba5a599de8154a9a6016aef184bd63dea018bf453275f3a8a7a9e562fe1eb267276127320a2d3ce7d3c786e3024f49
diff --git a/dev-python/apsw/apsw-3.35.4_p1.ebuild b/dev-python/apsw/apsw-3.35.4_p1.ebuild
new file mode 100644
index 000000000000..9c4c56abd928
--- /dev/null
+++ b/dev-python/apsw/apsw-3.35.4_p1.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
+
+python_prepare_all() {
+	sed -e 's/"gcc/os.environ.get("CC", "gcc") + "/' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	esetup.py build_test_extension
+	"${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index a1123ab08834..a5844b017baa 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,5 +1,5 @@
 DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
 DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd SHA512 b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
 EBUILD argcomplete-1.12.2-r1.ebuild 837 BLAKE2B 1565ba57d1d7a32be13986eac83db7a3684f38edc17a5163c6e813c2f927a933444dd41ae4ef0e107818004cb9d7412078fca4b4a372ea76b5f03943f3092d2f SHA512 1a668032c7bb747c7c65cdc44baf37e7ea890a67217f2bf3cacb79db125ad8948395698b5d782195fd3b2a996aead1c43501929f23dffcb9a91fb0601fea4011
-EBUILD argcomplete-1.12.3.ebuild 1008 BLAKE2B 4b499cc1342457f44b7c153dcb5e0c2a701eec38445a0ae5c8f8b4ed36bd3ec21c6b4e137f4cddc4c11a59f74a428abb57e054bf55d69193c8e284e9f3959fa8 SHA512 a3d935fc7a1e17ee5fa918e5e7082a4fc642785ae37e2e46b623a1a05343cacbebb843ccca415c9c91f06d10b8afb724e62c03d3d3a23577bcea0aa86ce58dc8
+EBUILD argcomplete-1.12.3.ebuild 1014 BLAKE2B c473b0cffd95ea7684c161faf6c3f1a371613e9d2b4d965b510fc5fa29479ec5c095dc4ca021c4df9a1c177558ec1a89a65ce080f155f147e0f41afefb652fab SHA512 b3569897e9fb842dff330f139697e1fbb33091e0befcba288c5cafd113e6c11ca0e335816a23d2102539345cb5a1d2dec8787a809ad3b698bfdabda4dad9c042
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.3.ebuild b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
index 808b962e6f3b..657c99a754c1 100644
--- a/dev-python/argcomplete/argcomplete-1.12.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 7fd12b8308ad..6c05fa7a6ba0 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,8 +1,10 @@
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
 DIST astroid-2.5.3.tar.gz 317721 BLAKE2B 66566287fa65489064056d6dba65fd7c59cbe9e4e3d88ba5a33d08dbcf6af48b6f1eb4aafb4f7483a1fc0eb6fdd92a7bc8f1991d05cd4d589fbcc6ed6f5db769 SHA512 dbf480e86023f7d093386cc68b259d5b721717638927a893b3ade0a397b212f5f24a17c753b705cf499b47e12ab255d51126b41b5af167d5c3018f5aade1abcb
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
+DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176
 DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
 EBUILD astroid-2.5.3.ebuild 1111 BLAKE2B 5834800bf11748b8c7090be868e482733daaf6ca567f288f754a352caf4a8acf2758702dfd86da744bb3c5f8e1609336de19dbfafa98956d40810b48002b02ac SHA512 a57a0365c892129fdbcc700f0258c830e0fd1a45fa354e2b17630dad27b1846765366dd5e1f4736a0b535dace1488ef2d20bf2979ec9c875727450c49c32d4f4
 EBUILD astroid-2.5.6.ebuild 1198 BLAKE2B 8a6555fcbb19261889ec9ebb482d800b001b9d916ed1001a5371225026c063440897decb2cdb51de77a5ffdbc84617572166c6e7021b8d54b23ef10148e52f0e SHA512 2d412f46f147d714719c7501cb04d4bc72bf1feb0f49a22af4cce003e8ca13efe0eb3e4f2e624ad4ffbdd113e64710c8eb7d0aa70916e56f059c1d8c909b5c1b
+EBUILD astroid-2.5.7.ebuild 1341 BLAKE2B ee60d0e8fee5fef7bb8f53b5792c8862cc568ad6b147cee743e0c65cb12931c7fa2866ca196513b22884928d0cf7da23f86666e34e864723ca1d75e65cba5ee2 SHA512 22af5d34ed87dd6a3b14ecef3b085aac0794dd18fe215e72217d6238f202c3ba03199872a9188328ac5c72498aa1d7b9c3b5d860949ca8ff4d31e333c6480224
 EBUILD astroid-2.5.ebuild 1830 BLAKE2B a35caaaca26422269b69e090aeab58f3bbd7eaff296d19af8bbcd18ad9d321844dbbae11fb5a5e8127dc7198e29d0542a03d6d99581235be60e95670e241547f SHA512 487c40073e0b032c8e5a9f45ec562954f94d4f9d9fc2ab5799df8c576f4cea5237b91838044654dbe20d2acea5e9f7455fd3b6817292564dce31b603815ec5e2
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.7.ebuild b/dev-python/astroid/astroid-2.5.7.ebuild
new file mode 100644
index 000000000000..f34e714dd00c
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.7.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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index a90d334e6d51..edf905537b86 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,5 +1,3 @@
-DIST asttokens-2.0.4.gh.tar.gz 46823 BLAKE2B 111ed58c1b657900f830b7b9f521c1f87fd37945ab6ed6e165108fc2371923030b37cae33885e166a524eb8dd5cfad5fe9391a19b7729b7cd504474d1477748d SHA512 49287259d64c43c7460357d19ed95495ab499b0ad7ae0d5a59378ea0332142b574643349d1d3ca56442712ebec14c53167da475915017feb1b524ac190f9dac3
 DIST asttokens-2.0.5.gh.tar.gz 46876 BLAKE2B 8a8da138888de0a4096b10eccc483c9540710acde0da188ed3fb3845f96b862fe2eec393c69ca62e7b313bfa0e2f0d673d828e9d1ff6dbbf5b641fe8122a548d SHA512 3e710ca9703e67643bb9c0a4db4e5c1656e6d5c904a1262a9ddb962beff06e4e8bd9815bcd2509b48974a97a565d8479a4369583c166a65b6d16c19fd926e93f
-EBUILD asttokens-2.0.4.ebuild 1475 BLAKE2B fb8da0a17a553990a2681f8b048f2a0b38ed194a276e862c2293410bf305dd312f69cd8b38c9c15c6e482cdcd655cdd9f6ad182a2c0650410bea848e4d11c74f SHA512 2e0ac7930a98570c94aa2818793a14eca644c086804187f25269bc6a1b94d0622c4cf82910c01a3a0ef2bff820c1d8fc709663cdb18216d7ab4aa99eceb3ed15
-EBUILD asttokens-2.0.5.ebuild 777 BLAKE2B 434d174d536f0617b454ef53fb66e87867362e5829bafff23414753d0da2b78a814df95d6e48eca905e5cbcf40874ba9ba6d3baf877e89e86e304f2da9d168d1 SHA512 a617317cbba7de1c78cd8e020014a4b8492c9147a7d724c7fdca6e8ba91f0c952426d3872bf7eeb0c5aebb23f44250b959cf745fe1e471260329ffb4a41f2f6b
+EBUILD asttokens-2.0.5.ebuild 773 BLAKE2B b0ff6b3f024ae2668812a84487ad781b7ce9e722d1c967b7e932fac29a32275230e3c5c3ee05c069e678346b7cadf8d947be48c6161c8891f7d4daab2419f08a SHA512 d26657cbbc02f654654b92913bf4d69bd09df6ac9d3f0e6717296cb3a05808674b86fbb8ba8a59ca374b1f67524fbb89d355b7e838a372ba817087cbca83c7f7
 MISC metadata.xml 349 BLAKE2B 98a5cf5c1dd38d72e3a9291bce91e66b23feaae3df2356e68e60bd2fb37a578b3f62d9f1eef8f8966c1cb10dc1c6d0820cfc9977e30c8574f9881177fc58fd00 SHA512 1bb6c8ba010ccdc6a47646021446943063034afeccf89437e6a769f40136e0a8a3875dca5eb40beb119a87e24b37db342542d89acde1fd3a836853f4524f62e1
diff --git a/dev-python/asttokens/asttokens-2.0.4.ebuild b/dev-python/asttokens/asttokens-2.0.4.ebuild
deleted file mode 100644
index 2fb6b6e0d04f..000000000000
--- a/dev-python/asttokens/asttokens-2.0.4.ebuild
+++ /dev/null
@@ -1,58 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Annotate Python AST trees with source text and token information"
-HOMEPAGE="
-	https://github.com/gristlabs/asttokens/
-	https://pypi.org/project/asttokens/"
-SRC_URI="
-	https://github.com/gristlabs/asttokens/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/astroid[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# Kill off useless wheel dep
-	sed -i -e 's/wheel; //' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
-		# invalid syntax
-		--deselect
-		tests/test_astroid.py::TestAstroid::test_fixture9
-		--deselect
-		tests/test_astroid.py::TestAstroid::test_splat
-		--deselect
-		tests/test_astroid.py::TestAstroid::test_sys_modules
-		--deselect
-		tests/test_mark_tokens.py::TestMarkTokens::test_fixture9
-		--deselect
-		tests/test_mark_tokens.py::TestMarkTokens::test_splat
-		--deselect
-		tests/test_mark_tokens.py::TestMarkTokens::test_sys_modules
-	)
-	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index d1c976711b1e..cf7fc5d2a259 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index 9f13b2baeec0..5c6ab25f67fb 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -3,9 +3,11 @@ DIST autoprop-2.0.0.tar.gz 11705 BLAKE2B 0dd6401671250f9445aaaf20345035bec683eb7
 DIST autoprop-2.1.0.tar.gz 13258 BLAKE2B a08431a87067463278276974326ca81a8c0150193fd3a03fdc2ab422b836655a11f759154fdeeaf834bc379163e167d4815358aaefdc83a76ab4dfa87b6efee5 SHA512 c30ee4bf85d139abf1be2e7b0217bc6f394ba289ccdad423c97f1d27f472ce00eaef2be0f3cdf1c9022c6edc56006d5834d1afd6ef2c5ee2ec124eb5bf679652
 DIST autoprop-2.1.1.tar.gz 13794 BLAKE2B 63645d0d8f9d49f5df730dca18c468e3dea7108e01cf12f6de6d80ad6cf8b5d396957d4a0cd82c737c0b12274a8534e6f48120ef1118c0fb34dba529dc74f081 SHA512 39db6c1130d0b958713f15efcd75ecbbb41659f5f7182be37f1dca22a46c18832d0f7893fadfbf4e8ad9f446417a2476e7dc7890124c9caabd6b5dde37eb7c6f
 DIST autoprop-2.2.0.tar.gz 13939 BLAKE2B b30565618cab67c5a3b9f94958a8f4734d60c048067f73a007fdb9d34555337f92776cac221c89e0067851d59b21f157b4bc1d24fdcaf3e3ae677c31c8a32cc9 SHA512 d8ef758b0d097ddb73cb384075d3d2b0d59191cd12d59a54cc449483da94ab116c75b39cf48d3d262b147e855af1806a0c617ba220f435118d636cd6f283c51e
+DIST autoprop-3.0.0.tar.gz 14082 BLAKE2B 9881dd924b8d66e83dccb3e7ca1d753bec924e8f348d96d0522a76e857c85311ef7ada37b0080c1b3a0e719bf84e807d12c7e4dff4bbfc111273b340f92244a5 SHA512 4730155130b98fc02bea991837ee6d875f19ffa14ae542909314264950d20a34cdbff9e21b31431136624de0dac5eb2a50a9cf677da01862b38cae9c10bec92f
 EBUILD autoprop-1.0.2.ebuild 433 BLAKE2B bdb7b42769da05c744bd5d0cef90ca4cd306c55ad14825f161c440a7c6d7f4868048ccf0640fc381542b6d724ddf6fdde1e3476abbffbd6566fafe1480faf3e7 SHA512 0f1e41541307ccc4ac2216ce355b8b67fe02a862346ce43f9d643d621ac1ddabd048026259de1d4d02f803e4996ec8aba04beda2e63ef26c6850925e00ed2164
 EBUILD autoprop-2.0.0.ebuild 437 BLAKE2B de766ec1f301da0572c5818943b05b966a2369724bc7258ef5385d4d33808afb00f1d59dc84bce637771d926820d45d4598f39bc6c474652ef359e0512bbf496 SHA512 332af04f83fee78b0c6e17f60c949a6e3ae1a55acbbb875e923e04eeedbee5a6ced6c7638d41d91ab5bb8ba69c83ac35fe7f876f484282f55f000bef6e6a216f
 EBUILD autoprop-2.1.0.ebuild 526 BLAKE2B 7029bcaff23e9cb90aa3d0dff2205df2af827917b24334e010bab5e4ab83ee5c2a53f6e414e88197ad706629351d0e44daf920ee247e670c315417facd6c90aa SHA512 7e06181d70a0f4571bf87aae79d1428d3d03e3e12afb809bb9067f52d2948ddf0474c8de49446aa0b5cb554fd0590d7ae8e4ac3dd84ddfbc55f1cee942a1b5e3
 EBUILD autoprop-2.1.1.ebuild 526 BLAKE2B 7029bcaff23e9cb90aa3d0dff2205df2af827917b24334e010bab5e4ab83ee5c2a53f6e414e88197ad706629351d0e44daf920ee247e670c315417facd6c90aa SHA512 7e06181d70a0f4571bf87aae79d1428d3d03e3e12afb809bb9067f52d2948ddf0474c8de49446aa0b5cb554fd0590d7ae8e4ac3dd84ddfbc55f1cee942a1b5e3
 EBUILD autoprop-2.2.0.ebuild 526 BLAKE2B 7029bcaff23e9cb90aa3d0dff2205df2af827917b24334e010bab5e4ab83ee5c2a53f6e414e88197ad706629351d0e44daf920ee247e670c315417facd6c90aa SHA512 7e06181d70a0f4571bf87aae79d1428d3d03e3e12afb809bb9067f52d2948ddf0474c8de49446aa0b5cb554fd0590d7ae8e4ac3dd84ddfbc55f1cee942a1b5e3
+EBUILD autoprop-3.0.0.ebuild 527 BLAKE2B 4241223ff54d56bffa53b3e9933517bf69c2584c722dfe502767df49fb2ae3c184e56b01eb6724ecdcfce9c3dbc5ee394e4a54627ad64e4bcfd1415f90850e68 SHA512 bd60366caf728f4161eff68a562b80c048c80396317a64585201420add023619e172491a755fc3f73e4ba2786ec2d2d3f220f613a94b2db6bfbfe107386f33ca
 MISC metadata.xml 1375 BLAKE2B ffdadb28cf5c0d998c10efe33628ff9fa6c1a7c5eaf94d40e990838a37180bcf00357ecde94a2650e76b10877663aeda9b4d5ebdde97eb46fa381e9bd5152098 SHA512 d6eb2de762ef76247113ed312dbbd8576000f966b1fe224293bc4a7debd3ff6b87370f5eafe62dd6596b99cb77a995cf5ea1be834d7c5096a8885acf8747bd75
diff --git a/dev-python/autoprop/autoprop-3.0.0.ebuild b/dev-python/autoprop/autoprop-3.0.0.ebuild
new file mode 100644
index 000000000000..6a1d42d9b3be
--- /dev/null
+++ b/dev-python/autoprop/autoprop-3.0.0.ebuild
@@ -0,0 +1,24 @@
+# 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..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Infer properties from accessor methods"
+HOMEPAGE="
+	https://github.com/kalekundert/autoprop/
+	https://pypi.org/project/autoprop/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	dev-python/signature_dispatch[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
deleted file mode 100644
index bd2376dab7c6..000000000000
--- a/dev-python/awscli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST awscli-1.19.47.tar.gz 1990843 BLAKE2B c894aaf84d5fe7cb8998fcd682783a1f2e75dd9273a2aa22babe4d57175a1716aefccda50edb96a1203f010dbb2af29cd47d43b5d5f94adfdee1730ab98345af SHA512 7d51022e13609f5f5ab3155e3ac09670c7e49508d67eca8cb477e556e4b06b7643e86bdfe5fa8db59360f6d73e5774b433cb7093c25d6b688f98847b502872b7
-EBUILD awscli-1.19.47.ebuild 1277 BLAKE2B f16525afa2a61d9b2baf0e41852e93cf3838f02629b92a56dcc1b43375807437eae186278b84c044c005506c07ab80f3d2c17a7d3468698bbcb0bf234a554e16 SHA512 c8c9ac76a97acec8143315e98b78b6926c192abb44b24227a9792bab151d9a6ea9091a01844c57de9844307b4b2bee530a99a698d281555856b007196d79ee54
-MISC metadata.xml 453 BLAKE2B d45517c2fabee8961b00d53a0118966ec7f50b965ca2c42e02b41201baada3ad18d66f1bebc134fa64a524ab9a12302feebe922833d04ac571068b10dd9e9052 SHA512 eed3ecdf6fa24c738554a6f95659835a1d1ab9fb017272226cc54194ee2f35d1ca6adaa52bac44cf4e740c42636f842782e708f38f24b51b7341e47e10ccfeca
diff --git a/dev-python/awscli/awscli-1.19.47.ebuild b/dev-python/awscli/awscli-1.19.47.ebuild
deleted file mode 100644
index 73e39dc7c9d6..000000000000
--- a/dev-python/awscli/awscli-1.19.47.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_{7,8,9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	=dev-python/botocore-1.20*[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/metadata.xml b/dev-python/awscli/metadata.xml
deleted file mode 100644
index 4b2238e3a1fa..000000000000
--- a/dev-python/awscli/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">awscli</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 18586e345924..df24a91f2f12 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 1163 BLAKE2B 7b43e53ace42297cde8a502dc7fe582ec60418a22dc41880c1e4a872967cd20981d28b8f1c3c6232cdf57765b942a69effdc4889c284d33169e5715f09fd6bbc SHA512 e99c18cd90188d422902b184d8084cfcf407df87a3c9de527c96eee66e62c2421b49096c8e06d4bc3075d68766116deb96337ea2f4341360ccd80a9bb33cf3bb
-MISC metadata.xml 1103 BLAKE2B 6f0961c2729e7e51ffc3667f539625d942ba0b3f529c97bbccc41cd57c3c2f326ee66f334f62e25cf20b955c8411aa12a59015db0817b793e6c4409e7d0ed75c SHA512 a2631c7bf292497853892a9cb8caecd95a8e179508849e1ad8e4949052fa0a06c82a0febb8a446cdb462418b7dcb79bb62410951d6229eb196eaee4edf2c65a4
+EBUILD backrefs-5.0.1.ebuild 1164 BLAKE2B 041c0ac793ed5644857338d90ba774a8f11d934e7475465b76eb0800e98f335f8d43962ac6698c90e3325375f13433933778de52e6b379418bd8de2237d04cc0 SHA512 3eca0d88d2c5268d8d06e49577a73c90730ffc8b739e83336ea25c72095b5e07d81cdc912800a89c389126917ea2f393a11bc2ca414c8939a42ddb66237d13a3
+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 72b44d4b44cf..60fd99b24c7b 100644
--- a/dev-python/backrefs/backrefs-5.0.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
index 0c26badc91b1..8588059ebf57 100644
--- a/dev-python/backrefs/metadata.xml
+++ b/dev-python/backrefs/metadata.xml
@@ -20,4 +20,5 @@
 	<longdescription lang="en">
 Backrefs is a wrapper around Python's built-in Re and the 3rd party Regex library. Backrefs adds various additional back references (and a couple other features) that are known to some regular expression engines, but not to Python's Re and/or Regex. The supported back references actually vary depending on the regular expression engine being used as the engine may already have support for some.
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 4faf0ae92656..155cabda8ec7 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,3 +1,5 @@
 DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+DIST bareos-20.0.1.tar.gz 13324751 BLAKE2B ae52233a912492e7a31372b5124e7dfb6dd9dabc6545116cc49435cc078512a4380076484c7f802a7fbeb70e6683c053d97eae9348230820c4105e9be6e9af51 SHA512 94023b21a8c8a020ad5f01153a115c45e7479b204bbd834cdc89aa0f10878ea199738835f9d831922ca10b2a077aa8725f8356f205d5dc414712ef24d1c3e7d4
 EBUILD bareos-19.2.8.ebuild 525 BLAKE2B 7276dc23ab5c9c4f77f9823b1a2ac8bdc7057cae3b22c81f91238c4a8abd52cfc3fe6e0f7f6f359e8c86c5a68cbd856b039a949aaf68a2b03336e9f2d29d6783 SHA512 7ad407ddd5774296cc2cbda0e9990818c2b556945b18a321e25743cb90e0c1160c6771bf9477d9facffb623ec7ac841d03a72a169e7bbfed6f2e496639f3cccb
+EBUILD bareos-20.0.1.ebuild 461 BLAKE2B 73e3b84ba144d6572051adb879560904a0768c8479672b50e75be35c4510a4d8512459978c172518ffc079ea5c9d98c2a6446b2ad540c7be078134fd964881dd SHA512 264ffb4ffb7600c4b6cc83443ecde6af73618b619c20f51d3e86309eed7bcc191b6a524c723982e98c6b15aac5af76c6125f384378432b9f6747322bd3cb943e
 MISC metadata.xml 328 BLAKE2B 349833d83da7fc08e938a5de92f212d232cc91cb3ffe295afe2a70feef1f55e466ad9ae33d518519598ff9dfbff05ef449ca1247a02581536f62073e3f96d7c6 SHA512 540595607116ed282250e8202665400e5d204b772c94937c156252acf8edb9f2dc3929d3023de01ad0e87045c4d12a7511a1fd658989af4b8bfecf35211568be
diff --git a/dev-python/bareos/bareos-20.0.1.ebuild b/dev-python/bareos/bareos-20.0.1.ebuild
new file mode 100644
index 000000000000..f4bc69ab46ea
--- /dev/null
+++ b/dev-python/bareos/bareos-20.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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="python bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest
index e0a663d30083..c1bc79fd0791 100644
--- a/dev-python/basho-erlastic/Manifest
+++ b/dev-python/basho-erlastic/Manifest
@@ -1,3 +1,3 @@
 DIST basho-erlastic-2.1.1.tar.gz 9298 BLAKE2B a3cd69a77c2d75ccbc2494cf841563a075036ce2ecca4425b3e806463e080d87fc2ab6668bcb21dfe3b083ec51498113c641f033cf66b0fd6b1b00ddd9703349 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e
-EBUILD basho-erlastic-2.1.1.ebuild 558 BLAKE2B 9cc342769139ab6d788e61eb45fd799171dfdb9fa2c9c404c9162ace64f5efd02a00732fb8fc27aa0e481ce71fdf09d37cc12ba194a9f14a7b8ac7e9ebd20f98 SHA512 26c3fbf36cecc5e06410e52d8a18d858dd17846d3131d1812b98440c63bfd587fe3d8bb55b1e5621f67413b9b990ab57abfa101103021649266b76b9a67a363e
+EBUILD basho-erlastic-2.1.1.ebuild 492 BLAKE2B f2504e4278b40cf63718d27f4156d349d783d18f7c61c864455b48c58e56a053678325c8a0aec2532fcbf8348414baa1cb56c8ca3cc36a6d4ed17c5f3025f968 SHA512 807bbe5d07c6d7fd5c47ded05e67a2e7e9bf7aa94ede285ef212b84b856288b2fb4dc74b317088c40bb0b447ecf902b9f95f35d8cac36581ebc5038ef8248fc7
 MISC metadata.xml 356 BLAKE2B e6bdd5c282ab43b84c7d3e581a62b579d3e46031f31e4e81426f93e9fe97f46c5ca9ca844afb15e0a31436464473ea4ca03923ace0ddb55ffdb695569fa42f84 SHA512 cbd8ab52f7ab3e2b9627d745405f21c19e9918cd765005628415626d0598e216ad53744988e343f2d03bbb71d92b3cd62c085ad4288393f016950c8dcda7f09a
diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
index 452fa4b25603..2a1385ad5f38 100644
--- a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
+++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -16,9 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	"${PYTHON:-python}" tests.py || die
+	"${EPYTHON}" tests.py || die
 }
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 7bc487f58ce0..cc87a0494cc1 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,3 @@
 DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup-4.9.3.ebuild 852 BLAKE2B b603d58af75d9b382477a8b8de0b9e31638c728d1ecf47fcd1edeb67d86978f4719165c2321cbad54b27486b136de1e7d03862260e7ae6552a73c3a0967d901c SHA512 c8dfa580e2524a01a89850e9550f8f0c5dc5ca8c8ea48f918d9b6665f88dfb037277612c13bc312101a4e038ae0d21b94a4652210fba07f9513bd2325fe053e0
+EBUILD beautifulsoup-4.9.3.ebuild 853 BLAKE2B f667ada00b70314f502e9747e499d176959ae5345ff26c26f6ce82675731cd8a821d19377e933734edf3c41b2f5b8eed618e9e498d64d68e90b5932e4999727b SHA512 f93f5f6dc35799f1690130c9ee3bb0b3f4a7256a976a82af939f534ea9dfa8cd6fa2122db55c01064fe2fb536123cc754561667bf5a1b40734d6826ca937742b
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
index f35d2db5d16e..84b1144eddd9 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.3.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=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 1068174a2b25..039232a47dea 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,8 +3,10 @@ DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330
 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
 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 1577 BLAKE2B a2b7fff6faf857c077f9655ccebf82a603123f0611450f2431e8197f0311e6f25e7ec9420e9c7faecaeceb83f89b7cc4d0f1dacf71c3eb885372b92e0e38234b SHA512 c0bc951cb9e1502e3bff52ffe8a1120c95ca2e8299b02ff3850cbba4a536e37c5b47f5b7e59a8e10ccd32a602a7eabcf31d70b6ac64b47d6001b8ad141148882
+EBUILD black-21.5_beta2.ebuild 1544 BLAKE2B 7e8af30c33fda87f7d24aa2aa396f4cf748cdcd862ad747b7e012dae3b3b65c9c2556e3fbdd5bf5bbb6e79a4e3c0293f035cf1547664a2517aa0b9cbdc694337 SHA512 461b9e04c506c68497e0cbe6fd7eb6cc5f6f6ee36cb2596916f4dd0cf0a59479b112c1b03e8cd6d7d621a0690c315fc2e6a3e57a74dd4c64b8a3d345c3517746
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.5_beta2.ebuild b/dev-python/black/black-21.5_beta2.ebuild
new file mode 100644
index 000000000000..c80dfedc410a
--- /dev/null
+++ b/dev-python/black/black-21.5_beta2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_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/boto3/Manifest b/dev-python/boto3/Manifest
index e9831eddffc8..4ce8883ccee3 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,32 +1,18 @@
 DIST boto3-1.17.54.tar.gz 362224 BLAKE2B d67ea9a2833d4cf6ec50fc4eab9c194f813f92ef00fa0d1638e0dca0bf03a92fa5208707b3ceda70759231aa69c35bf83028eada42d04209a55d05daf37ce764 SHA512 795a78807e8aad9ba53b196ac6b3547e23d2f7cc962a34121280fe47dfa8f99eac19765c87817918c6ee36dfb7e2b647e5646b7da27eb67900f29430bfe2fb5c
-DIST boto3-1.17.62.tar.gz 366832 BLAKE2B be452f1afe79538c29a9c8d8aaf0e0d0224a34b78a7d4f261cea1286e21e7154784f7aa0a544aef68161a861915a19b12fc1526ed7499ad9de6fdb638abb5b7d SHA512 64c323cfcfdd4a1adf083dde08fc88707975c03c4536ef8f66ff08694c292705dca7f11a37c0a2b1158facec9c0c9b58c62570e61e3018ca218f1207d0713479
-DIST boto3-1.17.64.tar.gz 367357 BLAKE2B 582cc599628df29acdb146a0a1da78fb1e35d560f08f54709e5aed9fb27be9ffeaec27b1c2f393ddd48fad5b9c5ff5e51d001972a798b516e089d58d321aaac3 SHA512 ffe248707d162de5a2edd2dec4acb769bda3d2d0c9611548813647d3f0d70de9e6754216ba32df70eacf2e4a6ed2c8fab30261731aa87977eb5972af6052ddb4
-DIST boto3-1.17.65.tar.gz 367905 BLAKE2B d6aa552a8f5a40613577dcb4d43de185662799f471eae2c14baee4799ac2ccc3b8a7c44e39bad8997b2c68d783c1e4454c0f94e41888a895f88bbc740905d626 SHA512 0bfdcba7fa15e0340b9bc235c4f3e09cd1e01d99b6fc7a95e7543723477b6d642ef2b833b24a5cd1adf2c274d517fe43ee0f9bdceac973b472227580fa39b29f
-DIST boto3-1.17.67.tar.gz 368242 BLAKE2B 72e612816c45d49c74430d82f4ede59f6b6e7c128d5cb60b8f7d0f07808776b2a1b7656fa8acdf1b8c0d18b4b0a33479aeeebb57355b07ea2e9b6970f84bc4e0 SHA512 a80ea576a60c21f67f43a556ebead8caffcfd18fb9e777693375f591c5e842bfefff86d0d15252057b7ec1ef5cc54b66019d023880a30c88bc8bce012c9b063d
-DIST boto3-1.17.68.tar.gz 368708 BLAKE2B 4ed78bae6e8c9ee6e8f1a5a4009f89b1c5efac1ddfa8189a6ec76f1ba47b8113dd479ed935e1d6f4631fcd1e40659398a5189bab77b15e1efe5acf706871b90f SHA512 c8a4a78da518530b3e47c1f3e37f51a61070f9b626b29ee4b1a990bfb2dfce49332add6674a0ec8b156c50e922736a500f2b265cf9ba286000aca55a272a7257
-DIST boto3-1.17.69.tar.gz 369006 BLAKE2B 6ad2e9ccb71872c5936f63b786b4b7addd5ff6ff9ccc9b8a65361006ae77861175692fd8a7d4075cf170f92aac4c0f3072a598a99191356909cd95122c34d3ba SHA512 7dfe8ceb621a63ac3e2c2d0852d8ba380200cd91f9f548109c8c5f6b0704a5c56acb645cdec6b7974bb30402a5832d001f5cc9e8d30f940560a06f88407c5385
-DIST boto3-1.17.70.tar.gz 369851 BLAKE2B 31416aed68f340842962dca12f77e169f87f2f2a63fa5189c298678d0672f1edf349e0884856624faa971dd2e1c248e320c92dc8189fc63612cce24680971e5c SHA512 fa0bbcdc9027f09007780f75d3a41aef7656c934bc10f710f5787fd7cd7a7124475437e62e7d507e24f773668102a75c4b3b5cfffa5d2834f75fa930894ce227
-DIST boto3-1.17.71.tar.gz 370105 BLAKE2B d0ea164459e7f79f5d9124af1917eb1a6ef9743792cd13daf58f8c70c852e537392ae8e3fb7ddaf5cea75e914ebb44c205f865f1b896827322b0be8500dc4a4f SHA512 b934ee87fbbced5a6c180517eb2b304b0d097dabc7f9831ebd4945d1b69919e3701955d92b4cfa5cd00da42f32fce731b70dfb3f69b5583eba0a032b4ef3505d
-DIST boto3-1.17.72.tar.gz 370275 BLAKE2B 2a6923fb9ca0a67e9096844cf66a3dbf74e77eb1b4ade6f17fc248dff5249b467bf07bfe51779a65dcc9d41f20597419418cb7aca04cf03b3ab7c6556772b685 SHA512 c185c05c590d6e7d61db6ea88082a1520229fb9384eb04e0d0c19108cb3cbab53714dcc46b0de064e11e8989036e782f21d687dc12312a019717dbf082febe35
-DIST boto3-1.17.73.tar.gz 371093 BLAKE2B 1259a4c8ad0c87cae66c6f30c70ea785927669f82ba3fe196db30e7dd8c92f940928a25c4cb263d3b9f0c9944a4dbf8d0cd4dc52770d60286a50ca4830d3129a SHA512 582ced34557e3ce20628a5093c80f7a9231e010da4a9c4f7669b7c04f1eae8c4edf050b75fc00675f03d4e9fbb3dbd97441cd9a99c7e050a3914f072810a8aeb
 DIST boto3-1.17.74.tar.gz 371719 BLAKE2B f6d44206a14cdf395c8963be048e81391ecbf6817b1c00e1cd081abf111df8bd85c05fa1c04b013de7e6d916835e4876cc961891c8d52d8a32e41713080ed96e SHA512 a79012072238286561ab43ca7bb9f24236e858e0bf550be9a074517145445d0d520cc207683d99f6f704416f617b5f89468c87357223db9564e4310a2a2676f1
-DIST boto3-1.17.75.tar.gz 372223 BLAKE2B 5502d43dd76206a57793593c85b5c84a126c8bd4b8e1ac6c72b65a70a1f5494a46db2a0f97cd7218f02fa4ffa53094202823a50b652650f21672be990242b25b SHA512 b7c6aeec402b0dcff2681f66714b5de77206873f4b554ab5a9436de473ce52c20c84107d18e0cb53badd7d6a68a5be53e0967a1d18f92935f6c27b3c2c154eaf
-DIST boto3-1.17.76.tar.gz 373664 BLAKE2B 2c38008fbe459ba0382d48f1e1bcf896fb1f341cba27f1ee9b7a2e186f71ba38a36edd1b123fca8ea66abddf81491005fa17847a447f300647f13b66bd4c1525 SHA512 3e3bf35bac59d62a23aa26db5d328e6ed07aebe87449037f11f2561514fbb877bb268942504c2f204a27eb19be6e076f36f59b635ca77e83c4c40b9371e76e92
-DIST boto3-1.17.77.tar.gz 374165 BLAKE2B 2c7c041787da521d89d18248be2f92c29f989949c6a9c19f12cd59098db0392f47d5c4e66a172adea0190a126bc2487669a1f4a14024378194bd1e9ae5bdf4c3 SHA512 a6140ed800ad84abe77d78ce1df874ef5c89a822af75b50459f220db4544dee5078e5c7f517fe5cad83d9f4c3fbb0d5c6095c136603c677f4c019109097411e1
+DIST boto3-1.17.78.tar.gz 374487 BLAKE2B 8a83cb32db8336351454251a3cf78efad6197885a66c10a4e3f9e13770d92d7cd9e9b51bfc7c4bfdb2f5183c5246872d7f3075d55b5129606ad9d977ecbf9891 SHA512 8ab9f13360f63342219d7b0278e2ca5613f8d051d006ef26da14307e83fcaaf1a546c566cb4b8ba012fa5e8e6b5e409722228da0989e56f50e40df4a733602de
+DIST boto3-1.17.79.tar.gz 375101 BLAKE2B 3948499f1bab6853ea110fd025a9e9e917e3ddb3a90681008686293132dc18098c13834937f04342dade16663b878da065f44f023c9adcf682c4c0057e19484d SHA512 d01933f1a41d352ba33e6e78debf5f0cd2c3d187214e7cff5602d26518b45d605c2a319a98ddf86179871410277e85aa59ddda80dcf1efb66f9aaf0c89109350
+DIST boto3-1.17.80.tar.gz 375564 BLAKE2B dd10855ff88a0f24789cb389b0e10c3a6d4f98453ba37d1b76429fd9fc48bda8d9c5a578bd72230401a20973c9d6ad62be15f4ea00845d834a573fb9b20fa60a SHA512 cb6c6628faca586131b3dc8d989437e7a5f09ba5de55d7eb40e941003bb5407812ca4058a2c951d473aa1f1ea0acf48370a275191c7fb64ec0fde34793a59218
+DIST boto3-1.17.82.tar.gz 376284 BLAKE2B 33520a1a80566a17b3a0665ce2520e73bab69b48db02b1ac25b6ff438a2dd68a75c08026abce6a2274e1fa40aaa7fe4f0e56ecc663672d9a6eef205df5d0baea SHA512 0ab14df312032a64746624b67dc721c45ed6cb7c3be21cceba77eb4c20a76d85bd2db22eca41f598431f6579473becc78e84075a57ab43b16561d4b58e3648a5
+DIST boto3-1.17.83.tar.gz 376963 BLAKE2B 0bdcae1097a8ee4250c08fe639419ea99b83e33ea77433698ee9bafd928252e6b836c93bb83d383ff4aeacc583d2309236e80d2ebd5425e320aa2a80da295964 SHA512 c1dad3d17b0bf628ae31edda3a6eaf01fa1b820031d541f0dd4f4d56e98a1da9f868ed1c6e63ff0b6bd83cda027c540c08b41a066d3b35959294779c2113cb37
+DIST boto3-1.17.84.tar.gz 377284 BLAKE2B dbbc6b8643b720a8a5409c334e268b6de465e7db05684ff5a70d95c91e7e2feff3c3db94ad85f400ac7451e8f37537732ed416602c35bf37955d840701bf5bb4 SHA512 19d224c9bd7135d1de4da807b51f72a3366d5774dba970896388bffb1308b348b001453c0632de5eee8f03bdf0c2b8cf3e9da894e73cb16e10551e060beef5fe
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
-EBUILD boto3-1.17.62.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.64.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.65.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.67.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.68.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.69.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.70.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.71.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
-EBUILD boto3-1.17.72.ebuild 1362 BLAKE2B d21a975d4661dd88ab66d3dcf1eb6c9bbc17dd2ed5e3f6e1c6b78a71b56a535de1245b68cb70d711064f17dcda1d7d83175283362e8bd8a523d564b977c3ca8d SHA512 5d6e5f2f42a13ceaf4a684708b5e37f3d372595cfe34c1cbd027731b8120e983faf86726eaf2ca5fcd9389a56215f0be5954b3dac7c3705b9dd371db160fbcf8
-EBUILD boto3-1.17.73.ebuild 1367 BLAKE2B f6429973eed8ec0c70e99cc1c6bf3f3e572d9f75351d64e15517107877ebb8df86bc096f3c44f9b2c1c1557848e664b1d6df6619e9abd1a1f92374e6ae31cf7a SHA512 3bf84ec1bf6ec8b3e34cd1b39408f1f5a8c275a0a28c13b92638bfc5494f69b56bf2494580e7b1cfb47ef5c335bc0278077a629da83c1043c2abc37e99bc93c8
 EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.75.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.76.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.77.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.78.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.79.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.80.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.82.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.83.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.84.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.62.ebuild b/dev-python/boto3/boto3-1.17.62.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.62.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.64.ebuild b/dev-python/boto3/boto3-1.17.64.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.64.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.67.ebuild b/dev-python/boto3/boto3-1.17.67.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.67.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.68.ebuild b/dev-python/boto3/boto3-1.17.68.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.68.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.69.ebuild b/dev-python/boto3/boto3-1.17.69.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.69.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.70.ebuild b/dev-python/boto3/boto3-1.17.70.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.70.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.71.ebuild b/dev-python/boto3/boto3-1.17.71.ebuild
deleted file mode 100644
index 74b9170a9119..000000000000
--- a/dev-python/boto3/boto3-1.17.71.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.72.ebuild b/dev-python/boto3/boto3-1.17.72.ebuild
deleted file mode 100644
index ac3419c36218..000000000000
--- a/dev-python/boto3/boto3-1.17.72.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.73.ebuild b/dev-python/boto3/boto3-1.17.73.ebuild
deleted file mode 100644
index 359c82c2155b..000000000000
--- a/dev-python/boto3/boto3-1.17.73.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_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-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 ~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.75.ebuild b/dev-python/boto3/boto3-1.17.78.ebuild
index 5577742efeb7..5577742efeb7 100644
--- a/dev-python/boto3/boto3-1.17.75.ebuild
+++ b/dev-python/boto3/boto3-1.17.78.ebuild
diff --git a/dev-python/boto3/boto3-1.17.76.ebuild b/dev-python/boto3/boto3-1.17.79.ebuild
index 5577742efeb7..5577742efeb7 100644
--- a/dev-python/boto3/boto3-1.17.76.ebuild
+++ b/dev-python/boto3/boto3-1.17.79.ebuild
diff --git a/dev-python/boto3/boto3-1.17.77.ebuild b/dev-python/boto3/boto3-1.17.80.ebuild
index 5577742efeb7..5577742efeb7 100644
--- a/dev-python/boto3/boto3-1.17.77.ebuild
+++ b/dev-python/boto3/boto3-1.17.80.ebuild
diff --git a/dev-python/boto3/boto3-1.17.65.ebuild b/dev-python/boto3/boto3-1.17.82.ebuild
index 74b9170a9119..5577742efeb7 100644
--- a/dev-python/boto3/boto3-1.17.65.ebuild
+++ b/dev-python/boto3/boto3-1.17.82.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 ~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.83.ebuild b/dev-python/boto3/boto3-1.17.83.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.83.ebuild
@@ -0,0 +1,56 @@
+# 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="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.84.ebuild b/dev-python/boto3/boto3-1.17.84.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.84.ebuild
@@ -0,0 +1,56 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1551fdd0dfb3..49c3003ef1a2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,34 +2,20 @@ AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e3
 AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa2886343a6e486710de5f962fe09ebe3ee9091830aabd17544e2112de2eaf91d63ca881ce050b6b9fa9af86337f3146a791 SHA512 6028bd13aebcbe6afe66018185d22f904c010cfd41f014b43f361c73799592d223af0a23d8fb3086f4bba9a1d106f60afc68e659dcb78d0d2a967442130b3179
 AUX botocore-1.20.64-bpo43882.patch 1106 BLAKE2B e08e112f1afd9a4b80600550550903594901eebf94d44cecdfc38ff2e6007594f796506377096403f3b77a148acf92bcb2373eecb705e3f150cd5ce41c0b3c76 SHA512 1bfebf53c8cf9a2e84b7493365b90e87174cdaf0eb138921877f2f726b5b9acf7d0cb4b4fa4f532f23cfb29bb48150ad01ba582b1a19c3b0702b24f69208e5da
 DIST botocore-1.20.54.tar.gz 7650344 BLAKE2B 2dd0a3f8c7c5665e849cf74b663a88e63416f1dea8ca3ee7dbdf10cf35239d466919f2ae4b3c9a639b9e25a23d982b723b24f32ece43715d40283e96e3bf10f6 SHA512 77cdaf68378836205c94c7dfd8424f9ca44ac822fd418d323df30639157bb38e5534fcfbc5bb6cdd7695bec62e24a1d52b81a0be54b0f69f16d20c5182db004b
-DIST botocore-1.20.62.tar.gz 7674812 BLAKE2B 6fec1213c13bc12937f45c2584ce52532ea75d6973e9741d18933dc399e8f0ec569d6aacdf4a9f83f997ff9898cb39c327410965d992836bbfbd9aa06ea81311 SHA512 ae25e2266955964de7be499fe17b64dd5008b1c1abec84167593b04a1bd4f7baa506f91013b292cd42aae01990ec3523d75e3529398185fdaedc358bb5048e83
-DIST botocore-1.20.64.tar.gz 7685481 BLAKE2B d939b262f04a67918fe61ba0789a4ac9a73bd571096fde881ad537bd7b193798960096ea6d966b49634f33454845c8227786c7bb16c0008e8b5dd84591c2e018 SHA512 a2e82988e59f05ae7050b3e8f86b379dde83f516736c9ca133c0fa678cb7c6ba5448e2165cb0ab3f4262e8e3681ede37048508092ba62313e6ce3f89700c8827
-DIST botocore-1.20.65.tar.gz 7689179 BLAKE2B 4f831519c785747b48351b9820fe00efb39ae9157ff11604b6d850b9768a6613ad54b3db9071dedf51e0e9209f3741f35d7e21e953842d1bc89db52b22779d41 SHA512 1936955ab69aaa7d82ea2dc522603162b00e3a9ca39b5911ccd4f3d78688ff1375c4e2abc65638a517a5d7a07076c1c7d6fb81529c6d5cfbe9c13254c3736777
-DIST botocore-1.20.67.tar.gz 7691087 BLAKE2B b56cb7e80179b7c5c2b4daa27907870c075b0cc5b0c14da1d96583701df6d764f0e80cff7973f501263a4edd4e70e4adb613cbe7fa05d7855602db508b509539 SHA512 d0feea0042ef5bbe1fc76ca107cb2450bdf564d82542c483f3b484aa3e32986d649bea9e7e65ea7a36e23582c73c7b341bdb1b07722f09b67334b97ca423999c
-DIST botocore-1.20.68.tar.gz 7692876 BLAKE2B a5de44db992688a7ceff14e2663e21f370811871d87286215d04db9d0ba9649c67c047b6ec290967eddcdc8cc6fd12bbe9c99589fea183ec2b2036dc69f4d7e6 SHA512 f3de8f5cb621174dc0ed1b8c8d4cbbc3cee56f0b0f4363767cfc68a879fc6e837225e82538640736687efa4340d62ff3d1923abc315f914b0a9189f775c65b6b
-DIST botocore-1.20.69.tar.gz 7695769 BLAKE2B 994e5415c278a0c021deb1749c59ee5c654c7212cc2a1961fb2c528b7f5aea0a4d3f70c88a72489410cda935c8498cb3c4b1ec4830b3150ee043eb3429174781 SHA512 dbb0e77484a545489b54a1f71c78d2cf7d95b7f3a4f4ec54a9c07d7af354e9037d6eaa3100cf6a8e89d778bb0ed19f9475d68dceee98666bd69a4b05662c5939
-DIST botocore-1.20.70.tar.gz 7700136 BLAKE2B ab7ea88763dd4637754a5d9eb955e0947efd9c5fa87856276056d6eaac341f57d5edd43ca830dd35c1283c6f41de43be2f9b06e8f328a8900cde41ec5953bf9d SHA512 d992b88df31a77b153fd3110119d1523587e98d56e4b80ac14d0c5351d76b3e4c188295fbbeafcd8efd3f414a1c0af0d78f21555b2d3285d6f8e88eefab282dc
-DIST botocore-1.20.71.tar.gz 7720081 BLAKE2B 4f5d4f237222a034d2102cb637722c7d63ac34549ca582fce8d7b02a93345cc48067b195f339010a0dd47fa04a53ee4dde5f98eb58a1db3b0d4c958066717063 SHA512 7a9154efeeedc90dd9089641798494095cca9f1967e3615131af154e718081e2ce85e37fea1a729e7d7cd42d2fd6a9f79cae9409ff32aa18674a40a0e2fd0fe1
-DIST botocore-1.20.72.tar.gz 7719833 BLAKE2B 23bdce05a95ebcc162e26e91923999ba50910f2fd1d78830c64ee4cb685b2f58e0f14b71c22d34973e2588590fa8af35868f696bbe7719f710baad49d7d1753d SHA512 d46cf353c1df60e24e8e3def8ccf4821bbc36366d25c073330133e4d6ebf83491c5d82dd708c14df65ebbcc08c7705fd3d1d37339742719bdaf58678e04d7824
-DIST botocore-1.20.73.tar.gz 7725102 BLAKE2B ccb41513630d8016718cba5e7cc172efb985688f8537dd7f434707f05f9222f486a42c3c84cf25edb437836f04d5ae024292a15a2e784c600bbdebf7dc34d9e3 SHA512 7b1fadcc4e337f0c7498b46cbc0779f20ceb864e2b3974c15a947f18925691ecaaf455bfd7de153d26632a2035a1f922c64320887d06203285947b4310f07e10
 DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
-DIST botocore-1.20.75.tar.gz 7750681 BLAKE2B 4cf5700ccdd43a7d963fc60c7e0db5204947e6d3c63747882fa01856ab4e97bba5f4174a8f4252e3389d6aa6436473f9124f445a53b2cc4233b8d7ed22cb5fef SHA512 736f9d8e4875fd273e73e25ba791117c146c0facdd68970f8d2127245805383119178faa4c91d9dc43ec045e59bf39dbece40d6946013ce9c8ac3c5d1ef9bd84
-DIST botocore-1.20.76.tar.gz 7755457 BLAKE2B 26246a4118ce32098676b4933548792a7a5290866c53876053c6f509d1695b467bd7a63d994020ab4b8c85b7beefd9e7b06fa6509787d954c2e0e1d16783b7f3 SHA512 43a74493ce3a69d621c8adef18bb39aece146a83a75745ba79216ab839161095c05ed53c1a00edcfba291e7321d28db107c3baee81ae970d5768c2f6dec79c5b
-DIST botocore-1.20.77.tar.gz 7758363 BLAKE2B a441fc84ce0095cbad1df59c26c533c38068574d1a5b3ac68091575d607d0ab5954852a1c82eee1bb394ed8e6789076d9a8ca2afdb02c6e492dbb2f22c8c3e6e SHA512 840b5cd6356ce3d716d8f04ed7a04e5169336444b4f3ad114e1d8122ce999f26ecb57f51c7afec33856ae0f6d68d9a5966a5ee14f1341a144586f0fa2ebfba64
-EBUILD botocore-1.20.54.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
-EBUILD botocore-1.20.62.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.64.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
-EBUILD botocore-1.20.65.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
-EBUILD botocore-1.20.67.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
-EBUILD botocore-1.20.68.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
-EBUILD botocore-1.20.69.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.70.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.71.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
-EBUILD botocore-1.20.72.ebuild 1503 BLAKE2B 2f456cdece7e542d46b34789e230f2f30ccd8579178ed9d640ea803c96f0c7de7c2cb52867969ec3e7007724ced5727410ec3a60f3249540d594606db11cd528 SHA512 1469588294ee1f8c4bbffd3879797e8865e56cc8d2dc750669be7993e34ed488677474ea654f4ddfc449b0aaed0e733fbec043fe87d4341c726ed2131bf21b7c
-EBUILD botocore-1.20.73.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+DIST botocore-1.20.78.tar.gz 7758829 BLAKE2B af13d6c1aa918e2c49c6dc931c9a78e1899c83e62657c063e20ba2a5544c48e4946018628e47d6a56db456a3a8d43fe3b577824bd76bbc339abaef375459932e SHA512 fc96ed8b6b4af05404654e470a4f83419b885fa32d9dc704727f4ffb3d5deeefa752d235b37fd81448b7f3b101bc0f8e7ea09ae8641f8961566f77f6a039cef9
+DIST botocore-1.20.79.tar.gz 7763400 BLAKE2B b49dbc848980312b1a8f42514bc37b9bd8e2d27252402042835302aabac4c6fbda6a49de409d5ea5b8f630ee044f50ab01de95919c2b9aaac8292d2c04e99331 SHA512 acbb9118dec30ef8389f7cb65660a927f64819e7d2f9902bf5ff1d36c55b974f42605ec25244a95904df4915113df92a9638c0df8d7a6c038885cb520659c424
+DIST botocore-1.20.80.tar.gz 7767475 BLAKE2B de8f7f6575e9e5a7f7e8ad0adeb886be77697d37a7aad1828cb69977d4914129c6c786da74447f8cb93514546c3c85f91e439ff08e6972047b9c164828850cda SHA512 7abfdec5450a24b5c576e47409cf311581bb909853b887a9770dc8cbb5aebb25cd9fde3c3a904d66bb69969e49ca00cef2fd11d2ddedef204b2d51feb89513cf
+DIST botocore-1.20.82.tar.gz 7772021 BLAKE2B 09fc32ba42275afde8332287825e954bd5bb8b7f5bea00666f73baf60297bd972b2ec6525f1d6e16e22bb23e233b619fecbb666dcdededcc07a016c9763ab774 SHA512 227b7160ef9d945d00efdcdfaa60ed85d50b183fbeded816e6185b8125b32c2fa0eee9dc473f83f977c0de2139eb042f3338eea37081b37d480edd7c300b641f
+DIST botocore-1.20.83.tar.gz 7786168 BLAKE2B 1bd8864da814ed502c4e0860d8c7a82c6c15d778f2aafc333ffe6e64f45398c173ad7700f9fc90a9fbf4b91f8f77b5494619bdc6e4bda1dcec6cef8d496327c2 SHA512 7ff1c73d85e02cc1f2de1de915d337369681e28ac44aba5cfb29df6bc4377f664170844ed8caeb7e50c97d127d1e9caac08fac18724046a7f1450cc7ea212b4a
+DIST botocore-1.20.84.tar.gz 7792555 BLAKE2B e9459fad976bb81541ce933666edccdbfe9910674cde9f23b264388845cb3e98cae77639a3333cb3fec00c33602af8fea82681fbd387775ff9ed47245e4d0e4f SHA512 da19ffb81c24c2e7a10c5e0647179f36ebf89c097f795cb16d723a3e0311a81e9c835b7b3795d02047d084a098507f4b6e0cc502129877e4258691a6a6ee1cee
+EBUILD botocore-1.20.54.ebuild 1541 BLAKE2B 2a87a90a023a6f4a203b686d8ebff52dcc013ecd083a103e6b77f9f738c4cd9fbb04d6c8a63311aacb867f46328676c296c0ac0fc7c8923eeea6b310295a9bb2 SHA512 293c8a55e0f1c424026e395c05e901ce2f233a42b1105d7ec03c85a99c7f111a4701553598e009210ac6f7517ca7d9849592b81ca7ec62d99265972a7dd5cd00
 EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.75.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.76.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.77.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.78.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.79.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.80.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.82.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.83.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.84.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.54.ebuild b/dev-python/botocore/botocore-1.20.54.ebuild
index 51bb10d67391..f1e8bd15b0c3 100644
--- a/dev-python/botocore/botocore-1.20.54.ebuild
+++ b/dev-python/botocore/botocore-1.20.54.ebuild
@@ -34,6 +34,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.20.64-bpo43882.patch"
 )
 
 distutils_enable_sphinx docs/source \
diff --git a/dev-python/botocore/botocore-1.20.62.ebuild b/dev-python/botocore/botocore-1.20.62.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.62.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} )
-
-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 ~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.64.ebuild b/dev-python/botocore/botocore-1.20.64.ebuild
deleted file mode 100644
index f051cb0e68ac..000000000000
--- a/dev-python/botocore/botocore-1.20.64.ebuild
+++ /dev/null
@@ -1,60 +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="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 ~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"
-	"${FILESDIR}/botocore-1.20.64-bpo43882.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.65.ebuild b/dev-python/botocore/botocore-1.20.65.ebuild
deleted file mode 100644
index f051cb0e68ac..000000000000
--- a/dev-python/botocore/botocore-1.20.65.ebuild
+++ /dev/null
@@ -1,60 +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="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 ~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"
-	"${FILESDIR}/botocore-1.20.64-bpo43882.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.67.ebuild b/dev-python/botocore/botocore-1.20.67.ebuild
deleted file mode 100644
index f051cb0e68ac..000000000000
--- a/dev-python/botocore/botocore-1.20.67.ebuild
+++ /dev/null
@@ -1,60 +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="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 ~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"
-	"${FILESDIR}/botocore-1.20.64-bpo43882.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.68.ebuild b/dev-python/botocore/botocore-1.20.68.ebuild
deleted file mode 100644
index f051cb0e68ac..000000000000
--- a/dev-python/botocore/botocore-1.20.68.ebuild
+++ /dev/null
@@ -1,60 +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="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 ~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"
-	"${FILESDIR}/botocore-1.20.64-bpo43882.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.69.ebuild b/dev-python/botocore/botocore-1.20.69.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.69.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} )
-
-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 ~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.70.ebuild b/dev-python/botocore/botocore-1.20.70.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.70.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} )
-
-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 ~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.71.ebuild b/dev-python/botocore/botocore-1.20.71.ebuild
deleted file mode 100644
index 4e5d698e619b..000000000000
--- a/dev-python/botocore/botocore-1.20.71.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} )
-
-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 ~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.72.ebuild b/dev-python/botocore/botocore-1.20.72.ebuild
deleted file mode 100644
index 27be94b24acf..000000000000
--- a/dev-python/botocore/botocore-1.20.72.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} )
-
-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 ~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.73.ebuild b/dev-python/botocore/botocore-1.20.78.ebuild
index afca295f8bed..afca295f8bed 100644
--- a/dev-python/botocore/botocore-1.20.73.ebuild
+++ b/dev-python/botocore/botocore-1.20.78.ebuild
diff --git a/dev-python/botocore/botocore-1.20.75.ebuild b/dev-python/botocore/botocore-1.20.79.ebuild
index afca295f8bed..afca295f8bed 100644
--- a/dev-python/botocore/botocore-1.20.75.ebuild
+++ b/dev-python/botocore/botocore-1.20.79.ebuild
diff --git a/dev-python/botocore/botocore-1.20.76.ebuild b/dev-python/botocore/botocore-1.20.80.ebuild
index afca295f8bed..afca295f8bed 100644
--- a/dev-python/botocore/botocore-1.20.76.ebuild
+++ b/dev-python/botocore/botocore-1.20.80.ebuild
diff --git a/dev-python/botocore/botocore-1.20.77.ebuild b/dev-python/botocore/botocore-1.20.82.ebuild
index afca295f8bed..afca295f8bed 100644
--- a/dev-python/botocore/botocore-1.20.77.ebuild
+++ b/dev-python/botocore/botocore-1.20.82.ebuild
diff --git a/dev-python/botocore/botocore-1.20.83.ebuild b/dev-python/botocore/botocore-1.20.83.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.83.ebuild
@@ -0,0 +1,59 @@
+# 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="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.84.ebuild b/dev-python/botocore/botocore-1.20.84.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.84.ebuild
@@ -0,0 +1,59 @@
+# 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="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/bpython/Manifest b/dev-python/bpython/Manifest
index 5cb911431d3d..5dad012bb909 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,3 +1,4 @@
+AUX bpython-sphinx-4.patch 393 BLAKE2B 09bddc348da1ac845554edc57ba37a6eb9eaa748c86647cc437557784ebb924b25ae80a7830ecb80ed73bfb6b06bf3fda2c124e9e1577b51b6322909e324ccdc SHA512 fb72027c11e52222adf25212299dc7ff3d2ee8710997d0f5f3882038448c57173a49e6619989bf0273b8bf8be676b8a7d1caa6860356d56d7421e30e2417fa4e
 DIST bpython-0.21.tar.gz 208206 BLAKE2B 22db7abe3786df337af50f6217fa8c6702871b50de41245797270e70622084a22b3d6615cfe634044599a532c5bc14677b01dc77042d228213eaae2cad11b623 SHA512 a0eea1b9c2329ce5665456e99703ef476faab38f880eb8a330a6536970888cfdaada9f0e377d3c1acd8b6c79eb0c562ada43e82bac9df4cce5878594c3399ddf
-EBUILD bpython-0.21.ebuild 1079 BLAKE2B e7cb5b64662249b44f4bee04f2b8d69066598dc71e1569323b7a48410f3bbdfce738d999b4944e1400922c26521feaff3d1673ed631ef278574ec8b164363659 SHA512 b15f1553e48c38cdbae7ec9b1e2cc2c68ad70950df3cc0a521b44925419c7cf7bd5ea13dfbed32c8b23a910eb3805a8ac826c592b42598da4960e4637b355a80
+EBUILD bpython-0.21.ebuild 1127 BLAKE2B 4c5242c369be892f053269446169cc2a17a1a5fd9adb6fc1059bbc9c30c25448c59d4b380f37e62d3a7f09b4e5bd02091a845cb222c6fa6ccbdda7a120e69a43 SHA512 ac7234686089bc808e05694472c33e01f64adac9a951dab35bafe6f3b15db59101937e4bcbf82236ca40e2c04ea1605dd00e03aad84be5950878020ad6ca8d31
 MISC metadata.xml 496 BLAKE2B 77aef739a6085a972a41cdb41f7c1a9c70d8b80eb3070a1c132f18fba666bd9ede3f1f804064e51384b3173e47915f7172f8086c2d1e3a95177abfb91b8d0ad8 SHA512 95c4ff0de7773693c3c4f1f9c19623318037cc735e54f6669fbf33e2856834e09b15e09df1771a5a28d75de3eaab409da8cba91658eadfd94f848eeab07a623b
diff --git a/dev-python/bpython/bpython-0.21.ebuild b/dev-python/bpython/bpython-0.21.ebuild
index d82bf1719c22..b89b73167409 100644
--- a/dev-python/bpython/bpython-0.21.ebuild
+++ b/dev-python/bpython/bpython-0.21.ebuild
@@ -34,5 +34,7 @@ BDEPEND="
 
 DOCS=( AUTHORS.rst CHANGELOG.rst )
 
+PATCHES=( "${FILESDIR}"/${PN}-sphinx-4.patch )
+
 distutils_enable_sphinx doc/sphinx/source --no-autodoc
 distutils_enable_tests unittest
diff --git a/dev-python/bpython/files/bpython-sphinx-4.patch b/dev-python/bpython/files/bpython-sphinx-4.patch
new file mode 100644
index 000000000000..5003de24bcf6
--- /dev/null
+++ b/dev-python/bpython/files/bpython-sphinx-4.patch
@@ -0,0 +1,8 @@
+diff -U2 -r bpython-0.21.orig/doc/sphinx/source/conf.py bpython-0.21/doc/sphinx/source/conf.py
+--- bpython-0.21.orig/doc/sphinx/source/conf.py	2020-03-30 01:44:23.000000000 +0700
++++ bpython-0.21/doc/sphinx/source/conf.py	2021-05-22 21:06:51.161746459 +0700
+@@ -215,3 +215,3 @@
+ # If true, show URL addresses after external links.
+ #man_show_urls = False
+-
++man_make_section_directory = False
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 38d4ca61ef63..1ea188fb7088 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 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
-MISC metadata.xml 1227 BLAKE2B 13111faa6d25ce2370abe62b735b3686372e66e545542c94cd53622f4cd6fd2b1c9ebaf1f521e4fa6aa9564c4a5f84ea7221beed7abab8455b9bc7571c29b22b SHA512 3476ee8191e6b0d1e4ab7b7b9765852573182f5e2476f24e209c0aabe21d82e66ff180298602efc75de9083fc3504981097b56197c7045e00eaef132c762ef49
+EBUILD bracex-2.1.1.ebuild 1049 BLAKE2B dd4110fe090f59503599f248f7ef26cae5dc5e419f1723b8a7c9d57be5a9a11fd72676045b139a9145cbc47774361697a1b254fb03e392dcd78bb1db8f8eb21e SHA512 fcffd84b07718db713338dfe8c5093e40efadfd7e2ffce3e65f356df446c65e82a8fc342bf45c9285a38f31fcd9e2b0e29249c6d940e3ab924169e6073de6da6
+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 0af93ef28dda..14f6cc11376c 100644
--- a/dev-python/bracex/bracex-2.1.1.ebuild
+++ b/dev-python/bracex/bracex-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -18,8 +18,8 @@ inherit distutils-r1 docs
 
 DESCRIPTION="Bash style brace expansion for Python"
 HOMEPAGE="
-	https://github.com/facelessuser/bracex
-	https://pypi.org/project/bracex
+	https://github.com/facelessuser/bracex/
+	https://pypi.org/project/bracex/
 "
 SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
index 8badec61ee20..106da756d0bb 100644
--- a/dev-python/bracex/metadata.xml
+++ b/dev-python/bracex/metadata.xml
@@ -22,4 +22,5 @@
 
 		Bracex actually follows pretty closely to how Bash processes braces. It is not a 1:1 implementation of how Bash handles braces, but generally, it follows very closely. Almost all of the test cases are run through Bash first, then our implementation is compared against the results Bash gives. There are a few cases where we have purposely deviated. For instance, we are not handling Bash's command line inputs, so we are not giving special meaning to back ticks and quotes at this time.
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 9d7c7a72cf4c..b4de58c8ed44 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,5 @@
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
 DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40e52c21fd90d026ce0aad706830b98f10a226bdc23b819d3f1c52f93f25892a1de04f2a673b4d150a5c47fa SHA512 05eacace46c4b2f7025f12613ae6a755aa7fab14f15d0131d4d856ec5c37bea547d3c4a8afdde28c8653139be741f47351de5460df7dd3ec662325c8d1e2f3fd
 EBUILD cbor2-5.2.0.ebuild 894 BLAKE2B 36b608216833f231b1474c89d4eb003114e1b1de750ff2044aab51af212c48010275d67ba2849063bed943b423d6cede889cac39bd0f0b215dddd71e213a138f SHA512 32d3439ee5126da0d3574f81683c1b776a8814e7c7fe084f12f54dafaec703c6da3cd10e365ff371bed5a24e5da954399724cf6384417cf69e384fd85a12700f
-EBUILD cbor2-5.3.0.ebuild 899 BLAKE2B 891ce27fc81db3a0919f1d07ff263ff8ce877167cc67a239665d624fffef815aa6b7ce8dbb2b71a7652ad284cd174dd868e93ad252ccba029f424284bdb42939 SHA512 ac98609861521912d390393af8faebbad69c8c53849ed86c2ec4a7aa4ce72671c0932a93db44fe384425b1398e4ccb887d49d6156f6dd66e07b2f01fb6f97f21
+EBUILD cbor2-5.3.0.ebuild 956 BLAKE2B d084c44504bc9bcaac1425ed500f4f4f7aead2791155ccf06f46816693775c30f3f0694fd05ce0681638ddbb515aa0578237c92762db35b8e0a9f1a29518d414 SHA512 ccf5ed460c7fb3bd9a751bc9183fd2bca5cc456d4d3ff9736d7796c0b8ecafb42e1badcbfd64ef59d6ab7189d001783060d9cd551dcf553b289238aa796ad196
 MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.3.0.ebuild b/dev-python/cbor2/cbor2-5.3.0.ebuild
index 36bd7a9475e0..08eedaa0341c 100644
--- a/dev-python/cbor2/cbor2-5.3.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.3.0.ebuild
@@ -14,6 +14,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 54cc779d7f08..88d1fca23014 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,5 +1,5 @@
 DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
-EBUILD cfgv-3.2.0.ebuild 457 BLAKE2B d5cb4e59f393930f8082a948aaeecf92245e0a670ddaa664ef77f49613265fbd5df3a00728a939802f1792ff4fc1150a4cdc3187e4309978ecbc9b5948ebdaad SHA512 8df2ae37ab96880cf0e66f16409f3c87b317b7bc3004d2f552bfb343c3a1af4e051f1183e4f5653a9f23220394583e3a96f30f480fee7ad2df8d5770b393dbbf
+EBUILD cfgv-3.2.0.ebuild 456 BLAKE2B e05dee33306e8a1614973a910f30fc125cc936b1a47d30404cc53575fcebae3a64f0fa99c86cf438398ccbb218bdaba4e7a25b2474b08aa0bf03a8fd66c2ce68 SHA512 336d131a92694089dc237834c88a4f7170c397fa4ed3bfef5feef52356b86946ec4891a2298e5bf6d9296934591e0199333a5aa19f9ac63b80f53f0e74df858a
 EBUILD cfgv-3.3.0.ebuild 457 BLAKE2B d5cb4e59f393930f8082a948aaeecf92245e0a670ddaa664ef77f49613265fbd5df3a00728a939802f1792ff4fc1150a4cdc3187e4309978ecbc9b5948ebdaad SHA512 8df2ae37ab96880cf0e66f16409f3c87b317b7bc3004d2f552bfb343c3a1af4e051f1183e4f5653a9f23220394583e3a96f30f480fee7ad2df8d5770b393dbbf
 MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.2.0.ebuild b/dev-python/cfgv/cfgv-3.2.0.ebuild
index f99bdc112346..e03fb393efe9 100644
--- a/dev-python/cfgv/cfgv-3.2.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.2.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"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 908b901e488d..2acc2b4f54b1 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
+DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
-EBUILD clang-python-12.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-12.0.0.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
+EBUILD clang-python-12.0.1.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-12.0.1_rc1.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild b/dev-python/clang-python/clang-python-12.0.1.9999.ebuild
index 921f7735340a..921f7735340a 100644
--- a/dev-python/clang-python/clang-python-12.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.1.9999.ebuild
diff --git a/dev-python/clang-python/clang-python-12.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-12.0.1_rc1.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-12.0.1_rc1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 22db30efad23..c7f326a6e09c 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,4 @@
 DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
-EBUILD cli_helpers-2.1.0.ebuild 658 BLAKE2B e0f13c418a4a042d2c5ceced97fd7b5f8dc60bb860b376313a92ff43a269c450dd0b4b9fc56a75302a1c9905a9b79b33f5fad0ca31de4f32cdae61ba5a1e2cdb SHA512 080137b9660d748d350870b50c7fc9d363534824bddcd51fca1083cbaf5c6b85414020e7ea33d21ce52e2debdc80f1a1d2965fa2cea268f27ae82b66712ca91c
-EBUILD cli_helpers-9999.ebuild 587 BLAKE2B 76794dbf96a0a3da0121762c94e189d6c3c6a4fb17ae52eb48591736ebeba5154d83016d5cea74c3a36b1675280d1ba4b336fcbe205486c30f4fba5d5ba9637e SHA512 a132098d1757ef229b2507665e4d0317c36b4665093303bb9b15ad4e81e01a69fd0838e706da719c210729659f83767e5cb0305b7942716b68f193d81532232a
+EBUILD cli_helpers-2.1.0.ebuild 659 BLAKE2B 1a0e3145b9979a5c9e0417f41b67ff5b185536ac0520f57671d5fb9cf0b858b362a0f5d6d3f7e0e8e8e2e3d00bdd66ecb1849adccc4f92c5db259c72ff93c98d SHA512 cb1b52ef15cfbb4e908c0cb7a1d0881a6f71232207a8eeae0f074b5d409bc9611d463fb0dc3dad64ba5fcefa8d8ad70b580095b8bb8f430a93f58a7119855069
+EBUILD cli_helpers-9999.ebuild 641 BLAKE2B f07a3f78ada7409a32b32c74b6892192a90fad594d958bd6fb4b48682e1463731780f016cf61b2113d6519b63ce9e4dbf2262c253f39a9ebffea61b15553a0c1 SHA512 fb46213585db5f4dc14170b4eddff214518dc749ad2e53860d999bea860e0ebca8478d948cbcd47b47961acc8d6f244e3992546e820250b1793b044ba4bc7c68
 MISC metadata.xml 456 BLAKE2B 3c7bef25195fc639bb4bcbf6edf7236e18c8b338e9327673da6b4aca9778363115ff3f271015d01b98fc4728028b751ae9d55f85f3375adff20862f6b6a9706d SHA512 c3d592c696302e6e11accf1b50853e6f114c5de063ceb02d22eb23d3e8af338a0222d9615ab689825f483aee1156acb939ccfb01c1fe768571ddf137a28e3e95
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index 8e9c61809ff3..9abb01e46053 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index 52c7cd0046ae..f36ceb139659 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
 inherit distutils-r1 git-r3
 
@@ -18,7 +18,8 @@ KEYWORDS=""
 RDEPEND="
 	>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.2[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index d4a3db9a8b55..d96c705f4265 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,3 +1,3 @@
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
-EBUILD click-log-0.3.2.ebuild 533 BLAKE2B b5dbefa10c70f06a4b5be86561b11f29d0c27f1ebe54916fcc3b1b7aa5aedd0b9fc49bf58f1be72d8e8fce2863708ebd591d29768915b9aa2aa5e8ba91f36743 SHA512 66ff945135d51d23ed1b8c19cbc40f6c22743e48beb96e7db0116eccc9769239d6896de6387cd0a7b7c2e0d54da18e07c1f6fefa95a919f4f65e8033cba78816
+EBUILD click-log-0.3.2.ebuild 516 BLAKE2B 37ed8f659b17910607b2523e86f8453891bc783f06691de81530488803be1d4e53c7f134cf58cedcbcea055a8d1e264dd128fc9975d97ed3e2bcf2db9c238f48 SHA512 025be8dfde864f95c94c1312149a265943e5971e3d5bf1054dd936201940af021e278e566750de90d73321ef20787b6660dd1c8a0b88abda91a298ce5836a1ac
 MISC metadata.xml 352 BLAKE2B 074401e90afb56f3ff7629b43ee84b4e349ce3ebad89331458881b954598d3e47be78aaa4743c206df472be0fd1b8528f32290db769249790612f75943f2e618 SHA512 33cf781998cb3d633b4d09d276b882f189027a273b36f46919e0eec88e4592d8af10753fe5f690988f7cb59323d8d31d5ea4a980460810de99b166d5dc0c2c55
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
index c11e7e900081..c2738800aee7 100644
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
+DESCRIPTION="Logging integration for Click"
+HOMEPAGE="
+	https://github.com/click-contrib/click-log/
+	https://pypi.org/project/click-log/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -15,7 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index 0f26aefad039..d3d420070824 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,3 +1,5 @@
 DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
+DIST click-threading-0.5.0.gh.tar.gz 9836 BLAKE2B 245c63476e58cd370ec49275a4a8ff8007d71386328c2631970a0bf9ac0b81c14150966a3cab54a7616dfc1fdd5e5b3f601fe1e08d1c9c65ec168b96b6b773d5 SHA512 134daf779a56a18cc36a94cd6818801896f171ad91f0b34995d92de5ccd62ea61b7a4fcb0afe2634e5fe80869a616263952e687c5d8d490f17d1d27d00ab3fe2
 EBUILD click-threading-0.4.4.ebuild 592 BLAKE2B 6a73c50f92e8354f72def92ace6ea2324ad5b9a13ece58d6c33d5c590690413ff2786b85d05e42a1a2190a8d7cbad8a05a95f1171a929b4c7b542c39fba5890b SHA512 0ed381d2b1037d1a75324294db5e63b5dad0ea4c854833b0cf918f2a27a267aa433b861ec94db1d5e85d3ea0ca3e6a92eeee9df0ab3dcd09f1203dd619568919
+EBUILD click-threading-0.5.0.ebuild 580 BLAKE2B 0fe80bf462abb6c225373cbc0d4277cb9ebea1da9a29d42c761c575efc2c75a43741984e8553b0599cd212bc7965dbb423fbea578a4caf587ff8cdfff9c2b829 SHA512 86956ca04eee5e728a407689609354dface3245fe5b142a5c8fe4f3a84c57084e9e6c7c9a1936e8fa94efe49cc7fdf19c093479f068658cdd5a0acd4103ca8b7
 MISC metadata.xml 364 BLAKE2B c32b7b0c548c7443487f628dfeb3b802807830ead46824d1aed757130ff614755890632afd33101de65b939d9a7fc34cb5cd5b236ef60af14c03f55938a95ff1 SHA512 e78befa435da19a782ca4d10c229602fbd0a7cee69a1bc8bd2bfb7c1de6bc3e5f36a7c18aee7400aa57bef8b5bfc66ef685e58db9a74b897c4c1059fcdb6d4c5
diff --git a/dev-python/click-threading/click-threading-0.5.0.ebuild b/dev-python/click-threading/click-threading-0.5.0.ebuild
new file mode 100644
index 000000000000..ff843180f887
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.5.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Multithreaded Click apps made easy."
+HOMEPAGE="
+	https://github.com/click-contrib/click-threading/
+	https://pypi.org/project/click-threading/"
+SRC_URI="
+	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 0e6bbbab2c59..684a97a8b818 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,5 @@
 DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
+DIST cliff-3.8.0.tar.gz 81862 BLAKE2B 3a8219f822fdf14e1de56204b0f536a92d27be5a99fb628f3aed5b569a1e703d4711bdded28fa42c0692316454847ba3338baac8efae873540652e46d155227a SHA512 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
 EBUILD cliff-3.7.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
+EBUILD cliff-3.8.0.ebuild 1166 BLAKE2B e89da7bdd0205270da5e3fc9e42c6465004edf82c46933f4024a5ad039db7ffc29f93351266442031a89c6b3c5484e7220427cd819dec08feea5beefca6c8a83 SHA512 1931493eea1badeca99161b6fcaaddafc7d4106204e3e9cfc8e6de861976d5e6cc5643d020701b5f96c255b88533ea7699c56a5f904f5ddeceefde5058b6014c
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
new file mode 100644
index 000000000000..fab20af93f82
--- /dev/null
+++ b/dev-python/cliff/cliff-3.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# TODO: revert to rdepend once this is merged
+# https://github.com/openstack/cliff/pull/3
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+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 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index f5fc562ddbde..c06824289c3f 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,4 @@
 AUX clint-0.5.1-disable-args-dependency.patch 417 BLAKE2B 182c61c55e2d0d573ab62bcefaa6c31a43e9c6ca11c1fd4a2a36ff7917198b90e09016d877d368bddb6234996bb85d3517825d4bbd8b0a48e594d3e987e71ce7 SHA512 294e21ce515bbaf2949cf0da5c1c89e2dc9a1c4556a52c2a2d3ed360cbcd22891cfa103ed97abc59f5498e08f38995c3986b42dcbc7e548b87076d7e3dc574cb
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r3.ebuild 814 BLAKE2B 80939e28f156c4cce35b43ccf859ddba09d0a27b0f68f7141bfdc3696e25137ceb05fb95dd290ee7b316a0045b9a27cde8318999b441d01f8744ef79e5e03e33 SHA512 e6093baeb5ae1e827df7fd8c7d0c7335b682186e1eb1a4400e44843162a08129c74c100958ecfd2b17ca0642c3e82e163754cdd0ff69c83bf85187a8757ac834
+EBUILD clint-0.5.1-r3.ebuild 814 BLAKE2B fd5d85e151a4f0a0fd68eefefe698edbe14f1f4ba93831387ce2169c62b54d9a5289662a2102a06637f294dc044e8303b226500472fed0d61f726936db75d953 SHA512 77275ef23e71b46e90a4c6308f8f3aff3b91fc705191bea238f61831da1e936ad95c931040e028c8a953615dabab04cc58ce4b3e8abe19374492f2cf91c04d97
 MISC metadata.xml 299 BLAKE2B 43e7d81392bd0ae882571f0ca4e0dee2bbe3447e1df1e84c36b77f2c8d8da4c27fb085bd10189b7009450a1378778981a7d332f6cbb7674c08f1cca622140d08 SHA512 7827c04d5742ea61c2bc614b09595e79a19634f47e63c4f2840209a1f8731f69346c3bf7abc146fec791b8de3b34201a0b9c63c0458ab1f2501bae55a4bfb924
diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
index 381bb44598f5..ba94740f0d82 100644
--- a/dev-python/clint/clint-0.5.1-r3.ebuild
+++ b/dev-python/clint/clint-0.5.1-r3.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/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
new file mode 100644
index 000000000000..03876430e774
--- /dev/null
+++ b/dev-python/cloudscraper/Manifest
@@ -0,0 +1,3 @@
+DIST cloudscraper-1.2.58.tar.gz 110992 BLAKE2B b3e002d559ebdbb07686d74fe9967776f832397758653c2d6fe8ba766239d5744608fe6f321a0284c1da02a1ddb8257d7ce1931bb5adf71096e4151dbb9cb2a2 SHA512 bab8a9b00e891d2e0b982200de1a9a8fd800f554bda02624a963d0de19388880c4abf2ee32944177853eb7cb14e67521b0591e8d9430d1789425e67de9f1d467
+EBUILD cloudscraper-1.2.58.ebuild 1005 BLAKE2B dd3511ea35eef38a0c545899041438c4dd651370dc97f933ae591e1e4bea721e21d39623ebcefdc7fe97343c097dab5491913fb68c4a95660c537ba2ead0015e SHA512 d1e082baff85c385d8e7340bdf0160dbbe2f7a07dadaa945d8608b9186a67c7bc9e8837398abfcce7964c5d349923dba25db5d8534aef4c13576e89cf0a7170d
+MISC metadata.xml 748 BLAKE2B 8e69962d0d79bf51fb0b22d27969c02a65debad1df7236f3a718714e1e16c28dacf2497c89472b892f0bb9ba5023850349fb14aa8a0e1dbfa71b806c73cf0bd4 SHA512 80b54664d6557cb514a436afb944e7b654b5472348f0bd5a2051d647b0417be4f3dbf96e6b4a67d45907697c686c2e68878be839f6b4e0236f1a35ee91d4c7d6
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.58.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.58.ebuild
new file mode 100644
index 000000000000..c48e402f633e
--- /dev/null
+++ b/dev-python/cloudscraper/cloudscraper-1.2.58.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A Python module to bypass Cloudflare's anti-bot page"
+HOMEPAGE="https://github.com/VeNoMouS/cloudscraper"
+SRC_URI="https://github.com/VeNoMouS/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/js2py[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "brotli decompresssion support" "dev-python/brotlipy"
+
+	optfeature "js2py interpreter support" "dev-python/js2py"
+	optfeature "node.js interpreter support" "net-libs/nodejs"
+}
diff --git a/dev-python/cloudscraper/metadata.xml b/dev-python/cloudscraper/metadata.xml
new file mode 100644
index 000000000000..908f6165a7b9
--- /dev/null
+++ b/dev-python/cloudscraper/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>vaartis@kotobank.ch</email>
+		<name>Ekaterina Vaartis</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		A simple Python module to bypass Cloudflare's anti-bot page (also known as "I'm Under Attack Mode", or IUAM),
+		implemented with Requests
+	</longdescription>
+	<upstream>
+		<remote-id type="github">venomous/cloudscraper</remote-id>
+		<remote-id type="pypi">cloudscraper</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 78575b07a9a6..425f4e9a0027 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,3 +1,3 @@
 DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
-EBUILD cmd2-1.5.0.ebuild 1406 BLAKE2B 59f9dff3907bd69222f7f9f9cd1fcfb03cf08cad75ee951942b58dd29fa9e4b950883631f73b079c1b887fd348ce71b99bcc66a959fb831f4f9114f1b984925b SHA512 313d412dd2e175657668e9b250541b9d2caddb3db078fccd35a75b20e4d5e08a0ca9523e26dceea0c359d35fa32f7281344397e5faea30db519ba4a7b0b8089e
+EBUILD cmd2-1.5.0.ebuild 1412 BLAKE2B 5e7640c0555dfa7f8b441deadc7fbf444f6ef7de931d070966695f9e6a5d842dd9a84d4108109fb38f13fa5f53ecf7b276bbec5af5bfa8f5850a777af6868a63 SHA512 aeda875bc85e14c6667953dcac3a1ddf14ac5a7a255ad7d7f46a1b2ee376528d13deb2e5c2b84821a53a1f845743818e614202adacf0bef49eba05054a173cdd
 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
index 94981d9a869f..abb40a0a9bf7 100644
--- a/dev-python/cmd2/cmd2-1.5.0.ebuild
+++ b/dev-python/cmd2/cmd2-1.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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/colorclass/Manifest b/dev-python/colorclass/Manifest
index d2f0d6d146ad..7c7dbcf5d1a8 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,4 +1,5 @@
+AUX colorclass-2.2.0-fix-py3.10.patch 1141 BLAKE2B 3ee06d510c39af677977203af1e1ac8f7de50ec93afc9540de45ae62e6ac480b5d0a58407845b92edb193ef014f42fa8132a141a8698bf5499fce4e71e9dca67 SHA512 70d7e9cfdc6647c77ca0e36407cea51f7ead276edf9e41201ca307a282ac36acf0d5bb622e2e76f76e58ec52d2e91c201b1b2490565e3698aff42852a9520acc
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
-EBUILD colorclass-2.2.0-r1.ebuild 568 BLAKE2B ecc8711e5b363305526d6a2044850caee04ab71de6fe2fb6b8d387d2a3c9840f4eaf196b7b7e1add47f7b9811c48e7e4a5207b88f728cbc022c253c21333caab SHA512 23b14673a2b884cd1a99253c97f667c21d8288c3ff91f865b400d6cbeed1739cf3fdf8883e23138a04b6fa685be5a6590bf04624ba9e7cbc2645cf2e4ab83264
+EBUILD colorclass-2.2.0-r1.ebuild 594 BLAKE2B 84541c2864698d0df1a5fba5cbbd810c9f0d7fbbc52cf57d87ba9d2983839a8a34df6d590351cc2d954f4be1c415c6948f971bf86a368ff72b1a2a00c6c293d7 SHA512 591c3ee088ffb41f135bb1962af3435b8da17d0ed8606a6e2a6c3c0440fb4f3d33c8216f4399aec330cfc81ce44ffdcb865d592b53f1cf7ee0ea1b1e68791766
 MISC metadata.xml 374 BLAKE2B 1656d6f1d6a6d8bc75c1f2d9b790c85a5992ffb94f8bf56cac32dfd07833f8f8417b782f9418515c15bc0cac48659409a11a087ca8e839e1ec7743349727f511 SHA512 9ce3b60ea6e344f10daff59046d494090ef274cd905419dcfcc4f1e0a6f353d959d51ababd9744e9e1f0377452a5cebd52b5760a27fe55d3bf2b4e1500790551
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
index 8f1559141ef3..fde6c8c536af 100644
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # 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
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=(
-	"${FILESDIR}/colorclass-2.2.0-tests.patch"
+	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${P}-fix-py3.10.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
new file mode 100644
index 000000000000..ee67d6d40bb3
--- /dev/null
+++ b/dev-python/colorclass/files/colorclass-2.2.0-fix-py3.10.patch
@@ -0,0 +1,28 @@
+From f8bbe9fdcff1d97b1d0e5dcb94680923cc43a507 Mon Sep 17 00:00:00 2001
+From: Ralph Broenink <ralph@ralphbroenink.net>
+Date: Mon, 24 Aug 2020 14:49:24 +0200
+Subject: [PATCH] Make code forwards-compatible with Python 3.9
+
+Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working
+---
+ colorclass/codes.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/colorclass/codes.py b/colorclass/codes.py
+index b0ecb03..8b6085d 100644
+--- a/colorclass/codes.py
++++ b/colorclass/codes.py
+@@ -1,7 +1,12 @@
+ """Handles mapping between color names and ANSI codes and determining auto color codes."""
+ 
+ import sys
+-from collections import Mapping
++try:
++    # Using or importing the ABCs from 'collections' instead of from 'collections.abc' is 
++    # deprecated since Python 3.3, and in 3.9 it will stop working
++    from collections.abc import Mapping
++except ImportError:
++    from collections import Mapping
+ 
+ BASE_CODES = {
+     '/all': 0, 'b': 1, 'f': 2, 'i': 3, 'u': 4, 'flash': 5, 'outline': 6, 'negative': 7, 'invis': 8, 'strike': 9,
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 0c1a3ae9ecd8..ad26f5393b0a 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,3 @@
-DIST construct-2.10.66.tar.gz 1189924 BLAKE2B 1c0eb91bd8391a8677a2af7b24ce471d961ba97c0e297969c956a4a6f7e8a35ac539882dfb15da94455e8c9c24e9411d11e981ee180bf54179e11735409718fa SHA512 66e23d1c92dd5472098ca1f971d781a0846a6bcfd797d9d71781f1ff7288f1e7d21b68176e8353409fc355979b1636f4f5a0ef86547d96860636296d19d340c2
 DIST construct-2.10.67.tar.gz 1189939 BLAKE2B e3effd2bb2906435208ef6a5fadbdbde2e1ef3565174568949207bdace48e25f423932f08598c82df661919d926a18d49767ea1189b01a5a3ee48aae601c45c8 SHA512 a4c7cc32b9eb63311c6ae2b1580b7a696c1e0c3960d78936798dd794cb37a77ec8ed8baa8128f12abd50390b9f4cb3f150e3453d5043797f0bd603525b8292a5
-EBUILD construct-2.10.66.ebuild 1029 BLAKE2B 02a11e7eb758eb5e9e4bf9321a2c4e03808bd60bbb9d575e8413a5883ed004a79c5ce157f246d2f7cbe0f44840293de51e4d275ab87de3a1d04cf9a2989d1b4c SHA512 02ecc011249fe759b12572e1375282e62caea91932569b25bf0979fb33979519d9ce924c5eebaa8d3ddb97462dce29ce56d2dcdcadacaca05a8fd4a2c5fc429e
-EBUILD construct-2.10.67.ebuild 1031 BLAKE2B 92dcc84bdf48ae704ad489bad3880ac4da0b86d895d10b1db3b45822dc9b2d10ab2e020c18020af327c313a839629ed1e3e87a1315571c5b7e980b7ea33c0eff SHA512 a233c6e9164dac51506db46e4a8fd61815c9cdf8fc6e16aff09844c1303ba3c8392af475c1c418d6dc460eda4bb4e82e393873e950710754301b9b6326832723
+EBUILD construct-2.10.67.ebuild 1029 BLAKE2B 02a11e7eb758eb5e9e4bf9321a2c4e03808bd60bbb9d575e8413a5883ed004a79c5ce157f246d2f7cbe0f44840293de51e4d275ab87de3a1d04cf9a2989d1b4c SHA512 02ecc011249fe759b12572e1375282e62caea91932569b25bf0979fb33979519d9ce924c5eebaa8d3ddb97462dce29ce56d2dcdcadacaca05a8fd4a2c5fc429e
 MISC metadata.xml 529 BLAKE2B d84b9d53c6bf6326dca24517df887c8edcb5ddce3c991bbcbbbe0b88df079f26e42d7bd1c634e6c769c9c784976f183e1f74f05d5476be4a5aabd22ad1be15e0 SHA512 6ccf55b1d39223fee6b243d86f918d236f8dbbc7583b7af4ca0c30d539a3998f74ed5d405d8f7381ca9a06ace0a7b405db0eec669e6bbbcaa33b6767639428f0
diff --git a/dev-python/construct/construct-2.10.66.ebuild b/dev-python/construct/construct-2.10.66.ebuild
deleted file mode 100644
index 89b9b60fbf75..000000000000
--- a/dev-python/construct/construct-2.10.66.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --ignore tests/test_benchmarks.py
-}
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.67.ebuild b/dev-python/construct/construct-2.10.67.ebuild
index 79ca0ff13275..89b9b60fbf75 100644
--- a/dev-python/construct/construct-2.10.67.ebuild
+++ b/dev-python/construct/construct-2.10.67.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 5acc6412f2d1..9d9d02da8b8f 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,3 +1,3 @@
 DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
-EBUILD contextlib2-0.6.0_p1-r1.ebuild 937 BLAKE2B 605d03dda57b720b5597704ee5217e97119a0bd95828a6a27a4ece72e603982e2c65c979b1e63a86341acc0086ff07203fbd55ebdbbc006e9312469dd64eb8ba SHA512 ae5979aaa7d535a8b0430088620a52944a8ba12417cec5df9a0e98e7cf9ae8bff5b5fff14cc9cf0030f548c95540021117591cfe169c7b08a38873a869872662
+EBUILD contextlib2-0.6.0_p1-r1.ebuild 937 BLAKE2B 0eed41b8c4b22b91e2c6f707b066477beb109c6039f90dc10ce2881388a8123ee3132198ac671c795f6d5b52f30b619feb7ee01805d66b5206cf7023b0461962 SHA512 1e1a30770834be442a67a79e3ac915380cf34fa6875061e5c3d8e4a21a331a0cd8f8ea3e4a8c0e49ec154901b63a31434bd08c503c369b963b80c15f8ff2129a
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
index 948d0835b5f6..cae46e1d472e 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 0eac6ccd3584..b38f8bbe4dac 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
 EBUILD cppy-1.1.0.ebuild 449 BLAKE2B a0f5fc3e9a85bad250c51f9b19c3f98a0e4074c45eed04480d7507a245ade459bc31c6cc74b79dfd8fdb996bd785cce6978a00c883a4a113b8931fd94313162c SHA512 037478af21cee122c2402d82938b2895d1920f003f6177b3e191214e63562732a7939168e8af21e091f338be660402537e1236829c1b1f31c6e9e370f840a270
-MISC metadata.xml 839 BLAKE2B 5e5a08edb8c9ac805cf2a0d1bf21050705f59a89888bdb3f7dc8fe2379a3de10d928161f21360d0a690fb2270819716c8dd72c436098f62296935f30d81a6bb7 SHA512 6b64081cea844ec746723a3d9efe90bfede222f00b2135a80003984d3689901a7879f00f9ff3465fa5fe3e60dd923318653f1fd5582e9dee861fb6d31cc23649
+MISC metadata.xml 601 BLAKE2B ea350b20df37a65fb695429ebfe7a7de8fe2c2611b20aed100aee0b84693363d1c3f4d16eec0fc3df0de63dfd79a4d4b89afb175698888fe64c847962575d6f1 SHA512 a8e798ad3e49b58041127be01d4256d62400aaedbdd006a1294df67afc4624abb8c55a847c7f9e75434b1b193a882902685d53ae183b415cd3bfe54dd4b6945b
diff --git a/dev-python/cppy/metadata.xml b/dev-python/cppy/metadata.xml
index 1594d171a6a9..e4ea92a7a8ea 100644
--- a/dev-python/cppy/metadata.xml
+++ b/dev-python/cppy/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vpayno+gentoo@gmail.com</email>
-		<name>Victor Payno</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index cd9da2a21abd..325160741a05 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,5 +1,5 @@
 AUX cryptography-3.4.7-py310.patch 8611 BLAKE2B 6cabc8056658f6a0c895a75b287ebfaa3d25c4ba9f95e28bf63c34bb87ccccdb4b04e42c5d72fdb4d889560e1ca13c602755fa05b9bab3b1fe05788abe110964 SHA512 d1c89a6c50fd4032d6aedcf026592b52b1e38922ecc2a83e8defcee5b7b4845a66de45de897fd3c2022c6118591811b9fc25df7fdd33d219647e0923cd906a66
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-EBUILD cryptography-3.4.7-r1.ebuild 1924 BLAKE2B 118c9da25288dd0ea6d0c263cab76effd59a21e445d295686c0a68b19581df9d0cf16ce72568bc03433cf2ff6c52d0f445823d35c239cf88afb3409d88bf9066 SHA512 b64add0ac3073045a970932e4f0486e32a18932d401b5c892e1f1922eddb895419d24b027ca033e7fa425447cfea2e5d8b3961108cdf2deb64bffcfaa18a52f0
+EBUILD cryptography-3.4.7-r1.ebuild 1930 BLAKE2B 7dd5447b2d3190bdd73c9debb4a35b5c6be7bf235b7e949c2a3998beff5381c07e40a7b75f981c53510b1b435b0fff5f1e823e6713a83ee9d932ffb946adbdbd SHA512 8ceb657fd2d8e9d5d6847aa4774b47e6d3beafef817e9cc5d8aaf5f0d06c7f87bdc2a63dcd68ed1718849c59bb714fbd8cdcf6df34c64375b0a320dbb8e6b829
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-3.4.7-r1.ebuild b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
index 97946e3dd07f..0bc251d53b55 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/csv23/Manifest b/dev-python/csv23/Manifest
index 0e3709f61bbf..8b99d13a0dfe 100644
--- a/dev-python/csv23/Manifest
+++ b/dev-python/csv23/Manifest
@@ -1,3 +1,3 @@
 DIST csv23-0.3.2.tar.gz 24132 BLAKE2B 2c5eb231814e087dce9689c7075bdbc3875b3e200dc1273022d55661ec60f18a5bcb03e062b205fde13e845e5e50d530b07596b51ad7b2a89e41b45629bf3ce8 SHA512 289386cce5de4ae5bc42fc56d1639bbd1483034e5422f63142c1d188de735b1f5f18f9f69e3cb96f4ac3e1d7d0b371b1c45e720982c4f4b539fcf0d2da893f6a
-EBUILD csv23-0.3.2-r1.ebuild 751 BLAKE2B 51f15e286b6202c03b0a0018a39ca48c85c7c4104cea806c9a26aff8beaa5aa5ca2f5b53c8838cdf7c227b03b203dcf7f48e471f738a2e8c96c5a0f401d8aa36 SHA512 882fec5396413cf6ddd60c1491025eacd76166aaa5cff60413599210321ab62d9bf20c69e277dd8fedf328b118de3d01947c44dfd0b69b2dfb41b9a098602bd7
+EBUILD csv23-0.3.2-r1.ebuild 757 BLAKE2B 449f949f5c422a33fb0d4d7fdc232ff8475bb447ba55c256a5c1d3c2d9d7ab686882462686ac6fc3233716ca1d0078f6865a40edf8cdbabcb9676144a41d60a8 SHA512 6af03c6249b9c16e29162339dbabc4e13080c60c77248ad8127ac76fd56807576a16e0ad7f124bb9c8d49fb65182b74e164cb63cfd47dac272b2ae8db16d52ed
 MISC metadata.xml 361 BLAKE2B 43f9dc14af4978ea8f825d16fc06ba82b5ad1c33ea279ed6be0bde9fe9d66f0c5705e5a35498de60c525ce5db2653406ede42fe164be618aa119158f65feab68 SHA512 921364097f1d8c20e7ed174304bd4736bd3137edfecc77258ee77a84298b2d005bf070b8900ae1671e291c3b064e45937865c581f9a192bf7fe9c0c3f77c361b
diff --git a/dev-python/csv23/csv23-0.3.2-r1.ebuild b/dev-python/csv23/csv23-0.3.2-r1.ebuild
index ac7d51503fac..93f75ac5187a 100644
--- a/dev-python/csv23/csv23-0.3.2-r1.ebuild
+++ b/dev-python/csv23/csv23-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 6db5c79bf865..58fe0c52d1a0 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,7 @@
-DIST dask-2021.3.0.tar.gz 3672035 BLAKE2B 17b3e808603b8524e96273ad33b69689605707a1c187b32c8ed67f054e7f242525365956800017ad5685e0c306dcd21bcfb3dbb3f9920446f03553ceb0fdd9a8 SHA512 ba5b62dd51dad29a106a4fe38a5015f7e1d7ad11eaa21a524b7c8b7d916873b9e447d065c9009e8100662aa3b1f64718b164369f173fc84f5f085a1e369e091a
 DIST dask-2021.4.1.tar.gz 3702584 BLAKE2B d6c630349f26378c1c6d15de38c112ef330bec6422664b6e5737b7a023800f1705be163cefd79cf76c1213ca6b773ee19e2dc7e3f22eb60edc23e6fd4c153e16 SHA512 55d8d3a1a3eb76ac68eed5092075301ca88ff311f6729952928fde49f90a1b9a825dc085fb38b07a0138b87a109a5913f26d683c5fd22476539f3a8f36397c32
 DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
-EBUILD dask-2021.3.0.ebuild 1124 BLAKE2B 438fd46d7d69e191f04e66c7b1b6d61188a133e6b0c44885f7f2833f297d4fd4d37f03bb4747772935481f802b684e403322e552a311788cdf2e3657c80505ef SHA512 0cd9b1e7e22f1d90f9baf0c0546681bb6709b829b69e96876ee7e0fb1adbf7a1458e521914f86d80c6906e6594410db3c78a841ae08d3c599366731e9566a7d3
-EBUILD dask-2021.4.1.ebuild 1083 BLAKE2B 230b277e98b67bc39e995ce24417dead6e9837cd59a54ebaae2d90dbe1a9ba16bd3d8df479a724e87fe6c9b91559b57d5440b7f0cee4961614c2b5fe017634e0 SHA512 d93483a2ac23c86f2f2c613c0760434c0867138cca2bd2967462ac55707c22702ba1fb4f8003fef48f2f7059aeafd2a15ff8929c5cb0d1fab89863d0e96060c0
+DIST dask-2021.5.1.tar.gz 3713937 BLAKE2B 14e9043c9b762773779784b06f21355f2a384e9d13fd13cd8b7cd46d42df265045493ceb7a79c726922dae8133df5f7b3a493a389632b3d2c803caa42b141916 SHA512 e12986065e575b636fdaf5ba910dcabd21c807012f0fad49a3797d228ec47cc7a9b32fdbf567c306e274a7cc617439d0d0784ab65ebab5c6b42c21014d085209
+EBUILD dask-2021.4.1.ebuild 1081 BLAKE2B 08abd77aba6fcc012541c584c504c0ab6951832e1f04d2d3b167b8f64fb879822b673d47259359c5c2b5e8eacf2ece5946699916319e03b474335d9165916a9b SHA512 148de997d9ab125ca949d4d598c7cc807baa1d5263737fd256d5fc533ad94fc5effeb241cbba5ee20a328d0242ea7fd1453686196c8e3b0b034a86eebbcd6370
 EBUILD dask-2021.5.0.ebuild 1130 BLAKE2B 638753f70cb901a39c94aa977b951e59aa05b79de97a1e96848f761018faa0b09dc26953e0fa81887434e5520b290e043ba7a8cf3a238bcb5fe9da9f08a88937 SHA512 27e4853bb68686b4b576e32be05ede702751d5f8807ea2b82b9959f49b1a00c11b76f7c16c6b01e366fcd0975f34e6a14a3646c51824ae8739099367f3e2ce14
+EBUILD dask-2021.5.1.ebuild 1130 BLAKE2B 638753f70cb901a39c94aa977b951e59aa05b79de97a1e96848f761018faa0b09dc26953e0fa81887434e5520b290e043ba7a8cf3a238bcb5fe9da9f08a88937 SHA512 27e4853bb68686b4b576e32be05ede702751d5f8807ea2b82b9959f49b1a00c11b76f7c16c6b01e366fcd0975f34e6a14a3646c51824ae8739099367f3e2ce14
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.4.1.ebuild b/dev-python/dask/dask-2021.4.1.ebuild
index 083343d0a237..9c748ea5571c 100644
--- a/dev-python/dask/dask-2021.4.1.ebuild
+++ b/dev-python/dask/dask-2021.4.1.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/dask/dask-2021.3.0.ebuild b/dev-python/dask/dask-2021.5.1.ebuild
index f606d67e5749..9f9b2cef940c 100644
--- a/dev-python/dask/dask-2021.3.0.ebuild
+++ b/dev-python/dask/dask-2021.5.1.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}]
@@ -31,12 +31,12 @@ BDEPEND="
 		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() {
-	pytest -vv -p no:flaky -m "not network" ||
-		die "Tests failed with ${EPYTHON}"
+	epytest -p no:flaky -m "not network"
 }
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 528048296c59..d54ea84ab3b9 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,4 +1,4 @@
 AUX dbus-python-1.2.16-py39.patch 948 BLAKE2B df88f38be549b81b404f3e5e7f0d4c09f7c43bc9ee91b0534059fbb3edbbe675e7ecd467d5d57f365aa59d510f06c41c9ae4970a5e5e8d2fad109bf55cfb507d SHA512 ce5f419736dea09de8a58e372c7587afbd270d806bdcc0eb3b7bd5fa830be00453152ea7ea44a32a06d860ca3174282f62ef44d5f8c9d43de7d8724c69f2ab37
 DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
-EBUILD dbus-python-1.2.16-r1.ebuild 1734 BLAKE2B a3ac67a8c0787cb8ad300b7f5da33861f4c129c3c05168b8156c5998358f4e852795e52cfcceebb65b257b3419aa77c4c124b5a2efb2270c0b66dd8253d38794 SHA512 c10d16d835153a006df9f94f546fdeb2c0c956c39c39251d0b7253a4ecf4a24b6c5cc3949d87954bb926e689ab5e6a5c0cbf54cc5f648856b847ffa2954a9b9a
+EBUILD dbus-python-1.2.16-r1.ebuild 1741 BLAKE2B 775079c1fb18a829c519e51353c0c0c035654c938d234e44c081b2b157f838eb1626d63c8862b42d35c8eab209499ca5164e847b43b41e4c19326b3b0ab6b58f SHA512 13f0d1e731a8faee3c69dc70306c863a6312d7359a66c7b8e4cb1a72fd29f6864492d10ffcfbd5710ad696f897f658c93c72d0202b4969588ef42369d2615ff5
 MISC metadata.xml 403 BLAKE2B 016856f2fe17f2036e04502f85ffcd605d52556ddf50baf50fa431548b57914994f03f159ed01beaba1409daf0b4192e6101d4e62db73a75944ed0550943f2cb SHA512 a7a70f0a2430894661a3324d32a091b8f9473170c2dc073a4dca269b29e19507b753f09aee212ef47c13e1f89e9d1ae41d0f50b96da211bc3afcc4d51dd94e6a
diff --git a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild b/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
index 9fdad5779fd3..2a6f8bd59269 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16-r1.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16-r1.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
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 6b7add3f0f77..a9eb31f68029 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
-EBUILD ddt-1.4.2.ebuild 606 BLAKE2B bdfe561d18805d9a826386eb1c789fb07dd17878a90f2423678da319898478c42f87ff87a7927a5296caf30b2a48bee2759b4eb944c4efcf497980ac869fdb5c SHA512 bd03c3667c6c155a307ba0ddc867ab1358c720c5636c5cc0ad6e1ce22481b2348a79e7b6815aa04b3c9f6ba2f475998cb45c43a437888e9f692cdbd7a69be4dc
+EBUILD ddt-1.4.2.ebuild 611 BLAKE2B e623dd2ee805fc0dc102fdfca2c6703a439abd542456f33f973d4f380782f7b7c9d7e9bf36e92e916ed4db808ab62c854989b21c9f8420d822f9e1c3ebfbe902 SHA512 2e9fcfe8a99cbb4c76669f46d35608bf213d5c713f6735eee06258558c9720dfd012774700ddfa2c19d6e8619fbe48f5aafe7dc888ba088e9e326e2cbf74fb92
 MISC metadata.xml 636 BLAKE2B 073d2c7d879b92927f8fa037b79eb9a947b3acc9decd241e8c1ba50352af45f27480c02061d264ae3eb5187061b2f2df1465ec6540590edeb871d29eacfbb7e2 SHA512 9dc659009767cafa7509e00533ffa037fad5152cc2e35b1631e764d0120e9dac532718859dec4fe6368fb6f44adaee307eb264820ec8d2e8d8cf515e7dc4e563
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index ea0f9dd6a241..4ea7853d2886 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 4d683b44b63e..cdcb67da915e 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,4 +1,8 @@
 AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
+AUX distlib-0.3.2-py310.patch 1131 BLAKE2B d5f7dde9f3a23756d926ce39061ab1d168e3dcf1161b63eadcc2f639f58cb58d9e3dc4bf4738cd32a148fc649abd236230ea57353d851c1fd536c5fd2964c56e SHA512 d96f9ed3e023084103025650d34448cbddd301f7d43d65f565427e00976809d813730f5208dcae53969cfbe8f5eff054cd538141ff1e988dcb4396f8c94cd5ae
+AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
 DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
+DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
 EBUILD distlib-0.3.1-r1.ebuild 1468 BLAKE2B 4b154a1d890ac4d3b9e4062c08ff2919559d3895c3f447a348be68c9ecece8080f3c3c5ad65902d5c1ec7083387ac546e61de9ab28f11659de064eac8f2beed7 SHA512 61b9b0e5555ab60f61d96607aa354d7cd574069829595caaa04f6cae10cacb34a89660fea0b0d2970c3c1cd324b932d345d951b6df400695fd951f1ce36f5c1d
+EBUILD distlib-0.3.2.ebuild 1541 BLAKE2B 3c25106407d4787aa2103eb3eb402a0aa875db3dd94a3bff5979ca3c53006c740919fcfb5cfc76ccb3885f7a7214f00d5a0aca1b216843c7699e1504748324ad SHA512 28fce49fec516213f12a3d54586a7c9093e5e79a28ced2b0a03dc41901aa0db2dd8fad9e2139c20593df4e464a1e727f62c228ecd8081a237d9ca59b06a961c4
 MISC metadata.xml 288 BLAKE2B 865be58267f18634250b494dac795da10ca6daa5defa289003da9282f06eebdcc3a3369bb39b2a7ac216ec44134b29ec9052676637564974eafbbf4c270403d4 SHA512 2eb267e476064080a3e34b4f66af276666a30d37967298384f612c2fe9a73bd805b0ba72f6c4e2c1ca6d6bf737d8b3f5484b0c3f37f2ec1616f9017124c54cf1
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
new file mode 100644
index 000000000000..43cd8fc4d2ea
--- /dev/null
+++ b/dev-python/distlib/distlib-0.3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level components of distutils2/packaging"
+HOMEPAGE="https://pypi.org/project/distlib/
+	https://bitbucket.org/pypa/distlib/"
+# pypi has zip only :-(
+SRC_URI="
+	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+# This package's tests are extremely fragile and tend to break or hang
+# when it doesn't like metadata of packages installed on the system.
+RESTRICT="test"
+
+# pypiserver is called as external executable
+# openpyxl installs invalid metadata that breaks distlib
+BDEPEND="
+	test? (
+		dev-python/pypiserver
+		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	# make sure they're not used
+	rm -r tests/unittest2 || die
+	rm tests/pypi-server-standalone.py || die
+
+	# use system pypiserver instead of broken bundled one
+	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
+	# fix tests for py310
+	eapply "${FILESDIR}"/${P}-py310.patch
+
+	# doesn't work with our patched pip
+	sed -e '/PIP_AVAIL/s:True:False:' \
+		-i tests/test_wheel.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SKIP_ONLINE=1
+	local -x PYTHONHASHSEED=0
+	"${EPYTHON}" tests/test_all.py -v -x ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/distlib/files/distlib-0.3.2-py310.patch b/dev-python/distlib/files/distlib-0.3.2-py310.patch
new file mode 100644
index 000000000000..23c3dbbe0274
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.3.2-py310.patch
@@ -0,0 +1,29 @@
+From 5a9540cf58fc020b0c6a1d5c23b9b93d1abd2eb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 29 May 2021 22:08:57 +0200
+Subject: [PATCH] Fix test_is_compatible to fix Python 3.10 support
+
+On Python 3.10, PYVER is py310 which wrongly matches the original
+'py27' <= PYVER < 'py32' condition.  Replace it with explicit match
+against known Python versions in this range.  This is probably
+the simplest and the most future-proof solution to the problem at hand.
+---
+ tests/test_wheel.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_wheel.py b/tests/test_wheel.py
+index 849e7c1..7c8f5ee 100644
+--- a/tests/test_wheel.py
++++ b/tests/test_wheel.py
+@@ -206,7 +206,7 @@ class WheelTestCase(DistlibTestCase):
+ 
+     def test_is_compatible(self):
+         fn = os.path.join(HERE, 'dummy-0.1-py27-none-any.whl')
+-        if 'py27' <= PYVER < 'py32':
++        if PYVER in ('py27', 'py30', 'py31'):
+             self.assertTrue(is_compatible(fn))
+             self.assertTrue(Wheel(fn).is_compatible())
+         # use actual wheel names from PyPI.
+-- 
+2.31.1
+
diff --git a/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py
new file mode 100644
index 000000000000..386ad05da578
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.3.2-system-pypiserver.py
@@ -0,0 +1,24 @@
+diff -dupr a/tests/test_index.py b/tests/test_index.py
+--- a/tests/test_index.py	2021-05-29 17:42:08.015558305 +0200
++++ b/tests/test_index.py	2021-05-29 17:42:56.949966576 +0200
+@@ -57,11 +57,6 @@ class PackageIndexTestCase(DistlibTestCa
+     def setUpClass(cls):
+         if cls.run_test_server:
+             cls.server = None
+-            server_script = os.path.join(HERE, 'pypi-server-standalone.py')
+-            if not os.path.exists(server_script):
+-                logger.debug('test server not available - some tests '
+-                             'will be skipped.')
+-                return
+             pwdfn = os.path.join(HERE, 'passwords')
+             if not os.path.exists(pwdfn):   # pragma: no cover
+                 with open(pwdfn, 'w') as f:
+@@ -72,7 +67,7 @@ class PackageIndexTestCase(DistlibTestCa
+             fd, cls.sinkfile = tempfile.mkstemp(suffix='.log', prefix='distlib-pypi-')
+             os.close(fd)
+             cls.sink = sink = open(cls.sinkfile, 'w')
+-            cmd = [sys.executable, 'pypi-server-standalone.py',
++            cmd = ['pypi-server',
+                    '--interface', '127.0.0.1', '--port', TEST_SERVER_PORT,
+                    '-P', 'passwords', 'packages']
+             cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index 7131f1260fed..cf0f6ff9a01b 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 596 BLAKE2B 1f3c58988f55adce486e85bf3c173017601d50e5ceadebb9ef7d368548bf2b1a096d842f9c29900655e4075dc7a09065c14f08c5c4ac31ab10c4fe14d0302ab1 SHA512 58ef734c869dab4bf224b5ff094388fe612c51d8026316d02b014204fa157e5a8218fbf48306115aaec255a09935c38e0d41ba05377189754fe36db215b56ab5
+EBUILD dj-email-url-1.0.2.ebuild 581 BLAKE2B 0c93267f193a37f6de783aca3c451b27b29083818f91501158714eec18162b0c6262fb58e51c51a61f10481ccb15f8836fc4df006c5dc94c95c65e6f90a6ae60 SHA512 b9afed584d88f8c8c540d79c7494285a6686445d9c3158716171aba056e8575b7b2ec31f52b7ab914506e5df1ffdc7ccb6b8af7286ccc17cbd662740deed21dc
 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 e101e12aff3d..40c4d515ab1f 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
@@ -1,10 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -15,10 +14,9 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DOCS=( CHANGELOG.rst README.rst )
 
 python_test() {
-	"${PYTHON:-python}" test_dj_email_url.py || die
+	"${EPYTHON}" test_dj_email_url.py -v || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 6770cedca396..7212d464afd8 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 646 BLAKE2B e8d78b1503b5a770cc8c6cc64336acfaaf28b029f73ce47756ea0fa1bfd64c01870c7b19e918616859e73d932c5b3defe11e1509a440715cb75e82cd1950dacc SHA512 0d78c732223c689235b46a791c8757346a7cfea9e2b4b05696acddd7188f90da9aa71955623c2d808fc9d86cdafcb533804279e0faa1a2c654df38c3b94a0344
+EBUILD django-cache-url-3.2.3.ebuild 688 BLAKE2B 11ca840493b7a7ece196fbe050fe9ad58e6469b4cb4da070b115a7925b9d2c91db4a82b7e14f1fe4bb17e9c2eaacb961346a3997c3842c3f1a3d5e7e26ed1e98 SHA512 eef40b06fa456f47da713e91bfb7b0d931b0a3341b5f63bd78a21a604b5c99ca1adb0c7d05a832bdd375a56c4b3a6eeecd5c3db0a38c7fc7890a427d47e02b24
 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 1116937c9657..88aea34048d0 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
@@ -1,22 +1,27 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
-inherit distutils-r1 python-utils-r1
+inherit distutils-r1
 
 EGIT_COMMIT="3480e70bb19eef22f4e1beeddd236f44414ac5ac"
 DESCRIPTION="Use Cache URLs in your Django application"
 HOMEPAGE="https://github.com/epicserve/django-cache-url"
 SRC_URI="https://github.com/epicserve/django-cache-url/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+
 distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/--cov/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index 3df7c76e3ce7..4c76a8e6ffe9 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -2,8 +2,10 @@ DIST django-otp-1.0.2.gh.tar.gz 66885 BLAKE2B be98b68f0aa5df25835afa28a23d25e035
 DIST django-otp-1.0.3.gh.tar.gz 67007 BLAKE2B 33aed04898afb6ad3940e06436a1d2b4b9349e8fcd55acba0719084939fb9b111e0c266f4964826491f91f832c16f2e4d505486016bfad416706e3e7ef6f3f37 SHA512 7b661228377fa57812a45888e415478cee49d1e343cbc814ba8631f4c354077901ec82f79e69abd00c6bad1dffa026d3e03f4cf0809b074ae1e02ab2cf878137
 DIST django-otp-1.0.4.gh.tar.gz 68976 BLAKE2B 30908c3769ca9c05c850524d8a3b155f7ac8fcfa8e69073622d83808d7b78293604f9b332e59b074a6737188ca4f53ede13d31d283588605ca17f994bf5d4e5e SHA512 7b37fbc56a708f5c26e6204fba344235c7823db66d7e3e56b74516efc8a1de4150c088ce2d94c04c10855f438b077599d361a4d2c2263e8ff2936309dc0ddb6e
 DIST django-otp-1.0.5.gh.tar.gz 68677 BLAKE2B fd4fe66695faf4a75fc9cdab69241520c42c50d013121375bed2cb0f04a71def8e64588e3ac5727cfb319cb025273cb5adfd5d3b0dbab06590967c58e2b36e37 SHA512 bfdfe6d5058a6bead28a756392a76301cb821b5ea4f61dff8d376aa7732aa92bf8d709cb964d23e94ed37ec0e3ae45768f4fc4a98aaabfb2be0788bb0059f10c
+DIST django-otp-1.0.6.gh.tar.gz 69023 BLAKE2B 82534fb666e27ab654b1587160fd9fd4600d1ecb57f5b506b383c3d7b36a13d6bbff39598603c7c3bc69edc871a6a3ad1aa2531a92ea921ab07798e7e4bb1316 SHA512 ff14a786bc8b3d22c8767fa78d676951c262389dfe00def981c79894d299f393ffc86510c33866482aa246ac1643238a3de5701bb76cf56aea5e3ba0a25cbb97
 EBUILD django-otp-1.0.2.ebuild 879 BLAKE2B afe469a99ffafd9ddfefd04709b6209380459ab1f0e2ab0ea8335bed19f4c6ca30930efd0a71e1f1e3bf676ac6846d2634dd550e54b4d973ab3b47e99e30fdfe SHA512 b8fa48d607c6669660fbfd4c4705d389e9ef2218571ec90438df9c6704a0744b06ca64fa9d810df7c186c137dbda600cd2ecb00a2fd912c59acf2f9cc760f9b5
 EBUILD django-otp-1.0.3.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
 EBUILD django-otp-1.0.4.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
 EBUILD django-otp-1.0.5.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
+EBUILD django-otp-1.0.6.ebuild 879 BLAKE2B aa0f40028ac48510140cd533194ed3fc34ce29d574c7cf41e93752d243d87acd9b604d58d1add09003a2dfc5b184061d848b2589cfbf667bdd1abb6dbcb12718 SHA512 068e1d44bf9b4774505f607b31aa7ed570548de1dcb5b9afe3fc0927d4aca3c4bca28fd3ab8f834acb38f37af9ef558bd75ecb82f4a5ab77a42e2a21425c86ed
 MISC metadata.xml 386 BLAKE2B 089280b44d70d41d6ac97b035d5346c7e484d53cb5cc4505a1953d46c2a618140fbc1a3094a14ef18d3c39023ae10b7d162977537b646563459f3a9912e765fe SHA512 6d181b8eaad8df98a615d06c292284c1f8fe28e6bbfbd467428fc387fb9553221646d2014a10c3d16a4613db7d6f0af75714dacacecf1daad0db053d08deb3e1
diff --git a/dev-python/django-otp/django-otp-1.0.6.ebuild b/dev-python/django-otp/django-otp-1.0.6.ebuild
new file mode 100644
index 000000000000..26c9a4b8f2af
--- /dev/null
+++ b/dev-python/django-otp/django-otp-1.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
+HOMEPAGE="https://github.com/django-otp/django-otp/"
+SRC_URI="
+	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	local -x PYTHONPATH=test:${PYTHONPATH}
+	local -x DJANGO_SETTINGS_MODULE=test_project.settings
+	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
index cd5a8e0dd152..e162ea935989 100644
--- a/dev-python/django-tagging/Manifest
+++ b/dev-python/django-tagging/Manifest
@@ -1,3 +1,3 @@
 DIST django-tagging-0.5.0.tar.gz 42827 BLAKE2B 0889af1ca2943c3bd8e4ffe3aecf8ceec85d2546daf9cccba06bbf9d34943ac7de41240ee79ab77797c6af490dc8dc2d3d9c7249b1c83d71488116e3fb78c0d3 SHA512 7a740c24cb9674f3e9c7f98aeb46f99537ba7afc79bbfd810004b921786e1246fe2ea1f219a2a6c414189497e7b9409bc4f7170714c6c03bb163ccede77c3266
-EBUILD django-tagging-0.5.0.ebuild 762 BLAKE2B c915d53ac6e278d75fa55fc973318e930cf161725dffdc7aefbeeefca945328431e73870ed844d8aa60f7de4884afd2be9e954bcfb5a4f8909d92f4af4fc2f53 SHA512 5fef31530990f4e7d94d1b8a1ca1ebcd6063afb98684d1315fffbbbf2db265a011eec2f179db862a68fa6ab4f228082e36a8214f4ce27413b48c4cd368fe912c
+EBUILD django-tagging-0.5.0.ebuild 763 BLAKE2B e8a86344d7063e80169303de0c3249143f7f8326133343940c44e943778f3efb9870bc40a6e7931a4af5280a4b008fe06de2ff4c841ae583d038946f4d9dddf4 SHA512 11d8b4c23f1e47444c3f898d459a33a42f81471bf26b5524fdce5f07db0b787e414b91428f4a34301c1fcbc6e654bee9f1e598507385f0635d2e5eaa385b8e39
 MISC metadata.xml 394 BLAKE2B a5d5559d1e4c9a55fff337a585dfb731c84e470d6fed8ba651b59287090e99c1c2848c83faaa4aa720a37a1839f3ea18e4473ed8b0fbcf110fb214cae15dfe3b SHA512 b5bf9305f635c589639da4742fedb6dd1d001db05eb2849087af20466e5af151b1db55eecb5a3ac510f19c84cb64fd22a3e84e957d19e59f1729ad8cf9ecc8e6
diff --git a/dev-python/django-tagging/django-tagging-0.5.0.ebuild b/dev-python/django-tagging/django-tagging-0.5.0.ebuild
index 561ce28e724a..43234dcfef86 100644
--- a/dev-python/django-tagging/django-tagging-0.5.0.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index fb19f6bf2dbc..86159ed1c310 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B 2db9a3449ef0ceddf5d812d7767d6e17838233910a014bdf28990caa23632f5b94231731a4b6c74395df137dfc31316f68a3db965a9a4e89138c67449a01c72f SHA512 f2364a29382d54c227fb67acf804d345adbd7474368d2b37c77c2ee24217a8fb0b42215f380df0d77e5894ab4b96e4210f98d71958e07587961f748a3ca19dc5
+EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B ad1a7cde723e3fced02c848ceeef7477df6cb77a0bd7d6f8a0fe19eb50e2958cde618af92cca1b3c1e8aaa7d6140d88bd46a689f37341d0e373fcec95948f4d6 SHA512 3585b03373dfe0c5d2450223f95127f3a38566c05401e119e2d746a41f1d820ac582d2b217d7b144f27ee333274b5eecdcefcce710366e4e9aba8b75a28bfd99
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 1c0eec37c1b3..7f9a3a512938 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="Pythonic argument parser, that will make you smile"
 HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
 SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 77fcd8fd408f..1768e37c68be 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,5 +1,5 @@
-DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b549eb2a8a516def96f66a8d31ad602ae4253910a24efe7254411dd4723832481b0df3189a9cb8708e3bbd512eb6f SHA512 ca83bfe3566981830bdc91d2e4ed039625fa6780dcabf74e0e91c9d89001e06dd04c8a10e8dfaf5c5ad67081d77fc9e996e2e3e1a0589954faae09162c545b02
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
-EBUILD dulwich-0.20.20.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.21.ebuild 1625 BLAKE2B 0711d93411c4b6a679ffc36cd1b296d43debe2a1fdefce693156caa0b40c2584d43a2bd3eab5128dcd14d77328b8c21bede077a0f86fc5222a7019677c6eaa2f SHA512 50e21f8b4e732963275bf00a7d5029957e34486272db01f3726cb79efa47d60512ee748c7813806f52b0bffb8648e16396bb880867182092e9d3d4aee1741578
+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
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.21.ebuild b/dev-python/dulwich/dulwich-0.20.21.ebuild
index 4d8b68f98f43..6a31b0f595cb 100644
--- a/dev-python/dulwich/dulwich-0.20.21.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.21.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.23.ebuild
index 6a31b0f595cb..c3784feb382a 100644
--- a/dev-python/dulwich/dulwich-0.20.20.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.23.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
@@ -16,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 4928890808b2..89548f358311 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,5 @@
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
+DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
 EBUILD ecdsa-0.16.1.ebuild 771 BLAKE2B e2708decf97044e799eade890a1b947521cd2c2d3cfcee9896ba47c9ae5c2211e2e961e17ca88dc469bd624fe97a59e0b55c0fdeb9b885d4645d5f079a20da0e SHA512 135442dcc2f55dcb1a58158b163d8faebe32317a8d8f9ec42cd874eb062a751889a3777ffb2b90ae0054b385b99962d633c9b980bfe857f2e4376d23eddeb16d
+EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 3bb2a07c577e8bd05956b6268976793cf264bdfebe24c917e17061c7a94778bd8da6f2ade9230aec973558402f88bdc1ce82a194b624196a36512af1d0f452bc SHA512 0c15a21fff597729093c6800a7e2e9cdefabf908ac70974c7f37c6eea8dcfa19e6ab31fb776da164933a4c32a0d8631021c8a36f385e27e219ea26efb02825ab
 MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
new file mode 100644
index 000000000000..027c95f3a8f1
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
@@ -0,0 +1,30 @@
+# 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="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/tlsfuzzer/python-ecdsa/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/editdistance-s/Manifest b/dev-python/editdistance-s/Manifest
index a11cf916d225..8e8ecee6c5f8 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 522 BLAKE2B 762e6c6b395a2811c88fc3abb6303109d103132c0ed8446cdad9e92ed12cb360bc6edd487dedae4291af7b00c3a7ee7216ff07be5714a4c6c947ca21e4a1b243 SHA512 ba4e8e36c3540c086437c5b0ad3db6c18795dc160e407254b010cd4d71a1b1128edfdf71dc202c9779cdb7e1675e82f9576b5d2a0d53c4e614c83a827a20a30f
+EBUILD editdistance-s-1.0.0.ebuild 521 BLAKE2B a6f34353b11c246fa051c04cee5b99d947a8d42ff2958dd9385eca481555160c83ca6c6ab8cb0a071d529d3e120d953301972b5acf75dbe030049779bbeb25cd SHA512 6d67c3c4522e0029cf291df36c41c0e5d3ac4dfb20e04005b9f41165bb5a32f3b2faa30dbc6941065293d8bc802b15b3b133110b6e0591c1311febc53aabcbf3
 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 5cf084bbebf4..f0575ff7bb36 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"
+KEYWORDS="amd64"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 6fea34d382dc..e60b8969c6a2 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,5 +1,5 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
 EBUILD et_xmlfile-1.0.1.ebuild 499 BLAKE2B 4cd82ce445482d84488d0a8efac4a39d6230cd59754198aff000e4bb97cdb4b7177ed155fbb7184db109235275691c98bb379b5e479f1fb63cd6f7641ef15562 SHA512 790ca6f337b93100eb2f38d59cb3c7713bae942b79b26364a3a908832966826866fbfae721c57e3c130a3450af659a7d4798b0d7bd675b80eea828977560fdee
-EBUILD et_xmlfile-1.1.0.ebuild 598 BLAKE2B 4b8ea37c963061672b9db66086f1294d97dac2bb49e2bc9569b6ac0a57ed82bee9b0c2eb5fed2b6af81a4bcfc595f6c69baccadb8842d224f682c5f65a8b5790 SHA512 9838b301984a9044acd2d35e1b433637f985e61786f402b29c3b4ca6a9ad844e862a2ef27ca63b739fa277f454cc2bd04849ef007ad100628ba0ef690205b5ca
-MISC metadata.xml 323 BLAKE2B e324f51d45ea0663923d50b699f12cdf55516bea1cd46d0c288456f8d07a0acc0acade1f39e65a7e08230995ccb78985d54584564d586df4e94f290835d3d0a4 SHA512 afc7f8c9b847aa9781dda706ee320cc1d3068c113116e511b1d7a8c5dccb3dd0ade3d4aab75675f9a8e83991fd6053bba741bb2a8d15c994fa9b313ba874d008
+EBUILD et_xmlfile-1.1.0.ebuild 677 BLAKE2B 42ffeab1d9eae419e7e97c604c82cbe90b4f371b0ad949f7e8e3a1bab0c63d7d2e799ec92cc5bf30b9274a95a3a74a0343194e2fb8a4dcbe552457f2dd0844c3 SHA512 6dd7debd0ceb0f5480f546c16db066c3e294173fc83e6a2dc8476d87c28f89e78e544acdbec67ac46fe4fdc73f083d7a4d981dd4c0862629e4f83a52d04df94b
+MISC metadata.xml 348 BLAKE2B 888c03fe50adba6f74323c04eb0055b6399303a1d13f73f1faf432522936ab416796e94acca3ba59422bda48e277829680921875fbb663347a34aaf2ee02ff2f SHA512 59f01b675ab4d621f215e72b8e642bf4e2931f78679d9721d96851f5c0a1ea7da4ec579e61aa2757e398c7789e747324696371f1e912bac64f1b9e0cfc0aa823
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index a44d680ba7b8..84687c138ef7 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -11,7 +11,9 @@ MY_PV=${PV%.0}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="https://pypi.org/project/et-xmlfile/"
+HOMEPAGE="
+	https://pypi.org/project/et-xmlfile/
+	https://foss.heptapod.net/openpyxl/et_xmlfile/"
 SRC_URI="
 	https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/${MY_PV}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
@@ -23,3 +25,4 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
index 4838f47151b5..4e7763698619 100644
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et_xmlfile/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">et-xmlfile</remote-id>
   </upstream>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index c05fdd1acb59..68b709f3e1ad 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -5,6 +5,6 @@ DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
-EBUILD eventlet-0.30.2-r1.ebuild 1694 BLAKE2B b196199c45d2cb80069079d67d17fa1c1279090873dcd7e8b0c2f3db2c4477956a1eb85f8dd9b053635f50774d1029a7ca4bf04fba093deecbe191d6cf6a5b5d SHA512 5c223da6a51b20c4427d8a7a16b760cbb4c85e5937fa46d793e5172f83c540896b71e1bb3098537941ec0008e52bfdad750414551abd87ef81729ad415d418ad
+EBUILD eventlet-0.30.2-r1.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
 EBUILD eventlet-0.31.0.ebuild 1696 BLAKE2B ff7ce278853e6ebd3e6f0e5939b3c011c4368cba536620e3fd56f10c6b80a2bf82856809aa9c72440080904684bb4466ea65a18d33104de55413785f24386ec4 SHA512 be1e474154b49e7aac41598ef2656510e07c748ad8f1501cb087091620d43986fb34be8ddf885eaa27790120a9e7e9539a5d27a5f7dd7b89b0a5fb419f96781a
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
index c4c178a0f136..c335ba582bb7 100644
--- a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.2-r1.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/exdown/Manifest b/dev-python/exdown/Manifest
index 42b8a5f9c091..31d50037e590 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -6,4 +6,4 @@ EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f
 EBUILD exdown-0.8.8.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.8.9.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.9.0.ebuild 652 BLAKE2B 4cc4f067900083e96108699c07c0fe50035802d8d2bfdea9128632f2a8cbe33fb4b2a8089af818f18b7a1fe821a325669284bbb8600c87077a03c787bf1bbdfa SHA512 d76ffdbeded4e9fe4d2a2ee0172e8cfea5ae9cec2f0ecdd95779f82b3a0eeea84e195bfda6ccfd5bce58ddee713af4bad8c0b71770ef810aba157717f77654c0
-MISC metadata.xml 482 BLAKE2B e4a0581d72d9a27fd4376d849a3fca06a53f8d90111623f53443606c27ba030d004f9daf3bda5267b0b1d24b395e582a43e498d3ca1317734570176abb10e929 SHA512 71b956f791e6cb2335c6c19ec844ece93274f4c032a4cd86fc3a7a65893bc54c2aaa9a57d77fa5625b7a18f25c1821b561865ca55004fad740cc350d67b37ded
+MISC metadata.xml 506 BLAKE2B 9bd72901b30d0417e121259e083f48558237e00e01e48414e7e6e755b62df952ff0e80e6e729e17bc61ccd579335b6d913b627169c070d357894a4591ac1a6a6 SHA512 4578c9abf3abe58bfc618e04730f2d08ab539996839ee99d450eecbb312cee47c858a7800323eb26d47ae21b07380b78246bdc05c2bf8fce146cccd1e8e884f8
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
index e583da492b40..b29d8fe18a05 100644
--- a/dev-python/exdown/metadata.xml
+++ b/dev-python/exdown/metadata.xml
@@ -13,4 +13,5 @@
 		<remote-id type="github">nschloe/exdown</remote-id>
 		<remote-id type="pypi">exdown</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index f9cfeb9a246e..655fd8e02dd9 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,3 +1,5 @@
 DIST execnet-1.8.0.tar.gz 173765 BLAKE2B c6334a98b0e9dc7eb5e83fef05b795371edd0f85a6cbad9dc80d14f2e944204812c58419afebe5e70514f41d5ee7507b6a224a94e8cee2544607bc28ef5b175d SHA512 a0ca76002270daa5cbfa00563a51a3412008f893f755a1eb84f53e228dd61a82bdc94fe6152e30d471b4caff3059c662bb9de82100ec2c96df4d014836452698
+DIST execnet-1.8.1.tar.gz 173811 BLAKE2B 1d6277177908ccffe95973d34962856f6ef0a6d16c1e046f47a7ab0667b5e5c2867405a7a8bf36fb7be8e2fa0fd75b68375abdd9b70a1a1aaa641bdefadcd32d SHA512 183c89961b8b5db4eca5b64ff6b179f9faa19d26f04ad07740c818a471aedb02b2e7837fb7cedb6b1e4a538b0bd62cc4eff602dffe4c3c35bf826aa5a627afb2
 EBUILD execnet-1.8.0.ebuild 1381 BLAKE2B 82bcf0a4966d9eaf5407940b7c614ff0ab21cefef474e7628d88c263de8f67e3a35c239b3d605c029a311909ac57faf8f158cbeeb578cd50f5acd3a39ec3baf8 SHA512 d29b6cfc9d9274ea99bbc3febeb7f7763612b4e870bbdae96ba54607736b8731d6ed98bd7751c5a4977e74295ff18568d811bfbb7e728ee9d0e32e50d1b41573
+EBUILD execnet-1.8.1.ebuild 1389 BLAKE2B fd133c769ca253de323b5ac08e8c254b1047174f9b2ae8006a4c1934d8402138fad9c873724172bf1a012a4f10e3ab9aa51091fbbf28e87650f6366af0d06311 SHA512 800df19a8356c6c0011bc4aca52241e6d3be2a479c55d1147d561ec34256e1a0b33214d59443fd09061820c3e4d061cff86e8b5f9594b3440369b7c6df1e7f0d
 MISC metadata.xml 441 BLAKE2B be64fae1f1acc10cff3492e6c2cd802f9f3bee83d646868d3dbe2336b35c791f8ec0be4aad6e89aaad167f03163740cdde543c5af6dc71c0780754f97a76f4af SHA512 9f17e1724f03b55e0313dd4b7528ef1f190258bd39efe35e144ad1807f4037a08e4302f749153f511c1bd0ab01a885e3700eb3ead4764d44161c0f7080a55673
diff --git a/dev-python/execnet/execnet-1.8.1.ebuild b/dev-python/execnet/execnet-1.8.1.ebuild
new file mode 100644
index 000000000000..8990f1adf6e0
--- /dev/null
+++ b/dev-python/execnet/execnet-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="https://codespeak.net/execnet/
+	https://pypi.org/project/execnet/"
+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 ~x64-macos"
+
+RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
+		testing/conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# needs python2.7 with apipkg?
+		'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
+		# tries to run python2
+		testing/test_channel.py::TestStringCoerce::test_3to2
+		testing/test_gateway.py::TestStringCoerce::test_3to2
+		# does not like Gentoo defaults
+		testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
+		# almost all tests call py2, not worth filtering for the rest
+		testing/test_serializer.py
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index b2e093023a53..6160354592f5 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,3 @@
-DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
-EBUILD executing-0.5.4.ebuild 1085 BLAKE2B 34ead6a0101c73ae23e14513f52253ff0ede0e9c7bd5d927bb31116971edcf049854fce417861ad4accd0f10516d072e0766f48929beba4bf44bdfa516dfaeca SHA512 ac479051c079ed6ad1b4337cbb593224e81f1d8c5e62791e8f6387a0d4e8f9bb686bc0442dafd1250986c843651ada922fec6455ddb80c2b58832c7901c0de86
-EBUILD executing-0.6.0.ebuild 971 BLAKE2B ddec539f63d652620a046bddbe6c86f3239c0418a4e859db341407d85c77b0b9d8a1af8b573696e2b262442b930284919ae0ea21683ff9d4d5bb82d4156c6b03 SHA512 b35f23f39f2a92389204b04efd48dd3d356704a3e558da1977d4c726ccda22e4e6fc82e965f4562226bca44d83f5a0ad293d2ee9130600f522edde4708906191
+EBUILD executing-0.6.0.ebuild 967 BLAKE2B f3d4b98de91121ccb7a3f3c0117aef17c0d78bbe398953001dc67a950b3024c9dba6598d4affaa66b75cf1579101c3ddd3c2e00ff4be40f10234d6590bf0c043 SHA512 5e3f463c6be4d518e075e60d563ff1ae13f73616e67060f47015ff156edda5235bd394d428767963f156780fab4f6d7a19370645a760ad8f7e18f79064c49f7d
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
deleted file mode 100644
index d75b67883dbb..000000000000
--- a/dev-python/executing/executing-0.5.4.ebuild
+++ /dev/null
@@ -1,44 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# Kill off useless wheel dep
-	sed -i -e 's/wheel; //' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/executing/executing-0.6.0.ebuild b/dev-python/executing/executing-0.6.0.ebuild
index 63116e793bef..fd754d9ae943 100644
--- a/dev-python/executing/executing-0.6.0.ebuild
+++ b/dev-python/executing/executing-0.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 30b36807ed6d..1baa89f114e2 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,5 @@
 DIST fakeredis-1.5.0.gh.tar.gz 66371 BLAKE2B da9a961b9e163ba8221193c9c353f17bd23a710bd105b4fc6b9249a857828ece0b3551e3890818b0519f96aa9691166658332c25b796b22827f0951d3f50cebf SHA512 5bd4965c36abada4b937b635318d58e88ba76d30ff577b0f9b9134a94a3407a8c0e92d953e6b5299cabfe11ebe5a785e9d75406e8a07a4257674be64f6b8cffb
+DIST fakeredis-1.5.1.gh.tar.gz 67064 BLAKE2B 6eac029b7de6fb2c9b56a60655b6a224cdcba25fa86662a0423044ab97248984c4c6cfbaacbe4bbb2e3fc6826693791f232c6c55d7f15995d0e5bd00370a9ba8 SHA512 74a238573f9f911e9a39885b52d8c908d51d5620e346b8927c161111ce193566c315999f71d3edb1cb1326970985fd73d533b5483afe0c98ad76798a3c15e242
 EBUILD fakeredis-1.5.0.ebuild 1022 BLAKE2B 14a9cff3b14132348ad22120228ffe9c1e544b9decfd36bff4f239f9e407a98583b4672e0d19d4ab3f33fc4b6c1376bc281347aa0f2de1492a810ba282276682 SHA512 eaeebd6bda2f6f84452e1011a24268d62b9a954e60f4969a8e9081d474b967dd209b4bb7f7335388026c31d6a7de009ade7090d95240e5ddf64b8cf077329544
+EBUILD fakeredis-1.5.1.ebuild 1026 BLAKE2B 65591f5dc04edb14528ca2b1cd8ccd06330c78693bced3f80704fc2a1a12f68421c14ae89459a097b10efba2192b39de0d498198b1edf8c7877488dea35d3e7e SHA512 ae3997c461c698463f9f631602f1a01e7c60a1f194b0c8deecd0bec665a56cba38760fc21a894f367e329c3e52e4ad9a1a5bf181ea6d2647ea963400acf41e0a
 MISC metadata.xml 371 BLAKE2B 5d6b5f058881d62662d45b5f0207912d915fc731a4816b16ee098d19f7e8aa98f63e45bc68c6a41db7c09a84b4a82177a74e4edf566e506f287dc806bc461d54 SHA512 f43716bb013e8bcf042b0c75393686f1ae7eeac8b1f4b9c2d1acd27738d1f82427ded18f51d857032361ba2f4a3ea9679d3bcbb9ad2d99c3def5beac2873af3b
diff --git a/dev-python/fakeredis/fakeredis-1.5.1.ebuild b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
new file mode 100644
index 000000000000..7c66ea7651cb
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-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
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/jamesls/fakeredis/
+	https://pypi.org/project/fakeredis/"
+SRC_URI="
+	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# tests for use with aioredis, not packaged in ::gentoo
+		--ignore test/test_aioredis.py
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+
+	epytest "${excludes[@]}"
+}
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index a8f4ae5b33a1..76e5986385d0 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
 DIST fido2-0.9.1.tar.gz 206395 BLAKE2B 9a9b5d0dd808de896c91aa605540a1968aab7ae543336521d4a206f27bcf836c57e88aa6cdd0bacf71db8d16a0f94c2f9c16b16ca415363fd0b5e145a448ec18 SHA512 cde8c247fe0875129a890866ab76d40b2bd6feee86ff1ccb4b9ec5e6dc037e569fc8d969b51a456b5e66c6f7c67e18d14c3917375d5de85bbe7da5af3254f797
 EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B 03714bfe2468a2914760d886b9e9913c6e671510280cbe5e29d6124e6cf08e2894cd91bdb8129ebd28b2f26da62f7f969bdde2a3bf50cf4995a07d06c5ea0791 SHA512 877bcb037b68c29aec4f2ca8312643f3783d2cea4f5eb09adb277a8f9504b7c16f0146ab6fb3a95cc88de7a0b0721228773d3edbbdbe55054de57983a8c3c484
-EBUILD fido2-0.9.1.ebuild 1323 BLAKE2B 2d7547f21eabf7ffc7ebcef98d68e9876e4e197eed6e8d962d62189ffff2321563321b3b39f65beeb125cdb0607160deea40d92732dd89a61a36f9d268901857 SHA512 f065200ec4d22d9dd20d5930bdc3ea87ed7f74753b3fe83a9cb5ba1dc5559cad21053f0c67d17dc42a5eeb1e2a479b70ab86c5d2aeb2bf7f0da85ca7d7c5733d
+EBUILD fido2-0.9.1.ebuild 1324 BLAKE2B 8f0115b973f26448680a2a06f1e6623c616684b2f8c1a9e7d83bca8ed7aaf6cca446f22b984c3d09b3bc834900c21336c7b652dbbcabc249626a5ed0e17e45f6 SHA512 9c888534bfee0118cb7f5e98d4e6f94fca85c9bda0d1ddaee7fe59b3d60df307c77786320347309be67356887f18259900d4be61e2b0985dc2ef8b5a652b2647
 MISC metadata.xml 825 BLAKE2B c5e9aa7ff7fe2d8c1ad6c7d62fc99252765ef71258fbc6fb3a173b2e586eefb4da24d400c261e5888c3a51eaf5c7ce6fccfb3f01444d4c27778ec5dc098e3457 SHA512 89922697e33c94ad57635fdc4ebf316ed8d1f1eba307ce06f116aefab570613958e84b863e2f806d522fcce0a7c0010bf366c4eaa5777f8bf2d3087966f54622
diff --git a/dev-python/fido2/fido2-0.9.1.ebuild b/dev-python/fido2/fido2-0.9.1.ebuild
index 7bf7a417d636..4d049efb592b 100644
--- a/dev-python/fido2/fido2-0.9.1.ebuild
+++ b/dev-python/fido2/fido2-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 1171fe9addf1..edb9c9f02b68 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,4 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 527 BLAKE2B eabd23f521367f9f302813fa49f996a8902a770c2b493a9fd8453c43ac609fe33d4d9e049d350677415adddea8a9ca06e828773b226b7df788c272879ce4aa97 SHA512 1894a0353458d20dc030743174675373644c369c69bab23f96ed506bb12ff1e4a9abdd3de19cf22f193418e1fc4afa075b4e3d7ab3e4f67c56d3bf1dfb323eb1
+EBUILD filetype-1.0.7.ebuild 528 BLAKE2B 8d7adba80bf185047559e4325f2e91fe47a8cd24cf189a336944e3b9d9740cb7c35093a60fb1a404029b4869f23188bb47ca3beceeac07eeaa417af320fa757c SHA512 c9f3ca4d1af43451a05e448373227fb486aaad64e859f11d273370f4cbeae0141ccf9304b846425861fcfd325b405db8af5f2df9cc4d7d783e8423fbea9d97db
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index af5b020bb4ff..a7cbac696191 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/fitsio/Manifest b/dev-python/fitsio/Manifest
index 51773ad0f780..277d4fa830ce 100644
--- a/dev-python/fitsio/Manifest
+++ b/dev-python/fitsio/Manifest
@@ -1,4 +1,4 @@
 AUX fitsio-0.9.11-test-failures.patch 1560 BLAKE2B 3299a43eda8df89467474c51dec85af9edb8af52c93958e49834317439d440a0993ef6311002a4cddc4cde6aed42ed355dbafcf4f6ecbe98b81d60b9763c1c03 SHA512 224ae91e65d4b5f24cd64f3ab389940bfa58801822ad090966c4c570d5c9fb568588b3efa1dab73c2ebbbd0b5f802c2364fda31097811da78c09903814613c6b
 DIST fitsio-0.9.11.tar.gz 6020222 BLAKE2B a71a0a6a026999b06dce54beb48fab2f510951099788b51456a6e07057daa7c911d5a2841d5f15a397705459daf081ff91bff1014782c93cb1dd76faf0ef2e1d SHA512 751b9612fe051f128d8f5dea61e2d119409293051a130ee3e18836181637e8c8daea757a715012fd024678d00e234e8b6c0cc0c9229c2bd9a406db312e4607d7
-EBUILD fitsio-0.9.11.ebuild 931 BLAKE2B 01957c967ab7b9de087fd51ad54f79b560fc1093bdf1ea7778c2ae26afbd8a0f4b808e29448ef3e499b3adf82dcfb90e35fcfa4db7eca55f29a1f4587b15bd81 SHA512 667627843882104b7aac3036efff4a2ced5ca44a5ded8ba4e31124c286a36d89753395a116acbb357ed35ca2c171af4698957fd8f5a84020c91f610a3766a3ed
+EBUILD fitsio-0.9.11.ebuild 910 BLAKE2B 24876a5533b677ad919afbb503673446ea873a2649da0fcf5dd8ce90568c8feec3875590e7575e08a2658dfd3f01f38992f3090f950863420f8e42edd9046437 SHA512 07c7e1a43377ff7ddc5e693facd5a68e61a378ab4656c3daad4131986afc958cf9928e21e59733bcafd9d48c2517ccd157fb2b0d8e778f60edfddccbffb8af60
 MISC metadata.xml 946 BLAKE2B 5db7e27af3ff956fe32bb98c7bb54e7f4479fca568bcf0bb4c6c6bbdd97ac7a2db645bfbaed09ea3338f6512c75037b30ddb70aef4abcdeab6855cd1ee476b4b SHA512 75e62ae6ab0ae2348fbe678419e9d28d79373965b3d87af425195074544687b4fd54133b86e04a129a224a6eb84d07a3ab20b53cd38c09484d0f6532dd5db211
diff --git a/dev-python/fitsio/fitsio-0.9.11.ebuild b/dev-python/fitsio/fitsio-0.9.11.ebuild
index 76112220c48f..5bdf8f822b33 100644
--- a/dev-python/fitsio/fitsio-0.9.11.ebuild
+++ b/dev-python/fitsio/fitsio-0.9.11.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,15 +15,12 @@ SRC_URI="https://github.com/esheldon/fitsio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
 	sci-libs/cfitsio:0=
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-test-failures.patch )
 
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index d72c2cad265e..f2058a08fc05 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
new file mode 100644
index 000000000000..815f8aa2a278
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1.ebuild
@@ -0,0 +1,27 @@
+# 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 e2c26d690951..ae23f1b60377 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,5 @@
 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 1032 BLAKE2B b7a6bba5b09e9f30ebb55213d69a291636cea09d4fb842f6271179012bef0cac1fb33c4ba896a7c6e07fa2bc0910bc1a2ffd93661cfef71219bb53733ab89b97 SHA512 0eae0e1420a5e910fc9fd452a837fbe59fbabebaea8c67c00e9adb72a089d78c7ae5988d53e25077c999eef084571060dc2c0073da174c7ce3e6b640f9230478
 MISC metadata.xml 503 BLAKE2B 140d26af9657500e359d1d40308d83123de20d83b3536dd283d9692062b9dfb044801a3b099a7db74bc8df437049113d7e0ddd55d60b0bc1b46fb0fec53ee2c9 SHA512 ca4b90e216f28bfc736d5c617244d79c27b41564ecc33ad3f2d4bf2837bd478707ce7c08c01ac6579c839797686a94e748d725a594c7e7555352e93eaefe0c98
diff --git a/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
new file mode 100644
index 000000000000..7db390002886
--- /dev/null
+++ b/dev-python/flask-wtf/flask-wtf-0.15.1.ebuild
@@ -0,0 +1,41 @@
+# 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-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/Manifest b/dev-python/flask/Manifest
index dad54cdb30ad..215bc18ef5f9 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,8 +1,10 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
 DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
 DIST Flask-2.0.0.tar.gz 624458 BLAKE2B 82f552cbe714ea4fd64b56f88ee747c292659181139eae5fe0e496457d1f33cb5d7b464ed5250b6087c859691d89cb72a885d8640855dd9dfe7ecc6083bb0c36 SHA512 3fc66aa1568f7dce67bb70b0113401b7535dda32e33ac784a42f08fa21e08b055214218fac06dc6fb4b8f975b2a91321a6c97203f6568efc6bfbbb8d4ef9ddc3
+DIST Flask-2.0.1.tar.gz 626851 BLAKE2B 05273edacd6d66237a552410df7ef7ff367e28c273cc89f654eac5ed2eb3d26f71437169905372b398cc6c5c5067dcbea54aa1cab782e03c6186ac9ae3949f4c SHA512 fefed4971f0542b25ba2867919aa54a83b6e3f47e7cee94586543843e7e00ba209ac15d8fe28a3c53981f587aebcf2f3915a49e1a9cd1b729099dccbed3783c2
 EBUILD flask-1.1.2-r1.ebuild 1336 BLAKE2B 1d9cd737bd40369f5d8e7372376d69546d1979aaecf38bd22980a86e7b9f4027f42645d68aba5bee2ce099f37064bfd40495ccc6728fb35ad2d92f3ffa45e7f0 SHA512 f4c81fb1f96574a06a20a1d8ae7758f598b07d9957bd6c82faffe1415344ca5ddd482cea55dc54a83cc86990cd6afb1fbae25f93282e9efb0d238fad17814cad
 EBUILD flask-1.1.4.ebuild 1338 BLAKE2B 5058ffde76eb4b3066d2dab05b5d4d8e491519b89f0da39b45a3b5c7fc942246f541b183def35f6c675becfad2f2d8fb8594fd6569fcb992cc3dd0fd8e56098f SHA512 007beb976ed79d475841d321dd6fdf849a64acb1bf7409aab92f4839e621c9ec079c037bb9085a7127728e57884df1a0a35c309a72cffc184706252f24ad8d92
 EBUILD flask-2.0.0-r1.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
+EBUILD flask-2.0.1.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
 EBUILD flask-9999.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-2.0.1.ebuild b/dev-python/flask/flask-2.0.1.ebuild
new file mode 100644
index 000000000000..aa5080465c2d
--- /dev/null
+++ b/dev-python/flask/flask-2.0.1.ebuild
@@ -0,0 +1,47 @@
+# 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="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 386595e36b1d..e949b068feb0 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,4 +1,7 @@
 AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb26bbf8e1e249bc506e5c8550e5531d3252f93d99cc2bad9e317b61d10f1d87e3094f3dd8c1c2d34a85b9049 SHA512 2e628275e3db217c9d5c1a593d3ea6a8539902737da8ed2d98f96f5fc99e0e25da1d427ea153f8279f3de0d7afde14684a7898c7e01e55ebeab4a5572479724b
+AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
-EBUILD flit-2.1.0.ebuild 1405 BLAKE2B 4fceadf47ffbab46a393ce4e31cbddc5282344ea7aff580a1c0f7558338b05af097139a3f51cfe53ce028c8a8c9531c0d50e1f88188eabaff90304003bc46039 SHA512 7b4fc9b6809ab934247f113ef01ecc90fbd4af2da44914d0fd4549b858ba3337cfa3e5d4561091d4021cd29b3651a11607e26aab668bd7ba4bf5cc31eefc50af
+DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
+EBUILD flit-2.1.0.ebuild 1417 BLAKE2B 070718c185f263ebd450cee23d6ea7cb08a9c7c35638e07f2725b66f54cb201836ee2c288153baa9b0723c129fb82daa469f0035731e0cb870f897dc449d8a48 SHA512 61ca338e64c5537a25a1fd326acf55d31eb376c61d16af2403e8a77a7709951f4fb77bc63c9264a8ccaa3a68f8a6bc7be470d126994ee0da06c9c79eac6a1b0b
+EBUILD flit-3.2.0.ebuild 1209 BLAKE2B 651d171f9c9b79aaee9b42486fd4840a78a47b04a1e9059eda2523c59cbe24f3e9870438d68cfbc640f3e5d2e4db3415d4d952eb2d68780f150b4a0254028c41 SHA512 1ec0cfaf96533b12d77e76b9a8486699c7ef03e7f936fad09e1e3062a269bd57f070f9c92bc8d0abace09cdb0732bc2d7a6c2efe6d8dbc8df77ee66f747f7be3
 MISC metadata.xml 382 BLAKE2B fc966604e8ce9f4f1d09745dfcebf3f5ca4ef00471079c13aa04c52b31d2cc84512a9509151a7c96a216dd80368c5d00e2802ba0c8bcbbbf386c2bbde3ee82b0 SHA512 de756a5fab204417b2a52b90ca02e9b38cb4a261ee4133e2e986d5cab06fb82172e2f8d2bf8d177841a4dfb24af45e3ec39ebdef7075fd9c6daa436d1c481f1d
diff --git a/dev-python/flit/files/flit-3.2.0-tests.patch b/dev-python/flit/files/flit-3.2.0-tests.patch
new file mode 100644
index 000000000000..7a0a4c5c7a72
--- /dev/null
+++ b/dev-python/flit/files/flit-3.2.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 214cd17..815005b 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -5,6 +5,7 @@ from flit.config import read_flit_config, ConfigError
+ 
+ samples_dir = Path(__file__).parent / 'samples'
+ 
++@pytest.mark.skip("Needs internet access")
+ def test_invalid_classifier():
+     with pytest.raises(ConfigError):
+         read_flit_config(samples_dir / 'invalid_classifier.toml')
diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
index 2b61057002d7..4dd0cc171729 100644
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ b/dev-python/flit/flit-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/flit_core[${PYTHON_USEDEP}]
+	<dev-python/flit_core-3.0.0[${PYTHON_USEDEP}]
 	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.2.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
new file mode 100644
index 000000000000..289ae9807716
--- /dev/null
+++ b/dev-python/flit/flit-3.2.0.ebuild
@@ -0,0 +1,48 @@
+# 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="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	sys-apps/grep
+	sys-apps/findutils
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/flit-3.2.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
+
+python_prepare_all() {
+	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
+		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 23459d8b96b1..320c6ef2e362 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,5 +1,5 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
 DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
-EBUILD flit_core-3.2.0.ebuild 672 BLAKE2B b2201182b6e265b0175af97ba112fafdeafbf26cb7cf4b9611ff060608a6d64bbd0abc1b0e8d5b3976351d6d259b31689a909c7c1fc3208197535a0f8b7bd96d SHA512 e411e5bb4f5c343b219a1ecc10ca49df46501015859a853a3ff1e9a0a4dcd342cec9a2da4eb285373e13c74d0bcae0f0f7042489ffbc4c25ef8a22364cfa7f5d
+EBUILD flit_core-3.2.0.ebuild 673 BLAKE2B 3c799620fe55ed46b8b19bf00201e00eab3cba5b0397d69d046f5682a4c0981a13f2af1668c004af0eec880fda9d113762a9112eb1bc9385ce9611c4ef59d95e SHA512 648bfac710570cc6ae09156999db5ceb71dae0701ba38ec529fe62334b8e1f589a2d747c6c89d3ed6c01eee454a6bafc5b038ad63ba16421156fa8b9aedb6eab
 MISC metadata.xml 494 BLAKE2B 45cafc5e7fbac4425836c2af8bf464438ee852077e82512ef8964af26957337530744a1e65d54904a6c9469c2d9f501e15309daa468bd3bc474de91bab0fe5e0 SHA512 9d48e122ac8238876796333b91c422ec0f4f35b58970ea4d0e806758ca8e47670dc03a266b0f6e6ede0961d1aa88efd7ab6ae9cb90e02004ef2f4017912dacca
diff --git a/dev-python/flit_core/flit_core-3.2.0.ebuild b/dev-python/flit_core/flit_core-3.2.0.ebuild
index bfb5ad97f0cc..79bf4d0c2b80 100644
--- a/dev-python/flit_core/flit_core-3.2.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules (core module)"
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index f2460eb38e46..e44ef1482b28 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,7 +1,9 @@
 DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
 DIST flufl.i18n-3.1.4.tar.gz 24058 BLAKE2B 1652ea9d0ff7b853298b3647da0fa4c692b9f227f42873194dcff00b119316f425012c534bbd5df87125517bf12cdd7a6d5eaa807f1bacf7c6c82967e8880adb SHA512 02de410e1ca911e2c452b5dd48868c8c409817b867c58dbebdda6aff6dfe4d09b2f7ac4c293cbc1306eb5caa17c1f5a63e9d8c0ee59e8e41058ce0a4517257ea
 DIST flufl.i18n-3.1.5.tar.gz 24116 BLAKE2B 6fef2f6d1cca30ccd21d71fa4f6209fb01f14e576951ba7137326ca18184983adb4825b721f046dd85a39803630c3090d5a29cbda68cf4687aee620cf3afbc63 SHA512 16222e243bdc7527f040bff8e7492fafa15a7c49ef20218d4563a70b885fb497d3b4b7a8a008079b7ca6185fa640105062c0d5e26dfbd11922d7fcccd5c3b786
+DIST flufl.i18n-3.2.tar.gz 24209 BLAKE2B dc827eb4099670c6e5c39ebc8702fcda146b20a3978fa56108ab98a05d2c8911e705b71dacd6b9fc7fae9923d009487f6f047baa0dcd06a5de2e4f4d5fafc465 SHA512 07f329d026f24db623045f3c9857bcaacc1f0982066d4409fc060c4f712716044f96321a4e4909cbc85932f36fc76f71b9d118662ba837fd85b22754ce2d25c7
 EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 64c1a3388694297adc6a8389cc8ae038b54f2da974b9a3a330169f1fef7583ecd93444bf3e341f7632e33d9114c188adc18c996b2fb4fe4ff6a9b4bdb41cdd69 SHA512 27bdc802c0f90a11c5b8ccd7e7fa89587d754135cbf7de7168bdcb406906a8c6e2a186a67e726d1ff6eae629acbfe26d29c10d05f60a17575e01467aa38dc7c8
 EBUILD flufl-i18n-3.1.4.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
 EBUILD flufl-i18n-3.1.5.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
+EBUILD flufl-i18n-3.2.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
 MISC metadata.xml 406 BLAKE2B f6f83f2aab363940a49aeaf94e1c6071c03ffc43f0d055d495a46c58340f2bd7d7adaefb20a78c27ed5692f28c08503755a80c77a76259f05697ca154ea401ea SHA512 7b1c0ea21d0af33b9adf005343a9c00a98a14df62afc734456dbbe2346dfb9e4cee5c78037e9de08f5d0297f9fb78f2855e4994d631da546688bdc41eedcd4bf
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild
new file mode 100644
index 000000000000..bc9300e4f4e5
--- /dev/null
+++ b/dev-python/flufl-i18n/flufl-i18n-3.2.ebuild
@@ -0,0 +1,37 @@
+# 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 high level API for Python internationalization"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index f23fc34fbf70..59fac2ddd33e 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -2,7 +2,9 @@ AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c1
 DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
 DIST flufl.lock-5.0.4.tar.gz 29486 BLAKE2B 3fc6c3bfdac3c877c82f9f56e739342604be9f855a42a99bd06e5fb89fe8b3bc4cabd2e357e8e0992f7aa3f5ec7ea4a18e1f59a05beeeed7074a72440d3f6b9b SHA512 c08d8115c836f7523887d86539e9f11a2007913936fd8a4a116a610b648adf289fb086e8904b2163a6af7449e92a6edf9fad09fb770a34473768ffc4d8eb146e
 DIST flufl.lock-5.0.5.tar.gz 29537 BLAKE2B 978581adb55ce468ed2dd0f84978234a54293ee7cda4517dcdda2a2fc3507c965c419424f6a6bdc8cccbc15b14ebb739ff02e0c00d427f4f92afc31f913d0201 SHA512 11d0dde6addd34fd3812b346d851692addee49e7a65620acae87da791051f89638036a652645cb7fe34edd786afe3112bf5efb3fe4aa36760e2054622b0c1c8e
+DIST flufl.lock-5.1.tar.gz 29652 BLAKE2B c5b5bbfb284945d2232e8183084e4f9b24518962e2b8bf229bfd10d2e0629f0d248daf8cae544cbf50ec24c57ff2744c3cae4a4de756bdbd11fe51e810ac2eb6 SHA512 fbfc28e4e34e47b92a5b4e6d1771bf2b53ee052947d2f05d3392c3db156c5d14632ad63e0ac5b2934b8dc00176f6ff5b5fe1ff87358056ab9d71c2bb7f2c0498
 EBUILD flufl-lock-5.0.1.ebuild 818 BLAKE2B a44aed8dda606290e57056dde43ff5d00c944b9a4e7bc4319e7c42339e435a8d63ad2d5d617cb4c04370b67147ca0f6bcc8fa6129eeaea500c6df450859726b7 SHA512 6a82f7608a57ebdc7d3cf4e2c8fe3d744beae03a8e58785837b3ff790dc217c16588adfb47a6f1d9837bc99db9ebc771b4062e2d794c64a2b353bfb3645759b5
 EBUILD flufl-lock-5.0.4.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
 EBUILD flufl-lock-5.0.5.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
+EBUILD flufl-lock-5.1.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
 MISC metadata.xml 406 BLAKE2B 292a253230d4c718cf487d4ef1d760ba4e4910af7742462e99263a28f74b8a83bd12832502c918f2630a3e8afe2a9eed348f0532535253610cebea49979c83f7 SHA512 5e3d8954a932195a7cde168d5d86eec59babe5214af33da08805f1c2cb463d4369d14d7ca59bc8e3247281a556863236eccc4e317833fb560c5ae7dee84596dd
diff --git a/dev-python/flufl-lock/flufl-lock-5.1.ebuild b/dev-python/flufl-lock/flufl-lock-5.1.ebuild
new file mode 100644
index 000000000000..57e4a8b7e444
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-5.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 8036e10c51c7..ff5a5a1f6e18 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -3,9 +3,11 @@ DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dc
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.0.tar.gz 2551274 BLAKE2B d893d07729ee680c77ff3f2d369e1c77333e5a706ee5696e0843b19cfd419084d3278e35bf9f4cc3accc62bdc168d2e25cb0bacaf6b8adea17301e47cc185c34 SHA512 be80610e9c61a6f49b66b81d2e0ee50ed07e8ff8f932e3ccaf59869cce347088aa739883c6bc599dc47e196aecb69a648033dd485da3d18c84901c02f0aea92c
 DIST fonttools-4.24.3.tar.gz 2554695 BLAKE2B 8ef77e9c00a074a3d9ba92a976f5b22a20b24e89bb51e46e72ce88b6d09e5b9b77ac2b2d67aaa8988bbc34f81a17a52798bc2adb6b552ca68d36c29136a9ec21 SHA512 394d0c33432288670841d246167ca0c5af7c5dc843d8601ff7e681f8a81dba02023a1314053fb591256145b9063b8b6f9f0f13d5c319de926ec96f4f15dbe4ff
+DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 EBUILD fonttools-4.22.0.ebuild 1308 BLAKE2B 8948cbbdd2891530e5e79f05e0ff752de0278afc6659c8cbb24bfa85a6fb35c1a4869cd84642acea99d1d612c31ac8fb2ec84626c497b8d735c4fdb7edec113d SHA512 33a7e0bf787ac86abae46dbbf93f58df730076ed0c2d7b3cd0c9645d6bbbd7a019c424064a0b6293a179f36d906cfc1f59d139e33c850e8ff43171ad5b460f52
 EBUILD fonttools-4.22.1.ebuild 1316 BLAKE2B 9d44143f4439f4f8c74ae55dc801945a7aad1c7d1e30e3826b488a14dfbe761ebb63501f4a92545a1eb2b8fb6bd37ad07cc494aeb73fb72169798bba63139060 SHA512 895e3d29de74df1a1782fcc9f7b15d3991e14e69b6066b249839ef86eff3ed4853faf48d9626c63fc3fad5c81c1c4946c2cc899ce1882dae8fbab60d1aa46687
 EBUILD fonttools-4.23.1.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 EBUILD fonttools-4.24.0.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 EBUILD fonttools-4.24.3.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
+EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.24.4.ebuild b/dev-python/fonttools/fonttools-4.24.4.ebuild
new file mode 100644
index 000000000000..95ced12ecf0d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.24.4.ebuild
@@ -0,0 +1,47 @@
+# 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/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 6d38183873b1..006f2d9a1b53 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,8 +2,10 @@ DIST google-api-python-client-2.2.0.tar.gz 24631108 BLAKE2B 377b87d30a0adb2bdbf9
 DIST google-api-python-client-2.3.0.tar.gz 24912943 BLAKE2B 60233808f0f6243c37e8915791975e9aa10fa2d82e54c183582db9712dc36920d7d99f6caa67a25a96b1806ae9f96fd4f371010472b753f7a80d5e4fab49bd3e SHA512 11b9ba2f6417c017d47c9563460c38afdbfd01658e6c0f1812b1cdd1068b04bd37bb362e2ade4214fcc9a89d758f31bc977e281b093793a48641a2b7d926715e
 DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
 DIST google-api-python-client-2.5.0.tar.gz 24996941 BLAKE2B cd29420cde87584324fedc8a0ebb91fa20e65a84418cab1eae8ac5a7adedbb09a8f5b1367e3ff7606f448b1125c6d4289cb2dcd908031707774fe7dad50c9229 SHA512 b97abbf87aab42ea14907500d5955d43e318087a73ddb08c43d8f073aefdb56ef31dce7d3ce054ac8bbe6140d5adbb6a54dc977b4c504cad00fe99937f5acb7e
+DIST google-api-python-client-2.6.0.tar.gz 25405797 BLAKE2B 4961d4940b82edb1ef839b7433c69a0c0abded1593a7a229a97e52f42583d6808a3325d76a1dab4c6ff3d9c66462190e408ac22afc66b8c0585205ff7b0974af SHA512 eaf0bb958d54a5b74916ac962e6d0b1b55679ffe6a2bf663e0574a86c799e9ba3ae49ff9a986b81ebe8ba407c8dfe4e46388325f3725afe49f2b157fca10b978
 EBUILD google-api-python-client-2.2.0.ebuild 1519 BLAKE2B bbce04ff3287c107f2deffd4614c62c71fe3e147b514fd46cc97761f3a30b8593aade945b40d7272d5b34813f897fd1bfb3ff96c89fe9208cc50960007217fd6 SHA512 7604601e0431d69f1b999fc5cad59c2118a4d5c5864ed6ab803fe3faa1be4833ab1a72df585ae278759cd1e8d73c617b60889bae6e41773c0f74dd36cf78a401
 EBUILD google-api-python-client-2.3.0.ebuild 1559 BLAKE2B e345907554560433de3888b24109ad3103348a620f9f85f0c842fa2350e5c3fcbd4cae21229787b634330a94f916b16bddcfea00cebdcfe49028f5ccd92d945f SHA512 1c0638e7cf57b6e3af304741a6c80408005877abff24e88a161bbf7233ddb28463ca7b3009f2d882758021f8ac2810235bc9986ca19a385fece84b3472e1b004
 EBUILD google-api-python-client-2.4.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
 EBUILD google-api-python-client-2.5.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
+EBUILD google-api-python-client-2.6.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild
new file mode 100644
index 000000000000..5ab50082b8d7
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.6.0.ebuild
@@ -0,0 +1,49 @@
+# 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="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}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+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 cf1b4fbc0038..0c81d278b5d5 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,7 @@
 DIST google-auth-1.29.0.tar.gz 167058 BLAKE2B 0c6c9ac11330e46757bc554f7ae984d4ab94562e4524e0c579c0878fb093201240ebabc3a4f44f8d9f530a82ad5f84dd76100d57e2f874b78315c7f0d2cfb4fd SHA512 a6c8ca93ef493f16b7b16c2e1456891a09635bbc4a39053dc2c4cdca2f739692a74e4588c61c8aa5f06c1a5355ef304771770e26f1656edc0ef4c3c291df796d
 DIST google-auth-1.30.0.tar.gz 169598 BLAKE2B 4b0a0e66255abc11c697ca2c3d77ea0b7cf72cc13f6b1630307018e6ea52bda57a1f856787394455d71c61b58103d4e5e24da62f6ffd95022042b48842efcbbe SHA512 d07d6946635071e601c684a60e99ecec532ec51425aa934ece48b124419cb4c69c7651505018471431a7cf14470f4f8d894a2121999d3a482d603d41e5a8e66c
+DIST google-auth-1.30.1.tar.gz 169244 BLAKE2B e496239807ab9ca64e1b5dc39726fa22b56d55f14883c983673064b8ea33f80dee013654d4808fead0d06e8b6ddc53554d094f42aede6e06224dc3a3c04e88d1 SHA512 7e35f5be9be160ddef4b579c2e5bc966f1d64f8f0bb75220e22fd3edb9c6f6140bdcf68055fdb13dd370e3d543206900cc9403237eb328d69418a384a4d0fe26
 EBUILD google-auth-1.29.0.ebuild 1437 BLAKE2B 8ca006569936c4c27aba0c41a1101afc6cb03ee559e91c643525aa52e391edf48db40f0bc14b4f117e13cf18a85f0a3cbdf6fd5c7872878e7dde36e41c61f323 SHA512 36aae194362705122cbd36d52c431935d352b17fd0dda3221c17f900f71ab5b9e659295c2cfa3f21a67d831474ddda829435a07f997560241ea23b93755495e6
 EBUILD google-auth-1.30.0.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
+EBUILD google-auth-1.30.1.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.30.1.ebuild b/dev-python/google-auth/google-auth-1.30.1.ebuild
new file mode 100644
index 000000000000..4c3742ac5a32
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.30.1.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=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index a1ca3329e326..c4730858b9ea 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,5 +1,7 @@
 DIST grpcio-testing-1.32.0.tar.gz 16814 BLAKE2B 70205dd8857256c9c4de8c7a5d115620b908deb4da35fc3cb77d9a93bd42ece34d6fcd2d32d587f8c3ede9bf49e61b9d37aac36ebc1fddbbd6e3ff2ce83809f1 SHA512 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
 DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
+DIST grpcio-testing-1.38.0.tar.gz 16637 BLAKE2B e5d63653baa3ddd7c85b04a8979a748703037aacd1daa25e3e066a14efbcf6e9a36352cb4fd14422490246e72f7d3bff2e445f659eaf890db31cec0ddfdf7445 SHA512 5bcd2204475329bfe7ea194380152bddd440d82cb31a3a2510bf253cd4c165c06e02b607f19e93d5860eec18e08ef39bd6ac105c6dc016bb2d083c1dd74fbee4
 EBUILD grpcio-testing-1.32.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 EBUILD grpcio-testing-1.37.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
+EBUILD grpcio-testing-1.38.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild
new file mode 100644
index 000000000000..cc55c6572526
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 724f2a332074..ede25c8f813d 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,6 +1,8 @@
 AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 DIST grpcio-tools-1.32.0.tar.gz 2103777 BLAKE2B f33a54140a5356afb3930dd1ed7d48852744093621d7b252ba74ab9b615c90de36c637d1004689bd2dc3fc86757c9084795586f334a54c3ed45475f2565edf98 SHA512 aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
 DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
+DIST grpcio-tools-1.38.0.tar.gz 2128330 BLAKE2B e2d191289dd7cb1edf85ed3d63dc2c469ed03f75145fdbf8dc0c300427c629dbf27a9c4393bf37ac29545dc5b959dff20a7ac6cef679f34aa6b395c556e9c01d SHA512 0aa5827d2f6e575874b9d1222f889a8d07e54c64d4a2e9fb76610cc5ca731789cf5e9eec2dd42462eda386d96ea519040e162e0ad8883c1fe9683289311cd8eb
 EBUILD grpcio-tools-1.32.0.ebuild 843 BLAKE2B 8605ca43be2b2d03f96214f4943aa8bbfc422a7a65ea2c5cf8a05f04c1638767effdada5a1ac120255f294cd9ab508c259707324a04df0c4e03d33ca2522fd2e SHA512 99774f11ebbd4a4c026ee0ae16d2b58b3f9e68d54597c6259d578191ffda244163444a29ce5893da5053640da4f7ea81f46f452bc9bc5ee41bcad486d6fb4198
 EBUILD grpcio-tools-1.37.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
+EBUILD grpcio-tools-1.38.0.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild
new file mode 100644
index 000000000000..3cd4ae36bed9
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 5c6628dabec0..6b8cb0181eca 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,6 +1,8 @@
 AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
+DIST grpcio-1.38.0.tar.gz 21391828 BLAKE2B efbbf42ad4e67a2c39369c47f345b2a823427341f3e535737d28ff4061941bc649bca179cab84ff5457bab2ccef49146fd2cf7daeb0cae7303e47f192f250feb SHA512 7def460f1a96df65b99fae8aa149428286002aecd14242f62885622fda1568f2d44fc69c3bea28cd1568e3eaa46f03b0fbfda2a9cee23e1e5dfb44ac99ffe597
 EBUILD grpcio-1.32.0-r1.ebuild 1206 BLAKE2B 9efb8a65a9330cb803fd72fb1002c20bbb05a4c650248eff3c869f2615695deeb8a4cf698cd3cc727708c4e4b40e947ea11c2f391c10fd2b91d6823125e96646 SHA512 2b109be98186b79a61c332bd39a1134a2b3e187f222cfc08c43f69271bb0310ffeaf9deeded15cd1627f1c14d797c8daee652d9823cf7a07bacd85ca1173b44c
 EBUILD grpcio-1.37.1.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
+EBUILD grpcio-1.38.0.ebuild 1198 BLAKE2B a57a7c85950f94f79c1e7283263cb716dc26a808a32c1c0a590d6ff9c0009f0fa63e58b7531d9071bfd284108551ff8125ef0e0d2811b712ae428b67b0c55636 SHA512 00c382bec1f5b7b141ac68723de6ec2940b0f612ae26cb11c94013ba794968c67401c2365cd39c0e8c1767f8b008bf6833ca36846063287786b8b1711f28e20a
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.38.0.ebuild b/dev-python/grpcio/grpcio-1.38.0.ebuild
new file mode 100644
index 000000000000..9a037a3b070e
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.38.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/re2-0.2021.04.01:=
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
+	export GRPC_BUILD_WITH_BORING_SSL_ASM=
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 51b7013066d5..ea1d2858888f 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,5 +1,3 @@
-DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
 DIST hacking-4.1.0.tar.gz 61910 BLAKE2B 95ced5b2fbafbb890478b5ef598a836520b4d1a3f1f2a0e708aa3f3135f394aab9e1ca8eaafa9d2f9f8dfcd1043d925b0232228234021ac89d2882ad6c7918a5 SHA512 44741548b5031777b0a508255129893da63a076615dc4245fdcb2368711be0ff6e16702c12c75a7f2c6b13257e2257c58e6e95dfad6da6640ff077fbf2b507db
-EBUILD hacking-2.0.0.ebuild 1744 BLAKE2B e82c8b0a3d32bab379ed9f7103afd5ba4e54ec5b1a71a44db5d0bd14f574d224b4d27e99a3b1bb1f27f79f8da12d06e06b022f23fe889302a6674f2a91f2bfc2 SHA512 4f61452313d00d0b35e739ab80ff557c7fefff3ba269edcf34a7db159c187f06b877c49b825c1e51cb6ab4c34a3d3c62e1be0f607be3c1d6096520ee967e4e4a
-EBUILD hacking-4.1.0.ebuild 1657 BLAKE2B a217c48d5dbcee6d87af164705e9b214241093112a6d2b58da74cf15ccd835681115db3058b0eaed2b3a7478e401fbbf7d64ad4365f4ba4d32ba1faef73a43e1 SHA512 fc9dbf5fd16b718ef305fb1a5a2c190f626066d264434bee172f6e0ccf3b5ad07104e23a1ede5d1d1135e494c1a8b05786ea5933858a1d73f031e6ed7cafe1be
+EBUILD hacking-4.1.0.ebuild 1654 BLAKE2B e73d791dc4360decdd129754b15cb21461571a71f7156f6a68b9d9db0692c12dd7fce0187f2b19a7b372851562c0904dc81f8fd2cf0b3899e14dabacdd018764 SHA512 226384eedbb2ff45118806d8ffe556deb07be8870a709f27bc189b83c925e430a0c705efeb43e276c5b2b09f765a22438bd9a1ea49ac6f1742ff8f7e340b0b9c
 MISC metadata.xml 745 BLAKE2B 7108120bb708480a5a2db0fd0424cbc51b996fa26ba4d457a2bfe726ccc74405bb7475363e025977cea12426e01e00f0ed1748e8f4fd61f32367b53ec30c422a SHA512 5d546066e8e9e3578739508a442c668eaf48c69974ac7de2fa849f6310e19b6e20337c73bd8a6de2e8074f87b8d2a6089f46d3273f87ab75dee613dd350aeb70
diff --git a/dev-python/hacking/hacking-2.0.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
deleted file mode 100644
index 29f8280c4cd2..000000000000
--- a/dev-python/hacking/hacking-2.0.0.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,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/flake8-3.6.0[${PYTHON_USEDEP}]
-	<dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	stestr init || die "stestr init died"
-	stestr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-4.1.0.ebuild b/dev-python/hacking/hacking-4.1.0.ebuild
index 3a8ad04c9035..300c203adc98 100644
--- a/dev-python/hacking/hacking-4.1.0.ebuild
+++ b/dev-python/hacking/hacking-4.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 3f3d9b93a4ad..7b0c8767eaec 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.7.1.ebuild 714 BLAKE2B b5075b2ac2f71d1435ca507220e0d32be2211b4e9fd1a88bc8b0f499f348e806084c656bd61622fe64d1baf44577cda555f367c6457251932f9ea0a878e0c012 SHA512 c302b7b52eb36e25f7b7383abc94d3455df8148b223dac80acd6562036e150bb6356c968654cebc4a2dbf166b9ab391931a178b72ff38060bdf8c995223a2bf1
-MISC metadata.xml 328 BLAKE2B 5c8b1a39f847385ff5a06471c06da25ad81fc8fd114489a7d52e6bbe0b11c20c9661f25eeedf589bc71851105f863ea5fc9fd016a64d4ce7d4b4f3ebe8f2d951 SHA512 5d203be899855aa31c4b8f7d1f762a9657cd40f058edd06f7e0e94926bf4f6c7ea38b1a5ce5c2117639b479fa5e6c0492e276ec82da1d0b13afef0f0ad7aaa6f
+MISC metadata.xml 352 BLAKE2B ba9c28461a42a8288e52cf5642cc41b1fcb59749d11f7fc0acb17b9ec9178607374faf5b4a8ed7dbb3d8eacefdcc92cfa5262ed15c1de0604dfc92f203d8f92f SHA512 d9854c85277d1cac96b5675a864d8d6992dbb810f660367363b684e69c3f5ae09e4536767ee19876e5d9aaf9414c4144f806c71135928b4a50b3faa3b5ecf059
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index 61715a303c09..1e7c3442067e 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">helpdev</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 534a713836c5..edf4f8ad7dd6 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.19.1.tar.gz 263971 BLAKE2B ec254249f5c8df2a0dc3fe4e2e9088f6ca14ba84516be77450beacab41cd295d4e741ac6026471fcf8bb8464ebd732a0a856901e5c09324a0f96ad2338b397e7 SHA512 0c87b3c9923e81c83df5257ce60f7248d86a64aea0a02d5a3f34be68c692c6abd896f95214899dc6e81b23677efc7684a3cba4c1a47261176dd26c3988054e55
-EBUILD httplib2-0.19.1.ebuild 1349 BLAKE2B 9578e027e28f19f5a5517b5f750d81b901f9094fa09f097424be097db62149d0b9f624d4875a79269a5517adc29d1dfe0cb10681f74ef790a3ea733ccf114b23 SHA512 3eb7a5ea0913b7d454329c7f6790ee446bdcfb53507c4cf2f077a19a29a7af01921abfe2209096071ed751e19ab9c541a6851fa629f1e7149c981d76fbc6fead
+EBUILD httplib2-0.19.1.ebuild 1356 BLAKE2B 0c56c13cd5c62560b15732711d6eb1033efd4c529e81e43aabc16746bd25f15c09e50369f9b2b8627e24e519af0cf30b8dec8087b958a83096073c33c0e77ef5 SHA512 9d78035dd3cc007b905f867b50bac18f41ab806abdcd225a1cf39751e1035c94188df91a642db8b64e06903b9c7fe3b02e2bc979e082eb3fa9d70d1d1446be11
 MISC metadata.xml 405 BLAKE2B d6f84c1836d38410590b2da8878ee9afe2b3b8754900c140e0dcb2a8098c998e078db1d93b7d5d5c0cec8b714a4447f9bc032e98d4c4fdb84649b32c3a14e405 SHA512 3b3a073097dfa5c018db5f5a3d8c5b3a65fdc56e9c0fbf3c00610a3a256596b7b6c5d40c20e7fc91007eb27bc7d1ec358f42a4d01f37ebed3656f88896df5f40
diff --git a/dev-python/httplib2/httplib2-0.19.1.ebuild b/dev-python/httplib2/httplib2-0.19.1.ebuild
index 43b6d5c371b3..443501903b19 100644
--- a/dev-python/httplib2/httplib2-0.19.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index bce170ca1a1f..0354a6081b26 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -2,8 +2,10 @@ DIST httpretty-1.0.5.tar.gz 414946 BLAKE2B 8bbaac3d53fbf5744f7bf8ef952bd93051129
 DIST httpretty-1.1.0.tar.gz 417966 BLAKE2B 2decbfdb8b8a1e04bc2a985bb605d59ef2ee84a434dcd3c420ecf68857a5a409cee622db63bb5bf8981c1bf287b7dcf56cf91360fec4dd219dc349b1d4425a6d SHA512 a6da71115d4dc12125bec451888c30858ec94f2a3aec530b21efcacd9c595cb3d2196dbca3631f4b6f50c985c14b3c4bc6f34ec1d9e41aaf2b48fc8a072f5739
 DIST httpretty-1.1.1.tar.gz 423682 BLAKE2B a68c28155082d01d2cc3af9672dd03d6e1e0427426bc5db08fea1fe9a6cf6ceb422315f321cb66e9a6b9fa13f8abad02ca7fe78753c4deb27e220263f18b363c SHA512 29d9f1a4845b0b3dd6d3e1e9cc3f81d673a939286203de06ff34b167f69cbab180eebc0ccc4a733d81728deb2e44ffb14df25cab31475267609ce510664af736
 DIST httpretty-1.1.2.tar.gz 426456 BLAKE2B 1b593344de4d2470a6712075b8476c024ec16bfd5501d0ab63e5e15ee65d3c4a7c89a24cc0c0ccee019554ab751afa1d09bdcd162602edd0d1d7523961e0fee8 SHA512 674641509e43cb36c14af560853271495474157477350ff80a9bd311b435fb64e9aa2b710419b34b1f344ffc963f8c7141a631dd3f0d9599accb43647b5680c0
+DIST httpretty-1.1.3.tar.gz 441309 BLAKE2B 9c8138bd83fd93602d4ab72e9ee2ff27605a851ee4e7e61f5fbe0d1423041479311315cf0168acb2474c2b579401c6817f4713f61707e21faad076968b2aa1f5 SHA512 3bac68ecb78efc7592f9ab314ca9ef570c8193fb7c2ab3d3fa003b0ff623ac57d6a74f8f0e7b6c2ed45f30e520d157345db56837212d9acd4ec6259570a43dfe
 EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691d951cabff545725c42a89098786064544b83c466cb07ecf5de05d8313b54c48f11c7872523310f685ef20a0199c SHA512 0ab4ea2ca20b103c10361d858e89238583bd547e371b6bc19bf89bc3091188be0e44ed9fcd92090b55c20de1ee1ded8b34f9015a9afdf280adf03703f8766983
 EBUILD httpretty-1.1.0.ebuild 1198 BLAKE2B 8f6feb8bb19893c4c74b9653ec90414d5131197cd36b5bc4d1dccffa5a49dd6155e2045bbed9d60995853560708c1a767b013246627a666f24edada682b25bc1 SHA512 891e9a72f471f5529f2a5d3c10c04ab55cd38d7eb97c8b17633fb6c6e521d7ff81b0353ddc70e649e1dae7cc9471f9e37d8f1cdee2cdcb967344ea0be44e0402
 EBUILD httpretty-1.1.1.ebuild 1291 BLAKE2B 8e312ccbf0070c4af60df4a98aea0db7f5acdbd4fcda701369bdd644342f8bd88fe793224f748e1904b464d76ab488d499735ce7b5c27e4d60e5dc50676f6932 SHA512 4e8691c96e9da6da9881a232b860f56bf24048f4c030de3c0427e4b2ba058dfb6d695851462f2e52d9efb0c0343797a537c5ec9af2bcb5d4b614315dd73cd2f1
 EBUILD httpretty-1.1.2.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
+EBUILD httpretty-1.1.3.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
 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
new file mode 100644
index 000000000000..bf841f155b15
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+# redis skipped as it requires a redis server running
+DEPEND="
+	test? (
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+	# requires running redis server
+	# it is skipped correctly but it causes unnecessary dep on redis-py
+	#rm tests/functional/bugfixes/test_redis.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 865dafa29e64..4e1b04cbe058 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-3.4.1.tar.gz 56119 BLAKE2B 79f91e03b0c3ab1c645552ee3a0bf321e0ee620f5c0af827e44ba9995c9128638d1dc5cd80e4210de143ab55b39fb25e03abb4afaf5fa9a98973ef6c37d99b2d SHA512 d7e201717ee6b1065920faed3fa70f48c7b6acaf246a707126246d84f516fe7a14713bf4c488b18815907a0926b6cf505f106e15f17051f69756a50f50cea51b
 DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
+DIST humanize-3.6.0.tar.gz 62280 BLAKE2B 6472e332bbd4c8bd539b084889f280e56cb0b8fd3083c88b5f9fe313de734aa8876f6d9fb9b1ba3f9d6b110b5ee0d9af6881140c30fcf64c33364488f3c22033 SHA512 502ad941d9ff97677f9a6da7194ff2cddff6c4e852b84339a17eb13d71d34701b4c39c05607314a0d06c6634b5e5e12444bc97f0ae35d715611f8dac3eafe623
 EBUILD humanize-3.4.1.ebuild 546 BLAKE2B 136da0da80d4e729636d0fb03069009795d282f7ee7aa10e699fc2bcd40df7b035248fce8452ecfeda4377b058a219530d2c7f001db1215ada2fa5ab1b83f689 SHA512 539e9fec04f88a99e85fc83b3ff223d7792b60fc02ad421a7ce485e93776bececfdad27de9fbdb5a12388a3c41097ebfa67418c702936a966efdc7a03638a6b1
 EBUILD humanize-3.5.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
+EBUILD humanize-3.6.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.6.0.ebuild b/dev-python/humanize/humanize-3.6.0.ebuild
new file mode 100644
index 000000000000..c806307de9e9
--- /dev/null
+++ b/dev-python/humanize/humanize-3.6.0.ebuild
@@ -0,0 +1,24 @@
+# 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/hvac/Manifest b/dev-python/hvac/Manifest
index 0a77e99f3f65..3be1b75b7934 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,11 +1,13 @@
 DIST hvac-0.10.11.tar.gz 297146 BLAKE2B 279cd53d6aff18d8b393214c3370bf8a5a0e8f597cefc739269086db66fe4f43a931062c18d76815d777d12ffdfd431ed2174d77afb58669572e6e0e8ed9e43a SHA512 6b68bd19d5621758637ec257992e03da6b1746e5ac1d1b8d63098b6c0c1dc0c0f92fb6bd653b5458e8c55060a48619eb4d09ec4d0529cc2b3f4b91745bd2095c
 DIST hvac-0.10.12.tar.gz 301534 BLAKE2B 3d60bc428faa2e66f5c3b1e7d4aa0df7777e76f996c6d49bd9429e6a69f43580067a0de396ecc4234ed416a304f6e017f35b60b4655eafa6335666c6c00b88e2 SHA512 a52791bee2eedf488fabb488971f84f357e94812b14de36b45360690d3d018c9162dba9b8a54a719f1fe45b5f526fb729c08c8ece4f3c093f8a8f50a37731260
 DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363bef206eb34f148f2d8b6a6fa69765e2ce35048dbd0b5f802160fd81cb8fd287da698a74c0c87b2ba4a25c5b498 SHA512 d4f4c3935fcf4a15d2f12f01dee1c267cf9c242642037b816e669c004269cd0b98d90e97774408e70c325b4449f2aa35f6158d0f6d4125226eafe353fe0c7471
+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
 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
 MISC metadata.xml 599 BLAKE2B 84158e64a8354d461d7a02cf871e3e2fe6b47d5983246d7bf01ce53467b68a2e45708b85728862853e4659fe7b0b514c2c2f268f67c660cd1948df9771233704 SHA512 6382293682cf7990487a76b88dcee4e43a1e679b751f8ae79fffb1ad0640db500ed16f9d75edcad919999f72858b7a6c6e86f0a1711c22c6394b5a8a8a2a2f95
diff --git a/dev-python/hvac/hvac-0.10.14.ebuild b/dev-python/hvac/hvac-0.10.14.ebuild
new file mode 100644
index 000000000000..a9529bd22ad2
--- /dev/null
+++ b/dev-python/hvac/hvac-0.10.14.ebuild
@@ -0,0 +1,49 @@
+# 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="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 6dddfb61243d..1cffbc3420ed 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,22 @@
 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.0.tar.gz 9128293 BLAKE2B be618d42639602bc6617f8b5e9374812298e9d6150b6510a8060ca7c489ea69f1d6bd2cf9322c325c9bffc3c3f886fb4a4fb038159fa2c81920541ac4cb668cd SHA512 66fd6e7842b7b257c92cf756db4cf97bfb64006c89e3e58cda154ebe9345302f0264297df8d9de0685033a0f4e43909d65e76495689a8ded9968ecda586b668c
+DIST hypothesis-python-6.13.10.tar.gz 9132876 BLAKE2B fb9b48465fd6e6ce08423384753ef3149aac6e2b57230f44119ad685c530ac68fac0b1a1925f2ab98586265055151e9564fa287262b06aefe68c2a78d8b3ae4d SHA512 f166a025dee3ec31033d8f8a3909e6f9ee4b2e14420ae41777a41163384502cfe9f20632fb134e38797817ee19972a7068e4233e64417fb4cf5af51427a1963c
+DIST hypothesis-python-6.13.2.tar.gz 9130008 BLAKE2B 3ca5c306ac402002a1435b8ccbc034f2a7acf1553eb6095e0394ff1ddf778f47ef6f72359cb5219db924edc18623b22732b4a94bd7c269217ec632b8d59adc1c SHA512 8c7e1a5de011ef66f5105009aa82f2b23ff36f0b0906554ae65e2e55e10c4df743c894b6264002c86bae3fc5e1dd7ded7e913f0866ed725e1afd4c9f54022b7c
+DIST hypothesis-python-6.13.4.tar.gz 9130435 BLAKE2B eeb78cc647df49ea11fb0e0f4d8412e20095e7c33bb0601dcbaad2b9e9929423729b25b1bfbf2a27b05e87ae38ced4e9aeba5bae4de76cfc81aae2d073248de0 SHA512 93db99bdbe408ddbad4baf983b00b3e7624fd28d15a0d4c1453437328a51b0733db13e3b7b04b40bc60aa05e2e8364ce5b186d81a2d33e50b49f5a406fec95d6
+DIST hypothesis-python-6.13.5.tar.gz 9131314 BLAKE2B 3de7ba681ab9c0907920ea7ad562a4434f06009a7bced47b98bf46da5d15aea35085350f4aca24fd41ba9fd14957e4de1d56092d49e757ea60a1575f59371add SHA512 06765607be1a49d92382d426105021ed9dca91c5b41674ba45f0a29ce7cb06537edf706ea7305300f9aae7d8c9b1827bcaf807e3c4aece9594a55b3c0122c622
+DIST hypothesis-python-6.13.6.tar.gz 9132027 BLAKE2B 939c7b410bef3d8e38a513e55f462f72cc758b78d8c76031f382969e0a622585b6f42b35a5eb70879e8cc80ea9795c5ad2d91dd55c1d3a60035e6f8e982a46d1 SHA512 dd53352df352e12f8bb9294d4e679518eff3a4431e0ccdc7037713cc3acda6d9b3da3ad2cb7748021b3acbb1b2cfe0d76fac22de68d2a020f293073ad2ce80bd
+DIST hypothesis-python-6.13.7.tar.gz 9132167 BLAKE2B a7f58630d114743a04665d245384d3b5f6a0592d03a9b7e771ceb3ad8633fdd9c437dc6fa099d9dc48225d5d113a203a62ca29f50ff76fdbeb406f2cc63f9013 SHA512 70022d90c09f9478df94986059cbb986e35cb24d3a8c19d023a5a78c9e12982e196d258149456d6d2f01646e84a5ef07714f1967c6b31b53ad5e41ab2b5375d3
+DIST hypothesis-python-6.13.8.tar.gz 9132344 BLAKE2B 8de45b42711f39fc6f08f0621ba0de5977bb10d623f08565840ce7b922a7049adf29c3f9315f4c2515229a9b7419d0671112562afe1065a156bc4685ffaa92f6 SHA512 a1fe1bdfac6694ecbbe6cd0d7e3d04766d9be812ea637c6b5755fbbaceda326300043b340558c80f082460e606742b0075a751f0f9cd8edc61fd8da947bda9f8
+DIST hypothesis-python-6.13.9.tar.gz 9132354 BLAKE2B d0c9676d25e13c147ede7c6e5dd2d234f2e4fa6809dabe26d392101683dc5eb8fa14d63b7127d82dd93debf7d10848b2faca30912d9782adba7f116c10398575 SHA512 0e5df60f32ee8cd56a376bceffe39d28abb2e1fe9e190d452272e86e8f86162d6e262cd1d008c3635c12c60efaf258cfa379daf1de32e77a6470e41becda1363
 EBUILD hypothesis-6.10.1.ebuild 1767 BLAKE2B 39d721a030c21acf4ab802f2f9f86cefbe9580346885fab4ac10191dbc7aa97598c28145566cdebd755d850550acb841161f4219f2165a02bf73a37797626476 SHA512 1008328cdfab7d2d517923817d50e6ac2ad154b1ef2903da704f79311036bfc8c0d3ff4565372d2c1890b2344bf8e8dc0ff8977291829187efabb4d62c73dba1
 EBUILD hypothesis-6.13.0.ebuild 1730 BLAKE2B 84d537ed7efae1e6abd955073fb36da430dff3197223b86039299e87122c2214b9c5e2879d085785c6e22b2e2ba389c62e3982bdab1cc9fa6426215757e2b746 SHA512 7cf50f09c62bff9d35a4d7455590c86471c535d0d5e00f73ce6e33a43cb17d31d365118a064d2a3c60c49d6c20b0e56ebf63a33146a73de7035e250b200588c4
+EBUILD hypothesis-6.13.10.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.2.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.4.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.5.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.6.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.7.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.8.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
+EBUILD hypothesis-6.13.9.ebuild 1761 BLAKE2B 1863b7f1d260758cf26fa511605c1d4b3bc34b80a865b42734e5a8da82ced09f105ad15f1388cc7f26d47979791959ef91737852ab043be446a00b17f730a4cf SHA512 28841bfd19d43c31b234824849e3955dfdbe1b793a7614ef73624259edc4ad79b835523ecbd01033f7d27edd34b7343369ae435605bafc59cb08df17df66b90a
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.13.10.ebuild b/dev-python/hypothesis/hypothesis-6.13.10.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.2.ebuild b/dev-python/hypothesis/hypothesis-6.13.2.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.4.ebuild b/dev-python/hypothesis/hypothesis-6.13.4.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.5.ebuild b/dev-python/hypothesis/hypothesis-6.13.5.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.6.ebuild b/dev-python/hypothesis/hypothesis-6.13.6.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.7.ebuild b/dev-python/hypothesis/hypothesis-6.13.7.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.8.ebuild b/dev-python/hypothesis/hypothesis-6.13.8.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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.9.ebuild b/dev-python/hypothesis/hypothesis-6.13.9.ebuild
new file mode 100644
index 000000000000..22d9efb5231d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.13.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/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/identify/Manifest b/dev-python/identify/Manifest
index 25db28ac4ffa..6aa4119074d4 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,7 @@
 DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae977406b9d7b211caa70c27d1850cf49da8848495841281b1f192b576d269a5372215effd7d89c9211e51d51151d SHA512 25e255fd62d0e75aafa7037085362b7bf2ba8ae142bfb11e0e20452d503d8ec3f90ec84c8ef8966fb021fe1054c226862b3ce99d2288ec9aaa758a8971d1c87a
-EBUILD identify-2.2.4.ebuild 527 BLAKE2B 7f31f76b93b5af6086dd3e647ad2fd8f918a6547c1b7e0b6255bfbc6b7685bb116f1f1a6b4f790178aacf14c147bd950f7833e90223ad5827a0cc4af95d56339 SHA512 887fc5846659dec85733ea0cfa5aaeabafc348bea98faf0d3cdb5a07e0d5aa3f46e9862059c443e3c88db49e0d78e9dd2f92062f460a8469a32c1ff988cbdd70
-MISC metadata.xml 375 BLAKE2B 5f97fa87c1c286f77f578814baad9249203d07249c189e59e33353d34f91d1301c0055c5ec6a8374657e47609188e1da83cc8f420e72caa2e38a1f2f45e91ce1 SHA512 519958c4a7447a47d8c7e63349b989354513fd7c7f90256297486601752e8e8d00a233a353602ac0ad1240497fad69e4124efff72d1e4b21fffb690d68164024
+DIST identify-2.2.6.tar.gz 101016 BLAKE2B eac32751d54379e3ba5ca5970c3fc02b6ac9f677a26f7a2c91986ba6ce8773a8e51ed98f17b6b12ba920cabd3d66ca23cd765d2cb6c48253ff97c34ddb9cb81e SHA512 09694ea3d92265385a79464ef948effb5b074f5b67a8a25171b4872b2cd70537a17c87c2aa94b66e3079f2047b290300beb7ed74be50ecdf09cb723948bc11d9
+DIST identify-2.2.7.tar.gz 101032 BLAKE2B 988aecb3f32b1d1416984ad7cb5937f85600e222a1053d2800dda1c498fea2660f86ee42208611c71e29b9827e212992fed35697a3d24f02814cc6ea8a560615 SHA512 f3c4073a9018ba595c8535447c7ccb20ca1f8d8bb006b4662db19b3356afc33d810b2073810b86d7dec4572b151c53301feca09bf0662d4d683febbdf7735e06
+EBUILD identify-2.2.4.ebuild 526 BLAKE2B be61e9ff39f3a18ffb9e65cea4fe6823619d2def1a381b5e95d3f098b0a2c721d293c8b0e2843bfb65fa7dd78cb5dfc0fbca27302b4f5220d715e4669385577c SHA512 a0f5d34c699ad1c71fe721fde559dc76a3ec3edf142b162665d0b543710917ecd18817eb33b9f5928a153d248b72365fe55398e4d378c05492dde2b7479dc375
+EBUILD identify-2.2.6.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
+EBUILD identify-2.2.7.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
+MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.4.ebuild b/dev-python/identify/identify-2.2.4.ebuild
index a83837f77d4e..a8fff847953b 100644
--- a/dev-python/identify/identify-2.2.4.ebuild
+++ b/dev-python/identify/identify-2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/identify/identify-2.2.6.ebuild b/dev-python/identify/identify-2.2.6.ebuild
new file mode 100644
index 000000000000..f4471b5191e4
--- /dev/null
+++ b/dev-python/identify/identify-2.2.6.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.7.ebuild b/dev-python/identify/identify-2.2.7.ebuild
new file mode 100644
index 000000000000..f4471b5191e4
--- /dev/null
+++ b/dev-python/identify/identify-2.2.7.ebuild
@@ -0,0 +1,19 @@
+# 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="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/identify/metadata.xml b/dev-python/identify/metadata.xml
index aac3450e825e..76e0b7127932 100644
--- a/dev-python/identify/metadata.xml
+++ b/dev-python/identify/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pre-commit/identify</remote-id>
 		<remote-id type="pypi">identify</remote-id>
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
deleted file mode 100644
index 530636b704d8..000000000000
--- a/dev-python/idna-ssl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0-r1.ebuild 902 BLAKE2B f4681bbe8bbb984eade51a68c332535e3453ed49a0325b2a157c8536822de7fbecafdfbe8a620a2f42a597a91956c7bff5472c50b4e7040c48fc25f0e6057d6b SHA512 133b56eeaa10bad808ad689d5eb06715d7a2bd4d37db2bf5d84d5ea86c50adc0985c4b995112acea0fef01a14634bbcfbe3feaac0b9188069103f6a4a4bdd4de
-MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
deleted file mode 100644
index 28590c6525a4..000000000000
--- a/dev-python/idna-ssl/idna-ssl-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# this is backport, please do not add 3.8+
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
-SRC_URI="
-	https://github.com/aio-libs/idna-ssl/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/aiohttp[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -e 's:--no-cov-on-fail --cov=idna_ssl --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-	sed -e 's:test_aiohttp:_&:' -i tests/test_base.py || die
-	distutils-r1_src_prepare
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/idna-ssl/metadata.xml b/dev-python/idna-ssl/metadata.xml
deleted file mode 100644
index e0f41b17f555..000000000000
--- a/dev-python/idna-ssl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">idna_ssl</remote-id>
-		<remote-id type="github">aio-libs/idna-ssl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index ae9f3898c7d0..445ce3975ce9 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,7 +1,9 @@
 DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
 DIST idna-3.0.tar.gz 180786 BLAKE2B f802465ccad978600af0f6b2aeacf4fa56957ccb73625ba374663bebc5a507986589c54b7a81c7303fcb97f8fac11695fa6e159236d61e6e29c110b8a8a66143 SHA512 2ed384e75fb3d873a19c6ee49915a48a757b3617227015f92f5e21b130cf30816ce3abf25d9ffd8931e080e645416fb0551b1be18a2d0233e02bce2e4b6556f3
 DIST idna-3.1.tar.gz 181601 BLAKE2B 1cacc2ad93de4e7f3e4faff72496dd17162a042558c6771d4ed39c68c33087633d6bdd141df3d4f867befde16acdfa82aeb0d70c36b1b1c62bbd0b3b446aed63 SHA512 23c02520d00a99855d552a9b9def529f0baeec7d27e8036c544dd654ade15243fd5c9e5ad02e73b83a9ca3bb335ab2584233d17345a6a5e6d5ac089e8ac81e8a
+DIST idna-3.2.tar.gz 243962 BLAKE2B c1c53533fd70a705822abf7debcb98d1cdc474df63eea22f0502585f9f2d143c4a35e575081951a8b98325e45ae5af46bba6632b04d40cb7181306e293377884 SHA512 2bc8e37abdc0570e5e13c9064f51630605806c3246a8d292511dad6f971610288212a2d881f9356ecb383f871e1477ccd60c4a5d6d7fd05254ff740d36543f35
 EBUILD idna-2.10-r1.ebuild 637 BLAKE2B dfd1ad9cd57e65beea353a73d35e189044a3cdea3e3e8fbc1162c3b40406474d94f43321cbca872399cb8a20246ffc476afba5dc01b3da605f9d2b8a0ebdd19e SHA512 5271722357247bd38397a61df60c4c9fa5d4fff02000878d56eb32ef902affb9fcbda6ca36d5eb78f35967fb968f539c7e21075db5393ce4a560c2a1f4c8459a
 EBUILD idna-3.0.ebuild 636 BLAKE2B d8cc0944c382fdf44b68a6b8f1d4f01621645b5371291f0048c865a1f09bad40c383ce109e8e78137fa84fb69fa759d064e55f794207058c44abb7673e2085a7 SHA512 6b073ef11f170f952cb14639b5223bac6471fda11addd21a20012bdd5c5cc9e3b7a12362ab01273dbc32c0140346eb9a0a39c4e841592cc453454fbe31c0bd0b
 EBUILD idna-3.1.ebuild 629 BLAKE2B d35f572bc1077849fc663ffd68e7660067baf710b924dc84c92a1116c4d9190812bbc6479b1dea4b396e93abb05ee0a3618a2eaf9ee2ac95c04f245cfea1d022 SHA512 d74e2af4939e768f32da63b7b286c19fe827b717b8634070ebbb324e05034a036dbaa18ac08d7bfbdca8643873e5d483b2ca47734736872553f884c0a401736b
+EBUILD idna-3.2.ebuild 637 BLAKE2B f48da0a8819dc6905d64cd28c8f51392cd20ebc1b063f1b19dec3e72195f61807eb1960c570c786ba02dae4433d9f17ed680e63b6c8ec07227d08ce7dff85503 SHA512 ae761c15d7c1babd9dd42c7876be4333b3adbb47110653771b1855f07235ca44cf04e2728a297d219378a089e366d08795d1c2920539fdc8bed60f5b7a827153
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-3.2.ebuild b/dev-python/idna/idna-3.2.ebuild
new file mode 100644
index 000000000000..aa34addbfa46
--- /dev/null
+++ b/dev-python/idna/idna-3.2.ebuild
@@ -0,0 +1,18 @@
+# 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="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+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"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index 7caa6c21b7ce..65b2549a9ef7 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,3 +1,3 @@
 DIST ijson-3.1.4.tar.gz 125725 BLAKE2B 870439690c0b776d04c3023fb910d0f9ff2ca573be728c06802fbbbd5de1d5dcb8e677b778d30cb134d181dfc4ffd53c686af3d57458501d9548ddbdba8bf6d7 SHA512 7e64c4fec84fd6942c83809849eefc1c299c597524c0fe73e2cdc542e113faad8f35cc5219b0bc4e05842ac69d8608089d7cbb2dc006e404c184505392b21baa
-EBUILD ijson-3.1.4.ebuild 570 BLAKE2B 1f20bc61b9f59f43bcfeceba16ef5acd0b4a196f856b6a6df4e4322525411f80cf31a98499b50a3bf4d5116e0dc2bea22e5e975cbb485920772dae80d5959bcf SHA512 940646abfc15f78e7474c53dd06654e9f1c4f3d43c40862d4728863d06a195020a24b143a30a57f4fd2a0a33237099753d5691ed1af78b43b38fd9de4c639ab0
+EBUILD ijson-3.1.4.ebuild 571 BLAKE2B b4e681c34bac09a35c06304062f828e620ad3237913f9da5cffc4fd9a2438e25f4a778e86fb53da3aad1caecf07e52f4ff18da5c7f40eec0affab62b0c13469b SHA512 debc3f1d393a61f57b9fa084126b71c580a3d9072fc41d21d75b914a06be53d5cda5cff2857e39264cdc2cfad022c9c6074398d4f1cdb6bbaa7d5fb59d177589
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-3.1.4.ebuild b/dev-python/ijson/ijson-3.1.4.ebuild
index ebf6208f293e..a7436b0a48d6 100644
--- a/dev-python/ijson/ijson-3.1.4.ebuild
+++ b/dev-python/ijson/ijson-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 MY_PV="${PV//_p/.post}"
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 22dbdbf2e65d..8921a45c33e7 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,11 @@
 DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
 DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee722762c3cbb034a534dab6c24523ca76d25dde4cb2c6bb06cef7e787db9a9cd83ca08a71bfd7b849db57ef4a95e461e6d887b14e SHA512 bbdf7b3f1e714c5a02babe0f9ff5eb366942e21b626d1d61839ee04040d0ed529cd299afd446639795b34665be20e6438d8e9970292b282946a8b6495682f726
-DIST importlib_metadata-4.0.1.tar.gz 42189 BLAKE2B ed0fda0a2218efc75ce4fd614c8d69767042f035d026b28348d7909b7d6a520e6c1a6f1edb8a00f5e0c0e0e9f818d65e97ad590471d2398a5fb21f4efbdad600 SHA512 972e2f4bcd6433f603f0c6e23f4dbf4269993a47a5a8f66740e0143df63568ea8ca4ed6aa84587dcf967c6c4ba93e5d5ead9ac9444db9bc6424bd8c238f8335e
+DIST importlib_metadata-4.3.0.tar.gz 38461 BLAKE2B 5c8387aa618b6561910adf48a701b28556574abe0a4aacc6ae8fbecb258cd0308f637a95402a07c2452ba92daca39034a5fdaac03608e5112534c379e66aa4b9 SHA512 44e3da5207ae6900059758ab26636798fafa9d186d045096e382660083909305887e28c63c2147c940f0af5870d1781f69968c9cc992e50811b5f9b055048459
+DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
+DIST importlib_metadata-4.4.0.tar.gz 39577 BLAKE2B 1c1536b72385380176febfe012b5e47bc4d1b1382e048dd6383b5097f8047404a9a726438100e6f812f397f425e4d0d92ff296530e1f81cf16d3f26a57f47e48 SHA512 d227caaa1130d5023a87e5fa32aa1cd473ff0ae09cd82969be86f4301402cacee068dfc5d744bff82a18abb86848780013b6e6b2ebfa8a568ee027c270b90efd
 EBUILD importlib_metadata-3.10.1.ebuild 1273 BLAKE2B ec33cf32a3fc2a92666c0e9aac0d3d72968b7e31d7c8e4f5f6e90462b8b07efc2754f20c011a11065f726a6197b642d08eb4c6c70240a64eff67aac23b51b3a5 SHA512 eb3e8fc070b6a7f797ed1a92fd34bd7263046ed44603a436a882daf38d0da3a4eab4c981ca6c0fd6d4c4a3a0d6ba5822698f82b7e3dce90ae8b37e0017f27cb2
 EBUILD importlib_metadata-4.0.0.ebuild 1281 BLAKE2B eaf8b2c298ee8510f9182e88d2f01bcc33461c7c4fd18f5a26f06a692c6684618aeb3747bea8f330d0a6e2926b1b86ef0eede8d7aa73022c0e6372ffbb13492c SHA512 77544555aa575bd4accb1a6bf073e916e80b094a77af906bdccfe05d11e5ccc31fdb0c6ee218470317708c2d3b1a45d71a1e9d7893acf486eff1510a9809f404
-EBUILD importlib_metadata-4.0.1.ebuild 1196 BLAKE2B 3ead6c5f928b927213b7e34f1d6e8827964f19a2887c2c543483eab71003410f31a2098a33bc926630a76ba2f33e5c48c52b24383a6645074b5d2a82032d027d SHA512 5de2f8ff2a79ddd95065d3bbfc0bbfb10a5265f52e0d3dcc6825989d632aba957c605a0ca0fcfa9ab1c040359f51a17bccc54fa4497b2ccc744b972dc53c084f
+EBUILD importlib_metadata-4.3.0.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
+EBUILD importlib_metadata-4.3.1.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
+EBUILD importlib_metadata-4.4.0.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
index e7af70accd2c..49bcd216dd9f 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+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)
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
new file mode 100644
index 000000000000..49bcd216dd9f
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
@@ -0,0 +1,42 @@
+# 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.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
new file mode 100644
index 000000000000..49bcd216dd9f
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
@@ -0,0 +1,42 @@
+# 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_resources/Manifest b/dev-python/importlib_resources/Manifest
index fd6d87b4e10d..d9f57b9bda49 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,7 @@
 DIST importlib_resources-5.1.2.tar.gz 32177 BLAKE2B 5374cad672f7324cc31ff4709f0fda27dc48435c2469282fe84bb9a453917ce15b1c3529f502a8b42993638768e7ee781a4601665c60ad6da2811748b4866006 SHA512 894bcf55aa4789a8d47d832cc9a20ac0763270e78f03548b7e714d18f64f4b4ebdabdadb4dd1b2bc9513df13a3f328ef5d62e6015878738ea59e6f139e4c195f
 DIST importlib_resources-5.1.3.tar.gz 28613 BLAKE2B 7edf1d75ae977c674223059504e5d7912cb83503d7a70b0b9251c5af130acf8c1466b0314c583167c1210a3fc3005d298be5fd1e6b1d7e6d128ad46142decfab SHA512 cfd778e6a07799577625a0102b79d3fa69c710215168b6aaeffea68db41ff84ff5c15681fcd4d68be043a618554189720520fc0d1266df3e522035924903d39a
+DIST importlib_resources-5.1.4.tar.gz 28783 BLAKE2B e88cbe34dfd9b251fc78f2aba173f3eb657462777cb66454fbc1735575c6cac6a868f5e40206fb8925aa8c7f708d72624693cd772f2335231bc5da4f417d622e SHA512 ede757b0ee4a246a3446a165f4c8e56edf326f90464f01d853b6c04042371ff1edc4e41f388c6ea6973302a183cf1c04ee21335342886747c991ba0b38c7aec3
 EBUILD importlib_resources-5.1.2.ebuild 822 BLAKE2B a5278d617f596adb9b4bbd2be1327f8d3101705e843ec41314fd8de71880998451717406fd06547e7467c13906c4aa4e9134f88ac72600d0a61b1d73cee86a19 SHA512 4f541d1afca24b5b3a7a60bb0b121eb3d513f67e975f4f5217b8669ea444ab52bede560ed0ae13695f243f05208b6955ff2d5bc56afce03a853af0ad6c19a7bb
 EBUILD importlib_resources-5.1.3.ebuild 830 BLAKE2B 202b6e72a123540ea2ac6241831ac814a648989e411d75e40a63f44cb1d31114ea877bab62b188f64881983a8273b5ce94fb7a647213c41a8b02be1526b7e556 SHA512 8c78ba7c7b2470e0d18b4c720fb756fc7967e26369f94ea509da875a848b2651c4e1c75b29b90917b97b58af964f866668b813c6a51c1e7881665bd414d98ff3
+EBUILD importlib_resources-5.1.4.ebuild 838 BLAKE2B c396c0af2150537fd0c12450184fc13582ad13e0a933fa043f410cb991f467a78c83df89836a88475658401c5f2f3a2cc47c57bd936b24d83b820a55860549e5 SHA512 66ea0741fceea94b297348f3e87c0c2129b0ec9223eeb0fed11904410bc42cd9777064c2f07befd1ed9b1cedb9fd712f1c67df996cb5988fa3095fd5fac45e77
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
new file mode 100644
index 000000000000..b0057246b1c9
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3 python3_7)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index d6ed9d11cf4e..2b6c627e0d2c 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,3 +1,7 @@
 DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
+DIST indexed_gzip-1.6.0.tar.gz 99260 BLAKE2B 15fff478a275baf59f152040455502f57762889959c4d2989e44b626dad25d381ff73029107c4495b477397ff5dc0763d1934f23bcc85a6296a0eec85a36b421 SHA512 0e01da5e8c527202c1f18148bad2a8ebec9ca0bc1bc49ce4804c6a32397797525cc7bfdfc254139c3c1b037d3f65171c010453ff3fae6e6256304ddf486bc58d
+DIST indexed_gzip-1.6.1.tar.gz 99290 BLAKE2B bbaa0fe55c132fef4e392c4a154cc7f5cb19e25761af298d70a8c9f5d1019701f0f470b9bcff333b02b0ecfc13b823a5cd64c16cfd2d113955f7e59837dcbd7f SHA512 8b508ac7fc161b75ee7ed9cc0ce8828e0f195c3aa676114c54d5b2767b9f2e56b0c203e63f2036245ede9649138d197dffabd67f41b41232e6c66e2ee1336529
 EBUILD indexed_gzip-0.8.10.ebuild 805 BLAKE2B 8a9d1c94f2492934ed0c0208ea1a525707130c21828e0a7cd2db7fa75b2bf6605a8715bedd312d738da6fa722afd7cea63b5fab610113367e9d1be21a49b3fa7 SHA512 85ee0d4b7a0777350647f4bfa2afbd2e4b97874507bdad69c186bbb898802b2255945e956f062f10181bc98f01ec25c385a7abb2fa2ba0291f15b5ce1869f405
-MISC metadata.xml 926 BLAKE2B 86dec52a10883f8fe610f84c989b5ce11b6ea80653e977ffd9797ff70159db47c2541c98cf9757f813ed743b64d66c1a8cac21f3981eccf588d8fff972334bf4 SHA512 4f1df7ec9af73aebed4127b05bf2a77480571b6e983bc68f9366dcf480aa5a5e873cdeae4c0bbde6881c7823c4e2f684c52daf19ca7dabb93a0ac1dd27d14ebd
+EBUILD indexed_gzip-1.6.0.ebuild 935 BLAKE2B 8f60053b76421add4ce3a11bf33baf5964cedd509348e1a898b8ea9be37da3c2b104f2cbaabfd0d6e7d6383ea0733a149654a540d8b802c950dd0496e6335853 SHA512 bbb7d3514ccbd0885e3b3bc333826eb8ef3b356782e202b519b13bf536a885b10a54a4340c3fdd350aa5caf089b7a14516dfd85e695f521ee2dd5368777ad3c2
+EBUILD indexed_gzip-1.6.1.ebuild 839 BLAKE2B 41902763e34f6baf95e9aa0b01e2dbae4af66556574fe85775da351a758a626d236ea2afc76e929b09b884bcf2ab9265a706b40ce520e992e5ee0bf1a428ba62 SHA512 3b6e23c2c5378058ebefdf0577a0320e1daf7af2ea560213cb22100c5e03537307ecdbf874e3642c7cd5eaa8ce3e861694a8ff46965ddb3759e7647b5620aeb1
+MISC metadata.xml 1027 BLAKE2B aaa13506d6a2c422d80d88cc67eea62f7e049907c2900b24ddb7a4550cb0e79d574b33c70ec7fbde207c7cb98e1b76390398813c61e38ae58ceb1139e2899868 SHA512 2ae3c7cf2c23908538e25be293ecee3f38519b5062b473593e486b642b41db99a91ea0eea58111f10374cdb523f4b913c304062fab5657a2ccafca48380a5e63
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
new file mode 100644
index 000000000000..6803e7e7dcc3
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.0.ebuild
@@ -0,0 +1,47 @@
+# 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="Fast random access of gzip files in Python"
+HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
+SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	local ignore=(
+		# requires nibabel
+		test_nibabel_integration.py
+	)
+
+	cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
new file mode 100644
index 000000000000..6481acb4f3bb
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.1.ebuild
@@ -0,0 +1,42 @@
+# 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="Fast random access of gzip files in Python"
+HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
+SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
+	epytest
+}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index cacf75bd775f..b30eebebe8b2 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		The indexed_gzip project is a Python extension which aims to provide a
 		drop-in replacement for the built-in Python gzip.GzipFile class,
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 30a080b1035f..c838df51abe0 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 803 BLAKE2B 8165333b80e334f7cdd938d778f7c261677691a6f9b4c4eb8b99d49c7f713319c32a995e9b987dd16df7612abcf1e0db5f7f651f508f9a29427d639426249be7 SHA512 77f1f93f63a7b6ca196cc2f98ac7d52562c6665f9e2e3f8a4a789763a7edb654fd6120c3fa11646b620f7c579a9c9ac7007d153cb9fe6a526f932f40c01b02e9
+EBUILD intreehooks-1.0.ebuild 804 BLAKE2B 17318626fc22b1b96f32d360c520c97ec9d55a7deabf13ee534e5a8c01b36134c0da1d14566c95d86939bbcf78e415eea478f8f4e04a6aac33770f8415f5a466 SHA512 e49688f664dda8573d819595130abaf45f219a7197f4f1181f89c72ed45db0cc4672b20cd8806f1d19b564262756988cfb612ce926ce71c1efe0994b2e308e7a
 MISC metadata.xml 503 BLAKE2B bf6af8da27cb19f77cb35df083ab385eb3f88d36fb5c159f01edf11e7737c0b61984126c835ea0b9be95ef3601f7ceee4f8b5d0ec169ac717d0e8fcb56610271 SHA512 41223615acfe458c4a3ab3b2716292b024f563f6ed62d9ea06225c79b90ba08196c71c3a5af50747839081c57e500303e5a7fcca79db1304e622106de8b847b4
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index cba27a4650e6..de53a841ed6d 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Load a PEP 517 backend from inside the source tree"
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 79c55ea10b21..7d17634fdab7 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,5 @@
 DIST ipdb-0.13.7.tar.gz 16437 BLAKE2B 3f4ca56f0279f4bccc14eb12df48e03b938ff2de0e77a5fff273f82895dacc8d079f5ebd66f63568f62f3f1ae3f266695a6bad23911a872b5ed0f1628d32d1aa SHA512 14ccccb645bf3fb303d82718ed9f1e7fd19d699c9a875358b336135b40f9492b6c9c260c53fa87f38aa381e989e6f6c801f081eaa361c8e929c6e1b0bbaa300e
+DIST ipdb-0.13.8.tar.gz 16761 BLAKE2B f049fe4cfbecc6df7162069fb79e6493fcdc9a680dc33072b00a278ce7a46187a2f132f2252989c41f7263eb5b433905facf597322c7c20a1d2b7a0ae029e193 SHA512 5018a275e47eba26fd399b6d946a8c1f556dbe9b5392ef14e2766bed3f080fb9f75fafe79a598d052eac6152a5e347ce82f455250946c5b33a96e033887c4f92
 EBUILD ipdb-0.13.7.ebuild 541 BLAKE2B a59bf02b8e23d9bbe8fbc920b49654b40ccce993f1a651aace9ad233185687c63a8acd75bd1aefa632c8c7957cf6c23e24d6f85df3c1579f92ec79d206ff14d3 SHA512 632770b68ef19b0a9669b7964052c457f83a95333be380dfd5206a560443926bcb53b48831ab4fa1596bbb3e637df057c0d58aaae97e7289ef207b15230a9d98
+EBUILD ipdb-0.13.8.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.13.8.ebuild b/dev-python/ipdb/ipdb-0.13.8.ebuild
new file mode 100644
index 000000000000..4b895e23400f
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.13.8.ebuild
@@ -0,0 +1,25 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.org/project/ipdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+DOCS=( HISTORY.txt )
+
+distutils_enable_tests unittest
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 8abb9a5bd4b1..db3ac28919b4 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 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.0.tar.gz 5146172 BLAKE2B 9d10eea9c329c78d7698adda999d746cdb305fad71ad521bd2f856590dd1e34010adfef045633bec07f8a6705201325815bbc254c23d74f0a17d73d2c3c060fe SHA512 67f6392b5448f1526da67577e8fa84958c99b3ac71c616c78a034e5c20cd06224134da45a8c3930a3779ce98ebc983bea2f237b5be7e8ba9d6fe97fde91a0608
 EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
 EBUILD ipython-7.23.1.ebuild 3842 BLAKE2B c8e2900a436112ba50c3c5bf505da365359fe914dbbf132dfb901186456276472bfad6d2bc0e1290b1594ccac2d5368ec876e1dd786e58e12e37ac2b005ee3f5 SHA512 921a79ed0b75e69f1c390663e3a7a02263cdbb65cc2e580b5e6b1717d46b9eb742e0382f5aa03c220dd6fe95e8f17b7b27d4e0b87ef6b0915b834f4939a6a87e
+EBUILD ipython-7.24.0.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.24.0.ebuild b/dev-python/ipython/ipython-7.24.0.ebuild
new file mode 100644
index 000000000000..c085c76819cb
--- /dev/null
+++ b/dev-python/ipython/ipython-7.24.0.ebuild
@@ -0,0 +1,139 @@
+# 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.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+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/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index 0600498a927f..122a17b6e829 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,3 @@
-DIST jsondiff-1.2.0.tar.gz 15076 BLAKE2B 2d659598e6c647c8ea6622fc982808381e570c6ced23b5e77431b52e9fa746a5dbc743c739506362497d1f45dd2c290f23f459713ef31e927c05816e56659762 SHA512 5aa391ccc42d07330dfcf272b78aeb130f6f9033ca8b00cbea93549e32f07b98ea84cd6a1e61ab331da3de92838c69a501f95a9adb5f48e2eec46eb653264d55
 DIST jsondiff-1.3.0.tar.gz 15283 BLAKE2B 408070816a4b21a3f11f5b039464ba276fb253f712f29930454167d3aff22f78b4d828aba5e28cf05587c8a296b908fd1945a65958244a1093279bff5e3a555c SHA512 512e34d1a0673ed785f066c284c09412a3590ad916913ae1885ac567795cc73e2adf30596b60b64b6b379954e6cb82d5174e80dd9cf40ed53f6968bec8a3d8f2
-EBUILD jsondiff-1.2.0.ebuild 771 BLAKE2B f7532274af59c8cab5301e95a87b52e59ebc9405b835b4a718f495159adc4207c7c8206feba13f42b9780edf7c516c4efae594f4d0bafd762b7cbdeb12949bde SHA512 236c2cfe41d3a74a8afc5fed7e4cffc9fae071da390f023ad20eed433cdf750212dde180c9e2df7ba78ab87e11b4dc2e5f04c03f37c72853a1b7bb1e4b38c55b
-EBUILD jsondiff-1.3.0.ebuild 778 BLAKE2B 237e0a41d86212ea823f3700fe9e923ac3ffe20753cc1171b8cad381bb430dde82b28639324c9886b5ce185a93664045635ce6511a36d8a68d643bd59f429fc4 SHA512 261b2a3585fbb85e49675dc50c152e83961174417fa8946265372b6b9c2e2f2b2f956ba2dd8e92d377c5c5c989d0979ee6af01635d066c6390403c883c4d77dd
+EBUILD jsondiff-1.3.0.ebuild 776 BLAKE2B e6326a47df6281677346f590f5ed3490eefcef417fff756a170dd8e73258fe7a1f159382afbb721b346dafc7079685ae071cc359609bdb17f053fe4d38898281 SHA512 408716e01e9c39fecc33339b97a1867cf9c221d57e75d201277df8829f62bff680b31c805a80364cbf93ea6698f634be1391da366ed628e8ebfecc63359d2d71
 MISC metadata.xml 536 BLAKE2B b4fb49f36f553a6d01a07661a0b273a923f6fbe95661958fb742b1149d6679e05771dc2d9825087647e5282f33b11b60b00ed11485a3976dce5b4f615fd1afe6 SHA512 9d0e82a422d7d2e40cd68d9f9b3f3704049b73ce22496763199517762c6531fac861edeba777ccb2a4769d0df90d4749d7cd57542654e8ffca3cc73d733bcc0d
diff --git a/dev-python/jsondiff/jsondiff-1.2.0.ebuild b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
deleted file mode 100644
index 42d878ac2aec..000000000000
--- a/dev-python/jsondiff/jsondiff-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="https://github.com/xlwings/jsondiff https://pypi.org/project/jsondiff/"
-SRC_URI="https://github.com/fzumstein/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/nose-random[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jsondiff/jsondiff-1.3.0.ebuild b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
index 9dddb4004e22..8ca8da9c1579 100644
--- a/dev-python/jsondiff/jsondiff-1.3.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index d27459a15baa..ae1a3352bd43 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpatch-1.32.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
-EBUILD jsonpatch-1.32.ebuild 841 BLAKE2B eda03acc39dba59f02ad14ba31a9817a94791a1b986cbbaf918d88a7bfe466e2585138a0f21cdef26631fcfc2637d463e4d1bb030c7c2d9812fd55e6d4efb24b SHA512 300e06017daab02ba62ef66b386ff2d3a6ccb0f7a9566c8d094e82b6d2a752ff8a015a59f9d8a5be84bd03bc0d8677bf8123e79be9a6e7d2210810c931629cf1
+EBUILD jsonpatch-1.32.ebuild 842 BLAKE2B 959fd122c0d2bf3974faf884caac9f7aa3e27298ce6a7d9122f000e01ca855a599ad291bd903d8a630a7eb27a5a111ffbe7dd195b140318f1b49af1c463958b1 SHA512 340f7a4b6b10ed0cdb7d1c5c8d3d9d0fa2eb221bc40a7febb5bc98a48d48658671433e51ec6d894684691ab55a47fc03650ff13154930d092fab493da4b97886
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.32.ebuild b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
index 6bde08476be5..c89913404859 100644
--- a/dev-python/jsonpatch/jsonpatch-1.32.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 670efd3af8b1..1512230db762 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpointer-2.1.tar.gz 8190 BLAKE2B 5b9d0b0a27c6e2d133de67cf0ff9442e639a06011005f94cb425568fd3e5678b4832e9467720261fb85669e8b83eac73b1cfa8058adbd78d46339cdf8359561c SHA512 4eed8c7fa908ce3ca79884e98b1b0e818d24515f6b7b2067daa49ab6dbd989be4bc43f387e980773c9fc17bca89d2039750cb0df76675259050e3f48c16da3b6
-EBUILD jsonpointer-2.1.ebuild 605 BLAKE2B fa71f2e7264bad82ae5571f863d3b1bf5a2acdd0b7cf79af02ffaedf6332d545ff88da8eeb6cc9d1cc93eb672181da6b6e1d515632486e8fc886423900e16f7c SHA512 740d8e002e2a516ff21e56f26121f8618206224980c004c5778e611d4b89fe3d21721a698d340565b7ba6d4725d0b18867b840273efb39a686501b5a81dd57ae
+EBUILD jsonpointer-2.1.ebuild 612 BLAKE2B dfdcb4b5642c6e13a183889acbbd34d448a0d6174bcb96781e3e451d499259c8fd6dcf301269b8990f4eafb75fec1758ef58b5619ae1f6b97187dbc90eabd5c4 SHA512 d11200f2e311655e165eda88413f4fba54ee8abe21bb6435f0ab04b0b41194d079d186ce616a1c6ce293e0c2b2351aaedcd21203f5904ef19a69288426f4942f
 MISC metadata.xml 727 BLAKE2B 124b8cccc53c9c288f80c9d55132aa4f84ad81986ce7c305fa55f5a46fca29ebed88d1094bfd2462e07a131a4b925a92eb40c2d35ee0dea633767bd25d2ae2b0 SHA512 5c95179eef43a3a6d7b2c2c1a57364c25068f7cdda3edd5ea860601a730a39a8460de19dd7f914b62c80e4031e44db037fe803e53df6d997d1beae80100652ec
diff --git a/dev-python/jsonpointer/jsonpointer-2.1.ebuild b/dev-python/jsonpointer/jsonpointer-2.1.ebuild
index d79126d76a34..27ea50cac550 100644
--- a/dev-python/jsonpointer/jsonpointer-2.1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.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
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 398f35699a4b..e5c89793c2f1 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1,4 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-3.2.0.ebuild 1653 BLAKE2B 5395eca64d7e258d2325dc35e500c030edc6b235ba486b7a091dc75fdc6f00e09dc4dc6350a3184aa85c227e3414a1a4fa8512824856caeaf9371032223ab87c SHA512 e4537479a7c2ebd72561e56f3260fe9a05b2bd2942dc2ef55d2b98e991aa075a291ea76dbb63860a51a3d3aecc529819be5fcfd653f4e417a4bbcd0648114a98
+EBUILD jsonschema-3.2.0.ebuild 1659 BLAKE2B f3e534a2d7c16050843b991f871777bf273d8a5890ea62fdad14a302b6b8f4d548931a574a121d7c394bbe9595caaf8c5a25d42b3944a569710e35ef9515193b SHA512 ef62b6e3cc4c044334e9c8c4f2b228e4a6248a207a6315acac065962d65b6ac124365e893f0ca32bdb2955e93cb476103c6019a2af56c78f4fb410fa836727f4
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 687c4e5c4ca5..64e6301f0482 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 34a3812123f2..6df24ee81f1a 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
-EBUILD kafka-python-1.4.7.ebuild 761 BLAKE2B f9cc1c0f0b8dbd7a3e4be19131b976ebb848ebbb013447484de2fed046be5884e5ea6999cb963aeee80ad453e7607ac4be2dd351e1ed58ec1866c9cc7c81aae6 SHA512 06c544a0f5f7450f53201142d5b963331e20bf0711d3c0d6c98bf4bfe1c776eb6191ff65d07f0d3e8555efa083ae3745a0f855919bc27b2ad4a2310b4550f107
+EBUILD kafka-python-1.4.7.ebuild 725 BLAKE2B 69d90b081511f17db3d6cc428dc9f4cb15e3db894d4090b3c6ac1e8b979c743b63a30f0e8c082ef941d63e3a9b41e23bbb8623bf2ddfe1e19fa674dae1969a0e SHA512 39286e1051ad198c2492e96004a02073d80b462b2b991dbef8e54324287f854e8591ff8a04da43235d5a4daf5f79a352d03f2bdb66eaf0c161869e9d7f769668
 MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
index d821f6d6524b..36adc8405d2e 100644
--- a/dev-python/kafka-python/kafka-python-1.4.7.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -17,9 +17,9 @@ IUSE="snappy test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
+		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index 5cc083fc27dc..0746f3a3feda 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,3 +1,3 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 532 BLAKE2B 636e98d8052ee2624100eb398ee236ce4bb69170f08d8e73db738f7913dec03aa1d7bce4527a57838b65d33c70fc6344663af822b4e5a494b81ed0ceeab1392c SHA512 708fe199a85f6369d1834300c0558226301885a9bd9f847ec9d6cc63589ae9c8d7f1e4bb85f2dd0c34821001a7bcb408ad716bf74a87361a37751127206d7f3f
+EBUILD kaptan-0.5.12-r1.ebuild 469 BLAKE2B 996fc72346d5d71aaf2c02b797e8e72e44123cf509e469fa9b31138ad24b5a8ada13fb636899065bb31918bd594bde482deabcda4ec1e29aee0928950345f873 SHA512 8e5ef52e6f096918e6e00eb0270dc064a321ac139ed54731019cb81c25c78ee9c5a3fc680fb55ca90aa6eaea70c355ea6d31c52b31a1ed20970894c14732c4bd
 MISC metadata.xml 318 BLAKE2B 48394615db06281f01d093cd2519cf8fa5698b12f5a165f7a955c44379438d07562a5c13e1463de19f1a4dafadbd5592d79a052a815d503398444c278c348856 SHA512 d59c74d409e9dc3daabd68cc696108930757171d52e1dbdc0f36ff631eabf55512df01dcbd503cd33048241974d2843ec2064558529cb9fdd3cf5c3578a56055
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index b3b88c26ac31..03d94f339712 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -10,12 +10,10 @@ DESCRIPTION="Configuration manager in your pocket"
 HOMEPAGE="https://github.com/emre/kaptan"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="kaptan"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 8850ffd27395..4f4ffcd61e64 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,4 +1,4 @@
 AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85ef2928f053e49d4fa9bf9db5f086b32d74fd6d04488566ca63915cbd57b7a5b5fd0f3a9329c0b79918e40d487fcc3938f365 SHA512 e3031229d0e0ca18d3f0a9abe84aa3e0d8d62e212ea93551cecdd1be11698d2a73db5bc52c49b65a59681b0620f1718fab8c4093951edbffa6891495ec116931
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
 EBUILD kiwisolver-1.3.1.ebuild 626 BLAKE2B bcf09f5ec20cb2ee4860df96356327c3e950498c7612441c0485890134bc111f21271648b06d284e2602996d3ea8eaacc712e4102b1a2a6bfc9e3c4967953a9a SHA512 8a11ade2e6e59dc0e596856e4e5c4c7dcef3b368ab401d4ddd41613740552a21533023903227b9e781fc41718b14b1f0a1b9b0950e664d49ce6edf026ee3c842
-MISC metadata.xml 603 BLAKE2B 8cca666ad3603069161814bf8af2b73129ee8044369d5d341c6b1d7163a8c1e05506e9e4d8185a14e60c992b02703de6e79049e6583011c46043754af922c956 SHA512 501957059473ec8f0dcc0f1de442edc388b9d18fa8ff48460969547f7adbb4acc7acdafe06917b359152cbf5fa0a2ce0aaedebfc569d1802e487f0042a091b96
+MISC metadata.xml 365 BLAKE2B 358ba29f93baea54b87b7af93da632cf6d9e15ddbf8171b82e0745531c5ce9c5b647531bf9346d81591c713bca19d72f136221077e61baef7bbf05f3d770a62d SHA512 2516fee7907e5d0f3b401d0f500adc914cc53fa7df56c49424e16ad8d33835c3aa138632cdcee89aebdfea9b3d497c9ad6f275f22b0509ac90bcacc1647b33f6
diff --git a/dev-python/kiwisolver/metadata.xml b/dev-python/kiwisolver/metadata.xml
index 9f35c49b5d4e..7fa9b5ced280 100644
--- a/dev-python/kiwisolver/metadata.xml
+++ b/dev-python/kiwisolver/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vpayno+gentoo@gmail.com</email>
-		<name>Victor Payno</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index ae1df05a79df..3e80559efa66 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,3 +1,3 @@
 DIST lesscpy-0.14.0.tar.gz 186505 BLAKE2B 6c7f4691c352573d081436d5f31ddacbd6b054810f07feafaf654a5c401d98c3274f86f03f68534f661b79bff3d708eb09bfdc0e3b9e800b7e2091060e64c370 SHA512 333015e3d4169fafedf0c295d12d5f0eadb8bea2576d147f1461e5854638b0501ea3038a945924efd81629b66dcc7ffcd3fabd12933529cb5fd4b962e87fe2c3
-EBUILD lesscpy-0.14.0.ebuild 655 BLAKE2B 99fe9197856beac107585ebd8d531ac0ba2f956dad02279d458bfd4890b574a3684618e8fd9416442e9a7e4f96869d68f9d9b5c7f2fec136795541c2b9f41257 SHA512 1da1acfe5ef26d5a9995bf22cc5e767f0da9eef93e16844e21a08a1689e48ea3c2bcfb6907ed33636b39a0e89c852c1a552310e22b4e8ac9455dd4f52eabb938
+EBUILD lesscpy-0.14.0.ebuild 487 BLAKE2B dff6bb39f3afafbe11a70f8dd03b14abdb0e5b6664dfd8f236d3688a88608400aca102083aef456ec4ef39a73b175ded66af81d499a6546f9933d527b6604653 SHA512 d150b3cf373c9cd399be71e1e5616552bacef307e7bffb20f113cabaf32143e1b0bd7ab4c4cf26b0c6fa017d92e6e159d9e39fae24eaabc56a15504d3d8aa280
 MISC metadata.xml 441 BLAKE2B c9c2bc6984c96c07afe8d866a5206ea1d64846137321c5d84c281796b3ffb240aef443ce2a380e44fb49d64ee05ac850aba23b83a2e4d5529c75747dbb55c248 SHA512 88fab7282fa26425cd6ad9bef796f763f80ea950ad855c20b1fcf327dd5b0cf3d99177a56231808fbb5f0358cf41abcccfbecc25e8f47e079ea977826fb2e95f
diff --git a/dev-python/lesscpy/lesscpy-0.14.0.ebuild b/dev-python/lesscpy/lesscpy-0.14.0.ebuild
index 21e9b438e594..06eba5c57e17 100644
--- a/dev-python/lesscpy/lesscpy-0.14.0.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.14.0.ebuild
@@ -1,15 +1,11 @@
-# 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=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
-RESTRICT="!test? ( test )"
-
 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"
@@ -17,12 +13,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
 
-python_test() {
-	nosetests -v || die "tests failed under ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index ba9e05d76ffd..c0861e89baa0 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,3 +1,3 @@
 DIST liblarch-3.0.1.tar.gz 55564 BLAKE2B bb3b3b67f9a64403e1a57e9b47217aa1a9b066708d70e1387a8b864a81dbdc4202b6b75012365f9c93179bbfcc4304116a33ebd3bd892f24334e0c200ae94b56 SHA512 591854eae54f5e644882f8ba486434f85196115a3c06f249cf7b343bb0e029b78a818610881d9d656f6342748c956cf5a213a22843e95b2ed05246a8013ff8ca
-EBUILD liblarch-3.0.1.ebuild 738 BLAKE2B 0da1b6d0da9a852a69e8a28d444221694a85b3cac2234759f5747a07c7832e03bec0b37c16c3f37d6e1c71d02a972d10c16c7c9684237d467f264c509e39092a SHA512 59cb16c86a533c687308234a6c05cdd87fbb964f82d1890b87b0e6e83b89c9fad729c950d6e7913c5d301a3f43af4e4a40b80fe02bc4af1ae7b42d51303d2c99
+EBUILD liblarch-3.0.1.ebuild 642 BLAKE2B 8908503b530aaa8217d3dc0d158b02d2957e3d57ae381ae089f361ad6ded0e5427d3078afa8d7e2d308920ee3e393abf7e431d4e59033c0dda76c316adf3d7a3 SHA512 372a14e5fe5be3856e73de9aa1b52ba2e309fc78bbb89c184f6c17f9561058fb96c16bfc3344c67593b72e346677c96346b24f1fd0cc57148fa3f738ff9fc57d
 MISC metadata.xml 816 BLAKE2B f8e5369478e15d5db78b5298cf7102130d5598da60d897c31391a58733bacf3ec9965b85f72c1efbe61f2c5d5adab50e861602d3251c3587dd4a6559f83fd612 SHA512 8a18df9c51da63c8f04131dc16e1d554d2df244ae45cc738289fc3760462a7f3eab8f9b66d3d032dd1550f7716a2e673647173c531ef099829c2bc9ada7c42b0
diff --git a/dev-python/liblarch/liblarch-3.0.1.ebuild b/dev-python/liblarch/liblarch-3.0.1.ebuild
index eebf15b1e445..7122e078145e 100644
--- a/dev-python/liblarch/liblarch-3.0.1.ebuild
+++ b/dev-python/liblarch/liblarch-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx
@@ -14,18 +14,15 @@ SRC_URI="https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
 
-python_test() {
-	virtx nosetests -v || die "Tests fail with ${EPYTHON}"
+distutils_enable_tests nose
+
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index f265610fff25..4592df289c19 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,6 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
-DIST libsass-0.20.1.tar.gz 316227 BLAKE2B e4b4955a2ad0722d76e79979405c8e549b911d31c3fb828563e1e52cad9f9fe72cf543bd5e2ac2383faf85a44f4f0258253f7d45394f37d30076425660ebd031 SHA512 8918154f9fc4b0618d4729195414b2d8c5818a3e4dde2d4e084a73c01c3f6a2d46028a35b4e11759bc001266bcf03423319230682507c6952c9b0eb2df17feaf
 DIST libsass-python-0.21.0.gh.tar.gz 55774 BLAKE2B 3c584ff3b6c09bc768554a3a4f7ef28ecea0726f59206da8540f9c1b4db74ab1235695074dd6b95db74f174066bb856c9854026525da82e7763f341920f0bd53 SHA512 d5b7a1bf0dc736a6a38e2e609f0a213306de31d5ad84cfdcd96f9ff72a1c38f15bad3cf25a1cec6dca5a9f3b00a8509afff2b4ea5e4db80e218e3ae603d55856
-EBUILD libsass-0.20.1.ebuild 886 BLAKE2B 94a8372dbf0353ecbd32a27f5fb2842654eccaa9093a8a8b437df1dd79755e93d9de2af16d48407e20a60fea6386d08ca02618badba2f4ae72397fe4b7bd6c38 SHA512 8a3754e235124aed45afe5dfb3c5b741300c33d4a7d2f3fb11246fb1949e08c9862bd9df4ae4a1696484e78726fab5cddec0fc496a99d1eb634e3a604b27d5b1
-EBUILD libsass-0.21.0.ebuild 1403 BLAKE2B e2a3007b4fb99625c3f87a410e9aeea1caba7cbc9d95ce8fa6e1956af07f8b0868649203eed6c69513a551a54f19a25ef6edc7703fcca76afdf86cc5759a37ea SHA512 e8d747fa91052e1ba2d1c1ee3ac7e815cb57310b2d1646de7e8d1f3bef1a2775a7fbe0570d8d39b9bced8416341108bb4f4d83464b21d20e2c73482cd7d87e2c
+EBUILD libsass-0.21.0.ebuild 1402 BLAKE2B c618ebddce00ebfcb4698902e1235466db47b62f80133d46775e0f1cc7966d45e867bdb05dca4c9e2f897129a26d15b2b83f6423b899b970cbf9f9563d685878 SHA512 1c00b790f2d33920cd0206d7e8b2b1452313de10f14aa9afa9a753484dbfdb500909b7240b5ce952d4503fdc8c6aba8ea9ea34c2ac2171d1145032995734d611
 MISC metadata.xml 328 BLAKE2B c75e306610c41d64a7d68392c44c72827ecaae50a26ea524d8826d48c418e7fc34a2345d682dd9f6ccd5db887f032de1b6c6051801037a67dbe5e1700b9e1d77 SHA512 fb6418e4e357c35fda2e78378db2b7646a49401989a695b0ae615d11f132267819fe896335259482b6b91c20cfc832417e4fe2ce0a93768b3de8f85b0db93806
diff --git a/dev-python/libsass/libsass-0.20.1.ebuild b/dev-python/libsass/libsass-0.20.1.ebuild
deleted file mode 100644
index d1d5330304eb..000000000000
--- a/dev-python/libsass/libsass-0.20.1.ebuild
+++ /dev/null
@@ -1,34 +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,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A straightforward binding of libsass for Python"
-HOMEPAGE="https://github.com/sass/libsass-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/libsass
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	)"
-
-# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
-# This avoids a file collision with dev-lang/sassc
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0_rename_sassc.patch )
-
-distutils_enable_tests pytest
-
-python_test() {
-	"${EPYTHON}" sasstests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/libsass/libsass-0.21.0.ebuild b/dev-python/libsass/libsass-0.21.0.ebuild
index e3565c7cdb2d..073aaf506a5c 100644
--- a/dev-python/libsass/libsass-0.21.0.ebuild
+++ b/dev-python/libsass/libsass-0.21.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-libs/libsass-3.6.5"
 DEPEND=${RDEPEND}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 8c34760eeb35..93a0bf749361 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -9,6 +9,6 @@ DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a
 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 b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
+EBUILD libvirt-python-7.3.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
 EBUILD libvirt-python-9999.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
index eb8b2abcbc09..f4d733c9c871 100644
--- a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 	virtual/pkgconfig
 	test? (
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 	verify-sig? ( app-crypt/openpgp-keys-libvirt )
 "
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 71bec7d6c9fc..1b7727157eac 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
+DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
-EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 124a91bfb39964af4222f3dcd88250c2c91d9c399e87b00b721e14b75d08f9aa9f2b55a105174bc8a2764664c287812e823621e272742b83f497d2f9ee9f8a1c SHA512 238e92e87e72989a6818be202f5602dd94fb4e8f9a172736d9f0548feb1770d7befe77fc23b00ddb5182dc7e8649cf7e639b50ca26301fcb7bb596ec8b59401e
 EBUILD lit-12.0.0.ebuild 911 BLAKE2B aaf5dda5550e4bdd5354fc4ab00f1b6d1540791e21944b394f75e0c42966cff49999a16047560b0286e6ed29753949aa92efd55a8bd945a91e9a4f70ca1cfb99 SHA512 5a91da5a8c8d58dabc445f6a55e3febaa3404f8fa89d5bc7fd8f6031eeeab45cad8c05fd68a5adf6b73595fe9836d18c6416f9ef7a186aa47c13c9ef4b591da8
+EBUILD lit-12.0.1.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
+EBUILD lit-12.0.1_rc1.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 EBUILD lit-13.0.0.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.0.9999.ebuild b/dev-python/lit/lit-12.0.1.9999.ebuild
index 330a64a87aea..2076120cc165 100644
--- a/dev-python/lit/lit-12.0.0.9999.ebuild
+++ b/dev-python/lit/lit-12.0.1.9999.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
diff --git a/dev-python/lit/lit-12.0.1_rc1.ebuild b/dev-python/lit/lit-12.0.1_rc1.ebuild
new file mode 100644
index 000000000000..2076120cc165
--- /dev/null
+++ b/dev-python/lit/lit-12.0.1_rc1.ebuild
@@ -0,0 +1,40 @@
+# 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} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/logfury/Manifest b/dev-python/logfury/Manifest
index 7e1ba9f4f2ff..b0018af31674 100644
--- a/dev-python/logfury/Manifest
+++ b/dev-python/logfury/Manifest
@@ -1,4 +1,4 @@
 AUX logfury-0.1.2-fix-requirements-remove-dev-tests.patch 382 BLAKE2B 5dd6b9eaf0fd075d26e800470f7ef9f7303968d5cf33904e0b82bf87bd351a3346016c289c997eb3e746bc22abf78d0bf67e56266082b8aa22c09dbbdd20ea0c SHA512 b6acce332ffa358e39421158fa686b3f6d8e7a11e19544b0da8c419c371622465c60813cdfb0595cbc5cfbcac0c277c4bb55a13411d6e22968e7b2eb3b8d5662
 DIST logfury-0.1.2.gh.tar.gz 15854 BLAKE2B 68fdc692b552c42f509760ba3b6b30d6bdb0066b1179851d9a47e6f8d7b651e3518348ae60cd0726d867d015448253ac058f083c2798b3e5cf7e2e7d86db3929 SHA512 626965bbb8bdebcd7f71fa141de24c7f725933a32f0a00c8799d9778fb41913666c2ef0c71660bf6d00b160b9e34baff682520f4c3570fb0e347f070f010172c
-EBUILD logfury-0.1.2-r1.ebuild 709 BLAKE2B af95efea6e1a44bc6d28aa76d7f3adb1a6a086872b18dd6d24c604455b033ee485b46749cd1715122699c2615fbba8d8a46b703f9608230b2ec47f91ccf6e34b SHA512 8289f0d924c6203f4d10a8a7ce0f44003d1b9d29966a5a079890c1ca3b326a6cf15ea471c7855066b1f41d89a9f27cb954af3a4a5163f2f59002f2111ed74371
+EBUILD logfury-0.1.2-r1.ebuild 705 BLAKE2B 61cf4b944782de02c325f8c504c4b5a76d349708034e44d3dcce6dec89eeecc131699f63ea4c3f4851507ebb373c41600d46b6d886b0875f25b3c1ee49d18e5e SHA512 a0d3eb978f8bf25631bcbca602383f88613c5473b1ae85b103969363a8dc77fe347b6eae3dea271d4e0b4f9ed1e79083190330991944700a436f7c4b3e5fe0ab
 MISC metadata.xml 549 BLAKE2B b40b2afd80da533ed36dde0b3b5cdf8e8a8f5046988dac6e22aa62439e81f8f41e70b45a4a498baacfc00b791fbdfef491249505f7beb27528041567fb8a5356 SHA512 c2d3d2a28331231872978cebbbf4d6da0e3014fbedf7598b002b3b6f8795af36c8ae3cc70ce4d522933527f20e9144c3646364f6f2597963782fb6ef51c744ec
diff --git a/dev-python/logfury/logfury-0.1.2-r1.ebuild b/dev-python/logfury/logfury-0.1.2-r1.ebuild
index f1225f9867c8..5bb4e74c940e 100644
--- a/dev-python/logfury/logfury-0.1.2-r1.ebuild
+++ b/dev-python/logfury/logfury-0.1.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=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ PATCHES=(
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? (
 		dev-python/testfixtures[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 1aa9e7794da6..a83c772c33fb 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,5 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
-EBUILD lxml-4.6.3-r1.ebuild 2729 BLAKE2B aa8dc34da8819d486e30e373324a57333293eb03cf2fac313cccd0a6be23d46e1f1adbb09f4e7e24453cb8c2eec5cdc0557ce14e33711385a9d59720ed6a0a31 SHA512 d7491ba98a0be007a3fff028f62b6477576db0ff0b6736819a09c549333d629b7331550a0488b1bdb5b461ebc1ca579410f2162be623a42338022342be947362
+EBUILD lxml-4.6.3-r1.ebuild 2727 BLAKE2B cef49a3e29eace35efaaa0ddf03b44cd2b78450baee6886a210a763d8f48f94eea81743639243853f2cc83025856c56b5d53047c1334cefd40891a9a78e06b61 SHA512 b8c17926061c47ac2ec7071e6d936ca6bdfd258232d4a8b6ae4b1c5a869c577ef9d8bfeab4bb821f1cf4cd7d57cdb735461fb8e4333b0f081d39956693f6d0bb
 EBUILD lxml-4.6.3.ebuild 2717 BLAKE2B 2e8557208185cf2c0a5a46302266b6bf05e3fd614d5aca04dfcf9b758912b8f6379c06039746ab70b070d3d25b830397683cff87eaae08051534a4ab4fe19b07 SHA512 e65da2610f2de905c2c867c9370824ab9d7c94c6c40ecfe660587b7b0f75c800b0846191ba5c961daec73434351260ac50c4983f063eae23dbadbb46d58c6001
 MISC metadata.xml 409 BLAKE2B 95add82278696324ff1c27f90f3bee49ed0b1ec46546751b5c9551991e1bb208139cb9e6594dc013ff14c032611f890da2330471bafa30960f8b61f45a1f0d4a SHA512 f4ab9197ba14428808081c0ff600b4b6d004690914ef6e8d053726a8d4d7dcf8df6ed2da56ce45a2aecc7484e9c5beced927771f1eb46dd7f6f61d5fd91b4f91
diff --git a/dev-python/lxml/lxml-4.6.3-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index 57937b2229a6..8994ed792836 100644
--- a/dev-python/lxml/lxml-4.6.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -14,13 +14,13 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 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 ~sparc-solaris ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND="
-	>=dev-libs/libxml2-2.9.12-r1
+	>=dev-libs/libxml2-2.9.12-r2
 	>=dev-libs/libxslt-1.1.28"
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index f9cf784ee333..0e00494df2db 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
-EBUILD mando-0.6.4.ebuild 1073 BLAKE2B bbcf1e5995d52c9aa302f01470d6d32d70b0889f43287ec8663ad211185c8d3a687dafad2747614a39a96dd8dd18ef131b1cf69c95770aa4b9e7c6cf6a5231df SHA512 02d3649be938e2edfab1602b564f9dc00debc9402d468a2977f9929eaa8f8ff2450a1b6253f8c189cd6414d80265c62dd6ced9e5ce0989e005adf1143f019393
+EBUILD mando-0.6.4.ebuild 757 BLAKE2B 6ae109b43c0a14d95b0258fa2e9656ccc7a1479cda20d7ef73d473b6b9d91f11b4ea0dc847be58dc3e9b8cb7ab73630ab476daa7106ebb0e261e01fe89cc9cf5 SHA512 e3ef88cd92a2615c5edb844c045874d34ee5f329bbdd8d494d0f6553ec69a15a766597bc24f752198cd8e9bfa76e395e1f3a1e6b3b3a69b80a1e29953d1b2289
 MISC metadata.xml 284 BLAKE2B 2ac79590ac3d86444a048221b350828e6b8ab5c575144eb2bdd5aaa9838b10d5bdb9fc1ff94df85b0912ed1e540185e1f232ad329768470fa544178cd0fccc15 SHA512 5dea54f42d9854c6e4ef70112a31c073e18ccc6af76ba95bfd72cd370e2bc720b564935abfd73c8d3c743361f824a608ba99bf848ed8da222cfaf83076403e8a
diff --git a/dev-python/mando/mando-0.6.4.ebuild b/dev-python/mando/mando-0.6.4.ebuild
index ddd3921f30cf..87d54e40707e 100644
--- a/dev-python/mando/mando-0.6.4.ebuild
+++ b/dev-python/mando/mando-0.6.4.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -13,30 +13,16 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND=""
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
+IUSE="examples"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_test() {
-	"${PYTHON}" mando/tests/run.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" mando/tests/run.py || die "tests failed under ${EPYTHON}"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index fdb0ae3edb78..6572d16de288 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,3 +1,3 @@
 DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
-EBUILD manuel-1.10.1.ebuild 611 BLAKE2B 369f47a31ebaedfbb7552cfd5c6311a469b161ceb74b2a49a669a39fb55cadcc65b23777e4f3d09afa65e622377eba700d70b1f6d290f6eab92558e27da822f5 SHA512 6dc46489130a4354829f8c57354c19b1d932f4ec8386471f3d2f40ac305a6c378cd5e2482d1d2828b087222429bb1ec577cdac2d097e763be777eb491f5f04ea
+EBUILD manuel-1.10.1.ebuild 612 BLAKE2B 9e8e17d2fc9e8715d01c678455820e5890e0fca45424d89346c436aeb96f6a0f27124f639fd1b94e4c23c0d35e6bd1ead437a1496c6fe12b42a6e21b93fb891a SHA512 71ae4d7d4168790f8e2e5391c0050507ddaa9a403bdec37b9fa8b6708f80c86701e8e2f9cc9dc61735a8bb617db7e33b66dab8078ae64a558278ae5e0d4c3918
 MISC metadata.xml 390 BLAKE2B a36a39705528b3a8e9d49a17f0c8afb55dfda94fb253f357ba900d29b585d936bbffdcdeeafdb59b0dcaaee748e5c6c572ec4758ccca8ed7b5c102204f96ffed SHA512 1c9c8fcc67a5c0e41f6d2e7b6969aa6665881bf769275b0bdfc153af82421a2920917dba3ec1a05ff82e72ab1960c1da4a8dd2cb0a404d8ba30a6a218a6dcc37
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
index 402aa2a23dc6..96120aee9f88 100644
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ b/dev-python/manuel/manuel-1.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index fcb695966965..d8a1195b3f51 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
 EBUILD mkautodoc-0.1.0.ebuild 643 BLAKE2B 403486972ff04cd7d737cce8fc8f4c007858df17c41cbb1e4ccbede2006bcd8cfd9c9060669de6bbc4740a73ebc23b37dfbff6e4f2c9ba61218ab0c6d9576d03 SHA512 b69f6a6c62fd3ff393ebe00a1d6ec905718c7f948aa849a99a6ffc1fd2ec28ad99b48a34b95a1e8563e6ca0e11c8255a773b7685b9d2d20d674ed3f643fbe1ad
-MISC metadata.xml 492 BLAKE2B 7a80c9b384ec8b2323d9eb3a76ac59527e2e70a371c444913d6ad64c711fd4526e942f22f00e6cb517237186d43af7a974a6df189f585dad526be6c0fc1677b0 SHA512 1b9240bf7cc0cc5f30f457736dd6ac5bba43c1e66ec7e0b467ac21000c53015eb45aea3a11219961edbbeb40bc10e3bb78320a924078efdf7826871f8406cde7
+MISC metadata.xml 516 BLAKE2B 72dc56a7a6573ee2870a8dc08522f0f4dbe6f07db4ff8d27e5de5ba8ebcd572cb95a8d8b85b399f57c6d7533223d590c5fb7d68e2b9c76a7883a829edf7cc81a SHA512 6b44f28ab4c93519733ad434c56b5e7b1638e2823e4b4e239143a8d934a07ac44eb82aad02c0f929e941198c63da57c42a7e7a500fbbede0e0e302de16d6c62e
diff --git a/dev-python/mkautodoc/metadata.xml b/dev-python/mkautodoc/metadata.xml
index d3cd9cc9b242..d8dd7c17d439 100644
--- a/dev-python/mkautodoc/metadata.xml
+++ b/dev-python/mkautodoc/metadata.xml
@@ -13,4 +13,5 @@
 		<remote-id type="github">tomchristie/mkautodoc</remote-id>
 		<remote-id type="pypi">mkautodoc</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index e8e4307534bd..a07c86b7be08 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,4 +1,5 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 EBUILD mkdocs-1.1.2-r1.ebuild 1699 BLAKE2B 59e02ec5ea24d932eef86268220feff250e3f2aa7112c29e74829fc747cc9a27b86ac544ddea54759f019def3d5b2c17958b809d94ac63f87b5ab54aed2ccb3a SHA512 c10a8b6bd1ee42777d69225963521b5941d595f6a8f0fabca19ba830d3a7389a4ce7d9d88f66b63f370595bf07be33c7b69920044faeb61d76b418c177086347
+EBUILD mkdocs-1.1.2-r2.ebuild 1866 BLAKE2B 41ef609e6648cd0d082143b975b0a8c3f9685808c17a1f089907b3e55a813628efe7d1b5533f2b00b9fdeac94d20c50b6d45c03be2543b21e3b262e365aba095 SHA512 f931df4b728f9e2814084a448017ae1fc1fb8942816cc25fc5a631cb797f56e9d3adda6bbd0162f70dc1d47a1fda363b25404da6cabc167441474e803da8fc36
 EBUILD mkdocs-1.1.2.ebuild 1353 BLAKE2B 14ed1990f54f4954dba6afa3b01f967508412573e2826c7feb40c873a2f55000df8186166ea7a31f8bfadd6d040f357747007f889c19f072026bb86887a3a43f SHA512 7d24f6aa455983535ff489f3a34509e236b336a65750b383429dd7304e3243feddc6bdd94164545284f5a29b7e111ec3911591b6e478671637589c24d50a3d11
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..7b12540ddb37
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		dev-python/mdx_gh_links
+	)
+"
+
+RDEPEND="
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
+	dev-python/lunr[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Upstream pins this to workaround with a bug
+	# in lunr, from 0.5.9 onwards lunr (mistakenly?)
+	# depends on nltk<3.5 if [languages], which does not
+	# work with mkdocs. We remove the [languages] part, and
+	# allow the use of 0.5.9 instead of 0.5.8.
+	# Tests pass.
+	sed -i -e 's/lunr\[languages\]==0.5.8/lunr/g' \
+		setup.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 949bbbc5e0b7..29ffadbecf0c 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -4,4 +4,4 @@ DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e2
 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.2.2.ebuild 561 BLAKE2B 086ee2f238c7cbcec3a4028cf7642387eda803de5584b128e96789cccb14727a8ca2d49554faf20b6ffbe992ee9e75acf12a3fda1a9d5bb2aee6238d1521c9de SHA512 7b72bc9630030ee807c7dc5aa6f3ea989899e40648c403e6f5e195fff34055d1616ed97b292b0225e2c55c6a1067d08707c23501f80b5ef13b38ffd6b93e201a
-MISC metadata.xml 1190 BLAKE2B 05a3c4ad81cb2d4247a66274037ee45e606bc1ee273659841aca22a22f09019515813a4a1dff520b3db252e0641a07e3d6927dd63b941f0a58ae623047687f4c SHA512 3285f70348e70c92c0b5526431a4d4b1d8206dd4df9d7f0d13b4a7d550a14c6a5349baa6c4c553b70bac0621a047448de374b44b52eea1f6ea55296ff61795d5
+MISC metadata.xml 1166 BLAKE2B 7f19da6ad1ea3ddd412be73a28b2fb4e4c46f2fff047f404bed33fdc108d93008209110abd88843cf16b9572663a50c7ffb3be9abda9049318c5051205240e55 SHA512 37d55fb8a55e5a9a60f8b9771de181944022e691548c0f2fca52e0f343004369af4c7d4235587a943112f64e72ba34ce203f8ab81848fa86d523679b30cff424
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
index 50a13facc0b1..c92b7cae9d81 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -13,7 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">facelessuser/mkdocs_pymdownx_material_extras</remote-id>
 		<remote-id type="pypi">mkdocs-pymdownx-material-extras</remote-id>
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index db09857d10a7..d8eab05afed8 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
 DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
 EBUILD mongomock-3.22.1.ebuild 852 BLAKE2B e64e7194e6900d55673d33e161d3aaf2a4bf9b7ce11078201c9c8df0befc617cc844c4d3634a0edbd8144c24aaba51e2f6aa24728179ebbab323ad28d9c462c1 SHA512 41919b31354f337d332efb5788e32c1f29b27d0694cdefa1869ee18147521ee8189defe867d80f732c872e38e0d081b257fb1389fe16249704b476e9ffd46023
-MISC metadata.xml 633 BLAKE2B a72f01eba3907efcbbe35aa6c6cfdd7264df5a4308b2ec0bf45d34337b8c185b678aa8bd9be9ac03e644735571494959a603625a970b2814c7f3b992b49f9e43 SHA512 636471d2bf5300aaa7fa2a97599b53181e379f2ec240ca58dd3953a5615d474dc9c7adea9b16bdac1d15574e0e31fbc4dd83357d9eaff5640051b86ee9071266
+MISC metadata.xml 395 BLAKE2B 348ffbb9c7274a10413f5805e9af06ebf7dd5ccc3b4493d7f876cbf370cec2d42a16280648097e2c1c273cddfbb55417f0b33f206acba49a91685bef1cf6be75 SHA512 dc60cc89f839255497b4cd2f9fd020cf0e300ffc2944ae681ced5368d6e4dbe307e10a6752aa1594a2730392928016e6a7dade21fda3f4ab715d09c332ed5d9c
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
index fd666817a89c..1bf3e0e030c0 100644
--- a/dev-python/mongomock/metadata.xml
+++ b/dev-python/mongomock/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vpayno+gentoo@gmail.com</email>
-		<name>Victor Payno</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 2fbcb72637e6..0120a355b7ea 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,5 @@
 DIST more-itertools-8.7.0.tar.gz 92857 BLAKE2B 65966fa2939fb6908c25a658e96162238056403e2b67d41d027c11cf04c01a09f954ea1a75363e0f615ea3e5fa5b9cfa4289ef18942c68122f10588f37f797ab SHA512 0e80dd5e08ffbd1878f414e1e8d036046ecfaf74c638a79d277d72e8357892b73735cc18d8a022c53916acc3733ebde4cb8030c5cecc354d6469933d91c66c13
+DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
 EBUILD more-itertools-8.7.0.ebuild 623 BLAKE2B 2a75e8dcded237195bb6a71f406124e02fa5bb9d28f038b76d4e88a00fb44a800a7013b4381f507efb93ba05eaba3a82875e5ff3828fcf4249964dc5edfc85b3 SHA512 95d8e90cdbf631c94ee3b091dc165ac31c7594b9d8b820af8c96536f705be4a38ca84c086b7c4a73ce79583982754eb90c7f796c8d32eedf9705ea2cc00898ea
+EBUILD more-itertools-8.8.0.ebuild 631 BLAKE2B 92f155b60235091f5883360b490cc47945c34a0fe25dbd7409a344cb309ab9c52eea0fddbfa0ec140b37176fbd853d4785bcd6f2e120f625c99640756c383ac4 SHA512 79dc28acceef5541f9b114abaf00a8ba3ced9c71fb9b3c7418c0161102c0a21ff777f49375a3ef0339b2f020af3167b949a2427858ec9ac36cb3fab9bc4ccf4b
 MISC metadata.xml 487 BLAKE2B 32273e3af64b6c58907948a20fa547f733fb0c1a1bc8d8cf580657d4ed19f6eaff7f9b6e8f930887d5af7052682bad3ef1131a0c10ba2474791f01b450b86e65 SHA512 5ce5d78097a243fe8ad553783a5de64c1df82ef77f0eefc9c55452bddebe472622ef6c95d28be9247739ad86cf68a1854ac66c5725555728a46a080ff26a6c8e
diff --git a/dev-python/more-itertools/more-itertools-8.8.0.ebuild b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
new file mode 100644
index 000000000000..c62cd2e85d81
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
@@ -0,0 +1,20 @@
+# 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="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests unittest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 044ee10d2969..fa17aee50e5d 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -9,12 +9,14 @@ DIST moto-2.0.2.tar.gz 1534459 BLAKE2B b4609f332e8f8eb8d61250919eca805f82a6dfc46
 DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d647673443a8a335bb907f8601098540b032d6c9a8ced3e1fc490c49ad70c877547d905cece05bbb742d05976 SHA512 70e64ab98873d480e776a2139a4d351665c6c2f98faf90e2871c6b9998571d1bd239757bc90bbc6ab6e1ed510598bfce77157ad522953efe40c884068885c57d
 DIST moto-2.0.6.tar.gz 1557871 BLAKE2B dd4c23758bc9c98fbd2b2a70af744daa245fc8b4b1154348486ae85d195e5e3fa2c513f61386504d05c0d646e81fbf8ec5bf41be317b9fd7581668cd23cc1db3 SHA512 9f287ff07f948dd3d2d6af1c6120d29e9625e420bb94f83c230d813e26689161f9a2e89e2b32947e82084cdcd865fef714ad14309ff41371bd37d251481f8dc9
 DIST moto-2.0.7.tar.gz 1565849 BLAKE2B 1c6491828a43156fd347bcce80f3440cd8d4964e28bab19593e29fd88aed558652b08c81c577312f9c612adc666ddd35fdd46b4d2d8fb82eef380210e9c62d8d SHA512 5df26f478909c57d4ba76bb7c6e002c37d7f604084c157744be32da93dbb705605a7a85eb0774cbf2c0083f7096f01075ddb1a119cb7ac2f3931cf58896f1629
+DIST moto-2.0.8.tar.gz 1569426 BLAKE2B 746313241d49558ab49d7e2116406f128a315a9fca40956808e7f901e91518551a1f75c95c9ce5c92534221d1db3e01a3baa2cef6cadab9a9d024cc30d8ce0e2 SHA512 5cf1a47c97100b76ad9b69787ce4df00f24f93ba1a36a242cea535ede649af457ff043b44f1cce4a4e44b6735844652f69271f18edac0748b636f4e519545018
 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
 EBUILD moto-2.0.1.ebuild 2366 BLAKE2B 25b780427da33dbdae8cb9ea6bb0c834a02ec745f40e7ad94c27cf79c9fc13bc4a91d6a3ac0e4627ebd77a36ed0ba1daadfaca963cadf32a860d4ba62b34df99 SHA512 38596bc35536b0a1598cdf2425a164605b5b7614c776592b1f76279334dc1ccf91440e88e74511ebfea239095a1180d91c740d05596645c82982f45e39e0c8f6
 EBUILD moto-2.0.2.ebuild 2286 BLAKE2B f370137ce59587c9725f64911408efb2e8faa31e63ef3f719c30da646e7b075b2051b8bf0ca429621a98b98b651c659c739593d5d1f3667fd971fc1a291f36cf SHA512 cde2248be2511cf28fed1334134c85acd393cce1b9fe28e05b7f1c51324e42ee6555beddca8b3a95c18a0d2a0a7ebce111a377955c674b9c813c9e11ae28f28e
-EBUILD moto-2.0.5.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
+EBUILD moto-2.0.5.ebuild 2250 BLAKE2B 3f553b6d7b6369b3cdda5d7ab67071fadefc66a919ef74a1338a90d74c64b1bd76413a84599ac0cee355267002528bf1d46b44368a1c777c9933ce61c26136f2 SHA512 e0d941a86b75f2099e6cbb9ab0e511333094fad874d1ac9502f34a3a0e371b98060f7d4b94ba7d86328fe6328f5334a15dffabd1f2e0b197e286480709c826ee
 EBUILD moto-2.0.6.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.7.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
+EBUILD moto-2.0.8.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.5.ebuild b/dev-python/moto/moto-2.0.5.ebuild
index 7c3740bdf84d..265120c536b4 100644
--- a/dev-python/moto/moto-2.0.5.ebuild
+++ b/dev-python/moto/moto-2.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.0.8.ebuild b/dev-python/moto/moto-2.0.8.ebuild
new file mode 100644
index 000000000000..7c3740bdf84d
--- /dev/null
+++ b/dev-python/moto/moto-2.0.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+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() {
+	# unping 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() {
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index ca031cf3c15c..6570235894a8 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,3 @@
 DIST multidict-5.1.0.tar.gz 58801 BLAKE2B 9b9194447a7d91d673b07e440d5f1d2068c79b15890c63a5ab679016b02471996adc73173bb303c14609b2aec230d8ebda36ab978b22b67c008f6b03e6f663f2 SHA512 7dfc8862048d274f37341dda72d93c0fab6d5463fade4f5e241f5b8bf65dcea5c0b5120376847a77f00c7246e87a1cfe14502b6f64bf97e4d00594fed6735466
-EBUILD multidict-5.1.0.ebuild 748 BLAKE2B 20fe92f40fcb892a945ded877d438363059679340932788741d37c6e0c7d766ad5aa223ead34ca1928d69bb96d3d85676793cd4a31295c4893ac76f654539283 SHA512 8035207467bb91afe575d2dc9c66aa0f206e5c86fd8cdab499520bc24456f5b919709483c235fd111fccbed0303b06ed6b3b8054ae440fc5af41754c05e4117f
+EBUILD multidict-5.1.0.ebuild 747 BLAKE2B 761f0c4187f333cd82c81a953a3b6c0ae1ffb0dc76aca4a5ccf951a9101af8e05c8b0f71b481af77067f78d60e29cdf6b99c85ab6dfcbe5552e60ef69bf6b926 SHA512 d1dae1fbadb15eaa4e3489e4dc787f0d07e853da92456f7b077912cd07f78d1a995012d1d602708fbaaee1567d83c99fca0e16624b1ee5078070a09317d8a3a7
 MISC metadata.xml 475 BLAKE2B 29991d1ee4ae7390538396f192e103c82dd62d6aa29bab5e90ed7f9f0b7ecdf144bbb77ea40c9874cffab5dd345944554cae08e46d9cf3dfb723444eea7cab3e SHA512 1d99cd5f4b1c2a09f3e890ba2b0cde53633f56230397f33f82012e6e3aee6e4054f959788f04247002c824abe71faed324d8bec425ba83e206719eca84864e17
diff --git a/dev-python/multidict/multidict-5.1.0.ebuild b/dev-python/multidict/multidict-5.1.0.ebuild
index 4de34908431a..f7429c25891e 100644
--- a/dev-python/multidict/multidict-5.1.0.ebuild
+++ b/dev-python/multidict/multidict-5.1.0.ebuild
@@ -2,7 +2,8 @@
 # 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
 
@@ -14,9 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-BDEPEND="
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-"
+BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 621f5bac1ddf..8c2f4192a0b8 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,6 @@
 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 563 BLAKE2B abfe33ad7ac652dcaa81f9e4386e867ee7a5a75303f7e7394dc15ac8ec2bb4b4eb0f23b0e2ee3a54d4802863e94ff67b802222cc5715cf972fbf7c3e8a77ef06 SHA512 06d572d3caec9111ea5e039e8a844d7f42e286070e355e07315196cfbfd41a60a5688018c509e93c12b423f0b38513f34e4e8a0bcefcd954546b15225e8fc4fe
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
new file mode 100644
index 000000000000..01ec4d8c2b58
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.11.0.ebuild
@@ -0,0 +1,22 @@
+# 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/nltk/Manifest b/dev-python/nltk/Manifest
index 9d6c8093f088..d65d4fb33b03 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,7 +1,8 @@
+AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
 DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
 DIST nltk-3.6.1.tar.gz 2820223 BLAKE2B 74ae44376e8f59e4ccfd4bdb5d6f535a8480733a2fdc6a8f1117a551f64d9f6404ca237bd27cd4a4a9d32443d38179c7a1c824e00e808868d45e468ab84eb1bd SHA512 ab0e8abc938fa0bfadc3f02dc583749775a6c06d2d2ee30692ccd9c118277fd79cfed02f858d4347dacbe87f146cb8f9af1203a8d68685f131da5f6b127b86cb
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
 EBUILD nltk-3.5.ebuild 1658 BLAKE2B b78651baeef0a8715ad9eaa33c7e8b240aa285a24e34f5e67fda72b2ec3021248a46e0de36a1d41f8b7debeca53515943bff736323071b0e3da625bca96c1c1b SHA512 1aa2310c120f22af4f5099de7b07ad9851da3bb732bf11851d00e29fc042302bd922d50c3f827b4753685c1e23dbc95740f9dd08d9c2ca0d941dfd7bd0b2ab40
 EBUILD nltk-3.6.1.ebuild 1620 BLAKE2B f6e0423ca7ac08bff5fa08ebc0013b4fd9975822c4d37b399943fc06bc79fbc99a99da8758d13ecf75e96771c209f00df2daa45ced7b768dd1fcbe929b66bb3d SHA512 86e1d0682913de2b7a5e9f9cdb631c230857353ca92dcfa1227df82459b7e67cc2cc871dfc3533970b24e6e7d6d8982bab1245c9f3faeca21ab00fa46d5443de
-EBUILD nltk-3.6.2.ebuild 1620 BLAKE2B f6e0423ca7ac08bff5fa08ebc0013b4fd9975822c4d37b399943fc06bc79fbc99a99da8758d13ecf75e96771c209f00df2daa45ced7b768dd1fcbe929b66bb3d SHA512 86e1d0682913de2b7a5e9f9cdb631c230857353ca92dcfa1227df82459b7e67cc2cc871dfc3533970b24e6e7d6d8982bab1245c9f3faeca21ab00fa46d5443de
+EBUILD nltk-3.6.2-r1.ebuild 1668 BLAKE2B 9ffd88dc5f8c27227920b90833678fb434a8db384eda00849b7fcb70920875debf5643ce9826a562a9a9c0404c75e27fb74808871412c887f746c764d2733a39 SHA512 7439225ac3fc2f0b0b2b4a674dac70ae0a830818f02222bd1cabe61b10eefd7c88a0555dc17c77dd7b4dfb59102b943075652d5c38835602451a1e8f5a7a699e
 MISC metadata.xml 405 BLAKE2B fe64d9154b1ae508bc30bf6aa0f5f6daf1b72f1f08cd9a57ac4421d93d889609eb1a656b8e95671e0235cbd8d0bbe1ddba1ec1eaa78d97b10d8cbff9225cc7c4 SHA512 a57e3953db801948b62deb294b66421e209c75995715d23483b75afe150144a821f0f88d4faad2564aed8bdd1ecf61153431c5f2fb8e42b6d017ec1c9762b3a4
diff --git a/dev-python/nltk/files/nltk-3.6.2-metadata.patch b/dev-python/nltk/files/nltk-3.6.2-metadata.patch
new file mode 100644
index 000000000000..32d4c183000b
--- /dev/null
+++ b/dev-python/nltk/files/nltk-3.6.2-metadata.patch
@@ -0,0 +1,38 @@
+From f8d834d9ac1e5b26f04cebd8ca6f07ed15935e70 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 29 May 2021 18:32:53 +0200
+Subject: [PATCH] setup.py: fix python_requires
+
+Fix python_requires to specify a valid version.  Apparently, combining
+>= and .* is disallowed, and I'm pretty sure 'just' >=3.5 means
+the same.
+
+To reproduce the problem, you can:
+
+    $ pip install nltk distlib
+    $ python -c "import distlib.database; \
+      distlib.database.DistributionPath().get_distribution('nltk')"
+
+which yields a (not very readable) error of:
+
+    ValueError: '.*' not allowed for '>=' constraints
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 49dc08098..7be160494 100644
+--- a/setup.py
++++ b/setup.py
+@@ -108,7 +108,7 @@ natural language processing.  NLTK requires Python 3.5, 3.6, 3.7, 3.8, or 3.9.""
+         "Topic :: Text Processing :: Linguistic",
+     ],
+     package_data={"nltk": ["test/*.doctest", "VERSION"]},
+-    python_requires='>=3.5.*',
++    python_requires='>=3.5',
+     install_requires=[
+         "click",
+         "joblib",
+-- 
+2.31.1
+
diff --git a/dev-python/nltk/nltk-3.6.2.ebuild b/dev-python/nltk/nltk-3.6.2-r1.ebuild
index d03c61527233..c11ff6910967 100644
--- a/dev-python/nltk/nltk-3.6.2.ebuild
+++ b/dev-python/nltk/nltk-3.6.2-r1.ebuild
@@ -39,6 +39,10 @@ PDEPEND="dev-python/nltk-data"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-metadata.patch
+)
+
 src_prepare() {
 	# requires unpackaged pycrfsuite
 	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index c59b4a8339a8..fcc1afbf9e3c 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,5 @@
 DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.3.5.ebuild 471 BLAKE2B c286ff7cabc65a9b50cc7cabff22593eec5d852624afb4bf1fd35ea54fe881f9774da8b8d362f3585d1f620b17f33b464d6f7312769c31803400148de528ef2f SHA512 2f672269a59835dbe4806c4518da8e95a3842eff0b3435bd06a622c0e2e7dc9ea6597cb262df8630de7057962ba10648c0adfac0b76b4a3a517a1fc56cfc04fb
+EBUILD nodeenv-1.3.5.ebuild 470 BLAKE2B bc0370672aa4d3cb89a2707a981cc03265486933556fb82ae619b911574124cb9ee34763d122bbf2698a90bf04f60631d085f4d0e523a955d3349b4fcea5b48e SHA512 b459a4b36bdaacfaa5c33524076117e7d0bebfb66dc562432604bf5edb17ae0d16905a173d160b8c8b77ad6fa64e2bbbfd84ffe4c17b7081c51cf629bb7da2fb
 EBUILD nodeenv-1.6.0.ebuild 472 BLAKE2B fa62d5ae0c566cde8d4f6e7a5bc231ff443db533c0a8309b5290351d9444e3fba8ca11cac0dbf80a564808325e4a8e079a6032bd81bd62684896814658a536fb SHA512 27f881dd8f4daef26b1fe74856e1f67c8ca0b8935b56ba016cf882b8a6f1fee5318ce6309db859df9067b16006c387acadc54f99010f22081bb34846698266d0
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.3.5.ebuild b/dev-python/nodeenv/nodeenv-1.3.5.ebuild
index 3cf4ca82c5cd..a56521f096b1 100644
--- a/dev-python/nodeenv/nodeenv-1.3.5.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.3.5.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/ntplib/Manifest b/dev-python/ntplib/Manifest
index ea33e1092469..d64faa510fcd 100644
--- a/dev-python/ntplib/Manifest
+++ b/dev-python/ntplib/Manifest
@@ -1,3 +1,5 @@
 DIST ntplib-0.3.3.tar.gz 6808 BLAKE2B 192640fd46a12e6f6829b2e252bc3d8126104a15f6186d2f5164b74d6fd8aaa715c6df7c9d2d896512d82f729f85335d81e44eb86b6a7240595c40c8927c0b7b SHA512 4175ebb78228475b32744a59ad4c404f7b88344859c19874606967c7d83a4680bbc78ff42d13b866b8e6ef939d2f1948b0a0b42819c78a8520856bae48ec907f
-EBUILD ntplib-0.3.3.ebuild 487 BLAKE2B ae49b6474788e1c0aa7881a80715af4ccb7e72f10db769be02659394a3372325df9fcb983c2faaff81dbda40f697beed7b0dd9b85b8fad69f3d29d7befe4dcaa SHA512 ee191ffa354455b655a2e5a71c0ca378d5db1faba1756862e9739f49eedecbaa28cb06dad1398e9886deffa18ce964b84556f882923be5eb4c8aa235dd752833
+DIST ntplib-0.4.0.gh.tar.gz 7315 BLAKE2B 508936a01e23dcb2ac9446f4ef6a1f8084a250cfb58e456efc25646b8fec49d3317f751fcffc9d397201d7b41c2b9d387afae2e4a75518225eacc4f3fb01c1c9 SHA512 ad735b1bccc4dc149622423b2877dc1d4b461f245dd0bd5b0cf963918ea63806772783e03eb8a66c75934746981fbd28789f19efa339c87b2f83e8218ee4a4c3
+EBUILD ntplib-0.3.3.ebuild 518 BLAKE2B 07906adbd1559ad43ca529a613e3c085e5db141513ec6d39c734296abb365bbc199d20611b07ac80eaf16ebe62de85dcccde3e40f8e79ab94bad28a61eedaca6 SHA512 322f86499b01356009d2cd8cc714bb9406823af85992ee7b5f1ea506bf0b958049e86019ee7e191ec72bc777ab37cf806fa9dd27a0b11b89c29d6305baf157b6
+EBUILD ntplib-0.4.0.ebuild 518 BLAKE2B 915ada90e2fe3fb28ea43ad922b707be0e7787611510d1831dc03b1720090100d179e15cfb776a854d2e72ed8b231f1096b7ef1d9140b3fd318ffb86b5b5c95f SHA512 381ba62cd0d1605f465ca99fa39fd41c5a8212adc67b88e871ff1d2cc294a95f990a8890711703f209986dea36835ac0732be4a2f7b5578d368e900563e6772b
 MISC metadata.xml 287 BLAKE2B d9c88c99c78fd24d440b330228a1274e027828e515dafcd5002f0a5ead33993a311b69981cea6d45e43f5f3cbdb659732b611590fca0731a4fb686b9be68ef63 SHA512 d256e098bdba17370fff6e829dc5eb5b416fce97370aab0b5c96eb2be30376d1295d502731266a975e81001f098f8f030d7b1fb57b3942ef6f20dc99cfd0efe6
diff --git a/dev-python/ntplib/ntplib-0.3.3.ebuild b/dev-python/ntplib/ntplib-0.3.3.ebuild
index 388be2874a6b..38cffbd39d3c 100644
--- a/dev-python/ntplib/ntplib-0.3.3.ebuild
+++ b/dev-python/ntplib/ntplib-0.3.3.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=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -17,8 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 # tests fail with network-sandbox
+PROPERTIES="test_network"
 RESTRICT="test"
 
 python_test() {
-	"${EPYTHON}" ./test_ntplib.py || die
+	"${EPYTHON}" ./test_ntplib.py -v || die
 }
diff --git a/dev-python/ntplib/ntplib-0.4.0.ebuild b/dev-python/ntplib/ntplib-0.4.0.ebuild
new file mode 100644
index 000000000000..b5c4c8472001
--- /dev/null
+++ b/dev-python/ntplib/ntplib-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# 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="Python NTP library"
+HOMEPAGE="https://pypi.org/project/ntplib/"
+SRC_URI="
+	https://github.com/cf-natali/ntplib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail with network-sandbox
+PROPERTIES="test_network"
+RESTRICT="test"
+
+python_test() {
+	"${EPYTHON}" ./test_ntplib.py -v || die
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 46c5c872aff2..2443be6fa80e 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,5 @@
 DIST Nuitka-0.6.11.tar.gz 2582563 BLAKE2B e65c3a01f3283b24aadefc47a17a41ebae116265946c24f2225fa7f3f6f824a0a822c76aa2fa1ff33b5a00d4d3762bbac7cd0d090d2627274155b13a48d8f0ba SHA512 c1ead8430f0af3a20d7a14ae3cb34b9a4675c18f0c775e8833b5722cb0acdd8213b28639e52067b3e6758b8b6cc516b05151cfd85560630c92b872dae05a88b4
-EBUILD nuitka-0.6.11.ebuild 1188 BLAKE2B e330144fc75d0d8ac39391ea205b221672f8b93f4034e14e978bf4e9a306fd8dda244ed9184edb1a6c9fe8703f89f60ffad688216963246b4bea54e494026513 SHA512 ee23c9d30112bfd85e7a313fe2cb044d3ab1eadf7ce97d1dc03219d9c1a444dd1414e04794f50bfa87a096d0b33ca58792757c7cfc120ba10cb84d71dcf1295d
-MISC metadata.xml 841 BLAKE2B efca2f349ecd0eeff87ec403e691102ff6f8a2a3b6e61ebe463064d4b4d7655bfb09a7fee840371b64df4426f8e9f6db0d801e9e0c5bb020c362bc9eeb1e9c93 SHA512 3a32cf40d2c9f66e25a7410c2fb2dff81e927f4bba6ad492b5a9f127914678d23d2fe3d73cee540bd4f336995bbbec5efa2fc05b38eec30333c313f2b43599cd
+DIST Nuitka-0.6.15.tar.gz 2712097 BLAKE2B 78c43be4a2ef5678d7a0d6164d7cba2b3a67a738215915b001cdb3774e209fcecc167c52db4c3b22d87dde9169e48077875d09f8601df7c8b079e3d57b21aea6 SHA512 9a41e9b8fb3f51ec16dccd5415b3b7d7d201230fea6aff902931be1764ba65e1d5e4885cd772b4c1cb9f36b1b14a02a73351bc5c1b8e7f7bbb87e5d74aad16b4
+EBUILD nuitka-0.6.11.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
+EBUILD nuitka-0.6.15.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
+MISC metadata.xml 942 BLAKE2B ec5857515914046bc074009149a2e830fd94da026e6563984f914d72183595617e1437e1d3dcff9caeeca20fe0f2be0cf33d45489a36bfde05b35815a9a34df2 SHA512 c2bcbedbfaf567f0813291fc890fccf9d59fa52808317cde9bbdfdda79337f15a1e6551587557bc0bf8ea27f5cc646674d3857c1c960f72469730fa23a43eac2
diff --git a/dev-python/nuitka/metadata.xml b/dev-python/nuitka/metadata.xml
index ea8a6d087e33..bfddacd6504f 100644
--- a/dev-python/nuitka/metadata.xml
+++ b/dev-python/nuitka/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Python compiler with full language support and CPython compatibility
 		This Python compiler achieves full language compatibility and compiles Python
diff --git a/dev-python/nuitka/nuitka-0.6.11.ebuild b/dev-python/nuitka/nuitka-0.6.11.ebuild
index 739ff9dd18cd..d45a2f3b311d 100644
--- a/dev-python/nuitka/nuitka-0.6.11.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.11.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 flag-o-matic optfeature
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="https://www.nuitka.net"
 SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -26,7 +24,6 @@ BDEPEND="
 "
 
 DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-S="${WORKDIR}/${P^}"
 
 distutils-r1_src_prepare() {
 	# remove vendored version of SCons that is Python2 only
diff --git a/dev-python/nuitka/nuitka-0.6.15.ebuild b/dev-python/nuitka/nuitka-0.6.15.ebuild
new file mode 100644
index 000000000000..d45a2f3b311d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.15.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index d4c5625d88de..1c8c3c127e4f 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,6 @@
 AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c342db80f7f5a7f02a5b5884bd9fac574dcadb9234901b08b1b2ca5bc5ba0345a58e896a241e3a48b4b050b2f5a1063324359d84c SHA512 4418b9c5ed3842848bc06a56ebbd7cd9261657e407775374f2f060944522128d8a5178888def6e4cf42ff6d81082d9cc1425d9553c5334ad4e728d0df9b86bc8
 AUX numpy-1.20.2-fix-ccompiler-tests.patch 1616 BLAKE2B 3e2796029854207187322b1061201e7f014472c64d8c66a2dd3f82ec2eed7311f5cc3351d98aeb4b8b75d95608853066a30394e5316bb91e443744f33d66966b SHA512 5ed01b466a0da96b5d7c56b78e420d6c589c48c20053b9da66344384fa93048f90e281d3ed5caa9325f6afe00ff48841b24abc926c75aacb8a6bd5418ed32117
+AUX numpy-1.20.2-fix-popcnt-detection.patch 2852 BLAKE2B c7b97d54649e33fecfa9cdd7e79fbd6a0f599648edd9a923a4d8ff428f774813d81f045e82905e236828608f4c969e56d681a828ed0190f86f8731a2c22401d8 SHA512 cb0e461b4ec788812fcdb528be18dcc04222c1aedb9ecef96d8f0ccefd407640dfb7d10b2bd392e0e40054b016a0d023f4a397432904496b793c8a2f1fba8f74
 AUX numpy-1.20.3-float-hashing-py310.patch 4677 BLAKE2B 410438f8b9ba7bc346cd9fbb4d3087d60af6cc54b7ba4a839a1d9559d5b09db623932089ca8c34a70d30622d6260f3bff13fd2d97c94f6af437502f2e5b3c27d SHA512 a7605bf4db0886f4e7d4edd65c7b46d6b47ccb43140555cc86b35c2f003cdf29e8704593d77f7cc551f3be1550af209e7910a95e1421fe45b5d0ea5716d62588
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
@@ -9,6 +10,6 @@ DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef96
 DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098 SHA512 316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
-EBUILD numpy-1.20.2.ebuild 3734 BLAKE2B 2a4dd063c94eb074c8ce3f60039710d4426f1f8e0be2be1419af23a791bdee32cb52aaf03084741fdb4d6a849b9e6c4f08aea3d642178361e5d1dd8329ca9f3d SHA512 541e3a324ef2f06236c78b5578a338b0084e1067b2fdd214f95bb579f706e6db91fe00513999deaffd5e7bb4736e49326c8f919e4c1b3b7b8c1dd473364032b9
-EBUILD numpy-1.20.3.ebuild 3675 BLAKE2B ca4e67e97798cd46444cb49587a6e9549fe8bb67e4ff8f8d1da400ad3b8b03823e767cd936b58ae6abc307e1a2c49857c58e2d2d428fe102e0959f72ca37197a SHA512 cb0a52a6c41db0097413117363d1e243e3b56b13f0d731939f556795f9c68ecd2e274b89ec675e0b6f72100c775e4d92137547527b32e27dc6ecaf0b941495fc
+EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
+EBUILD numpy-1.20.3-r1.ebuild 3730 BLAKE2B 7099a2b62a5d366b9a5b099fe7a8b675d1488659e48810d2e014526338ff67eec04b68577db68ce9f97b301de52dd58bd9a1df903b1b7492c6c157a34f61f274 SHA512 97c9046f0d2548cb7ff6f91c8f0d000f0e90caf9d748e9c723b957f28bdad3faad66d44b5bada93577f40cebd37fa2ad213069bec86eb925ae7c4d0b79e88cbf
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch b/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
new file mode 100644
index 000000000000..85f4bb11b768
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.2-fix-popcnt-detection.patch
@@ -0,0 +1,103 @@
+https://github.com/numpy/numpy/pull/19074
+https://bugs.gentoo.org/788184
+
+From 8dc768964b5578a8aa9db1ef2c55134a00731e10 Mon Sep 17 00:00:00 2001
+From: Carl Michal <michal@physics.ubc.ca>
+Date: Sat, 22 May 2021 20:43:10 -0700
+Subject: [PATCH 1/2] Fix compile-time test of POPCNT
+
+The compile-time test of POPCNT, cpu_popcnt.c produced code that would
+execute without error even if the machine didn't support the popcnt
+instruction. This patch attempts to use popcnt on random numbers so the
+compiler can't substitute the answer at compile time.
+---
+ numpy/distutils/checks/cpu_popcnt.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/numpy/distutils/checks/cpu_popcnt.c b/numpy/distutils/checks/cpu_popcnt.c
+index e6a80fb40be4..f6c785dd2a97 100644
+--- a/numpy/distutils/checks/cpu_popcnt.c
++++ b/numpy/distutils/checks/cpu_popcnt.c
+@@ -4,20 +4,26 @@
+     #include <popcntintrin.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ int main(void)
+ {
+     long long a = 0;
+     int b;
++    
++    a = random();
++    b = random();
++      
+ #ifdef _MSC_VER
+     #ifdef _M_X64
+-    a = _mm_popcnt_u64(1);
++    a = _mm_popcnt_u64(a);
+     #endif
+-    b = _mm_popcnt_u32(1);
++    b = _mm_popcnt_u32(b);
+ #else
+     #ifdef __x86_64__
+-    a = __builtin_popcountll(1);
++    a = __builtin_popcountll(a);
+     #endif
+-    b = __builtin_popcount(1);
++    b = __builtin_popcount(b);
+ #endif
+     return (int)a + b;
+ }
+
+From 52d5fe1ede45083d0783c3e2bbaee5c44df9d553 Mon Sep 17 00:00:00 2001
+From: Carl Michal <michal@physics.ubc.ca>
+Date: Sun, 23 May 2021 08:24:52 -0700
+Subject: [PATCH 2/2] Change fix of cpu_popcnt.c to use
+ _mm_popcnt_u64/_mm_popcnt_u32 on GCC
+
+_builtin_popcount is always available, so the compile-time check always
+succeeds.
+---
+ numpy/distutils/checks/cpu_popcnt.c | 26 ++++++++------------------
+ 1 file changed, 8 insertions(+), 18 deletions(-)
+
+diff --git a/numpy/distutils/checks/cpu_popcnt.c b/numpy/distutils/checks/cpu_popcnt.c
+index f6c785dd2a97..540c98dab05d 100644
+--- a/numpy/distutils/checks/cpu_popcnt.c
++++ b/numpy/distutils/checks/cpu_popcnt.c
+@@ -4,26 +4,16 @@
+     #include <popcntintrin.h>
+ #endif
+ 
+-#include <stdlib.h>
+-
+-int main(void)
++int main(int argc, char **argv)
+ {
+-    long long a = 0;
+-    int b;
+-    
+-    a = random();
+-    b = random();
+-      
+-#ifdef _MSC_VER
+-    #ifdef _M_X64
++    // To make sure popcnt instructions are generated
++    // and been tested against the assembler
++    unsigned long long a = *((unsigned long long*)argv[argc-1]);
++    unsigned int b = *((unsigned int*)argv[argc-2]);
++
++#if defined(_M_X64) || defined(__x86_64__)    
+     a = _mm_popcnt_u64(a);
+-    #endif
+-    b = _mm_popcnt_u32(b);
+-#else
+-    #ifdef __x86_64__
+-    a = __builtin_popcountll(a);
+-    #endif
+-    b = __builtin_popcount(b);
+ #endif
++    b = _mm_popcnt_u32(b);
+     return (int)a + b;
+ }
diff --git a/dev-python/numpy/numpy-1.20.2.ebuild b/dev-python/numpy/numpy-1.20.2-r1.ebuild
index 234a0932bb97..2e16936ea190 100644
--- a/dev-python/numpy/numpy-1.20.2.ebuild
+++ b/dev-python/numpy/numpy-1.20.2-r1.ebuild
@@ -48,6 +48,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
 	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
+	"${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/numpy/numpy-1.20.3.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 5b772a58a6f9..6604eb23a4e6 100644
--- a/dev-python/numpy/numpy-1.20.3.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
 	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
+	"${FILESDIR}"/numpy-1.20.2-fix-popcnt-detection.patch
 	"${FILESDIR}"/numpy-1.20.3-float-hashing-py310.patch
 )
 
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 66c189330478..a61dc8031e80 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,4 @@
+AUX openpyxl-3.0.7-metadata.patch 361 BLAKE2B 7a5322e9fd568124bc2271f015fa284300ca7004d286b4f3c4dec35446948941e69c3d0b43d7cd4af59c05a633b73071290d65cc1e83bbaa28eef39cf9f03d58 SHA512 1926f83469f6b869ff5a923b1bfb112b0674b86aadaade6005f3921e6cc67118c771b36cd04af49447e99bbadfbfa0a03d56f1d6ffaa3fd27deb40b4ff2eb5ee
 DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
-EBUILD openpyxl-3.0.7.ebuild 708 BLAKE2B 4098cdeb4ecdf4cce95ed20cd86b9eb6d780a0f2b2c537385d41bf9ff5bd3016b0354faaaae073e64e2781d9c730f56f9e6fd3a7f459c3d0016e84b5055a5ca5 SHA512 ff9d6dea51ed8741cb775a8d8d22f9e6182bbb4e64e439d8a4c405a5f34068122eeb1996215e4881c092b60bb09687229a89544e588860be2405da8d1e10f074
+EBUILD openpyxl-3.0.7-r1.ebuild 767 BLAKE2B 53053bdfb36551f6f7a9c8bbe51dbec7566ebd51a022ef4ec7a092d7fff33315ef2a4841be5c3dac06ef0e8ee5b31f47474dfa295dc79e4d76dd866e3cb652fd SHA512 8253edf67d365df6a21cbfc1226bbb377c206ab993a7f725bcb875a308181bc205616e4d664f5c375efd65ffa8af18bf9109680bca46e1c6d8c45f4b3fdb90a4
 MISC metadata.xml 535 BLAKE2B 59a57dfa41a492b88402a893a4c2e1a6bc624ada24584744ad2c142d1ba9bbad0172450e17cc2ab62068c7964c08066499b4cae59e39aef81bc7714ba86059f5 SHA512 30500339fc951ec3dbef77bcb5b0298b33bedc78ceb4733f9fac689da179096396da308214f012c40c54f718d74c6555b5795d763db197dfacceb46441b292a5
diff --git a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
new file mode 100644
index 000000000000..08349787e6fc
--- /dev/null
+++ b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
@@ -0,0 +1,12 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py	2021-05-29 19:21:13.876463476 +0200
++++ b/setup.py	2021-05-29 19:21:21.986626313 +0200
+@@ -74,7 +74,7 @@ setup(
+     author_email=__author_email__,
+     url=__url__,
+     license=__license__,
+-    python_requires=">=3.6, ",
++    python_requires=">=3.6",
+     install_requires=[
+         'et_xmlfile',
+         ],
diff --git a/dev-python/openpyxl/openpyxl-3.0.7.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
index 526fc8d0d055..b5ef708e1bec 100644
--- a/dev-python/openpyxl/openpyxl-3.0.7.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -27,3 +27,7 @@ BDEPEND="
 
 distutils_enable_sphinx doc
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/openpyxl-3.0.7-metadata.patch
+)
diff --git a/dev-python/oset/Manifest b/dev-python/oset/Manifest
index 80a983cb5446..87cf3c17a226 100644
--- a/dev-python/oset/Manifest
+++ b/dev-python/oset/Manifest
@@ -1,3 +1,3 @@
 DIST oset-0.1.3.tar.gz 7345 BLAKE2B 1ef3fc6e0acc0bdbabb139a968ada851a0b1f19785b30c1f65bc3205600ae868add111487404b0e71b03cb5c2fce9d3991c32c5b0034ead62da058807efabfe3 SHA512 d34d11e76740c85a41be3d055710fe08afa7de1839ae43d76c152aa5838dad5895f0a0d95c5a2625a94494fc462e08f79a7614756ee5748c35e434176ec21121
 EBUILD oset-0.1.3.ebuild 370 BLAKE2B f37ae2e55496a4cc8af9216461790b1233ff2480114728b775b88d3ab68dc51a002a6297ba599ad04782a334c4dacce4752673c1f2eb2848dcd88962f5ba337d SHA512 61769509bf1a14e698278e12b0fc555fbc366c5da3c123a115a9551f900c3bca44f0c9ba753f872f50744bbb6d3b8cca4e0827843120d32614898c59eea27b63
-MISC metadata.xml 325 BLAKE2B 7a9d5fa1688919833dcb2dceea06d31f2d1484e84b96a4096dc5302d85b4bf378df5d1119d0f07ffa9b7aa650628561680830f5cd58003c3f1134949c90dcabe SHA512 91c69acd217279dd7ea4fd57758cf5dabd21cbe5adeb0a9f6f1f88814702fdaa3752ff6c6747bf13365c0f3fedd9f586ca63792be9a880c7837c3f3d149ec4e6
+MISC metadata.xml 349 BLAKE2B 341ca0c588e411b30c4938cb7433594a02a17e849134005f6da68ca62095b414add54380432631d0270e18411ac2120d97cfdfedf1d56107fdf412ed81696ad4 SHA512 59980905757cbbf8f7dbbb3fff09dfcb86440ff81fdbdeed0719ac6ef00f05468dc69b0d1fbd6518ed5a77fcf2e9606c6d8809399691ed7300f0520b63223d9d
diff --git a/dev-python/oset/metadata.xml b/dev-python/oset/metadata.xml
index ba9e1475b0d9..8b86be55908f 100644
--- a/dev-python/oset/metadata.xml
+++ b/dev-python/oset/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">oset</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 08a59fafafc4..c03eadb1c521 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
-EBUILD oslotest-4.4.1.ebuild 624 BLAKE2B 8dc918bec2ee23911215952b94f76ea8c82bd26f7c95f44dae7b09dc49c179a8066e1306f46a0fb3c536868d0a17b50bb5dcdabdac4cb62c083d177a3b703b2c SHA512 6c66224c5cc3f45364b6233260ada0300155c659445d5b2b68b9129032dd9d2305d8854b655ece5fc48eabf9469f71d9df11c2ff33b87211b54ea5cd5c33ca23
+EBUILD oslotest-4.4.1.ebuild 658 BLAKE2B 5bdb57aab28a40f330c5446e72b8a5e5e60ff213995533dcb3246f41478cb35c79ed0fea59d7eb29141efc9b8a6a41eb8817577e8c36005840f65cf96b666c87 SHA512 67062d9036c40e30dfd6fa983b28f5a7e1289f5f8bcdf3901cd257a981b28d627c6c1c1c070eafd1140417ad34f9bb50375dc90edebc4ebb633b0113bd6eb277
 MISC metadata.xml 876 BLAKE2B cf0d406713d4859baa20404513835b83439c92a99ddad4312ce94769c64fffd4d4ef0dd11c06427c09393b4f151491733efa0fef14e49acc2253f3bd0e9d60f7 SHA512 b38c2229b374a960bb060ddb65efe97b9e6fa6d9cd58c0f6de60702ba8ea736cef1c79d08491bc12c4b1dda633e2c7a6b053744bb28e47e6ad194014d28c6b12
diff --git a/dev-python/oslotest/oslotest-4.4.1.ebuild b/dev-python/oslotest/oslotest-4.4.1.ebuild
index 3526d62822cd..060a17fc8705 100644
--- a/dev-python/oslotest/oslotest-4.4.1.ebuild
+++ b/dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -19,4 +19,7 @@ RDEPEND="
 	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]"
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index a0b60244fc03..363d538cd030 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,3 +1,3 @@
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
-EBUILD pastedeploy-2.1.1.ebuild 990 BLAKE2B 69d8853742272ff9e232802d8566c44c9f26eea2cf12a72f034aaafcb3c9985a7a38debd84f1b0d395ae419c22fc3840632183c46d4d3e70ac991eabf193aaf1 SHA512 4729ae5e54838c20f551768bd9e0eab9a2b91a290f2b9796935fe5e0fd5e077a3edb88db5aacd0b13a85502ae3ffce93decc53bc08a946aed03fdbc65b2943b3
+EBUILD pastedeploy-2.1.1.ebuild 990 BLAKE2B bf4c59805cd8d791c03e697dfa44733a55f3d57bf4fdd61cd0bf6920b83b1b19bc3c85f8a2e1cb22a15130483c095a60c1a963689874af9aa73bc1acc18e41a4 SHA512 7fb8de59ad1fde7f19941a23a6e1798d22f7ec860b79c7fd6875d49980e54719f9ffbc15634ae02542038df70fc579fda1ea4d0c2ab6e9fc0a73460fd927b851
 MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index dd594a81dba5..a1f5d48ca816 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index c33639e39d7d..458d5aadb956 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -2,5 +2,5 @@ AUX pdfrw-fix-import-collections-warning.patch 1450 BLAKE2B 143b5365d1d79cae346e
 AUX pdfrw-static-fix-import-collections-warning.patch 527 BLAKE2B e7ccd07d60e5afd7c98b81c1f6209ef539a6b0bed3ae4a96e6179d86bd73bdb6e4f673242730aea2e3535fd2a35b560f2d2bd8a84d0599f52e0525b7310088f6 SHA512 6d626d216c3201145825faf7d042b516a18bbeb570b098c46abccdfe85fe5613d166c8256a6b240a35aeb527a4c2b555fe2059a0fcbc0310ce9432ee26cdd11c
 DIST pdfrw-0.4-1.tar.gz 143615 BLAKE2B 281dc94c762dcc776e2c9c84609b59ca32387510bcfbec39271a6073533f9ad5d416cf4250b3dcd8564973d197ce090719c5561f58b972c89d463b90723ac8e6 SHA512 f2ef6a966cb1b947425679e6c16e658b5d1dbc13d62fb2e1edc278508b03f6c6847b3c83dab8bcd7df3438e587df066bc16b653461ae402bb8688ddb05f4e886
 DIST pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz 25243391 BLAKE2B 5c491d56c9731352907787bbe10b8b3ac362f0c7892ddcd15a1299d3b2b4bb604662f6231aa22478290992a345e769af2e2c2459a25a16c370ea05fa68101f80 SHA512 9bf1d5ddc8f55b40b50041e745579406bb0036fb7795ac40064aad7cdf592869051ba84a5ab080042e237690bb2f1811b86b2a4424535aa4c367f6e29a0c34eb
-EBUILD pdfrw-0.4_p1.ebuild 1598 BLAKE2B 9b86fe593207fc8bcd7344945b30e50f3a78111c7f22582a887d28a554ca06e7b61ac26096690f9b7cc6c6549aee3b45e0ec5c805d3d008df181053cf75e1a50 SHA512 c17afb9e835abf2b241809771c63eab2a03efcd79d890b787de95d0d2d9b07d5acff1cb565c9b30a4c47799071690f84a2f677027d4f962ba17f8f50fc87fe7a
+EBUILD pdfrw-0.4_p1.ebuild 1519 BLAKE2B 4b8b2d4855f012c5393210a6786caee6db0c8d2a205cf838cbae0ea428c2923c87e41be6bb9a0116cfa201b50c0ef5a399db3c7fb80755ae89b987660099145f SHA512 ba3d550e1df5b558cd639c479fe28da9df29a5638d2c72fe751d52a6320df60ddc3e3bb82bce63028c34c414ea570a9a5ba94558f0d93674a578be2b4860ac63
 MISC metadata.xml 391 BLAKE2B a926eab8ff8ea510f4c418fa13b3adc8ce9a3498eaf16880a2a2ed944312b6eaf162809236f5499dec6ab310ace105c9ca8ee13c046ca030f5013545f4af20e1 SHA512 c0518288da1389feb27e291b69254fe7fce0f4b6f28eb75fbeedaa343900d0808171ab4018a275b6e1aad3c48c9fa4b1056e8bec80a02a7b02cd4879d82bcb97
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index 43e32b1d00f4..bdb7083b77ae 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -27,14 +27,11 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="crypt test"
+IUSE="crypt"
 
 BDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
 	crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )
-	test? ( dev-python/reportlab[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
+	test? ( dev-python/reportlab[${PYTHON_USEDEP}] )"
 
 # unittest would be sufficient but its output is unreadable
 distutils_enable_tests pytest
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 38461e7799d5..1c03862f584d 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,5 @@
 DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
+DIST pgspecial-1.13.0.tar.gz 49204 BLAKE2B 7269fc94fc0672db1880ba4b76c8926b6a3c995aac3fca77add7ae6756fcc3295d8d32fcede37cd3fa2d82c82aebfc26d91ed50b4294c5206f04d4c72742b45b SHA512 de2560106fbad14f2095ace468c8490cb325aedb772f649f20a0b5fe65f19afeed33f219d3a6eca683a63b418741a9906a01f7c4bdd8734868517faeba791026
 EBUILD pgspecial-1.12.1.ebuild 684 BLAKE2B bfac4ec92c81b9d0076243bf0a3d8ae1edebdf23a60805a16f163356245e3a0ece13987ae9114fa83ea1b77b2220c73a8a9582c07edbe5d7f3613aa29204140c SHA512 0e785005053597a981e76285f7574bbee0865281e002db70da920bcd6e13c8acc92e6a92e4a30e510c54db9ce9362f071248442bd0643da8d630a8465b46ebab
+EBUILD pgspecial-1.13.0.ebuild 1132 BLAKE2B 99754671fd2446c9d6c38c10c3beb8424b571bb9a35e07d4e5ff3cb4bd155039322f87add02900ff007cd4802a8e86385b9596e4469a19a1df6d74465b650ff6 SHA512 56eae566d6033b6247011d437840c1c2094b765310773e2d57cf3d5b6d0e676d8f0c520024c319226b0cdb9403b845f52936ebc9780ed72272886aad98953ec2
 MISC metadata.xml 468 BLAKE2B 7fb95be81dcba90a99cd8ac20a7eb3bd93d926ab8da91d328806fd5d6516a8f32c46ba8721a9d490e1243eb2f1954e2ca35d4543bc8df0d2c53f60dc280a8a5a SHA512 7b558945ce12f4be5c135118b3ca4d9e565ddf5ef978c0b84af6687e15f2d26efdcf27f55efc1c85fe7b9a023a506cd219490d2baf9607cf099e921b0709df0d
diff --git a/dev-python/pgspecial/pgspecial-1.13.0.ebuild b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
new file mode 100644
index 000000000000..a3365765f2b9
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )"
+
+distutils_enable_tests pytest
+DOCS=( License.txt README.rst changelog.rst  )
+
+src_test() {
+	local db=${T}/pgsql
+
+	initdb --username=postgres -D "${db}" || die
+	# TODO: random port
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U postgres -d postgres \
+		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U postgres _test_db || die
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index f80bb9c832b0..88010b1ec79c 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.22.tar.gz 2258000 BLAKE2B 0aaabf98997a254166267e3f37718e6ed745f0ae55b6b338eabc65067d1115a08f035879bbfd6a2ebaa76f4edbd4c50510119d3eeb4502ce2e53e097dc021c5d SHA512 80fcfda8051b6b77f5f75f39341a8b588ec7cc4620433f415f34feac1eaedcd8c36bd43ab75621386282ce1b77b184bd6407a7dff2c0958ce0507dc96383e47d
 DIST phonenumbers-8.12.23.tar.gz 2257693 BLAKE2B 338a3e943e98c768178768c0e352a8c162f88f47d51652c032a5492b869ce1bc047bc42a9194699d36bdb1699a360324d3211cd4670225a7fbeef6f46f2e47a7 SHA512 2ff7f4a9118a2d1dcf32e7dd919b8f91af0240ba7e180fbb4f11a7af197ad1236f65a7ed985c39fd8059dad80e9859284c3b1ece7f1bf699ccbe399971b060a3
+DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
 EBUILD phonenumbers-8.12.22.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
 EBUILD phonenumbers-8.12.23.ebuild 436 BLAKE2B ae3484cb7def1c6fff1fecd3e19923e9f0200069f9169d1b6593ff9f6461610171ac06f001df26f465bf25b436f31becd5cb44d1d5b22a039ccecb9366b51fa2 SHA512 a868c265b85ace987ebfe3df5b5b6fdd2af69255d95245fbe973dfbc364a16bdddf445eec541f5c27b545ae2082ed719b8076e2d638e63b27967934359f0a54f
+EBUILD phonenumbers-8.12.24.ebuild 436 BLAKE2B ae3484cb7def1c6fff1fecd3e19923e9f0200069f9169d1b6593ff9f6461610171ac06f001df26f465bf25b436f31becd5cb44d1d5b22a039ccecb9366b51fa2 SHA512 a868c265b85ace987ebfe3df5b5b6fdd2af69255d95245fbe973dfbc364a16bdddf445eec541f5c27b545ae2082ed719b8076e2d638e63b27967934359f0a54f
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
new file mode 100644
index 000000000000..728d3a9eaedb
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.24.ebuild
@@ -0,0 +1,20 @@
+# 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="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index e0ce6488fa9b..59473f60c571 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,5 +1,7 @@
 DIST pikepdf-2.11.4.tar.gz 2298520 BLAKE2B 4c657e50259cc126a4537f699c30723eb5d06303b2fabaa53c4ed2862236bcc253ab793d20905f7f2e298649a3ba8c5c8b66deeb4b859b66e18ab50cd512b843 SHA512 292fa0cfdd0a3d43bfc533dd339acc35b93958cdab476a7963274f0e98f2d8ad0c121d7605b53fe9e1a318cab59b24a46343ccf9f25e6de32e6e39d6dfc02ff1
 DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
+DIST pikepdf-2.12.1.tar.gz 2301208 BLAKE2B b3fa60c97a58dc312e00c0e129d1f55fd390d83b221dfd90acad5f5954e0c564492fe39718248f87980e42ecd590dfd98bfb21133c8ab0664666391e8e030902 SHA512 13bb7132282c024fa5118970deb6347c954a94545602fa21efe99ea2f837693b810dc6706d1681c28588d5ef41a867c70f75c7ab85b01267fbcf55ba89d39b94
 EBUILD pikepdf-2.11.4.ebuild 1538 BLAKE2B b56471c516e7c203ca3b712d9ebffcee5c322bce8ca2eb6a31baa5238f7999bd4445dfe0149dabb6e6b259878b2afdbecf46e0bd60c95da63be2f8d5a251e8a6 SHA512 f1e661917c48506ccf19eb50c3ff7ff9c2ebfc2ab6e731a8ac9c81dc22b92c253bafc037d69d8a8e9372712699a3004734278a0fd78c709502ff2066bebddbd0
 EBUILD pikepdf-2.12.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.12.1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.12.1.ebuild b/dev-python/pikepdf/pikepdf-2.12.1.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.12.1.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} )
+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/pip/Manifest b/dev-python/pip/Manifest
index fbae14b11f50..c17132b950f4 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,14 +1,9 @@
-AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-21.0-no-coverage.patch 2082 BLAKE2B ad2efd846eabc81f159cb9c45773258fa3e242ae619428c264bff738456d3957a229807812fd945744163b0d70bea70da36e659d68530c33f810e96d311de9f5 SHA512 4f8e2242897092e41e156b01a35ca2a0c1ddcaa1e4e5347b6fef0f9ae171a8d7283c346c0e0c4b013e62df29eb053095d6d8caf754d162fce89937270f0bf1ae
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
-DIST pip-21.0.1.tar.gz 8772082 BLAKE2B 2fdd78e2db8ceda2bd21fdeb4d29c0c2eda412827b87cc97ec1996a5b71b9c6e5938c0a6ef696163780bbbc55d81b8b3b1b6e2e79b05fbe9ce4bdd52e3ebdf13 SHA512 2db5397f4ca3a3f56f5add3f827bf1f0a4296019703438d68498266b9d2559b6baa3132061c5ad4c2a08bec6e76a2768763fdca02d86cf32aadd4640afbf3664
 DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5
-DIST pip-21.1.tar.gz 8771224 BLAKE2B 2056a741b7f51d56c3984e2b0bcd1fa9cc12ba9677f80505fa5182fc0afad9c7dfe4ecf9429cf5ed5f8534f0a6a003b12455e90537a5dacbe188c8db548b71c3 SHA512 2617ae852cd52db980ab4131d711946b63930d30f480e050555bc61acb78577aa447b88065c6c8eba7e29c7167f78f04b11404cb0c1975caac464fa768ee7de8
-DIST setuptools-51.3.3-py3-none-any.whl 786243 BLAKE2B cc8a98cdfd5cb78a342a3d50049c0ebd0965451e9bd4050b7a133346f505a17842a498531ade9bf932064a6cac81277ecf60d94ef94faa39b78740de87f9fd86 SHA512 1d4f29e392371b7f0e427d0570fddbdd1204f6c98e48a0a289db23b20f7c048551584ac946e30b90d720cce4f508b3c39208e9a70f87067d66734432963d141c
+DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.0.1.ebuild 3770 BLAKE2B 809223baec949e59ee589a954440349091c03b81c4f3d25e405169c0a678aee6e71ea59e1b84a11b6befc27e69d24600f89b17369c0d03e2b5c5f11715354c8b SHA512 b9283e24bccae8a5c8e1ea6a2cd525079d12b85b1e772434726a74d861686a4411c39a5a81201ad28c64e74d997098bb3e52443bedf827268d4d6b2f80dd11f6
-EBUILD pip-21.1.1.ebuild 3868 BLAKE2B ecb6f983248b468ad6d4830954d366a8e09f8b454165ea5e2acb3ffa3ef8b1049cb25d4b8f5e64a752337333eb56934489769c732503a7fca6c42fd5d3186848 SHA512 795ac0c76cfc2a35a6058ab5438ce9280559356e7dbcde6b428d45781ce928cedf19c2f7ae5a7d46305a280d9f45328dfd155ac17c87ad5045e1c2900218b2d3
-EBUILD pip-21.1.ebuild 3868 BLAKE2B ecb6f983248b468ad6d4830954d366a8e09f8b454165ea5e2acb3ffa3ef8b1049cb25d4b8f5e64a752337333eb56934489769c732503a7fca6c42fd5d3186848 SHA512 795ac0c76cfc2a35a6058ab5438ce9280559356e7dbcde6b428d45781ce928cedf19c2f7ae5a7d46305a280d9f45328dfd155ac17c87ad5045e1c2900218b2d3
+EBUILD pip-21.1.1.ebuild 3866 BLAKE2B 1a7e1ebbf174d15f7fc734b8da623457d9d0d73816a31a215be8d379e0d456d051d097c4a970fcf4e1fbc929ec15704f2fab961df0facc67b79143b1ed0f72db SHA512 854a70b497255438d54310a9283c2cbcc99b8f7b5fc53bf4171a29600bbb43343d2e9941e43c9909654c0ff7dd5fd9a667b848c92817f3ab513a1dae50552f66
+EBUILD pip-21.1.2.ebuild 3841 BLAKE2B e4d61f31d5555e59be6c660220355d3d5270abf1a0f9bce65ced34b198c1f5099d140b2de9a4fa86de324a6954308256b5caa44dbf30cfea137457efac5ca6d9 SHA512 96753c898c2353f70bd2e5fd692620bc86ecb6e01de4a576c6865af0eda91c319ff8cd63f7f7862a6b6434e5c05d7a073f34d812cde1a55898483de4f08d937b
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-19.3-disable-version-check.patch b/dev-python/pip/files/pip-19.3-disable-version-check.patch
deleted file mode 100644
index e8fe868431d1..000000000000
--- a/dev-python/pip/files/pip-19.3-disable-version-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/pip/_internal/cli/req_command.py b/src/pip/_internal/cli/req_command.py
-index 203e86a4..a2183f10 100644
---- a/src/pip/_internal/cli/req_command.py
-+++ b/src/pip/_internal/cli/req_command.py
-@@ -129,17 +129,8 @@ class IndexGroupCommand(Command, SessionCommandMixin):
-         # Make sure the index_group options are present.
-         assert hasattr(options, 'no_index')
- 
--        if options.disable_pip_version_check or options.no_index:
--            return
--
--        # Otherwise, check if we're using the latest version of pip available.
--        session = self._build_session(
--            options,
--            retries=0,
--            timeout=min(5, options.timeout)
--        )
--        with session:
--            pip_self_version_check(session, options)
-+        # Disabled on Gentoo
-+        return
- 
- 
- class RequirementCommand(IndexGroupCommand):
diff --git a/dev-python/pip/files/pip-21.0-no-coverage.patch b/dev-python/pip/files/pip-21.0-no-coverage.patch
deleted file mode 100644
index 82e3e1b30f77..000000000000
--- a/dev-python/pip/files/pip-21.0-no-coverage.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7f61ba983025cbfab7b7b810b13f1a89cb503568 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 29 Jul 2020 07:42:25 +0200
-Subject: [PATCH] Disable coverage testing support inside test venvs
-
----
- tests/conftest.py | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 0bb69dae6..02da6c573 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -311,13 +311,6 @@ def wheel_install(tmpdir_factory, common_wheels):
-                                           'wheel')
- 
- 
--@pytest.fixture(scope='session')
--def coverage_install(tmpdir_factory, common_wheels):
--    return _common_wheel_editable_install(tmpdir_factory,
--                                          common_wheels,
--                                          'coverage')
--
--
- def install_egg_link(venv, project_name, egg_info_dir):
-     with open(venv.site / 'easy-install.pth', 'a') as fp:
-         fp.write(str(egg_info_dir.resolve()) + '\n')
-@@ -327,7 +320,7 @@ def install_egg_link(venv, project_name, egg_info_dir):
- 
- @pytest.fixture(scope='session')
- def virtualenv_template(request, tmpdir_factory, pip_src,
--                        setuptools_install, coverage_install):
-+                        setuptools_install, common_wheels):
- 
-     if request.config.getoption('--use-venv'):
-         venv_type = 'venv'
-@@ -351,13 +344,6 @@ def virtualenv_template(request, tmpdir_factory, pip_src,
-     subprocess.check_call([venv.bin / 'python', 'setup.py', '-q', 'develop'],
-                           cwd=pip_editable)
- 
--    # Install coverage and pth file for executing it in any spawned processes
--    # in this virtual environment.
--    install_egg_link(venv, 'coverage', coverage_install)
--    # zz prefix ensures the file is after easy-install.pth.
--    with open(venv.site / 'zz-coverage-helper.pth', 'a') as f:
--        f.write('import coverage; coverage.process_startup()')
--
-     # Drop (non-relocatable) launchers.
-     for exe in os.listdir(venv.bin):
-         if not (
--- 
-2.30.0
-
diff --git a/dev-python/pip/pip-21.0.1.ebuild b/dev-python/pip/pip-21.0.1.ebuild
deleted file mode 100644
index 902858799358..000000000000
--- a/dev-python/pip/pip-21.0.1.ebuild
+++ /dev/null
@@ -1,120 +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 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-51.3.3-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test -vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${PN}-21.0-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv ${deselect[@]/#/--deselect } -m "not network" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
index f6ec7e817918..e9149813910e 100644
--- a/dev-python/pip/pip-21.1.1.ebuild
+++ b/dev-python/pip/pip-21.1.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test -vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.1.ebuild b/dev-python/pip/pip-21.1.2.ebuild
index f6ec7e817918..5aaeef43de3e 100644
--- a/dev-python/pip/pip-21.1.ebuild
+++ b/dev-python/pip/pip-21.1.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7..9} pypy3 )
 PYTHON_REQ_USE="ssl(+),threads(+)"
 
@@ -28,7 +27,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test -vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 2c5eb37d1aec..39d48035b3af 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,3 @@
 DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
-EBUILD pkgconfig-1.5.2.ebuild 571 BLAKE2B b28daec31941dd46eb8e7f0b83c6639d56a367d28a3fbc28d21b3beefd269b130d5dd9eeaa74085d25622504935395537534192ae712fcc5d3a639d3b1ed6b1a SHA512 bea1313d95301c58d1a43b73e8a3a229ba6986550a30e4da2016acf149a4e74f15183c3dd08f51d5f6d7b82b2f7a37e0cb9beb2a94f1e88160db49c94b971059
+EBUILD pkgconfig-1.5.2.ebuild 572 BLAKE2B 89b889d939b11616e7b5eca89bac2d4277c33aad92b2ec2779825295d77ffb4e73b1eabf79f98a6d06647e3aaa4199d030288921bdece66e477239e916c099b8 SHA512 f0211e5cdd45fca40cf84116f84ec8fa68ad135d821416e7f0b36a5e23d9754904889df7ed9c73739d0d888e6d44673104b30c71f971c4dc60e2f3040f83b89a
 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
index 2d103c69d11c..bc417b9d0993 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index d7a02c7451dd..18b11d27202d 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
-EBUILD plyr-1.0.6.ebuild 917 BLAKE2B 10e9e3439e493bf7807898739abd0a49f3b7c66138bf64a0bf67c638fc218bc50cd3e7e1724d5d164528f2f6e74192381db95c89bea39a45bed2eb240ffca06b SHA512 20b0791113ca7a8e94b7211702d53f93affdbb5d36198373ec99bbd979cdd4b4128f8d38d48ace7fffc6fe6aa480b76ab0cd14e133225ca4e4a23c7bed63c82f
+EBUILD plyr-1.0.6.ebuild 930 BLAKE2B e345c7cf85d685fe450690a21927d4f7d4793faa0dc3d26c24f51102b42d535f022c5d575ae7aa7fcb4dea989b79bc543331a9a91cae45a225223360dbfe1c30 SHA512 747ddeeae12ac89684ffebed1d2f82273f9db4c00c5e86fec48beb7f3db02fd8483a4bd8cfea26826ae651e97cce25a5e9ec81c8bfed73e77216dff46b435509
 MISC metadata.xml 364 BLAKE2B cd94849fc6cb34e69150423177bf80677c49954ff4643b63e4dfc92e87b8c581599c55be932becbc0b05789e819a7a99243433e1c8997de7fab52f643509940a SHA512 3cf3744bf5d4fbbbf47cba6942958be48119e4ec8057d04f2818bd47814ca6ffd39ed7a3f58c80012555df9098e38c25433fcac381f6b4b50d8328ab16f18f19
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
index af53064323f0..6d453c66f45e 100644
--- a/dev-python/plyr/plyr-1.0.6.ebuild
+++ b/dev-python/plyr/plyr-1.0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -22,7 +22,8 @@ KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="media-libs/glyr:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 41fbfee5c7a0..a7fece769d17 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,5 +1,3 @@
-DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
 DIST pocketlint-0.21.tar.gz 23524 BLAKE2B b5ec01cba8b73356f08720149125abe1427561b499b53409e5eb41dc2e5c6dc894b51fc8d7655eb94a6b7ec43a3cd94067d170e2a7f985e251497f253c57f6a3 SHA512 af5f3d9ebd67102a3c2b793ff550c6626ead48da7043ac86d4129f6746532fb6c8ce34540b255e649c936c5d8d7dadc116ddc03f86b2a85311327eb10af14ad8
-EBUILD pocketlint-0.20.ebuild 479 BLAKE2B 2616aac24d0efd34edc0de7cc8dd0eeb286934674efb43af5068c75b6506621a821b63d930414ad41d6293a2cfcd93a49d2178f1fd8051e81a67093d6419a7a6 SHA512 69db41a584c88296704a4a3b7a9b1097194e89edbabaf0902c7f7fe9a93a8aee461d57bd9c6efa91da290b5ea2b0b543596f27705c2610f0477f75c41d340c98
-EBUILD pocketlint-0.21.ebuild 486 BLAKE2B 70da7c06f505dfedccbfeee85ee8db19863fdb93538eab7b49b99d7a2266a07098bd98e3113da3018ba17b1f8ec5763fff0f09f905771229574787716eab05ed SHA512 ab3fb2e410f757cd93b7d3288b3579cb8f9acbbe338679d2a24119c8147cf58622e98599322ac42aaac3cb03e8f03110766feee4af11ef0e49816cf034c74935
+EBUILD pocketlint-0.21.ebuild 479 BLAKE2B 2616aac24d0efd34edc0de7cc8dd0eeb286934674efb43af5068c75b6506621a821b63d930414ad41d6293a2cfcd93a49d2178f1fd8051e81a67093d6419a7a6 SHA512 69db41a584c88296704a4a3b7a9b1097194e89edbabaf0902c7f7fe9a93a8aee461d57bd9c6efa91da290b5ea2b0b543596f27705c2610f0477f75c41d340c98
 MISC metadata.xml 386 BLAKE2B 66a4c2f274af0b1f76bcffd9cf7cc3d67cebe52f79e9e08dde88122f0912005941e4ec45aa20c4cef06775c9bc59b8342067af2aefcb1315b340a8682830270a SHA512 4e7958fb1508b4b5d9462b3ecf3a24efe298aa1af63e9d6746f82cd56410a8607e28e0157ffffcca0ec25bb66257e9072529d4760f2d461444496530848b3775
diff --git a/dev-python/pocketlint/pocketlint-0.20.ebuild b/dev-python/pocketlint/pocketlint-0.20.ebuild
deleted file mode 100644
index d10e4c4623b7..000000000000
--- a/dev-python/pocketlint/pocketlint-0.20.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Shared code for running pylint against rhinstaller projects"
-HOMEPAGE="https://github.com/rhinstaller/pocketlint"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.21.ebuild b/dev-python/pocketlint/pocketlint-0.21.ebuild
index 8556ad083470..d10e4c4623b7 100644
--- a/dev-python/pocketlint/pocketlint-0.21.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.21.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 1b225b2fb6e2..a230d7286471 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,5 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.1.0.tar.gz 43306 BLAKE2B e2085003f2720d573e19fb2b03c8aa98262ec9e7a3f7d0a20474cad2fab374a91664bb513d8158cd612e58a47917c3ebe8b43798272f38c182f6cc2472918f55 SHA512 8eaad22c66299ca3f66cc167e1a94aa41e3b2699da4ff48a0e81927ee8cc623d3147ae29a0bef92370d07d6a7fb6b1eac535fca7090562419aed219b9483edd5
 EBUILD prettytable-0.7.2-r1.ebuild 599 BLAKE2B 81279c0a0b31c8d20b3320531e78a9503d493c7432b758873826823c35e9db0e8e1069d1cc551c06ef5a223732a74bc4585247ba4a1973c03a5738e7cb6ebe3e SHA512 c05622c9ff27784044c47dd092a34545e464daf0ab17fc0b0e6e2eaa957a49e1b0612dd4fb87b907a4ccea023a8b0c383f65a8c1f98fc466cb55deefe66c4700
-EBUILD prettytable-2.1.0.ebuild 711 BLAKE2B cba28533feb82ab61bf0d1414ae424123bad37e7e1ae5be26cdb46e0078d7f3252191d61823082af2360872c599a9eebb6e99360299c468052b35f2f2a5fae8e SHA512 5a312d1c840d25cd40f13e664c36a53528fd045f9a3833ffa92d221d82f80cc172c0eee32a03f799245012eda39cd709e6e58ba4f2ef0874893956391cd97da7
+EBUILD prettytable-2.1.0.ebuild 717 BLAKE2B d3dcd66ca8cd0c8dda6ab0b8c97b59f7dcbd4c67667d305346d1d4ebad28e23b845045ac9c497178f0ab53d37bc1bf60a0f9d8cc7faba9683fafa8cf27610c71 SHA512 b2ce04e181640af1f8f3d1a9c76b180faacb2995c6cb4f6e8755b14cbb6209f403cbf919ab707f3c3a312ac670167920b55003e0fce63c8e76aadf8c2d3b6391
 MISC metadata.xml 582 BLAKE2B 2abcef37a8ef89f66a30fa5c96406bc7ae799f16cbeba3ab5105d5412da65ecdc691d410b0d4147d089290ef49a0fd8c4af42c1676c7161d82b12b31f7a2d5a1 SHA512 e4665346eda726a3041e5eceff3e7925bea95dc2a2df761c7f807d9da0f333d5a46a68ffb1413e6118e40c459fd08af9e9d73e6a45e9c84d41628d80e86fca60
diff --git a/dev-python/prettytable/prettytable-2.1.0.ebuild b/dev-python/prettytable/prettytable-2.1.0.ebuild
index de547660f19f..baf03d2ccfa5 100644
--- a/dev-python/prettytable/prettytable-2.1.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 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/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 7e29fb9a7440..f98ad3e3ffcf 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -5,5 +5,5 @@ DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c
 DIST psutil-5.7.3.tar.gz 465556 BLAKE2B 6a9f31fcba571f381c1f4c904a9ff65659d13ed64e91df478aa7df4dabb87a35c4fbd9c0491a3d10b9eaf0fdcc8f2407fcf7144e729043eda605dfe6e6f93844 SHA512 8fcff56dd4e4c1b877c09023721e6f562424f7f84ae5304d518976a1e7f21dd026772f1abfc063bdd0857a375bc869f42febde090dc0b65918d1ebf44e3ad71d
 EBUILD psutil-5.7.0-r1.ebuild 1140 BLAKE2B 95af4642e5489c02e92536181bc65ac814ee5b48aef220f8a54b8e7e70d53cfcf3a9a31d592c5233b4a2de8180f4018a8759a43aa731bc6a9d327b3db3c3d78b SHA512 7622f810bac7d26ca1a9eef9558e0749b1a506ffc316d4dc253d966d1fb7c14a191b54b3bbae17938dffba157c739526ebe650789d1f063ebd6e1a92963fcd09
 EBUILD psutil-5.7.2-r1.ebuild 1153 BLAKE2B e48b32b47313c8041b518e61a81441a5ad477347371e6156b23eff2e4eddfa859317700d6b03e366484b4c3fba2c2300dfe31d720a03de3d8566070576f27c01 SHA512 70c177b24471ef79854eba6673d66aa558a9ea376c11b502c7c8228f25dfb6e8ecfe96d926938a66ceab9303ff703749084f7ea4c997356ae32a89138b8a3c9f
-EBUILD psutil-5.7.3.ebuild 1149 BLAKE2B 2c156d28868f664b792f421af1a1c27a19aa39502bb1673f0e4309375fc3ee207674c8287cbf393e159f356707ade982d16aaeaf0866b53fd0cf5454287fbaf8 SHA512 bfb6b8c2b6fc63937db8178b90b4b0678f568bef8cbbbc6fa3bb8564567f7f2708dcde4ef0e488064308e229f8f845934e5a3be11d061797e6d5bab2b79142f0
+EBUILD psutil-5.7.3.ebuild 1155 BLAKE2B 13f89c3397dacf75c21c2506e21ea149bab5334cddb7b94f62c30ba2ae6ce6f7f08144d07c9be7983de8913d113f861f6dabf51aca997123cd83e40aadeed500 SHA512 3d29e2ee60cc953a45724904c5c656554f83b3a6c7d8618d5c9863c38d563c2c31fc68d7f422241b7a52b5e33cfe33f8eaf3109b60022953cf031397379a4526
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild b/dev-python/psutil/psutil-5.7.3.ebuild
index a16b6dab402c..775a42abf9d8 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index 4bf1afa9fa22..3d0872831b83 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -2,4 +2,4 @@ AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
 EBUILD pweave-0.30.3-r1.ebuild 1371 BLAKE2B 1f77826512802801e4f18786f7a140ccda82cac14c0644798602d3964c1d47067338d4cfed9d2b54e1771517f78868e780fb3060d5788cc6453a28ac9e9ed978 SHA512 79973c9b0e624f3cd60da235de74c6966c665788f10f46e19a5e8f50204357dbe28dcc060cd9251fe9ecf86fd6e819a0c193b0c90c87b102a7a35a29271e94b3
-MISC metadata.xml 327 BLAKE2B 57907eeb81c512106130a35d3b2de35ed4054e7434a48c1fc63adc4c70f4c110834a453f06a13f760187fe99e28a5a45f1309295a461c80280a529f7cfd6ac72 SHA512 0e2877f277155affd47aa4144fffea29949fe238269f4794837e7179c0854c6a9dd14d256bd84e0130b23fd0ec3667b87ad26352035037c28046c1eaefc0cb3c
+MISC metadata.xml 351 BLAKE2B bc21a9b48f756787e622d2b817564524ac801c37ba98e79e12cfabfe23f0e9d10696be02c3c1a40d76828b87137a56cddd4ed951d86cec699325ac8c231e748d SHA512 90e42cbd664dc9da395b364c101a9616dbf820fdc1c4ef71b151d54fb3c129e5b6919405accf61430b8323b1878962128da1da4d48981716317aedc745f3d98c
diff --git a/dev-python/pweave/metadata.xml b/dev-python/pweave/metadata.xml
index 86940343905b..61cbf08721a5 100644
--- a/dev-python/pweave/metadata.xml
+++ b/dev-python/pweave/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">Pweave</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
deleted file mode 100644
index ba8828ee6130..000000000000
--- a/dev-python/pyTenable/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyTenable-1.1.3.tar.gz 139494 BLAKE2B 292b5f8a4da5a88e0b0f6be8d3dc72601e7218361fabf31afcfd229c1448f82b85b4911f93e34523ea03b69f2d932f03febf0084861d72e37e5c2f2b6ec49f67 SHA512 1998c1d58edcdc75983deef083b9c6d382f144aadc87a5e4be287712a8e07751fcb43ac697c5c7df56b671aa23c769db45d362247eea9456e24b7fa0a1241b9d
-EBUILD pyTenable-1.1.3.ebuild 716 BLAKE2B c4d78c095efcc3a11df36471eb51f6adeed5ef72a45183a380768dc9e1c81ca336bae1f934ed3d117eff36f33a618cec6aff855172684e3d2400b30a24508630 SHA512 6a747cc5ffb6230498baa4088d066a15900cfae6fbaa74668f3314f601b87316791ffe089e36a8ae6503b09d8cd626337b0d1449e3ccc114370dfe40d9f2083a
-MISC metadata.xml 380 BLAKE2B 051d5d76aa2da7bc57d1382fc596b4f061f1c028414038a73ffa977279dd9592c581fb8877e49e8848bc8d44d473f32bd548007b91b259e407e642c5a965e1a4 SHA512 513a84951b784b1c14391c1a283a5d9796d9cb56e178c9ad58f9dbaff3e285c48d45dab6b9fe0fa531cc358a4454e35348c8472e986a43259bef784eb565d065
diff --git a/dev-python/pyTenable/metadata.xml b/dev-python/pyTenable/metadata.xml
deleted file mode 100644
index a14e32b03dd6..000000000000
--- a/dev-python/pyTenable/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>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tenable/pyTenable</remote-id>
-		<remote-id type="pypi">pyTenable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyTenable/pyTenable-1.1.3.ebuild b/dev-python/pyTenable/pyTenable-1.1.3.ebuild
deleted file mode 100644
index b24ee52c85c9..000000000000
--- a/dev-python/pyTenable/pyTenable-1.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_pkcs12[${PYTHON_USEDEP}]
-	dev-python/semver[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
-"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index bef5933ed710..f67fe6bb54a2 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8-r1.ebuild 800 BLAKE2B fd64e4faad4da858cf6c5fdab06deb3da63e27e9d87989252b71543117cec6257e9e5838c9e0cb52f19d22e8862567947be31a6e02e4f91834fb3ac80a6e3e2e SHA512 8a28e43f5f9baa119cc1ac3ffa770382de7ab44f11d8f98a398904fc6039809508098018357ca3a28262be387569b5e82bbcdf71c099970c151a887b58c5292b
+EBUILD pyasn1-modules-0.2.8-r1.ebuild 694 BLAKE2B 7e742d5326a67b3f538f5ecad2267b2ba6e6531b6d37eaa6bd21ad67b5a2cf3ba9f1ab7f0349ce72b25fe70bcff232cd5ae3062031216fd465f7c65ccca88017 SHA512 465fcae9204c7796d2913cae532321c7e2812e0aece706c508bfd2acf3e4f64986ba25a3e9aaebcd6d7b44a0c7036eb99ceb028119d228b2923c370d756a35c2
 MISC metadata.xml 403 BLAKE2B a00c4608ed5c0b7e379b27fddca36a4c67217468c6eacb08e9af1ad0f0a96f7888efbe39ecc2d1bde100652bd87ab177ef3eea2b2926a9dd2bf43244287d14ae SHA512 ed473b6d2e90b04824dcfac52e0bab4d23c62726ef46bb2568a17cc75526f244e7d66d564f70814fc001f0d44955df9d88147279d2854b0832c96756be5c0f2a
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index b014b5dd8da7..4867c479329f 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -16,12 +16,8 @@ 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 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 27691eab2399..3a997f459f06 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,3 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
-EBUILD pyasn1-0.4.8-r1.ebuild 594 BLAKE2B 808c5b293367cda88e8b0446efb90e3b18857a7d7f880c7bf4b496aa70ce5207810b6b55daa3af43a83d81a5f13e3d4e88318b92e44c0b871c37c61dd778f764 SHA512 6fc3cc73fe046c838d12601f4d2d8f29c6a7d312be6a71ec9ab5c6507f1a5dbc703f2e7545bf7751ed0378feac0a1f12dec0e5877a8e6b0b751a1fe840ee21b7
+EBUILD pyasn1-0.4.8-r1.ebuild 583 BLAKE2B 4af3828432e46f180e2e5224a93b7526bd4b0dddeea9242016014f8851d5fb726bddb1d203ee88384d9667a15bdc4b38901393c056a6183accb9f85cc7cd5793 SHA512 2ad90c1a98fdcf31c8ba6403fb1da356cbc7d52f22383b047cbceab9215271652b6dbc8e634d37fe0f56e87a909e90a91d72c7fb0d9dde052370b107a54a0a8c
 MISC metadata.xml 400 BLAKE2B 1b95895b1f394ae898e3020ea8deb32c25f4432d2a50d7e0610a718440ffa9332067e34ee7ad0a6457a44b6d129de509c4cf1099fc6b6dca9cada1c7de1e8613 SHA512 7dc53765dd68fd979bc652e3021df38bb9301dff8ae72acc77478cfcfae1802342fc197770df63308c17adcbce6c4b6bec64255645004a8b885dc73afaeea316
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index 4767083cdd33..cfd28a69f6f1 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -16,7 +16,6 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
 
 distutils_enable_tests setup.py
 distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 61dda0449e34..67888cbd92a5 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,3 @@
-DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
 DIST pyatspi-2.38.1.tar.xz 316724 BLAKE2B 59ca2569575f3d319d33972477ebc966670138df8cb6570ac260dd903f54df66fd12beeeee53e3380938e4571910b99ae2bf3f395776b16a73ac27f8fa023c49 SHA512 bf8f1ee9a6e00014a84e4329bb971bec8b4bc8f72c3905ca585ca20b1cf000b855965159fcc10871eb92e9808a6b41b5d793f3ab563ff0867f185279eedcd487
-EBUILD pyatspi-2.36.0.ebuild 1364 BLAKE2B db12843f9d7eba199064a549b35f8af9800e1bab74f59a35873ac5386daded841d7a949f70299bb17d313fbc6795ac07c9eea55d67b585142a3bffd7634017fa SHA512 4ba287e69f8c76087cf4940f55f58c4296e579d0dd4a47e9560d76c3cdd897f8b4f1ee194ba69d53ab864fb2c18227918376fea70b421492f9768f6ed9ee8f54
-EBUILD pyatspi-2.38.1.ebuild 1303 BLAKE2B e3e4fb253fa6e96e0d3dcd863f7ea209e07a5022da884f20c76c9b944a785177551f7a085505b85a3cbb60d843e44794769a37dbc4596bb168d1cc57de9667d4 SHA512 2b7c66b8d66cd23d5bf76d6ef0c88b175ee82fdbeabb6df3945b30ec59fe2c03eb45a531cbd980efdedd8145355c8f0bbe399657b5dc4a16946dd74f45ffd385
+EBUILD pyatspi-2.38.1.ebuild 1299 BLAKE2B 4396a51ce061fad33ec0659615b3cd1d572909278be545746bd09aa8203b3740fe5923fc628f0052b1ff01aad8ef007ed256e98dc5bc1267c0ce54ba59675809 SHA512 d212efc574d37654fee61ec8180961c0485d0a42fb77ac5a22b3e758e9efe29790aba34be24328b3a4f095cbd360e2d7f32a9d3dc623d000b933314c2882428e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
deleted file mode 100644
index b3bff1257362..000000000000
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome2 python-r1 virtualx
-
-DESCRIPTION="Python client bindings for D-Bus AT-SPI"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-# Note: only some of the tests are GPL-licensed, everything else is LGPL
-LICENSE="LGPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/atk-2.11.2
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/dbus-1
-	>=app-accessibility/at-spi2-core-2.34[introspection]
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/dbus-glib )
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir virtx dbus-run-session emake check
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installing
-
-	docinto examples
-	dodoc examples/*.py
-}
diff --git a/dev-python/pyatspi/pyatspi-2.38.1.ebuild b/dev-python/pyatspi/pyatspi-2.38.1.ebuild
index e1cb0d9edadb..0fcfe8055d41 100644
--- a/dev-python/pyatspi/pyatspi-2.38.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.38.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 8aedff29ed56..c9ff9825f584 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -2,4 +2,4 @@ DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
 EBUILD pybtex-docutils-0.2.2.ebuild 550 BLAKE2B c2e4f7f9c86187f3b7cef9958b42520f581069ecebf66fb8eea66eb91862bd74db981e123be82c9d4212a42c26b2a48587e5e6fd4caf64b195084d8c6fd2c5e0 SHA512 b82b33269520d226dac81bd17693dedb4fc407cd67bca1d238209262e1e454031f880a18e4d68c94f0d014761379a1f91439063300ee3cd1dce3d9febe7c1e16
 EBUILD pybtex-docutils-1.0.0.ebuild 519 BLAKE2B cbbae5e244ac1fa35e72793e417ea929844bc1871e8e8070c1e38f38188d329f953de8e62e24269811d2fcf20ca54eeefd5588dc8e2ce941516406dad5eaf604 SHA512 cf105c7c72a509e9adea923063775492e3371c59a640cacb8ba557befe4bcb541b64682b219981083ccb0c87085164aa16119f320d80479743ef2b9cedd4e5ab
-MISC metadata.xml 403 BLAKE2B 9712355309a42e37afab144f87bc83e52a2ece3dc4e0118d1306d20c97e1c13e3ea8d0b8829616abe8e990ceb66640bed2413f3d7a9b344cb2047d8ebddcdc9d SHA512 75453a219a35bb80248af8512cdd5ac7299ef5b11e4c256fbc51978f715af953ffb96a3b9994323f1c61e5a9450a3fe5c7c4cf1d3c3f919817add56b6c1569e4
+MISC metadata.xml 427 BLAKE2B 4240ad89f3274e6c809181cf1cc798e2aa0eda209aef78f99f15a25de02277d33b430e1566dc849ba8a1e2eb65101ee8e908171c2f96f3c6a34fc72ee3bdc5ae SHA512 b7d4797d2e06dfe73609a4925c9796ced3f9efecb4c8faac4a0e2bcd7449f3e82804a8bd6debe1e898a869d7119a5d7b0de2e56b46ab1fc5672f4b4af76909f8
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
index 87a222fe4488..1083ec486aa3 100644
--- a/dev-python/pybtex-docutils/metadata.xml
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -9,4 +9,5 @@
 		<remote-id type="pypi">pybtex-docutils</remote-id>
 		<remote-id type="github">mcmtroffaes/pybtex-docutils</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index 8018a496d4d1..ec818c08d644 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,3 +1,3 @@
 DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
-EBUILD pycdio-2.1.0.ebuild 1058 BLAKE2B c47bd149fd052b14aa2fc46420fd576d4aa734f7d58fc28a0f4337698701812e643d1924419120565bf420ddeef52e3534ddc3675ea3c5ab544fe97d82d1e14f SHA512 c252cf5cd93d192d4f1089a94a3f2175abc64826a73d800ca293b2737d1435948701f5564294361e7836b60787828dbb066c4cd512a4d567a1ed38d3af0d4106
-MISC metadata.xml 551 BLAKE2B cb87788bd6a8cd15e83547dba1f44f710a27db24b962790484b252553e6e3563493000a8f9e17ad72bdc205d7692aac19f6aefefd4b586dc2c5469c6045aff1a SHA512 e74e3c72794ff1356a6d91482162adfbed24320821e8df6ea4043416f586f6e30f91980e4c15281e59c6428a64550986eb69007da30390de6d7de51b250900c7
+EBUILD pycdio-2.1.0.ebuild 1089 BLAKE2B d50db41fa7d845782e0f22972c7888362bb7fd52192445685499ec131b0d7c35e109ae2fe061a67fdb0be1019d15d0478fbdfd4f1eec37209b6902e1650a744a SHA512 8725ca8e1de99a411a78b88a0a58f23af4c8da843f79c0c0d39312326d0190c88a7925c8badbd2d2ae3c5f332b0fd79a8b596223690bd8b7f93b3761bf15870d
+MISC metadata.xml 603 BLAKE2B cb7f62b66b44c9e5a0f761b69c44d94a8d55c178b65499c1ed5cf6854a2ef4ff774aa35ef047d84b03450ed9bad349f5591c13294e2676fde1e5a36b6643236d SHA512 6a259fc05469d51ca3ae442570ac2d1170bebae2c01466dd626579a83f9e7adc615c9eecfd2cba1542728cfdbc3e5a4f41671038c4a6584504b96a4be01fa979
diff --git a/dev-python/pycdio/metadata.xml b/dev-python/pycdio/metadata.xml
index 6d6623b91d3b..c20b0e40f33b 100644
--- a/dev-python/pycdio/metadata.xml
+++ b/dev-python/pycdio/metadata.xml
@@ -10,5 +10,6 @@
 		device-dependent properties of a CD-ROM can use this library.</longdescription>
 	<upstream>
 		<remote-id type="pypi">pycdio</remote-id>
+		<remote-id type="github">rocky/pycdio</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycdio/pycdio-2.1.0.ebuild b/dev-python/pycdio/pycdio-2.1.0.ebuild
index 827ab2874412..5652e3e6c98c 100644
--- a/dev-python/pycdio/pycdio-2.1.0.ebuild
+++ b/dev-python/pycdio/pycdio-2.1.0.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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
@@ -19,6 +19,8 @@ BDEPEND="dev-lang/swig"
 RDEPEND=">=dev-libs/libcdio-2.0.0"
 DEPEND="${RDEPEND}"
 
+distutils_enable_tests nose
+
 python_prepare_all() {
 	# Remove obsolete sys.path and adjust 'data' paths in examples.
 	sed -i \
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 5976e5814852..23a701bb5956 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,4 +1,4 @@
 AUX pycountry-20.7.3-fix-tests-for-pypy3.patch 740 BLAKE2B 64113481df5b7fb385604f16d7b3be066a12b6a5e1dab38cdf879101da132bcacf407fdf773d5f15381789114be265c7e1ee3ab880c38dae6e904e6820923ee5 SHA512 0df7756ac4d3dd3ccc409307f21a95021c93851ad3b6ce07ce244eade4957d9906dc6aaabdbafe671cf6f9619623cdd22097119642c0c926376e4991eb6a1a4f
 DIST pycountry-20.7.3.tar.gz 10137217 BLAKE2B 2b32d450a1d16eab95e0c1ab6cae3bf89c07742d48cf6f8473854119ac0483b5490523e03e823c9b314231983f39d1c8bf595aac201756fee9897a8d15a84c08 SHA512 df88a34307a4275267a7f3af282b73ca5e762c49ad158bfcd39b97c5d852bf045bcfe72351fc6f232c55003a7c4b0a04801eb562ba65ed5d599bd45b2bd3bc58
-EBUILD pycountry-20.7.3.ebuild 989 BLAKE2B aac94be1413cbfdfa49d70b0fb0b6a9970eb59d63efcc01c8837bd7d28706ed6e610709daa068c24bad50b4202172fb82aed53669b4cfa4fee59971f67339e53 SHA512 9f79ec0c5750330db1e1a4d120bccac26e79a5082f839d7af66dd7d4bd2b68f13d98ce32b9f68dd9eb2b687ac017771718d2dcf95311cbafd0e2d5c42da8df8b
+EBUILD pycountry-20.7.3.ebuild 755 BLAKE2B 27af61c68eba4eb538030409a16d5d7fda2c9550986a2a94697cd459d4779f394059e331c618ff597de8f9f9b032a62b7d26bf8eb7e17e61a701658b3f692274 SHA512 714d10f2236a8c8f4b6e3b0e661134da4871793d2438b1e80ce8828b9e6dc100566028b5d87ae393d03268490f7d4ab2a972b37f0ffddd5cca9bf3eefb047f4f
 MISC metadata.xml 472 BLAKE2B fb2aab31ad673be9f39cc21bcbed26d06525a6bb905855b297f3f4aee7be246db9bab4344dd38dd0e903e63a8548795c26925e742635150600b26cf9f0c563e1 SHA512 83ff7cb703819ed92c8b2ba08ada6941f9accc30208f12ec9c35bf58c4dc772de34bec00646b6f188fe9cddd0d3e89ae540e8d0936629dc2075bf66442986024
diff --git a/dev-python/pycountry/pycountry-20.7.3.ebuild b/dev-python/pycountry/pycountry-20.7.3.ebuild
index 24c4be17dd8d..124a682416fb 100644
--- a/dev-python/pycountry/pycountry-20.7.3.ebuild
+++ b/dev-python/pycountry/pycountry-20.7.3.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} )
 # The package uses pkg_resources to determine its version
 DISTUTILS_USE_SETUPTOOLS=manual
 
@@ -16,20 +16,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ia64 ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests --install pytest
 
 # https://github.com/flyingcircusio/pycountry/pull/51
 PATCHES=( "${FILESDIR}/${P}-fix-tests-for-pypy3.patch" )
-
-python_test() {
-	# The package uses pkg_resources to determine its version
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pydbus/Manifest b/dev-python/pydbus/Manifest
new file mode 100644
index 000000000000..d79c616072af
--- /dev/null
+++ b/dev-python/pydbus/Manifest
@@ -0,0 +1,3 @@
+DIST pydbus-0.6.0.tar.gz 2083046 BLAKE2B 65b50b272b004b30411ff396a9c50d8602485f281100467e2c75ed300cdb0a83532a354a62ef1a8e7ee38a41af243ea7de7a5e80232cfc7c79540e8ed71741c6 SHA512 65ac490dd44ad0aba0b3ea5c58cf6a99bd9de0ce86c6f03b9696335fb2d3f63df0e2e23a022d31d0185f7b8307bcc0f6e230efecc31199fc177f9a8a25929ad7
+EBUILD pydbus-0.6.0.ebuild 499 BLAKE2B ec5b91ca0fd12afbbe0e08a61e29c7998bb21fc45ccdd8661286bfbea93a737040f6cf8a28a98a311e37e8aba496a1359e1dbe3980dc0987d06849db40d2ccc8 SHA512 763732703aea034eea479a34b81750bd974c8f4403600646d9599e4295ca8301e677e077179029b9b21e181678535031c847f99d45364c71871a6b9d6abf80ad
+MISC metadata.xml 283 BLAKE2B ef3dfe1a27e46c933f7ae0bbdece78cab262e4c6a5713caceabd3cc11e5150ff4ad87da258f9a9aee61eb0b4f84dd8aa4b5537bdee54c0eee3d219666c436a46 SHA512 1401089263deca8f8539e7242fd5a68f32c51f8eeb44c05639cc5bee57781948443fd8fe3912c77dc7bbd61181c0b1d7ded90c7c7c3ae161d681d050ec990bda
diff --git a/dev-python/pydbus/metadata.xml b/dev-python/pydbus/metadata.xml
new file mode 100644
index 000000000000..213b9d4ff05b
--- /dev/null
+++ b/dev-python/pydbus/metadata.xml
@@ -0,0 +1,10 @@
+<?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/>
+</pkgmetadata>
diff --git a/dev-python/pydbus/pydbus-0.6.0.ebuild b/dev-python/pydbus/pydbus-0.6.0.ebuild
new file mode 100644
index 000000000000..e0e4e179657e
--- /dev/null
+++ b/dev-python/pydbus/pydbus-0.6.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Pythonic DBus library"
+HOMEPAGE="https://github.com/LEW21/pydbus"
+SRC_URI="https://github.com/LEW21/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	sys-apps/dbus
+"
+
+python_test() {
+	sh tests/run.sh "${PYTHON}" || die
+}
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index fd5c99e3decf..c8879fb218dc 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,3 +1,3 @@
 DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8f24c433dbc6754ea32a7284ce0463c392c1392538eed9d8bf9ea3f09400bc08f1970a7c96c52bf072606718 SHA512 22f16c571f9fad02a70a8e0bbbfd802f4f9af23946edb78e15f69f23e57411369274945a1dea5603acae1fc1eb404e5445207c541afb7864a60b92dc4d5477b3
-EBUILD pydns-3.2.1.ebuild 755 BLAKE2B 39dd96de32514d8dc24089d15c1fae0142d5432d26ea0843c2a14c6f62276cd17ad99384512e3a7a347bf3a574ec37b95f9a52958f8bb5d9c2f81797f4e2dacd SHA512 d77b81257fb32953498e4da403a7aa01d10e54a3b745da6404b3d0a741dc2ebc4d17413537c4a6781abc8cb41b53deb092b6551ebae777aac012474d82a58fac
+EBUILD pydns-3.2.1.ebuild 757 BLAKE2B 43e0a2c50203e229a60b97b1155b3eb02034744a6bb8cf8cc96e68dc62572ac14be5f36ff524bf59c439df10e67457d0c42477957cb9d2cd90ec00efc8c9aefb SHA512 28b83ec19658872edda71bc54f83c32f921e41877709a951265e9617116ffde2466bc3c4f3496a0ab8ea3553db681cf8799ae29fccafed394411d72137349395
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index 1b8664d23900..769b3494af18 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.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=( python3_{7,8} pypy3 )
 
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 inherit distutils-r1
 
 MY_PN="${PN/py/py3}"
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 2492e59324df..c0ec66623cd7 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,3 @@
 DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
-EBUILD pyfakefs-4.4.0.ebuild 701 BLAKE2B 3528959cb23a99ee562e13c183d2942f20ae88f24ca39540d501100c24c462edcb28f8a5d1200c6cb6dd82ce6169ddbf84b080d20d0bec8fa9055fbf7082ec99 SHA512 8c3cad1ce77afe4689336bdaa894a640c7ae0a7e151008da6c64f3c0620a0d483c5eeea659e33e76c8872de77d147109e42238ffa434c2834f55e6387db76f8b
+EBUILD pyfakefs-4.4.0.ebuild 707 BLAKE2B 974aa1c9295c257298f96899e41b677dc02e8b011c22d71bd3df96c1d5a3867972bba65e025b803d599d11c0de2248d22eac32820b2f9c245d603406bd3647f7 SHA512 beed44ba6ac0812f0fc06b3024a656b6f2ad8f9c3131acb402dc0560b130249e64fcfe613b03fc23d2fb75bbba7fd2f832caa7af85a09ddad012bca1e31cdf3b
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
index dbf254948ee7..e7a85e83b590 100644
--- a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.4.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 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/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 413fdb46949d..d4654dff50e2 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,6 +1,7 @@
 AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a17bcf39804e6787ed2627a77d3b068a8ac1d7951a207c83e1d76812ac77b889d6b4cbf0b1cc30cdd8c59f8ea886ef373 SHA512 47e1c624358edd34b3ddae023275a81ce529594689c3b67ec2c7b5acec84b9c9f426b9f79151a1ec3dc89b39335f11e03cb22db4f4c63399e876f887e3f3ecee
+AUX pyflakes-2.3.1-fix-py3.10-tests.patch 3166 BLAKE2B 9950380f37f84e6c6356a62cb4566a12517cdaf57c48c146b922dc2188c8d2f938691ee909b70e4b10a8f7cfbf35240659a10832295d87be483d1a5a1a12db24 SHA512 f67ce0684e9b1fc269845a8b43ac5f99243d8060674c90958cdd0b2781196aeeff96eb504cdf9a14a5b77dd658e0ff0f3ee70c955dadcf0b36c16148721dcbdc
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
 EBUILD pyflakes-2.2.0.ebuild 739 BLAKE2B a13889d951d54c49dca0df763c347390c69c1bc6e7471d8ad9b1a1c932340096874c2ec09cca6ec9ca23472d2bbbac90924a6be8ad06bb7b7f4b731d7d712bd8 SHA512 dab20e9ed9a1ba53a50c72466d5093a3a214dce230348910a91b91473b7bcd8370355a47d438612129a798d087b1ce55b7c21c881d06e740e461848ff8991271
-EBUILD pyflakes-2.3.1.ebuild 650 BLAKE2B 0f8816e6c44d4c76ef526b6cbe3111e94e80ec53a0b5ed0767586bf0599a6ad91ab891a9518637100f1a0fe9c6cb12e37b2eef5e9bf8037f02b0b72175520f45 SHA512 758ca693a60b8cfa0a9dacdc44baee0214547241e5e9fa2c24af5abf9b8fd82174cb68bfd5d988d74e286c92fe7883d2257a1d34b27f33c9e4ecd48fde6169aa
+EBUILD pyflakes-2.3.1.ebuild 707 BLAKE2B b267feb99aabf0087d13501889c5b89de59d0d12caadee1f57abd1d41d73d7c8dd81b33f491c85466b983c66679be5f514795d3b73d67da868d201f0850cb4a8 SHA512 8dfc9d7b142056d7bb12249325ba0564d6aeb3fc5e858e9ce5fa3e540a8ec7f57b1b1fe89c6a69eb65b9fd231d37521ee4d225748519782f0aa7a2766dc32a8d
 MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
new file mode 100644
index 000000000000..c96585d20c73
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
@@ -0,0 +1,91 @@
+From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001
+From: Anthony Sottile <asottile@umich.edu>
+Date: Thu, 20 May 2021 07:23:19 -0700
+Subject: [PATCH] fix syntax error offsets for python 3.10 (#635)
+
+---
+ .github/workflows/test.yml |  2 +-
+ pyflakes/test/test_api.py  | 43 +++++++++++++++++++++++++-------------
+ tox.ini                    |  2 +-
+ 3 files changed, 30 insertions(+), 17 deletions(-)
+
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index d379b3b7..2c1cf19d 100644
+--- a/pyflakes/test/test_api.py
++++ b/pyflakes/test/test_api.py
+@@ -441,7 +441,7 @@ def evaluate(source):
+             evaluate(source)
+         except SyntaxError:
+             e = sys.exc_info()[1]
+-            if not PYPY:
++            if not PYPY and sys.version_info < (3, 10):
+                 self.assertTrue(e.text.count('\n') > 1)
+         else:
+             self.fail()
+@@ -449,10 +449,17 @@ def evaluate(source):
+         with self.makeTempFile(source) as sourcePath:
+             if PYPY:
+                 message = 'end of file (EOF) while scanning triple-quoted string literal'
++            elif sys.version_info >= (3, 10):
++                message = 'unterminated triple-quoted string literal (detected at line 8)'  # noqa: E501
+             else:
+                 message = 'invalid syntax'
+ 
+-            column = 8 if sys.version_info >= (3, 8) else 11
++            if sys.version_info >= (3, 10):
++                column = 12
++            elif sys.version_info >= (3, 8):
++                column = 8
++            else:
++                column = 11
+             self.assertHasErrors(
+                 sourcePath,
+                 ["""\
+@@ -468,21 +475,25 @@ def test_eofSyntaxError(self):
+         """
+         with self.makeTempFile("def foo(") as sourcePath:
+             if PYPY:
+-                result = """\
+-%s:1:7: parenthesis is never closed
+-def foo(
+-      ^
+-""" % (sourcePath,)
++                msg = 'parenthesis is never closed'
++            elif sys.version_info >= (3, 10):
++                msg = "'(' was never closed"
+             else:
+-                result = """\
+-%s:1:9: unexpected EOF while parsing
+-def foo(
+-        ^
+-""" % (sourcePath,)
++                msg = 'unexpected EOF while parsing'
+ 
+-            self.assertHasErrors(
+-                sourcePath,
+-                [result])
++            if PYPY:
++                column = 7
++            elif sys.version_info >= (3, 10):
++                column = 8
++            else:
++                column = 9
++
++            spaces = ' ' * (column - 1)
++            expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format(
++                sourcePath, column, msg, spaces
++            )
++
++            self.assertHasErrors(sourcePath, [expected])
+ 
+     def test_eofSyntaxErrorWithTab(self):
+         """
+@@ -515,6 +526,8 @@ def foo(bar=baz, bax):
+             if ERROR_HAS_LAST_LINE:
+                 if PYPY:
+                     column = 7
++                elif sys.version_info >= (3, 10):
++                    column = 18
+                 elif sys.version_info >= (3, 9):
+                     column = 21
+                 elif sys.version_info >= (3, 8):
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
index 454409b0717a..a556099613d0 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 # Uses pkg_resources
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -17,4 +17,8 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
+)
+
 distutils_enable_tests unittest
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index 870757a5b492..16a93b42b9c9 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,4 +1,4 @@
 DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
-EBUILD pyformance-0.4-r1.ebuild 894 BLAKE2B f358d6cba73316bf0caa8b33397015fc9cc5dae755e995ab43f717e85261a5fe2c2b46ce337b4248f7a53424c3aa9da833d42f879093c091fa20f07e3c318844 SHA512 65ac21973830b6de557177b67b2258334c1cf8118b7798283adbd92dbbf6dbffa8590b0549209304c4af5b420bac0de20abfb7496509b65976a27780fd747f25
+EBUILD pyformance-0.4-r1.ebuild 818 BLAKE2B d47160ab1c678af76c70c5444a7ce133db4ce8093e1b70b19ed21adeceba0798a2a8c96d2adb7aa50fe957f10fb763afa72cc22bd101644c88dcf453d16d198f SHA512 ae679c8712c08a2f34c7a8c1f8bc1466c01894d4310a74bf8a18b0f1bfc918b0618b1b39370c1720dea18548b346898329914bcd647b36e636119332b82d6569
 MISC metadata.xml 452 BLAKE2B c229f2c744aad33f55a3983a97780b9c0e361e8786a3c9b372f556656c7e1dec34dc30b1f9985747a8f917c8714e867b509143faffacb4242aeb1b61ecce54d1 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240
diff --git a/dev-python/pyformance/pyformance-0.4-r1.ebuild b/dev-python/pyformance/pyformance-0.4-r1.ebuild
index de8932038a89..00c24dde4952 100644
--- a/dev-python/pyformance/pyformance-0.4-r1.ebuild
+++ b/dev-python/pyformance/pyformance-0.4-r1.ebuild
@@ -1,32 +1,30 @@
-# 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=( python3_7 python3_8 )
+
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
 HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~chutzpah/dist/python/pyformance-0.4-patches.tar.xz"
+	https://dev.gentoo.org/~chutzpah/dist/python/${P}-patches.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
 "
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
 distutils_enable_tests pytest
 
 PATCHES=(
-	"${WORKDIR}/pyformance-0.4-patches"
+	"${WORKDIR}/${P}-patches"
 )
 
 python_prepare() {
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 4b191cb2fad8..118a40e09f55 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,5 @@
-DIST pyglet-1.5.15.tar.gz 6429039 BLAKE2B 5835d2c8c0c6e309664bea4a4001d0b68622379ae27555b640ed4441cb4319bf4ffd2b491cf789cba5639b9ca43e047f1e2cf820e540123939dd386a4c88fbf3 SHA512 0ea6f936895b0f17d7272866ecec7721ae1fb353af3654c49bb09eb81729f939df07ba3cdaf8b8bece345a8f144d56a45dc23d82e1887db306fd08c7989c688e
 DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
-EBUILD pyglet-1.5.15.ebuild 1290 BLAKE2B 95388a11b82c09f2284fd4a039c01a4a60a30cde9c0f121a40585719aad989f0cbceea7bdb963fb68120dc910c26d155d33a049fd2e681763cfde1caa54741da SHA512 76f03d4f17c347a6aa0a0ab502de363b4f64db546182e8787a7dc5406ae82314f8fd9440ee5fca49e74344c47d88653d5b1eff45f1289aec947f679bfe1d4d9f
-EBUILD pyglet-1.5.16.ebuild 1251 BLAKE2B 879fdd7998a37e788ad481356dcd77d4a7b7737bc6ca7a7f23aefed2311e93e0ed08998ea12a3d71f67afcc48d5ceb87ca68cfb3b5274482fa29bc24512e5425 SHA512 4e4dbc2b2e5d7bdb901197b015750e8f0c815307fc46777330bc3cb871a86de1113d2a223bfb5242cf0e1b9f53081db8c8269cd89265ee1cc4067b8e49362488
+EBUILD pyglet-1.5.16.ebuild 1249 BLAKE2B 29ce40ef1be1efb2440908367b279b0ac865b5e10a416bb43f8fffd4bb89622ca4e43279e50731662fd7ff4803cf220866bf45c133b1a94fda54f34606b6d91d SHA512 e851e9fe37b43f1e656e454377643500cddf4473fa52d91345d754d858d4a2b51c3e1e8f5d3b10d441568f9c2183bb5a23d074f24cdc6812b8a7eec248a683eb
 EBUILD pyglet-1.5.17.ebuild 1251 BLAKE2B 879fdd7998a37e788ad481356dcd77d4a7b7737bc6ca7a7f23aefed2311e93e0ed08998ea12a3d71f67afcc48d5ceb87ca68cfb3b5274482fa29bc24512e5425 SHA512 4e4dbc2b2e5d7bdb901197b015750e8f0c815307fc46777330bc3cb871a86de1113d2a223bfb5242cf0e1b9f53081db8c8269cd89265ee1cc4067b8e49362488
-MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
+MISC metadata.xml 1036 BLAKE2B ad16f5e991753cf8e6291b5cbf19f791684617eb8394528c0b751d57c9091ebb73112f9a4439f9b78eb2d648d0980bdfbfdeaf0c6671bf5d0521bb87f19011a0 SHA512 efe3d7ff5ae120e037b0521c45b67833f4cb57802596793704fee556b36e2a6f6797bd948254fb1ad50122a2927bea7bb5bf6b715caeb09648e7d4facaa6734b
diff --git a/dev-python/pyglet/metadata.xml b/dev-python/pyglet/metadata.xml
index c4ade21967f9..4a700f7da152 100644
--- a/dev-python/pyglet/metadata.xml
+++ b/dev-python/pyglet/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
   </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
diff --git a/dev-python/pyglet/pyglet-1.5.15.ebuild b/dev-python/pyglet/pyglet-1.5.15.ebuild
deleted file mode 100644
index 4125e92b7947..000000000000
--- a/dev-python/pyglet/pyglet-1.5.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/gst-python[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.16.ebuild b/dev-python/pyglet/pyglet-1.5.16.ebuild
index 7893369764fd..9ec70e8d0e48 100644
--- a/dev-python/pyglet/pyglet-1.5.16.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pygments-github-lexers/Manifest b/dev-python/pygments-github-lexers/Manifest
index b314b17b009e..7b864f024679 100644
--- a/dev-python/pygments-github-lexers/Manifest
+++ b/dev-python/pygments-github-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pygments-github-lexers-0.0.5.tar.gz 6337 BLAKE2B 21fb1a0627c9ebf42d86d6cceea3ebec4339ef29b1d881d8b3bd5f90060ec2ba76a69ae4bf9e92420a10950ae20c7ea7ff44d5fccf8add06be1f1353cd8b7800 SHA512 429a8a81eb0228c806b6fafe5e1c64be92e719170b1af666aa9c9c7923ff4058972a167193dd0ab1ace0395fa1f6621212f800b07dcce4e59970fd905e046d71
-EBUILD pygments-github-lexers-0.0.5.ebuild 493 BLAKE2B 6ef5e46a9b72ac627b952618d334b1f7aabe28eb4c951118b20d12d52caeff4955196a4d2e259a41cebddf0c928ce1380cf94157ef47e443f33e6e787e35967d SHA512 e0ce29d08c8d53dcc31b67436e6a6963106780291a0f0ade770675254c44ca585a0c5a9b0a3c594041182b2e225d6c2bb96beb08e2770707f648e6eadd0a1d34
+EBUILD pygments-github-lexers-0.0.5.ebuild 495 BLAKE2B 4623b8802f33899758a9023a353ce6676a64c79bb75bc7683f6ce2d993aa2fa54b86304051052457c878dffe6f7520007e2d35a76e81ead0c799789aea6879d4 SHA512 c5baecb98c642f71b36e32bf8fdce231bd7128794a67312299eb66086dcfcecdb0d374bb5a1670c91b9f495bac96e027e3e5e741df090d02de2c17883ec66661
 MISC metadata.xml 415 BLAKE2B 3b27412383a7af51dea042367841b300a81ab124c7ff2c6baa8d625a8de51bb7c255796a1f52db5713b03b3f4157e3b0cd29a96e1a881f07b96d018b20a1285a SHA512 61ca55165516ae744bce2f81f495375d23273383cfa51f78732c5805f9936cfb4123218f1212d14cb68f33f97d6696fba6cc9e6031f9693a1223f5b008820627
diff --git a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
index 1bdbafc3b73b..d62e0bc47d32 100644
--- a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
+++ b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pygments Github custom lexers"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 83ca85568554..35c26254cf66 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -3,5 +3,5 @@ DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ff
 DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
 EBUILD pygobject-3.38.0.ebuild 1750 BLAKE2B 5e9fb1c304867db80e8abd422d6a2acc73cc04d04e5183d6aa6be9e5dea7a1026d9e5888d389eea628dce8fea026363dfea8325f2d971a33a0861ae3b490f6ef SHA512 aad5d9bbbc022fa21b3491eedd9237bb125387639031c2a9897cbc1d7afa6f6f26d435612a73486e157d56000a1011ea80b215ed5e68753ca432eaa07f1a4b68
 EBUILD pygobject-3.40.0.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
-EBUILD pygobject-3.40.1.ebuild 1766 BLAKE2B 1100560c8851bf37cffd5b63d7a46cdd3e0e9439ceb3de3624e0e9b245b8ee6020cdcf1fcea2cae29b23c9af200c6b49d74f37759636a7f29c584baaefd7893c SHA512 c56352c1429cf3f5f63600f98abfb30bd46e0d2cfa090976ce071444ee919ef66d0f73ca11754c8dd2346c8ceb1ad20de8424ce7658df0dc22e9c69f2b8957a2
+EBUILD pygobject-3.40.1.ebuild 1759 BLAKE2B 66a6d8aca77da2fc35a9b0a988eaefac284ddde2377407d6edf04b7342d6b14709157b3dc432f9ed5b80a3e47cdccfd31a63cfea07df0e1c0423fcf2c056ab28 SHA512 d869ac8ca451dcc1355beae9c84147ef42ee56ee60683eb21d23a64d7992842c0880bf4462dcc99b9b2a2199d4201a058bbc112ac7b189cdfb568ab40fddd7e1
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.40.1.ebuild b/dev-python/pygobject/pygobject-3.40.1.ebuild
index 233f53abe6b7..a4e9a735cbbd 100644
--- a/dev-python/pygobject/pygobject-3.40.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.40.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index fa0c20944425..af2a321d8102 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,5 @@
 DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
 DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
-EBUILD pylast-4.2.0.ebuild 710 BLAKE2B f8aee8425b2f57dc04d7b7848f5d8f5ea3fdd7b8ad5ee77ff62f36173e1e364f66fd796350594bef99bc04aa80881e217038fe3e9cceba1d288038cd51ba42f4 SHA512 70af9cd05bce1b889dacf7ca839f8079dfe65821421896d27cfd199312fb1c55e733f45379801347347c95939c0998fd8513bfe2af2bf5ec8be895f083611a3d
-EBUILD pylast-4.2.1.ebuild 695 BLAKE2B c6dcdf021a55134b9f4acd7871a86f556afa3937caa438216ec058b032aed31efa7957b9344fdfe7d2c28e48b2e215ea5d410b86c915c9f6ff81f12dbfe211b7 SHA512 a93ba6d7f6225c5d31de2c82453f381913e3960e6a2d2b3d48f6c76bbca4deb74f0eec6d96c7e62351c1a6f62c18798f05ddb184ffdfd4423e007b5a5afeafd1
+EBUILD pylast-4.2.0.ebuild 711 BLAKE2B 835b3737bac47d829edc7d4582da4ce529e27270ab85611c530c90e149dcc872846dd23e2dd680c30d10afdb69eeba460bb53c9b435ef8993c2dfa0bb52d533a SHA512 1cc178693cf73d8ec07b9ec4100c2362e284f0376049ff8c8a0f9682410a3998a6e66b28717db4d3f107d18e821c54da3c1858b54ce3666f754aede9e4a7e113
+EBUILD pylast-4.2.1.ebuild 696 BLAKE2B 834c103714e715de0cd91214dba85baa5a7ae7889663827ed4e7d5d5190cb7ca840bf78b5c063d78f4eb81e41991e57c463c9f2710f6c23100c625611fcaf36a SHA512 7bbf4304265a6a5e8e3f794765412e614a96d3f30c6cd8b855cb5dce7da7d67b62be708df1f07aa0f1abd0d649f7160b421f566b31d95fa04ebeade234c15af2
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.2.0.ebuild b/dev-python/pylast/pylast-4.2.0.ebuild
index 6938a33f4ef3..86245446032e 100644
--- a/dev-python/pylast/pylast-4.2.0.ebuild
+++ b/dev-python/pylast/pylast-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylast/pylast-4.2.1.ebuild b/dev-python/pylast/pylast-4.2.1.ebuild
index 15fc748bcb74..224d71ffca3f 100644
--- a/dev-python/pylast/pylast-4.2.1.ebuild
+++ b/dev-python/pylast/pylast-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 5899b8578066..02db63603976 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,5 @@
 DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
+DIST pylev-1.4.0.tar.gz 4895 BLAKE2B d49e153d308165dcdc06bad94013afa4ccc6d2a6ecff943a2718a8f9ab71bbacb9c0cf8b604dbf0c77322a8d0cbeba5ffaed13531a31210507f144f716f8e740 SHA512 3999adf04b159499a199b1aa66e2540904c689c50a407bf7e0cc0affe834ea289006d2fc73f65e4fcd486c755c580e9657dc5c67290dccb4704bebc6a4348de3
 EBUILD pylev-1.2.0.ebuild 450 BLAKE2B bef91d26a5a415d1b6c751f82d9d5bb9134d66980d42242f489d40060d53dd77527cb1bf1e08bac5ed9d1edbcb3ab9ab806febe24135cf641770befe5944fc29 SHA512 7f73599be7d094e0e56feb6b1fb18d636b700d0b72bd85c322ad73c91867145f24987f2e172f4e1262d03aadb5faea595d71475d164df8ba486946d01e9259bf
-MISC metadata.xml 566 BLAKE2B 488a77ccff558eba537987b87b7427d0576c62fa873cb41028886252577b4af65b7525764753656c1b3913885b16a0b2c093aff0e2f066e7bb1a612167a9d447 SHA512 f028363b0700c96dca3ecb2286da5a27cb45c61e1fc17fc99d9c510f7b324a688927ec7129478bbc1d38036be83234a11fcf73274c46d8c82c9229c885c035af
+EBUILD pylev-1.4.0.ebuild 424 BLAKE2B e7dedf5db044b2d043ddf13477922339ab19f4168529fe9c639d26530ed76ebe3c3de0898e610c8dc459d668ad022d99d7980970c13fc18359a1279e5bf2ed49 SHA512 9354ce56aff8caadea6ea3fe98712653eb126a60377d5f0db0905dfe33a9824d4cc5fa027957db79485bb26ca156fd88e2a4f9477c1eeeb9db57083f9f9d77af
+MISC metadata.xml 673 BLAKE2B f0ceba167d8629c9c70267f6d54e1a68f40f099a61d4f89703af2a846f7dd806fa21a194e3f65b421c5da1cd0d32c0a80943a420ce848375c2a6275d95a36365 SHA512 3d6249d4556c2726fdf1ad2fed72dedef901684a18815cab5d93a03553a6548cf5545644911a736181cd85d6ede78d04754420a3fc002ee8a7e68eb5bf5142c3
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index cb2cc6da3b27..a914219acbff 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">toastdriven/pylev</remote-id>
diff --git a/dev-python/pylev/pylev-1.4.0.ebuild b/dev-python/pylev/pylev-1.4.0.ebuild
new file mode 100644
index 000000000000..b15eb286215b
--- /dev/null
+++ b/dev-python/pylev/pylev-1.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 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="Python Levenshtein implementation"
+HOMEPAGE="https://github.com/toastdriven/pylev"
+SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pylru/Manifest b/dev-python/pylru/Manifest
index ccea7073286b..acfeb5f96f16 100644
--- a/dev-python/pylru/Manifest
+++ b/dev-python/pylru/Manifest
@@ -1,3 +1,3 @@
 DIST pylru-1.2.0.tar.gz 18533 BLAKE2B 6cebc3ecc91050bdf3c8f2721a7ee1768fb48692567eb2e8603e0d28fbfd01634087bf8fda0c0c3f8c9af377195623d2689f9eb59a3ad781ccfc5f58b362a734 SHA512 d4b247cb3740c2f94f4f41bd9affbb87db4e2ec8ff566978d130d08fee9df6109c13b64f22536903bf8be3ea60d4b105dd969d1156a279115b6bfedb817cdbf5
-EBUILD pylru-1.2.0.ebuild 401 BLAKE2B fbd9f6a1c0f32143da6f599863fbb5561f7114e420e586200456493fa286bbb1e050a1d03759101d92e0a631f15ac4549b58e4a88651aa618ab476ded5934bcf SHA512 db37e0ed075058d40d82e51d5e30a317525f4658967c56bea5c93854dfd35f6d0f6483364a32f2c49a6f1d52e334e6be98225517b41f369b48686cb86da066ee
+EBUILD pylru-1.2.0.ebuild 461 BLAKE2B add68c55187cd6c1c53b4ed9f527befbaf23a6bcea2964b8f92e7da298f01fa905c2196b24082947d308287c4fb09730a92864864471bdefa9e2ff2d13d24e8a SHA512 5e442e006bb8c9f2d954ad20c9fce8c72624cfa25a5b9362f782a97180b60cee160ab0b3f5885652bb349f8defa7e3ebc107ae46a1e0a61cba56b0386a426957
 MISC metadata.xml 369 BLAKE2B 4689e535bc1ad7110ae6ef173aa013e78590a3b66a59d324e476f08fead674c041653abe435ef27c8fb46b52a0cc0c999e36d7ae66875208877bcf8ffbe575c1 SHA512 2782acfafc75433a7207a9d698a6e067119089d5c2d3832228aa2d00637bb8d85372f167c588a6271a3c8c466a60749d1079706181ab1b0ac53b6d9590d91284
diff --git a/dev-python/pylru/pylru-1.2.0.ebuild b/dev-python/pylru/pylru-1.2.0.ebuild
index 73f3e86bb7fa..f22b1b0e9eb6 100644
--- a/dev-python/pylru/pylru-1.2.0.ebuild
+++ b/dev-python/pylru/pylru-1.2.0.ebuild
@@ -1,18 +1,20 @@
-# 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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A least recently used (LRU) cache for Python"
 HOMEPAGE="https://github.com/jlhutch/pylru"
-LICENSE="GPL-2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 
-BDEPEND=""
-RDEPEND=""
+python_test() {
+	"${EPYTHON}" test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 12a11ba760aa..b24595c2d570 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -4,4 +4,4 @@ DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00
 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.2.ebuild 1186 BLAKE2B c6b96e35f20edf2cc4739d8a48c3b5841da2600db2cf89617a9d8182ca2b87566278cc95e5e47b00e1baf28b87509462453285390d5db553846b3d4aea9f8686 SHA512 cf453c3792b8d8d9bda0713d24aece7e855797f42190d8d7f2e6df5046570303ac12f5447291e8691791ee1131fd29f6807b610e1fd100bdb555d955ca041353
-MISC metadata.xml 511 BLAKE2B b5a68b917839d33949dd5b3e215472912088c4d309b0ed2bcb03eae8037369f08e2a305af85e919bfb71d3e5854618ffcad97b1e73c393648688469347d2b369 SHA512 b32168fb28f40f96cc22c1f1e16ab9a03bd62ca85661aa89b203c6626099e28a7dec6a6af8bdbf251360e21e5aa43c727e44204a2b355aac8546008f660582f2
+MISC metadata.xml 535 BLAKE2B 59f4bfe8eb59bcd482ed28ccb76baf82c3fb3ce15a3cf4fc342dc5ca8d0a0c47af6013a7c5d7888e93c1be22eaa326488580f3ff7764629081b754a2c650fb23 SHA512 a34f70e7d2acb37cd2aeed47b3b0d39899cde7c52450c83970e1b3b54575d32b621601783b6f29df8231985860d3ee9d59e9b007fc69f3cec4f2a2db1cfecd00
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
index 15a26705528b..802c8cf97742 100644
--- a/dev-python/pymdown-extensions/metadata.xml
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -13,4 +13,5 @@
 		<remote-id type="github">facelessuser/pymdown-extensions</remote-id>
 		<remote-id type="pypi">pymdown-extensions</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index a2eb95da08c3..0cd7860bd7f2 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,5 @@
 DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
+DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
 EBUILD pymdown-lexers-0_pre20180905.ebuild 558 BLAKE2B 9f9f3c1a239fbdf3abf143926d83a8066b7b500c52b0410b31ecc49245b0b82b5d47b51a7faabf476b1f3476ee2063ee2d943685f8553aa0b8c11290356d5d1c SHA512 8eb46df0690ef63d4913bc06cc938b39bf01ad5862d51992112bcbce0d8258dcb87f23649b87fae1ccb8f97e2822303f359c06147833be6fa3baef0ed3651bf1
-MISC metadata.xml 617 BLAKE2B de6281be935e74606c1b2ecaf28c1f22f237d830d959217728a4e194ef3911651148e059f3528ca671b71f1589d8821c5c638d664e3935b26f40bbd63a1a00ef SHA512 8df05380fece8b006abe5145eb876dfad712832b12743c81623c1081d7d9d1a3c8d1b7fee249a2fd8448039a243fb296dbb8f7f8f2d32181e960c6d1196518ee
+EBUILD pymdown-lexers-0_pre20210308.ebuild 558 BLAKE2B d98ba583587cee81e8345731e11aff62a000d14c01f843fb09cf942551107fc2b026ee4cd31a2edab9796d0a6009dbd30523e21367fa2f6b3b0773de32a55a7e SHA512 9915aee7074fb0ca123f36edde001054d64ada8151a1127c2e6d801f624f6d02f55629ddb853cf29f8fcb4bbdb2c01ee75b839518350adf0db9d7bf5f5cecbf1
+MISC metadata.xml 641 BLAKE2B 0dae0d22b6178cbfc32aa39edae5fad524fca8a26fc1b2b38bb1b07ee3c7296a8161dab003b114b2df0532bfead33beef86aa113dde8f74a374d0cd45ffef91b SHA512 9cc74eebcb0b409b11ff6135a4940c3534d7309bf9845d0948686939e7769dd86dc963209343f6950d5c1273c0c6f04ed3fe44c6d4ae1ffabfe2e98af8cfd7b5
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
index 55ec4409f77c..aabd58e9c2ff 100644
--- a/dev-python/pymdown-lexers/metadata.xml
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -16,4 +16,5 @@
 	<upstream>
 		<remote-id type="github">facelessuser/pymdown-lexers</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
new file mode 100644
index 000000000000..5e7103789cd8
--- /dev/null
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+COMMIT="84dc78c7692720bd614209124c3e8af65678532a"
+
+DESCRIPTION="Additional lexers for use in Pygments"
+HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
index 6d02f3489ee2..c8a3705ea605 100644
--- a/dev-python/pymdstat/Manifest
+++ b/dev-python/pymdstat/Manifest
@@ -1,3 +1,3 @@
 DIST pymdstat-0.4.2-r1.tar.gz 14798 BLAKE2B 179c88a8999b4908586a3bc1698de9df25e94203b723b2981f9ac6e1b2ef47845c9e625c1daa40990dff7e90aece34fc471c3c5a0278a85c4c526d37574e5fed SHA512 7c9815b365fdb37ffe37c65d280a3bc4370f09fb8dad18ff9c68f61b8cc906e6b8d8e0fe0dd1570e68349f535f23cfb8afd52ba805d78e795d5c6f9730f7f2d0
-EBUILD pymdstat-0.4.2-r1.ebuild 765 BLAKE2B c8109138ef19422aeac933f37a5e1fbb858d9ce0a445f2e7fa68e268cc1a80f20352976191ccc9e6a0aff7a5a4840bfa86c756a338de7a825ab392cce8a9429e SHA512 58546f0dbd38059254f58a05ccb12dc319ea7fc820df5ef58b8b04040f8c51804a26e586fc24ad2f619a03db0b53e932d41b4e3266a19fbd083a90a3949e5098
+EBUILD pymdstat-0.4.2-r1.ebuild 766 BLAKE2B 9e264dc7fe31111cbacd3db13cc6aea648757574d6765994dc41aef05a8dd57afe670769f518f7804f16d8714d9a2c2a4474b77f55fff557f52197f176c2b1af SHA512 292beb386d22567760d39630eb169845a09f1df0d7e90c7fc20f27a56e67376633b7c1e8a2640b0c15fdd143705d6a19443427767aaff1c0903504c4c6728f51
 MISC metadata.xml 511 BLAKE2B 1c45d5fbcf29307f98a9a78615ffdbb4126562f8666823019374f7196f3bb12e2b293c9caa8e4f7a31db46215244e5c2d318c3e4247bdba027b69b40583b38a8 SHA512 47023cd0ea65d3eecad51f1e6d3cad0a3326b65f2ebcfbbc7ea7e817a04f3fc064f04292ae63613bd77a1cbc644775c66c322d3f8d9f18ee13d3c1f54a5ef508
diff --git a/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
index 922b5a782c2e..4db810357637 100644
--- a/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
@@ -1,15 +1,14 @@
-# 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=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python library to parse Linux /proc/mdstat"
 HOMEPAGE="https://github.com/nicolargo/pymdstat
 	https://pypi.org/project/pymdstat/"
-
 # drop the ${PVR} if there is a version bump
 SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${PN}-${PVR}.tar.gz"
 
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index b9ec15968fac..e830b0a1f62f 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
-DIST pyopencl-2021.1.6.tar.gz 448568 BLAKE2B aea3f6f28d3377b0b8aa7b6c726252299039663e9684316f48c5e875be9d25600582a4af931cacda3fa39834c000a00e2d29720ed6a3cca8e46141ee189107a0 SHA512 320b521e9ed05e0c183d0535b81f27355bdb21577a8a8ba254599a9e853cbe6e0ef44ee6e5be742b44fa1e1e5005732643217f327e4b347845ee6c706db5da87
+DIST pyopencl-2021.2.2.tar.gz 450053 BLAKE2B 577e328aa5999b499aaec759256b60c1ef5e41ad8d9e19ffafa9b1e7562e5f74f15f2c8ee344f4f2bd80c27375d6a303a813f80241932d22988f6afefa61d6c0 SHA512 ec148d5b05f8df62d35ddf85d156e75ef2effab6dfab12a998e8a79cb559313c5a7fc1b680790eeec12f4f31fb5af80e46c6a18e8b641b6485659a5c89758735
 EBUILD pyopencl-2021.1.3.ebuild 1458 BLAKE2B cc0a0ee17bb7c072098dded2973d6e13142797c6b867da34bdc9d1a7d6ba00f0dded0fc9b9a0ca48037dd2a0fd394338fa3a729153b7c09a653e1ea70f453b56 SHA512 42e47d1baf85acf94087fc0f23cb8660bdd36adfa8054560f10d5db45254fd05c72b5c523e75740b2e49e13613d6af3f0ae691b3d8f434e8e39b7b9e0960aaa3
-EBUILD pyopencl-2021.1.6.ebuild 1460 BLAKE2B 1102a8a5aed69bdb9ac19f8eb775731a5cd0aff8150abc6c6fda164c85f9997cb0632d4a190aac9d474814472bccdd0ac09320423454b1ecbfe1c0ba2eca039d SHA512 8152742974fc8e34b2cd5737a43edf9993bf5bff46c34000ace1b8b30ed49da5f9c842ba1f90f3c78e2a6f3f58ec8925d7d3c10ffc83746a793b971c9720d432
+EBUILD pyopencl-2021.2.2.ebuild 1460 BLAKE2B 1102a8a5aed69bdb9ac19f8eb775731a5cd0aff8150abc6c6fda164c85f9997cb0632d4a190aac9d474814472bccdd0ac09320423454b1ecbfe1c0ba2eca039d SHA512 8152742974fc8e34b2cd5737a43edf9993bf5bff46c34000ace1b8b30ed49da5f9c842ba1f90f3c78e2a6f3f58ec8925d7d3c10ffc83746a793b971c9720d432
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
index 863ef6a22457..863ef6a22457 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 525ff1aeb4a5..b7f9e8e7208c 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,3 +1,3 @@
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.8.2.ebuild 1226 BLAKE2B 02bfcbf36185f6f41183227503f22188473acc84f57ebb1d4503d7b16d7101dce931fcd669559fc194660cad43d574e228a8350c6876eca4300054bf7d1de7e8 SHA512 fbf9c5d70aae094392cf887d685538f6d38a1bd1080687ce254680c385688850ba6d9c60085ccf94841e176a6012b3a2c517f1696e24f4006dade1a34440d749
+EBUILD pyperclip-1.8.2.ebuild 1232 BLAKE2B 018f8c7b49a20b9a7c1069a207eb1d3671bba0435fa00ea52acbca963a963e436f2663b4120bbc8882804eef6bdb78f74f1a3c61f7a0285241abd9f1acb508e9 SHA512 8f9eb6d36e5e4e99e837ab9b51faedddaea7df81c8409400ab6fe3e8b8e48e6087bc1a84ce5c4db698f83b254bf9cf2024807095c670d8794e6ddd1784575443
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index e61e7e130fd2..0a037995ee10 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 2b0171424d2f..f46f7aaf4ab2 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,5 @@
 DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689
+DIST pyproj-3.1.0.tar.gz 182603 BLAKE2B d4e95f62b10b282e7bbfcb7a2059a11a489e53402cbb1760b7da73248dfc05de6be8ca820e55d34c9270eea38178f1fb934bd5ffc389833b3734b87b79991187 SHA512 21a5d08207676d8d9722cb5e3b13ed68f03b1a2aa034c20c61bb8dab5d204dd968ba9a3df1b0c43ed174e082725c7624efb75a0c9c3df920808cbcb44f4d170a
 EBUILD pyproj-3.0.1.ebuild 1454 BLAKE2B baa1dd99d0e3c02662f1ea337583912d1d1978f4577dd548f1c7d12c6d7d539098324525d63bcaecc7eed9e2cbcc87bd0c80df36430e28d071897f5cf8b7a455 SHA512 45244a36fb061eb99c8fd56ab3e44aa047689e48e9279c2df2e26ad1f10271d2e67ed5eaf335d61e108e8e0ad86d9ad92ce2fc8cb7f8d2fead5f1f6e4faa750c
+EBUILD pyproj-3.1.0.ebuild 1440 BLAKE2B f9892cf54aff4df9d9972c91e0000118bba97814f19e95341fc8b3f5536fb52c1b055b4b20811b44109228f769f54e2b9ebd4e4787ac84e435cdaa2dcebcd929 SHA512 3def949e83675186e4620b8a87bce6438711622abcca7a48d67b9bfd2a7b573f1b4925d29ffc9bd59ae11277ee9c16804d16035fa86780bdbe8b3823c580c321
 MISC metadata.xml 414 BLAKE2B 37b554706874ecf474f6fde6c09e4d7e466f2a22527e2851d3766518d0044dbbd2211f291851564541394a4d8f7d37f8216ae1c50cab8f662d3335d58c1ea142 SHA512 c117112962969a1cee0a9c3c7ec86942bfca1ef3eb9859b079ebdac743b691a954d7dc55ec729e141336c253abff8e0c7fcf1625279990cb87da87d732efe881
diff --git a/dev-python/pyproj/pyproj-3.1.0.ebuild b/dev-python/pyproj/pyproj-3.1.0.ebuild
new file mode 100644
index 000000000000..6061e44b117b
--- /dev/null
+++ b/dev-python/pyproj/pyproj-3.1.0.ebuild
@@ -0,0 +1,49 @@
+# 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 interface to the PROJ library"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND=">=sci-libs/proj-7.2.0:="
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		test/test_datum.py
+		test/test_transformer.py::test_transform_wgs84_to_alaska
+		test/test_transformer.py::test_repr__conditional
+		test/test_transformer.py::test_transformer_group__unavailable
+		test/test_transformer.py::test_transformer_group__network_disabled
+		test/test_transformer.py::test_transformer_group__download_grids__directory
+		test/crs/test_crs.py::test_coordinate_operation_grids__alternative_grid_name
+	)
+
+	distutils_install_for_testing
+	cp -r test "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	epytest --import-mode=append -m "not network" \
+		${deselect[@]/#/--deselect } test
+}
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index a4d80eaefefd..a6244514294b 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,7 +1,4 @@
-DIST pypy-exe-7.3.3_p2-1.amd64.xpak 13559131 BLAKE2B 85826ef13cc12ec07143b55cd6821f50db821ba3dad351aae90c2beb98b85f51f39ee26626a04757a63e96ef0da6062ad714f1bf96900ef361d61f2051342787 SHA512 5f5566942f6187d8fdf5b05dc27a3eb7e4bfa958da9b39a85a3531c427de89ca5bea16d080dd5450df906e5a3ab56fdb09010a603795a4763b80d5e4ee4ed96c
-DIST pypy-exe-7.3.3_p2-1.x86.xpak 10215453 BLAKE2B 34bbac2f3fab96eb91d2f3a9514e8f1b7ecb342da7402385f6d44755bf31f9b3d76688dcc7446aac2a9d768b588c545c0557e96b2bcace39ee669ab3ba5f882b SHA512 9cfc4fc080ec67a1a28cad2d1a76ffcff0db3e1d02ca2efe35f9dd4931c6d2e58ea9de1b3bd8098fc891f7c4b2ff703e42c77f19bedc837c1f5c4c7dc141f26f
 DIST pypy-exe-7.3.4-1.amd64.xpak 13659131 BLAKE2B f8dc0875bec1027fd86499d13e435f97bd015882260b449de279ef41f8b8e9b89fc6e9f197539314ada54e2435a2cb7e7baf3da6e47b872d6717c847c3b7ddcf SHA512 e14312457c1fed4d815c7dee0487b5d77e781b3139381a142156e6fc524df7e7f4f613799a570716d89c95fd704ecad3c095f839296d7c1e63bd675aaac2c92e
 DIST pypy-exe-7.3.4-1.x86.xpak 10291603 BLAKE2B 62e83aa57b176a02a64a1826515763c24d008a02733ef32040ba2c908dffaca371cda3f55eddecfe93f45c1ba52aa7d0ccb898d84f0dbf8ab004f8a79a3814bb SHA512 73c6481530f4c4305a16d12995b11860023f7516737f892df7911d1effd01142c22f2318fb3b392e2483b976fa2609dbff37b61ad8847e395cbaaccbac0301dd
-EBUILD pypy-exe-bin-7.3.3_p2.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
-EBUILD pypy-exe-bin-7.3.4.ebuild 1090 BLAKE2B 7c2e8787fbaa020298eb80b34f8c22a368042f62f010226ea32d1211318ed1cfb3732e4e5e380e30e3adfa8e11807b4e5be8a70278eb4855ffd52c28e3d5a37e SHA512 033ab74a18692e376051070d14233eecd1b8f7d8b21c91485c24a3442927d414fc6af5f8c296d316316fc76a89f68650b351a72ebadc4c88c8647d3b51995e3b
+EBUILD pypy-exe-bin-7.3.4.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
deleted file mode 100644
index 3d0b3fd13699..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
-	virtual/libintl:0/0
-	dev-libs/expat:0/0
-	app-arch/bzip2:0/1
-	sys-libs/ncurses:0/6
-	!dev-python/pypy-exe:${SLOT}"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}"
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
index 3efe53b38758..3d0b3fd13699 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 91b8a148299d..454a70fe1850 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,13 +1,7 @@
-DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
-DIST pypy2.7-gentoo-patches-7.3.5rc2.tar.xz 5792 BLAKE2B 2380dc09be7e8dccfcc151e5c3cc5cc0aeb6a5a284b3b3fa8d12bdc0c6352d0da4fc3cb52762c1b5a38b97b3736147cb10986e0e6fdb622ff277445ba7228252 SHA512 1e269a02fc70b67fe44a8d57303a1565acbdb4b7f8065ec489b6bdd9275281e4b516fd1e01223e9635e4759a71c73be941f02e6bc561ab728d6a67e22bda47e3
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
-DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
-DIST pypy2.7-v7.3.5rc2-src.tar.bz2 21561927 BLAKE2B 1fd8aeba0698c95015716109d6a3aec74f95d1a4faea130ffe872b43d0ef8e1e8f8b742aeae6048ab596c5b78634e83c83c95ce3ed047d068dae7bddc02e1281 SHA512 d1d4b45c29c5e4c1735744b4aac46c87787bda7db496c8865e099e669f666f223ed9c014f3637065bb7762eda39a0116bab54078cf10ce8fbd8505d1ab952575
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
-EBUILD pypy-exe-7.3.3_p2.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
-EBUILD pypy-exe-7.3.4.ebuild 4301 BLAKE2B c1310028ad3a452c2c03458dbdea90f2e1c58badecda30240cbe0b3e9be9e0d41403e27c506071308ea8229edcadc2c9247dea00b50791e5f3f0aba376161965 SHA512 ed19844284bfb7a6d9020b868f890cf0865bba5fd6d852728877cc7d476219cd0e6e3aac837219c925fcff35c4c5625ab9a9b84261f27451cb9a4d1bfc4af958
-EBUILD pypy-exe-7.3.5_rc2.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
+EBUILD pypy-exe-7.3.4.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
 EBUILD pypy-exe-7.3.5_rc3.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
deleted file mode 100644
index 0bedc372a695..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV}
-PATCHSET="pypy2.7-gentoo-patches-${PV}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PYPY_PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
index 94a0f8c74a8a..0bedc372a695 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.5_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5_rc2.ebuild
deleted file mode 100644
index 8678327f1313..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.5_rc2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS=""
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PYPY_PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	if [[ ${EPYTHON} != pypy ]]; then
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index e967b9a317c4..3136f0d408c6 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,15 +1,7 @@
-DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
-DIST pypy2.7-gentoo-patches-7.3.3_p3.tar.xz 12936 BLAKE2B 7d00353f79d535044e4e2c9cb8ad06d637bca4707123a566989b0ab97ac2f22d9f631d1d5f4e32bf1e0d5202dbc31fffa8d39718963da2a4594f814b90aa8132 SHA512 818910bbe3c01399a0da361a48098a4e875ddd7d4fd50f23bc06501dae7ed5eb3ee773b0dd76d256d141ba190d55b5c725fa4d7ed8d7a9841e6be81babaf518b
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
-DIST pypy2.7-gentoo-patches-7.3.5rc2.tar.xz 5792 BLAKE2B 2380dc09be7e8dccfcc151e5c3cc5cc0aeb6a5a284b3b3fa8d12bdc0c6352d0da4fc3cb52762c1b5a38b97b3736147cb10986e0e6fdb622ff277445ba7228252 SHA512 1e269a02fc70b67fe44a8d57303a1565acbdb4b7f8065ec489b6bdd9275281e4b516fd1e01223e9635e4759a71c73be941f02e6bc561ab728d6a67e22bda47e3
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
-DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
-DIST pypy2.7-v7.3.5rc2-src.tar.bz2 21561927 BLAKE2B 1fd8aeba0698c95015716109d6a3aec74f95d1a4faea130ffe872b43d0ef8e1e8f8b742aeae6048ab596c5b78634e83c83c95ce3ed047d068dae7bddc02e1281 SHA512 d1d4b45c29c5e4c1735744b4aac46c87787bda7db496c8865e099e669f666f223ed9c014f3637065bb7762eda39a0116bab54078cf10ce8fbd8505d1ab952575
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
-EBUILD pypy-7.3.3_p2-r1.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
-EBUILD pypy-7.3.3_p3.ebuild 4826 BLAKE2B cdf8416b6dfeeb167e17e958db45bfe287b4e972c48b988fe0029685aae15e9cc179452e62ea9088650373b5236f17e5bedf78283b85acdde2a0f990626f2a10 SHA512 43f5336d74176230c20ff7448503cd44d8cf1ab265e50cefbe2e65729815ef32330c51d231f7624719e93b12475fb4fb11f3508e644f734c4687d725d8fe7bf9
-EBUILD pypy-7.3.4.ebuild 4821 BLAKE2B 11555d42034da0a9d07b0368992693d4ad6634de283b8878f9a71c4c667d4fbbecac42157b4ba5ce0e749593789dfe0312b1ef82d43b78af9f9d97526050ecbd SHA512 107f8614f1a8358239a66b0fe8be314ddf8b29b0ad3f5ebc816360d38526bad71ccbc3a9489c555a71a19e6795f0d68007ba51f9c44dfeff52a1a4b951bf1cb6
-EBUILD pypy-7.3.5_rc2.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
+EBUILD pypy-7.3.4.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
 EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
deleted file mode 100644
index d6dd6887ee85..000000000000
--- a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV}
-PATCHSET="pypy2.7-gentoo-patches-${PV}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-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"
-IUSE="bzip2 gdbm +jit ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.3_p3.ebuild b/dev-python/pypy/pypy-7.3.3_p3.ebuild
deleted file mode 100644
index 88ca89d62cc7..000000000000
--- a/dev-python/pypy/pypy-7.3.3_p3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV}
-PATCHSET="pypy2.7-gentoo-patches-${PV}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-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"
-IUSE="bzip2 gdbm +jit ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-7.3.3_p2:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-7.3.3_p2:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy/pypy-7.3.4.ebuild b/dev-python/pypy/pypy-7.3.4.ebuild
index 8b32239d43ae..d6dd6887ee85 100644
--- a/dev-python/pypy/pypy-7.3.4.ebuild
+++ b/dev-python/pypy/pypy-7.3.4.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/pypy/pypy-7.3.5_rc2.ebuild b/dev-python/pypy/pypy-7.3.5_rc2.ebuild
deleted file mode 100644
index 82edf15baf9d..000000000000
--- a/dev-python/pypy/pypy-7.3.5_rc2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS=""
-IUSE="bzip2 gdbm +jit ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 1dab1fd7bd2a..597da6c65ac3 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
-EBUILD pyquery-1.4.3.ebuild 1176 BLAKE2B 171e09e8d93757343005a6195fc54992e8fe630b3eeb78be06fd5e0b576aba11711e854ccb767ab5d35add438f109b276efe73deb32d55a1b903ea7c6dde4f16 SHA512 37fab5c294577e2db5850befbc052cac1110a838d6f1a0057378eae1e7248bf156572869a77712815a7f8f23c63a241b5fe6bc6ef74375975ac96ba405102190
+EBUILD pyquery-1.4.3.ebuild 1119 BLAKE2B 624c1b37e37b599ea257ab8d4178098c493de236442e05e01062f1f86e095400b7f576bf619730bb9ea81c081ce7555b49f01c672c798703679b8fd5600b3865 SHA512 6d27b58673b1e909acd9fc68e0b55cf6ecf8a25c03f5c0d8d1e7f6e88c8905b7ec789f3417d5c440b54d15f33ca140834a90fa0f8d99faed6d67c5514d593187
 MISC metadata.xml 400 BLAKE2B d2e08b1b84985d34ddaa36dd90a890915203ba89a477d9ac2254f19b21070dc7fad74c1d51b8ca19ef56c6dadafac3a8b98fee11b9fe0d28c73a1b1dfe9ec109 SHA512 1045e3c9056b6724f1a3457d908e8a9bee0167f34db8aa45f269d279396b3a7ff42709ca42768f198e61fc03063add0a05791ffe631374b0e65328f28ad80ae8
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index 5e3ce4f6ef3f..c89aff0e9911 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1 optfeature
 
@@ -14,30 +14,28 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
 
 RDEPEND="
 	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
 	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
 DEPEND="
-	test? ( ${RDEPEND}
+	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/webtest[${PYTHON_USEDEP}]
 	)"
 
-RESTRICT+=" !test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
 	"${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
 )
 
+distutils_enable_tests nose
+
 python_test() {
 	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+	PYTHONPATH=. nosetests -v || die "Tests fail with ${EPYTHON}"
 }
 
 pkg_postinst() {
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 8f19da086e87..5cee0964275f 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,3 +1,3 @@
 DIST Pyro4-4.80.tar.gz 515103 BLAKE2B 5d2b69ba020117947a36c9c75f884434a3452167fa2e586e3a5b0e6deb1d0c8c54dd06a20b9568b53a0a6c42a847d880636e3abe37090246d5f34ca84e915b36 SHA512 8e41285674edbe5c8d5ac63e33406c5ff7b6366d5dd251a1755eff81611193278a473ed8b15f995bc0ba2775dc5d316eb6a3cafd63626b95820591ea3a0a92e3
-EBUILD pyro-4.80.ebuild 1366 BLAKE2B 2a03220e6898aba21c1e3cc956b851da8093226f2f4681a39fd9fa1480b82ca6719605a787b3320d3384ae42dabfa55a8b52372721beb83a83110c92b340664d SHA512 d1fd4c62fd56328ccd939764eb21e5671dfb839b8e7626ba01558b326cf1f9ced82762e900dc6a9973e39a3f6e442291a9358af783aeb49c5c3076ee63bd7ece
+EBUILD pyro-4.80.ebuild 1332 BLAKE2B b964c524fc766b2817c99f3e123180d9630478a1e32ce1181bce2404373b9bd76145d58ede2bb7b294ede64b5d3eaa3440ceede5914a2af15f2937d4a69918e4 SHA512 be989db84d71eb9b12710daa3ef4fec51264486107eea855502c4ec1715d669f2211d0c197d5481e60aee9e7cc3021596bd30a52dcaca9363f9856aed91ef87e
 MISC metadata.xml 383 BLAKE2B 8fee38d6339804b0a0e29cf54c4b570d5e2b30fd2a3c271c681bacd70423a76f86e004efc16479b6f27d3a6e10f71491366e592faa76a0575eea89d24c50d52e SHA512 f444523d9fbbf37c2d4bff335c2ac8087582d9c76dfc1a4545141f186257e5a8d82bdc0675143f573375511031df2df3ce29399f0f4fab62efb64bb9c0bf167c
diff --git a/dev-python/pyro/pyro-4.80.ebuild b/dev-python/pyro/pyro-4.80.ebuild
index 8a76e66ae186..1c2150e74eee 100644
--- a/dev-python/pyro/pyro-4.80.ebuild
+++ b/dev-python/pyro/pyro-4.80.ebuild
@@ -1,11 +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
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 MY_PN="Pyro4"
@@ -15,6 +13,7 @@ DESCRIPTION="Distributed object middleware for Python (RPC)"
 HOMEPAGE="https://pypi.org/project/Pyro4/
 	https://github.com/irmen/Pyro4"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
@@ -32,8 +31,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
 python_prepare_all() {
 	# Disable tests requiring network connection.
 	rm tests/PyroTests/test_naming.py || die
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index c7ab08f4904a..898d934fb9ee 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
-EBUILD pyscard-2.0.0.ebuild 691 BLAKE2B b118e9e40effe0fee81fdc1e9a6e1b7da153249172e756d61264c90b512f01458bcb615867f691cfff162f887dafa6f759b308638750af1444a969565421d5fb SHA512 f44c4829a938755b5207afaa75c604844f1ae3952b82c09b72eb2bc94939726721d068894457cd35f4d47581073187d587e89134951daaeb87565ae13fa0b3d3
+EBUILD pyscard-2.0.0.ebuild 692 BLAKE2B 44c43a4eb72492a5ef29faa069ede7c51aa12f47a308054e241e1ae56f8dea35147df2afbbcfa0a3d7b80f1a56fc19d60a76a7a5b1fe1f2ffa5f16c0f7445a77 SHA512 a4b4aa1f9b94266f4ffe3551eba2de405253fa663ae7d35f7912e88aca30e168e70a2a473b9622acd0dde4c4c6448509503cd41d305ef3a6c73c0df5f1d4647e
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.0.ebuild b/dev-python/pyscard/pyscard-2.0.0.ebuild
index 0461c47d0851..c3bdd158fd22 100644
--- a/dev-python/pyscard/pyscard-2.0.0.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index 18328213d1a7..4a6fa1a48264 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,7 +1,3 @@
-DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a97212b3f4472b42e40f9470fd0575fe8f0ceb976adfe13059c0566413414e03f78189d4afa193d88a0aaf4c5c26e SHA512 6689ccbcd5c6164aeb12d911ee93c8958f6c6b5aaba5ba7d4073ee855e6398180ed27fce6299480b18b3d7ffad12cd17694c3db1f1c7373d4b25be0073d49338
-DIST pyscreenshot-2.3.tar.gz 34543 BLAKE2B a9ae6fc51ac62efabca7e9b4e08ee8ee05d778a3f8ea0bfaec5f0958bea7f6dd266e18a938350aac6fa1058fdb378cfa69cf6c5490768c39d7312be51e3d2630 SHA512 6919e4529a932b9a6e3dd28d60c628447b0e6f25df567db742b5bf14455373ad7340237bb4b77696c436be6f31211030b206d7152f4b61d16d6745f439f84425
 DIST pyscreenshot-3.0.tar.gz 32865 BLAKE2B b39d338be4f1dc23fc30fe84a6f8ee6b6346761b023222438e8ff33e01beafc347d34118332efb053057c54383f5468e73049041889a6140a70c0f928c655661 SHA512 f8070941ade2bc710157238f47c9575df1504ef63152980b2bc0edd1f69c9ca4aeec3f738929de1c81a51fed79838053674626981ec61d95dafa7b9998004606
-EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
-EBUILD pyscreenshot-2.3.ebuild 1013 BLAKE2B 4a3a8abaf23dc546cc907bc931972c6a6e926e275e3decd3337a6ee0ed1582071f9c819ac4ea5c366bc4d362c80054e7784bf7666bc33cec4179ff4ca0d00360 SHA512 3f0b7f0c31755dda3b3475ae6ddf24a609f8a03155cde9936fd3397b2e3416e9b3ae87bb30c13f2242cc33cddcdb1f24c38e52f6c3213bc7e4646a639f86cc2c
-EBUILD pyscreenshot-3.0.ebuild 975 BLAKE2B 92bb0f42fb44a84c44de0700840452e23fe006967ccb07492c3a133cd45733729c574d4db650e4b05bea0143c57394cbcf6831c041debf1bb4f3b5b4da9d0bb2 SHA512 74ff8ebb5458c68e019350d0c17c8cfe0780ee2bb006d48e09ac637df3844e13e29971f3f7c2b628e857451cd0eae9df6e854b0271ce3c5cf558e7a4df808c6c
+EBUILD pyscreenshot-3.0.ebuild 973 BLAKE2B 2f438e2098c661c838e5808992830bc1f85911f96d0c4002f0a6c9edfa4e06c096c4dceaee9241b277b53716270c74314ed50971053ca3927c6c3b040aefa8f1 SHA512 288e088e78af9de43b02c71ea33895ef657fd59d6b162c25b069c6e0b52f9f76dbe2c4b159181e117cbab3d96ee8d9c6cde93eb745464fb83519961746ef9ef8
 MISC metadata.xml 458 BLAKE2B e057d5382e811b727d46b04ac0ffbbfa2e57799f2b7182e0a0b81cf891b44db37fbb201934810b2ebc353b073fcd4b632612292fc93230904669c276983b46c7 SHA512 5347be673d2628faf4660a3d25f39d340b00aae8155b4e3463a9a8a92554249be3ab5cce1af89c39e33bccac9ff5c0c72b97a5d16db01194586bd0acd75225b9
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
deleted file mode 100644
index 67e2ca1a19be..000000000000
--- a/dev-python/pyscreenshot/pyscreenshot-2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python screenshot library"
-HOMEPAGE="https://github.com/ponty/pyscreenshot"
-SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	media-gfx/pqiv
-)"
-
-DEPEND="
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/mss[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# easyprocess.EasyProcessError: start error fails inside emerge env
-	sed -i -e 's:test_default:_&:' \
-			tests/test_default.py || die
-
-	# AssertionError
-	sed -i -e 's:test_imagemagick:_&:' \
-			tests/test_imagemagick.py || die
-
-	# Needs access to dbus
-	sed -i -e 's:test_kwin_dbus:_&:' \
-			tests/test_kwin_dbus.py || die
-
-	# AssertionError
-	sed -i -e 's:test_mss:_&:' \
-			tests/test_mss.py || die
-
-	# AssertionError
-	sed -i -e 's:test_pygdk3:_&:' \
-			tests/test_pygdk3.py || die
-
-	# AssertionError
-	sed -i -e 's:test_pyqt5:_&:' \
-			tests/test_pyqt5.py || die
-
-	# AssertionError
-	sed -i -e 's:test_qtpy:_&:' \
-			tests/test_qtpy.py || die
-
-	# AssertionError
-	sed -i -e 's:test_scrot:_&:' \
-			tests/test_scrot.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
deleted file mode 100644
index 1cb95e4a350b..000000000000
--- a/dev-python/pyscreenshot/pyscreenshot-2.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,8,9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python screenshot library"
-HOMEPAGE="https://github.com/ponty/pyscreenshot"
-SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	media-gfx/pqiv
-	kde-apps/gwenview
-	x11-apps/xdpyinfo
-)"
-
-DEPEND="
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/mss[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Needs access to dbus
-	sed -i -e 's:test_kwin_dbus:_&:' \
-			tests/test_kwin_dbus.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
index ea317eb5ece9..71f557e8e35f 100644
--- a/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 2587a0eb280b..cf49543565b8 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD pyside2-tools-5.15.1-r1.ebuild 1667 BLAKE2B 720d28927bd13aa0de40c7c41709f64bbc369000e9e85cbe2217ea12b8c3fe87dd5b703948bd9df52c7a269873c2ed121ce2e36ab99abd92c40d0ed05979dcc1 SHA512 22a25c027d34d188a095598678e3dd6d1916792946ba8373b98feb054a4bb42bb8ffae9263ea6a7dc3b312a6639c7150bf223c979577b07f5cedc9ef6806e36d
+EBUILD pyside2-tools-5.15.1-r1.ebuild 1665 BLAKE2B 2e61514e8f85b6f7548fbba19a02e8c5be6ef891b962a5683013d02551c2162cbb7e086f10b037dbf0ffad40717c8061e285327f871fdb557487de122be6e1d5 SHA512 2e017f9cffc7a3ab028ef860462b293c707c37a2040c7593a83a0524e4370b2e8f58ed9d87daf7982ad8b96c945c755499eb6be6a55bde46d2768ae28b7407b8
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
index 186e304ebacb..54ec37690e72 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index f362bf1fd3a3..a6d5e4144998 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD pyside2-5.15.1.ebuild 8508 BLAKE2B 17a565de5a11e456bc106fc0a6abb48b50ea47f704524f48d642a1a7a465a82e5f2679e164c48ed0fe00b161c9ed0b3326b5765b125c8d85d03c712e4fd52d74 SHA512 c45f143a3a781e18758c1e3bd12af16cf568d9126ffa6d4ec68816dfdd6f707bc22851d116ad7ab1e1006c462bc9be7918da16ac330fc5d9c57ada3653915469
+EBUILD pyside2-5.15.1.ebuild 8507 BLAKE2B d293578b31f1b1f5a6657f6b8fd84b1063df436ee077f6e18aa9a5b6dbf3a173e5f47148976c71f0bba87ce394135ed1b5e11d673692c855237fa73dda1d3213 SHA512 8536fd5fcd16d6aec841e30b4568bfb875dfb47d4cd3f2af8a2e2a6f65ea1a8bc135233e567affa6c720612efcc2194afcb268ad7cd7486001345240fe136928
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild
index 74610644ff46..f2048d65d19c 100644
--- a/dev-python/pyside2/pyside2-5.15.1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index e0d1fabbd6f1..b5e9bcfb3d17 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,5 +1,9 @@
+AUX pysimdjson-4.0.0-error-types.patch 1867 BLAKE2B 3c3383d29890363a3d16547bac57884b12ecae899b587ffaa78599f144a32f2cbc5978ee0b831e64933bca0a4caf2d670c03ca4827212c5ff5eb2d439ced79f6 SHA512 2b92745019144113f85171c8964056c0d56cd59f82da4af962cf3891b6056caa7be9601487414523854f03cc5e60c7b977a99ae23bdc83cd69e5fb1dcb53ee4d
+AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4ac2d7d7e83b6b4b3116f00456ad03cc2e9d6e554e624a129ef6e62e1e3310cdc57b97dbd5452d984865401ae88b057b07 SHA512 49a47e18b7da306bc347675fa1b1a822e9365ef3a5b9d4f3eccdef5b32d6bab9f5d110b93dd90c65075e6b21027d07e93ac6469388d6609b750ca9d72121de19
 DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
 DIST pysimdjson-3.2.0.tar.gz 3357720 BLAKE2B 596738da76d008563e31c6231d348fefb8f37dd4dee2490339a6233ba0a39ab24dc3facf1d02a4621f1d6e01dfb4af8673651d79095919ee7f4532a25dd1c63f SHA512 4c72d71ead5675c2d9b1551b5dacadee013fbaa74f93b2345920f0bac8eb65d79dd84ee817d07fea0bdf477c1c97ca4746048fbdd06a4bfa516e063d89724226
+DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
 EBUILD pysimdjson-3.1.1-r1.ebuild 512 BLAKE2B ab3793c04071be9c51237465b83fbabbf1593666f00931d1e80379541aea51da4b39b7f5bba340594ae3326c07fc95ebcdeb5bc62e29edd2995b63436fd7ba1d SHA512 93a8e90cdd78ceb402252604e8191047d653ea8409c90c017d11ce55fb16aab6453bf5a9dbbe17abb69f5a63d54cc78a7c058d710457346131744b7ce0ce0a95
 EBUILD pysimdjson-3.2.0.ebuild 516 BLAKE2B 0da10517c85e0eb5ce240c67b34252b84b5cbcf563fa960f2e8ba211218b4caf65412873f6a905284f58a490edf7944a8d8e39d3f8c681f11fb46895b64d9b68 SHA512 5f93df21da251b9eff510c518976e7de6f543b0bb20f481cf51c309e77aad56fe813220dec6f15b6d834b2b096810ece317caee9fe77aabea5d5a714d85778e6
-MISC metadata.xml 322 BLAKE2B 94765d38596d2ebe4a27143373174f461b1af57ab29af679c35dbf69f45be48034ffeb424eef6ebc27e4be9e02090b587e216e7bb7f4eb6404523bd9a500435a SHA512 c88bdc79d128f98678accce553f367a1b83f7888e698a05b537387576808d9c547f52b7f963990311082ad06714e883a3da26e6f5cb93ef2b229c56a859d2fef
+EBUILD pysimdjson-4.0.0-r1.ebuild 926 BLAKE2B e5f293ed566d8950148e2875f81de146cf56ca2b541d96071f86b6478398788041ff44358fe6dffc7da751c0bfbf56f9e9a071ba7961b1df3f0eed309c52442e SHA512 3e89557d79dbc476a5e737bbf1f8010b3d2c2a4bfc5a5eb45c27194d20e4db9fd26e2cf4c98a536b6c7d0f808d1f1ced5955811b953ea77565868be83e9fa38a
+MISC metadata.xml 423 BLAKE2B 06f368507ce8309c6d7b2e2695fdfea636bb503444683450c76f8bc6f8ad7da8b7a0fdcf8ca478445dba7148bc2faad9a5c9f66026777be2c408c3765bf22267 SHA512 b24e60e618e2b4c74ec4a755e99faa0966156ceb188ae5c97feedbfc1d7c19fda73913632b977fe9a5f2ee4261c55b1c0df3488fe7303fe3b9e581cf57979f2b
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
new file mode 100644
index 000000000000..34b8f4aa9e29
--- /dev/null
+++ b/dev-python/pysimdjson/files/pysimdjson-4.0.0-error-types.patch
@@ -0,0 +1,53 @@
+commit 1145be6cac70ed065f2053977d470f3f771ac6a0
+Author: Tyler Kennedy <tk@tkte.ch>
+Date:   Sun May 23 15:55:28 2021 -0400
+
+    Empty buffers now raise identical error to empty bytes. Closes #81.
+
+diff --git a/simdjson/csimdjson.pyx b/simdjson/csimdjson.pyx
+index 095a183..c278e08 100644
+--- a/simdjson/csimdjson.pyx
++++ b/simdjson/csimdjson.pyx
+@@ -478,6 +478,13 @@ cdef class Parser:
+             # type-specific APIs, but gives much greater compatibility.
+             data = src
+ 
++            if data.size == 0:
++                # If we were given a completely empty buffer, trying to access
++                # a stride in the next step will cause a (potentially
++                # confusing) IndexError. This isn't a very good error message,
++                # but it's identical to the one simdjson would have raised.
++                raise ValueError('Empty: no JSON found')
++
+             return element_to_primitive(
+                 self,
+                 dereference(self.c_parser).parse(
+diff --git a/tests/test_parser.py b/tests/test_parser.py
+index 88e7207..d3a28c7 100644
+--- a/tests/test_parser.py
++++ b/tests/test_parser.py
+@@ -1,3 +1,4 @@
++import io
+ import pathlib
+ 
+ import pytest
+@@ -32,6 +33,19 @@ def test_parse_str(parser):
+     assert doc.as_dict() == {'hello': 'world'}
+ 
+ 
++def test_parse_empty_buffer(parser):
++    """Ensure trying to parse an empty buffer returns an error consistent
++    with attempting to parse an empty bytestring."""
++    # Issue #81
++    with pytest.raises(ValueError) as bytes_exc:
++        parser.parse(b'')
++
++    with pytest.raises(ValueError) as buffer_exc:
++        parser.parse(io.BytesIO(b'').getbuffer())
++
++    assert str(bytes_exc.value) == str(buffer_exc.value)
++
++
+ def test_unicode_decode_error(parser):
+     """Ensure the parser raises encoding issues."""
+     with pytest.raises(UnicodeDecodeError):
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
new file mode 100644
index 000000000000..de52bc063a24
--- /dev/null
+++ b/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
@@ -0,0 +1,95 @@
+diff --git a/setup.py b/setup.py
+index f1de675..4c23028 100644
+--- a/setup.py
++++ b/setup.py
+@@ -27,53 +27,59 @@ if system == 'Darwin':
+     os.environ.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.14')
+     extra_compile_args.append('-std=c++11')
+ 
+-if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
++build_with_cython = os.getenv('BUILD_WITH_CYTHON')
++if build_with_cython and not CYTHON_AVAILABLE:
+     print(
+         'BUILD_WITH_CYTHON environment variable is set, but cython'
+         ' is not available. Falling back to pre-cythonized version if'
+         ' available.'
+     )
++    build_with_cython = False
+ 
+-if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
+-    macros = []
+-    compiler_directives = {
+-        'embedsignature': True
+-    }
++build_with_system_lib = os.getenv('BUILD_WITH_SYSTEM_LIB')
++
++macros = []
++compiler_directives = {}
++libraries = []
++sources = [
++    'simdjson/errors.cpp',
++]
++
++if build_with_system_lib:
++    libraries.append('simdjson')
++else:
++    sources.append('simdjson/simdjson.cpp')
++
++if build_with_cython:
++    compiler_directives['embedsignature'] = True
+ 
+     if os.getenv('BUILD_FOR_DEBUG'):
+         # Enable line tracing, which also enables support for coverage
+         # reporting.
+-        macros = [
++        macros += [
+             ('CYTHON_TRACE', 1),
+             ('CYTHON_TRACE_NOGIL', 1)
+         ]
+         compiler_directives['linetrace'] = True
+ 
+-    extensions = cythonize([
+-        Extension(
+-            'csimdjson',
+-            [
+-                'simdjson/simdjson.cpp',
+-                'simdjson/errors.cpp',
+-                'simdjson/csimdjson.pyx'
+-            ],
+-            define_macros=macros,
+-            extra_compile_args=extra_compile_args
+-        )
+-    ], compiler_directives=compiler_directives)
++    sources.append('simdjson/csimdjson.pyx')
+ else:
+-    extensions = [
+-        Extension(
+-            'csimdjson',
+-            [
+-                'simdjson/simdjson.cpp',
+-                'simdjson/errors.cpp',
+-                'simdjson/csimdjson.cpp'
+-            ],
+-            extra_compile_args=extra_compile_args,
+-            language='c++'
+-        )
+-    ]
++    sources.append('simdjson/csimdjson.cpp')
++
++
++extensions = [
++    Extension(
++        'csimdjson',
++        sources,
++        define_macros=macros,
++        extra_compile_args=extra_compile_args,
++        libraries=libraries,
++        language='c++',
++    )
++]
++
++if build_with_cython:
++    extensions = cythonize(extensions, compiler_directives=compiler_directives)
+ 
+ setup(
+     name='pysimdjson',
diff --git a/dev-python/pysimdjson/metadata.xml b/dev-python/pysimdjson/metadata.xml
index bbbada85c7ef..0fbbf43703c8 100644
--- a/dev-python/pysimdjson/metadata.xml
+++ b/dev-python/pysimdjson/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pysimdjson</remote-id>
 	</upstream>
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..165fcadc2520
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-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="Python bindings for simdjson"
+HOMEPAGE="https://github.com/TkTech/pysimdjson"
+SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/simdjson:=
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
+	"${FILESDIR}"/pysimdjson-4.0.0-error-types.patch
+)
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark::' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# bundled lib :-(
+	rm simdjson/simdjson.{cpp,h} || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+	export BUILD_WITH_SYSTEM_LIB=1
+}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 7891f1355e4c..11b171135ca8 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,8 +1,4 @@
 AUX pytest-asyncio-0.15.1-310-test-warnings.patch 297 BLAKE2B c8144f2ac331d5bd0bd793a1f66b6dda89e2a8c5e027c92e73806d111d144c70fce4adb044a65f7f0ec8e540e673562f608111a21ddef691a7275fdde3bb0cf3 SHA512 aca66133f76031b7ac7e6daae427184cf6e480fc8b66324751eecfd968073d8e3302cdaa978293f9459d6233c6503483e699b98d0addc53b7c1c36dd31c2e7bb
-DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
-DIST pytest-asyncio-0.15.0.tar.gz 15555 BLAKE2B e9f0b732a1ff81c02cccbeddcebc593ceb982a640c5da2cf644ffc8e57548795cefdb7464bb1bb0d9a7d96a7476d30665dbea1c2b25341f8e71b16512c9402db SHA512 a936bd8f00cb470cee355b9abe6a6df5f65af5de9144bc0c128732f65fe4bc1e60b08a4e7287ae2f303e56e1764fd0bfe771102439e6d1ba7cb495d06b0677c0
 DIST pytest-asyncio-0.15.1.tar.gz 15653 BLAKE2B 8f10c46672a18d6992248482f9e3eb68ca9d3bae5163d5924e6363a15bc97dbfdc8b9dfc21a8a89ee4a6e21d76b083b1aa5a077fe581f0f2f0bd4c5a7b519cc9 SHA512 1813d49e0dd55f563d9bf058e009da61a17f61e081cc53626b5f1db623ba04905b6bea3ecba423dc931668053310176b634339d6526c7ea729d9aad87e4f044d
-EBUILD pytest-asyncio-0.14.0.ebuild 818 BLAKE2B b8ea175fe0d697c82c573a8e145d14e8ae2a3a794ee6c2fdf401eb8eebc3e28c5ad02596665486a1600dcd76473b370b9b1496f669152670aeb11b7b27b651be SHA512 037f5979820fe4c719b008f36971723f32cf404d1397ae97df1950b7e04e5cd0360c56e0c3a635ab5b78ee66d8f17390427320bf67edf19fe4721054164bf519
-EBUILD pytest-asyncio-0.15.0.ebuild 691 BLAKE2B be3e79199410efd0bf4adcf98d36d936a745efeb0d1c94e3739f716268b6452143b5093036ee57100a86bbffe8fb25e94512d648a0b94617c9ca1cca0d601c68 SHA512 93fa2d0a8fbeaf821eb5b7ef01883d1b2b3e5ed5e267ce6f08bdb999362c6f3ba610e066f18b4318baf5328f7ae3ef8e294360ccf56fa4c9815f599dfb433197
-EBUILD pytest-asyncio-0.15.1.ebuild 767 BLAKE2B 628bd66b96fe807c85953e255f843e95aeedb5ed7b7cc3a7455675c1371c32ed07e6a7dd761ec3d7341fb6ef4a5a60894ff0c3854a46831ec6172f5c6acf40e8 SHA512 68bc57fc981ed4d6fb23afaff1187d1297c654a169e5e4c73acd3df21778edca704f7892aabfb814724e0ccc2980dc694d4777c6410b3d9ac90c96239ef2d249
+EBUILD pytest-asyncio-0.15.1.ebuild 759 BLAKE2B 4032e1e8fa687f63e50c1f984827a9d2f3d1268d91dbd165c8a14cd0ebeb15f57cb273bf29e73967292a5725534949481436a2a3e28329488f8d1411c3c2bb43 SHA512 a9d9678d9729551c6aee5f0d5118b23dd19863e6dd5d9c1be98841712898abe407067b7611d095ac63262f1184cb4d89c557de8b41710adb75fd95849367a3bb
 MISC metadata.xml 384 BLAKE2B 72efae7dd0c314cd8f6e9e5b53fe94abab14fd591954474562ad4d6f5d485eaef9f324900cf79f3b857fb58e0b033ac496661e020ca9c88d2db0f1f8242d25af SHA512 ba2890b3bfba36b90098a578018c2fff627dd2537ac1c5dd90632c93df5a24a295050ef142caa5217d9a51da802aff686d9ea0318a1af7fcbc01e83b456848da
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
deleted file mode 100644
index 5449a5c5356a..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2020 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="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0"
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.15.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.15.0.ebuild
deleted file mode 100644
index bcbcda7b5f7e..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-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="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
index eef2f9adf10d..8467c5809abd 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 4057f7b52968..b04cd4f87bdc 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 439 BLAKE2B 38fea07a4eb50113ec02eab872b6d969c1be082cd21f572e7d8496caa7d829599c74f506b6feec53c63b0905fcc9cc1e32ce1fc8004267c53c655517b8d22148 SHA512 f37714faaa419bbee0745cda9e8b22b1ad12492291edc68eb94445cb544edc9e22a3c66fcebc28ffdb4b1f42f207becabcbba1b28a132481926434e121141603
+EBUILD pytest-env-0.6.2.ebuild 438 BLAKE2B 3c7319d3074ffbb125d2caf38be3a9d1ff06fdabd6eca56f6c2024b24158c88c2c7743c2c3c137bee4d014fcd5fa93f56e8421abd91a2f30c80d301aa2c2e3d2 SHA512 d8eca21aa980d3ee1d67355b6bef7bffdc2505400543fee146d2ed150781fb4710aef87e7d544f8954709f25052e063d28daa4b407d2d81a6f310fbb1424869f
 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 72f5a0e9e5eb..7289ddc4acde 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"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index b07df762d321..0b6aa36b5a8e 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4da03f0f5c4ea1e8601b16ed1a211c33150bcc0eaac5b47786040f571ceb266300bcb5142e2a8d977aeb69f89bd0ecefec4c3 SHA512 23146b1c0965e66ac201cae82192f3833daad2563f2177d916050df14b532a3eb78f2dd3b888cec3d28121b334ee86c9b762c5aadb8fb624c9a4288fbad693a5
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
 EBUILD pytest-faulthandler-1.6.0.ebuild 747 BLAKE2B 4b1c07cabfc292ba543dbfb3fd0ac154dcf82a15e4019a4c2ffbc951dad94ab82e9b742d7cfc6e53cc2d7e984ee926322de62080db9cef01ba995c3c51df5837 SHA512 83cb68adad83c92089f7d9b400de93c5f5d46f38435aa8ff63fe51c6476f159c3bf846ded527f7fecac30d149fc792fcef69e9d85c4851c668d4bd005e1f2203
-EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B 9e7e5f4c37aebb033b7a093fdee08a18e786dbd838182b93bd5d6ba848f307bf63bff147f644d1bd62c92b5c58686099b448b73e201e1c0388df961382b49f50 SHA512 46ab18e1c5102feca7ffe08243a18386acb6bc5cd73030109e0a90acb1fe0ffcf5a83e76577a309ea7de935fa264e00ee8f90ac2793a60dd53673e41b9428720
-MISC metadata.xml 340 BLAKE2B 67aad0631d9d00d8e0bd945dea4a882da0466855e89b656e55e0c937399b9d30a3d6e1a3cc798d678cd3d8bcf03eef34c8f7daa48c45ab9872ad521655d2a4ba SHA512 d49a96a88b8062191796b7fdb72db9bf3e325db21d1857937970334b5821ccff107335d5c9e3430d7983a7d95eba39b68e1c79cc59bcc1a9d15390286a399145
+EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B eed00faa56622564548d3178eb720da2320ef757b713cba5cc8a632a2e6b0ac478e3317f7deb7296e48f62208b0edd3a3938c4e61fd2dcaea9e932851dd02be8 SHA512 cce9affe6d7ca9f217ca2e07b014aa10602f3b7e81978f3eb737b620495f795ac2b44b0016be470c3f7bf050726ecd9e33d8df0159c67b028afc3c9183550bd5
+MISC metadata.xml 364 BLAKE2B c502a98983d875bf3690e12b804fadf2f3559eaeee61c00dcd4c812446c79fb23d6a61b6413427b5144acbb432915899b4691ad11406fe72d27f55ce3280009a SHA512 0e30d1f360967df40ecef021e683d7ea8a836b805a23922a973061b87195e64fea6fbc4e3c3b87730a48f1e5a14e9d41876d61931af502f546b8f23e37adcf0c
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index 34606dee157c..3c6448f01ae9 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">pytest-faulthandler</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
index 6c18a00e8b96..37aa6fc04bbe 100644
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index 497cceb7391c..64802c7c2fc7 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 623 BLAKE2B 112fba243dd8a958415b2287a6bdf7b40d2a6d2fdfa2ea8e0ad31c505ed821535d009ac10d2f950a7db2653bea40d4da96ece295c06eac4297f5f29902d84cfa SHA512 2a29ca38a2d514fa9a4348076c6263db581a992a316a249f566235632adf435ec2f9fd51942bde55929ee38e85b3aa7866e51eeb7a7a9db621b67ec0e820efab
+EBUILD pytest-freezegun-0.4.2.ebuild 629 BLAKE2B d52d515255d606edb4c80ba69085579d068a87da6d0637e9ee50a4e1951f3d4903d6b33094c6541d2b48f26009715c64fc7c0682ea231b2a8f056f8dbdc276a2 SHA512 f26afb2e67fcaaaa83692a38eda8fea6009f3ec90364b4a28927a5a1c5885625c218f29f5cf9656d109b7d2a9081b9b47d351e970f68b37b247cfdf6493cd3ac
 MISC metadata.xml 321 BLAKE2B 1a1663748ef01afd7d998aa072544238daf5b78eba0cb16cd1eaf30a0b55b1d232c898e5c85fccbfe15f7781c99579598bf0c2734ff4a4f5b74d1ad4aeb576ba SHA512 3b4f288d20ed2df822fa5ce5c164722def390c881c5eb9edd558d7d3683b1205c21ea784f70db440129f20e8e97ef5dcc0c8927f1a8deb54bbfb6cc578835228
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index ebd2b8b853b5..6b9608f47ff0 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 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 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 970fbad8a371..1beaff66cabc 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,3 +1,5 @@
+AUX pytest-localserver-0.5.0-py310-tests.patch 1608 BLAKE2B d11471960e35b43150f2783b728e2f763e8b3b54a4a8a3fcc56fd12b6c230d03ffaa9826ee20c83865754c95b75c35343e3038d32b2e792fbf9975bbb936c961 SHA512 149526734f33dbb7903cf8381f6eca7cea7a0a3c452759a16d7a0ee8d415bd767722acde88189865eab769ff4506d209155df1e02e130effc724c4306f8cf99f
+AUX pytest-localserver-0.5.0-setup.patch 170 BLAKE2B a82759d54b0ff9f7f457ca9e3665d68b05c92063ea4dd47bb4e5932999cb600aac9bda9367d33dc7911d0294932a30f52c618cd7f2f9b9db24b279efe64e79ab SHA512 75df9fe8dbcb38151478bb7039bb56a4fc00fea5f7867044ebab90260f7289930090f84727b1e449c95baa4fd275cd277fae5fcbad283e1f84ab72f6277d0926
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0.ebuild 691 BLAKE2B 36f50956f4a53638b821b6690cab5e8fcb3a6d7e7c2e45ff5c8eabf8b57a2177ccd16d683439d9a2feb6ffa1cbc9aef2b74eb220a69817b43759889782b931ae SHA512 66ae0c1801a772f0e3d481b35cbab202cf55e5dfdef58dfa1fb0698e2ad098d4ad49c90600ce2fb3db725b408d4320590141c42012e4aaf89a4a839d3af6cdd9
+EBUILD pytest-localserver-0.5.0.ebuild 814 BLAKE2B 4443f00387096757315f3c7d50698772c7b102d334339a63c123d59ea996c990282029734a152e9233dd4c4cfccc364577c3497da67ab321e53c5caddc8fe5b4 SHA512 6d63c912da6eda8f6c9adc4452670323dc9e99ae7a0239dad11f354c72ecfbfb7ceac7552132bc6f73c91212fde6fa58386e8b1bd92e5b082513f2a2ca9b20b7
 MISC metadata.xml 345 BLAKE2B 79e94a8ee25d0f7284462fc21638c20778f60d0f8cf2e84f6904bedc165293c5f13335b3bc2976cf6bd0170fdb0be80b52b256a3abfdb9eacbaa98661a9466b8 SHA512 5a2e28bdb0a20b1a04e1f549130a7f1bf3b33fdd176baa50db33e999540474abe091bcf8ad76c4554a0e046dec7466c72f0786acaa87c88e72f6164891c3decd
diff --git a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch
new file mode 100644
index 000000000000..c9a8fbf0f870
--- /dev/null
+++ b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-py310-tests.patch
@@ -0,0 +1,39 @@
+--- a/tests/test_https.py	2021-05-24 12:10:07.335676451 -0700
++++ b/tests/test_https.py	2021-05-24 12:10:23.966572498 -0700
+@@ -11,17 +11,20 @@
+ httpsserver = plugin.httpsserver
+ 
+ 
++@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
+ def test_httpsserver_funcarg(httpsserver):
+     assert isinstance(httpsserver, https.SecureContentServer)
+     assert httpsserver.is_alive()
+     assert httpsserver.server_address
+ 
+ 
++@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
+ def test_server_does_not_serve_file_at_startup(httpsserver):
+     assert httpsserver.code == 204
+     assert httpsserver.content == ''
+ 
+ 
++@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
+ def test_some_content_retrieval(httpsserver):
+     httpsserver.serve_content('TEST!')
+     resp = requests.get(httpsserver.url, verify=False)
+@@ -29,6 +32,7 @@
+     assert resp.status_code == 200
+ 
+ 
++@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
+ def test_GET_request(httpsserver):
+     httpsserver.serve_content('TEST!', headers={'Content-type': 'text/plain'})
+     resp = requests.get(httpsserver.url, headers={'User-Agent': 'Test method'}, verify=False)
+@@ -37,6 +41,7 @@
+     assert 'text/plain' in resp.headers['Content-type']
+ 
+ 
++@pytest.mark.skipif(sys.hexversion >= 0x30a0000, reason="Example certs too weak for py310")
+ def test_HEAD_request(httpsserver):
+     httpsserver.serve_content('TEST!', headers={'Content-type': 'text/plain'})
+     print(httpsserver.url)
diff --git a/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch
new file mode 100644
index 000000000000..1cad7643973a
--- /dev/null
+++ b/dev-python/pytest-localserver/files/pytest-localserver-0.5.0-setup.patch
@@ -0,0 +1,5 @@
+--- a/setup.cfg	2021-05-24 12:19:38.163108453 -0700
++++ b/setup.cfg	2021-05-24 12:19:58.714979990 -0700
+@@ -2 +2 @@
+-description-file = README
++description_file = README
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 21a6b9cdda9f..b995790ef5d4 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.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=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -24,4 +24,9 @@ BDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/pytest-localserver-0.5.0-setup.patch"
+	"${FILESDIR}/pytest-localserver-0.5.0-py310-tests.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index f8ab9a675985..8309f8f4c969 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
-EBUILD pytest-metadata-1.8.0.ebuild 615 BLAKE2B 2836b250293ee447cb8bd008e807de5df5ae713723e19ff53983450d6f9190ad406d1397847c2d34f7f201563f0e2966b0dd174b863348ea546c8e2d47ffdf7e SHA512 3526ce2217b13b484f5659f5961e455c98fe6e87a463e5f92471549e16fd3c30b6dbfaa8963339d6522c42f854d3a5a6a2f9e74c3f6f2d1398b22ad18be16ab2
+EBUILD pytest-metadata-1.8.0.ebuild 554 BLAKE2B a1c2bf62a9b6da202abe88fd0f0dac27ed310aa5d4f91c80f7a1cb35fffbdbd2e7759ee441e3084ca3ed03593af874c504c6b439bc60e280623ef9e48b8885d7 SHA512 cc6dd4f0ff2cb6ac2d0a8f951d89e21803ce0e6d6f5f936f459c741d273f96091eb2e1c1f2fb1743cc28398379374101eaf48a2d001c9c412e4573f2fce11cdc
 MISC metadata.xml 384 BLAKE2B 2fb7e2ded2eb44e76996997159b81fc25b160b41b298c9ae48216c971f2722ba3ac1227130df8124cbf391dc17a62daf228069ccd78c3405cb1e26ede1a6d9ad SHA512 3862d8f512cd6c2d02b816b2d1eb914ae028be0b04b6726429516fb97a55f46a37f40aa030285ccef061c17c4c651e4614b1ea5024f797f8648ed29c25aea357
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
index 827d83d29123..6adcd9c3bbed 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# 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=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,12 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 RDEPEND=">=dev-python/pytest-3.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
-python_test() {
-	py.test || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index d767bf50b505..b30a512c26f7 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,5 +3,5 @@ DIST pytest-mock-3.6.0.tar.gz 29795 BLAKE2B ac0a9ebf47ceacaa6f1e109571a15509780c
 DIST pytest-mock-3.6.1.tar.gz 29933 BLAKE2B 6c22d23f3a8e9b5ef26f990325f5a2c2897b60f61f84472716a1f984e72a8c38f6992e439ef581d7772e25a5fe9e76d190697d9c7bc8b5dcbf6375bead4b3dc3 SHA512 50a8ffbac1b20b1962558789b24d50c1e7d8d2e2706ee15a576eb5fd1b40d4523482dce7a1078d532b686ff8d38b6d769d356b04241528a0196e14acae0b6199
 EBUILD pytest-mock-3.5.1.ebuild 953 BLAKE2B af318c499a1dbbdc22f44d9349b63869558eb92d035dca81c9599bfca4d5a43365242f63e57e0b81a21496982fd125e44d09d0e0cc4d80ab4cae48b4022a6dc4 SHA512 197716c13d3b10d3ba5db4b432a5a522649adfdf2badbe93f916afd9bd14d3b31427a94a8f213aaf22f96da49e69668598553b46bc28fe01ddfdf22dabed01df
 EBUILD pytest-mock-3.6.0.ebuild 844 BLAKE2B d026a1babf2abd7445c5cf8a3251f9fe41ef41a139f31f3ab3b294847ac2051253fb863ef3438176231c76f6b80533ad3e095e36d1b418325b99f5fba0c206b9 SHA512 5074a2587a5c90763476d364c011e5226d688b9811209bb89019445013280ba6a98ec104b2cdb7de1d809a28be1956150f440a6d655795f0c82407f1131e01cf
-EBUILD pytest-mock-3.6.1.ebuild 844 BLAKE2B d026a1babf2abd7445c5cf8a3251f9fe41ef41a139f31f3ab3b294847ac2051253fb863ef3438176231c76f6b80533ad3e095e36d1b418325b99f5fba0c206b9 SHA512 5074a2587a5c90763476d364c011e5226d688b9811209bb89019445013280ba6a98ec104b2cdb7de1d809a28be1956150f440a6d655795f0c82407f1131e01cf
+EBUILD pytest-mock-3.6.1.ebuild 850 BLAKE2B 55b01509db49382aa9fc6845171a18cc711535d41f0434f388a38f5d6bf6e3bb8154220573524072221999e217ee81c565c7afa382f981ac66ec7ca3b9ab12d6 SHA512 278909c77d66617bcc1e32797a80abb386b100cf5e89b85423ae4599e4de6f7501d6f1452c91ca629126a8f73ec928e601d2920f85df7e015abce9248c46c7cf
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
index 074f1d7ea000..c5b380101e58 100644
--- a/dev-python/pytest-mock/pytest-mock-3.6.1.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.6.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 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 66e73b90b741..e4421b0c17ee 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -2,4 +2,4 @@ AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 EBUILD pytest-qt-3.3.0.ebuild 1186 BLAKE2B 170bbde7f87dd7e77d6a07120176087550577fab22b81749db2003b889ea33edfd0947493f2c3e092b955973dea63e3ed7ad43da47ab5a97da8175536ae50d2b SHA512 f2c01fb7fd902e11f20937d0abc947f44d2da84087cd7db5ade934e0bd20168e4d94512d3156c85d9bccf2bd8df8e64d713bcf1f0128c427d238364aca8a344a
-MISC metadata.xml 390 BLAKE2B 57230af7617bc5ef26494e3a522ab4049c8154201f94f13d50a7331eaec5da3d5c59a3be3cf5e72efe2249dbd6b2adc99d15ed3e06b8c103ea1b1036cc26ce5b SHA512 f56e8f638d41c9b86bc7d8619f9a3601825b034f26cd2e603014820eadd863b7d93c07e4c04f5993569bc205a6b57cfab4b744f85c331d1dca26fb4006b83722
+MISC metadata.xml 414 BLAKE2B 841b7a751e41917fe4f3c672a196d41ce020832ce8794c2b5bc52f24061a3742a605550e7429791e940f4d44fbb035e026a1d665bca323a7c84e5b9c2d1615f7 SHA512 50fe7cca60f607561b5f5b9436d75365ffba1704745c761f6043db274f07e1a0065e6a7c107f3d4fcaf7b51837a872525a0f509bd9f55b96852ad9c2da41072f
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
index 1ce572b568b9..75d1b540cf9d 100644
--- a/dev-python/pytest-qt/metadata.xml
+++ b/dev-python/pytest-qt/metadata.xml
@@ -9,4 +9,5 @@
 		<remote-id type="pypi">pytest-qt</remote-id>
 		<remote-id type="github">pytest-dev/pytest-qt</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 4e181bb53d45..f09d9ba94cbc 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,3 +1,5 @@
+DIST pytest-rerunfailures-10.0.tar.gz 12706 BLAKE2B fb445acd6324a377258ebcd32255bd725dc78f2209990e5807a0553da259ffc101969b7572799efa5041ae68bcc264ab80581cf9d9943ab81d9b158a15dd71d5 SHA512 83270e18cc3f825c0e0184950a149899b99a2b46cfaa6ca1c82b7cf388144265831fc2b8b82ccebb5df57463219cb7e0b41f5beb049feedcba90ae6d48d1e05f
 DIST pytest-rerunfailures-9.1.1.tar.gz 12435 BLAKE2B b2118fe9460ebb750c72b05762d70cf53703e4c9982c6343ef02ebcec6630598ac98998ff994268b9108bd6850e71fd5b9cde1d0abb727d33fad238e9b26fa61 SHA512 875591306ab010494ccbb865ea6445ab37422fce9105260d9495215af44057210564aca4fed3b4765b5a30c1cbef120de716d15d10a6db91dcb7d9f5b4f3b102
-EBUILD pytest-rerunfailures-9.1.1.ebuild 567 BLAKE2B 32404989eb7e15fecee830207b5229bc63fa083d936267a512df2a6695682dbfc7027806de83443fac47ba672a144d14c932a6c34fb0ff50b48c66164ebb6861 SHA512 cdcd30629e3813029913e72567c36491cd563d4d69a133fb383a22d3d4ceed1ff03feb3e1e93d355817e1d3ef4f318a9ab34be952b8b4507f4e74f942e51670a
-MISC metadata.xml 358 BLAKE2B b10d8e41dbb79dd8003448bc1806f5af43d9b918513e2790275110bf8850e63d0d0520a676812a63779febb7bfc889a59760a835a97dc1159c080feb085fbd81 SHA512 3197ee191bf6cf247d34979d47da6a93e23383fdc77b0e51ab965c6ece1f10a1dfddb9fef7eeaa7191a591908ce0217f4b17b4535891076736d4438b2e0ffe94
+EBUILD pytest-rerunfailures-10.0.ebuild 600 BLAKE2B 546087e808686702010fefdbc3f90786ef4486f5e3fa4dd7276171e223ed78af3893145d74e85cd5c54dac0b35d72ee61ba3fac6f35d3fdc0261138f187f923e SHA512 7fbc09b8a36a110992303cc7a44a9270df613dc30df5aa223ebaadc0b80949bc168ab8b78386aa7dda332fa573502c8f73a40bf9b0204c5065de715bcf6ec746
+EBUILD pytest-rerunfailures-9.1.1.ebuild 598 BLAKE2B a1096ed122bb81fbe9d789d0fd8346d0935fe595bedd7d0efb354be425bd252cff3061399b2dc6d3f9d98f2a9170d09aacbc01ed1533e6483222bcfa2457098f SHA512 861186112fe5ea6d6c9b6fae638db8f78872ea71dc25b06306a23beae86a971327b225fa558d270665cde074eb345c33c69aa68f8b6dece6ab0f1fe204e50ddb
+MISC metadata.xml 431 BLAKE2B 5a8702f2474240f37ccaec26f689300650c53798e6a5fe0e5fbc910316db3b5796c285419c8531200823ec33c12b2e474825c28990b39234b7d4c915f1504add SHA512 8609709f8477b3df1417ce765896dc27f8da65f8ce8d1d7d10020ed3acde36b00c9e7634e9e9efeb6d0d00ba4e49b774fb4c90670804ed938a6d94562d08a998
diff --git a/dev-python/pytest-rerunfailures/metadata.xml b/dev-python/pytest-rerunfailures/metadata.xml
index ddaefd86cfaf..ea758706fe2e 100644
--- a/dev-python/pytest-rerunfailures/metadata.xml
+++ b/dev-python/pytest-rerunfailures/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytest-rerunfailures</remote-id>
+    <remote-id type="github">pytest-dev/pytest-rerunfailures</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild
new file mode 100644
index 000000000000..ab9103a1e97b
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild
@@ -0,0 +1,22 @@
+# 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=rdepend
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+BDEPEND="
+	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+	test? ( !!dev-python/flaky )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
index 715756106ba1..f0adeca6bb51 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.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=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+	test? ( !!dev-python/flaky )
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 55982c677673..2ba801e9a000 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1281 BLAKE2B 560ef73907a797812e84d15dbf501a46ff08c24f854dc50480e2afaa92f58743b7d929ff1a718c13cb4a90421b15dd70544676de0dcac6f11234def35c351cf9 SHA512 124292e1f7352180491ced69b8090d43731d3e30ac3918867f95df811a5f8e4bfe45a443120a4e6f9fe8c864a69de8145e9c42b44852655b465c57a4eb29c49f
+EBUILD pytest-shutil-1.7.0-r1.ebuild 1179 BLAKE2B 4da7c3e77cc02a21419d7051c9707730831fb4a0bb35b86a56bf1232b17671a4b6fc30279340d9c2fb678c211361407f60029b244357d14efc677967921a816c SHA512 64c6ba86ffd5588f50aa4afa8aa41c05804c30797f75a5a2f0bc44a38a43a435c32209a4c40089c47c732ab075c71032b8a3db15421a037a13e7ef812e0f3151
 MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index 7a36fd6f0175..cee304ff4f5f 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,8 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
@@ -36,15 +34,11 @@ BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests --install setup.py
+
 python_prepare_all() {
 	# keeps trying to install this in tests
 	sed -i 's:path.py::' setup.py || die
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 934cf228628d..403a131c6866 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-subtests-0.4.0.tar.gz 9673 BLAKE2B 780fbbdc6d4ac88c87002ee14323a0dd1036ab3dadc14b79ef11982459c60635add77e97575521ba0bda61317582e090353b427d945eca7198e294eb3d895240 SHA512 00302f47d1699e053314b6b4eee7c84a04fe0f51f287e338374bbd518c7d245d839ea0f1ccf50d4f35c86138cf6ea36da26e67bf41295205fb38323f2ad89f89
-EBUILD pytest-subtests-0.4.0.ebuild 914 BLAKE2B 06a6912acb7f2e6a993211a2280c555edbe5405eaf5f28f7539366b9400702772b0f5c111c17c2b29b1be50209dd915819aa144d5c3bc212f08b199fd1d26504 SHA512 8f80ff5199e31fdbe154b5915f48d1499390eb9b2e76baa6edb47181cd364ca1006fc75d3d28c989100de587487ece5ee6114f268b2203791e5ab50cfe1cae75
+DIST pytest-subtests-0.5.0.tar.gz 9793 BLAKE2B c671eb14189c0fd34180a636592b20c9e2b4225c5faf3b702103164e60bdbac4c9644e464f1e0c783da3da1263f7b841ea7a4149bcbf1de23325a8ef3ce5c030 SHA512 e3d7e90c3ab66950eb80d25049bc6f6f75b08b3da5ce0de5f3fc55d6a176a8d1fdcb19a19f7d9d137aeadcc82b214550474f76d5611bc5592ca649ddd8257a2a
+EBUILD pytest-subtests-0.4.0.ebuild 920 BLAKE2B 758191563212f5086dca9396df801ee6889ee69414c3a8cd1543a954d80b7e5cc36c4799f215caafccc2d7f2fb8735b6801f207d1e8a3b19787f3ac4337dbc5f SHA512 120b66684fb9219f4eac5e6c373ab7ae7d29bde2b393450909473dc9282c336c89315a04439447ba7ae70ae44a77f33fff9c262e3691115cbfcba946a79be347
+EBUILD pytest-subtests-0.5.0.ebuild 928 BLAKE2B dbdc1d767d5f3976961ab7b5535fb5ab0f8fa0c7bbac87755f2506154214e77ac4754f5648bd5d8d7c118cf5eb713098cb1451bc86e429548fdacd54b331961c SHA512 c09f96acaf1f0c9a5cccdd3fecbfaf4d4a70172f1bdabc9d7b3397848ab0ea2ad916cb71d5730b70de8677217ef6aa7fd38694194501d5c4129272c4b79032d0
 MISC metadata.xml 408 BLAKE2B 6aa0bbf41b922dcd85d121ac03cb177f2527c8bf89eebb53bbcf86bb3e551e2023c38a1356f1cb5c55010bf65c97f95ca77d9aa26db8e898ed1bb74133825a6e SHA512 5485b50b9c2f5f23209931bdb2afdea6bf77bd55d2853aea2418691fcd9fd93c47bf4ba3c5769cdfa5240e463b7926a8fe5f0a0795464fa02d46fc61e8dd59a3
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
index 3151351f9e42..96ccd96fda1b 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
new file mode 100644
index 000000000000..0182bfadbb1c
--- /dev/null
+++ b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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="unittest subTest() support and subtests fixture"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-subtests/
+	https://pypi.org/project/pytest-subtests/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions
+	' python3_7 pypy3)
+"
+# pytest-xdist is used to test compatibility
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 12c4f0bf691e..922e756d2294 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
-EBUILD pytest-timeout-1.4.2-r1.ebuild 833 BLAKE2B 82bacda2efa91936f0a3fba5e25411956fbe559c7b1e3a8c145f58f53126a3d27d07939d86e791b33e3df487cbf737603e11222239d7a608b4056b70e31177fa SHA512 b4360d501bf1dad80a10199e6f4e401ff9921a38b60332c50fb6cd3029bf23f74ad41323b599bf44a369e456cb0b57e771f6ac54bd6e65abbd1e7d5019fe3d38
+EBUILD pytest-timeout-1.4.2-r1.ebuild 839 BLAKE2B 18d3d26573eeb3913920f22762f04dee350351a320c594b99dc5d2c6206f53c29d76be9bb1b69f4df52e139f74c1621735d67729a1f636fe60312d98e57005db SHA512 46b6f980c1c503786f63ab89c7a9c1cb5094c29be93df68371e5c86c99f5ab404bc3ac3062df9d6b8d9c7a196645b61076d42ec4c1872bff19a3f66302b63fc0
 MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
index ab58b250128b..e329ee7f084e 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index fb07c8ef30dd..b3d3bb694b23 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
-EBUILD pytest-xprocess-0.17.1.ebuild 628 BLAKE2B ca5d31e3436d514a61628a6019d1e2bd363a8d49e722612fbafa7aade6bb3d375675598fff324390120933868e1c862ba9373d04eedf45a234bbb070f57551d5 SHA512 557cde9c2ed0be310f30cc3d67d5725fa5347ad58e2a62e444506c1674515ba2afbdb8dca4020e45939566a2ba4e57279117e203695715b72c5c503dabe6d570
+EBUILD pytest-xprocess-0.17.1.ebuild 634 BLAKE2B 34b0df6d67136b0852e8205592aae284fbc9aab3ca78d19fee451463c9edf7c515d9b9747db1a8e1f80026dcac21d8edb0b65c3c4703ec0f7cafefaa8a13f1f8 SHA512 12b7d0ed336f6bc98878cfec2fbf685058036c0f6bd9a015abdd17f4ebf19aa9b78c418775b8197cedad7d0da62cbc9a2c209860f6914c77d98e07bfd6a6c6db
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
index 88aa40f141e0..3a9515f0a7f9 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 6d707c660847..38f2d301a031 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.4.0.tar.gz 86010 BLAKE2B 958d85f852e88a27fd22ec2511ba1367a69141f294d96f55d45fb5da176c539aef09a6c65d31be87581d0176571c7bd1ca84d580e920e460c3ca810d8efa45be SHA512 a98552bb1c5075c73ebb0a2a3a0fb241e061ed476d5342c8e8e23b3da86fa769a7d5d8027cfa243542d8b62efb89a9b1daf1c4768173295cd466714e4c53029d
-EBUILD python-evdev-1.4.0.ebuild 759 BLAKE2B 31ceb49f75f235930bf1e95db3fa25c6f70e7fea944f7cd299d4e622aa9c376f75bca0fc61eb2c5d06c0169edf70e315926f99344df422144d664a58b1c53059 SHA512 f1c54f7d600cf5957b0806f45a5dc52ca0cab693c1d52fc158ad2d5c0d7238f6f33c303fe469354d5dd6ca2da969350aeebdb745aa5c16e6776fea5d59c66fcb
+EBUILD python-evdev-1.4.0.ebuild 758 BLAKE2B 0360e57adb922efd858e795a6d67397ca48d2ee265b733159ab1dd999f0f25e9231542a4015effc74c8683abb4f5a828d22e14e02bfb8c1db902e780d60a528f SHA512 4edf3a0f4900876c86d05cc6e5f158c8f4ab4aa3734f89484670c6a9fe5f81ce09282f3e73f71034d138153b746bcfd6827a538bafde06de576a84ac48b0dfb6
 MISC metadata.xml 457 BLAKE2B 0655c72b7383d76dd0733f978fd91248a7f5a6e740354d80d96db64db44adb62de5c9123f81c08c7c10441418d8e8086586d8e73682f0185cb4dda505304d096 SHA512 5c5a5f99ea76aa2620ee61eb277d6edae6bde115a50284e7cd4bd805d327623abe368a9bbb5413bc7c074a77198a8a58095c7a9e6806d0e34fb760e9eebd88a9
diff --git a/dev-python/python-evdev/python-evdev-1.4.0.ebuild b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
index 4203b1499531..9dea3a603023 100644
--- a/dev-python/python-evdev/python-evdev-1.4.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ distutils_enable_tests pytest
 python_compile() {
 	distutils-r1_python_compile build_ecodes \
 		--evdev-headers \
-		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+		"${SYSROOT}/usr/include/linux/input.h:${SYSROOT}/usr/include/linux/input-event-codes.h"
 }
 
 python_test() {
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 21aff2fd39a7..c27e25af6390 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,3 +1,3 @@
 DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-EBUILD python-gammu-2.11.ebuild 778 BLAKE2B 1e531188ee643b6e96bbd45c998072fb73a011b7636956073413692c885f3c9137961b4f653725d1be5ee6485c419b98a612653f08b7de5f71513389526059e6 SHA512 e90f2eced3311017f66614339aeb337de26c4da927e524746cb7ca4fc8abf32018dd4d0cd8e6814ca0d543a753585e6be4c0ba70f04fcd17043a55977f9a38cc
+EBUILD python-gammu-2.11.ebuild 790 BLAKE2B 033f3a46bd211f278be1422cf5721dc50904707e7cdefb7053d29c19cea95ea4b8d1e20bc49cd056b482d38fcffb442bf9b51659d2697c181d09744902869cc5 SHA512 f3285cf9a82efdfd964df9920ee29171bbf1adfd0cab72438365718ce7486e48bd1160160046d2021e19436c3e829882371e016c98b826b3126aa3fccf1dfaae
 MISC metadata.xml 298 BLAKE2B 4943c4978a37d9a4df5d7629dfc523c9c112c4138e0c4580688e7021f764772aa4f4f9478e2c7872481ca0c13c6159511c79ba32d34f2d9df4ba087a7de22326 SHA512 421fd8797b7e76ce73a181e3403f39275594bfec21e9a260ec8740d80e3fa71161a78d6ad23d3b6f6998351348f4901f3b01632a7f086158420484f21c8aa8aa
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
index d8bdd85c30c7..74f61aa9ae4f 100644
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ b/dev-python/python-gammu/python-gammu-2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -17,7 +17,8 @@ IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-mobilephone/gammu-1.34.0"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	test? (
 		$(python_gen_impl_dep sqlite)
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index f089ff310755..6a9b9189d417 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r1.ebuild 822 BLAKE2B 5e039b367693a82bf5fe191dbb35adbf125a58637934d84507e91563c0601fdfc9bd060562b270cea1cd85a73298702d99c9951f4420ae0da4bc47823ec8ca6c SHA512 2ee39eabc9b12ab0725e486bfcf33e142d773767ad0ddab0e97d4bee51aa932dca82fee4ac7237a23c958fe39d40f09ca956c2015cfc54141a901161f12facb2
+EBUILD python-gflags-3.1.2-r1.ebuild 823 BLAKE2B 192e57534bcb46ba58bcae9beb33a528d5ab9c370cea5559aec2a86522977b671b12952db76bb6f23e1a3044daa1a812f2676c1264971df9809cd0de9510ae4b SHA512 e5339dcf70e7a9ae896babb6a7bd8f485ea79db4ed93634be5eb1b1921015022dfcc40d34db36c377e773427eb6d7e5d6b6c0d1600a42c72e05215274dab85fd
 MISC metadata.xml 400 BLAKE2B d46a510552c2563f3c27284b162ea1a99134a907342d35c19c18e972c2914d1719721821d675f5149cf31c619cdd106a3038ae6517755ee9eb695c1bdbe4654c SHA512 39a2a0400bc6d6e5444f9a90e3aac170c54964f0b031fe20926a262cb7ec85c31fadff6c0c4da1200cc6f257b24a2950e06302bccd22e61de44184ce6a10b8b7
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 90fe031744e0..6d6ad7be7ff4 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Google's Python argument parsing library"
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 0c5ba79f1005..268b549ca0a3 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,3 @@
 DIST python-gnupg-0.4.7.tar.gz 53091 BLAKE2B ebbd67b7255fa6e7739da785476efc441733c3cfa740fcb11c595c560b5a90ee43a1040a654485c30ae35f5e8d06fee235a4ae8d069f20f0eb1fb6e45b4ed441 SHA512 e590778affd3f864bac2221e1ce7c4a37ba257e7112e023d70617f3f3c7597dbeb2974db0ed611b2fc75a071678ae8856be4a3b3f48428a12b42c2f1125fdce5
-EBUILD python-gnupg-0.4.7.ebuild 694 BLAKE2B 38dbd2c208e4fa9283496d334610771f5153e030d14cf7b5c5f8d89c6337dad1689e1869e3ab9a04cf30ef9a361cc7c219b3c6575be7dcdb030d03c6ae6471d7 SHA512 5ec2bab86a4eeec9446b8ac7435cd08a0d04bb2ff6d6585b65c4e57c3edb2f5c51fd27acf3d72aa35ffd683f7ff654aa3f7edac145a7c61f4ce3279b0de03446
+EBUILD python-gnupg-0.4.7.ebuild 660 BLAKE2B 079a0f01ddebe65f50b690c8f574d1c1f315f8c3e50f8014fb73f044456b57aa7082ba8eedb9c5e66e7082469558438d2416bc4d2d5220f4f2631923818687b3 SHA512 1f519ceec3ddc1d1237761ab8e3d20e1e3e41cb5ab2acf6d9a3e41600d33d72dd20e2b2d75978b3a06b6a0d3e3d29eeec5e0b633ecb3f3e717d26d7cd0c77c9d
 MISC metadata.xml 719 BLAKE2B bbab1386e54f1fdc7b8ca36064f020f5e2e908b367503af9d41612b63b3d97fd615a5c79fd49fafde4f60d372d2545953d8fcac28c8ecf5832212a24c102cd8a SHA512 153a00e09ea9fdf656a0e332ffa41cf52ee1fc018055c8d01129400b0141a34a511db15ab2fdcb21166bab06702342dfaab1e271d35aaee142146681e3ca8e14
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
index 1cd17bfc5706..c8b201758699 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -21,9 +21,10 @@ SLOT="0"
 RDEPEND="app-crypt/gnupg"
 DEPEND="${RDEPEND}"
 
+distutils_enable_tests unittest
+
 python_test() {
 	# NO_EXTERNAL_TESTS must be enabled,
 	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 "${EPYTHON}" -m unittest discover -v ||
-		die "Tests failed with ${EPYTHON}"
+	NO_EXTERNAL_TESTS=1 eunittest
 }
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 0edfbac9f0db..a1ec665c2a9f 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,3 +1,3 @@
 DIST python-jose-3.2.0.tar.gz 102183 BLAKE2B edc0b0e651ec63333345eb29e0c08649823d8c59e88e2f39127081a04c2afedee0ae1c83709dc45bd81f4143cc0e1e76d22117ea11160ab6418372c69f1b216a SHA512 f81e0284ef2df05a5b2dfc5448f3cce0c8988c4ba5d40f935666ee1693a964db3db62609a38192e317bab6b3945fc5c3122b59f373dbc308363d123ea9752efa
-EBUILD python-jose-3.2.0-r1.ebuild 1107 BLAKE2B 369b0f5d3c1ec61cccbbb4def7d5856bacc3c7248757c37a49de27c123afec8c6d790e8f82c9a7b562109807bb83bbacc55476da6df05f48a833e15a31abb06b SHA512 9d51f8b0c2e6c362f2e4458d63e4af6e7bc4d3ea902a7c7eae58c2d4b521b30802d5fca9ceb1b57234f9227f59e9323b8067d842abf5742e485fa524baa1cd46
+EBUILD python-jose-3.2.0-r1.ebuild 1252 BLAKE2B d2a90b8cb648ee500eb53e177793101d5b6bb3ff3b899327fed9cc34ff27e4f7028bbb0d3a23d14373279aae07642fff089e3a2dcfa593492ca7a30fff2236f6 SHA512 fb8e25206927f2df6513e022fd2633cee0eaf709d55410eac69555a906161d5a41df96e7d8f4072d880631b5fedf22ea76b6dc8211cb59271d4ab93932792dd4
 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
index 84bbcfea7cd6..a896c8929b37 100644
--- a/dev-python/python-jose/python-jose-3.2.0-r1.ebuild
+++ b/dev-python/python-jose/python-jose-3.2.0-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=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
@@ -25,13 +25,20 @@ RDEPEND="
 "
 
 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:test_key_too_short:_&:' \
-		-i tests/algorithms/test_EC.py || 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-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 46d2002f765b..6a9a8a4c6de2 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,4 +1,4 @@
 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 e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
-MISC metadata.xml 342 BLAKE2B 6a7a999e84da208939b06cd7b589ff536a2d8c63f5646dcc1d8d9bc474ca88a538d3184a840e47382706a7de23414da6b1913fe4854d39f10020fee6a740c8d4 SHA512 8871573f805ecac9b6a414446e375fd63bea99461b51a7855a24bf70917c880e22185c77a65abb27749a79967cfdd8435f49824cdf294f0bb95b7963d68401a5
+MISC metadata.xml 366 BLAKE2B e8d4fa851e8430fc170e86701301b78af07fe2619a749aa5ddb21bca3faba59407bfce4e727b2dde95c52b9951725b2367c560eb3479de48ab5052f6c30ec222 SHA512 1b6b62d650e143cc4c0de9047b541489f9db4da3fd654e27bf8d8622e428a8a3e587ecc8bbaea8248e964b2d25c28d6ceb77be57f06704bf90a2f6baa18c4f4e
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index 9282bf9d7ace..cc81d1f0619e 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">python-jsonrpc-server</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index fd41d1ba4c7d..9c9afb9eb338 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
-EBUILD python-libevdev-0.9.ebuild 627 BLAKE2B 218014d83a2b80b11b85d1089b0a7032ec57489227b2abdafc9ba9d2a60d54a7e2ee266b3840f27b1d01c62c38830b20b6749dcbdfe1aadebcb011ad55ecb746 SHA512 6c9b7dc500c4e3d56abe40facb86f58a8433407dfa11e7654a591d84ef2d427bad70aec7605b8c23c975e99bb005ba8654190791c974d9023d1e2eb5f2494003
+EBUILD python-libevdev-0.9.ebuild 626 BLAKE2B e224a55076a7ca36ead5c19774aac3981d995a9526abea0ad31a325bc9a2717e753219444e5d3d8beab39f5116897235db5bfa32f2e40ce162f2136763786793 SHA512 62677ada4ca75c3f306d8dcc7fcf16d95854e3cebf05017a09100af8a9f0e3ce3270d3d42aabf44a307e4922ff6779b277fd9e8531813ead59c0c5799732c3cd
 MISC metadata.xml 305 BLAKE2B dfcc352aa29bf0497e41b9ce993e525211a1d673fd3c7ce75712ba1441faae1841a57885fffa358674dd03cb67b0e2c423a90b047c3517524a76f97ca1e9ab0f SHA512 e4f77ae903c4df549c7f730b37110adcab750d694a9d66d4d1c8c02fe327da783836e65edfc91fb131901154cd69c19fa250c9a000103ab631897e358fab0ba5
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index 2a2c585a28c3..a01db655c3fb 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 0278203aad4a..90a2d6256f28 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,3 @@
 DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
-EBUILD python-ly-0.9.6.ebuild 517 BLAKE2B a9e052a0bf948b77a09ae638b1217342347c726b91000df3d8a7f37bbc7941eea89e103f165e7a3a1988af39f780829dd9cc07af417bb7e7c51f37e0efe98b7f SHA512 db5b6956fe3977d9ba03fa2c7a7a1613edb11b26f2610c767fa6ddd19a0e605339eece46ed4bf3346b932e71c7ec658c9b76f07cca5d0dc57d56d2dfff22afe4
+EBUILD python-ly-0.9.6.ebuild 518 BLAKE2B 6c4c598502562cd75c928eac43e72f2a68ea4c2aa13d4c8a9b42f11bff97c862c77b2fb8723ef6ae919f557b000a35a5c627c92246f7a2d19c88368bc0f47621 SHA512 08291203751905df39ee8af9c693fa4a6858f86a6ee4e426add957f7d9adc2fa7d94ba6c5bc17f896b2923e9ab38e02ce6c22c92abd1c10afebfd320ebbd0a13
 MISC metadata.xml 307 BLAKE2B 7eb583fd7175f9ad3e3cb506485023ba395574be7d5f0e969327ffa4f1903bd9bbd3d42db7e0d10b56567576cc32796e1c353028d18983b2d4ff133ea473818c SHA512 9e79afe747571652dda724ff77bcc2aadd724ee1f31283a64cd3275cd1b42f9c31fc811749b209d8b3ceff778f01b12eb6c427ac9b986e880df6013a3f0ec0e1
diff --git a/dev-python/python-ly/python-ly-0.9.6.ebuild b/dev-python/python-ly/python-ly-0.9.6.ebuild
index 124986416384..aa983b7eb9dd 100644
--- a/dev-python/python-ly/python-ly-0.9.6.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.6.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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for manipulating LilyPond files"
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index dc7e5bcbcb8a..9e7caa405fd1 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1,3 +1,3 @@
 DIST python-mpv-0.5.2.tar.gz 207755 BLAKE2B 3222a54db145a66ae8b992f1c4e8243c50099573586fd8be9a2d88ff360898bf9b72905c22c8d056178b7917f093a494dce9138f3f8bb5782152dc38b71b1dad SHA512 cd542b0866d6c75395f1ca00bb6df3981998dd801dcee97b15e080fe66e94270f15daa674f663aa6974dcf6aa425d6e17f8476031badeec035727b2b690816f3
 EBUILD python-mpv-0.5.2.ebuild 609 BLAKE2B 5f1a3ddcf5d4cf7029fbff2545801986e8fd44afbfc32cc743932cada21846a5392a7db3c53f0f82dc85e349c85c6948079ac74f742612a828aa68ae6caf9b03 SHA512 432fd8ff99c56b5f0f00538446e6ea50d2e82777d6efe8d095b7c95b6238b50cc639ff92cccd3c2c1e7b6cd5f17b7af513a17b905dd1af2cdb7782c810c45155
-MISC metadata.xml 277 BLAKE2B bf24e94f642972ff1dedac351b973b5f767111a2dafa2d92c1e0886f00b8fb5689251d09b990d80217d82318fcf33452984df71d3951a20e2c690b4050061103 SHA512 92647e12357f72bb72680d35af3b29ea544d84a0079704a0b47b5b8dfbf04cdccf64582a6e4a70887e94a3256c84cc399dda966058ce113dee10bd2c5ad300ff
+MISC metadata.xml 412 BLAKE2B 51b935354b431b848e82d9dbe5a55f55f43cdf5f72e2253e8669e2a71d0c438c27fa09eabb45d46c4430debb7890d2dce05e35d62c06d63b3f9dac126dc58747 SHA512 5625a32b64ac2f439ccad0598d1139100f25350811cb190c95535d4737338c42041640b583490be72f1bdc92dbbb460363bacd1b6eef05d78748ae5606340f04
diff --git a/dev-python/python-mpv/metadata.xml b/dev-python/python-mpv/metadata.xml
index 651e2156c25b..252093682ba5 100644
--- a/dev-python/python-mpv/metadata.xml
+++ b/dev-python/python-mpv/metadata.xml
@@ -2,8 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@gentoo.org</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-mpv</remote-id>
+		<remote-id type="github">jaseg/python-mpv</remote-id>
+	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index f08365c52942..c2f330970a1e 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,3 +1,3 @@
 DIST python-musicbrainzngs0.7.1.tar.gz 112302 BLAKE2B 1c0696c72b8ea78d182300c76c0040117e1448a7955fa9aed8e42d1ebf9aa1b43359cee1158920fa31d3fb7536796130b54d0d45f351ddb5449d8f022a55f552 SHA512 a674c38b5084d1ae554dd03d1b3e613b48f8f3f3ada67f8d608130cebd35f0640ca65f8b4d224c1e660975274b0b077ffae29739ac2dc5a7078ca87eb8ccadd9
-EBUILD python-musicbrainz-ngs-0.7.1.ebuild 913 BLAKE2B 0fe98b5476bd9a16e97d53157221d065772273017f36627cdb564f7352a6f23e61bd820c7cef7bd869a14d2d8a6025eade07d0fa72ad009156ab6adffd12fe57 SHA512 233b95f8c8d71d64edf2fb1fea56d722e3d1fe285943606c53ed6cc6fc8d75f49ebc229569cbd3d82243694f1b83ebf7ef992991c6ee435b19a632d1066c86e4
+EBUILD python-musicbrainz-ngs-0.7.1.ebuild 914 BLAKE2B e55a4e590abb7f21941728295dcecaf1ee1e9b11d511dd189ae1abde745ae8b0811880aad91d170a76f015365c1b270bc993dd2d9f4de88e24992b5ecd46cb27 SHA512 75903b6c9bec1734f836627fc0fd6e5364187e83573bc325d97fcafdc501e474889c1d2012f1e90f9d2dc48714f1de86e6fe763fbeef341c4c5530f84e05b0ff
 MISC metadata.xml 955 BLAKE2B 68571b0c8d1a72425ce23f600363146ab2e365d561236c618b46333d1bf3a75035e05c131b3c45fc1ec1f6e4171c78446588533d54221ed7cdf4b43453d71053 SHA512 b2f68817a2720a15364672ba29629fd9f0b1efe49e46167f60b1a5a7f3223bd2cda6d01bf31732c01d3cb1703523a6e0245be051278a92a221d796fa3b7d83e5
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
index f14b0b9971b5..e1cdd629ab18 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-redmine/Manifest b/dev-python/python-redmine/Manifest
index f00fda676e38..281b69e538fa 100644
--- a/dev-python/python-redmine/Manifest
+++ b/dev-python/python-redmine/Manifest
@@ -1,3 +1,3 @@
 DIST python-redmine-2.3.0.tar.gz 67915 BLAKE2B ad31d63ec5bebd33ff436f04c40fd49e35a79751c353ba1e343bbb03048c2d1662ec8ffea5819561b675e366f8cbad48a0e0a0a59dcaa563a90301ad4f1eb1cf SHA512 a317743a561cde65c17356a317d3aed082149d648aaa7487858c8533ceb286d08b6610d742321f6593fef8b61b1a4526963ddffc4ab180a83795d66773154b70
-EBUILD python-redmine-2.3.0.ebuild 473 BLAKE2B fc95561962b4289512ee98c17a01ab554db5c58e1d3ad9e8155e33662a7901d15e880c2abff35a0fbb6e8a0b15fc24af6c1119b7593a7f2c68eb896877df3fab SHA512 6e2babc8d8c3cc04c7b4d020a71650fc63691e349da691f374808bf8632c861bf4a5bea3897b688d14076e1873cec88b9ea0f5717fa136156d7f836d6acc9758
-MISC metadata.xml 400 BLAKE2B 7869d1348e69b8d5b68ec4b111d2be6951ba78aaf10f086f74272ee9fa537713b3df06a5f5e765e1ad31e438fb069bd0c62542581cfccebce962aa2e665bc36e SHA512 54433c81daf2cb7b21cd7ed2796742251fe65db4d0fb827dc8c1c160a480a0df026d985a99edb324cf8cbfc2f8720cebd7d5b16b94e443845c4a19d0e49752bf
+EBUILD python-redmine-2.3.0.ebuild 473 BLAKE2B 3707b8417c9b89e27a00f3d5b6e5288c50bc5cbe701a5cd932c2b0f9f9ce510b2a1f7e633d7bee06882898601380186364e482084bb76cc61a4e5f1a2675e685 SHA512 2feaa83b46f11117efc80278b9bb23e6775e8fab3d434f3218a8d049f1e7c5fb711cf79920b54d869523bcd40f5660565dd9e1488a5ba089fd6a6f816b144cbc
+MISC metadata.xml 425 BLAKE2B 802c206c7be42ae2454a804b0fc3f6f8f392e911607ebe1893b284e8c3b6827e229988e2b5dceecb55dfdc22c57dabccd21478cd732d10dc7b4baaec864169d4 SHA512 1fa1eb48be222f0b56c6243929a269ce7e66c05d187b4ce7a13a7ab759a684dc4f6c491f6b99e0a16ceebf6e501b960b9c0c441a9e1e17a4ad70a2621a06ffe0
diff --git a/dev-python/python-redmine/metadata.xml b/dev-python/python-redmine/metadata.xml
index 3a856b534c01..193539dd4b37 100644
--- a/dev-python/python-redmine/metadata.xml
+++ b/dev-python/python-redmine/metadata.xml
@@ -5,6 +5,7 @@
     <email>mjo@gentoo.org</email>
     <name>Michael Orlitzky</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-redmine</remote-id>
     <remote-id type="github">maxtepkeev/python-redmine</remote-id>
diff --git a/dev-python/python-redmine/python-redmine-2.3.0.ebuild b/dev-python/python-redmine/python-redmine-2.3.0.ebuild
index f97519de9165..8e9b4736084f 100644
--- a/dev-python/python-redmine/python-redmine-2.3.0.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.3.0.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=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
index 7761da97ae89..5055c486d7aa 100644
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1,3 +1,3 @@
 DIST python-vlc-3.0.12118.tar.gz 148685 BLAKE2B 356963caea1a14fdc9d5ba814fc442fd8d93fe327ebea7fd51ede52d29aaf7b72af3e9d6de9a7e1372515694738fbeda49c698793fecd80a47ab5f51b01f3d08 SHA512 d84e373b77b763c169fa4c2ffcdec979fca44cc40e873865b6a55d79481f2b01711fee48f8ab7ca2506ed73a72b970b6fd410f121c24120640ddc0ef5efbd05b
 EBUILD python-vlc-3.0.12118.ebuild 447 BLAKE2B d159dcc3e3936a8f0e1a4d6ea0501c3bb9cd8392f8f7dc316dd2f47bb25bcd61ab0d6380313885649809c1888e38825c23561d73cc6b92e9b8a2590994a37190 SHA512 f37cbfb2927da7f2f6cd8a45a5fde0de05e224dcc912e5b147060eb3d32564f299d9cdb9fcc9662a6f4f1bb0e7dc613092edd75005692074f2bf2caeddb364f8
-MISC metadata.xml 277 BLAKE2B bf24e94f642972ff1dedac351b973b5f767111a2dafa2d92c1e0886f00b8fb5689251d09b990d80217d82318fcf33452984df71d3951a20e2c690b4050061103 SHA512 92647e12357f72bb72680d35af3b29ea544d84a0079704a0b47b5b8dfbf04cdccf64582a6e4a70887e94a3256c84cc399dda966058ce113dee10bd2c5ad300ff
+MISC metadata.xml 283 BLAKE2B ef3dfe1a27e46c933f7ae0bbdece78cab262e4c6a5713caceabd3cc11e5150ff4ad87da258f9a9aee61eb0b4f84dd8aa4b5537bdee54c0eee3d219666c436a46 SHA512 1401089263deca8f8539e7242fd5a68f32c51f8eeb44c05639cc5bee57781948443fd8fe3912c77dc7bbd61181c0b1d7ded90c7c7c3ae161d681d050ec990bda
diff --git a/dev-python/python-vlc/metadata.xml b/dev-python/python-vlc/metadata.xml
index 651e2156c25b..213b9d4ff05b 100644
--- a/dev-python/python-vlc/metadata.xml
+++ b/dev-python/python-vlc/metadata.xml
@@ -2,8 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@gentoo.org</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index e0f9b2f53917..fdf8e6e2b63f 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,6 @@
 DIST pytools-2021.2.6.tar.gz 63630 BLAKE2B a94420134688514f5a27c85aedb3655e507ca37b30e0db81656e9c1597b2527f55e534b777d97daef889ed496766718bd42c1e6193ac62d45ec90e9305a91959 SHA512 378c58c4e321f5ca3bb8e3d36d06dfdbe20d04210ca9943cff0909b85d2fd89791c1d966992b2e6f5ccd772f68d223eb13c02b335d9f5c0ac3b17d36fe04aed0
+DIST pytools-2021.2.7.tar.gz 63673 BLAKE2B 0d64aea8c87bf7d8f6f0fb432545fc20589aadf8cee41fdc9096a1e59e1ec4588812b803cffcbf8cc92bab4e18d5ea4422beeddc9408051af11e06b04d8e7a6a SHA512 284fbdb638d40247e330c254567f594f723cad467a504bb31852c0ec5cbbb0648d9596c65e9839975bbe3a52556896440c25da5d2171aaed7c26ba38db6a4426
 EBUILD pytools-2021.2.6.ebuild 551 BLAKE2B 9464350a8af26c40562d44ff6ab247c5967aaaf0f416b33155c3dbed2e7431b49906f1ab4edd5fb5f7b5bc41f84c2eba6dbae832a8208933a90c1a3de7f58201 SHA512 fb0b667a071206237ce63ff0ca549135cf8992a15816954ca68061f7a674609d758b94ec2b4f4b56e11fa5b94706b97302b3dac0011a16799dcc033715685d98
+EBUILD pytools-2021.2.7.ebuild 552 BLAKE2B d062b876f1a053ef63869a35f2f4fbcb97aa6f4d5b592e4c08dfad1a1d703fd64d432c97c74f6140cf20c5f037d22fa5ae679cc8d1992e5ffac16f19778e2517 SHA512 289be0463ac1b0ba78bce0b64f06982282991527e144c6c867bc469ebc459e50b937fea4d0cf03611bf6968176fb8e9ef7220d5ff43aec087a230babec063f5d
 EBUILD pytools-9999.ebuild 660 BLAKE2B 2b4690e513d08318b43371eb3bf6ff9653dfe2c17df63938a22cdf97e14b0bf5b9dea3c69446375e98092da7bf5febc4afb1f4eab88c75c5e715bdd18931826d SHA512 ec4d6284b10b407ee0100f394f1d9df0bb10102a85ac0579bfd5c354e2f9177f6c5cc6a52585e91f6bd2c9add9f8d9d9dcf3a12443bd15238836a787ddc368de
 MISC metadata.xml 394 BLAKE2B c92c0da3fd787c1b70b8b6518448050c13a1b68b27a813506d513f54db1b47853d4d2c633b70f5bb1e604935dbdf8e1f4fc3394cadb29ba30ead7a2b718c03f5 SHA512 70139b5703a5bda95cf48fa30cc97702a149a3555da20a2e8143fad5d9174557b3508a251526af797a93811aa3964ed5b0f8e89fc2a6b3da965a72062649ec37
diff --git a/dev-python/pytools/pytools-2021.2.7.ebuild b/dev-python/pytools/pytools-2021.2.7.ebuild
new file mode 100644
index 000000000000..6f643faacf9a
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.2.7.ebuild
@@ -0,0 +1,24 @@
+# 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'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 17a365ea8961..de2920272de7 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,3 +1,3 @@
 DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.22.0.ebuild 1273 BLAKE2B a1085fed6c59aabce49239b1100187d7ea290305bceab6cfbae16bc0c2e549bc2214aa51b63691d464d978f9523f2ac07729d66abb549940cc256be665e2d94a SHA512 1a4d9454b41087dddedd3a2288270e5152df30839802ceef834eaf6ff09f4a497519d29a65cd2ba07b77cedff554ca999580065209e9c9e7a34d78a4f53dff84
+EBUILD pyudev-0.22.0.ebuild 1270 BLAKE2B 75c78e4b24b4f85af76edd0684a31d074a32f389569f7b8e66c56171d8661db2216bf4d3d9725cd9c05c2399d1b3697808b8940bea1f230f128ed034d51fd50b SHA512 01ec90457800da048f09f4edca75ca4b88075af8d5e4ea3cd2f1bb6c2425991091f957cb0a0cc1f26072d0dce9980f9ea7e447574fb9e4bdef4e5e35accf15bf
 MISC metadata.xml 593 BLAKE2B bb5efdb90e8b189f55f12df33d7bc69233a448d010c62b512cdbea78c58a625d0e876b48cdac3342e3588e3bb1f3998d9400e927fecf7bb86ad01da113c97758 SHA512 dd6e479a44e54d4e3b2a4b7a3ceedf04fd45152d9667227b4f7bf0c585052e1adedda44084c6251749714ba91bfb8ae2969c158bb3412edf1230f5b8d1d1c768
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index 25193dc4699d..7add9fbf588e 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index 326806d453e2..ad90ffc228de 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
-EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 535 BLAKE2B d289eb93aa5f02b2aad95aee5acae5d4fc65c29ccfa0fc482ca65b3acb490b24704270766431b122430c45ac0aaf5e9a683aa1dcec51f2c8ca988c10210061a4 SHA512 01ad67ab72074c2031030ab80eafee3ad2e954b3249d399dacf901a4359be935594a3c939530cc7bc88e11379e140b44cd0ab63b31ef91b0be5bb5af067de3b3
-MISC metadata.xml 414 BLAKE2B 48de5d98fcef6b8c2deb0ca89662ac5d571c05d496779548b89a4c3dff03efb64deefc009736b94affb7066cfcfe46c597ded43e6bb64a01853de66769124c4d SHA512 1a022ac4c0ee8115b44bf88426eee0899e35fa563180b2add0490c4e3cb581b0618d31c54aefe09bda0ceb4a1b3c57814ce3b02abf1e23912b1da81eda24d102
+EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 536 BLAKE2B d466bbebf0120387a47c3d4201581b1c09822f0c4797f3d1d4639ba37d41c44c242132b6fedee4531b3f9024c0959a59229f47ffcaeb1c7d1c5ab65788a916c0 SHA512 121dbcace2efd346a384cd59606e1ede6eee1307a5db094914b5cc40bfa4fc31d22947c688b1912b49cb756710606b7e773d03a5c6a250b72b6da0c4789adacd
+MISC metadata.xml 438 BLAKE2B 00de77610517b9aee2f1dadc9e6867350337982a71fc23471d06e369cdbde8c76a1957eb5bf417ce6b39bf45a15b1dd04b6734448710875bc66cef725a072961 SHA512 0ee101c503f1c162efac623dbe7f58664b8b46a389f261d93997d7b5cc40d9c3f25211109089c19c97a3cc014b5d206fbfcd94cf0958fd13a236ea52ce7a2eaf
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 5a2a2d0429aa..e20cbddd254b 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -9,4 +9,5 @@
 		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
 		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
index f29dd9673894..11f8317a7724 100644
--- a/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
+++ b/dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index dafe2b44121c..8f4e81e35241 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,3 @@
 DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
-EBUILD pyxdg-0.27.ebuild 601 BLAKE2B 457a53f6e5d5c14d8b20474453fde8c51fc76ed177f5e7464a332c6d665b96ca7753cd6e900c49508568839e20e65a1d3fd6d1c409ebc6ab2d3cdbbd31bca5e3 SHA512 4d8f7de9a00845b32b9b589395629fa62270619e1a95a2a4863edee55c87ed1ceb52f951f53adbdcd57e8b12ff4ec3d937ecd70f88b3c8fff435ff6e5aa37c2e
+EBUILD pyxdg-0.27.ebuild 608 BLAKE2B f1566c39644ae8d085f1f25065a237c9b873e2d892d43ae5f7bad48f03212d63b949d08a8eb8278e04f6acbdbf467c0d9def1da9e93d9e6e68c3b051f732a96a SHA512 286524dc41c956b9717bd3e807dbf3dbd81a46443c50b580ba2746a531f6a5f3324ad8c5d6651a81d84e5ed677cf85d6cc2ab1f860276ecaeb61a39bb84648f9
 MISC metadata.xml 512 BLAKE2B 134a7a97dc07dfa10dfc1f9684a0d9ef1cf059966ca3a569762dd277145d19dabf02987553ef6ec60083cf7ea5dd754ff64a735ac4cff8045415657c0a5b1f33 SHA512 c1f7bdaca58f1e63fa5906edd0d626413174742e68da597ab28350fc1f917d9c9c77d0fe7ec0aadd008525cdfc1fa71ff3558bb738f60d129be198844549a39f
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
index 1b1a33faa9e9..7ed5bb244fe3 100644
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -15,6 +15,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
new file mode 100644
index 000000000000..29cf1e1c36ce
--- /dev/null
+++ b/dev-python/pyzotero/Manifest
@@ -0,0 +1,3 @@
+DIST pyzotero-1.4.22.tar.gz 521386 BLAKE2B 3f5cc943aa108b771675955fcf7acaea62bbed360f7b9a4de4127d086c0c11679090df1e02820c0c937057cb77923c7d48ff95b06d92a6494d2db3b70fa65a27 SHA512 c9438474c30405d54194315ee007ae53527963460621c0e74b8286baa98f324601fbc99d342183ae643919890b70f08cc0ae431836b03e3d9028e62302ec63f8
+EBUILD pyzotero-1.4.22.ebuild 970 BLAKE2B 7062fa58ce4bbfa46ddb81b79976869b6e7a7480fc4bf631e92e13a1f9798340902fdd088d55453e5dcf0d5298c3f23fc0c0af5469d71ac3b6ccc0772de62e82 SHA512 ba10003617ebae621c6f53341da81271c0ec142bb810398b39cbded180763beb0c5bf4800b2478191157b0533e6d88d6cce82cb08eb4e9554154435029a7edaa
+MISC metadata.xml 410 BLAKE2B a4ce6140570dad0e688cfb5047b5649fbc5a4036d6ef246fdb4c1352f1d8c191efe941ec8083ec9a6312ceccd9a4f75c20e58d45c42fb6ef230eeb64a9812ce0 SHA512 5b7f4f41bc1d78882b58f9b164ba0606ce2f6ddf6246f16d5c874151aa475356a02b3bbd3c234be745a05bab7947babe015f151ad507eddef47cf60f6037f9a0
diff --git a/dev-python/pyzotero/metadata.xml b/dev-python/pyzotero/metadata.xml
new file mode 100644
index 000000000000..9e4ba37ecb8e
--- /dev/null
+++ b/dev-python/pyzotero/metadata.xml
@@ -0,0 +1,13 @@
+<?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="github">urschrei/pyzotero</remote-id>
+		<remote-id type="pypi">Pyzotero</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/pyzotero/pyzotero-1.4.22.ebuild b/dev-python/pyzotero/pyzotero-1.4.22.ebuild
new file mode 100644
index 000000000000..9bea3eeaca08
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.4.22.ebuild
@@ -0,0 +1,40 @@
+# 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="A Python client for the Zotero API"
+HOMEPAGE="https://github.com/urschrei/pyzotero"
+SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	dev-python/pathlib2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/httpretty[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# do not install tests
+	sed -i "s/find_packages(),/find_packages(exclude=('test*')),/g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index daf2f1e039ed..3671f86b4949 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 EBUILD qtsass-0.3.0.ebuild 649 BLAKE2B b1242d761094f744e68966021e49d28de51506d75f8d715e4d2e7cb2cfa0ab6e5ecd1da745df69acf2984e932c45b308e2793adc260dca92cf02b61fc5133cd5 SHA512 9bd5830b61fedad4bbdf140291cbb487000040aef9fb873003189f801d7fa983a1e7c325e7708aba695412e20689332ec5c193daa10081eaaede0caff9f501f4
-MISC metadata.xml 327 BLAKE2B 900f4d682ecec0d5220124f51a071f8d959f1d2a15301a76027b6428ac1fd4a59d99eaa56a3e444d51aaada5345df7d3acf76c3f24da7fbfeeeb70cc9985631e SHA512 e38ed87ef3723cc73eaa17f079812e73e545f29455620c4d0190013f6f5b0269db10243acbccf026018ebe3e4a10e2b134cc06d2820dfcfcb9ba25a7b14425ac
+MISC metadata.xml 351 BLAKE2B 4955a0485ce7900e744eb26013ed9c8e639aaafafde962edafb8709bf652b7447e18205344bb32318e2ec8adc3ff87a38de4d4692c5a0d6e7033519bfa7629c4 SHA512 0d8e7893522f0cf13ab3bfe74144f059e32318038d7e14acba497ccd623b4f37aa128771a64ea58c511342147e1699b6774f79bb77ca3055ba130b2b2d6a61ac
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index 645a3f43f1e9..0dd547d2004d 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">qtsass</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index e0419065e9f0..75203b2cd588 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,5 +1,7 @@
 DIST radon-4.1.0.tar.gz 3672016 BLAKE2B 3da02d62a2be0ab709bbb573372b86971f2eafd98724ea984236710c7f3e3517215bf496d621d42e9e93b747e3b8742f9cf156d3477c5c1cc4ac6098f0008b8f SHA512 c594fb2822a5311f1daf18304c601b4363477bee808f32a0eada6dd28560668a93cfa614196a614240eca436dea48945a29915bd4d347946aa28def0780bc93c
 DIST radon-4.5.1.tar.gz 1873194 BLAKE2B 3bbbfd1fcddb8c89c39240d7de082342b667c53a663e766dea16032ae5a7a1eca2a3a55664f39d0a60551db8c27e0f1102439409ee50520f8ffeb7ea20e5319b SHA512 8f27af1b9fed27806415f7af12f7480f638c71c741b3e7e150a0137964f48d43e615d410a84a8e093aaed28c92ad57f22e36e1d1a9819c335635ec175c4e8314
+DIST radon-4.5.2.tar.gz 1873164 BLAKE2B 64a6def2be3505e247625b11deaaf75520781f98748cd8fec07c0d525905605deaf7f17c0103c6d41361ac0c6f62f489aeb418b5bd592dbd5b12755ec73e0116 SHA512 247fcd715ed3dfb889a73889fb5be8dc159673beb3abe1e1ba5170b8caadb85ad405ebd05f6a9080a6097f1c731b83b9dbe8b7f564f2a39b1b7cb0239f445813
 EBUILD radon-4.1.0.ebuild 1086 BLAKE2B 2c6cafea3fcad0e2fd60e47c5e0ab4e3ab009bb253163a7d8fd57595ce9a4411bd405f019dcec2be74f5f8cdb20d8378c8b79e90437d960e0b6f678d89b46648 SHA512 a6513c41d90634a0bf099a3bd8e853fa858752b4bc273d49ad199576e95a129ec01a73ae94ed4dc3e807700fd121d442de07b1e5250e04e4182e8f9a73effd1e
 EBUILD radon-4.5.1.ebuild 616 BLAKE2B 6a26706fa09350fe971e7fcb729a4eb32ccc4433f57cddcb462e908f3c6a9aa75cd63a5e67ebfccbf31409306623b1b21b43c87b555e88990274b4b2ad3c5d43 SHA512 95b0d943815aa07657fec3e0c655238fcfc9c07a497eb69b5f790a24ed09b62219bf6054ca642d253ab32507ac7cb7be7322abb9815951f97bbda86e22b82e30
+EBUILD radon-4.5.2.ebuild 616 BLAKE2B 6a26706fa09350fe971e7fcb729a4eb32ccc4433f57cddcb462e908f3c6a9aa75cd63a5e67ebfccbf31409306623b1b21b43c87b555e88990274b4b2ad3c5d43 SHA512 95b0d943815aa07657fec3e0c655238fcfc9c07a497eb69b5f790a24ed09b62219bf6054ca642d253ab32507ac7cb7be7322abb9815951f97bbda86e22b82e30
 MISC metadata.xml 359 BLAKE2B e55f145a3e3092509c27ecb46a07b7b4d0bfbbd2397f2f6a619355619ee786ba9bb285d2f9920e00b60667d27afe83a5a92ec8850f5bb69f8530718715fdf152 SHA512 5ad938fcd2332303e1b13c3f683b9a9c9cfcd461bc0b199724361d28d743af71d4a2f1a823610b24b5516bc478352d5ff00b41ce8d5e01215deff580c50a2573
diff --git a/dev-python/radon/radon-4.5.2.ebuild b/dev-python/radon/radon-4.5.2.ebuild
new file mode 100644
index 000000000000..fe5b81488746
--- /dev/null
+++ b/dev-python/radon/radon-4.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Code Metrics in Python"
+HOMEPAGE="https://radon.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/flake8-polyfill[${PYTHON_USEDEP}]
+	dev-python/mando[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index a3dc3fd06c45..fa0cdafbc0bd 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -8,5 +8,5 @@ EBUILD requests-cache-0.5.2.ebuild 2832 BLAKE2B 1bae66755831dbdf4cacd154a8e40f74
 EBUILD requests-cache-0.6.0.ebuild 1547 BLAKE2B d4882712310d235f1e36e36927fd604fec9d0b27da8be825886f8419163c90fb804c31a511b894a86fae8cf42a4dcf127e99ee8d524c57acdc3c1710ba66122e SHA512 001b0302241e7fd38c37fce08724a6b7a98ee2fdc17fbfce76d6bbe4cc42c732a5a44ec56b60fcde69a0e294a0665e61e8b5e89ea4180d7f277ce52d836b6f24
 EBUILD requests-cache-0.6.1.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
 EBUILD requests-cache-0.6.2.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
-EBUILD requests-cache-0.6.3.ebuild 1098 BLAKE2B 6130a0b601278c24f12810bce0731a88eab268c19384e4bab4743236ce1f54d6c2326717e47f8e18929d6a278486aa4e5e5251e36aab65d04cb85937f8946079 SHA512 ec05595da30540b757c9e0e6ba3a53f49ba219fb54090648ac23b164fbe7e360f99c81e2d7a5d3857c505d45184d779e5e66acdbc3ee25232d9cebca68b7764f
+EBUILD requests-cache-0.6.3.ebuild 1143 BLAKE2B f4a54616e1bb9a27e0958170d01e00d97afd01a2f9bd2015d02bb4ea725a67ff90ed3821bc46b1a388c205e7088b5e541a5b965596301f34c471d097c9260928 SHA512 15c6f3ec0a0c97a35236d6f3cbd428f2084d98eecf77cf246d5ea935069ff2fbce944cc5119802aa1e97c5042f671ffa7db2a88f4737943333ed297923606242
 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
index 56c3378e34ab..c51bb467921c 100644
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 83f9bb5d0864..6d7808f3fbdd 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -2,8 +2,10 @@ DIST requests-mock-1.8.0.tar.gz 59794 BLAKE2B 2bdcd180ea793a02cf34eda356d90c0e33
 DIST requests-mock-1.9.0.tar.gz 66243 BLAKE2B 33602e85376d7812b8f4b35bf657c905ddc7db4d85e3de1f70d38871c90c42fc886e99bce3dc45079b6c8ac8e3e6b0b5291d4acda31d26045396d4ed505c3faf SHA512 1382077357a13dbec65cc4226b628ff6b55348422d9f0e9e2311c85affbc40437d22c2f95fa305303a86decc765a6228366f27eea76e254da194789b1d8fb610
 DIST requests-mock-1.9.1.tar.gz 66782 BLAKE2B 5457d359bf93f3f1e335481e44c1e9a391ee88c648b3c385806274e2c39ae3a69268d792dfc2e4609f2ccebd47dc2a3bb488f11b1b479c010a4194fe5cdc3be6 SHA512 96a8a787daa7d42796baf2807543ca18c27f595e101fd230cd392eb2417b3b0925b977a6fc49d70e21362e5b647cac201cb9f3968301ce2702772ddd85cf7094
 DIST requests-mock-1.9.2.tar.gz 67383 BLAKE2B 70a0772b415f437c38897862d663983d9ac65a5fc37d70b4f8734f8c249457dab6c4b1c04db79f7865a9b31a49aaa9cbbee98453ea5bcda35aad2e7cd9ca3f4a SHA512 b8da389f6642a4dfaac77b2613d12e3028555a5d4154aa7252e50fef527a49fb78d85dbd911ad2fd7d5ebc0efa49a2c0fd8d3b10114596839f0ddb53d917773c
+DIST requests-mock-1.9.3.tar.gz 67988 BLAKE2B 8ab651adbde9e18370641655589f5d209d2a9ae07d82108c64e4269757217cf01588066ebc3005852cf48527f911d3fb76cedce3e88bc74123db81725b4b5865 SHA512 bcded541d78670a1b1fc87f97d35286ab4bafd6946beb9d9b44886454c26a4d8c05834add18914f3f72b1d3c0534311efd1cc80e711b5085eb63053ae24cbb6f
 EBUILD requests-mock-1.8.0.ebuild 1314 BLAKE2B 2905ad624ce6ec7329fb59e02f6309aa0e2781237f3ed98eabd6c89c2e3f8f12fcff366c1974f8ca788124e93e9d907e19845146aed4997faaeb4462cba3661d SHA512 e260ac73f27d04f9017088b557ebf8463f888e1f4b0921856c028399c402281f178372415dfff7207bac342eeb04fd2aa00118dbdc07983c2cc5a83cb8ab227e
 EBUILD requests-mock-1.9.0.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 EBUILD requests-mock-1.9.1.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 EBUILD requests-mock-1.9.2.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
+EBUILD requests-mock-1.9.3.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
 MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/requests-mock-1.9.3.ebuild b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
new file mode 100644
index 000000000000..930d9082097b
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index a4286bc432fe..da50f17de285 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,3 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
-EBUILD requests_download-0.1.2.ebuild 810 BLAKE2B f4c278f6e01b3e7050c8d9f6cc7521d18a7116e8c016e037075d06c46bbab5bd8258495a5f85dbc68ee0aac1079ff6e05668e816fe0765dce2e08081830a21ed SHA512 90a7cb7f9d4562c4d8060f416d69ca69705f564020b6e7df58409e52041513024cd21624057c437e381c83f8d65e15d3b095c8f4e1ec3351a4b323c34527e3a3
+EBUILD requests_download-0.1.2.ebuild 812 BLAKE2B 6eee738dfcbed86493d8384b0b3d3b82e6208027498eb4cefa4a8a6e886774c9456472a8c7ffa0512be05fe08d2aa14e8bc5cdfb1d7cd7b7b66bb2e1138d19a9 SHA512 8860753fe8a948253538e6cfbb1661b32e9519063a0e72abe0f99acd28708d499f845fe11d3dd82456119660aad96a81101d6c2c62fe64224e04b3aed444b139
 MISC metadata.xml 433 BLAKE2B e4aaa3e5f3675b4afb8ceb70aa2ad1fb008004f4f9c3ed6015e7c7979c8a2716e4a2a8c6ccf4dc128739276463d423f745e241db8383dc8eab2a8d7496818a81 SHA512 6cd28a07b396dd6a651761f98eaff3b20679669f48c0ce686f30682a64786402eea1e0f5bccb76351b822437176b699aba2a2d2ae0ba9fca672a1387ac5c7d93
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
index abb6b24f1a7a..dbc6a4417f86 100644
--- a/dev-python/requests_download/requests_download-0.1.2.ebuild
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 3a24f4d9b7d3..9651fb32104f 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.13.2.tar.gz 30302 BLAKE2B d90059e12518841af0276777a77c28aa96ffa5fcdea9ff1ce2d7a5b0c7e225b1b6253bc38bce534b8447de43365e7315b3ee667e6d845206a9a7a3c3c0d27227 SHA512 cac338cd2c2b3c0193de779ef47830471ed17f2df7d94c30acea0117dfe508550a1dec471fbf249320637125322a5a40273be568b330989a272870afaea0bd04
 DIST responses-0.13.3.tar.gz 30327 BLAKE2B 299d4ce81b5ff1703cf72fdb42d39126b5bc8cd95837467cbcfb35c1688e75ec8c95edaafca4100c1b6cb51fe8e9f4c22db1a3e2f46714539bff7a861b16451c SHA512 c523755e44e158c3b37d084b9105ba36f515eb883928d51f296ffd911d72206461cd864355d991ff6f6f05abb447a3eb558ac9958379b0a8a49d29b8afcadef4
-EBUILD responses-0.13.2.ebuild 759 BLAKE2B ef24d05d7cb5a7f24cb59d618b8489ce0efe00412e0195325b68a06d16463978b0dbb76dfd1a788e7b53b398d6f4706be0625f7324735529db0066af353c5fa4 SHA512 c6401dad75212d7ba5f281da9868cc619a0ee1d56ff5e5d2605c5e37b17f94bb09a19470f52cde7ad54d412813b26977424503a5ea465aad1873aa68d6b79944
-EBUILD responses-0.13.3.ebuild 669 BLAKE2B 6dede014b4d06cb49d46d19101b8c09c6f43dbd9953d944df9bf338a7f8aeadd431281641b2785b90dad3fb91d418578831c5b39d5198f628cf7e942f1274665 SHA512 b2eb6b7b95c0eb428af606c6c438e559da27b5f16a1e5c33689ee803ced6ce4e2ef01f970e1283c03f717725411f11e64a0af02451d51856f0802479cadf8b50
+EBUILD responses-0.13.2.ebuild 760 BLAKE2B e4f01e8319f57d8a3a87ecd57d275e5709f04485868d931455ef335845e4bb1d3fd54451dcb4c8f17eeb69a788604061468565730d4895f9c954ab3fdb77d95e SHA512 db7d7cd5d5f88259e8a9e2bef0a54843d1b9d5514e38666cd41fb22cb1529471143e55a862703c0cf082370c5e90ac22e53efb79bbd034bd6fe493e71d5dba90
+EBUILD responses-0.13.3.ebuild 670 BLAKE2B b991cf4467d1edd738f99871edc1de6a914f88010f9f2357c53a8cda4eb7dd29c3c03214897bbbeaacad7d6cee74d16d92278e87f8b8c43db02b79edfc976c86 SHA512 f13e441a0b5520d0b11e63fde0a49cfd845628040bfad97aed777771ed2b6349bd39c495984c71ee917d455f2e1d8d101734ef9801ae2d91b84d6ad59a1c0718
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.13.2.ebuild b/dev-python/responses/responses-0.13.2.ebuild
index defc47fbf49f..95abad3ada8e 100644
--- a/dev-python/responses/responses-0.13.2.ebuild
+++ b/dev-python/responses/responses-0.13.2.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/responses/responses-0.13.3.ebuild b/dev-python/responses/responses-0.13.3.ebuild
index e4ed917ccca2..d25a69674a20 100644
--- a/dev-python/responses/responses-0.13.3.ebuild
+++ b/dev-python/responses/responses-0.13.3.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/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 4b0e5ba34086..c90a224658ad 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,3 +1,3 @@
 DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
-EBUILD restructuredtext-lint-1.3.0.ebuild 777 BLAKE2B 37482cd3d281e218d487cd2e2fa50bace62a74628993280b6ac7b11d729ff06d3e6f7ecbc197698c520a22f0d41046cc350a170df62667558259ec592a58ace7 SHA512 e836a5c8928a6519580f14eb34edcc8d0bc1e8c96baae42b1376bccc96017c34dc6febb9f4966f84c4701fbf226e840abf39a32393167039aa37cc8fe28834fd
+EBUILD restructuredtext-lint-1.3.0.ebuild 634 BLAKE2B 1a79e4e00b9c3fd7af435b136f01dd845830c25af25d81c1de964f38980284a1b93947c655d1bad2c3130490f67527a26c46327601f36db4074ecb6653c3649a SHA512 00ae4be9908f32010162c73679b1127c7636d16dfd3815fc6ecd5c6a56afb3f7ad9eb0a9d03a995be0199558660c451fef0f76fd8a187bd494af551b26ea7b59
 MISC metadata.xml 362 BLAKE2B 85214c8f24b266c39043bae4b132291512732e292127d9c6881e87c79f22f88b894955e75b0fd3ac29ea4aaa304581f75216ebc58f0761c040a2d3339a2ce62e SHA512 a429638f5f54808c69ec4fdd0710ba540279df44ef0de542014994e71222d1f39afad098b189b7cd01ae0ec0ac9a4a33c3425a32a5c6939f23e2008bc14f39cc
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
index 2773dd5e0a1c..d71a4addd03d 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -2,27 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
+MY_P="${P/-/_}"
 DESCRIPTION="Checks PyPI validity of reStructuredText"
 HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
-
-MY_P="restructuredtext_lint"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_P}-${PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "
@@ -30,6 +25,4 @@ RDEPEND="
 	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
 	<dev-python/docutils-1.0[${PYTHON_USEDEP}]"
 
-python_test() {
-	 nosetests -v || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index c38892bd51a1..398eab6043e5 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,5 +1,5 @@
 DIST rfc3339-validator-0.1.3.tar.gz 7439 BLAKE2B 8991906720f3c7fe08edbc2994693b354338e70bb361e2ceebe168e8f8195a061c2cd716e365a7713c1a21658517e4f2028f9b619513408252a46ef589868c02 SHA512 d89679fb9fabcfa75cf3955744facb235201c0c3ccc4bcfd53b553c5403967226282b68e628d0dd74bb4abe553da6c3734912c63f3a5e16875e57a872c78231d
 DIST rfc3339-validator-0.1.4.tar.gz 7451 BLAKE2B f8216b2eb08cc7cd755a2a57dc6fa93da9aa664cc49f7e34c551d07eb61e57dc865de4a3e86ed2dfbf5a38ff99c149868762a3807e916c884b12fba7e98c3ced SHA512 ed593b31c4984cdbc313e42dc0432173eaa649712e29627ab462dfa262efb30cee97b74f589d3d211c2193623fac3baca560a52a7a3f718071a63482e06c4203
 EBUILD rfc3339-validator-0.1.3.ebuild 654 BLAKE2B 2f87b4decfec9e3468554acd85eaed5c15c0057cc1788950fa38f97e737c29f5514a957db292bc225b442961ffcf5564680f234e12b3f195b6889e9a01f45c7a SHA512 5e9416cc2570bddcd28df6837e80db67f8ddd8e784605df44274fab3e1014444f8e58fd5a9c2c8b904c2a88525bb73a52c7ff4585df4a6ed4e6d3b4b4761df88
-EBUILD rfc3339-validator-0.1.4.ebuild 661 BLAKE2B 9a7072eff55bba810babdb603b5f0f81b0d6430512541a5825ecc716c1884d53f0772af0818194c2d983416985cc020bfbbcaba47d5c7f99aa8387cdae82b310 SHA512 b35cfd3d797df26cea581c62f77d3f061cfbff909d662f890f65bcb658d2c01f3380c9a1f464177b7d9a10ea199e43d1b3a8b43b7a64a3c0f72c3c6fa44b0779
+EBUILD rfc3339-validator-0.1.4.ebuild 667 BLAKE2B 8488e4db4300d73640ab3afdc7000b8f4608c9f7bffc164354a446520f2a7f9f3523571274ffc84d6157143664c4b1d1205544b9abb818531ee96407f84f9d70 SHA512 61196011e13f718c44698e720c2ebd719129bd420b4687498b82417d4e216f79e981b332b3984cf0efdb5bd3c58b796011abaefe52c027c0d5dd043decc2ad18
 MISC metadata.xml 410 BLAKE2B 2e5f33d43e9db653e8ea92b820fda57657072ffe43c96e1606fd4fb09e81aec31ecf7c281b3019bc945fed28cb7c0781178bc7f136df5e1c2876384296b46c56 SHA512 695a99018886fb434079006b3e0784c609654a0482c85890774f31f9f5a3bf9a4765a4105495e67ecfe872c4ed160f07dc692e1d21d1ede2ced8692e666e95ab
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
index 8d19a1fdfaae..5a23d2d82f84 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 8c6372d782c6..e76f05ce6aae 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 914 BLAKE2B e02274cb88cdb74792789eb854de347f0f9c77444bba85763334f84481de05be31bfe01c55f67c77d431fdf76ed189320756f3f49e09705e3799679fbcb8bfee SHA512 c30eb10ef0bcc8a36c016b9355bf12a0ef136198b85e0fb13b4f528d3bfb473b0da82db1f119a7ef8ad78b31234cff99269e776df968f03554912fd5cac382f3
+EBUILD rfc3986-validator-0.1.1.ebuild 920 BLAKE2B bc7527d4a9e2d5cd1835d952ce40552364915873154fa097663ae9c8a6fb70b97a4a9a71ba2395f97a0c8297bd6f5a2ea136bbffe0e465125e049f8e5206d3ba SHA512 7de889a8bd4876c366ee3ff84882d855154cb6a7759037a4523e8510605deebe6c27f410c279f112e64565068171856977a9ac8ea9025b8823eed54e545e3711
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 46d467bf672a..7e4e0d71a72f 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 2d23932d65f2..af2e73a7aa78 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,6 +1,3 @@
-AUX rope-0.18.0-add-python-3.9-support.patch 6673 BLAKE2B 165431552a7973e65c7c4711f5aa350c747989c5f66b00c2f1ae1fb2f71215aa5f483749d93a5807b72c6f4591d9bfe54b30a172bf36719687c0336a7d8200cf SHA512 2f2248374b6b01307b05f478d5ff7df39e1aea470b0255fa8b3e0d58ba87274d24f362c7fbb3f8fd308feeea69f6d8d36c59fdac8c11fa7c814d76c7b86588f0
-DIST rope-0.18.0.tar.gz 249828 BLAKE2B 2aac0541936c671f9b70528da28b2c016f14c7a3e5f368aecb6a3f2a39d2b447d70943bf00b7a49702f5d341504da7398ca5b1240d625275f749de1e530fb178 SHA512 9f706da345866447ff7e4027e6f9f0719d4b823253155881efcdd3a9e9a6f42fa9e194cd9547df4a6f752ae0cec739045e52bb7edd5cfa04ad4079fe06808298
 DIST rope-0.19.0.tar.gz 252902 BLAKE2B 41760dc29d26558bdf5f296238b7d59ca949530826953fe5592b763b8d24fb49a90a56b9c7d0e3475daf145185987116a7dd0cbfba74829abfa4bf6a57c79937 SHA512 fd41777d76861837479bf0777ea42cc052eed7ba396bc4531a0c7f101b05b1c5a57c300950b7a3c8a2902e28ff049d146646f83f8a8a447ab9ccd7cd8aa48110
-EBUILD rope-0.18.0-r1.ebuild 994 BLAKE2B a2b8510a8a020b84d3101caced2ac9716da016019bb03db05f1621869328332665c7cb336f03105c78d86efdf6ed99dd9feecc72e80384ab30d85836ab5e097b SHA512 ae926d4c08ea8933396503586a38ad48a7d6b6b4b0a4ff50b343d2f3094f3679cc0d94d316c80381476f42825c4dee09607b99c7d8459175846d19660ec4b907
-EBUILD rope-0.19.0.ebuild 934 BLAKE2B 10b6f5d2f42695d00aad43a04e34fbb2ccca1766aa19130ebf8ca0f2e78f41ec404ed47b0ed95ed90ab14b7222fefce0c7d87949a2a85c69e8eb6eaf2f73d483 SHA512 5787c9ac2612b1707d561f60ab638ffff5434493749d6d1ae3c1bf426964d148df7ccd419cefcbb250a30635817129518c76b514a6035166c704232195f65f03
+EBUILD rope-0.19.0.ebuild 932 BLAKE2B 532f06b5b947416d8c93a15df22324d136e90c7a950d81d21838593a23abe351be726d63173226dd2c2a91baf1d52a8862f378fa998bfe19f33659ae9e6f109d SHA512 dd45048b4ac0cc12c774c2cc79cf807a9a0934b8264e8ca789f72bb7e72c4d15ea33a140ce3112e08bb0ff6476f24a38623b390466fd050c4e43500dbe9d859a
 MISC metadata.xml 451 BLAKE2B 37ad17660eb9247a5de5ff2974c8ec1a312c87f6bbf79375f0a4bb272277f3fb9af63de230c608f7353209868eb4e4882778fecf7ea3d51ba465d14768470ccb SHA512 756ea4e98b36abd8730139115b84d6779c910fe1e671a40b6bc00ef1a484bfcf54baa40f16f03e7375bd044307ebad51dbfce3fe3d90ed9e87d1568a4ef5a198
diff --git a/dev-python/rope/files/rope-0.18.0-add-python-3.9-support.patch b/dev-python/rope/files/rope-0.18.0-add-python-3.9-support.patch
deleted file mode 100644
index edb5304841db..000000000000
--- a/dev-python/rope/files/rope-0.18.0-add-python-3.9-support.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-https://github.com/python-rope/rope/pull/333
-
-From a63ae26035c5493dc8b7c3bf6a70fc05dba2be98 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 14 Mar 2021 10:17:47 -0400
-Subject: [PATCH 1/3] Fix test expectations for Python 3.9 AST changes
-
-Fixes the following two tests under Python 3.9:
-
-FAILED ropetest/refactor/patchedasttest.py::PatchedASTTest::test_ext_slice_node - AssertionError: Node <ExtSlice> cannot be found
-FAILED ropetest/refactor/patchedasttest.py::PatchedASTTest::test_simple_subscript - AssertionError: False is not true : Expected <Index> but was <Constant>
-
-The ast module in Python 3.9 has some API changes. Quoting [1]:
-
-    Simplified AST for subscription. Simple indices will be represented
-    by their value, extended slices will be represented as tuples.
-    Index(value) will return a value itself, ExtSlice(slices) will
-    return Tuple(slices, Load()). (Contributed by Serhiy Storchaka in
-    bpo-34822.)
-
-[1] https://docs.python.org/3/whatsnew/3.9.html#changes-in-the-python-api
----
- ropetest/refactor/patchedasttest.py | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/ropetest/refactor/patchedasttest.py b/ropetest/refactor/patchedasttest.py
-index 04df3752..74a9d9a6 100644
---- a/ropetest/refactor/patchedasttest.py
-+++ b/ropetest/refactor/patchedasttest.py
-@@ -838,8 +838,12 @@ class PatchedASTTest(unittest.TestCase):
-         source = 'x = xs[0,:]\n'
-         ast_frag = patchedast.get_patched_ast(source, True)
-         checker = _ResultChecker(self, ast_frag)
--        checker.check_region('ExtSlice', 7, len(source) - 2)
--        checker.check_children('ExtSlice', ['Index', '', ',', '', 'Slice'])
-+        if sys.version_info >= (3, 9):
-+            checker.check_region('Tuple', 7, len(source) - 2)
-+            checker.check_children('Tuple', ['Num', '', ',', '', 'Slice'])
-+        else:
-+            checker.check_region('ExtSlice', 7, len(source) - 2)
-+            checker.check_children('ExtSlice', ['Index', '', ',', '', 'Slice'])
- 
-     def test_simple_module_node(self):
-         source = 'pass\n'
-@@ -933,9 +937,13 @@ class PatchedASTTest(unittest.TestCase):
-         source = 'a[1]\n'
-         ast_frag = patchedast.get_patched_ast(source, True)
-         checker = _ResultChecker(self, ast_frag)
--        checker.check_children(
--            'Subscript', ['Name', '', '[', '', 'Index', '', ']'])
--        checker.check_children('Index', ['Num'])
-+        if sys.version_info >= (3, 9):
-+            checker.check_children(
-+                'Subscript', ['Name', '', '[', '', 'Num', '', ']'])
-+        else:
-+            checker.check_children(
-+                'Subscript', ['Name', '', '[', '', 'Index', '', ']'])
-+            checker.check_children('Index', ['Num'])
- 
-     def test_tuple_node(self):
-         source = '(1, 2)\n'
--- 
-2.26.2
-
-From 02284e4151c2b1d549a64175ef0e3212b7737c56 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 14 Mar 2021 10:54:48 -0400
-Subject: [PATCH 2/3] Handle AST.expr in _Subscript()
-
-The ast module in Python 3.9 has some API changes. Quoting [1]:
-
-    Simplified AST for subscription. Simple indices will be represented
-    by their value, extended slices will be represented as tuples.
-    Index(value) will return a value itself, ExtSlice(slices) will
-    return Tuple(slices, Load()). (Contributed by Serhiy Storchaka in
-    bpo-34822.)
-
-[1] https://docs.python.org/3/whatsnew/3.9.html#changes-in-the-python-api
-
-isinstance(thing, ast.Index) always return false in Python >= 3.9, so we
-need to handle... whatever the value is now. ast.expr catches 20 of the
-remaining 24 failures. The remaining 4 are resolved in the next patch.
-
-Fixes: #299
----
- rope/base/evaluate.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/rope/base/evaluate.py b/rope/base/evaluate.py
-index 610d34e0..4634981a 100644
---- a/rope/base/evaluate.py
-+++ b/rope/base/evaluate.py
-@@ -307,6 +307,9 @@ class StatementEvaluator(object):
-         elif isinstance(node.slice, ast.Slice):
-             self._call_function(node.value, '__getitem__',
-                                 [node.slice])
-+        elif isinstance(node.slice, ast.expr):
-+            self._call_function(node.value, '__getitem__',
-+                                [node.value])
- 
-     def _Slice(self, node):
-         self.result = self._get_builtin_name('slice')
--- 
-2.26.2
-
-From 46a3403a06aaadf9d17f87b38300c4e3febe47c5 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 19 Mar 2021 18:41:53 -0400
-Subject: [PATCH 3/3] Handle AST.expr in static object analysis
-
-The ast module in Python 3.9 has some API changes. Quoting [1]:
-
-    Simplified AST for subscription. Simple indices will be represented
-    by their value, extended slices will be represented as tuples.
-    Index(value) will return a value itself, ExtSlice(slices) will
-    return Tuple(slices, Load()). (Contributed by Serhiy Storchaka in
-    bpo-34822.)
-
-[1] https://docs.python.org/3/whatsnew/3.9.html#changes-in-the-python-api
-
-This fixes the remaining 4 failures under Python 3.9.
-
-FAILED ropetest/advanced_oi_test.py::NewStaticOITest::test_static_oi_for_dicts_depending_on_append_function
-FAILED ropetest/advanced_oi_test.py::NewStaticOITest::test_static_oi_for_dicts_depending_on_for_loops
-FAILED ropetest/advanced_oi_test.py::NewStaticOITest::test_static_oi_for_dicts_depending_on_update
-FAILED ropetest/advanced_oi_test.py::NewStaticOITest::test_static_oi_for_lists_per_object_for_set_item
-
-Fixes: #299
----
- rope/base/oi/soa.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rope/base/oi/soa.py b/rope/base/oi/soa.py
-index 8ef17aee..20ab567e 100644
---- a/rope/base/oi/soa.py
-+++ b/rope/base/oi/soa.py
-@@ -126,7 +126,7 @@ class SOAVisitor(object):
-         for subscript, levels in nodes:
-             instance = evaluate.eval_node(self.scope, subscript.value)
-             args_pynames = [evaluate.eval_node(self.scope,
--                                               subscript.slice.value)]
-+                                               subscript.slice)]
-             value = rope.base.oi.soi._infer_assignment(
-                 rope.base.pynames.AssignmentValue(node.value, levels,
-                                                   type_hint=type_hint),
-@@ -149,5 +149,5 @@ class _SOAAssignVisitor(astutils._NodeNameCollector):
- 
-     def _added(self, node, levels):
-         if isinstance(node, rope.base.ast.Subscript) and \
--           isinstance(node.slice, rope.base.ast.Index):
-+           isinstance(node.slice, (rope.base.ast.Index, rope.base.ast.expr)):
-             self.nodes.append((node, levels))
--- 
-2.26.2
-
diff --git a/dev-python/rope/rope-0.18.0-r1.ebuild b/dev-python/rope/rope-0.18.0-r1.ebuild
deleted file mode 100644
index f3463196ae8a..000000000000
--- a/dev-python/rope/rope-0.18.0-r1.ebuild
+++ /dev/null
@@ -1,45 +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 refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-python-3.9-support.patch
-)
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.19.0.ebuild b/dev-python/rope/rope-0.19.0.ebuild
index dff0792c6594..1db6110fe9cb 100644
--- a/dev-python/rope/rope-0.19.0.ebuild
+++ b/dev-python/rope/rope-0.19.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # Dependency for docbuild documentation which is not noted in
diff --git a/dev-python/ropemode/Manifest b/dev-python/ropemode/Manifest
index f06ed20da1d7..0508b59ae86b 100644
--- a/dev-python/ropemode/Manifest
+++ b/dev-python/ropemode/Manifest
@@ -1,3 +1,3 @@
 DIST ropemode-0.5.tar.gz 15328 BLAKE2B 051c92a6105c0226c2a2daafbb55485327fcb8777467fc4ff86e1491f9fbbe39cec90100c212ebc64d08d6b1803638597eea0852222f29187b6fe92542a80b3c SHA512 50740982a731045734150171e0c3ae26ccf64bef4699fc7062204c68750b760a373d5b2b0e00b8ba8057d3955059ca1dce2a41cc1878775698184d78f921b76c
-EBUILD ropemode-0.5.ebuild 810 BLAKE2B 17a68cc74c05233118cbf7651e775f27f517b2234b60d54ecca270417700fe664a9f8cb1f5d8f9a52c0ebe3f8200e58c187f73299e76de9a4268d894ba837d71 SHA512 a6e079c5439bb5668d750c2a5cf673163d7b41b20f31a140299a522e2d7124ade4d8200c3fbf9c1b6f2b44bc7cd7796e4abf962bf57ad8129bced293d326dcd3
+EBUILD ropemode-0.5.ebuild 660 BLAKE2B 809cc6be9319601dd03dbbabfac0f5ac570cf7ed5345a346ede517ae4c74d9f3c3242d9cfcd2f7e89c985f8da0299f493f946ce04437578afe4901b8c6c9009b SHA512 e188b470f4bd804ceff4b8e7496a4b18a45368b47bef39e6c790416a1a998d8092d24e9bd898fd52b28c93d7debf2baa1df53325fdfe8c9de8bb78066b983380
 MISC metadata.xml 371 BLAKE2B 74b3b1353d032431c5e82332cb821f124c2b55ddfbeb605deb8c04a14a32063c354125748c6576b808c21468446620beaa1011dd2e6130e7a68568909d92e68d SHA512 49cea17b2dda7be620a34c956349a316e71ddfca6f93b5c9130a47326787ac67f22cd4421cc1a84882756bb1de07d34b42443bbd2f8759348605cfb241a657bd
diff --git a/dev-python/ropemode/ropemode-0.5.ebuild b/dev-python/ropemode/ropemode-0.5.ebuild
index eb540c46a0a4..52d9fc458cb5 100644
--- a/dev-python/ropemode/ropemode-0.5.ebuild
+++ b/dev-python/ropemode/ropemode-0.5.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# Currently (2020-11-04) rope is blocking
-# support for python 3.9.
-# For details see
-# https://github.com/python-rope/rope/issues/299
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="A helper for using rope refactoring library in IDEs"
 HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode/"
 SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-# pypi releases don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/rope[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
 
 python_test() {
-	"${PYTHON}" ropemodetest.py || die "tests failed with ${EPYTHON}"
+	"${PYTHON}" ropemodetest.py -v || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 121f194e837c..f7bd50b3dcd3 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,3 +1,3 @@
 DIST rply-0.7.8.tar.gz 26697 BLAKE2B 95c4be3bbbd7aea7f278dbe0c37fd43d012df768169d0363d1a938f762c2f9ad69d596cbbaaafee3c93f3d615ea5cd1509e9b642188320f8acd09c12d6b7c780 SHA512 b43e6425f046561cfca616801d37d7151f015aeb2ea2365abc00f97fd6b41f1a01a17e330aed5a81537065e4b29d49cd0824b5a5cb8b2d11da2ff1f8de952fce
-EBUILD rply-0.7.8.ebuild 569 BLAKE2B ecdbd60485dc4b5753c8e05c161c0618a53f35154e8ec6ad7ea60ae100eaf0a296b6e53c48175011d0e8fbbebe1f1033dbcdd1988d887bfe385e5bda466fa815 SHA512 4469da5a4ee2d7557c7c391ea8c7484457bc5631cf8f3cbb443ba858252a019fc74cdb95ce3c35ae0a34a58b33cff8cd8ae719e4adad87e88a72690d7ded9d83
+EBUILD rply-0.7.8.ebuild 564 BLAKE2B e38b2b9ef9d91876ce5d266ec9352b7d389f7d0a628a5e21fe1bd67593dd75a41424e60907201a1e4fa6d16e190389bbb96adbcbb7ac6e428b11822cff7d2687 SHA512 85db3a5e14c7886f7b3f3b0a58fbbe08c07179cfa19ab98762c5da7df3f45e8a34f8d6086c4645a0c353825cb4b0f87224c65c4cbfa7ecdb54e507289a3a9ae9
 MISC metadata.xml 380 BLAKE2B 0ac53d36f1b21e8a614df2da1e992880124a7bf62b82b1ef65744b90b650ba539eb6f5575998075dfbd4f5f4a00a5813b8d71a5680e778cac749a5bee9be8425 SHA512 6e6be00947ebe96792114acc566fb0b5cc2e1e65d49c343d9a107a97f1fcbe2a072059290fcdd6f0efd42784fc5d4e1b9586f3f17cef7f1f83a6d2f617c4c52b
diff --git a/dev-python/rply/rply-0.7.8.ebuild b/dev-python/rply/rply-0.7.8.ebuild
index 0cdee74125ee..c17a94b90b44 100644
--- a/dev-python/rply/rply-0.7.8.ebuild
+++ b/dev-python/rply/rply-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -15,10 +15,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/appdirs[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/py[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 815507665372..685e2563996b 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,3 @@
 DIST rst.linker-2.2.0.tar.gz 14339 BLAKE2B fedeb8deea3ba3dc1f084a08476d2117787dd33c3ff2cd4c7881283e3c3e6813ffc143373812adfb4e578d21034d2c287a5af2b1e3dc9ae2f087cae9364d2ce3 SHA512 3e51103eb5111e1dd6e4e6f8c546a366eeb669d27b050de41a0580ac992117c530c322ed7cf31fd26a2f4a872ce8a7a41e801630e9291a6a644befd7272351a1
-EBUILD rst-linker-2.2.0.ebuild 924 BLAKE2B 747525356b987c823b7687972915646c09a21a0915c58cd047cf7566015d5cc1186e18ad7999af0a17cd7b113bc31c2aaf5f100227a807a4f787029768b3d3d2 SHA512 f0793f2035299acdc994f7222025f9853238322dc6b77249ac4e29fe4e15fa0a202c1cf68e59e86d73868bbad6c2b963d956834c6c502d748d95bbe8003f3afb
+EBUILD rst-linker-2.2.0.ebuild 921 BLAKE2B 559dbc67cf0864d0f2cb4656a1c38e6b53df8e4f9c8de45244bea237a8e918ae01c7f8c0151db38159d989645cb23606c954900f4de0dcb58769975463924bb0 SHA512 0ca493a22040a6975da714b83b42cb3706e314e1f2f7a0ab4bde929787c1827358db76b9fab83608f2a03bad175989bd99d021ee130a5f9cbd142166c1c6a1a7
 MISC metadata.xml 464 BLAKE2B 553b3e9fd8b0a5df09e6ff044ecc6724c155bff6ea5ce21ceb1cbf919e1dee65122f8902921235a40b20baf656a54861741633dfa853405785d8ceecdf0c37b3 SHA512 cb0e45d357d9134fda6c859885350414a04ba45d8a5bbf4424f3f4311f0e662aefce70238434392d8be98b0d7ecb6c470f6725935143e88e09463ff3f0519f02
diff --git a/dev-python/rst-linker/rst-linker-2.2.0.ebuild b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
index eea2a1aabc77..58ed324217ed 100644
--- a/dev-python/rst-linker/rst-linker-2.2.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 30a13f579a87..9799aafe7812 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,6 +1,10 @@
 AUX ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch 647 BLAKE2B af2f03b775539038b557879a7d01d42ca050ad2abcdfd60db07fa48129fdc90219577fe9f0ba1a51b897057ee36e6abe5fabd61b343956bf6edb3584144d6912 SHA512 55ae9245470076938d1bd5322b3dc6042267914eef30b3a64a278f5bd06c0fd60500463c6c0a33f80d09e326f0dc0f87986a56f1d05e2e7b6fd9c20e83949a9d
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
 DIST ruamel-yaml-0.17.4.tar.xz 178028 BLAKE2B 24c9f61cf8e158377ae839f73dcceab8fdbb8071d1a792a37bd96158993602625967805f177719bbe88e917ccaf10ba210b6c01e91bb750f4df6bcc8a4a66450 SHA512 4c3d51ff00ace64e00d5bc8314c8cb6bc193da2a90e2cc9b9ed97510a7035778917c56e10b85cafab50f296f2f46d8817ad1abfa01b0498715f4972d91545dd3
+DIST ruamel-yaml-0.17.5.tar.xz 182484 BLAKE2B 8e06b08799a2b8ec8cd5a732e689dd8413bdb3afdc621fbedfc769fea9cee6b06b33434765dfff048840b4b25b5b9784db6b93e22336cc4306103e91b0269e6b SHA512 99c8ea0cfcd3877b9a17fc781e32302359b9e704f72dbb53ede17fd63a78cce7f670de36a35d3ce9bd64f604c14741fba74a2c6c422a5adf484bbe5a31d464b3
+DIST ruamel-yaml-0.17.7.tar.xz 182984 BLAKE2B 54c196f07cabe7cc97e4e652cb1c66443461f1555e0feb002e7c02e725a094a468733bcb9423c3a6d7450d25ad508a6a7338a107f0b015b2bfb0c42a57d8957f SHA512 0e5c638ac69d41ac5ea4712a97a05a43ec947a6bf9890f7c29aac057ef554fe65b92370bec91eae2803fc83be6ad01f60668f3d81458aaef32871312a62a86b8
 EBUILD ruamel-yaml-0.16.13-r1.ebuild 1232 BLAKE2B 8f8eb1f7f8000aabec62f1ce4a457c2c4989ad83687baeaa0db22982b3ec45d60114661690e6d38ac6c7c2f420ce21e22c0314ef7334c532b994f3f814c03466 SHA512 e01a262271a37c1539d9d1eacb30dc327cc0610182be70b71605a9d636f807aef52e5013dbdde898deae887e28b24b252a9a2d0660c89d67b326975ba5886bc2
 EBUILD ruamel-yaml-0.17.4.ebuild 1306 BLAKE2B c63cd6753e7d39171aceca54e4f10b8a931b524167eb164d8d21fb786e154f48b51533b2a3f5bfb2357d2dbb5f7992459d878bd1eaf24e23c7e46c99788745c2 SHA512 71ccc3cf41573b25f0d378481c6f5e7684c2749c155520eec6afc37691d4978f9adb8f82d9dd3aeffa6839220b88ce64b3312581500f69643ef35d8bf4a45e99
+EBUILD ruamel-yaml-0.17.5.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
+EBUILD ruamel-yaml-0.17.7.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
new file mode 100644
index 000000000000..4b594b0aa1f6
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
new file mode 100644
index 000000000000..4b594b0aa1f6
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 1485cb1910ed..5fdc78b82287 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -32,6 +32,6 @@ EBUILD scipy-1.5.3.ebuild 4382 BLAKE2B 7a33344b2c611098a2f13c970ef554643dcf19707
 EBUILD scipy-1.5.4.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
 EBUILD scipy-1.6.0.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
 EBUILD scipy-1.6.1.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
-EBUILD scipy-1.6.2.ebuild 4146 BLAKE2B 7e1a560d42b21b24fddb88266b762b115432036ad0c971308fdf3c5708d34400d0914d41ef9b5725f19d803c6035b2241e31eb3c2c9b4c7d5a69be2f51310867 SHA512 84604c46d769f3e00d4983be7b66a59e764d84ea277f2f437acae605c6879f2b8b7ad027fc19f13ffd94aa736e58964fe81851e929ed1ef1ab7e6ea96f3fb88b
+EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
 EBUILD scipy-1.6.3.ebuild 4148 BLAKE2B e13e948ef779ed3adade409b18e1b7c663742261d6a0674eae9c6750a3efaa277a746b1623ed401b33e865720e4b8cf1e932c7a97b32f2de3b238a774138084e SHA512 4fa6d7b98ed01f6105afe28a32ace5025f67f5f3da1d64dffbe874de856876380beb17e3444efc52c14254f7ffcc6518eef7f4c388753e6142ed8cecf0aada5a
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.2.ebuild b/dev-python/scipy/scipy-1.6.2.ebuild
index 0dbd5ea0e7db..0230181c4d6a 100644
--- a/dev-python/scipy/scipy-1.6.2.ebuild
+++ b/dev-python/scipy/scipy-1.6.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index e2a38757e037..9a8d88dfedc0 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 557 BLAKE2B 8eefb1e2fc017f77157c2c791e0d35a4183f05b4bd344112b7b5365f2bedae0e7a5e943ddfee7568fe5b84ba404bd73fc5188ae896999a51adf84e0a4002fc27 SHA512 2edc7102006a4374b0bd7b3adced7a136eafe57b76fa88e124628217ff2ff499dc2e47f1524c4e3fed67d0088300c9ed4f3569a15e4bfa57d731c0d0e553f153
+EBUILD scripttest-1.3.0-r1.ebuild 563 BLAKE2B 1f5342eaf0e3cd67f26abcbadc003e23d43f8d267b7964a46b1192d8d942bdf308cfc3aa8d05c3231b07ea697083c9392e489fad4b7cf1c51faa311534f08de5 SHA512 dae94181c046afaf225094ac3c32ccda4402ccef6e520b296fdb4b63e61cae040085119f10972ba4283c9f0cc97c279784ba7bec94c23ff473d376118795f0e5
 MISC metadata.xml 368 BLAKE2B a456fc4f5ab5fff862ad4a9a0df4839f98e410d705d6cb13cbff433122f9d9ee574ce3b62b5e1f893041971c5e26c3a4e5c71a67e4b51091fed6d4622e8b5009 SHA512 e0145c39362c5e51095647bb3d085be3b4c9177d55e8c0c6245dd6d144cac9eaec571667300a406271bcf503c991f8e242c4ed6eb278ef1b28b7bdf08e823114
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 41ea10b85749..fdd926b2be42 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index 3a16858bf2c4..84c05f7ad0a6 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,4 +1,3 @@
-AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.5.0-r1.ebuild 586 BLAKE2B 5bff89f76608a6f71c8b91ddf046bca64192e77bc2d3a8a4fb23be36911bb0132f5a4e2338bc44957dea654f3978d28cbf65fa016c30a0be0494430c745ca820 SHA512 24a6dbfa588f02ab5b5bd7a76482caa610dc3b1eee672b0fbb24fc04efba39920f893dac590b46037a9a3d438a7ccd61f4d3399c797b13fbc5d28001ab186e2d
-MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
+EBUILD send2trash-1.5.0-r1.ebuild 527 BLAKE2B 69dbba6460b35ac80d564a5d64c72119dfe3778fc987e29e554814845bc63756e846bd63416bd5c1085ced1bf78c1ea79d4b129d0f357f6fb89eb8618ab19da3 SHA512 c2100a073612f7bff10a06179d8feca10f90137b834900d03d37740bd481c215cc455bd373a9e3b38af1e8f27ee976f4942ac9d27cbcfdba5e85989af4e94087
+MISC metadata.xml 385 BLAKE2B 49af248f1b1b2495658177330e1a0af6a56c3b913c6ec36bfa9e9370f40e66c4de1e5537231103155b1818898a445b1caf6b0583c20d441d5e7fd495ac7114ec SHA512 111e3e77734f765a47cbaf2205e42c96da88b5dc8c2cd0a1e3319aedd7a451a9e330b6fc0ada86c6166cfc9e7357d62ef7f14ccb7ee3d0dbfd2b5e31885ccf49
diff --git a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch b/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch
deleted file mode 100644
index 3f2a64ca2a21..000000000000
--- a/dev-python/send2trash/files/send2trash-1.5.0-fix-broken-tests-on-py2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74352462f5df2cb5708b96458b81afef3070c800 Mon Sep 17 00:00:00 2001
-From: Virgil Dupras <hsoft@hardcoded.net>
-Date: Thu, 26 Jul 2018 08:30:39 -0400
-Subject: [PATCH] Fix broken tests on py2
-
----
- tests/test_plat_other.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_plat_other.py b/tests/test_plat_other.py
-index b94295d..ae4f391 100644
---- a/tests/test_plat_other.py
-+++ b/tests/test_plat_other.py
-@@ -6,7 +6,11 @@ from os import path as op
- import send2trash.plat_other
- from send2trash.plat_other import send2trash as s2t
- from send2trash.compat import PY3
--from configparser import ConfigParser
-+try:
-+    from configparser import ConfigParser
-+except ImportError:
-+    # py2
-+    from ConfigParser import ConfigParser
- from tempfile import mkdtemp, NamedTemporaryFile, mktemp
- import shutil
- import stat
--- 
-2.16.4
-
diff --git a/dev-python/send2trash/metadata.xml b/dev-python/send2trash/metadata.xml
index 9dd529756191..706dea08435a 100644
--- a/dev-python/send2trash/metadata.xml
+++ b/dev-python/send2trash/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">Send2Trash</remote-id>
-    <remote-id type="github">hsoft/send2trash</remote-id>
+    <remote-id type="github">arsenetar/send2trash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild b/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
index e784dc366bd0..de7f741d8910 100644
--- a/dev-python/send2trash/send2trash-1.5.0-r1.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0-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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
 HOMEPAGE="
 	https://pypi.org/project/Send2Trash/
-	https://github.com/hsoft/send2trash"
+	https://github.com/arsenetar/send2trash/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
@@ -21,8 +21,4 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ~arm64 x86"
 
-distutils_enable_tests setup.py
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-broken-tests-on-py2.patch"
-)
+distutils_enable_tests pytest
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index bbf8105f62c5..89182c40bc10 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
 EBUILD sentinels-1.0.0.ebuild 419 BLAKE2B 01d42e26044bac3ec65072517ff5bcf2522053705519ecd0f04d3b8821e0b341baf94928afd6d0a65aeb1bf17e47cdd7c7917c4b7da4f685a61f30cfd58781b5 SHA512 30393a5d19b3d25d64c2c15c2e69a14c8a11ecac04c1c52cdad208b0556250042228f20f7788ba8867b69376cb0ff9712a0592c432c4d661cbe5ce397d562073
-MISC metadata.xml 769 BLAKE2B f11c8decca22381c0210a1eb47e43610b3a3d304a011d9536ea8d96e59b76364fe5657430e6c5a7b03fe59df989467a5d1994ca7afcfca84e53161209916d6f7 SHA512 d431b74df62663b3eb774b3f6e1522ef28eed0addabd3b8a2aabfb21bc7a76f024f7725dc8de7e7c330b3f4ad84795352ccde94f3e28b1466374f2be83f31336
+MISC metadata.xml 531 BLAKE2B 7f6749f362395ac7fb6b7d81f768ee63d4cd9a87c15419d370b3c18ac2fd221618f3f052249a23e462aeb6a0b0d55358f0b813d04ebd0c4f2c3b18b733f735ff SHA512 c2c581c87cb0ba73e55b272a39a1e0754d99003547737a01f8e0d0ae9c62b1e90e888fbcc1ce6c0fc69302a8490ce6966fc691880ad65b14a716db72bb2c7c07
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
index 36db561eed8a..763820aa1174 100644
--- a/dev-python/sentinels/metadata.xml
+++ b/dev-python/sentinels/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vpayno+gentoo@gmail.com</email>
-		<name>Victor Payno</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 2b38ff33e132..06e3df82e78e 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
 DIST setuptools-56.2.0.tar.gz 2110133 BLAKE2B 90c75ba006becc9f564eecd7d46a9ce70c9ad17eacf2e17b3551116b962e08af0084919fccc18ec29a54b98e8fe2419d129554a7b38fdd1104f472fb2e6f9995 SHA512 858d46909335ff0b0441d5860788803100a8fe9f5a1d1f17353bf961bc77191c3237501c1838fdb6ec8e4b2c66874ffd4e8342b42cc2673cb866706660704ea6
+DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
 EBUILD setuptools-56.0.0.ebuild 2233 BLAKE2B 0474e7ac4c8f4f74f05eb031143a29342f0cec87c89603552142ae87daa053c3f6ee6301cb4a09eed078272448c9a754e3f7ee4bd4493bfaf96b35f9c9b28262 SHA512 677933aa3cf01c60a686229349bbce6f9d1d937e2fbc25b508c78005ec335e875ce9922ead6ccb3418f30b577a6077a5bab9ea4d91bb99880f29ed4c53557101
 EBUILD setuptools-56.2.0.ebuild 2384 BLAKE2B cdb6906701bc92333c56ae2848132dd46ea276304083a7f15bcbb58731dd9f03c9952b1f80ee55bd7490ff60644c86dc9c3e23503db588b4bb3adfe936388c62 SHA512 4f17b9ef8252f8301595512a2bac69837e84fbc68895f9f22d0f859dc673b2805386e06c115e1bc7c421b72927a00a281b1293a217948fb993877b586c78a4cf
+EBUILD setuptools-57.0.0.ebuild 2333 BLAKE2B 4ded8303f175a641286303b299a94eef12c678b9540c416a1d43a484dee95e798b28296c56ae6c772e3c102fb22483ff649e4576efee9793aea280d228cb8d34 SHA512 a14911d34b702037b936c4e5948fdb97bc710650e709e00df07faf5010d21b8692c5f4b3ac66a90bde7bb9092e3a13c78343a3ad183b63de4aeb6433bfc25082
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.0.0.ebuild b/dev-python/setuptools/setuptools-57.0.0.ebuild
new file mode 100644
index 000000000000..de5047202c8c
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+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 )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{7..9} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	# temporarily skipped, until we port all test deps
+	[[ ${EPYTHON} == python3.10 ]] && continue
+
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 3b32f2314680..78c7a6342e06 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
-EBUILD sexpdata-0.0.3-r1.ebuild 566 BLAKE2B 3d3e79648eb3413c970df566788b98ff577350753db6fc0552fa16b5989904d487593a5e44898a75594a99fc4218e482c7a469a79acf5319a44820180e5704f5 SHA512 88dcf43bc4c4b012f9ca169e2c724cee4a5e258052d67c4c633cc2a67e8e9d1fcfc358982531da9d80a54a4de74cc922a6facf7283e13901af865b282054fe70
+EBUILD sexpdata-0.0.3-r1.ebuild 465 BLAKE2B e5f7f34fbd6d3d41124765656ac47997ee9df46fa00206e1c62c32e343087c0bdc6a0bcdf52f1a1527c22b765349b31d21ef524fbd3a49d794edf29780d3ef78 SHA512 97eaafcd97b470b015a305b16469f1fa925145cf5bf51dd427a7eea971a9162a938fdd972f0e254d3736a000763ec3ae130405dcbb83e63922a50f459fc677c8
 MISC metadata.xml 379 BLAKE2B d951ac42c3992b2e8ca77b0bf08f138fad54afdf0f530868cbdfc32433a80b5b138d6a66833a397d6103d2edf0688958678b1b977946024ca75d95e8f7c02110 SHA512 d744cd48ed7fcfeef233d0731df0603a081c232c8a388b50402e494513929cbb6352a563525addc418d11c9eac73c2bb09e8d7f53112ce1618251e4447405a81
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index 5eb8bbd6f85b..e4d0ca64c36a 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-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=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -15,11 +15,5 @@ SRC_URI="https://github.com/jd-boyd/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die
-}
+distutils_enable_tests nose
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index c5f475901c7a..1f8ac3f76e71 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD shiboken2-5.15.1.ebuild 6589 BLAKE2B 160086d42bce0eb41e18d7d78266a79a0906902ade94af70ac390650cbb2b9246ec529bda412079f63b90855539b56a8dcb9535fac06f082773a6369508901c6 SHA512 1fe97a6e1ab2594fa74a56d2b3fcb56be55cde252a1244f045c5e9f300f5d7846a6c8d9127ba6a1731b3a6404a8ba7203833d7df5436e6ce356a1591acf85569
+EBUILD shiboken2-5.15.1.ebuild 6588 BLAKE2B fb86362764b1be95846b779ef049e088fd4d6f68098ed342843630d6f19798851e0cf17989a5e6d2d8661b22691ab4a2330c4523c986ecd5cfdde5a11e8c7010 SHA512 3074a50c7244af23ea0ef30b22cf64605dd9c05d2c67807eccc83049295f968277db3d4ce8e89e94d932989940d8d9f6eaa70ede4977c724f4505cb5de567aee
 MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
index 296f05b0387e..19ac8483267b 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index 5c59719d6be1..799103f1d658 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,3 +1,3 @@
 DIST signature_dispatch-0.1.0.tar.gz 8715 BLAKE2B c62f5d0b0b263e50215d588e83bab4b5ca6dff82f856ad6265a0bb2dd64e2a3a8dfd0b8989ec17424828575607bd4dccc5802ef072af271eddb88c2479e6b8e7 SHA512 687a1de540a61d274e93510d2c5a93c736a52587b0215aef91364e34ad8932b880361b53fb84e68f9c2083652fa97c759705b4d61bc74caeba73a4ff37b42785
-EBUILD signature_dispatch-0.1.0.ebuild 504 BLAKE2B ae812d46d7f48d16496d03b0bbf6dbad28799ad5a8f6d0a0edb3c958fa1bab5a200def498d2c543f9fd84ec772ae4d41861d4b7549213c7a8e7b64be2b23c989 SHA512 db6f0d53800a519fbb620b7f7e674f872c0701c381a1dd44363f1c5cb828d0a9b520256ce46d986c2be4f763b873fb1669379879930c938f2dd7e94454191290
+EBUILD signature_dispatch-0.1.0.ebuild 505 BLAKE2B fc8de8b0ace0179bb7618f53b02d82f7b82cb8c3467085b43095319bdcaf7fbba7c871c956251693cc48d9b40833567d98953361c626901dca6bd173b6163b4b SHA512 66c425ebbf62950d3d5c1f85534aba0369164f0f72e9f063dc7f9016f960f8096a31cf0157071eab0a8009c1c0b0921a2646c3af7ad09a92c9c7b97ba1cf3d98
 MISC metadata.xml 393 BLAKE2B b1a6b8868d977b7d8c96a6ac06cf9ee4f34c9dcf162d6eb4f8e5a45c0bf31b692533f7291f8875261fa14a8ea48ff96cab96b9c0a533a75013fc12472ea95940 SHA512 9706906e9ce4d27c9053eb99c54c98301ffca6ead45191a9386ce4bc1f0daaca58b062397b93515fb2d9ecb0a9d4f6f6a26a96ba238069bdcad411eaabb7204e
diff --git a/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild b/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild
index 6b816f74012a..2f025368e570 100644
--- a/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild
+++ b/dev-python/signature_dispatch/signature_dispatch-0.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Execute the first function that matches the given arguments"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index b2df2528dfc0..224c9ebc0b07 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,4 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD sip-4.19.24.ebuild 2282 BLAKE2B d58ef24520a95ccb3a4f2113769a9187f2b1ea7172e6e63ae992565c20a413b7d3a8ad91f00c719a8117ed3ef5d4a23e717f21d026cd1a37fea07b95b222920a SHA512 005130da866237d4b391c2b516c1741e9544503adce8e61bea83a654649e3b1e073682eae29022d5e506476daf51b127fcb95279500306a096bc61cdf6910ce3
-EBUILD sip-4.19.25.ebuild 2276 BLAKE2B 2bccef09bae58cb39f4fcb41f99d704b631b53403a7744daed309cc0f910f07336b169c457127508d0b73f8f8ce6a11bd4b5f1a15cdd508041c92a2992bddc79 SHA512 a56729ff7ddf6d3afb06d4430aa4e4863fe521b91c8eeee3e62ef884a87ffb8c1030b14deeb4ec64e5b638b9bcfcb12230e3b50abf43689a74b043fb46f41001
+EBUILD sip-4.19.25.ebuild 2271 BLAKE2B 7cbea5a93443ee348c5cfd2d0341c6b4927d1ee22b4d92eb64dd76c1418787389cdbf85b955716e5f795770d1e7292503ba12f424adc1c3e0a57f6922991ea55 SHA512 88cbd929f6f72c1e773e4622a4501395fcaa0656945456d5938c6a848f9d3e86de21cd5739b3cd7a1bbeb571d1552bbf92de37d66a9bdf879f58b9ff25ad60e2
 MISC metadata.xml 642 BLAKE2B 496a8870b0d30bc0587fb4729dc592eb335a8f7323106f8559a01980e25bd3efcc23ebdebb4a5ae9b1ac2c1397f41b2e48d21daa16b89265531112e5ebd7822f SHA512 d2e0e0b142a3cdb3f7f279c9c16100ba7a720c1d1348282ac4aeaf9541d6a351495a22eeb2e1f60f1dd3ee7998da2624a09b47abcd57093f0e273d797215f8cc
diff --git a/dev-python/sip/sip-4.19.24.ebuild b/dev-python/sip/sip-4.19.24.ebuild
deleted file mode 100644
index 13b20ad0c9b7..000000000000
--- a/dev-python/sip/sip-4.19.24.ebuild
+++ /dev/null
@@ -1,94 +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 python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
index 1b8bd36af39c..c75d9a8ffcf2 100644
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ b/dev-python/sip/sip-4.19.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/slimit/Manifest b/dev-python/slimit/Manifest
index 1b62df4b7a9e..539b5d4b6c04 100644
--- a/dev-python/slimit/Manifest
+++ b/dev-python/slimit/Manifest
@@ -1,4 +1,4 @@
 AUX slimit-0.8.1-fix-python3.patch 18813 BLAKE2B d4cdfcce63635ad35ebd7c1c4a42ee9b1d4fba2dea4aac3a97274c98e012b615dbd121413243e1279c00ad731527bf311aa5fe4dc25fa174b5142abb4f990c32 SHA512 fad15e30fea0000f797db6e113ca83d847e412c5906e42d15bf1d8afab857d617403f92b733ebad761cd6182e16e5a8f21081829d2410f9842bd8fa8f093b8e8
 DIST slimit-0.8.1.tar.gz 90096 BLAKE2B 9bf7a00fa7aa48a47950b2db66868c03e3923ed7b878ac4d93bd92becc1909cb79a15365db8185f6d8872028e0d01343394e4c768149155bc6aaeb4acf69954f SHA512 ce33dd15c755b8327a73121322b525738b5f8d83c08b0b6329fa6e090575c68883b4bfa29df04544e5f566f3a81a60e480b5e760e2b0e67644a7db5e25604cc0
-EBUILD slimit-0.8.1-r1.ebuild 971 BLAKE2B e12621d231fc740759ca0e3016be53ce0eae76950a863e06d1602ea3e77f130fa5d5a96670f61d4a54f7ed5294be3721c8b224f846374c1fb9aa0c3aa00a8381 SHA512 fe4f16ee9edbfdd83d30a06505e7f0a814dfdd90555ec51002b070a4ed9246e80fea88946c94d9e4c34a78084e5ba7c51e72c6dd6b938307636352f9b48dee5c
+EBUILD slimit-0.8.1-r1.ebuild 898 BLAKE2B 320e76b7d4f63da47a783ce4fafe4411a761060ddcfeacc3765f9ee66ca59c26fbe57f19f03f4bbd058693deb3bfec0934113099bb762dfd12095fd9dd1164f9 SHA512 8afc481fe2fa80962bac21cd8f2eaa2b8f68ea163e98b1fe78778d083e44fe49e7312c783ba933d9f56ef7d37c0d1c40c641e44e35dafaaaf2707c466c6eac7a
 MISC metadata.xml 480 BLAKE2B b3143e1d196b7904d7e2941f230b6eb473e91a97957ecc2dd989c79272bc116d09f8c5340a267599c5f535b3376511f95a3fc34b5cfafe0924337d0df5f048f3 SHA512 25cbf46f9d6a5246e2640f173c27265d177cca27818032bd172adb353a8da175f2645ba582e0d0f5f520e3665e7d4bd9808be42effe009972817892a53138331
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
index adb879571797..d402ab74e3ea 100644
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ b/dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
+EAPI=7
 
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript minifier written in Python"
@@ -34,5 +32,5 @@ python_compile() {
 }
 
 python_test() {
-	pytest -vv "${BUILD_DIR}" || die "Tests failed with ${EPYTHON}"
+	epytest "${BUILD_DIR}"
 }
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 5f899f35c28e..6586a7692d85 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -2,5 +2,5 @@ DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe
 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 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
-EBUILD slixmpp-9999.ebuild 759 BLAKE2B 73307904570350f10e384b16d54944f2ad1d0c0ec07726367a3bcae3b9f37b2d790dcb65bb7ac4600185791fd8c656ab7525b6826ecd67b48131f05a1ce7b96f SHA512 4052ceccc8b8ac8c71d171f7c2238dc504e5cb7855a08af76fdc8f37aab792a6ed1cad4694f673d551eb69caf3c69851605b906b1ea1200f52f87da34310f579
+EBUILD slixmpp-9999.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
 MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index 4bdc2f5616c8..0f5e88aa5f6c 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -31,6 +31,8 @@ RDEPEND="
 	${DEPEND}
 "
 
+distutils_enable_tests unittest
+
 python_test() {
 	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 3b7ff482a580..743cde47a842 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
+EBUILD smartypants-2.0.1.ebuild 750 BLAKE2B a9b166a8191b72825def7356cd65662ec034e18ee0319e6dfa079c555eaa82435569767f9e97246582a59f0e9d6958867d93ebd422ffbaba3f5aa3935917cec9 SHA512 dc4b82cf1abb44498088cd1cbdf73225c908009fc1aa5438dc43e11179abaeb67e902c395427845b0d6e808a8a95cbb1630ef9f1056b34302e67bd365650499d
 EBUILD smartypants-9999.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
 MISC metadata.xml 611 BLAKE2B 7dedba0a692b077992808f9fa6fa626d43b60cb3e09ade5d86be8f808ed356099ca59e462a617567175086de3082e47a73ee7e21206ab97f8eccbab4247703bf SHA512 3ad913668e585a605d3bc4ba3bd10931c8f9fb118c970384dfc25dd779819bf20ec6e643d8c71c588cb27801978a890d2468bbf7d408c4b797dc1f78c12fff51
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
index 418910a52b87..497d9ce22b65 100644
--- a/dev-python/smartypants/smartypants-2.0.1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 294537b2f156..d06805bda23a 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,6 @@
-DIST snakeoil-0.9.2.tar.gz 271441 BLAKE2B 754030285f03c83979c74da6cf8ee585486631e2dd1410c0da4a8e4c59a0367d911af3bc82ecf9e04438e3227982af8789662022ae5dfe5e1d83863aa2ec001e SHA512 664c91236500aafc81157132c5138d14972e9b74a344fdad65064440acdca0cbbdcef63b1d3b4d09f120a14a1eb40bbc8e7801fbbf2fc3b289b615cdd6caf61e
 DIST snakeoil-0.9.4.tar.gz 271395 BLAKE2B 6aeaf03e2c2f48a85ce926f1b8e0b86271c608695694358cb6eea56b962c0731b909c16bf37844031e986fc7ebca3a7c4cae5cb94ee55122584bf83981d8c4b6 SHA512 853c3fef517e7161a61ae0622fed82ceffdc110cad4ef7d5e2166728f506228d0802018dd351956f1525f0d27a4150e9885b2cc7c71788950261f72d8d7c4cc9
 DIST snakeoil-0.9.5.tar.gz 266086 BLAKE2B 635d2d821e47a92a668b2e95364d6587f0f74c21438356e708d6b16ed6c027df39a28f73d261d8ae06eb32de471124cd5ba5df0fc899f59dad5f7d2363391e00 SHA512 0762d90932bdf995160b3410e224660dae2cce327cdc30d5093ca9e3d16d3e910f88e409a87d2d7da211b850f7d0b7d9c70f053462dd9a651e4202b8ca018105
 DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338edec0eb00c9a5be505a9cf7d4cf27b140c9bc56fc42156dc33a7990e8a269d1a69df7cac92a71b56ce612b65ae SHA512 a900c76ecd5a3519bf5236567e5f9d59bca7c5f7588bdcfbf1bec0d912352486c86dfd4677b0aea19170bc9170109ca782dd60232e365008ae016cdf9ade7217
-EBUILD snakeoil-0.9.2-r1.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
 EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
 EBUILD snakeoil-0.9.6.ebuild 810 BLAKE2B b59f58b00ae58ff8664bd74bcd8ecf7fff28af5a1733d2e3074c706d243e4da8a962b8e9ac81f574340753f694cb0959d13a4194bf91c1ca734aae9fde23a1a4 SHA512 86eb29280f8dd4064647a95f9e4c302b96c27a33b76bfd539545930ffa93f94399e44bea2245eb45ff97e23aaa2b7f091d944ff98a09bef970167f087c454f6b
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
deleted file mode 100644
index 221b582e9b7d..000000000000
--- a/dev-python/snakeoil/snakeoil-0.9.2-r1.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} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/snaketrace/Manifest b/dev-python/snaketrace/Manifest
index ed6226d76939..8b9277166600 100644
--- a/dev-python/snaketrace/Manifest
+++ b/dev-python/snaketrace/Manifest
@@ -1,3 +1,3 @@
-DIST snaketrace-0.1.1.tar.gz 4119 BLAKE2B 926861e84905e8331ab05a39a5f1f501af1902ff8cda31411b6f3509dd66bc1cd24392398d7cf599665206ae9ba214e640970897b644113cabdf2ccc29f9c9f8 SHA512 85f2a697308714d8bf3309fb27dff6ecbec3358215f31e06d97dc746b05a24cbdd7df2cd42cfe8d2f10e069ee69c2956197995ffb6ff58c1cd46aa323e0211c4
-EBUILD snaketrace-0.1.1.ebuild 460 BLAKE2B 5373133f6fa2a5e4d43c1ca60d608abd702929a83e168d36ec77a8a80f126dc1fba7f66e322969e6c0bf3d8f3ad82ecb94fd436ab1259d75a63df797bb710ca4 SHA512 64a9d7dc5efaff1340b01a423c98418b0d81e5c03797d462bfd792564d3c4b6280c6f912ae186dd0dff4765b1aaaadf2c96efb6535a4f2bf965592f6f65b896c
+DIST snaketrace-0.3.1.tar.gz 6885 BLAKE2B 19201532a3189e981c88343c67920c9275e41c23cd42ac416d6deda037de6dcdee0346a3ea487cd32311aa97596803b907266a3c1d643bdb679206e64d45b078 SHA512 9efb16309e638b9472a6b7fd8415ca5c40b3b498ba0676767ffea4bcd07cfdba23345b5cd53a0b9d88f7d81f454035f126cdcbf2a51f9a04e1e7aa6e833a20fc
+EBUILD snaketrace-0.3.1.ebuild 471 BLAKE2B ad7c0519fe8c6fa4696140f1fd18192c11a25ba7299ab4a93efc8a0b5e74c1d44761ab49b3347d018e6f4a1f3cfad546e9e1a0135b521483bd6c68df9db4c195 SHA512 9a955b05392a0b751924ae2ecbfb769aad1db04cdd0ba5df274dff1e0a93f748c69685da2bd0575b525c39a7fd9d03027e557f655af676dc1c44b887046a14d7
 MISC metadata.xml 379 BLAKE2B fd83d750b9cd2b0641baa21207a4fee0aa656d9c897c6f1933df4a32a11f93ed7c58a4026ab6cd6b1fcfa4fa0fe0342092181b3f2703d55e01197c5687680005 SHA512 2f6587ca5dac4f9e181649b8c742365e679b6a71aa2380ed38a52e89ad6c56d3eee7e8859e105abd60b98014e040df57b1f0a90404b860d3536df2e2ab656ff0
diff --git a/dev-python/snaketrace/snaketrace-0.1.1.ebuild b/dev-python/snaketrace/snaketrace-0.3.1.ebuild
index ee5776d7e18a..045db2b2d4a0 100644
--- a/dev-python/snaketrace/snaketrace-0.1.1.ebuild
+++ b/dev-python/snaketrace/snaketrace-0.3.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="An strace-like tool for Python audit events"
@@ -14,3 +13,5 @@ SRC_URI="https://github.com/dcoles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/snapshottest/Manifest b/dev-python/snapshottest/Manifest
index da1e1cfb88a0..dca14c2bc9f3 100644
--- a/dev-python/snapshottest/Manifest
+++ b/dev-python/snapshottest/Manifest
@@ -1,4 +1,4 @@
 AUX snapshottest-0.5.1-remove-fastdiff.patch 1978 BLAKE2B 49bbd2118bd8defc3134b1863614a6da7f45f8702c9b65db35329a74b270a511ef6c87952eafefa5e64080c136e21fe7abbfb1e304ff1744983bfa6fcbcc27ee SHA512 804223af644f67a7ad22996572bdb35c88d3c87bfd67ef821b4ebcfb581281f305f9d96edfda9d8a20d5cd1d07397899dc10b629f7d02b91c2b8804e02fd1ac0
 DIST snapshottest-0.5.1.tar.gz 19312 BLAKE2B a8acfb09de9e58c7a929f71d10f3cc68d7eec31a9fa1ea0fe74ae8a574ceec315f7eab2f9e7cd326c34d981b5ede4c398b5f1352bd59c23be219eeb9a2c0e861 SHA512 1541c327c4238c816b55cf797f6104ad54ff62a2332517b3bf9a455bbee0abd49f6983a54dc7510d1e1c659d88e5f7d6c6aa396c0ece19e19957ea8cff42c673
-EBUILD snapshottest-0.5.1.ebuild 1260 BLAKE2B 6160ca5676deba6ec488e0a64bf8d5473965ab1880b509275910c0f9de6a88c3c21b36cd417b5a3419d942da676922654032a93c85dac578e65cf4f70ff4117d SHA512 e376d695907d6e7dcfc6ebd2e58d572a8ce63daefd5c40c5c4ed2746eaea93df234085decaa69e350a1da82c863ee613d3f795c516f200f43b5b46977461efed
+EBUILD snapshottest-0.5.1.ebuild 1116 BLAKE2B 4105aa10a0b6fe8229eefed46bd4ac456041a53064552c442ed7618833aa0cda7808edef055bd868c33ba9a801710e65df8ccf1d292d7a082f768a56f216d476 SHA512 da6567fae19195269dc8b78cdda647cffbe1266a24e1f9eec3d900d08902f882aa272c71d2e600ffb38f7b48d605f0a1c6d111c5fdd539519e368d89af052fc0
 MISC metadata.xml 379 BLAKE2B dd820515dd1513206bf39c277ffdf7ff17e14b75fbb933475e642eafa75d2bbcb77c04cbb80a3db8cfde704b67ffb04d426de3609e9cd0f8db9b6907e4c74335 SHA512 35cda720f330a8807f7a8dbe518e7de5df037386689ecbe6cd9ea816cf78d350053a7744c3fa266d824d32205125ab75dca0a5dd187e33c9b9b48afaf35ce8c9
diff --git a/dev-python/snapshottest/snapshottest-0.5.1.ebuild b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
index aec16c0b697d..c49cc1e8330a 100644
--- a/dev-python/snapshottest/snapshottest-0.5.1.ebuild
+++ b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 # no tests on pypi, no tags on github
@@ -13,24 +12,21 @@ COMMIT_HASH="4ac2b4fb09e9e7728bebb11967c164a914775d1d"
 DESCRIPTION="Snapshot Testing utils for Python"
 HOMEPAGE="https://pypi.org/project/snapshottest/
 	https://github.com/syrusakbary/snapshottest"
-SRC_URI="https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz
+		-> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}/snapshottest-0.5.1-remove-fastdiff.patch"
@@ -44,6 +40,6 @@ python_prepare_all() {
 
 python_test() {
 	distutils_install_for_testing
-	pytest -vv tests examples/pytest || die "Tests failed with ${EPYTHON}"
+	epytest tests examples/pytest
 	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index e83e6b4b4afa..62952cb83195 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,4 +1,4 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3-r3.ebuild 1487 BLAKE2B 3c5885bb17543fb65e083741ef55fb4e9fb3bb579f8da8ffc3fc23c6e2ec84b59220fd56f90644c36c2fe32406fc9e9c71a3364983e0a6e4174b89924430d9ca SHA512 1b42ad7d2523ea5b03e117e82fead15c374a80b7e38a8c7daee979ad7b776d86c4365423557a7e0f059e59914505ec2d58f7249b15d2a696e542d76a43df13d2
+EBUILD socketpool-0.5.3-r3.ebuild 1466 BLAKE2B a98653e90f0e561be3f96c9f75d4077eb7a493add49cfd602f30bcbae930d573a3871f59f39775b7f88248a18ee0ee821c5523a2e516fb136f67b0a47c4cc444 SHA512 a31a778176d3887dce6b19ae5c5b521e11e8bb039bba4d6941dcdfad1b151cb5c58b51bacda1a35941ff0ba5d0c0a87fee5de1ffd92a0c4d57a2bba1eb10c377
 MISC metadata.xml 671 BLAKE2B 4830d3dca5040e6a7b64449c56d35b91421a96c703e04a3c22ae10d62d4f9f262a7025cdbfe3c7589bf2b5adbac90684f5d0c9b26bd9ca80708bc9d5fe7bce48 SHA512 8b9aeda2388b10c703b3266a206e04746204d3b66334a902adad17fc794458ffe3e12116ddd4628724c323a6f6e2620acd0d5c36055271f56bcded01205acad8
diff --git a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild b/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
index 9e39a53f35d0..7ef6347c4930 100644
--- a/dev-python/socketpool/socketpool-0.5.3-r3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3-r3.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=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -20,12 +20,12 @@ RDEPEND="
 	eventlet? (
 		$(python_gen_cond_dep '
 			dev-python/eventlet[${PYTHON_USEDEP}]
-		' 'python3*')
+		' python3_{7..9})
 	)
 	gevent? (
 		$(python_gen_cond_dep '
 			dev-python/gevent[${PYTHON_USEDEP}]
-		' 'python*')
+		' python3_{7..9})
 	)"
 
 BDEPEND="
@@ -33,10 +33,10 @@ BDEPEND="
 		!alpha? ( !hppa? ( !ia64? (
 			$(python_gen_cond_dep '
 				dev-python/eventlet[${PYTHON_USEDEP}]
-			' 'python3*')
+			' python3_{7..9})
 			$(python_gen_cond_dep '
 				dev-python/gevent[${PYTHON_USEDEP}]
-			' 'python*')
+			' python3_{7..9})
 		) ) )
 	)"
 
@@ -55,7 +55,7 @@ python_test() {
 	cp -r examples tests "${BUILD_DIR}" || die
 
 	pushd "${BUILD_DIR}" >/dev/null || die
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+	epytest tests
 	popd >/dev/null || die
 }
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 0683eaff8fb2..d82a7ea84655 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
-EBUILD soupsieve-2.2.1.ebuild 708 BLAKE2B 0a9d70e1895dff0b36599dc45e641c1d7d4d90a073e598214af52bf85a86c1a440e421bfeae038a8e5cfab4d5570b569866872e723fd8d9b1faae73f2cafd8ce SHA512 653ac9f3a3cf861181fd2667ee563f9f85351ea9c1d53531481c3b9e30b5df3948bd96a414c8a86e0328459e14064beae8cd1ba2a07a9d5d2ecb28dc07aaecf5
+EBUILD soupsieve-2.2.1.ebuild 719 BLAKE2B fef1a146867fa97d78d4bfb6c9f361ef12181a677b2c55d807d77b3a1d03404daaa5f44cea91c6708af86769469e708d817fba8b638d664784e0a70f40967f81 SHA512 ea0aaff2aaea415e6ec4841fc88f7db4ad4962a5ce30d86e12bdb3bca6ad5878f3127c78659181562fef35b0211a2fef698848dede53effd1417b3f086e99c1a
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index 919d0817a5c0..670fe35d2978 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64
 BDEPEND="
 	test? (
 		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
+		<dev-python/lxml-4.6.3-r1[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 19e8fdac2c30..adc89c176bca 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 602 BLAKE2B d924e84096aca6c4ab6ec44fb97ca4636c2e3e478507ff310cb9cc853dfcb93d81d4457a248f9435103a5ab2b1a1182cc82444ad425efcad9f473a258bf5e2a2 SHA512 3b0b76b9f1a4326179d654b5cd5906d5cca795562d4542d3b77366692e23344514029949a6d82b3e115405ea17b1544070d5c31e71b24e4232dff8972cc83883
-MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 534 BLAKE2B dd7643deeb214b105119baa25f3c124b4d91b772a99628bc757999e4163d7fb7dd92d22d5eb3c9f09f79784896730746c687852f6716d95bbc891c2d45775d8e SHA512 083b9b30aaafc3d0c29140cbbec386cec0d05e0f3b0e80fa98c9634ab4c9e877d4f1775d377983563aafd6d79b92741912e302eaa1b6a96f94eb4c033cf6804b
+MISC metadata.xml 380 BLAKE2B f9161bac35d456128d01040ec0ff42e8f13756f17216d9a16d6f72dfb000c8b4cf1be8b1fac3720f17878ac686c5c95a0b186307a8b46887e81bbe46a51044c3 SHA512 4488ceb6b724d0ac95642b0335673aa959238f13149b788e614adb89d09a39d75ce04f9c1addc1fe72b0c487a97fa6186feec2f669b999517e04163c0d89ac27
diff --git a/dev-python/sphinx-aiohttp-theme/metadata.xml b/dev-python/sphinx-aiohttp-theme/metadata.xml
index b7700e6c436f..3855458b104a 100644
--- a/dev-python/sphinx-aiohttp-theme/metadata.xml
+++ b/dev-python/sphinx-aiohttp-theme/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/aiohttp-theme</remote-id>
 		<remote-id type="pypi">aiohttp-theme</remote-id>
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 6f7073108ddf..f2b632ec308c 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -1,8 +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=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -12,14 +13,10 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Sphinx theme for aiohttp"
 HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 6dbf6861cb20..3b3535331236 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-gallery-0.8.2.tar.gz 6530210 BLAKE2B ba1500b9870d89c686dd1afbcab4797e15944cbda4d8d2faf02bb65435fa4208bf7dfae70285c920ad2f3b82bc085b06629fb3d2807462f92e75be91ef1e81a8 SHA512 52dfcf320d1e53b2ee985482af5cee63582b26aa6f3969f2d83e6ffb9503712f5d1a865c849c4b2111f7fd4349cefb158874d8faa323e4e7d73bf547a26f3a93
 DIST sphinx-gallery-0.9.0.tar.gz 6530860 BLAKE2B 925a745a9bedaa98cf03fbd66bdb87e5c147543a21944d827f738ea1a8bc657a01f0eba2fa5abe64f7bd3632bef604d9490740f2b6fe5100bba92aeb93f3eaf3 SHA512 e511100c5add06de681b0682c90b3e914d49625c63391896dfdec8e6f6f378cfc65fc3425d4216ee0ebbdd4feb3397517ca40a838947b31257654fff2b8a7e8a
-EBUILD sphinx-gallery-0.8.2.ebuild 1083 BLAKE2B da6179da23af96f1e68fa0e14dcbb63acd216e8b649f84429c7617e8b44ed0248c6d11860de23f316cb2419b9df3940c821f88ac4e7b29341cca67cded577d1b SHA512 cf8379ee6f0dc0b5c946c65ae49003015a97df109e4d4476f3b1d26b003866023271b632279a482c149ac24246927dc20d40e621947f867c31b8fee73364adac
-EBUILD sphinx-gallery-0.9.0.ebuild 1118 BLAKE2B 252350c9945fd9945fd7b9bb5d40e043ed6e0e6444655dc86bac3cce2a3dbf893757ab779c88cfdaff1fa90d156cf17a009f4835862b55e99ce99a98ffa08430 SHA512 a93c58495b5f231ed79c5b75c6daf3b90319984d7f2f72d1b98650819a88540a3bac53385f46accf1f2bdc6501721d4aaa55b96ba05e7db59cb424eff7acbe4b
+EBUILD sphinx-gallery-0.9.0.ebuild 1115 BLAKE2B f981d3ae9bbcb2e8bc66cb04f908da54b84c27b37b3ff3448e7d6bfe5225ad2913de49a28ed2ed0bbcab413b3d701853964f0f3bf96fbba04ce6694ae1e03557 SHA512 72576a4da31d63d3048184c5940479ffbd02305d8067f53750fadeaf741e0e5c3fb017804b9c3087af831fab8f4af79bc9b0a976dad1699b4bdf1e8b3f538924
 MISC metadata.xml 423 BLAKE2B f19c62636f116f7d1864c30fba6d99d11759e425b2395bc8f0444c7fe6b1f5092bad3af576e9e9e5ff06e789a3e60e5c98bd87852b8f8670bbba93df4f632acb SHA512 377d09b8209490eb7b591abd00b3e6a077df956acd576844424cb022ba7948298f8ed36919b2903718d9a44b7aec2877b00b1e6f272f4768144772883a6ad8c4
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
deleted file mode 100644
index d03b672455fd..000000000000
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
-HOMEPAGE="
-	https://sphinx-gallery.github.io/
-	https://github.com/sphinx-gallery/sphinx-gallery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
-
-	# tests require internet
-	sed -e 's:test_embed_code_links_get_data:_&:' \
-		-i sphinx_gallery/tests/test_docs_resolv.py || die
-	sed -e 's:test_run_sphinx:_&:' \
-		-e 's:test_embed_links_and_styles:_&:' \
-		-i sphinx_gallery/tests/test_full.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild
index c9856aaf5382..70c7730b3110 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 0994440c80f7..bd9c7b44d4f2 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
-EBUILD sphinx-jinja-0.3.0.ebuild 832 BLAKE2B b7f429d139ab62252bd34feca8e0f5abec811f16ec703dd41bf2618bfb759b17737516fbb88ee1e90a2304ddf810ca3c0d79d07429740e4f78ee08e7d3730ecd SHA512 bef0a25006d8d18cd89685eb2350adb0d45301f4aa7d642da46a391e1ccd9441d5adc70b04c6b3c321d580fb904437635cb0c55a6c49a8ec01f7a6afad84aac2
+EBUILD sphinx-jinja-0.3.0.ebuild 765 BLAKE2B 37b547a9e56edb4e858c82ae137644d1000203d5e6e0d8a746c2bfd04b18fa6c3fcd9ae993097d292842b2c0a2e958cdc75b70a9ee240aa1de43ed495acf0364 SHA512 62c4d0c4258d5cc788582797ca20ccb61b5628897385a2c94e6cd6672dcbe24ada9b438e8a28a77e89e28333b55af0da113b5746f8dd6eb8571183f68a3c0cfe
 MISC metadata.xml 396 BLAKE2B 4b17bd02a1f95c07c4e1c87f74cafa857e804f5e6272a1098af96e728f4387221b0907c31a5b7f11b7d56a6681a75732a449b992d47bb6b945f3178e5ecfb99e SHA512 812b4a106b9c49afc90ed1e1912a9cd3d26c39346f61f952c792ce2d62cb16bbbc23863c0acecfc87c6ad4f6a1f5e0e5bd84b36eb1fc70cf4be7795a1f628897
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index 70be8884321a..5489dcac303d 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -13,23 +13,22 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
 
-python_prepare() {
+src_prepare() {
 	sed -e "s/import urllib/import urllib.request as urllib/" \
 		-i sphinxcontrib/jinja.py || die
-}
-
-python_test() {
-	nosetests -v || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 3a5b303f3a3c..90e367bbd027 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
 EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 61470cbdf3a1457303318b303134f87ddf59408dba82e025d6925a3b99d1e5f049c340e924a20b6a06adc023725f1f067b1a979794837c156ec700d4a713e1b4 SHA512 94ed82bcb93b4ae92babd84f521efcbc15c9706a57cdc6aa4c437bceb40a06261371b0742620ac2bf0555c5e06ded5b9ba0c1f2bd9dbabafd1d6a62980e48ad8
-MISC metadata.xml 340 BLAKE2B 0fb6ae6e031c9e39a528105edd9551c6daca57eb24cf2a532adb66c3dc20cfe23a7f5b09784e1779cdcd2099f99182ec73d6b68c1ce4dc599237cc7ee264d968 SHA512 b325051a6264bde28a4eecdf68cf52875fcd2299d7e6284b8072ff6f9a905144dbd7e13b0ee5c49c3caef95b5fb21cea56a7c01d157d60d5a43904ac208da4f7
+MISC metadata.xml 364 BLAKE2B f5e8984e8144c8186ff1f46360e083e3714383a4043fb74bd7890b042688a26dbd8ed43ef865055b1f8b2dd3c7539f481d9ebdb05791b47e4068e35b3de2f1ac SHA512 a2be6179f3becf97abbee610162114a9c323e78a3bf2d30eb917acc99c62cca35da47f8b30fb3887704e69362f8f9cc9fdcd9b851ce60dbe809bdd34337d7259
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index 9bf5f36c75d8..4e02ad597ab6 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pypi">sphinx-multiversion</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 84eded1133f4..08bd9c78da40 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1050 BLAKE2B 066303c661736e62c932ff00c0dd9a48e86f2a6f4bb4cf99b506e9fe6f3a87933489486594e117901a7d4dcdf4db6608ef7742420d15dff26a96ff5a8f0d5141 SHA512 27c63f0e672c3c09b9d02ac3cfb40454d77f76174250c6081230d90323f242df61c1a084cc1fc4e29b3e2195f75f1c1b981ef98973373eacb0a90e7ebb1ae8db
-MISC metadata.xml 372 BLAKE2B 68f844dbb9c910e8df3e4efa74b074a01c6f0f1e0bde6a13f4e98303d917a3f49769f0b49be53e2c76429a3f3648a29f59de17d5ce3661aa24802fdc74a40d48 SHA512 f67668ca0e50834df86b7467d793c197dec76691efd10f3ceaa8fcfebd965c67351207e496c21e3f5acdcf0ebf474cd52d329ce9d05a9b8508397b5186ee885e
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1036 BLAKE2B 62ca9a2056cb147d234c289e52ee70081607aea9babaae56088eb4a09d3c9beaa57527c8b48716c95511f12b12a7ba3a7fc20885563ce0b48e66437c49d11b99 SHA512 83780932985f1b2886c3a8381267cb4caeadc4241f0dd41dd70ed003cbfab280f5b091b110a78fcde0492a3309fd198ad8f0fd097f7bf0170f92af41fd9fab92
+MISC metadata.xml 396 BLAKE2B f34b84a48a20692e0f5aa18e04c888a6c0fc2cef7dff1b59163ea072cb7801a0cb88a440d1d35a263875ac581474560a87f6931bc0ce225f5aa9a62a26fec920 SHA512 06db15e4cf3060467d4def301c81eb717489e6953e774a0a4612e5c583f96aefbabf210fd0bc5d24b23cfa37b3a3cb740835a9d795ec05e4f860c5e5c3138a29
diff --git a/dev-python/sphinxcontrib-asyncio/metadata.xml b/dev-python/sphinxcontrib-asyncio/metadata.xml
index 63e4458e8c25..a8f33ec36a9d 100644
--- a/dev-python/sphinxcontrib-asyncio/metadata.xml
+++ b/dev-python/sphinxcontrib-asyncio/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/sphinxcontrib-asyncio</remote-id>
 		<remote-id type="pypi">sphinxcontrib-asyncio</remote-id>
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index 1fd703331894..7b80ce7fde63 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -1,9 +1,9 @@
 # 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} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="sphinx extension to support coroutines in markup"
@@ -13,17 +13,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
-python_compile_all() {
-	use doc && emake -C docs html
+distutils_enable_sphinx docs
+
+src_prepare() {
+	# fix for sphinx >= 4.0
+	sed -e 's/PyModulelevel/PyFunction/g' \
+		-e 's/PyClassmember/PyClassMethod/g' \
+		-i sphinxcontrib/asyncio.py || die
+	default
 }
 
 python_install() {
@@ -32,7 +33,6 @@ python_install() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 	# clean up pth files bug #623852
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index a8ad3e4240b1..333d046b327f 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -4,4 +4,4 @@ DIST sphinxcontrib-bibtex-2.2.1.tar.gz 96251 BLAKE2B 3ff2ad5b7a37535177c19ba82cf
 EBUILD sphinxcontrib-bibtex-2.0.0.ebuild 717 BLAKE2B 68a5f0e8ff7ad027deab9d1c265b4368969891ff7a04f0afcb7d914d69afa6ce9cd225ab7f473cec0d054193bb30e9cb5afd5d12fce04a2bcc879166dbf90c5f SHA512 d6a3b48beac66e0d5ec41dfb7d0a84bf2117588043680785a2164ac7a4433b1a0d63c9a09a457ea7298cd0babbd050910fd2811cb4e46f5c7c1f4562ea3e8836
 EBUILD sphinxcontrib-bibtex-2.2.0.ebuild 792 BLAKE2B 0e3002f9741dfc7343d49bfe75fe2d8683ba5f1d7b3ff3a001c5fea45289c8c23f51925ab51bb6879ed88b3c6ab968ce9870168979f25336683291c6dd47a3a2 SHA512 7cd7b81c93902735eec977b1d815c9ba04f10cbb35b5ec40a9e75d5d248c9ac440700f5bd5289662cfea241a0a1aa1c272ebc2385bf41548cabc600b6e7729ae
 EBUILD sphinxcontrib-bibtex-2.2.1.ebuild 718 BLAKE2B c5a00172554daf788b4913fcd11393c366c99edcf6aefa86899d9fc87f4686933831ba81ddb57a4f864010338de44126963fba9c69a14520a2e5a261ecaf1661 SHA512 78c6d4bbbb6e79add7f6c7579017a7d94564e9418e8d9357b92642d443467ef743bec3aa4304b609452f9df3d2bef50472a8eb695d9c2f7f5db7d8707d7d07d9
-MISC metadata.xml 413 BLAKE2B 51c21e67a46d2087f5750105563f034eabc1d4ea399cbf121c36618fb19bd5fabccc364cc4e641017f08f413059a61538c8dcd38dc08c9e8602bf1e74b6f5930 SHA512 ec18a4e4706ffd6d09ec02bd2dfdd55481d6a1e9e2f55113eabe7c5d59f33bf8178a366c06a41b43b276030e307c815d6294541dca279dbe41a0a9e2d5691a46
+MISC metadata.xml 437 BLAKE2B 9f4b8ad8c8adf41513f218923f2519707b6554c3dea164b0943016a6aa09ce909ac7222eac9851bde51491d608c048c569a5641f4b2f4793f2eed2cec98c5e3a SHA512 a67e9c49b012af533856c6e5e16ea85580129ac55498de5e1755500221bbedff830173ad28b3f29e065fecf005a3cdd19b67bf1f4817bb4bdfd6a36e32b879a8
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
index 0b33b2fdc73d..063f60aba145 100644
--- a/dev-python/sphinxcontrib-bibtex/metadata.xml
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -9,4 +9,5 @@
 		<remote-id type="pypi">sphinxcontrib-bibtex</remote-id>
 		<remote-id type="github">mcmtroffaes/sphinxcontrib-bibtex</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index e0a3ce9f9093..03019a15fc1b 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-doxylink-1.6.1.tar.gz 10173 BLAKE2B 2bb341576c459715a8bfc0a6a7b971e76afdcfba6a082b3f95844678e54c248e814e1a45a1a5d63d85407dcc6d2f7e56e4211b9603014b8478c7eb35e8b9a73d SHA512 c27983cbd54d6ff2c4110b0269d630cd81b8aff6bf7f6b1b006dbb18fc3643d59a25ecff0ec9c92785c697e38861e755fb44a95382314b8b2888da9e8e191637
+DIST sphinxcontrib-doxylink-1.8.tar.gz 20005 BLAKE2B e435a65f3931c91e0d7d44d1cb4ebc8e7683ab906864e37a0ac31fc6655dba60cf53ef3d91b9e0ce440e86319ec45e0d81cf43459e02ac7e45c8d1ecbc2a9881 SHA512 1c53af2502fbb493a5834ae3eb05428dd296300f8027b5dd8d93cd67a03ea572ac81a0c3c8e6ddc9017a0b7a0859757d61ea67b73b3ed69fb1db76244ffd6874
 EBUILD sphinxcontrib-doxylink-1.6.1.ebuild 837 BLAKE2B 6f1fc2df55812545726210f1bbcfb52328f14257c65c55e4fd64971eb8d153c23c7201570f629907467adbab911ed439d6b6d4ec4f8fe67d814f506a1ae818e2 SHA512 9c09d60272cf1b5c2589e03e8beef7cedefc90b40d5c11fc8a4499b2b7b79937c317ff0f43eab59bf0a4bc905b1f2c184f02c6484954a41a685c5feb3e3f81eb
-MISC metadata.xml 594 BLAKE2B 86632671564dcdc1232b188dc82e8b871671a3b45e1f221da4a2ea47129b9435d5a3d4dcd0baaff7df50f63b50c144474ad825f99de2d8a14d50adef761097fd SHA512 8251cbf356a788a1b34d8666007a91471669ff956348b18569c062fa8f09b8dfc685ee27fc6fc5066c41ca8f8da36b42b2a244f5232723bd39e26207148bcabf
+EBUILD sphinxcontrib-doxylink-1.8.ebuild 953 BLAKE2B 97290ff266342853a2706fc3628b9475a0e2746e156b4caeca0ab72ec889c96acfb6abc45392a3f1e51d890709301dca8d39846a69c4fa735087e6b10ded3a29 SHA512 ab255b6aaa11d923d3f5bd0dcf6a2b1a83789f6a945e89c7c85debf597ae11e716823dcd30df6e77863b10f2f0340eec3912e41f6de633896c7e6b7f2fba6b50
+MISC metadata.xml 619 BLAKE2B 7b63a8f5dbf93f8c9be5467f11428eceb1c66afd54da96499b1bbeb693a5fcba6e2e1344f57e43be9b479b1bd9c0de8d75bd995dac66ae4a46dcb590844f0945 SHA512 3dd0d09770cd2ad85337849adad13fda3bd5035c9fc6b0d313c921a8c40e4317fafd3ea4481ec1a7655faf51952e00d78c40f8a65c860490ba61e386a1af3b6a
diff --git a/dev-python/sphinxcontrib-doxylink/metadata.xml b/dev-python/sphinxcontrib-doxylink/metadata.xml
index 8dc68b4d5938..975f716ec960 100644
--- a/dev-python/sphinxcontrib-doxylink/metadata.xml
+++ b/dev-python/sphinxcontrib-doxylink/metadata.xml
@@ -10,6 +10,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">sphinxcontrib-doxylink</remote-id>
     <remote-id type="github">sphinx-contrib/doxylink</remote-id>
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
new file mode 100644
index 000000000000..c5972e46c7cd
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.8.ebuild
@@ -0,0 +1,33 @@
+# 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="Extension to link to external Doxygen API documentation"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://github.com/sphinx-contrib/doxylink"
+SRC_URI="https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( app-doc/doxygen )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index e0d88f70cbc3..38e1ec605d4f 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
+DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
 EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 641 BLAKE2B 1568d98697a52f5f6500f1305be52917d466a7e0f77f7cd21821c5fbf28339cfc1cedcfaea55316410ba21bdafc147e619f17e607b272f517390db21ef6bc993 SHA512 8b2d87209af9d86def3dc27dad6bdda84b15bee627f3e88fa53bd510faf8c79c8ad88d530b1ffbe1831fb1593b92d07ce2645e222443535dadcb901de5c330c6
+EBUILD sphinxcontrib-github-alt-1.2.ebuild 646 BLAKE2B f909b7d3dbe1bbab1817e543d502b4c1b73054bedd4b4ffb3c201d37ca94ac1bba66aeb7951b2715bffc46959626b9dc0e5421bd2b388b0c4412b9b96a46ecea SHA512 b7fb830afbce41e2d80e56f8eec2bf3056dc30144915b44bcf4f87e0f2786078be3a34a7f3d7cea3abc8ba67c638b383566b93d3dd6c74cc863636d3ae83b6df
 MISC metadata.xml 436 BLAKE2B 66cbd7a712c5d961f49809b3cc95dc80f3f10300ab36c0a91c636a514c52d46a4a31fd3d24665fc2d1dd44ed859ae35f8694193bb5fea26fa8f1e02c39546898 SHA512 9c198eba6ed705786f266b89e1313dd2a4427eff716ec0698ed3cc6e25eaa9b168216d8c46e48009d3e67ad820628820566bdd9184ffb1b147d942349bc66d4f
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
new file mode 100644
index 000000000000..fb29106918ed
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -0,0 +1,23 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="sphinxcontrib_github_alt"
+
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
+SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~s390 ~x86"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index af3d18eafccf..6b6eeefd4e54 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,5 @@
 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 890 BLAKE2B 597c07091265c29ad4bc16e1fd83e0af86afd003311abc3aae87c3b8f1380ff1fb4cd70d37af02c5a43cd2f3c6bcd5e86088ff9e2afffb0636d75b118fc8e662 SHA512 9341158c2c9b5da1a41ef0e0297cf78bf6399f34f97c66bbab24781390fd4809e0eff888960f974119e369b3e8f0498092c7f9d2e49846e6394264190695ebc6
 MISC metadata.xml 398 BLAKE2B 84cee02bfaa0420c3bee0d1324270b84678a306904ecf3b30237d4ad7ceefffd97528109552e00d3aa1b2ad4eb6d9cd0e10341fb122c7a1830031870c1919dd8 SHA512 63c17014837ebf2e8bfce709fdfcd9de27c0071aa527a790c6e1e66c1246ae6e4635e8c30b7b486c9bdc727d7e044bfc30d848058bfb4eafe3eb8c32478a5b69
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
new file mode 100644
index 000000000000..d48fd742660c
--- /dev/null
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 23526f596910..05cfc4d91a4f 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 858 BLAKE2B b51c78120a8c124b10f4ffece83a5ca7c723acebf51926f203239a0f7f492f1aafe4941025c832acc3bcc0b076a4d108c637dba826e0dc4974e39148da419975 SHA512 c4a9b374a84b970263c0247b26996a25e1589732c37100bd226c0b46f0418d30234c3d1b935a1e2a8f0fa16a226621a59000ae997f82990339b15e8b8fd6d397
-MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 790 BLAKE2B 5c4fc75130303ecfba718e93bcb3582b16b2abdb020bfac69f68efd3d9851b947353b2226456962b95dc84726292e18f920c85898f93f29c55fa1d04631c2b06 SHA512 63dfa7cbc0ab2a92bf0cb313301076e6d7e73318379113f3fe3dce9f828546bef446f2eca0bb8954449dd4d82cad4b8ff3c3394d5c7ae7e1b762d6dd242a177d
+MISC metadata.xml 355 BLAKE2B 3535d7f5166214060c68d0166815fadb05a63c75c8369c97f594b4d85dd94c5447fb1f74fc024dc9e171d20577a11d5f2381855fe0d08f12dbacea5c7f66f1b4 SHA512 c92acf2e76b3ebf0b4abf6f221d438d9061fb1fee5aa00d2c91990b5683e433de01cf36cb9669a6d854815fc451c93857bf379704717a9530639c8c52ee67333
diff --git a/dev-python/sphinxcontrib-newsfeed/metadata.xml b/dev-python/sphinxcontrib-newsfeed/metadata.xml
index a2e7b7c0c1f2..88f4741fe6d6 100644
--- a/dev-python/sphinxcontrib-newsfeed/metadata.xml
+++ b/dev-python/sphinxcontrib-newsfeed/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-newsfeed</remote-id>
 		<remote-id type="github">prometheusresearch/sphinxcontrib-newsfeed</remote-id>
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index ce753de7cb0f..de97fa459833 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -15,7 +16,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
 
@@ -23,8 +23,8 @@ python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r demo/.
+		docinto examples
+		dodoc -r demo/.
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 0242a6c8ee56..7ff6402b764a 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,5 @@
 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 867 BLAKE2B 967f55176b960c52f018704821a372ffbbaf7bca632717bb1c34038f2c5c2f45cd49c7b16f3f6617d41feb4a64a671afaf4d9f41d9393c0b87140e7fe098ec18 SHA512 56905b07ed3666276eee64c24aac5ee4eeb7b74f6b86b667cf8de1ad7d020e63063014779928e6dbafb3f8d209cb4b671c0465a59a99b58ddd527d500a5c1370
 MISC metadata.xml 436 BLAKE2B 1ff1b18113f36620c2fbab9af2fcb1ba8e827f5a3aa3ddd0eca46d40afbef8c6835f0b0df1e49e9783974aa536d1450f5bdfe8c5e1764e17339f5ebdb8dbd74c SHA512 ce1452b75f6f585ff90a1da0b6455693b18f462ec97bb4afe1ddefa2a1a684fcf87928a35911ce0fb99f2f4f039ab580bb4f17efc375930d57d788a00084936b
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
new file mode 100644
index 000000000000..1ad6f58cf77c
--- /dev/null
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5.ebuild
@@ -0,0 +1,29 @@
+# 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="
+	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/spyder/Manifest b/dev-python/spyder/Manifest
index 1ab194bc4abf..f008c6834262 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -7,5 +7,5 @@ DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f199
 DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 EBUILD spyder-4.2.5.ebuild 9322 BLAKE2B df0f65151072a0fafcad3392be2404e9a45e154bd2e9c8db1de6835b3057d8cb47193bf80c0999fe67cd75dd6a05470650ca23fb9a6be3ce1fe02b5e0f18879c SHA512 06c087701e4f93161f5671b5e2cf0c26a78038cb3c85ff15edc247565f47a738ba5f2eda9c17cf4269030f997e6a836953c56ca2a8e9619d36dc9862d2310013
-EBUILD spyder-5.0.3.ebuild 7087 BLAKE2B 6fd7b11ea335cd58ca1bb6878ac55f169f3e4639fad83ae8fb5accf6f8e7a7d4bd2d285a2dc46f7a23063028362e8040fe632afdd7c7c8c2844799f8c8693b20 SHA512 c68d36cd42cccfcd74714ea03a9634f0927a33523467122f44c8b3f5490ee46c4e22f2d9eece5b6c0ea1c627a0add8347ad55141ba0783d92ea8a512c4792fc6
+EBUILD spyder-5.0.3-r1.ebuild 7207 BLAKE2B 8e830b8f4f59e9940d21f0289ffcfe0114d09aa86af06e02d498e23d52ef047b8f7850859f435ee83fcd64b6a3ca6268d4218f23cc946c9d487d9493c3a1143e SHA512 8db811aafe765208dfa866912f79cf43d786cf92ab580de9c619f5dbc0780e29f504a9ac6169019e131c918a88b53b5e22df629374fa7c315c9bb0480f11635d
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.0.3.ebuild b/dev-python/spyder/spyder-5.0.3-r1.ebuild
index 7684a0869cb6..dd013535f655 100644
--- a/dev-python/spyder/spyder-5.0.3.ebuild
+++ b/dev-python/spyder/spyder-5.0.3-r1.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
 	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
+	sci-libs/rtree[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
 	>=dev-python/spyder-kernels-2.0.3[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
@@ -150,6 +151,10 @@ python_prepare_all() {
 		-e '/pyqtwebengine/d' \
 			setup.py || die
 
+	# allow use of older rtree
+	sed -i -e 's/rtree>=0.9.7/rtree/g' \
+			setup.py || die
+
 	# do not check deps, fails because we removed pyqt5 dependency above
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 09d50a1262dc..e34992035d45 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,10 +5,14 @@ DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da3921
 DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3
 DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b62ae2d7ca054fedb580b7431b32d15c8f68600b881eb67eb97a73301660ab96793ab12094ae901782ce4eebdc8929db SHA512 2f33ab034467344ffb19aa3934148faaa4a57e4ffa5f97008d814d54149da4e15cfca14d138b9fb656227e25932ca95cf7321209c31c2706405d3916dc2fb9c0
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
+DIST SQLAlchemy-1.4.16.tar.gz 7629704 BLAKE2B 46626cb38e3ec2c5b5c203a03da1a613cb5b66f2906edc54c03843b87ce8f12fbacb6fcd8b2b36584c53516de24b8c1bae041489a376472e4d2e6e2a301b707b SHA512 035c740b49356b1226ed79f188d022904d93190e5391edd350e44e63301333efcfc6c47477ce5119fdbebd49aa3e21b2764d3e4dcc6be5948428f1d8cf11c84c
+DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.11.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.12.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.13.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.14.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.15.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
+EBUILD sqlalchemy-1.4.15.ebuild 1701 BLAKE2B 165da9ccbcfd53b3da315b2bbbc3c26dcc5db91fe35fa1d460f570176cba17dd9c5706372e745c805c2d4a2d03739bcc4c8a2019dbabef9ae6920adcedbe3c87 SHA512 4b9642194c976dd2d2bc74d2ffbc81a980d9f661a0e571c53c110e91c41c3208a8c04013aad16b66e5c043a143a6f98a0057cd54361a79f5e9098c0753fd61ba
+EBUILD sqlalchemy-1.4.16.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
+EBUILD sqlalchemy-1.4.17.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
index 358669239962..ece650fd161d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.15.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.15.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.16.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
new file mode 100644
index 000000000000..45569f2d9688
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.16.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_{7..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}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
new file mode 100644
index 000000000000..45569f2d9688
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.17.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_{7..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}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index e6edeca5d760..5dcc6cbfd73d 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
 EBUILD stdio-mgr-1.0.1.ebuild 770 BLAKE2B 750b8847d1edee2c16b70ab5b5e10674b1ca18db9ea22625e8bf90d725839b3478be6c76cfda38dc7ba846d6aea8737b9ee63a05e0829413288aeba2bebd99dc SHA512 09b20c55b358453d677edf6812de3b7e8e142b1b602e2bcc6d724b97dc4ebb877da87e03d4c5a12185c863fa99f298b663feab5040394c22624e2d29efb5a0b5
-MISC metadata.xml 913 BLAKE2B b98d63af5f5319b7e6b8fd1525a3eb761fd9882caa82e798b35c9f20e150d038c5a69ead06f7dee1b8cbab1adc539b13c025ecdbfc9476b49f74930c15b15eaf SHA512 c15ccd5cccd925c9c2a5821c66ef2babe90c3bf54e1ecd0473b6e02e869649600b503c9c32669180db74b1a4464c75ebbbf39f08d1896b5903bc3fa4d8811311
+MISC metadata.xml 938 BLAKE2B 63b86f805c3eb74bd92a09792c04f91083198595c38def2fa795bc66d37af74b6017c801adcb17ad0cf65b7fa5a9a5271ebfdf1bbe295b465ef94d8b11535b7b SHA512 9850613726ea4ce8f6bff5785e2531479bcf1754999273b647f77d6774cffd79925193d37793b55702271364339a128b906bc4b9e49bec98dec5bfdb60f78759
diff --git a/dev-python/stdio-mgr/metadata.xml b/dev-python/stdio-mgr/metadata.xml
index cfe2eacab93b..494c90cba904 100644
--- a/dev-python/stdio-mgr/metadata.xml
+++ b/dev-python/stdio-mgr/metadata.xml
@@ -19,4 +19,5 @@ While some functionality here is more or less duplicative of redirect_stdout and
     <remote-id type="github">bskinn/stdio-mgr</remote-id>
     <remote-id type="pypi">stdio-mgr</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index e6336ecfa56a..2cc8be5e2b00 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,5 +1,5 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
 DIST stestr-3.2.0.tar.gz 118000 BLAKE2B 901654b53fdc9e5ab287b77b0a26ce531e3a167b2f5d0aa0765de170341bac8ebfbc4efcae39f672ca6dc6f7518913cb5e56d87faaef35c0b06287652c06edb1 SHA512 4f5e41c92518104b06f5b9717d59c214a8d87efe47fee199a602e71efd64e29c98711ffcf3b88cd00209946d0ab123c7ec5aa842e1d54bc65d83c8d70fa4898c
 EBUILD stestr-2.1.0-r1.ebuild 962 BLAKE2B d0387ce2d488ff93dafbcc1a0ef2f92c6b9440b40baaa905d560a8e5591c3981e8433319ad7ee71aeec2429f2d949b02f71341b18c143872fdd77ebd4f230383 SHA512 1f46b2bf824b3782b72f2fdda92241497ec4d8145e9564d42931d6559a68b8c1160fc810ffef3e6ca7f23e79af4a7df332fa3aca5b5da2a82da7973d91d17941
-EBUILD stestr-3.2.0.ebuild 1117 BLAKE2B a02d48df1269f4d02d61d62c1fce7a0829b706171d9ab69d23d56fb37923e1c2a55d38789a0aa665e85642cd7cc41ac467974d152b7eae365fc6ad592689cd8b SHA512 8b0015b4f08cc5fd963a488118ce2847b5e0de2f2fafd09ce40fea7c6c704dd2ee373eabf56b4de63bbeaae85459565525be64168e2ca061d9ce82c05efb5036
+EBUILD stestr-3.2.0.ebuild 1119 BLAKE2B b419e8bd366d0950c6f78f6a390a646804df09f5ec6646377294332c86ef4c7f3b08b27dc020ecac9e14115707a8761b13e4faeb2f75f1f46326bc3e20b34ff5 SHA512 234f5557199c0cdd6a84fb0fb4385feea151806884434bf1a7dbfc5cadb678a12deb77136ecd1beb1235becac3cfecb2a3dec05a9b889eba6741551b3c924c9d
 MISC metadata.xml 639 BLAKE2B 1a1ae7ac17a9cd8b64fc394ea8d4aede9f7ed1d8142c22eaa88e6315feeeb48e70c074e021dfc8115fce3a8e1b70d0a7739f66e9021e648609d5244548e42f2f SHA512 bcce81b4b21946c4762b334086ba5b72b899f02731de74cfc9bf6a6890bdb0211c7346adb76bc7dbee8edd200392584a1a29bdd5eb6722be1b8a13aeab734533
diff --git a/dev-python/stestr/stestr-3.2.0.ebuild b/dev-python/stestr/stestr-3.2.0.ebuild
index 5a1230230549..3348bd63a10e 100644
--- a/dev-python/stestr/stestr-3.2.0.ebuild
+++ b/dev-python/stestr/stestr-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index bc4df94b4a0a..3e839f3dafc2 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,3 @@
 DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
-EBUILD stevedore-3.3.0.ebuild 1087 BLAKE2B 3f6bf5fa2e401581d2a443bed35ae50028f6641830b9c113e7edbbe224d68cb28b0eb5d6cde939153e56901be815b24a9028f36d58064e1e504b0d6cf0ca672d SHA512 c54227358bb343a68aaf55ab3bf1b1fbccda40457c24d5c114fc9432bd0d03c333cc802ad327fdeca502013b4d03b869072352e6d61fa5e91c312c55b05d0125
+EBUILD stevedore-3.3.0.ebuild 1093 BLAKE2B f833683aa41ea93f9a286a5f1ba24b203017275b57bb3d211a31ffd230ed5cb632e1eca3ed71f08c900fdd62d3ac2e07500ddd2ddac0fcf327d937659a308d0e SHA512 f4027760e7049fe7901d2542fdb1deeec81a2b94bb2e3ce7e4c665c74559ecd7de41a0c9b1e035e9ca0017b8a713b9847cd19d0f4d959b01de4792dbc1cc853e
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.3.0.ebuild b/dev-python/stevedore/stevedore-3.3.0.ebuild
index 613d9ddf036b..1368a1544750 100644
--- a/dev-python/stevedore/stevedore-3.3.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.3.0.ebuild
@@ -13,7 +13,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 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 314ec1ed460a..585bee0c7630 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,3 +1,4 @@
+AUX symengine-0.7.2-metadata.patch 3335 BLAKE2B 4c960b14a54cc52773d6c9053f771f34c3db27e2d68e58a65a0e04fa360293c71b1b8d5e0568bee7e7d8addb16c1e190de85e43f75bcd83742f73ec44c93dfc0 SHA512 b71d10a70bf8cb7d49e0737ed6e26edaa75c0e98e97b578919b363720f228ac666d4f42ad9848fa0007e4b08c06bf42f9fb0df2b22bde505e64130bc753be420
 DIST symengine.py-0.7.2.tar.gz 107747 BLAKE2B cacd11f316df5132b6bbee356fd7a4c2d3fa30e80b144c5d8982fec1b6856ca3c839ef7a6f8daf4e70a27462fc43870d05fa76ece085e5577a1672b8e9910127 SHA512 afde47e5f6274a02c6ca138a6316bf0f7ec1c7585acaf4ab19ba849280dfee9ba937c3f8f5117e70f2a6377224f6dab9757958272f4facbafdc11d7965ee7a84
-EBUILD symengine-0.7.2-r1.ebuild 1046 BLAKE2B 17203a12952f483797e4886259e1fd0444835ad41ca7f7f8f04a93982c79771c2d6257f72dce62f4be482f6b2603d5974e5d962d8f6f9681969b521f5e2a1f87 SHA512 ecdc9283f34b355177e03a58ab9d34bf78dfdbc0a4c5ca16495e9a7bc7f21a67cefadf6c4f7cb3b69559f577c425cdb7d0299cfffd8a355d719ed3865b98c4b0
+EBUILD symengine-0.7.2-r2.ebuild 1094 BLAKE2B 61228d1163cadd3861f17e52db46c83dca782e6c9107d3da3184fd6460ea3f768f1bfa4efd5ad4f2c740cafa684b4d02f4d0ca959726dc183633bc6fd4c4950a SHA512 9f20c0c26d5e359db2cde7ef5e26d2b55b73476e18cf0e5c1ebea662b9f22a031237853c030ecbbb0b1d54fec0d35bcbcfdcb572769297fc82923e37469bfda8
 MISC metadata.xml 403 BLAKE2B e8b8f7b50836a7774a3f6326785fdafe1ca7e52086b163deaf97a76be9440858b56a88aaed86f05db71794e2b5999731205da73250f49e093935bd69346afb3a SHA512 5fa64eb4fc76db979dc3bfec18c47db689dd326ec682a0141aa001843b267cbe479c43acd9a0ef9d5725baab11b16873d9c2b85fd50e8527af2022e81da2f8e0
diff --git a/dev-python/symengine/files/symengine-0.7.2-metadata.patch b/dev-python/symengine/files/symengine-0.7.2-metadata.patch
new file mode 100644
index 000000000000..965751a41e7a
--- /dev/null
+++ b/dev-python/symengine/files/symengine-0.7.2-metadata.patch
@@ -0,0 +1,68 @@
+From 01b2f6255e05a808b14a9541b7a762277e409edb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 29 May 2021 19:37:04 +0200
+Subject: [PATCH] Fix python_requires to unbreak installed package metadata
+
+The '>=3.6.*' entry in python_requires is invalid and results in broken
+metadata being installed.  This in turn causes distlib to break.
+To reproduce:
+
+    $ pip install distlib symengine
+    $ python -c "import distlib.database; \
+      distlib.database.DistributionPath().get_distribution('symengine')"
+    Traceback (most recent call last):
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 677, in __init__
+        self._data = json.loads(data)
+      File "/usr/lib/python3.9/json/__init__.py", line 346, in loads
+        return _default_decoder.decode(s)
+      File "/usr/lib/python3.9/json/decoder.py", line 337, in decode
+        obj, end = self.raw_decode(s, idx=_w(s, 0).end())
+      File "/usr/lib/python3.9/json/decoder.py", line 355, in raw_decode
+        raise JSONDecodeError("Expecting value", s, err.value) from None
+    json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)
+
+    During handling of the above exception, another exception occurred:
+
+    Traceback (most recent call last):
+      File "<string>", line 1, in <module>
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 240, in get_distribution
+        self._generate_cache()
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 167, in _generate_cache
+        for dist in self._yield_distributions():
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/database.py", line 148, in _yield_distributions
+        metadata = Metadata(fileobj=stream, scheme='legacy')
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 686, in __init__
+        self._legacy = LegacyMetadata(fileobj=StringIO(data),
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 261, in __init__
+        self.read_file(fileobj)
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 359, in read_file
+        self.set(field, value)
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/metadata.py", line 459, in set
+        if not scheme.is_valid_constraint_list(value):
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 716, in is_valid_constraint_list
+        return self.is_valid_matcher('dummy_name (%s)' % s)
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 703, in is_valid_matcher
+        self.matcher(s)
+      File "/tmp/venv3/lib/python3.9/site-packages/distlib/version.py", line 115, in __init__
+        raise ValueError('\'.*\' not allowed for '
+    ValueError: '.*' not allowed for '>=' constraints
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8e64d93..7b2a2d7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -222,7 +222,7 @@ setup(name="symengine",
+       author_email="symengine@googlegroups.com",
+       license="MIT",
+       url="https://github.com/symengine/symengine.py",
+-      python_requires='>=3.6.*,<4',
++      python_requires='>=3.6,<4',
+       zip_safe=False,
+       cmdclass = cmdclass,
+       classifiers=[
+-- 
+2.31.1
+
diff --git a/dev-python/symengine/symengine-0.7.2-r1.ebuild b/dev-python/symengine/symengine-0.7.2-r2.ebuild
index 8bf39df40953..b22139861cf9 100644
--- a/dev-python/symengine/symengine-0.7.2-r1.ebuild
+++ b/dev-python/symengine/symengine-0.7.2-r2.ebuild
@@ -37,6 +37,10 @@ distutils_enable_tests pytest
 # the C library installs the same docs
 DOCS=()
 
+PATCHES=(
+	"${FILESDIR}"/${P}-metadata.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 1a3af9482adf..c32546e555b7 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,4 +1,3 @@
-AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
 DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
-EBUILD tabulate-0.8.9.ebuild 847 BLAKE2B 4455c2854730f5fb217f572fc4198cb6eec537d5111a6f9dfbaaf5a5c67c1abaf58ec65cab1c5e844f8afef625485616f1ed6b999744d0f8f28526c471201b9a SHA512 d5908ff07b31c8e0d427040c4bdef44a3583d5f6e019885cc8d3d52e82cb1e51883fbd5e6b54fcde9cfef2ddac17c5e6e0e74484e81184509a6e5a2ed3daf6e5
+EBUILD tabulate-0.8.9.ebuild 1171 BLAKE2B 7452d7fc3bf7715446a0d15eb94f7142a691f09acaab3ae1c74363f79e32af65c49ab74ecec8d0b908d2a12a3eb544fdd9dd9db4689615484c0dec4e1d3fb850 SHA512 c8e93d12c29881c39631b92fd428fae62d90d01a3fcaaad7324ee4646a5636a194fee3903f8492dcf18c5a50f1129916ec8e8af90ef5833b66f8817d7ec797bf
 MISC metadata.xml 398 BLAKE2B 3d07c5c3361c606537260a267c25d62b8564c3491a65aa425b418a9a58eb137d23ae7a0902e61b4fda33a5d693e9e1ae7f45d6c1d3eee24b46ad88b817c93868 SHA512 4ddb470a137b30099d06b9577f4dc2d5188185b3ec74393e0b8d3e7a388a20134e91bcc0ff0ddb782c6fbc07b95d72ad43fa5ffabc4a0587d0b94b0faae1dfcf
diff --git a/dev-python/tabulate/files/tabulate-0.8.6-avoid-pandas-dep.patch b/dev-python/tabulate/files/tabulate-0.8.6-avoid-pandas-dep.patch
deleted file mode 100644
index b75df197f80e..000000000000
--- a/dev-python/tabulate/files/tabulate-0.8.6-avoid-pandas-dep.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/test/test_input.py b/test/test_input.py
-index 5443ab9..8a1d2e5 100644
---- a/test/test_input.py
-+++ b/test/test_input.py
-@@ -4,6 +4,7 @@
- 
- from __future__ import print_function
- from __future__ import unicode_literals
-+import unittest
- from tabulate import tabulate
- from common import assert_equal, assert_in, assert_raises, SkipTest
- 
-@@ -246,6 +247,7 @@ def test_numpy_record_array_headers():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas():
-     "Input: a Pandas DataFrame."
-     try:
-@@ -267,6 +269,7 @@ def test_pandas():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_firstrow():
-     "Input: a Pandas DataFrame with the first row as headers."
-     try:
-@@ -285,6 +288,7 @@ def test_pandas_firstrow():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_keys():
-     "Input: a Pandas DataFrame with keys as headers."
-     try:
-diff --git a/test/test_output.py b/test/test_output.py
-index 1eb67c1..2106c88 100644
---- a/test/test_output.py
-+++ b/test/test_output.py
-@@ -4,6 +4,7 @@
- 
- from __future__ import print_function
- from __future__ import unicode_literals
-+import unittest
- import tabulate as tabulate_module
- from tabulate import tabulate, simple_separated_format
- from common import assert_equal, assert_raises, SkipTest
-@@ -1176,6 +1177,7 @@ def test_unaligned_separated():
-     assert_equal(expected, result)
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_with_index():
-     "Output: a pandas Dataframe with an index"
-     try:
-@@ -1199,6 +1201,7 @@ def test_pandas_with_index():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_without_index():
-     "Output: a pandas Dataframe without an index"
-     try:
-@@ -1222,6 +1225,7 @@ def test_pandas_without_index():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_rst_with_index():
-     "Output: a pandas Dataframe with an index in ReStructuredText format"
-     try:
-@@ -1247,6 +1251,7 @@ def test_pandas_rst_with_index():
-         raise SkipTest()  # this test is optional
- 
- 
-+@unittest.skip("avoid extra unnecessary deps")
- def test_pandas_rst_with_named_index():
-     "Output: a pandas Dataframe with a named index in ReStructuredText format"
-     try:
diff --git a/dev-python/tabulate/tabulate-0.8.9.ebuild b/dev-python/tabulate/tabulate-0.8.9.ebuild
index a8028f272d89..fd5ed0277274 100644
--- a/dev-python/tabulate/tabulate-0.8.9.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.9.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pretty-print tabular data"
@@ -27,8 +25,18 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/tabulate-0.8.6-avoid-pandas-dep.patch"
-)
-
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# avoid pandas dependency
+		test/test_input.py::test_pandas
+		test/test_input.py::test_pandas_firstrow
+		test/test_input.py::test_pandas_keys
+		test/test_output.py::test_pandas_with_index
+		test/test_output.py::test_pandas_without_index
+		test/test_output.py::test_pandas_rst_with_index
+		test/test_output.py::test_pandas_rst_with_named_index
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index ff049e1e293d..017bdc19c646 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
-EBUILD tappy-3.0.ebuild 838 BLAKE2B 27c52c052cf87c282a0cf324bef1c05a4ef94c05a133ee465f72c1b90475c58fc7190cd986c934b9e6ea699841969cf16126e404bee3587633f9a7703921147e SHA512 4692b625309ed790883d6f6d5ed359e1fb5b6c1993ecaa6af0ecb52d15a99304855bc57eea89fe51a8199c0f9a9607da481cf676c1b924c8f6da4658b19b2494
+EBUILD tappy-3.0.ebuild 845 BLAKE2B 5c33316f3f3cf25c830af4c4b67d8076ea3e4be9a269b668e43c4ea02e25350a87310a6a879ec787138d3d40ea56b93b14e58ecdd962cf567e922e16e0da5c48 SHA512 34ba42f2d487e11f045e32ffc6b8181893b0aa7c368d779d975d2eb22a989a1c51a5e81484a1aa32ad2495a4ea18b8aff4a4d9715068fd015514112b8b3efe1c
 MISC metadata.xml 490 BLAKE2B 532805af86d95cb00b5560a182df636f7798c8c534307fd3a2c7acb17f76ae98fd6a157e650c2c45f5241af61e331b2dfc2fd2c3b7ae2ad954511bf7904eef1f SHA512 afddd6e3d26e3e0961c29521217bb7c1ed08d287fb5ef25dd0fce8c24b879c40c2dec7aff44010b6ab9522f8cf8bbf121e5b133b65be3dc3a3467110f7e0adbb
diff --git a/dev-python/tappy/tappy-3.0.ebuild b/dev-python/tappy/tappy-3.0.ebuild
index 552ffb193e01..2cd26e5ffb1d 100644
--- a/dev-python/tappy/tappy-3.0.ebuild
+++ b/dev-python/tappy/tappy-3.0.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 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="yaml"
 
 RDEPEND="
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index c17b2037011d..3123636584b4 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,3 +1,3 @@
 DIST tekore-3.7.1.tar.gz 258235 BLAKE2B e04edfab294ac3dac1fb086f296bf3fcc463cdad981d435fdd19ec812f1bb2ff79cacaa94d5105dc1070dd56602cc9a502537c68020cb27b2eb5b3c93788f193 SHA512 ed315a0b5b071265d2ba12d996bedafdea87286fd1beecc14d247176f2bdd2245e0220fb186ce4bd6eec2bc13a764f74b067ce1e546d8c30e618a4bdc3bf02e0
-EBUILD tekore-3.7.1.ebuild 958 BLAKE2B ee010f3200e8a1c61a1c23c3a3b675f50fab8de8c6c9e97daba0074ac23dc36543b8cc94b322ac033dae4a878aa1661bcf0a6360c88d35d1435b8f7f997528d9 SHA512 8ac1081cea163c94a0c55e8b8e77c7354ddcd471d58cfed3ece83fcb002e7f4f0f244eb28a9d52c2b21d0fd95ce5dff07b88c3be1cd74833c1e4679b05df0c1e
+EBUILD tekore-3.7.1.ebuild 912 BLAKE2B 6e52c56c2160cde4a04ec70f2e585339721492ba125592544d44a9300aae71b0ffcae5bc6b9b8a30c76edde4bf655ebd85076a91bc85050cfceb717ecd755d7f SHA512 78bd19d67649ace49a928bc9ac8077d3fa25b9dea5037df00fea969a89d779c60207db5d95e557808020f398bd6787da0e515c3b330b5efee5e06c45eb1e4ba3
 MISC metadata.xml 411 BLAKE2B 948c30b3dcb538e9e4aa7216ab09898248abd74ff706d7a4f603affa1d97680764a2006e9f5c12e64f27f368cee028eddc3e3336a0ff34af99b0e23f0c9e6001 SHA512 95f11eb525271e57dd65b2bc960b46f2bc1c78bc5507ca60da13d477ed86c29f2d3204e8fa64e899614046ce8a057b83a8a67193482a09f245d21301da45daab
diff --git a/dev-python/tekore/tekore-3.7.1.ebuild b/dev-python/tekore/tekore-3.7.1.ebuild
index 128ffe74a887..0fa479a38a5d 100644
--- a/dev-python/tekore/tekore-3.7.1.ebuild
+++ b/dev-python/tekore/tekore-3.7.1.ebuild
@@ -23,10 +23,11 @@ RDEPEND="
 	<dev-python/httpx-0.18[${PYTHON_USEDEP}]
 "
 
-BDEPEND="test? (
-	>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
-	<dev-python/pytest-asyncio-0.15[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
+	)
+"
 
 DOCS="readme.rst"
 
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index ed3568245bcb..192004367aaf 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r2.ebuild 524 BLAKE2B a54505203a7c97a60809b7a5142f101f9f317b1f2ca32eac8766dd1d2570a18faa2828de177081ec6748885547c4b448c4f41a08a6b115cdecec80f64c710d33 SHA512 75cfde27f5690461fc20cf1b776475e8b1f5bebfbb548bbfd5967ef6592eb5d959f5bb2e4bb53336f48f5ffb12be58126de4884fecf4bdb91f000011b06f0fa3
+EBUILD termcolor-1.1.0-r2.ebuild 524 BLAKE2B d6adf2b0f496bb5ec430462e8fdc710bcc539092cdc246e3d030f09a8d57958930f1188610bd54942db54ba978c90cf47ca69cce9f3885f58247a430062b9efc SHA512 8e3c4d24d72022f6e1f41ccfa28ac827ca3ffe8a055f8f7fd6869d12884611d39ec6d3025a5e48d878e276955be13a3d6250dd526eebbe02474e268dcf56ca39
 MISC metadata.xml 468 BLAKE2B 661dac009a69d3e67a38195747df19e59eeeffe99cf88e0f225526a89b75ecce42708106d21e5902b9e091f7cf3e1a0462c4ba4b521e120cae56effa81d95d20 SHA512 b08572c63375e0f15530faa189263c72d6f9f954d33a36a97df6a427cfa05fe74a650be3f34cb4af4409f9b6748adae5db3268116bd47d25b2752391e2612a0a
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index fff6a124e17f..fe2c8a672d51 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index dad77d659df9..5a747e984433 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,5 +1,5 @@
 AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 681 BLAKE2B 5d2dbb65016801c231a0685eb9068917b0b14a4020c047c43e230f3ca55ab8b804f5162db328042410611a6a38f61a36fc63b99a3884441e9ef0ce0d125aae75 SHA512 a2e8f72368504ed5accec9695a3f62f661b63972a0b363102104f1f5eb53ec97fe2b1bee44d9d3da8cd08a25145a41dd2eda1805154c6fe27a1a5ed060f22930
-EBUILD terminaltables-9999.ebuild 626 BLAKE2B 6c860cdc4a03a9d5789b0b4ed2d99de9bfee6e2712eb93f7c58e19232b13c297da4a3b8865cd8e158d70c3997c5c7314af2322c1ff95822d473bd4c83fd7a563 SHA512 6a838399e9540ed8f4be26928d855f6a540c75479052e056b70d8759a29530de4870bef3d65543db738a8a261c8e9b3e713131ecdc0528f85cb1a51212e35f2c
+EBUILD terminaltables-3.1.0.ebuild 682 BLAKE2B 276e25b200a4423954205a63272d886ad61b1929cccd64a0925403697ece767189e5d186ed1f2aeca44255edfd41ca2b601f76ee27bd86c9899cfa54d53f7d1c SHA512 5d550588536a736497a25e15650a37dfe7baffaaffdaded4b4c1045acce3281e67a45f3c836af709db9c7381a6b0adc5341af8f228d8d183ee00d9476fedcc61
+EBUILD terminaltables-9999.ebuild 589 BLAKE2B c13bc07bad5ae721a777e41303fdccbc48916faa1d344830a1d4a5b84e253dc73038f92a6a5204aa1de04b463d8d5d629518541a9c21a09689090dc3546471ef SHA512 cf912682938c5e25cbc30843d05b69af33fa05d3a7137d089a30c7a7d703c4c9dc97d37f8d4658ee095b047ab3161b2bb12023f300f6b317dcecb64776503a06
 MISC metadata.xml 489 BLAKE2B 546f58767ee4dc9c0645bf046a7b64d5ae3927788d724b066335454301dd5d700238622641fcd5b8283400c768f353c7e7ec2fa0e7f7292b1398c90c7a43b3ca SHA512 bfa8efd23e30ac8c5c1d9d246e6e6f41ba86f5e527886750f17926a0150079d2f6c9552d8a34c022c932c41530be5753279246941710953e86185c3e8336179e
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 3b85c1fda74e..3e9791892e66 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index a5353396fce7..f20c73f288fc 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
@@ -19,7 +19,6 @@ BDEPEND="
 	test? (
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/colorclass[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/termcolor[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 75de819e5043..2e80a7a80aa8 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,5 +1,5 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
 EBUILD testpath-0.4.4-r1.ebuild 722 BLAKE2B 502726ac5906bed17a14903d206235d0d0b3ed9f39ffaa8eba88433cd19f67b2682d97200358f2819948f9066895b4a25628f4bb547fd925c7b16612ea8f3ebc SHA512 bb11c35555a6694564774daf6ea6bf0bc772e4e646b2bca1068c3a6615a8b4d3faeffb127825c4b006245a3295c0138254e09494979cc39e3fcdae1722c87e0b
-EBUILD testpath-0.5.0.ebuild 766 BLAKE2B 2cd2aabc9f6408f712ba7541df3026626ed0d826d0b0d27792d396b3aac8d69c76f64a9808f932ec34a5c73bcfe630245ee887dadd5c577a5e933548786fb778 SHA512 f4dd5038626c2cb01f5146996bb972c6db1c83bf0e0d15509392f5d1b144e8f05c7de811f04d965ddc48dc1925c8900c0e25abc16a0e3c8dcdd5e243b591a689
+EBUILD testpath-0.5.0.ebuild 673 BLAKE2B d19c0048df4591e2ac3f7717e778ecc794331e312d7d59354c43dd0042f2da5e969d7657a71d98bd48cf849e5744ee0c713fa6e9432c31731318257efe4fd040 SHA512 2959dea12e0b1b49df1dc85ef0bdfa96cfb65ef018855cc9dd122d1536eef49004ce5daeaab2e44d2083d77344e5e6867be2192ad0baeeac255c9cb2440f13e2
 MISC metadata.xml 764 BLAKE2B 66ca0cbf31a2ae4f9e59e232c029f530b9b6fb5d6d53c9a3a4fd69293a987f3a46c6530e20a9c4cca4056a91b546062b9aa2135d537de276255ae6188633257d SHA512 7787d485d68e575b8a0e01dd20bffaa317c8168a1dfb38cab9c6bdbe80778131e9ac1bb8dee91bcf6ee91de5ec466027f7b1fdcd65d5fbd81dc8433804e3f3d1
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
index 44cf89905b50..dcda183aff88 100644
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -16,13 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 
-BDEPEND="
-	>=dev-python/pyproject2setuppy-15
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+BDEPEND=">=dev-python/pyproject2setuppy-15"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index db592f2f870f..9c26b353bf48 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
 EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 25f2171f6f80354c16dab87bb230a3eb9765be8871cacb3a3c4712e83c763024ec0e40cf8f193382041670365693d39198f5624821c48ae3eb3fa596188c4c3b SHA512 f7f6e6a1c5d43cc8cf005efd2e63cf20a078f1a8438bee9ef0be62be77aac993e5fa8eddc26d032ec34077edc67ed2cd216cc8ebe10e4d5d203313214a13e298
-MISC metadata.xml 406 BLAKE2B 1c2571f132c1dc990e2a4bf387dcb55d7f4a3ca9f3d8f4b38e2838d37a4069bb15637831587acdf05f20212dc8ee8fe54de97b7de597a94a25a2fa49d959879c SHA512 d30016f81a55fb25dbf7b5d43d62a7447068a3a8b9f08a3bad3d42adff101a99aa995f3977cd645d344eb3b931318454ccde11fcb34f91c6d51b8af8c3684099
+MISC metadata.xml 431 BLAKE2B 5d9af87db71b8a78f9c6c883fa6309fac2654ddd3ae38cea955eed0ec1218bf5f852ad143f7792cd5b603ecb249ae6ae8cb9e3b7d61d444a1b08423ed2f1689e SHA512 e1d53e1b39f8fabc2bcfc639c03bb1df299293276bdd3c02a74e5a26a64bc2ad0a79c2be51d35bdee9ed6c1c4f2c439ae9423cc85193e97b2b5efc4dd9db16e1
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
index 3fbc59f479cf..a820e4e78e41 100644
--- a/dev-python/three-merge/metadata.xml
+++ b/dev-python/three-merge/metadata.xml
@@ -9,4 +9,5 @@
     <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 1e06336f2656..8d8fcf1c0c98 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,3 @@
 DIST tikzplotlib-0.9.8.tar.gz 589858 BLAKE2B 81bb2ece7d3f5976d928095caa3d8d51b619c97a4b36eea14f4b4477d31e78a978c2eeab81e9829bb9113e70f0035a572a82a229fea61ee08530d57334fda986 SHA512 a2b25d9820fd8185d4e7a03fb0669fa4c9b35aac9b371b0a873174d615bd40615f1fafa4208d2019af0b7ffe80a8eec6b56ad6075104f6c3a4f8f237ad5b4466
 EBUILD tikzplotlib-0.9.8.ebuild 1012 BLAKE2B b01ce8208ee5d2e59cd07c6af272e358164919c4aaeaa3fa9286962dcfcd201d1b7c947a54dd8db8d89856866dcba31422b03a8a09afa4b2233a1e0659aedb11 SHA512 83cb654f079e8f847bbf9d725b49e133a2eb845ca1644b2a4de3c7ba806901279db7a741050499d0073ca0601f35c22a05edfe3da094b0cd3e92ff195b3d0752
-MISC metadata.xml 947 BLAKE2B 493be705a384af6dcb85d97f6bc4ecd7dfd6f38745fd13522398ef7749eb71f3e7fd36ccf1bd61d2418291eae09fdca3a399f24f3a2e5e2410965fa64373f170 SHA512 25cebda08907be5ffff861f2556d709f99bc68c068e214b9ffc4e68b7d6189710d9a194bac787feed7274c5352d2dba1b3b4a712bab01ddee71151de2d1f1f44
+MISC metadata.xml 971 BLAKE2B 9bce78f1e6c08facc5705eaebeb99170e50d62a3e35d55aeaf746cc9a3b81f12fd67761f8582505e5916e62301f2962776f656e1242f17646efc3ccc08010dc9 SHA512 1490aea00c7e5fa17fe52f59366308740c4c247d5da77f4a64ea3118ec69517ee8f94b977d2048a7f3824b737c28dff7d5d51214c99557bac4cd11e12de5ced2
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index c418000c564f..8a46d828cd9d 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -14,4 +14,5 @@
 		<remote-id type="github">nschloe/tikzplotlib</remote-id>
 		<remote-id type="pypi">tikzplotlib</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 6075a2e9fe92..aa1ad809a5cd 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,5 @@
 DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
 EBUILD tox-3.23.0.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
-EBUILD tox-3.23.1.ebuild 2349 BLAKE2B f1837094eef9f7d700845729c49f9d94cf32d8acf8749c81d21393aff430262e8c08116b3a4ff80708f9e7871c2b395e0b6d47f647a668affdafff05514b254e SHA512 cd0735e3f8dcc74bef9a6ef485e29949a6d99a030275cda43999c0f3ba4fe783413454db80572cb5cd158f5dd95d2bc44dfe3842b62c5bb6cecc74f4de3f0521
+EBUILD tox-3.23.1.ebuild 2355 BLAKE2B 95a5749afdb3cf2890292120d72f807dabe36be2562826df219f316d92fcbcee868f97b078822919f8e78190d3dade1403ca2405893a095858e133e2aa68ec26 SHA512 a91d829e90a8eb9a724acbb8a380ebccbede489228c2f67e59de3263425d556a980f0be230fb874867bc18acaa8f0df7af4c8f8a5321848a47f67124644a741b
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.23.1.ebuild b/dev-python/tox/tox-3.23.1.ebuild
index 938612131f77..195d37f7ec9d 100644
--- a/dev-python/tox/tox-3.23.1.ebuild
+++ b/dev-python/tox/tox-3.23.1.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index d6d714e4126d..7cc484c89e32 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,3 +1,5 @@
 DIST tqdm-4.60.0.tar.gz 174201 BLAKE2B 78f4e2c2189621b5d276b8a9c75bae1566b05888cce81d8281de358ad2817e9751395bcf529c07620cd1ec4431c78ed7c1400dc96e9c3a99ac92daf2551b2da5 SHA512 e76dda97323353725c8e30b254bacfa328b4708d37ba2d21dadd30fd26e76605d8f077f02f2047030c6ab9761710a0e86640153fee0e3a3f972db12266fcfde2
+DIST tqdm-4.61.0.tar.gz 169471 BLAKE2B 6710b057bc5cab7afc72681c469618b442d47a0aec4300f52a360af41fff082a96d3f67cb650978c924df210a1c56e2856f181d55cdcc5692713d53581932144 SHA512 7c13c98572ac2800b695cf38d6de84b348c20967187dfcd3a358fc3a9999bfda509d3b4fbb77272840e1568ed975fc038cfb4034288c72560e09a58fbdc636f1
 EBUILD tqdm-4.60.0.ebuild 1188 BLAKE2B 999390ed0073e8bc219b227f3b8015173ac05ecdb90eac7c68d58b4d6c3ece9a1d1dc772287f04718d0d7559d7272588204d5ad7e02daaf5e837c1640e21e397 SHA512 db532b87c1cdd6e7e89b047547070eb593ab03bdaea756a6ac97939e8b17a16010a8df68e1028002e8be56cf470ffcd869efba3d342108a6ddd2ec3bde824d06
+EBUILD tqdm-4.61.0.ebuild 1162 BLAKE2B a64cea2e3f57811f642377ab1ab1ff5addc6265db5b99e7b87f2b3c00a5f667d2b405fe0f473bd1861eb60592f3dd2590185f17a2fb1440b8976dd78dbf0ec65 SHA512 f8238f80c87396942e8eda8204392afb283bc77a3be0541a887a23b12c5ffd6b243db35a745997dd1b8ed3dd567168c16af92e7ab463d1122ba3c6627e8f0b2b
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.61.0.ebuild b/dev-python/tqdm/tqdm-4.61.0.ebuild
new file mode 100644
index 000000000000..4cec8fab24b5
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.61.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=( pypy3 python3_{7..9} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+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/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 027fc7cc3492..5da94fa34a53 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,7 @@
 DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 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 565 BLAKE2B 60b1698b00e7885882ef1dc85b4359e8d57d962e1b8ba6d081876f3fbb1389a774b47398219eecdbb7422fec4fd477a73360343a5adc8985b4bd50f00684aa6c SHA512 925ae5cf512f3c5b61ca1b5cf86cdf741937ae2a695550ff1505c87ea6d5b51de52ba67f01867a8f57a16efd9345b134f78cfa1849e5f46de6eac33528cb6abe
+EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
 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
index cd0ed08127c9..3e348d16eed9 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
@@ -15,6 +15,6 @@ 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 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index 9ca0203f18fb..4334f54e6820 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,3 +1,3 @@
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.8.2.ebuild 1282 BLAKE2B af6d6ec942796aa2c96887b6ccc3e63e37ec3e095b7982a1125d777f6b78b873697a28b5f7c51e8ea91c95b5031900578b8c07af587a81a94c74d151eba8932a SHA512 4a18f3c7be32edcfeb7972a43a4bc3b9dbf76df1e1870db54a2fb1c9849262004f40a4c29ba32388409df598afb6bad60a1ce6b4c69d03b10a7a0809b70acd0e
+EBUILD txAMQP-0.8.2.ebuild 1244 BLAKE2B 9e4cbed5af85442899771df4b930ff95414fd4bf78c53416a1307bc9ea180ed51d987a37ff1470416e5a71f6dffe166908d64b1da522763d0d3f0c0613faca07 SHA512 aa3a8f781990c5387b267550f60d5d48e3b33af31e462e2a6bdfe082929b47d5d91139a7866a4cc642d42ddeade1bd631acb168ed0713edaf8a339fa95e809ca
 MISC metadata.xml 348 BLAKE2B 276442033e314dada35b6577f4cfa252542b9e70d542cae7d71b793b685860e0086454ceed06f9296aa6e4c87852a5d44e818aca26b7f8fa6e3e3d9505a51657 SHA512 e0c6b513e1e678b87cabe39e4368bb2f60217208c7157ff4afab9a1d23a4c80d5a21f7c0426c7649344310fa166e2d4d34aa0ea8aa2f746bbf6feba25840c320
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index a68485a6339a..31f1d27c9d08 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.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=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -14,6 +14,7 @@ HOMEPAGE="https://github.com/txamqp/txamqp"
 # pypi tarball misses doc files
 # https://github.com/txamqp/txamqp/pull/10
 SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86 ~x64-solaris"
@@ -24,14 +25,12 @@ RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		${RDEPEND}
 		net-misc/rabbitmq-server
 	)"
 
-S=${WORKDIR}/${MY_P}
-
 # Tests connect to the system rabbitmq server
 # TODO: figure out how to start an isolated instance
 RESTRICT="test"
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index a5e123288a65..581374aa1023 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1,3 +1,3 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
-EBUILD typogrify-2.0.7.ebuild 670 BLAKE2B 21334ecd523097804cc991f7b03cf2a8dff7f99b44946b72cee3efba872e54f5088758cdeddf2b83f2c2861e31f4a649473b0da51a6431fdc4e88af0200aaa27 SHA512 b33d5fa72dce8e393af5683153c5f040544de24cd032c40f12a5820fe33fda0840e4fc1e83da6687384b17c1a101c36d1e3ceba3060aef80f1e780e5ec8d991c
+EBUILD typogrify-2.0.7.ebuild 663 BLAKE2B 342e7721374f5c40b8f727d67e9241b1035b5d90a5d1023fb76aae0f303e1c87df3d66d7a6ff94b164853329ae16f197daeac020f960afa5250573bbca4c5d2f SHA512 19ca92c4aad26da81753a98e3bc22bb5529e0cc3d1f8e7413bd03534f4d95e0aee1bb7d79dd28fa9ddf9f1e7ef32c459715678eea22eacaf7d7143505c59529b
 MISC metadata.xml 463 BLAKE2B feb4586174307a87c89200cd8cf12b597cda32c73b9ce945075d68d7e69c37ed06404316a7473f91d278d3b7649d3e1dce347e550be1b19f81c7d06a36111924 SHA512 7d629d2bf2c3d34cc4922be9b27ee09edbce594f52806511b82dcd8bb270572dadd25513cb00d021975c3978f0a9d1dffe79b0874f61179ae970c54d6f2f3029
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
index cbf65c1436fc..2d1b38161bf1 100644
--- a/dev-python/typogrify/typogrify-2.0.7.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 497d6593f4c9..4dc6e79d9a10 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
-EBUILD tzlocal-2.1.ebuild 546 BLAKE2B 830627496e394d098f0795cae8fd0b966dbdeb60e69517358290b6887c0783b75a8c100cdb408031da5d2d3c0a1f0bfd808ac794063deb104b2b51b1a462d471 SHA512 3f0caf49f0b843bc1e7b35173f76a09b4895ac10bddab769e73ba1219c807aef80897504865f4eed0db8622ac9dead4663aa003cb377f6a38dca0243de992e5b
+EBUILD tzlocal-2.1.ebuild 547 BLAKE2B 6501acdab6f3cc56b94b196ae38fcc3bfa830528fa7278aa780e73aebc7869c136548b0fb426ba7e3691f54dcb82e14e3efeb66d7781465bfaa7eed5e30a1006 SHA512 48c82b14933cc7c511522da987e0ce3738790479f61b710b9765743d5a1e3d0fce228af46eadbdc1c31a7e41d8ce14cf6ec16e1d48276674dfd2abc6eb3f87ce
 MISC metadata.xml 402 BLAKE2B ffb6b7524232f23d77799fb244ee455c98bf36b2284d2493e79b9fe6e41327fd9e2134e9e036678466226f895c481d81dd351db3294da3ccd7a7a0a0360daf62 SHA512 c29fedcb3c915065ee5fabb28b9bbf8cf9ec4653f9d3ac076706f3cfb9519f376756d752ce51ec15e4421842228693c4c24b3a15241ec8feee283172a3c00963
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index ca1517fce0e5..417e905d44f3 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.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=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -19,4 +19,4 @@ IUSE=""
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index 632fb7779c58..b1eeb1d6aa2b 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
-EBUILD unittest-or-fail-1.ebuild 821 BLAKE2B f350ef277ded20909e0c883a2ddf7d3d2ab5ef9b551e8a939cb3a9ca6e97864952dd021c460f96cb53063ac1ad818bcd3db9d31f78218c61cde63ef585cf9340 SHA512 a91be138c424fd4ec445c7d993aec9bc5650ea8d0b5ed4be144b561cdc1b778ce24ead3f44a13845d03d243d0acc52d0a82fa2e5c98abdabffb9d8be3ac0dcf1
+EBUILD unittest-or-fail-1.ebuild 827 BLAKE2B 0840aa9cfa1a83500675e008b9c3dae61735058e824d6722d7d5b50c255b100113f6e70d1fc4dd095d1dfbe4e997e2060d538ae8d78edb948391a393f43107fa SHA512 f58e3d5ad954d7b4745443379ea767652ca96873c0b4f5f9846b86a88566404a77061e3c34357f56f3169a4ad06f840bf8b882cfabda98a2296a6163475aea88
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index bc3a13de7e0d..f5359c5ac03d 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index e2c983b8f5eb..90e8d4c9b4f5 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,3 +1,3 @@
 DIST uranium-4.8.0.tar.gz 1027286 BLAKE2B 5e068255918ca3a6125c308a64d47fab30260aa475505edad2abda664d2c2db7d821d4219ff682d4de90e16de2e36d257410a44f2752c733994739ca160e55b0 SHA512 a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd
-EBUILD uranium-4.8.0.ebuild 2290 BLAKE2B e553eb81f0c169f298f4d3b87f4b9f0ac91e2f524ba00b546546d40bdfadb6e1634543eded46d9c8323d74737ecf5dd58f99766192a271df5497c648fd57ea78 SHA512 16cb8e532b91afe6f1f404e0b19c56ad3dc937a5fbf4364b73e01bef9717175cb62d94c539200e35814e9a7b7447b5f9c5808f95031502f283ea213b7429a895
+EBUILD uranium-4.8.0-r1.ebuild 2334 BLAKE2B 7b842d31c4fda17a761bac9bbc7e5ebcefc0a6dab9e7926c87d9383954e1c04820069c988dce7d7829055f20c6e45ef47bc929950b6eb1742eab3b8fb94235fd SHA512 a70fc9d7ac263eb2f45da9148e611ab5dfa77c2c93ad56586c1d16f1384a26e2bbd3db5749427bf7e58892bded8a1321797f08279c318f98b52c91c23d6bb09f
 MISC metadata.xml 1208 BLAKE2B 4a7d789c09e42ecb831e92bd363f6fdf1b161d685c8a95d70f296e17306ffb5af19548ae845487eb366153e97264ba1007a67aabea1bfb3a241a7f98e7f63e4b SHA512 1a2f2e068fb647ded2277e7eb6530856534aed8815f82eba0ecd2c0a4f505327396a46b503ba1a486f35c1986af492234625e6f58a10dad762a833bf823405c7
diff --git a/dev-python/uranium/uranium-4.8.0.ebuild b/dev-python/uranium/uranium-4.8.0-r1.ebuild
index ec44ffc1c0bc..d2fbe4c60546 100644
--- a/dev-python/uranium/uranium-4.8.0.ebuild
+++ b/dev-python/uranium/uranium-4.8.0-r1.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
@@ -32,6 +32,7 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
+		dev-python/cryptography[${PYTHON_USEDEP}]
 		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 503a292529cf..6370b402b6ba 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD urllib3-1.26.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
+EBUILD urllib3-1.26.5.ebuild 2000 BLAKE2B fa6e4541b33924bcb2fb67d9655125059c854de67d4b32dafd40a7feded31358828695c2b2cb93ef61a4d27fcb45f67471d304557e3bf18a0d9698cff7381586 SHA512 84848d38a91b530b985400f965684a5857fba8cd2a55f3526bb2bc860b31d46c1c1fa9d1fa7de58feaaca7aaa25a3f4edf24781ee0b3fd6070d400e310a08d74
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.5.ebuild b/dev-python/urllib3/urllib3-1.26.5.ebuild
new file mode 100644
index 000000000000..921dcd09ce48
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.5.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=( 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})
+	)
+"
+
+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
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 0dd74e748bdb..81a2c5ba2ec3 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,3 @@
 DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
-EBUILD vcrpy-4.1.1.ebuild 1438 BLAKE2B 456bda56ea3ca8da85fdc5ebc08c390ca9afa71be3d11647d6f0c72929f116d759a55e090a11c8f810b97aea641517f8b47ee7e37858ff62961d7d2521de10a4 SHA512 aa4c4b5cf38d29db3e5a53a686bf3e8076ba52b58411802e9bfbb1de618f2851b0a46610a23a7c9189183e84b45331dce89880b58762ec94e183039e01d752f6
+EBUILD vcrpy-4.1.1.ebuild 1445 BLAKE2B 2886ead28eff8854f2ea2ddf5ae417900e51fd85d04d91c2dca08ee0250c4aff5756911d8cc521e45b41799bea004ba7a4cdaaa0cd95a081d690ae8207b1be1f SHA512 e2bdfa7e6352ba04b2ddeca200befccf49329b9a04c15a03c563fcd1e1b5ca169e359c78f899066170860ec70cbc9e7b689469d21956a04d7a7d70d0954b6322
 MISC metadata.xml 387 BLAKE2B 09c086ca73a9932b1ac06f46f7c7ef216db357fe831fd6d8f996acedcf24a636420752130597318f4cc0a8d11a584d2162a892ca412403d1bbf15cdd86a1fbaa SHA512 09ba6aaf53089115dc98031b4dba4d526864b6d38ba7950fc3fccd9c2b1a0e14702f5235b3923a41300fabd4152e06eae22e20e86b54795bee453a184bd8828e
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
index 9b7ccb523b3f..d110bfca31a6 100644
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.1.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 81ad57a963c4..d4808b3135e1 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,5 +1,7 @@
 AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
 AUX vdf-3.3-collections_abc.patch 297 BLAKE2B 0dec9027cfe3a39d06807604a896a8ebccf9acc244eb53e8fac3fc4b01b0c6f2e99f495edc01593b35cdfce1ef3080135eab62a72bc276a6b6a6e2065c3d6310 SHA512 3bdd6ebc8a282edbc79908e6e308982d6afbc93a42c9edf9672ca330bf1f63d3ff89634c736b7af2ec64801f66c4bfcebe777b98359a7b5f5c694723b53ca634
 DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
+DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
 EBUILD vdf-3.3.ebuild 579 BLAKE2B d585b8267baee46f72d63e898c4b5541d23041fd99ad668112d476bc6c95553f5729b6a3cc3f49986efd174f42fa70938a7301e0fbae62bf47cc34fde7879169 SHA512 101c87d0699365d26d91de7f85de10aee59e905f7360035526480422dea07353b6da75e5fde76b62837a9c8a1709fadf34d6c2016cf1fa4d5599ae0b80f42758
-MISC metadata.xml 390 BLAKE2B 1bec2f25b9826fb0d9236302938ef8ddaa4e29c815f63a900fdc6a25a8749f9d96aa5ec682b006e6b25ef0f8684491f08539b76ebc9ebdda43b9ca9a1f8126eb SHA512 6470d901496b951b03663055ebac69e588d8d40f0aaa7bef670f6a07654644d55781274e41ea82af094caa86313c60cfa0827d89da76aacd42bcc52d6b675098
+EBUILD vdf-3.4.ebuild 472 BLAKE2B 856f9ddbfd031a21bdb597bd23aae9c787df8ab0f2436a21b866021cf7834ba25e6c242a9f237a173d20c0f33a4be1bfa6e9569b2a94d6c572fc2b1b268b9e78 SHA512 e75982715bb6567b58c2ac9989236789ab971352b2cb840bba81096efbdd29d3a5fefb52c1070cc2f37889c833e9f55696b72b26bffe9c2ea4eb49db7a486f99
+MISC metadata.xml 491 BLAKE2B ae8b7f22935105a1a3e989ea0e27430a7e789b71f42416ce24f13334fd9de3b60e45d07d8fb157374517b01a3a5d751dfd2dc7847f39022740170f47570c0617 SHA512 86b89ec8e8956298106ae6d5aafff2b896df9ad9bf6dd397215972eec60a71462470f0fce423e8ee88c2c90070015dfb5a2581836d7e8db26f97de543350350e
diff --git a/dev-python/vdf/metadata.xml b/dev-python/vdf/metadata.xml
index 138435803a9f..68983bca5ffe 100644
--- a/dev-python/vdf/metadata.xml
+++ b/dev-python/vdf/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ValvePython/vdf</remote-id>
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
new file mode 100644
index 000000000000..c8883f862819
--- /dev/null
+++ b/dev-python/vdf/vdf-3.4.ebuild
@@ -0,0 +1,18 @@
+# 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="A module for (de)serialization to and from VDF, Valve's key-value text format"
+HOMEPAGE="https://github.com/ValvePython/vdf"
+SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index e4028ce52bae..c4807ab7fc16 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,11 +2,9 @@ AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b23
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
 DIST virtualenv-20.4.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
-DIST virtualenv-20.4.6.tar.gz 10588254 BLAKE2B 90537a694940063d74513ac74eb5e771c97cb7413b98ef9628ad71eecfd7bf1f604d920b94fc31b87ec2884aa1988aae8917085c4561cd9902eec83994197073 SHA512 4ed0b1e333215f2a9cc91082b4bbbe9ba6c1da928e5c19a2245966041213d771e02f84538c2a2a34c7aab539419ff14013150fc4b70884941fe48aa4786e90c0
+DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 EBUILD virtualenv-16.7.10-r1.ebuild 1846 BLAKE2B 59818b64498cb3ef09d0b95b32e24873faa5a0760681362ebfe5bd3fdd6b1cd914ddb1f0604b5b7bf22ed108f0b096ef7e2a738fc9717ee6dc4260a45f46a882 SHA512 e7c0fe99c605ad2dd5c0c83f168ea70dab48973134c8819924f4296ffacefccc017048f237506024b9c8ee4a84580a31ca76370ca8eea9f6c079f0eca773e37b
-EBUILD virtualenv-20.4.3.ebuild 4307 BLAKE2B 24e82320a9e8868ef3792f41e07c05020536bff5bb3a352776f000663288f280b5722c58f1e36996488b2d81b21336243806539c0b611226b9adb12e1ca1f154 SHA512 1fb4b61299cefb90d8e1e035ebaa268ed6e378b916364c4f7dcc4b9d264f17a3e92b4aa959a203c4ba8e27a1f4751a501e5db98c257ffc6f88fa04ca66d0216d
-EBUILD virtualenv-20.4.4.ebuild 4315 BLAKE2B f9a50746781f4b859e5dea9644745d582b0bc256e6ac0348a58d4738110757500e68caa52726504ac03ad51c80e9d43b365728632d688e3af341224d9f25cddf SHA512 2c9eba72b07349b230a6e16936a1edd8b4914d9d15d1c1ed0ffa92aafb31720f6f06e27eac04ec55a375f972411dd31aa0d592420812e7db36bff5e9518f32c8
-EBUILD virtualenv-20.4.6.ebuild 4209 BLAKE2B 5015cc7617c10588fe04ca9b726c3b27dc14841be8ab10b3baac3d724a65e6161f90f6085969b2ace0d61b4683bd3e94121a6e587f3ef3852b587b3f0980fd14 SHA512 23a8edae6317843d208319c77d8c3e878be91ca7c9288b690f3192e9d4576e72cef5ca4cda42cd3f4a009931777d9e2310cfb5daf8976e425841d4f1f4303fcc
+EBUILD virtualenv-20.4.4.ebuild 4307 BLAKE2B 24e82320a9e8868ef3792f41e07c05020536bff5bb3a352776f000663288f280b5722c58f1e36996488b2d81b21336243806539c0b611226b9adb12e1ca1f154 SHA512 1fb4b61299cefb90d8e1e035ebaa268ed6e378b916364c4f7dcc4b9d264f17a3e92b4aa959a203c4ba8e27a1f4751a501e5db98c257ffc6f88fa04ca66d0216d
+EBUILD virtualenv-20.4.7.ebuild 4209 BLAKE2B 5015cc7617c10588fe04ca9b726c3b27dc14841be8ab10b3baac3d724a65e6161f90f6085969b2ace0d61b4683bd3e94121a6e587f3ef3852b587b3f0980fd14 SHA512 23a8edae6317843d208319c77d8c3e878be91ca7c9288b690f3192e9d4576e72cef5ca4cda42cd3f4a009931777d9e2310cfb5daf8976e425841d4f1f4303fcc
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.4.3.ebuild b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
deleted file mode 100644
index 5de5c2f6118a..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.3.ebuild
+++ /dev/null
@@ -1,99 +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 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${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_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' python3_6 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*')
-	)"
-
-distutils_enable_sphinx docs \
-	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/virtualenv/virtualenv-20.4.4.ebuild b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
index 620f7b6d1dbb..5de5c2f6118a 100644
--- a/dev-python/virtualenv/virtualenv-20.4.4.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.4.6.ebuild b/dev-python/virtualenv/virtualenv-20.4.7.ebuild
index b4dd5456eec6..b4dd5456eec6 100644
--- a/dev-python/virtualenv/virtualenv-20.4.6.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.7.ebuild
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index 4f753a83f738..59a875631e44 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,3 +1,3 @@
 DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
-EBUILD warlock-1.3.3.ebuild 1068 BLAKE2B 8d1f864714b89be608ccb9b8694568af13ac22e574825b166b85ec914a919af84af2bc968533ae37909f7ce00566dfbc1b8d82353c37337af4e0257a7a005ad8 SHA512 26ff343c16a12071f9dee24d4c9b0ee21c6a06067d9d6733fcfcb3b5d8d735c413231632a64d9a44e3b02340773fb7b617c962962fa155775e3091b61cfe8e4e
+EBUILD warlock-1.3.3.ebuild 716 BLAKE2B c8d53b6778627487ef8342a0e5b8c2cc3c0d1b4ee323fe41ca9674b72cff3e49e8c53940e4f7a95c7361f7c6c9dc52cf5a0ca04b369bfc7f71d6a2646b8a8d8a SHA512 4a02713d53f48824cd6d8d2556962808706e0ce06d30cc4dbb6f1eff458afdb6b9bb751b0473a93f40249a6c01eb116c91a9f2ce56524272c8b2b8de149bf25f
 MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3.ebuild
index c016724851b8..9aeb1ca4cddd 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -13,21 +13,12 @@ SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/six[${PYTHON_USEDEP}]
-				>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-				<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-				>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-				<dev-python/jsonschema-4[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
-		<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-		<dev-python/jsonschema-4[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-4[${PYTHON_USEDEP}]"
 
-python_test() {
-	"${PYTHON}" tests/test_core.py || die
-}
+distutils_enable_tests unittest
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 02d21ed8951f..4f1dc8be8d11 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,13 +1,9 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af7398ced73aa332e57472cba2f5ce2ce1b96a31d3f5f3a525cabf81d5de528d95d0c59148150f407abb8ebc64538e SHA512 6134ad22b350b7b2893b564c4f02bd35b1be515fa18dd7f7000b191994b5ba48c5bf573819d2f363de227481a6bb8a0a14973e7c6611de367df2a3f228656ed1
 DIST watchdog-2.0.3.tar.gz 95524 BLAKE2B 568e9d66efbfa98c19dab704681dbc48f869b59d51d7c7ff7ce1fd7465efcc6233f871e7f9276f2732692645491f2fd197a639b17e9a3d8abb76d0148a934796 SHA512 e1c506e4ead8c3ee8d19e456b67623f3a1823007be6c1fad0d76c697205696183e7bd15e46c21bf61abce6dd16d267e55da8986633eeee337d10c609318fb958
-DIST watchdog-2.1.0.tar.gz 95833 BLAKE2B f11eb7961885fd0fbf8e6f888a069d77d9ff26b245bd3583e9060044c43a3356d56a334108c8c1a11735fffa779cc750bc390dd1510cf2c549ec9fe064899540 SHA512 65cc291927a61506fd2c26e05b85112e1cc0f26ca851138c62dfa34fae7958ee2b3946ffe586a9d2b7a48d59a6b5ce11c8dac276a3d78dcbeca8da011a880668
 DIST watchdog-2.1.1.tar.gz 96703 BLAKE2B cbcaff41de6111a3c9c2ff00b7c0a9ce1a769bb2b0f8e2af841a0783dd7f3a55f46003863b05eb983531211743fd112a6e63944193e10e8dd296523a1da27d59 SHA512 5b9eb75bc7b8642a8246f426a992265bbe2e5d82a3fcdd543289db7734701bdca1a868b02edfdc26ea239a89d80dd5322e410b949e419c66bdcc0645241d826b
 DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
-EBUILD watchdog-2.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
-EBUILD watchdog-2.0.3.ebuild 895 BLAKE2B b4438d2916609a2605ce3e9df17e6416166ea3afbac1a8e7b2f6fa20458462ced6a3280d6f1fcefc2b76bfb3c3605318f576540287bc17e58d0a3c7dcd082531 SHA512 eb2f0ba137f64555763997894e4e1b26d39502ad2c34a55e87d06482ffa57703417f11abb38cf5809b56be9a4581040364e9d480a7d52dd7a45e9a120f0e52da
-EBUILD watchdog-2.1.0.ebuild 861 BLAKE2B e92a1567235d7b2aa1df0c4f586b539622787060a6e48e9fe0476dd8b2c672410c0f97f03903ad6d770bc45339693d63c79bc26e3b7b716d0cf6993c90589e9d SHA512 5e745931a1edc77df6685ea10c27e042027221c155eef1e4cdffedcf8c67d9ef172fec39613fd32f0d4f56223672f50b8879610cda635faa097d4fabd05a0c49
+EBUILD watchdog-2.0.3.ebuild 892 BLAKE2B e4be44b841127430ac9f7fc683b8ad7d088fe51d7579cbda444517be3435ec4051c3568ec030dd4ef6a7332a3e8f4d5550f0b76bf96da00746ba820b8e21fa43 SHA512 871894c2e566a524ce7abb58f7e324def71d0a80871a6aee11c5d37f85455e7121e60b9bee3d25535e23386fd537d06a8e218b8b1c777174c84cd9df6a26ce3f
 EBUILD watchdog-2.1.1.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
 EBUILD watchdog-2.1.2.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.0.2.ebuild b/dev-python/watchdog/watchdog-2.0.2.ebuild
deleted file mode 100644
index 8e5e59165960..000000000000
--- a/dev-python/watchdog/watchdog-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	# broken when django is installed
-	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
-		tests/test_skip_repeats_queue.py || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.0.3.ebuild b/dev-python/watchdog/watchdog-2.0.3.ebuild
index ac974a0c8edf..9a7040e89d03 100644
--- a/dev-python/watchdog/watchdog-2.0.3.ebuild
+++ b/dev-python/watchdog/watchdog-2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/watchdog/watchdog-2.1.0.ebuild b/dev-python/watchdog/watchdog-2.1.0.ebuild
deleted file mode 100644
index 0b8865d4eefb..000000000000
--- a/dev-python/watchdog/watchdog-2.1.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 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 2e99fad848d4..2be750e5eba1 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,3 +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
-MISC metadata.xml 3040 BLAKE2B 9bb56694fe8fe1d9621e6eafe58c90242238fee0ffddb4f56fa2677bcd996ec94174998bee45164aaf797ed33c3e55f15c60b5b1dcf00dc10ddf35fb9ff33b31 SHA512 59cd3bdbc4859fe572e043e13efcb813b020be80ee1d6a7ef1b7d1020bbfa25cfc457b923e53ac0a4c4d0c33636d43f57a3cef73e9f3204d9f86851019ae0302
+EBUILD wcmatch-8.2.ebuild 1293 BLAKE2B b16a00ed341661f5623d87b8934e1bf3c6cd3c5bedb1b6c26bb8f4c6b657bc54197762700a8226d99c589c36672f12963d51e1b220dce97b501de3d461b0e8d7 SHA512 9ca84e9a8969094e7a51e90675645f9e14ad80482cbf13374eb06df97dc8282a42ab5d543ad787304c4637c1c188fc32d6a104448cabebadd9c91593bfaf7942
+MISC metadata.xml 3086 BLAKE2B 70a8843ac7d26d1ff596516cba4307a7e15ebf474997ee65edb44ba4d626b58ac75ba52158f90c471cb2b59bccb89eef22afedc0d6e18b8d6fef1faf1c361a36 SHA512 074dd8d50af976cb98853b05716adedb4abb848cce120f07967c17e7eeafadd3bc25f6cd1b71421aab80ee6652b72935677548b33ca2ffec7c18c79abd3a3ac2
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
index 1890dab7aa7c..3dae50904c3f 100644
--- a/dev-python/wcmatch/metadata.xml
+++ b/dev-python/wcmatch/metadata.xml
@@ -15,6 +15,7 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/wcmatch</remote-id>
@@ -51,4 +52,5 @@ Features:
 		Provides an alternative file crawler called wcmatch.
 		And more...
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
new file mode 100644
index 000000000000..780c9e32404b
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-8.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch/
+	https://pypi.org/project/wcmatch/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# tests require some files in homedir
+	> "${HOME}"/test1.txt || die
+	> "${HOME}"/test2.txt || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 240b1d22b16e..289f17c7d275 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,7 +1,9 @@
 DIST websocket-client-0.59.0.tar.gz 57897 BLAKE2B 9f15c563491bd105a1987281cc20c0ab80ed1625036eeaa674fd28334b8226b5f9660b150743649f6bc7717d4306cbb1778222f9caeeff29507ab364572ce2b5 SHA512 c7f4a0336093de86fd00828049a836477a3c859cc4bddebd9e7d31eb746dab4de8fa11205a5fb182e5df3590964aa73f279310575dfabc4abc32157e80df42b1
 DIST websocket-client-1.0.0.tar.gz 58557 BLAKE2B 8234fb246d38673d06c9e16257e00589fe27d1354feba2e1521a41e15c089e899023248dff61346cafbbffe8a423f1b1618a546ead2fee4db67a6c2441581f77 SHA512 6c62ea2f12be0e6409409e832e4654338f6b6cb7838b0765e836c575bd883545c885985e9a05a04cd4ce5fbd537bc97d8c6fc4efb82779c2ec3006580ca19c3e
+DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
 DIST websocket_client-0.58.0.tar.gz 48216 BLAKE2B 5e559852385d95caffa73fdb4bfcddd3e00f7bdc9d23d07e7bd6b9e8de599742e153d31bb3a57bdf1aef02361f5dc0b13a443c21872c27576e068f246102d655 SHA512 c587945831427a9bddef96be53d20fec7f55ffd7efe2b676dac96b8078ba446ecda85379a4edfc49c36de936516d3994cbd0515decb9b615cd969bde1117167a
 EBUILD websocket-client-0.58.0-r1.ebuild 824 BLAKE2B 3502b651e758f1ed8fb62ee84b988e49748c6ee99ed76ff93b1ea447ff8b77ef68d7680d23aed8d06d4f0fc7e76b5aa08237b973607031b2030e289feca09d6d SHA512 b8db735fcef22e1a983a245b29e637968ddc7710799bc18856a967aaa24ad9b671961f6a25e02de3953218053d1e6cbce255f27a62ee9d8b316ea156822dcbf4
 EBUILD websocket-client-0.59.0.ebuild 869 BLAKE2B e3b886958cf82f1d6d86b53a50e8841d25d4866bc4ba5663e624b48a484433e0675dc373dcab11b99018fd3a232f1ae150352cf2708bc69f872639d43641146f SHA512 96836b0874714f135fe571abc3411d6b1aaadec62fd4ce2978b7fe3d25316053090ec8c36d00304ea2877fe0078ffacdfb33ca3f69de332902beaedb8324f899
 EBUILD websocket-client-1.0.0.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
+EBUILD websocket-client-1.0.1.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
 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
new file mode 100644
index 000000000000..dfdf4b220036
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
@@ -0,0 +1,33 @@
+# 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/websockets/Manifest b/dev-python/websockets/Manifest
index 69de1ee11b4a..b66c84bdbc13 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,9 +1,3 @@
-DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
-DIST websockets-9.0-src.tar.gz 192076 BLAKE2B f5d2fe0e947b4833a11c013ce64640369794e1c5e4db5dcee7a630d8edd46ba72afd4bc42cd8adb392c09e2758d907a0029e09d61465215b3fbaa2430582cf2f SHA512 446d9734e2767a19a5c84de2676cf3730dc717d94e14443ded01727d47b02fca67546bcebe37d177088baaee61c8a7a90f7e15df1ee5bd0ed0a96bb4e46ad1d8
-DIST websockets-9.0.1-src.tar.gz 191411 BLAKE2B 9e45836334f55c18391fc853c81fe7d2b3929fc3fe19d216498a8f39891c82efaa83608ed6732375e1d6fa2a9c84aad77c99aa3e6f57a9a328ff9168a1e58c77 SHA512 554dc5f272f4f849982a2e2a3d391bc6dfc36dc247aa0e2854913d18772749762db424da38f135f8cf4a2a5f67a379f774faba76eb3113bafe509ac62753bed1
-DIST websockets-9.0.2-src.tar.gz 191752 BLAKE2B fde055626e067c482e81a80e0bfe32be81451b99c77c66a4d99b9375a93e46ee627668323599cd7444c834a13cefefadcc9acfa3f8ed00fc8a2a69d743a7fe69 SHA512 ddbd98c70734ff387b96396e5233286154a1f5f92db945f723012e7199f71db31e514d407f065c9d027358dfac0bd1ad59396bc7560b15749e9828af827a23cc
-EBUILD websockets-8.1.ebuild 469 BLAKE2B f726a691f5a392ddb087850b3476a5ae9d6495c182b670aa6287198abe06ecb6b82c57540ae58194252ffb89c90639a8e2e6c0f6bb15606667e2a0df0272ca1e SHA512 f23db3bee0f46176302d491c91d9b27c7e65f9f0e0ea855078fe358a0d36d73be836c8452b8df074733f5e09145ad38e91ab43f837baf38cd0f63b084c0d31f9
-EBUILD websockets-9.0.1.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
-EBUILD websockets-9.0.2.ebuild 486 BLAKE2B a5fe7829469847c9b46c5a7615118f0f1bbd627d43313cf01fd292fa83bd765b4e321219ca705c27c0edc16d22719f72319061758f5595823a3ef8223045ebed SHA512 616ee8c8262a6b5a92b3a2c222225152d5e4178dcde185303fb8a241398b663e4ca4ce8ddd134f698cbab515cf2384f3c6dbdab6fc2a1dda5ef8d1d106f4a5a2
-EBUILD websockets-9.0.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
+DIST websockets-9.1-src.tar.gz 191813 BLAKE2B cb3807f01e1a4c22a40bf5150d1e8b21ca786dc5bc4da8f3e6602971f3f7c79b57092f5ddfe3ee52ec00e7fd15f3a992fdbb94b5e26599f2621a7f51434ba6dd SHA512 ff2907a913ff0b8ced6dda72b6fc6512a2ece3ffded2e2dcb8ff6805de9ad504430cc1871c1f6e02ab8069e7b96b2e7609afaf3c9c25f9271b28e2daa72bd3ac
+EBUILD websockets-9.1.ebuild 483 BLAKE2B dcc29765f3c1be180e2ecf40c3ed0ebfe3e08a29adb9b4ee21f293e4af6cb5e5a8f1cbe0a8ebc4da4ae580817dc9d3b9489d951da529245724715b6310f07f43 SHA512 e50640a189a23222653f9939c9509593e78616d2299c1a5cb2186d5b1cc7d4b12800f615e905c108969f29b40f1483370caab9e2ca2d05e560fcd2c2d8c5133f
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
deleted file mode 100644
index d78c4008f605..000000000000
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-distutils_enable_tests unittest
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
diff --git a/dev-python/websockets/websockets-9.0.2.ebuild b/dev-python/websockets/websockets-9.0.2.ebuild
deleted file mode 100644
index ab6d5c255eef..000000000000
--- a/dev-python/websockets/websockets-9.0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/websockets/websockets-9.0.ebuild b/dev-python/websockets/websockets-9.0.ebuild
deleted file mode 100644
index 0992a9e2d617..000000000000
--- a/dev-python/websockets/websockets-9.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/websockets/websockets-9.0.1.ebuild b/dev-python/websockets/websockets-9.1.ebuild
index 0992a9e2d617..493b06dfa55f 100644
--- a/dev-python/websockets/websockets-9.0.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 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 55f918d11f7a..89f3563cf0e4 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,4 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
-EBUILD webtest-2.0.35.ebuild 1161 BLAKE2B cfb359591738ea2397bc1526831ce8689d5c4036fb4affb757d56d385eb0b28b17384cbff733c970a3f7df47c73e7f2e5b55899bb05b065a0adec67168fd5bfd SHA512 bb343954274c3fe7ff69e38015e43188f24f7a23ae21549affcb2869b8fe935674f3de3d3f8ce46dfff91b803f90357875fa8287276dc2b632bf60ad2a785413
+EBUILD webtest-2.0.35.ebuild 1118 BLAKE2B e012421590697c5a6459ef104cb1a5513f63ede3cdae4a7375924d84c2ab950493ac6304cf4f599cb08ea9b2beca60ac47d96b1a9ae757dd8f28ee6c6dc5301e SHA512 8731e987e9c656192a93e9a89e2e5b873d8e5327dc15d1fd65b11de8e598d8cd1a696b7238cc85f01c147534c490433617fdbd638c3612f45c09964541850bcd
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 0cfccf1b11c0..9580a68bc44d 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -1,11 +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
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 MY_PN="WebTest"
@@ -29,7 +27,7 @@ RDEPEND="
 	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	app-arch/unzip
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index ceaa310ed4cb..479f7afa141e 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -4,6 +4,6 @@ DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb
 DIST werkzeug-2.0.1.gh.tar.gz 894795 BLAKE2B cef0c6d704604d8b63d9e9d1ef8f232f97cae6654a4284b66ba7cd97f850df725d644ea11ed898a53f69668247545de86a9c44bc381606c700f4e2611fea7699 SHA512 721a6c3cf8f803c80873f68d94b273da2ddda79b5e83d9283b9af3d3c971bb8c7ac7828c7a60c33b9bded7b05f063810df12fc266ee7d264dc6261100fc97708
 EBUILD werkzeug-1.0.1-r1.ebuild 1352 BLAKE2B 8e8cc3e15bb6f78ff783fcb03ddc54bae9abed4b25012e71766902b9d2bdb3699c53a71608b95b58a625ce6091d61d2745524a38a6f44dcb77490c5d720f2261 SHA512 329fa7ed8319d7eec1321369ad4e19cc345d21a5ab3f5d954bf2bc17a0c1b6336baaa52081086cb08e0dfe9ce032c44e207d25c0de868d8a2b24e88afbd8e3d2
 EBUILD werkzeug-2.0.0.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
-EBUILD werkzeug-2.0.1-r1.ebuild 1392 BLAKE2B 9dce5ec69493d6723b92b6fd416d125b5a087c9db283be6d2844f655a467aef79a3afa16f74540775a56f56e85943e121131247a9e7bd044092e789f04c373bb SHA512 fadf31d89ebd82cb1e5636f308086bcafd1055c03573ac0cd944f86e5f45e36ee85a5bf31e058092c13f10844474b09d4cf94d87bd4220e42a1acdd0586e0020
+EBUILD werkzeug-2.0.1-r1.ebuild 1398 BLAKE2B 17f27ffeeab2ece87fade343f74af13f64dfcefe97a0924e2983278eba28fbd84a73415538a4294f55377bade33395bc2fe5f07c07cbd8dc0bc8992765b1168b SHA512 e9272c4c3f9ab58008a77da0159b24d49646576fdd34bcae7b85cba1a2ef6706f0bec30b3cdc292e50bbd23f344c44da0c6fd2216d979371451765221fcefe93
 EBUILD werkzeug-2.0.1.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
 MISC metadata.xml 367 BLAKE2B 3a7fccc21ad8c434460cebeee5354dcc6fa0f667ae12b551fe8b4776c3a0d1bfbf3a92e5481eba85c1937bc1c9b4a7e17c21d70428ffc44f08f83b35f7037e42 SHA512 e0a3c3dce6af15bd50e7ac7e56afa18e9baab0f95c719c54b643fb906ac837f0e29e8cfaaf38f4e1ddb4a6434b6866c721d010604e3daa075d5a554183b494e6
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
index 76e9a1859dab..154eb8d2deda 100644
--- a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 6e0fee3850f0..dbb18fd060e2 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,4 +1,4 @@
 AUX wrapt-1.12.1-py39.patch 8250 BLAKE2B d3f40b0ef14dc61a12b4e386d1b14b5f5d7f944ea991c7efb70c535b5f77c489feb31f9b162c9aa6fb68236bd0775ceed6c6582247ca0aacbb79255c90b10d57 SHA512 e157e40e720a173762ca227a1daa0acc7fc437f632943c5b5158cb776b32457d592571ff7dadc4f0069b5ace9cb1fd2ebb51807d78d62ca94d8148a4d5be48aa
 DIST wrapt-1.12.1.tar.gz 126750 BLAKE2B 92aba2d400aa626445be68fdda2831132e1c341a2f20065b3d7071a2ebc174cb9de7e6a20a8375360cf7df181881fd20b7b2f70dbfdf533e8823982eeaa722f5 SHA512 33e964cb3aa2437bc7d084a98f622f7c5c8c719d97806796ae0317d35130bdb2679a9dd87be7077e2cae1eb32b65d152349fa7cc138cb392d5999cbfdcecc9ac
-EBUILD wrapt-1.12.1.ebuild 752 BLAKE2B 8ddbd8af3284e90011aa1255fe386ef5adf9eaa638f4ab04df62a250e2d51cab46c1020a651c6b7d0f19113cbcda7e8c5868e6887c35638b6b600d495c63e478 SHA512 fb721bb9df20fd8cf178f7a73160bde8fa98dc1845d79c568ae6dc1954658ab7c2cba5af3cdc5bc9014cba65375689571e0770f30ea20adf30c744a40f71e509
+EBUILD wrapt-1.12.1.ebuild 759 BLAKE2B 15b9ed8e46f677f53edac41b0629aa269519625418ac273cd649b564d085685b7cdb7a65897d417c47ae6ec3a335ce879d132d4191f3bce23a2e8b412facf879 SHA512 c2c9305a4a4b266ccb89749cb46679f6b640315a2b4cac7c1239f32a29af8665105cd27d8c87f4ede4a9d6bd22b0addfc0820e21f9fe58d382ad4662bbacac8c
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.12.1.ebuild b/dev-python/wrapt/wrapt-1.12.1.ebuild
index ee2d504319ea..4ff0e1d5eeee 100644
--- a/dev-python/wrapt/wrapt-1.12.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.12.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index b973456a123e..aa7cf82696cd 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,4 +1,4 @@
 AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a68061a4c68162033da329068838ea262f231a07aa6a944f9a9889c415af0c65eb3c885d9b69d9ee3fa8878003e886545 SHA512 960b5be5e67cc77d86c37ea5f6966ca838455cea74d79288e245acb47c9b374a285a3135c39330b2e8928760fd244e8addad8e4f707b7cbee1dc4801562a50f5
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.6-r1.ebuild 1096 BLAKE2B d0823176dec75a1b6e18bedb6c2028c47f9a56e637b44193ac6debd479a0ac2975c5ef4a92f91c8a8bd732ec5aadc9409e747b4da18fd5d54376ff595c88f1a2 SHA512 57c1e87c525a115e98f5be1fce2dfb16d80e49ab303019aa96156e2f6b99a21220c09fdbc49a40958a6dabd349a967104c843e41eeed0920982512f613050a9e
+EBUILD wsgiproxy2-0.4.6-r1.ebuild 1043 BLAKE2B cef79f4a9d625a58c56e698eb57ad16d8545f5bf19f3e0d073b24f21d1153d411fc8e65397f911909cbe9b0bff868f037f41818c19444826899f791fbb4da848 SHA512 d6f6cf33f38a9640952d33287bfa5773ac529740debcae42c029f74ab15048d443aa09b6e87a539c3e9a1f5a20230491ff219a8187ba1ac298321971ff5ff63a
 MISC metadata.xml 337 BLAKE2B b34d470df573b61875a4d4bbff338d30a9bb21fc1905a73e47639fd9f3a9c3222b8d5dd54daeb37228dea119cdd354d618cd544de3ab7b46b826f70faaa9add0 SHA512 85c5219804c984dd8f028fcafd94476d0e44a09154d852fcc86194f6c1fb4dbe47228346be487aad7de0588079499c8e47cca0166721f519a8a99cb359fd4f03
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index fcabead12956..19cda237b3c2 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
 MY_PN="WSGIProxy2"
-
 DESCRIPTION="HTTP proxying tools for WSGI apps"
 HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,16 +23,13 @@ RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/webob[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
 		dev-python/socketpool[${PYTHON_USEDEP}]
 	)"
 # Testing also revealed the suite needs latest webtest
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/wsgiproxy2-0.4.6-tests.patch"
 )
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 5700796ced9f..5ca5c0c9f777 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,4 +1,4 @@
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
-EBUILD yarl-1.6.3.ebuild 876 BLAKE2B 08e35ff658f8b27fd24433c69c84213758a5a02d2086a10fadb6aea5bf30b61bc531375d2908fb72bf73ae09fad66cab7e628fea0f4ca8737bbb22dcf496c0d9 SHA512 6cdd36b5e2a23272bbcca8f6f6f5496c11e6dae83abfa5ba74be3123e73eeb1bf180bee638c08c797ce965058cea86535c7214b2dac800897bab6e92b39d8c7c
+EBUILD yarl-1.6.3.ebuild 927 BLAKE2B 86f90493dc43c951fb824c3e1f9c1ce789c376bd92646ac314e7fb6ebe9e1d88554cc05e3a85fced290251ce12645565c0ad343c2b2a87b4d5046f31512c5881 SHA512 376fceeb9f260ca9444aada5fb4fe080f0a9eb0ab7740b7b05243c0ae1a0bd63144d503e1e893af6403da02243f95afb9aa00ef7e19d640af3fac52a7df556a3
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
index dd7465b90388..b9b9dde0ef79 100644
--- a/dev-python/yarl/yarl-1.6.3.ebuild
+++ b/dev-python/yarl/yarl-1.6.3.ebuild
@@ -2,7 +2,8 @@
 # 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
 
@@ -19,10 +20,12 @@ RDEPEND="
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
+	' python3_7 pypy3)
 "
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index ea4242da5013..a4b73b8aafea 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,3 @@
 DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
-EBUILD zipp-3.4.1.ebuild 1210 BLAKE2B 60859480d0c584f58e2702661a7818884af69dfa9c306e22459813e92a3f0007114f2e2912eaab09a2f9a2394e75a0dd11a63a7cc915f2d1b203a7681f40f8fa SHA512 efa2f7ffce10d270ec05396bc4d7ab2e01b836c2114266e3193bf0e42312302930cdb90bcf52350f9bad2a27b464435070190d32f9b19c86e338f458954b81f4
+EBUILD zipp-3.4.1.ebuild 1172 BLAKE2B 057ee69c0da51eb08b56217003a10e5e569f3c3f40b3587f4f3a0b3dfb0109a1676c67342d351d20686350697b2496ff2c2449397a91b64eb5220e51d37ec56d SHA512 402dee93c3ae2d75a2e75b7831d11b57ce92094d70693ef7b8a7a05cce02682db8c3083dc21650bfe059f818aa6fff8c43ae5fa35b5d62b4f8d328eaacf3226f
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.4.1.ebuild b/dev-python/zipp/zipp-3.4.1.ebuild
index e7eae1e79a92..49091cfd7e46 100644
--- a/dev-python/zipp/zipp-3.4.1.ebuild
+++ b/dev-python/zipp/zipp-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -36,5 +36,5 @@ python_prepare_all() {
 python_test() {
 	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
 	# by ensuring only zipp from ${BUILD_DIR} is loaded
-	pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
+	epytest --ignore zipp.py
 }
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 44722a1fd8fb..0f514f10e5b0 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1.ebuild 979 BLAKE2B 6b8182358b49bb3f1967081648343650e0be0c3800268dd3bbd95de1253bcd109b04854e2ec54b5d65365008d522994407bbb5192315dccde1f7a892ef442f7b SHA512 8622756c6ce2f929fade0776a1524a0814eec09f08fdb911282e00bb0a1a5a5f70fb1e25d839f38bba36a2e5e5db1f21f3feaa4a6dbc2f67a4b762cf95483f1f
+EBUILD zope-component-4.4.1.ebuild 949 BLAKE2B 9c72f2bb8cfef4c7c6265fc81afbf600c8c31b9c721bdedfd503a8109b50f92677b7d1f629ead387f3a78b3ce4965e434a9d0d78db11b7d6fb246cf3a9dfb987 SHA512 3a781ac4442e5fa5d6cf521ce44eea510c21de6f0cadd3c9357d06ec23f1c228017ad0daa237d6de608d2b4a4060bae6cb45c7c9007557f30089ea0dc1146505
 MISC metadata.xml 410 BLAKE2B 13b354ff6b4e8021277d42f4f7adf5710fba20cc1f2859c19f7bf19793109d5dc5d93aa033a6d83932b775dbed017b1646ab650eb4a76e87738471329b727e8a SHA512 4135d10ca2332108fd3cb15a826dbe7c8fddafba2215a2905cfeeb5bc8b64e91dbd82b7273e1056b2a2ca6358fb01a7a18fb37b572cd927428f4be1af5963037
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index fd1ac77de368..c13ead1de3b6 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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})
+PYTHON_COMPAT=(python3_{7..10})
 
 inherit distutils-r1
 MY_PN=zope.component
@@ -14,25 +14,20 @@ DESCRIPTION="Zope Component Architecture"
 HOMEPAGE="https://github.com/zopefoundation/zope.component
 	https://docs.zope.org/zope.component/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
 
+# Uses multiple new dependencies, which isn't worth it
 RESTRICT="test"
 
-python_test() {
-	nosetests || die
-}
+distutils_enable_tests nose
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index f65a82b7f42a..4b85d7515408 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.4.0.ebuild 673 BLAKE2B 3431aaef34a7eb9097354234607481457be0f074865849d75aa5857f6507d02d74ca784d89851e0c2b49b44ee68adadd5d60349b843872db086fa82686a01705 SHA512 b58ef56bce3ad658d9b3f1c0b5a8953892df186aaab293ba5b3fc6903221b47ea765abec168ec1dab4d4fdf2ee16722c4106ed190270e816930606ffd38ef8ed
+EBUILD zope-deprecation-4.4.0.ebuild 673 BLAKE2B 38f05d07adf269d766c72b341ae99b7917aaae2c2f6a319b538a81996aadf0e056ca79a72d28a26acd7476edd4ba9d851064052b8d17addb86654a37189ac9fd SHA512 d321b4b681ea5ac4af57d1d6b79c28b37090769848639555f169b1941da3525c3b0806b2d15a051cfbcbdb1336f3b1c35941e5b7e0a570c02b3b39167d330adb
 MISC metadata.xml 392 BLAKE2B a04db77716b9193d942c3d45d09694b58577e279b162bdfab1487b3d45114623c93885a309697199e3b9c90f24fff75771575a2f1d371c79127c4712cd577727 SHA512 2089dea082d58ad23b2ffefe38d79b579f68392e7cbd1e191b60575766487a57bca369e386b25f777cc9434decfee06036dc42d12ef07cb0502f5c5dc517e4f1
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
index 14a895391a5e..7b98e5313fbb 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Zope Deprecation Infrastructure"
 HOMEPAGE="https://github.com/zopefoundation/zope.deprecation"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
@@ -21,8 +22,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
-S="${WORKDIR}/${MY_P}"
-
 distutils_enable_tests setup.py
 
 python_install_all() {
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index d83588438dab..23964051691c 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,4 @@
+AUX zope-exceptions-4.4-fix-test-py3.10.patch 1087 BLAKE2B f5cadad133bde4818e03ac3bf971c093813b3ff48bcde18ad1431038fa8bb1b9b978ffae710d5812c963f0ad6d09f3396b86257e4debd23f3ea293b1eb80ac74 SHA512 681b4aa0d9ae0848ba4101db11942fe8b305aee1941e3c6bbf9c7a4bffe92783eaa1393e9131a25ab1ce7b1f91ca8e0907cbec85e6598907059650314208ca7b
 DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
-EBUILD zope-exceptions-4.4.ebuild 925 BLAKE2B d16e983c9f01d1f44b8628f1e2276abc3ced84def799b18b1638ff71db55b4d077674bb88ba81e87b3cf2290a2b1faba2b82c684fad10593316210accbf4a4f1 SHA512 eeb1b39651165875e94023ab1c1f1b1e68affd3d1e04f862b3643f720e8926854383cfe2ce6e19fcb4080a3e345044d3c3a77407def32050cad50dbc0a1cc480
+EBUILD zope-exceptions-4.4.ebuild 980 BLAKE2B 9182f4b231f3434b4a0ad1c3692cf9eed4d8a3eda7d48ae5ee9e0f9f10b7fa7e29b1881232a7fd73f28dade999b69cfacaf62e7ef834fb32a9b4f5d79cf5f3c1 SHA512 09d62bca36e2db56346327fedbc1b98d50b2eb696dfa89bbec34cfb51183d9dc9288e782038d21aa22cfdbc16898b6458af8fd3c0d4fd061cfea1caa0cb3ffa8
 MISC metadata.xml 412 BLAKE2B c10e47865e43c36b30c45f69202df2899e961f2b8ca11c4d6ee289e742cd82ab2708ed91042d042b9b41d977d8b7d13f3d3d1a96fa10a1d6b8beedf52f07ff33 SHA512 184a2a82c735cd77ada2afd4586bd0381c8333bdd604914de8538e941b8c5c2203eeb6c46064e9a41915c316b8399b1ceebcbbfd7f6ab00c480fe44a72726ac2
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
new file mode 100644
index 000000000000..a218797b25a2
--- /dev/null
+++ b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
@@ -0,0 +1,23 @@
+From 71be9d0724f087c99857edeef514d0b99e429cc9 Mon Sep 17 00:00:00 2001
+From: Zamarin Arthur <arthurzam@gmail.com>
+Date: Mon, 31 May 2021 12:14:30 +0300
+Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
+
+Signed-off-by: Zamarin Arthur <arthurzam@gmail.com>
+---
+ src/zope/exceptions/tests/test_exceptionformatter.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
+index 64729b1..0f5ee8c 100644
+--- a/src/zope/exceptions/tests/test_exceptionformatter.py
++++ b/src/zope/exceptions/tests/test_exceptionformatter.py
+@@ -668,7 +668,7 @@ def test_multiline_exception(self):
+         self.assertEqual(lines[0], '    syntax error')
+         # PyPy has a shorter prefix
+         self.assertTrue(lines[1].endswith('    ^'))
+-        self.assertEqual(lines[2], 'SyntaxError: invalid syntax')
++        self.assertRegex(lines[2], '^SyntaxError: invalid syntax')
+ 
+     def test_traceback_info_non_ascii(self):
+         __traceback_info__ = u"Have a Snowman: \u2603"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
index 61b483dc978a..e3e9b985874f 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="General purpose exceptions for Zope packages"
 HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
 SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
@@ -23,7 +24,9 @@ RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-py3.10.patch"
+)
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 5927a27fb583..9d9b08fa65cc 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
 DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
-EBUILD zope-i18nmessageid-5.0.1.ebuild 1049 BLAKE2B 5cc71895c8a44fc52454bcd29fedd2f7a0bf2a9a8916e5c3e1d8896bde8e8c4d9460d27a9e33db9f0fd92cc5ee28f5dc436b08a1e9ce99719b10b8cbbf961137 SHA512 65d820351784a806926bb7e6cff6e1211e50ed31a8ffb4c862c5fa3a3b39a604b28d713eee8f9fb8ba447a7f2c3de73fd3a6a90916548c38099bb5870beb8ed9
+EBUILD zope-i18nmessageid-5.0.1.ebuild 980 BLAKE2B c24fa17078cd51b581b6ac12b22acc129f4c7716e6615a9e2640a2364bf34c0cdb2edb8a450f25a0a448a3f4453ee37ecd1a6e93e17873e9ce2512d85bfaa4ae SHA512 52d5c7c002480d13f995e1ff9be2ef8d57b1864fbdf7e5555e902d357d0d1c23deda06054642583c799c686301e965735b6f352c7dfc3ac4a9bed73aa28f9ea5
 MISC metadata.xml 487 BLAKE2B 7d59b64c324e8f6d9a38f6d95c2a672fbc8ebc3054e7786a114db8d99082a9d7d10c794c97a6b684f792475c79759a27cf48ed2d4f013201fe8f7b70ba00e3ff SHA512 5f2f2862d427dc342c90d1624ee7dd8d95ccc5f11410532dd892aa79b93c2e79a41bc6ead47e4f1ca43aa718ac619a01bfc03a71bcf7116aa39e2069dfc7da87
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
index 47d123720e1e..6ad139e6808b 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -29,8 +29,7 @@ RDEPEND="
 distutils_enable_tests unittest
 
 python_test() {
-	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}"/lib ||
-		die "Tests failed with ${EPYTHON}"
+	eunittest "${BUILD_DIR}"/lib
 }
 
 python_install_all() {
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index db48c849422b..cae9318b9d67 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,7 +1,3 @@
-DIST zope.schema-6.0.0.tar.gz 110343 BLAKE2B 8dad6fcbd5bf3ef5902657bb7cfc4d31509cf8b74be3e44ec2a5977dc998bbe9b2605dd0edd85aec7f5e67e5e4e7ea6e9ddde2e63f5d56226dfead804e10eb61 SHA512 3258e6b2bf97485b9496f19319ef5af9a1e908b6c2661c27f45cfd64057597cfd514acbe79d86ddda1b80e66be45a10680fc3d9e662513b360d5f047917735d8
-DIST zope.schema-6.0.1.tar.gz 108325 BLAKE2B 4e23b2a864ce8ca650d71723f2ec89f04e05e7739cbe6b236ebdd4ffe80261a75faac414ae411b1ea525f93375f8eb4b6eb1e6186e04d225467b729f5c630b77 SHA512 c8b9182975b1f2834827877c725a8d0c800bf3cbed9dce2625bb3e1715c0fb7d346b8206f47a96994fa79240a0cb30c4aa38cea56f9ecb79351fd97e0bc021ba
 DIST zope.schema-6.1.0.tar.gz 103042 BLAKE2B 1892e5724b6f947cda40567f0694821d49ee66239af51d13d331dbb55b8251352670a7b37ff77ad6b36da7c18a8614338364e43f1fcf92464121d6b5daf65985 SHA512 a832bc779195dc3f1ce812610adc97205a4074c9523d70ee4019e03285f7d94df24f165a834e65cf26b06fc48754b76189299e58af5d4888a4abb15dc0d64ec0
-EBUILD zope-schema-6.0.0.ebuild 994 BLAKE2B deaf6d56e6043deec37cc2e5148fcd6fc08c5c54fbe9c6b74a3090abf68ae1f24d7154ee44ad9b2fc7d17e7da61ee62e548df6bf82bd654b2c2410b506812f70 SHA512 8d4d3b26916730154b457e9be15fa07f84370477a0baf61b7a8e3bd5ac8d3858dd76eac83e3b1dd1c773e8da5a79d49cce6d2415196bcf22aaba526b1c2fcecf
-EBUILD zope-schema-6.0.1.ebuild 998 BLAKE2B 31e4fa5827804c58540197638a92f9a14dd2c85506a14c8b07f93338f8e4f49c9490ffc552a62b4072b18622089bdc1ecc856589274bba5e8f63d3c07c23f5d6 SHA512 0b7257381cabce43ca9eb848d4584ea8c519628fb13ede90e20a4aa32c97c5e02ac5678a1692df349b0d5252d744cd117de7e2f694cfa09086a8eab1bd9245bc
 EBUILD zope-schema-6.1.0.ebuild 998 BLAKE2B 31e4fa5827804c58540197638a92f9a14dd2c85506a14c8b07f93338f8e4f49c9490ffc552a62b4072b18622089bdc1ecc856589274bba5e8f63d3c07c23f5d6 SHA512 0b7257381cabce43ca9eb848d4584ea8c519628fb13ede90e20a4aa32c97c5e02ac5678a1692df349b0d5252d744cd117de7e2f694cfa09086a8eab1bd9245bc
 MISC metadata.xml 497 BLAKE2B 97f6a446a1e6ac7ebd1526824992b11189c505e6942307f15d2d69479bd5d30e5ff8adcc214a8a77882db35f468c882f0db6d27ce292a879ab5b1cfc6504a24e SHA512 975c51cf597e6b88b45f8fe21a66481227b3e257165901986b6532e6e1632948728713d65d2cbe6b42a6598fbac6d78ea4d4af84a1593aea85e8f49eb8e7adc5
diff --git a/dev-python/zope-schema/zope-schema-6.0.0.ebuild b/dev-python/zope-schema/zope-schema-6.0.0.ebuild
deleted file mode 100644
index 4965c44542fd..000000000000
--- a/dev-python/zope-schema/zope-schema-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 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
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-schema/zope-schema-6.0.1.ebuild b/dev-python/zope-schema/zope-schema-6.0.1.ebuild
deleted file mode 100644
index f137c80de517..000000000000
--- a/dev-python/zope-schema/zope-schema-6.0.1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema http://docs.zope.org/zope.schema/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 1b7a17646420..2be003941db9 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1,5 +1,6 @@
+AUX zope-testrunner-5.3.0-fix-test-py3.10.patch 3160 BLAKE2B 6ed60d4ec2e34fb36dacb81cc1b55d37e71546ac8b4f9ba9d1bff53f207a90699c4a3782952155ebccb233a22ef4f47fd0d2feab3b9d4fdf33aa88fefd9d6c01 SHA512 e47a8da060bbd402fdbaa0a5ff5c5682404702f10f7a17953a6fa12e350bd4413c22df926c05f9f16b640e08de58777e362c58ff775b7bd3811cf7885574f937
 DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
 DIST zope.testrunner-5.3.0.tar.gz 141406 BLAKE2B f3434e9f22514fffe912385f61d163e42ba1dcd9e9d3f2b3f1d504b608c73804fa38b14a5ed1bf288b75b98ef106024a27de925c404ad67be6acc6c1d6c8f06d SHA512 6fd9375c7b58847868aaf04e85722fcc2b1fe7a8e4ae2ec9103dcb091e6f837d649557ba014146876f814345240b20863bf1584f32212b0b1b28c38ed343b87a
 EBUILD zope-testrunner-5.2.ebuild 979 BLAKE2B d276c1fe01844f1c157def257119706ed0b241171f62b53deea2e70569f2d62fcdf6d754d274610a78c55020c670ca1797a61bc3b2ca3769aabf47abbb636c14 SHA512 89c2233d5caa6b8adf7eb5d4b909e554bc7d57e10051e53e18e97d3759cc5570423ec98fb6e6e381e1a6839fe45dc71799da443df4c01f73d22454ef9b211493
-EBUILD zope-testrunner-5.3.0.ebuild 983 BLAKE2B 326dffbafd007a86acb45a2da14a198b6657d41e8896e90cf6219290a12971bb6636402ce543f50d01b1ce5a6f7945a80c9267b70c8ab380008facc79f5608a2 SHA512 47cd4ed7ed1d8879bb479fef902f73ed9321dd75a0945cc79729d07f09e8abec3f43201e2c8f04b4672e919611ab3ec11be47257309dd860d3e4b2cfb5996653
+EBUILD zope-testrunner-5.3.0.ebuild 1039 BLAKE2B 105bfed4a0ddd0a7c43f21cea8d06516e2c6c7f270605bbcd8e7c3b04bd4e63b1778ae6f180e6ca3cbd188b4c03d2c94d77795f02bd2537835e8944e3aa94028 SHA512 5a436976e50600d2aa77aa11e12b11aa9ebe55e42c69defc17b29525533cafc4009411fcf25f34483b8c6e59f2d48f2a07bd94d42f2e157c6be5a4667fe27494
 MISC metadata.xml 412 BLAKE2B 2bad0bfc23c6d11a25bb7aca8590bcd9efc8cc181a7aea19583dfd0134ba45860c787ea557374d8477dd336d8c54ee8a2f6d0e9b638b3f6c0e717924656b8fb5 SHA512 c147c65955c3436f1668f2b295cb63db1ecfe93a36ff944cee7abb3e4e722198223f05d2187dd637274f906e729dacd73f8285c91bf0b462082f5260ae52810b
diff --git a/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch b/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch
new file mode 100644
index 000000000000..6d495ba2cf5f
--- /dev/null
+++ b/dev-python/zope-testrunner/files/zope-testrunner-5.3.0-fix-test-py3.10.patch
@@ -0,0 +1,64 @@
+From af8bfec49d90613633b76e914a6f54884463ba94 Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Mon, 10 May 2021 09:55:23 -0600
+Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
+
+---
+ .../testrunner/tests/testrunner-debugging-import-failure.rst    | 2 +-
+ src/zope/testrunner/tests/testrunner-errors.rst                 | 2 +-
+ src/zope/testrunner/tests/testrunner-subunit-v2.rst             | 2 +-
+ src/zope/testrunner/tests/testrunner-subunit.rst                | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst b/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
+index 1613cb9..c0b2aee 100644
+--- a/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
++++ b/src/zope/testrunner/tests/testrunner-debugging-import-failure.rst
+@@ -41,7 +41,7 @@ Post-mortem debugging also works when there is an import failure.
+       File ".../TESTS-DIR/tests.py", line 2
+         impot doctest
+                     ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     > ...find.py(399)import_name()
+     -> __import__(name)
+     (Pdb) c
+diff --git a/src/zope/testrunner/tests/testrunner-errors.rst b/src/zope/testrunner/tests/testrunner-errors.rst
+index e210fe3..05d74b8 100644
+--- a/src/zope/testrunner/tests/testrunner-errors.rst
++++ b/src/zope/testrunner/tests/testrunner-errors.rst
+@@ -818,7 +818,7 @@ Then run the tests:
+       File "testrunner-ex/sample2/sampletests_i.py", line 1
+         importx unittest
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     <BLANKLINE>
+     <BLANKLINE>
+     Module: sample2.sample21.sampletests_i
+diff --git a/src/zope/testrunner/tests/testrunner-subunit-v2.rst b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
+index 8658fe3..c165b23 100644
+--- a/src/zope/testrunner/tests/testrunner-subunit-v2.rst
++++ b/src/zope/testrunner/tests/testrunner-subunit-v2.rst
+@@ -447,7 +447,7 @@ Let's run tests including a module with some bad syntax:
+       File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/badsyntax.py", line 16
+         importx unittest  # noqa: E999
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     <BLANKLINE>
+     id=sample2.badsyntax status=fail tags=(zope:import_error)
+     id=sample2.sample21.sampletests_i status=inprogress
+diff --git a/src/zope/testrunner/tests/testrunner-subunit.rst b/src/zope/testrunner/tests/testrunner-subunit.rst
+index 6597a88..1882671 100644
+--- a/src/zope/testrunner/tests/testrunner-subunit.rst
++++ b/src/zope/testrunner/tests/testrunner-subunit.rst
+@@ -480,7 +480,7 @@ Let's run tests including a module with some bad syntax:
+       File "/home/benji/workspace/all-the-trunks/zope.testrunner/src/zope/testrunner/testrunner-ex/sample2/badsyntax.py", line 16
+         importx unittest  # noqa: E999
+                        ^
+-    SyntaxError: invalid syntax
++    SyntaxError: invalid syntax...
+     ]
+     test: sample2.sample21.sampletests_i
+     tags: zope:import_error
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
index 07f992c4b75a..1142107a76cd 100644
--- a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -20,13 +20,17 @@ LICENSE="ZPL"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
-BDEPEND="
-	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
 RDEPEND="
 	dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/zope-exceptions[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test-py3.10.patch"
+)
 
 distutils_enable_tests setup.py
 
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 16b75e5f89a4..b1265672f079 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
-EBUILD zstandard-0.15.2-r1.ebuild 1172 BLAKE2B 8bfe479c085338b30f479b4ab6c3cc0aca769ee0c661fe28668eb10a128792518f713e3d3d9fb54619c3f15280f07fd75e128e6acb23dec4fbc0599c300b1d90 SHA512 f9ec4d26fc656ecee8062681789d971064dfc4f3c5cdc6e10188f1a820f4b355eeb6f98a1d80eccb00b84ca12d802fef710eab9187300da87791714429f7fba5
+EBUILD zstandard-0.15.2-r1.ebuild 1178 BLAKE2B 5a574795e1bbea6c546e9cd3a19a0b902667eeb246672f4ab21f26fe4bda43df3ac953b3e1445dd7dffc6bee4c67f711d075d26417cbcbc76d55779f5f635246 SHA512 0ea43c62a4a05b0ad7251fb9db8b96af430ba77e65992ebe1efcc252036fddc767812fa58c0af154f5c8c39bd7f60ca7fb9572cd0c980136a5944eb8fa6498ff
 MISC metadata.xml 377 BLAKE2B c14803b618b3badd945f8b01ca90ed6f809d9d2648ccb59554f947fbf5910e613f741f83cc020b70831ebf70b579a0e1ed33d3f5f72b858ff280082938516196 SHA512 fec606ee1d05384ce4433e90433e54925443afae244ced5276787a6f416a96017dbfd03dd9ec15c2526a943ff6348827e13719152478fb2cf609017cf8359a45
diff --git a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index c30c623ecd98..328609803de6 100644
--- a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-python
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)