gentoo resync : 03.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
commit: 7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree: 8c6793f68896b341e22f33d7e6cef88e481f4a8b /dev-python
parent: 9aa80713372911cec499b3adb2cd746790920916 (diff)
428 files changed, 2523 insertions, 5312 deletions
diff --git a/dev-python/BitVector/BitVector-3.4.9-r1.ebuild b/dev-python/BitVector/BitVector-3.4.9-r1.ebuild
deleted file mode 100644
index fd32d9b3c571..000000000000
--- a/dev-python/BitVector/BitVector-3.4.9-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="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 )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/BitVector/BitVector-3.5.0.ebuild b/dev-python/BitVector/BitVector-3.5.0.ebuild
index 5d7d432a1026..f55f024cf238 100644
--- a/dev-python/BitVector/BitVector-3.5.0.ebuild
+++ b/dev-python/BitVector/BitVector-3.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 5590e8ed0dde..7e139d363349 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD BitVector-3.5.0.ebuild 576 BLAKE2B 84d0bc3606433f698a2390971cb1f75d6d0fda30da0acf45a1c66f793a1f732ddd1fa41c5075aeca4627a11bfee172acbeef1f80c96a4f357a9a53fda3092c83 SHA512 06e93aedfddd99f543d35438a8d33cde1d4d682378722e0f3ec448557e61b678c777511bc847d3de58b740c73096469a49ed1a007f68636569c0368eab7d93b1
 MISC metadata.xml 419 BLAKE2B 36f8dbcebc7fabbff0be1eebd52558eead8092cb15dbdcf5a816ce834c4486dc3743022f11b8d8944fa6e055b3450a7a45f2327617289b562c07d8057966c990 SHA512 dd2061a42827712b25efe3b0ac14db337945a89405506241a199cd17387c138361155e7e42bf8a3b9e75a03ba008957f376b2ec3294f05308cf07395b074ecdd
diff --git a/dev-python/Faker/Faker-8.6.0.ebuild b/dev-python/Faker/Faker-8.6.0.ebuild
deleted file mode 100644
index 53094317ba83..000000000000
--- a/dev-python/Faker/Faker-8.6.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.7.0.ebuild b/dev-python/Faker/Faker-8.7.0.ebuild
deleted file mode 100644
index 53094317ba83..000000000000
--- a/dev-python/Faker/Faker-8.7.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.8.1.ebuild b/dev-python/Faker/Faker-8.8.1.ebuild
deleted file mode 100644
index 53094317ba83..000000000000
--- a/dev-python/Faker/Faker-8.8.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_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="https://github.com/joke2k/faker"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
-	!dev-ruby/faker"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.8.0.ebuild b/dev-python/Faker/Faker-8.9.0.ebuild
index 53094317ba83..ada44c6701ce 100644
--- a/dev-python/Faker/Faker-8.8.0.ebuild
+++ b/dev-python/Faker/Faker-8.9.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-python/Faker/Faker-8.5.1.ebuild b/dev-python/Faker/Faker-8.9.1.ebuild
index 53094317ba83..ada44c6701ce 100644
--- a/dev-python/Faker/Faker-8.5.1.ebuild
+++ b/dev-python/Faker/Faker-8.9.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a45736183c08..5d68fa86c339 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,13 +1,7 @@
-DIST Faker-8.5.1.tar.gz 1147272 BLAKE2B 5842f7ea74cb5eb02bd149e95fbff3d6a75bb007e1e9de98a808854c37b59bd337f17617c4dd8cd899a6740babd4a501bb09bf840cfbbb689c529517ff30271d SHA512 a787bbf4bacd06e7af777e4f10714167d7e9e8ad743cf99d51a3a4c312ded8e5085559f667ab6fca3a6df87650feabf88b0ec647e049c26576e65b3a77191ad4
-DIST Faker-8.6.0.tar.gz 1147647 BLAKE2B 6d3903ec2d75bae963879485572f7781455ff2411f34626ba21627e1b4d59295e983530ef6c8172dd3d6332eed511af3190c4e84dd345a08d5b5746217acb26b SHA512 fa2012d87184d53e91d067f30d107d2731eef72838e74ab82845c61d3074828392e4efd12051b16ae52c251fe9eb58b98df8bd55e81eca0a9e1940b1f74b2e7f
-DIST Faker-8.7.0.tar.gz 1147940 BLAKE2B 9f0548472aa3ac092c2cf63da73fc456207da9ff4e405373ff7d2c8e02afff75912e1c3ac03a1d87981d66dfdb7ca611ae9ab2c8638c610032486e09ea37930f SHA512 cd75674aa959854701d2ba47f5f0638be730dbe1e4e6a6f9d551b100a65b8fc53cd9a5b1568a473bcf7c8044d2a3bd4ce7b621c8e7bc0bf002a5eb5afa5a6b96
-DIST Faker-8.8.0.tar.gz 1148063 BLAKE2B e774e208438f7f31331c8c18bee2e7f27c2bb4e8f280bbdbd87e9de6484f5db9b38cfa01932efbbfdc82fc0bd3a8f05a9ade0324578deec750bb576b21f9ba7d SHA512 fc389638be46e109df208e8a6109e2236acfda136ccb7b02df9b4ef793310f63d9317f12b84811290851517afb557a130a4ed370176ef19e76d1e83b06959381
-DIST Faker-8.8.1.tar.gz 1148431 BLAKE2B afb6fe9c3c93e909c26e734558d95186d3dff19efceee3a2bd7bb2158dfac34fc74c959ad163eb8e08f374d47c84bb454ffe45efa30b4b62e9d9e478ac784025 SHA512 46b1d04c40d93b8688421eb3dcfe6f718f61225d6e30846c9d6578c12451a2a1634a36bd084078e992174c9c017865b5acbbbda49d311b67f921ade14a72475f
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
-EBUILD Faker-8.5.1.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
-EBUILD Faker-8.6.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
-EBUILD Faker-8.7.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
-EBUILD Faker-8.8.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
-EBUILD Faker-8.8.1.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
+DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
+DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
+EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
+EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a70357fdb44f..aa6cb2390436 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 38d7b1cd058e..5a06cf951a09 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,11 +1,5 @@
-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.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.21.1.ebuild 818 BLAKE2B a5c074310e0f9ddf2014558eb950166fac2c2312dfb3ff604e5a1c3fb08600cfc7b115bb3bf0410837ea39c3fe3e56a606cea4d7461fe8ba0c997b281697dfec SHA512 f9b33ccf24bbfc6d1c554450968e0191b0c34219f13af349a6b591bd33327d0de93312e99e57c4f68fb1217d7773221310aa542eb134074646b23772ab98b481
-EBUILD aiorpcX-0.22.0.ebuild 810 BLAKE2B 5afcc27755c93ef73d852600b521e6694f1e7943f752bf78cea4be9a55aad50defd32a4168d1fc2bbdd148f2281c311c529103b21e27b39bdf57ddd3efd7ba23 SHA512 b2e3992fed8d2fc4133b2ffcd96e421de4c41dc1cff5c4d58186cac73ec4023855f711e669aa6f09c5db6c0b7c5193208f74f33db8456decfb766e5a1b7fffd8
-EBUILD aiorpcX-0.22.1.ebuild 812 BLAKE2B 10679fe911cbe607b3f32c2c98c1d1fe0e32b8a92fac6d6c75b39e20a58c34874af30e761ab52ea9d21808b622de34abff3cd8ed53e4b86159df9f17e7a89a2b SHA512 8ccc50c71514326a5b1416f6159bf0e686fd691561f8a692894be0925441d6e0d861505c3540967ebfc349c984eec9706ef92140bd35904689488f1c760c6618
+EBUILD aiorpcX-0.22.1.ebuild 810 BLAKE2B 5afcc27755c93ef73d852600b521e6694f1e7943f752bf78cea4be9a55aad50defd32a4168d1fc2bbdd148f2281c311c529103b21e27b39bdf57ddd3efd7ba23 SHA512 b2e3992fed8d2fc4133b2ffcd96e421de4c41dc1cff5c4d58186cac73ec4023855f711e669aa6f09c5db6c0b7c5193208f74f33db8456decfb766e5a1b7fffd8
 MISC metadata.xml 405 BLAKE2B 6e2904d4bba224f3ea6898a0050b43aebb88132ab641533837cc39f2404b867aeba63f0466827199a4a4d54bce5f08376328dc1f3a9e50965be06ebd8fa02133 SHA512 5877ba7a1e6d5cd3bd6a5d1484e7abaa524a16d880c15e4b78d47986be8de8d290ebeb0bad628ff3d68d8dd7a85930d05e56c6954ec8e78c6f4e73530f27f12b
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
deleted file mode 100644
index 7547b1dfcba9..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require Internet
-		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
deleted file mode 100644
index fdcf3f0fdc8b..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.21.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require Internet
-		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
deleted file mode 100644
index 02ba5dea0c06..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.22.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# require Internet
-		tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
index 8ba0167288fa..02ba5dea0c06 100644
--- a/dev-python/aiorpcX/aiorpcX-0.22.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.22.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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 9e3bc2923af7..1486d00ebfdb 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,4 @@
 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
+EBUILD apsw-3.35.4_p1.ebuild 1051 BLAKE2B 668a4051c5238535b4f267c6c1a6fed22db382ca1d8884f16216b0e98ffb6dc5fe34dca93082519e9941372acff79f2b05f024f4bd3c95cf6c7d06a8cdf3096e SHA512 ac359e50a625bc456e617808841a531b4760a8c19121dbd16b604cffd6bfcca0212a45cbb247db804a1712da1c74b1c20488043880f0c9417cc45bb13ea4c398
 MISC metadata.xml 699 BLAKE2B bf19c9247293e0352ad99f01a8cab2e64a8ca9af974849eed8b270dab4d5dec4bd803f3b5e29f433df8a0db9a596faed84a6fa4422db2eef5061f6acda63dcf6 SHA512 b8ed61d9356fd05fe274e6634cbd7ffb47ba5a599de8154a9a6016aef184bd63dea018bf453275f3a8a7a9e562fe1eb267276127320a2d3ce7d3c786e3024f49
diff --git a/dev-python/apsw/apsw-3.32.2_p1.ebuild b/dev-python/apsw/apsw-3.32.2_p1.ebuild
deleted file mode 100644
index 2dcb9f8967c8..000000000000
--- a/dev-python/apsw/apsw-3.32.2_p1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 flag-o-matic
-
-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"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_compile() {
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" 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/apsw/apsw-3.35.4_p1.ebuild b/dev-python/apsw/apsw-3.35.4_p1.ebuild
index 9c4c56abd928..a98b052e48b8 100644
--- a/dev-python/apsw/apsw-3.35.4_p1.ebuild
+++ b/dev-python/apsw/apsw-3.35.4_p1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND=">=dev-db/sqlite-${PV%_p*}"
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 44d98f366bf7..629e7ec8618f 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
-EBUILD argon2-cffi-20.1.0.ebuild 768 BLAKE2B 49a3a794806cedcbab96c36393ad0a9e287993320909b73d663d15355e18e5ccb9ea5f588ab4b1dc05d08d56c2641d876bc82ea32529fabaf2850bfed74b1bac SHA512 e87c2f139bdf69a971389f27c36647f7f4405d9eecacefb7c58c468d57bde1f50ed18b40052670f457fa121f7a7e5b88b4c83cc5507a22d9be449b5e94aacec9
+EBUILD argon2-cffi-20.1.0.ebuild 979 BLAKE2B a918c4574fdebe9374fed350536e38c3c084a98412e8a57e40fb7c4e6a9af8053375ebdac277bc583a482e552340670a191e81d18b15c336bd45451f89e8dc80 SHA512 19d41e330fc2beaa894802dd079edaa224b033b8519dcb0b5d95a12ff187a385ddad7734feca522ca9653c5c4113722b58f359dd051101937ac7c5f251d189a4
 MISC metadata.xml 665 BLAKE2B c3518c59bb9d83d0fac8ecc1018bbae9c48e3aaa134f7416e77c9cbd35ccb26db34c195af632fc08baaf36760cd1cdc2eba111fdf8f70b0c6636502c6a837c24 SHA512 4e65e93862880357bec44f00a75f16995c3841a4a83058e00d87fa6920f1d0ba3d4af060c6f7942245a6b4fc0a9a71ed467353e5f403595d4306d52517c07fbd
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index 8f2dbc345dd9..d86638c7966e 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
@@ -33,3 +33,12 @@ distutils_enable_tests pytest
 python_configure_all() {
 	export ARGON2_CFFI_USE_SYSTEM=1
 }
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# fails due to changed Enum repr
+		tests/test_utils.py::TestParameters::test_repr
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 2a3f80599a34..7babc0c9e99e 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,6 +1,8 @@
 AUX asgiref-3.3.4-py310-warnings.patch 8869 BLAKE2B 9690124277e49c87fe5d72965407f50b3826d5e26e9f81c4a5f25b88872f2d133f656d5e63dbe7b6503e9242912d7d0ed1d19d9b38640dcced8b709edadd5309 SHA512 53de4ba34d212ff4e750764a790d8e5ed9fae5fb78f4e278820680bc8fa7028e6f2658d16cf9826790b49d185ffbf360f8fe539f3ed5d03907eab114cc258174
 DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
 DIST asgiref-3.4.0.tar.gz 32396 BLAKE2B bbf80c4f5bfc7eaf2f27896913a59f522643de35a5eac45807b88f0b2deef6acef408a6d3abb939c4653554415028b5eea68e99ee45247e384848c554ab61c7c SHA512 259dd6fafcd4db73554a4bd26f6000b33c61e8e4d42294bc22826bc95e89959bcc3f9f97d8f0b5dc7e0cf8420890ea8ab368232b4046254e8c91ad010f6509c0
+DIST asgiref-3.4.1.tar.gz 32529 BLAKE2B 4b5f3b33e165468d71711cf28a5a6161866cd7495140cb67ff028aba5a2586414783d2fa7ce744e99e269714d9d64a019a67c852fd4546ba1f71625473010b9f SHA512 af266fc3eac58c21f2ab3f66e522067388f9cf232b17344fb5afbc408c034e61a1cce02362ec5dc494985beef099800f75cf7de28dc057c45e4bcb973b0a6dbe
 EBUILD asgiref-3.3.4.ebuild 815 BLAKE2B 6df2257f14b8497d9b3c2f740310daa1edf8378c9ebb08323126455259854fc37312766f531a151661b49c79d3ea7dd2e166709dde6a7577dc560d54b4b5f98d SHA512 5543d78dcba4dcb6743e1ae05040eb6b1cb465ace2bb17b5a61b27961ff2e842f93f7d13d35f2be9ecc89d07e7ee0205498dc13363c628d37efc9d3e67b7a6b9
 EBUILD asgiref-3.4.0.ebuild 698 BLAKE2B f04dd652264530179490857aef42e3af9a8d4f14a7976602c77f8e99af47d84ceb3a57981db64aa29a519e85beae4535aea99e475a4b82124b98d35457998fbd SHA512 3d11e79046a7ea4e9ff0ff4cd4816d19634cfafb6fc4b18a7305ae9befb672fab0d996da1905e6c721d5c0bd570669d7759df36041fc77c9c50cdabedd2e00b8
+EBUILD asgiref-3.4.1.ebuild 698 BLAKE2B 1a4ef749ea4481e64d8c87eb8f5cb51fb2e875fd8f5108f02472c1bf344385011073a22bb4f5175069b48546562b5a6a19a798045d5341062a98fef08d98ebed SHA512 48a91d936af1299747d53535ba24406c9c5d42865d45fc30a71d82e1d863c5add0e5d1e21e42a3994a827351caf72d55ebaf40b6be1d896bd098b4ffdd367aff
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.4.1.ebuild b/dev-python/asgiref/asgiref-3.4.1.ebuild
new file mode 100644
index 000000000000..29fe309588a5
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
+BDEPEND="
+	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index cd8afc396a31..5ff008e07b80 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,5 @@
-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.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
-DIST astroid-2.6.0.tar.gz 358265 BLAKE2B 77db092a9f4368f296a710235bd9d022638c97e3439195f01e55b38ff9e7cbfd204906c353a515ee0bc12f75526866d783ad57aa5d5f69e672e9c1603e48f579 SHA512 44e0833e078948eb1ba1e62710890be8cfc675f7ee136578a39e2914b082fcfbcb90b90a002998471fcd19c4092b9a3c5f71e58af32d3839fa799bcb5bf4a4ba
-EBUILD astroid-2.5.6.ebuild 1191 BLAKE2B 375a0f2a91178e9c08211ec1ab11dfff40009bece3be7466a109743db3bc78e9f0d13240e910867ddce46d49f65828632bbc4dc3f696609871b74f3d70b826cb SHA512 b548a364d9d5b94cf31712912319688a893dfe3e2a212f562b8d2f622ea22b85152d5f816996ffb8e31d898aea56f70a3aa6178df5fd4323e864743621c8d57a
-EBUILD astroid-2.5.7.ebuild 1341 BLAKE2B ee60d0e8fee5fef7bb8f53b5792c8862cc568ad6b147cee743e0c65cb12931c7fa2866ca196513b22884928d0cf7da23f86666e34e864723ca1d75e65cba5ee2 SHA512 22af5d34ed87dd6a3b14ecef3b085aac0794dd18fe215e72217d6238f202c3ba03199872a9188328ac5c72498aa1d7b9c3b5d860949ca8ff4d31e333c6480224
-EBUILD astroid-2.5.8.ebuild 1196 BLAKE2B b2e9eafa9b1c3416bf83d6d8c63508f3cf84a2cf13e84e2199a785ae332fe89605300bf23a2510145ee7d7c85b4f9da0f0a9b035efda87053c3ea7dffd26949b SHA512 780fdd87fd134490ee39a19f97f8f62278235279573e1d0405449fc603e96a03e05188abcab045b802c618ae6aeed1b04c3cb842eaba015cc9370a12c7420ce7
-EBUILD astroid-2.6.0.ebuild 1197 BLAKE2B 23ce7c1bd3463e690febb4f93a60928a6b6bd9890c8de45d9cd398c733dcd11c6ca3e352ed21ba9cb3e55dd2d104f7cc83934e60f4158f8fe73edce1c7d927fa SHA512 36e72b086e861af3092c12dead3452be17482081bf68900ccbe43faec43b3f154d922cc67258d49226a55b535bfda08c47a1a443e9c63053da9856e3a7fbe7e5
+DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
+EBUILD astroid-2.5.8.ebuild 1189 BLAKE2B f519059d0c45508e587e62b79df37ce94385e97bd71c4e91d2e4b3845c55104b21ca3a689873782a0e1ced58d3c2d67df31cdfc9e4294d81e91023c264e0f461 SHA512 f63e523a3f82497443b1a7e72da6298ef8284d72074b7f87209497334795a47ec2a9cc09c7b960d77754f99adad94e36d80dc62fb25518d90e42f0f0e5c63424
+EBUILD astroid-2.6.2.ebuild 1203 BLAKE2B 76c0402208fe16f0efb7083e0dddbba8a45ada958eee01b9386f202e98596e14a3c85bd7d9543b54dc7fe15fcb3a4f7719145f0676e1157154b134bf32651b22 SHA512 e56dba9ea2058590585d088140ef844f65ad450fb1dedbcaf56eb82f2e4b1756bd34ed6e4c5749f1f61476ea89dc28d46b1b7e91b38e8a82406e39a5fa7d5f48
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.6.ebuild b/dev-python/astroid/astroid-2.5.6.ebuild
deleted file mode 100644
index 74cec72405fe..000000000000
--- a/dev-python/astroid/astroid-2.5.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-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}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-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/astroid/astroid-2.5.7.ebuild b/dev-python/astroid/astroid-2.5.7.ebuild
deleted file mode 100644
index f34e714dd00c..000000000000
--- a/dev-python/astroid/astroid-2.5.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/astroid/astroid-2.5.8.ebuild b/dev-python/astroid/astroid-2.5.8.ebuild
index 347648a064cb..d0ea2a31d654 100644
--- a/dev-python/astroid/astroid-2.5.8.ebuild
+++ b/dev-python/astroid/astroid-2.5.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.6.0.ebuild b/dev-python/astroid/astroid-2.6.2.ebuild
index 5d4947f82b01..3dc8174c1c62 100644
--- a/dev-python/astroid/astroid-2.6.0.ebuild
+++ b/dev-python/astroid/astroid-2.6.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
@@ -17,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 1e8d25a270a7..fe749cb77699 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,5 @@
 DIST beniget-0.3.0.gh.tar.gz 16001 BLAKE2B 2a14acf8affb6066bfbf337d547c0eb2215d9d38aa5ed14300f6bd0699409f27619d468cb8cc44f510e38a4abda0e3705be2445c0809c74125f17e860cb5e97c SHA512 c86421470c31a703c2f488826493737100d86c509c8e99d32d7244af8151962eeaebe0f3ff92cca90222bbbad6a045ddcda3d5efb449eb2e06783971a9c474ae
+DIST beniget-0.4.0.gh.tar.gz 16212 BLAKE2B 881b08b40f69950a0689d10c8832d1fe02f3cbcbac3bb5e341084ed59075cb5ca86a22759753036bf65ab2c253e8455c2663b674759f007d49d2ba014a54e400 SHA512 521df94813a086832fe99420815823fe07803350ce8692bb45b793617cd642d0fb590304fe6bf5899073a7ec1c102abf5688ebca23e37803d4576ad86fcf7a96
 EBUILD beniget-0.3.0.ebuild 554 BLAKE2B 686c69e875f191a0aeae0914754a4d71938f93988c146609d2b0f41a3fe87a191a7319efbda7ee97b90ef5a248fdd5ccf7c69cd1694d55ef966e05b7dab067c0 SHA512 107e52d46a6cd8ab9c60f4748f24fedf55ca9d57665728d897330c68c1996056f6e70066c6680b70718a33ede00c8831da7e2f29b34ef8642e669c3bb29b6149
+EBUILD beniget-0.4.0.ebuild 555 BLAKE2B 7d7700112aa737ab87e4abe7c6ed9f05ce7f0f6f0e8b7dd81c100e3460cfc22f83bdc7564bb21c9e2350fabc626f1945debf6c620b1bb57feb8ceedb7b8d865e SHA512 5f258cc0dbd0293337d7b06064fc198cf0f758fbc562facade99ff839c143143e443f0e51c6e9862d4204f429356a8e486209795b5813014f87b5417bc45a815
 MISC metadata.xml 353 BLAKE2B 045be9e1628640f0c33d984d45107f67bdc692ab5e9648a7a333e5d933f163c4738fe88c13887254ce6cb87f2cfed401477c9b8727c2264ddf6bbcf99eaf4939 SHA512 40571beac3e14d1455717533e9be0db570f24720ca733fd7b51e93dd3a0d12dc366e361a659167556ac4e447280b808c09ff021efa2f36d6deb15e3434b7c67f
diff --git a/dev-python/beniget/beniget-0.4.0.ebuild b/dev-python/beniget/beniget-0.4.0.ebuild
new file mode 100644
index 000000000000..e1aeadad6a54
--- /dev/null
+++ b/dev-python/beniget/beniget-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Extract semantic information about static Python code"
+HOMEPAGE="
+	https://pypi.org/project/beniget/
+	https://github.com/serge-sans-paille/beniget/"
+SRC_URI="
+	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index fa7e8486e744..28cbb3c1a47f 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -10,5 +10,5 @@ EBUILD black-21.4_beta1.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41
 EBUILD black-21.4_beta2.ebuild 1519 BLAKE2B d6d3c0ce41131dff8bf570a315ad71ab2b41f5856e4e3f0700318b8ffe0cf74501924e8a7ca0ac90d2b406fe045552cf589bcdfc9638bcfe157bc53008e6bae2 SHA512 6b078742ca657d8fb7430e588301c36771a9db7c0235b80fd66fce599ddeb72611044656a572a4357312db635f02fcbd485f1f873c0945c2889d4d1e21210e60
 EBUILD black-21.5_beta1.ebuild 1569 BLAKE2B 6ed170af0fabe5c5f81468ffc19c687a936dc815338c1574481c4ddf900f6b09a67ac4d0fe1bc6b44377d6dda92bbf4b6f5afb6abdd48f5aa0e9eac8fe9fe1b4 SHA512 8662e404c08b9bbb4b837645fd67d77c1d5b7aaf85a054334d2980ccf27e4db1096c47bc2466bee3e56ca53574cc09cf7dc59ad616aeb3cfbfd1a4f089334980
 EBUILD black-21.5_beta2.ebuild 1544 BLAKE2B 7e8af30c33fda87f7d24aa2aa396f4cf748cdcd862ad747b7e012dae3b3b65c9c2556e3fbdd5bf5bbb6e79a4e3c0293f035cf1547664a2517aa0b9cbdc694337 SHA512 461b9e04c506c68497e0cbe6fd7eb6cc5f6f6ee36cb2596916f4dd0cf0a59479b112c1b03e8cd6d7d621a0690c315fc2e6a3e57a74dd4c64b8a3d345c3517746
-EBUILD black-21.6_beta0.ebuild 1544 BLAKE2B 06bae683dd9642fb8e16fc4f0d3cf888dae03ac8ad2fac4a204d5682895d3581ce95225c8752a437f5278c5a3c86b33aaa9b272ec76a25cf996840e6aec670e4 SHA512 8f6fb7080deacdfececc744fa24b03868b780b3b6a21143a0e4da0abce4ef6ff7bca3c90dff5084665a775da5e6fdf07e0040c9c288bd1196e227898cf4f51e4
+EBUILD black-21.6_beta0.ebuild 1539 BLAKE2B 14227596e30628b7e003d0103b15beaa88894bbfe9cf9d6d8331b5e44cbc9cd13f2b0d9d3fa986f015d3b28b2e139d9bf00790fd47807e7bf521255a057234dc SHA512 23e7a4ec22a3f2bd39e8edd745f59ff0bd062bc3851280e6f4809e8cbe359a5986bd8b022a3b9e8ca89fefabd17e9c614641e3c102826d8b804ebeb4c5182318
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.6_beta0.ebuild b/dev-python/black/black-21.6_beta0.ebuild
index 9685a0f82817..97791621807e 100644
--- a/dev-python/black/black-21.6_beta0.ebuild
+++ b/dev-python/black/black-21.6_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9875a6dc5b28..411b7f97ad55 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,54 +1,8 @@
-DIST boto3-1.17.100.tar.gz 385310 BLAKE2B fef5fb0cf4862819c05efa3eb793cf2c9756c003aa4de2c8288a0b46d2f6f2cace53ba09429761437073fac366ad73cc1e816b480a22d42f1d3b9c5160fc3a07 SHA512 2d137d2dc6265a784af961b4e61faddf2a9b9493fc281da9764fd1ef8e855777d48daeaef7380e9d83408c6358e33c2898ad60c95e685bc04a9821cb0b2cfc3b
-DIST boto3-1.17.101.tar.gz 385690 BLAKE2B 7b98615588eb09513eba33f1fd1019631c862def949f9c8314cc8b8506e83be3b3bfe88c08d97166e9f669db2724b02a247769db7f4262c7b4d306afdb3bf2e6 SHA512 cda7c5c42ef809397002d64f04e23bfac271086b4601595b635dacbab4592cab401b6238291ae2fa898d2419b4a0f2d3d0bc7828c0a7de2442ad0026a5565d56
-DIST boto3-1.17.102.tar.gz 386456 BLAKE2B 25b18f086f8881a237a953c85cecc403fdd1b047f990ae289c16695ca1c1faf50da3cd7363e72d1655d7a887c8f5c0729bb25121fa0066db5d393f5b6cd3d4a6 SHA512 42cbd01626bd11f774466dc718086648eb7a4b73a50226a04485e934010271b0f20c030c300ada074fb0b3bf3eac8f6fa113dee86d0f1cf3f12f12230778c2e5
-DIST boto3-1.17.54.tar.gz 362224 BLAKE2B d67ea9a2833d4cf6ec50fc4eab9c194f813f92ef00fa0d1638e0dca0bf03a92fa5208707b3ceda70759231aa69c35bf83028eada42d04209a55d05daf37ce764 SHA512 795a78807e8aad9ba53b196ac6b3547e23d2f7cc962a34121280fe47dfa8f99eac19765c87817918c6ee36dfb7e2b647e5646b7da27eb67900f29430bfe2fb5c
-DIST boto3-1.17.74.tar.gz 371719 BLAKE2B f6d44206a14cdf395c8963be048e81391ecbf6817b1c00e1cd081abf111df8bd85c05fa1c04b013de7e6d916835e4876cc961891c8d52d8a32e41713080ed96e SHA512 a79012072238286561ab43ca7bb9f24236e858e0bf550be9a074517145445d0d520cc207683d99f6f704416f617b5f89468c87357223db9564e4310a2a2676f1
-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
-DIST boto3-1.17.85.tar.gz 377940 BLAKE2B 7fdfa25b7fd6467f484dc988bac280b0e4e7044f2a064625efdc5e6f9725b038f08b88f63442452b151541ae4f0ff26ae395816f6422b49474d2e8d93df3a7da SHA512 126e78056b8ac52cba3db5965563c4b6c1451f5aeba2d7d775f358e75f810229102328230e0f5dd1ef3767468106f1d7f3af5575e51422c6b63ef6b509318e70
-DIST boto3-1.17.86.tar.gz 378144 BLAKE2B 35d6bfec515c985ead488811e7f2ad021f671e8eee1e63ae1aaade8f4a03dcca228483ec81c4911d12c290b3e4b3363ae92e9153eda83a638258394d0c7b4fcf SHA512 0b267b2333925e830237c830ef5258fa8834fd584f6f4132c012141b4ad5e38b6e6977de019d60f0ba93e3c8b4d9a1036d0c989366145a9d25ac0e5e7e4d39ae
-DIST boto3-1.17.87.tar.gz 378759 BLAKE2B 21ad4c735f34edbd82767043653ed0cee9604f0b36328f40cb22c4f9cd57758e0bc89ae93fd798babc1dded019e2b1531bbffa0574edd7ce3e07515374cd97cf SHA512 da3f2cb772d3f9708f5cbb102907ef58622435d4acdec8fe0abde80511f0734e6cc9739f0652150edc9e4f12039c0c7ee62bcc0059b42d86d5af0e809d779fab
-DIST boto3-1.17.88.tar.gz 379248 BLAKE2B 1aa238efaf5a22594b90903e1090f4f66a04effe93c3506ad36e0a96aa607eef9506f6fc579981a919b0f55ab1ba7a5d7e02a22a3d2692a9442f143a63f1b282 SHA512 989f8f879bdcded758f7b0be93e9355f91be859de7f2eabc7760cb8ad6e3317fa999cc5c092aac53bb2645ea0a86d0a6ceb03237b5164b89850b8c34d3eebdb5
-DIST boto3-1.17.89.tar.gz 379572 BLAKE2B 8a067aa757974cc3399de29173a6fcf99d35196c64978bd0cdb4e85f6e50558c9584722fab3402f3b3a2f951b3cd801aada17ce70bceab4f215f1b91dffd6372 SHA512 6bae209eda16ee07b142fe56740a5e177378b88e66b0e5c6aac99748c59b34f28f0c78d863d5a76b9efeda6413c4e6aab94d3c9ee87fbc5ae7d9c8bf02b5fb3f
-DIST boto3-1.17.90.tar.gz 379938 BLAKE2B 72392968678576505a4c80f62ca0b3f7cf086a7c739a918b6d39d7c8b05a2a1b9648d7028126bb6c2893da44bc9bd5367089beb12a187d48c09712f2b6d7a95a SHA512 75f2d02c1256a2a60a4f87d774d5a339e556180482419c21774ec41a5980fd0149e7d66f52cb408035b394550bbbdcb2710de1fd6f948cccd91064e5d94f20ca
-DIST boto3-1.17.91.tar.gz 380247 BLAKE2B 8017241fce7337ed88f8da35ad914081d7b4a83c7ad78c6b1aea1408909f438c4b86c64501b5aa5c8522476bb9962ed94089b51ed89794062e7d937dbe0063b5 SHA512 d8a083911cfb930e7a7b1fe587fd33f7cf9a523683685e4929b63a8dde8502178d44091c6b8885a40052f03e7b8fd6a48e332ff5cff3a12fa7290d922eff9fe0
-DIST boto3-1.17.92.tar.gz 381619 BLAKE2B ea7f1d7fbc1481d22f5e5bce9d051e9d825de215fd9efc9396c9d11723eac70e422b68d9f72a429ddd0bfe9976ad0e6e3c7e7bff74af388996c3e48ac6f383fc SHA512 a96d57eb19e794b4b7a1d4b1ee142f601ca5a10ba7c20500dd3e570131904874fe470cb1ef7146f7eb4ba189a91f9b42dd58acb0c8d54216352c03ae173f8092
-DIST boto3-1.17.93.tar.gz 382205 BLAKE2B c665f3a98ffffd3a146914e5c061ec222def64ffffcf2bfcf1fabd86ba5be89d61fe4201b81134fd415b80710ed7d4261ed26eb71fec9c64525f4c2f3ff88533 SHA512 bb1f3264cfa4717f32343553f5af1d35dc7bab813d968775456239a758111cbc7eb6514df42cc3675f1d693f5bae33c048fcdae98c348d3aa54cbb6e98d88f70
-DIST boto3-1.17.94.tar.gz 382448 BLAKE2B 84ea4989b47ff4b1adbcb1118bf1a18996d98d954c195671483ac2ada94afd1fbda151afb6dd1be556c5a63535ebf9747c7f9eac99d55ee6cdd64dd163941572 SHA512 a157df1cef3d7d99f319bdce20ff4128cd171cb9ce5b3cd7e286711cb0b3939efafbd4f8b1370fb131af60296d703c1244d4232cedd28c3615d1437c98ba4445
-DIST boto3-1.17.95.tar.gz 383063 BLAKE2B 9d715ce7cf51daa806c0ed6044eca32c51dddc9114899e890e9745db51d574fea02515364cbab3fd82b9960dcc658c02bab89564c98ede13487ead75280c01a5 SHA512 63c78ea41bf79af23159aa8a97bf82ecd6c5b5075c1d077777679cc7ca17de4e91eb9abd19c152e5eeee2d5af47739ba0df3dbca6012c3836b577bc52e52eff4
-DIST boto3-1.17.96.tar.gz 383485 BLAKE2B d962177eb5a693aad1900fbe6c44e20853deee74a31f188d1d12a34352d1376a5edcb84e854d8eddb8ce9dfe0aa46d8ec8c5998010a0f3a635d7b4b2ac46a1ea SHA512 c77a682b6895ddaceec21f9ad28eb08bda9eafa102cdb1024270247f9bfe849249c80bc586e18de4c1bd1410dabd165154b6c17655e8d56a16d38e009d695141
+DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98042a76311588463f36f48a6bd9641fd25e07b63ad50afcb3ea9bfea0b5f3304e3c2689a2187198aac04549346c SHA512 477033e623476fa1e2e49cdb788f204ac49230088788cbae3f079de4561e7bbe56bb3b170480592a0ce056fcd2ea0cb3f14b4f5091279f46346465853a191829
+DIST boto3-1.17.105.tar.gz 387920 BLAKE2B 475342a93440418f6fc5682e7c24f386aaac8dc91e670e8c6ab7f949fb8557c97ca0f7e7929128742c3b1091cda2a42e0f1212528f8fb1c7ce1a6dcc3aea18c4 SHA512 a044f0a61f8ebea58f7ebbe670b4f0ba94f6c3abe69857340908be780e1cae5f5f3ce892ba16af44df62542883d30b93a9b42830123dd3fb31998ae8c642e1b4
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
-DIST boto3-1.17.98.tar.gz 383306 BLAKE2B f9fed22e11d2561a5a665105bdddffce2cea357f588200285ba4758809e6f64ded3ef4ad4eb10a52a1852df86d1098f752f432f5bd90a70669d569866262d638 SHA512 223de2234b235773138ffca02eed8187eaa2b74fa3c0822700bfcebe12da69078ab592ca77158448cb998d47dc63a20c79a3ce9dab2398c41faaf94a329c7cc3
-DIST boto3-1.17.99.tar.gz 384452 BLAKE2B a86fcc79242ce9e55101690f2fc7534d43038621c9d5aa9d9f7f1eebbf9bcb07a035e91d62486163894f8598969ccb99047d54918f874dacfb647116a65b097e SHA512 99f1fc890680162b2ec8bd9da77f4de5ecf23ab1f7cee552f51031f2b21ca930b9d2ab27ad5f61d1b7e4a4433b288374615313e00abe8ae595c10fe36f6a49c3
-EBUILD boto3-1.17.100.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.101.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.102.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
-EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.78.ebuild 1367 BLAKE2B da22f912dd19d83b7e2a4e22bda42785dba18b67bd6f0b9a5a6d13cc87a1cbec9810e8071a8f7407be4249fae4aa6a27357970f0f9b60f914e9f82b034b862f8 SHA512 568133f9ab499b8ff9e95340ec99b4bb3c9e6f53981d2fe337a3220a189d9bf91dd8f7f03db055e0a02169f36546f5257fa04c1a0fd2918d712c636e02903240
-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-1.17.85.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.86.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
-EBUILD boto3-1.17.87.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.88.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.89.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.90.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.91.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.92.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.93.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.94.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.95.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.96.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.97.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.98.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
-EBUILD boto3-1.17.99.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.104.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.17.105.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.17.97.ebuild 1336 BLAKE2B 7e8ad6dba926d35239c71ce2d80fbcaf13062ae03bbbd962bb4842f6ab01ee0226b8f41dd57b05c0e4602a45f43017213fd6da4ad6a1afe36307e006b0866d25 SHA512 185309d57be679c0cff90fc53e0868ddfe7dbbd6a8d46be2835b825cdd48ad9e942e9212b4c853caea0c90711a3b729a0181b6aeea980e9e01e0de13b01712a2
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.17.100.ebuild b/dev-python/boto3/boto3-1.17.100.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.100.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.101.ebuild b/dev-python/boto3/boto3-1.17.101.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.101.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.102.ebuild b/dev-python/boto3/boto3-1.17.104.ebuild
index 75afb4bcf865..75afb4bcf865 100644
--- a/dev-python/boto3/boto3-1.17.102.ebuild
+++ b/dev-python/boto3/boto3-1.17.104.ebuild
diff --git a/dev-python/boto3/boto3-1.17.87.ebuild b/dev-python/boto3/boto3-1.17.105.ebuild
index 666cbfa63e3f..75afb4bcf865 100644
--- a/dev-python/boto3/boto3-1.17.87.ebuild
+++ b/dev-python/boto3/boto3-1.17.105.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-python/boto3/boto3-1.17.54.ebuild b/dev-python/boto3/boto3-1.17.54.ebuild
deleted file mode 100644
index 2f9ae1e99fda..000000000000
--- a/dev-python/boto3/boto3-1.17.54.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.74.ebuild b/dev-python/boto3/boto3-1.17.74.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.74.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 ~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.78.ebuild b/dev-python/boto3/boto3-1.17.78.ebuild
deleted file mode 100644
index 95cca01df831..000000000000
--- a/dev-python/boto3/boto3-1.17.78.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 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.79.ebuild b/dev-python/boto3/boto3-1.17.79.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.79.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 ~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.80.ebuild b/dev-python/boto3/boto3-1.17.80.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.80.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 ~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.82.ebuild b/dev-python/boto3/boto3-1.17.82.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.82.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 ~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.83.ebuild b/dev-python/boto3/boto3-1.17.83.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.83.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 ~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
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.84.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 ~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.85.ebuild b/dev-python/boto3/boto3-1.17.85.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.85.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 ~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.86.ebuild b/dev-python/boto3/boto3-1.17.86.ebuild
deleted file mode 100644
index 5577742efeb7..000000000000
--- a/dev-python/boto3/boto3-1.17.86.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 ~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.88.ebuild b/dev-python/boto3/boto3-1.17.88.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.88.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.89.ebuild b/dev-python/boto3/boto3-1.17.89.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.89.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.90.ebuild b/dev-python/boto3/boto3-1.17.90.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.90.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.91.ebuild b/dev-python/boto3/boto3-1.17.91.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.91.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.92.ebuild b/dev-python/boto3/boto3-1.17.92.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.92.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.93.ebuild b/dev-python/boto3/boto3-1.17.93.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.93.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.94.ebuild b/dev-python/boto3/boto3-1.17.94.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.94.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.95.ebuild b/dev-python/boto3/boto3-1.17.95.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.95.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.96.ebuild b/dev-python/boto3/boto3-1.17.96.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.96.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.97.ebuild b/dev-python/boto3/boto3-1.17.97.ebuild
index 666cbfa63e3f..dc4338635795 100644
--- a/dev-python/boto3/boto3-1.17.97.ebuild
+++ b/dev-python/boto3/boto3-1.17.97.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.17.98.ebuild b/dev-python/boto3/boto3-1.17.98.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.98.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.99.ebuild b/dev-python/boto3/boto3-1.17.99.ebuild
deleted file mode 100644
index 666cbfa63e3f..000000000000
--- a/dev-python/boto3/boto3-1.17.99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9364b465c5a9..bb018e903db4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,56 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-AUX botocore-1.20.64-bpo43882.patch 1106 BLAKE2B e08e112f1afd9a4b80600550550903594901eebf94d44cecdfc38ff2e6007594f796506377096403f3b77a148acf92bcb2373eecb705e3f150cd5ce41c0b3c76 SHA512 1bfebf53c8cf9a2e84b7493365b90e87174cdaf0eb138921877f2f726b5b9acf7d0cb4b4fa4f532f23cfb29bb48150ad01ba582b1a19c3b0702b24f69208e5da
-DIST botocore-1.20.100.tar.gz 7870739 BLAKE2B 0af8337b44f78f0d66062c3e351e6c2805ab4e205e1404a698bad7240abf37f4fd47206c9b3f9a302053c933ab774e8842edefa38979b09d5b111b836137119f SHA512 af20cf638e48375b0adbadac5329aa62008def72e158159acbcdc200b250c0ac27e0ea568cd216ad8e81772b42491efed5a271f186d9caf0dc7e3bbf0197b7c6
-DIST botocore-1.20.101.tar.gz 7872329 BLAKE2B 417f92e0747d32e9238e318af1f4063c86aca6364c63f312755efea6135df9415dd37dfa754896e78573329da0bb9e5f5609cbd836fd771e4ef185d691b1f5f3 SHA512 6641f14bbe9385acc764377be27b8d50f8eb0044330bc7248adc27c7605d4bcb489203f3953cd3ef17ec0f3e49d1df4e84f6ebce2c7d5b2b54d98406d836b49a
-DIST botocore-1.20.102.tar.gz 7881122 BLAKE2B 51d2acb780766a02a2b58bab10c22557614711e944c58fdbd78479a59e1139446a642da7a8192f2d37c22fa8fa60d27024fca68737601d143018a17669f8df4c SHA512 ee756829454bca50e872cc8cb3caa66ff9ff3cc1075a1afdf693d39e4e9f3c7953b1c69c13c78be594aee572752eb89700369985dfc57e7ebc772b444f8d8c91
-DIST botocore-1.20.54.tar.gz 7650344 BLAKE2B 2dd0a3f8c7c5665e849cf74b663a88e63416f1dea8ca3ee7dbdf10cf35239d466919f2ae4b3c9a639b9e25a23d982b723b24f32ece43715d40283e96e3bf10f6 SHA512 77cdaf68378836205c94c7dfd8424f9ca44ac822fd418d323df30639157bb38e5534fcfbc5bb6cdd7695bec62e24a1d52b81a0be54b0f69f16d20c5182db004b
-DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
-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
-DIST botocore-1.20.85.tar.gz 7795550 BLAKE2B 483b6fef456de9a37b00dbaf0f2af766079447f70fb992c96f0ab8208c3ce0e39a459d89a29e07b7e9fed9e1b39ddfeac28c3de5bfac1ddde1aac2cbecfe4056 SHA512 1a3e07da2c1b60680c858e4b732fe340563b18ec10aad7a9250bff7e7a11a97ccd3e952245187b90fe84b2fddd8f48568d70d69a03612782da5d90a8e2d06de3
-DIST botocore-1.20.86.tar.gz 7798788 BLAKE2B 93450262bf1e34a627a64f8972e4d8b02dc24e1646633e89d4911751b0c919b9dd3515021cfffcd0c79223b237a8bb283220f6793c8e411d399a75321cd7b369 SHA512 fd630d93645861a94173a38b50c7b2ef1c646e33ad30d75eccb4b92bfa0ce08c06ac39ea6bb38f7e5c551f625b919b00170c4a243e67d5d66789a011ee5390a1
-DIST botocore-1.20.87.tar.gz 7800088 BLAKE2B ba98b0f910216a340f48adb5ddf14aa9239ca44202641c97ca91da69f34a67716c50d9bc6a330021fd630f7c309062fc0326543e46ee1207c294870baefd0aeb SHA512 b922e40030a1708ce2e5a2fa60012e21e28b955c6d30fbced5d1a93dafe189e83430b5cee162e2ab73e80c7dfa18657c2ca42057c17e943c0d421c6cd9969b53
-DIST botocore-1.20.88.tar.gz 7806185 BLAKE2B 21c3e3420fc9810712a462cfab4f43509ebd25a4cbaee4a51f2d82cc90a530c4a170b66cb6551121148d284404427eca7d9dd979ead5a9f4132ded47b4adf180 SHA512 aa36c39147d870758b9561e569f6b8a616e69437d775b1f68d522574a24f0e8252e5332d6e20b92448bc3189ec50232d89134bf86d12a3b72d63962de0d9cda6
-DIST botocore-1.20.89.tar.gz 7808318 BLAKE2B cc160b85d7e85267aa4bd7140c8f90b33dc07e5b8c0cf2cd4761ea456dfa955bd95b500e8da89bd9cca70237edcbd7df45c8f1d543e4e67646a8e597a5516fb5 SHA512 41fd7cf61b8eddb3e467d6d6b115c53e75413bdd3bb181723dd48c6efdd7133eee45ac597bf207482b2aa5872bf79d7801176194e474c61614599119df67db5a
-DIST botocore-1.20.90.tar.gz 7810567 BLAKE2B f34ce1e4ed16254585a90e3ba1674a35909169a0a73a216e0b5d60609567133ce1257fc3b48a21e3c707b42db546612f40263e20fb68eba1e01cc3560ed5ef15 SHA512 4765abfe9913bb214d1c4aeacc00f5b5745322121bbb1e652705fbd63a9801476e513596078f833306834047f42b39edc9de31939f02860476fdb825f4b654b1
-DIST botocore-1.20.91.tar.gz 7822478 BLAKE2B d76b3a944f951a9722e59d28218e24eacbcc9282235df6adbbf9ac01b12dc96e446a7dbec06ab08433513a3f1dd1f39ac8db85c4aa3cfcd99348fa57e85b2246 SHA512 730b664b050db5df7c9f9f3ab89e7c7f541b0c921a0a6f38f4d0d7a4594f89b61929d5251799c2cf08bda1107567c636d036379b328db788178ae7af18157366
-DIST botocore-1.20.92.tar.gz 7826845 BLAKE2B 8568b8be7440807fae48f735198059356764c7f36db1dfcf73801379ea90b728bb02a086e19a202bb5b3a7c05886edbc22ca729a1ea43ac1f38ad96b64a6c28b SHA512 0cba710b28086b4e83c6269e74ca3531b26497d438e28b8ea285f7fbee0da43545134d22fe5fb300d3c77d9c933882b1f00cde797c470e6af73553c191cebd66
-DIST botocore-1.20.93.tar.gz 7827854 BLAKE2B 6297172731db3367d5d769c38de4d8ba8e36eb8c1e870d8f31c3175944d32f52d4e51f69d533853d0c8ea2c0bd2dbacb971a12aa18537bf099c9812481108d9f SHA512 2d38de5fd92bd17df029f93254e8ea26fcf1cefda274d479cdbe8919c862d32c0a18cca165fe65c4125adbbaecc1909dc8da576a0b0fc7d47dc72cd3fd3db6cf
-DIST botocore-1.20.94.tar.gz 7830564 BLAKE2B 4c52bb0f782a4560c1c966ede26a5741428f5b06aea8a46f76956b7ebebeec92c6eecd62fd3064a3eeb206c68116a64104222dc141d860cc9d1c53eb37567c24 SHA512 1dbb52626b03f82b48cdf76da0e0138b11d47c9f6aef64a164c7489232a46af4f2d214fef5d132a1c656f2728608cecd23b4a781f58252ee7a69c7efe853d4f3
-DIST botocore-1.20.95.tar.gz 7833074 BLAKE2B f7c6f01cf28f609a2a6c2cdcb41240d3d653a12ca28e29011ee2ab909b988b187378989eaa19f73734b3a64ece5041520af9a9e9de801bb1802001b22d56387c SHA512 a3c532e26054f793ac71756ebf69c0f17bf60e4510297abffadf02c17188ae74ea374b534bfd9db8cd179c53287734b797142e7e08536a9e3199e269cb014c28
-DIST botocore-1.20.96.tar.gz 7842597 BLAKE2B 1a30d4d29c1200f51284a30ee1f512debfbf5542836e32e4971b593a041c4e0793e609b11528a1ecf080e2a01dd4b0ab06bfc44905beee202c23fca983238111 SHA512 9a4973b7484fa5586473dbedd402d6b8adfca18a17373752078f35fc24fda7477a37e2c9fee4779e52c3a60b352ab02943ebf49eb77dd607b79e88d25ae9b6c3
+DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a442b2d49e461a2a4c2bd613e26095ceb87f4b7ceb672f338ea04ad918060bed118f7bc4c184c46cce1d6a9f98d4239 SHA512 2201d87ce2e1c8979548698d6a46eb03c0a2026360b178fea895ad6a244efad534d9970d3c6343d50639d25b3b8643db6744658fec14e0fa29fd7c4b45c8e0d8
+DIST botocore-1.20.105.tar.gz 7883335 BLAKE2B b48347e304ea54b56a37faae8bcbe9c127118b5bfadc71ffff3f6914b57f4d819faaadfc25834e49c9523f073f639823db4046bcbd9b5b72ee1df4c2ad198338 SHA512 72267620e4ecb7e4e4fa446b8f5c0b42d2e0af372f9e8bcfea123e5d8a6f4638102d57a9eb9f3c6f2358c6c2b36e727552c0b350b07f95a79292fb3c2cf4dd99
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
-DIST botocore-1.20.98.tar.gz 7854150 BLAKE2B 3f63f0057555b33fbb69d4f8720b393dc6f866721df0a90be354ae3485e0053bcf2216f180d4f795cd271a5ea77e7d390ff453c5d2655e60b51623be1fe5df8e SHA512 98d931ad9efbcb899bc3f6e1fd55028fdbc88cebb9d2ffe93db08610b8515de8bd784338b2320136319314783fbb65d251526efbf3df76de80be4561bc97f40b
-DIST botocore-1.20.99.tar.gz 7859805 BLAKE2B 41c8afcf4277dd10589209c18281103a4ec288581c08760da380d883542133aec65813792064d70efdd74d94902e45e0a9164d1882d27cdba01ddd12d438b5ff SHA512 45da79b872e8489e6a366106858cf50d5af52d3f1a2df1b831d47b0f72ea0b777c354215b43e2feb2d31cc3646d1995590152133ed865bfc184ad60629a7f61e
-EBUILD botocore-1.20.100.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.101.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.102.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-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.78.ebuild 1508 BLAKE2B 63c6bf25a6af7e1f5e39d58577efd2044a915b4c9679b02941600fb89e061b403b9b6f5c47d12180768f8461660f39771a394dd90dfa851bd6b6d9ac895c7eb7 SHA512 83d93e13674e604cb4a0593fd6e189a689fcb5ce23a60756cb6b2bbe6050d4c07421953ea21b697f83cc876a6e77e1505e89344bf1143b8130d8854bcabc644d
-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-1.20.85.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.86.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
-EBUILD botocore-1.20.87.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.88.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.89.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.90.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.91.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.92.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.93.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.94.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.95.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.96.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.97.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.98.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
-EBUILD botocore-1.20.99.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.104.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.20.105.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.20.97.ebuild 1509 BLAKE2B adaf8d92de73c9637d36076b667adf0923761053f3da84b9889e84ea5cd0871edcfe27ae1849df654616f1cda04d6ac5e73f4665e686929d4ef8abaf2a7b379a SHA512 366bc1f07343f294e02e78d76efcb60935e62435f58807b67ca96d9715ef8f787f922e0dc199ad9cbd9e2a9d57892c1d770da6cfd1eedb000b14342d29991aa1
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.20.100.ebuild b/dev-python/botocore/botocore-1.20.100.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.100.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.101.ebuild b/dev-python/botocore/botocore-1.20.101.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.101.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.102.ebuild b/dev-python/botocore/botocore-1.20.104.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.102.ebuild
+++ b/dev-python/botocore/botocore-1.20.104.ebuild
diff --git a/dev-python/botocore/botocore-1.20.87.ebuild b/dev-python/botocore/botocore-1.20.105.ebuild
index 762144aabf71..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.20.87.ebuild
+++ b/dev-python/botocore/botocore-1.20.105.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
diff --git a/dev-python/botocore/botocore-1.20.54.ebuild b/dev-python/botocore/botocore-1.20.54.ebuild
deleted file mode 100644
index f1e8bd15b0c3..000000000000
--- a/dev-python/botocore/botocore-1.20.54.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.74.ebuild b/dev-python/botocore/botocore-1.20.74.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.74.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 ~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.78.ebuild b/dev-python/botocore/botocore-1.20.78.ebuild
deleted file mode 100644
index 42a1ef99e273..000000000000
--- a/dev-python/botocore/botocore-1.20.78.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 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.79.ebuild b/dev-python/botocore/botocore-1.20.79.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.79.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 ~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.80.ebuild b/dev-python/botocore/botocore-1.20.80.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.80.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 ~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.82.ebuild b/dev-python/botocore/botocore-1.20.82.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.82.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 ~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.83.ebuild b/dev-python/botocore/botocore-1.20.83.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.83.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 ~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
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.84.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 ~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.85.ebuild b/dev-python/botocore/botocore-1.20.85.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.85.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 ~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.86.ebuild b/dev-python/botocore/botocore-1.20.86.ebuild
deleted file mode 100644
index afca295f8bed..000000000000
--- a/dev-python/botocore/botocore-1.20.86.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 ~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.88.ebuild b/dev-python/botocore/botocore-1.20.88.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.88.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.89.ebuild b/dev-python/botocore/botocore-1.20.89.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.89.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.90.ebuild b/dev-python/botocore/botocore-1.20.90.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.90.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.91.ebuild b/dev-python/botocore/botocore-1.20.91.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.91.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.92.ebuild b/dev-python/botocore/botocore-1.20.92.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.92.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.93.ebuild b/dev-python/botocore/botocore-1.20.93.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.93.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.94.ebuild b/dev-python/botocore/botocore-1.20.94.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.94.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.95.ebuild b/dev-python/botocore/botocore-1.20.95.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.95.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.96.ebuild b/dev-python/botocore/botocore-1.20.96.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.96.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.97.ebuild b/dev-python/botocore/botocore-1.20.97.ebuild
index 762144aabf71..64b854be9334 100644
--- a/dev-python/botocore/botocore-1.20.97.ebuild
+++ b/dev-python/botocore/botocore-1.20.97.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.98.ebuild b/dev-python/botocore/botocore-1.20.98.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.98.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.99.ebuild b/dev-python/botocore/botocore-1.20.99.ebuild
deleted file mode 100644
index 762144aabf71..000000000000
--- a/dev-python/botocore/botocore-1.20.99.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/files/botocore-1.20.64-bpo43882.patch b/dev-python/botocore/files/botocore-1.20.64-bpo43882.patch
deleted file mode 100644
index 5f2e652f5baf..000000000000
--- a/dev-python/botocore/files/botocore-1.20.64-bpo43882.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9a25a6e9ace15d5f6136a2e9dd77324bae119f46 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 4 May 2021 13:15:54 +0200
-Subject: [PATCH] Reject endpoint URLs containing LF, CR or HT to workaround
- bpo43882 fix
-
----
- botocore/utils.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/botocore/utils.py b/botocore/utils.py
-index 378972248..b154469bc 100644
---- a/botocore/utils.py
-+++ b/botocore/utils.py
-@@ -977,6 +977,8 @@ class ArgumentGenerator(object):
- 
- 
- def is_valid_ipv6_endpoint_url(endpoint_url):
-+    if '\n' in endpoint_url or '\r' in endpoint_url or '\t' in endpoint_url:
-+        return False
-     netloc = urlparse(endpoint_url).netloc
-     return IPV6_ADDRZ_RE.match(netloc) is not None
- 
-@@ -990,6 +992,8 @@ def is_valid_endpoint_url(endpoint_url):
-     :return: True if the endpoint url is valid. False otherwise.
- 
-     """
-+    if '\n' in endpoint_url or '\r' in endpoint_url or '\t' in endpoint_url:
-+        return False
-     parts = urlsplit(endpoint_url)
-     hostname = parts.hostname
-     if hostname is None:
--- 
-2.31.1
-
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 206a80d0a779..c94f66486a2f 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,4 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
 DIST bottle-0.12.19.tar.gz 73142 BLAKE2B e59d7a507d3401869ba4953a48274062fc56226afa2f7aad596b4ef4352e4a79cea2d224dfe32d7ce014e4f4a3ba088d0e7a0886f64a84bb6b78571e953fa3c3 SHA512 e5d2f6a32d1b89ae3cc9607456c0614db2b58882c6d36273d695c51d3d77b1858cac4d914dbf19bca3b74be68c197aa6473f162e40d9b7ae2af3a084a28c2637
-EBUILD bottle-0.12.19.ebuild 1373 BLAKE2B c37d7044a24a57b8f0e7c8effe10e1447651c186f312d72112bbfc960e6f4f39aa7afe4bdd79f202ec7db5c50b257670726fdc5ca12899a77bd02574d193395a SHA512 05a00a0f5bb8b752bcdd076d71b3f76ad459c3ea6e3724688c28c7f93ae04acd972c1d3553e89439fe6ff6331d8b7a1dec9f211a4c82e0dc0f13545c7b8e9a64
+EBUILD bottle-0.12.19.ebuild 1380 BLAKE2B f3b2dd740980f6e11b66a5ccfb75070a03b7449f605ca3b280165316292102df2c5ae805f8bf079e4dff8df829e8fd1a494076cf4127301b551feb29a44c05f5 SHA512 2e1fff641be3a3f377d0724db4cdf1f2d3d339ca968450c5fe388696bc6e72e7469655b042d6536dde989821007b8de3845edbaeaf83542a22b9c02dcdffb180
 MISC metadata.xml 344 BLAKE2B a32327435528170de24fa1b28d50cd730903e5be9d021de0dd232f4994e93e161d132ea10eacfc0a71bc3d44bcc8ac0dd35a59e9ef3709909bf699827b07e84c SHA512 1dfbf879e31f4e61e8c75193ea13d317c1175cf555d2e9c7e5465faf726e836d71f002cae67734adbe8819579ae29ceb785a2397192c6e313f886e2f613da9ff
diff --git a/dev-python/bottle/bottle-0.12.19.ebuild b/dev-python/bottle/bottle-0.12.19.ebuild
index 38d13a17709b..4a7ace2670ef 100644
--- a/dev-python/bottle/bottle-0.12.19.ebuild
+++ b/dev-python/bottle/bottle-0.12.19.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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 4768150da777..0500c12d0c81 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -3,5 +3,5 @@ DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40
 DIST cbor2-5.4.0.tar.gz 84850 BLAKE2B f615667fbf0a823606d55e36de42af6ff4cdc0f039e540750ec2663ba660bf11f26b75ed21ffa61ba6de05fcb6eb76982757321430506a4cfde11c1487cc788c SHA512 9fb110ebadbd803af94bbe5b6f35bf6d28dd2c30609d1bacca08dfa01efb07e670fee72aa29010ef6c64051eda6e772d3ada0fd64c444ccc0e94061483131c60
 EBUILD cbor2-5.2.0.ebuild 894 BLAKE2B 36b608216833f231b1474c89d4eb003114e1b1de750ff2044aab51af212c48010275d67ba2849063bed943b423d6cede889cac39bd0f0b215dddd71e213a138f SHA512 32d3439ee5126da0d3574f81683c1b776a8814e7c7fe084f12f54dafaec703c6da3cd10e365ff371bed5a24e5da954399724cf6384417cf69e384fd85a12700f
 EBUILD cbor2-5.3.0.ebuild 956 BLAKE2B d084c44504bc9bcaac1425ed500f4f4f7aead2791155ccf06f46816693775c30f3f0694fd05ce0681638ddbb515aa0578237c92762db35b8e0a9f1a29518d414 SHA512 ccf5ed460c7fb3bd9a751bc9183fd2bca5cc456d4d3ff9736d7796c0b8ecafb42e1badcbfd64ef59d6ab7189d001783060d9cd551dcf553b289238aa796ad196
-EBUILD cbor2-5.4.0.ebuild 673 BLAKE2B 26851d5d6984b6ef4e452f040b404d99fe2b2b6e286e5b6142cefc16c96ba017e2921409ea4fa0876f27b5e11d30134e3a1fb8909f43bb8b1f8402d03154dec0 SHA512 f9bdcbc64d1e2401da8b1cc8fa722dcf6d6acf7778ef108a3b312dbe8944a72513f621a47d83ce1e7e82a48da54071f28061da4cc4a02dc48206d918131e4544
+EBUILD cbor2-5.4.0.ebuild 671 BLAKE2B ae44d926fd32f69bb540d9ca3c79e687afecf89e399b952fbc10598cbe7a9db112772a06c7d7fb51acb2f65d5f411b8eedc2205a34b50764960db9545f652c3b SHA512 346dee83e92a04da852747a76a6dbd08883439a89a0a698cb6e1c98631b0c9d1430da0d37c84847735d92084fe0f2ce5acd52604ce727eff9a181ab3e95df726
 MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.4.0.ebuild b/dev-python/cbor2/cbor2-5.4.0.ebuild
index aa8f211a2716..1654cebdaf94 100644
--- a/dev-python/cbor2/cbor2-5.4.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index de9c915fc8c1..6efdfdc79c66 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,6 +1,8 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
 DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
 DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
+DIST cfn-lint-0.52.0.tar.gz 7221391 BLAKE2B 20422bb191e9537ba6950db8c40894ab07655389a0a81eff3489f5bcd626bd81c6f9749f885b8be4f4939f16abe62fbbde7c741e770e6265c28bd59740144558 SHA512 81274b973ede2e60ef113d5ec4e2052dc11ed0a85b79079dd1b40e8afae3738cbd963b2e703f5016e216b2844df8711a34ff024e5dc4b1b12e774176bbe88489
 EBUILD cfn-python-lint-0.50.0.ebuild 1528 BLAKE2B 41e5dc49f8b17753db6a7b2fad4d84e13d125a640d84628090528889649a85971c871e4b817381dfc27574317b300a0980d20fc263fbe36045ca3d126b031d41 SHA512 d61b521de58bccde229e226dd154c6ec70e09e190a0db95f60adc79c7f5dd48cb195529dcbfd3111cd573402b6085efebeeb1eca156adfa3f0efd7b3b55ccc97
 EBUILD cfn-python-lint-0.51.0.ebuild 1530 BLAKE2B afdac8393d467e2657124bd501160b5b0fe29d8fe164a7ace6dbb55e2960ced5018b8a0f321ce5d733d4c3cf28b4bc29474ca6abb1e376ce3422d5019e019da8 SHA512 31347e3c18d543b6d3bdda35c4dc2ad0cd464c2ec5e59ed7c44273ee171248f4c94e0d5c34a760f4a74e509e6cf582a35ef39be01a37d80fdfd769f79e1d074e
+EBUILD cfn-python-lint-0.52.0.ebuild 1530 BLAKE2B ea2f38064081c789468cd0ec6d6c581975d64c4e64fa384b7b6e0058ecc7c43e5942c8f5ef841865ddb5f353015d72b20dd37f62c504eaba72f6d0f08eac6d0a SHA512 73619dc30dfb1b185aabdd41a22d0877b25b0995cc1951e2c31a411e4bc543f195db822c40e0349c24846a1c671345c64fa8a16f2f39cdf5e6604b3e33d5407f
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild
new file mode 100644
index 000000000000..928f06df62fd
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+# TODO: pkgmove to cfn-lint
+MY_P=${P/-python}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 684a97a8b818..9921d7a8017b 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD cliff-3.8.0.ebuild 1162 BLAKE2B 437d306a8b53ed989eb8118c33f8216cdbe2643a48f8f444492b50ec96113ff376c7709434eb9017521e2d5f83673f88b440ed2b112fcf67cde91a39d9d3db0e SHA512 61dfc0762c58b4dcc8ee498a5f3f6199786a33d35ff1563edc7af5c2f106af832b60a2dd9dfd080d65cbec0f265174790ee63f5d6bc9022c657d2bd0172d3e7d
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.7.0.ebuild b/dev-python/cliff/cliff-3.7.0.ebuild
deleted file mode 100644
index 0fbb09d634f2..000000000000
--- a/dev-python/cliff/cliff-3.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# 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/cliff/cliff-3.8.0.ebuild b/dev-python/cliff/cliff-3.8.0.ebuild
index fab20af93f82..0fbb09d634f2 100644
--- a/dev-python/cliff/cliff-3.8.0.ebuild
+++ b/dev-python/cliff/cliff-3.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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}]
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 2c4e8d539419..c04d27398514 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,3 +1,3 @@
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.9.1.ebuild 992 BLAKE2B 52628a84ca683c89a992caf0ff3c92de69a04f95faa14bc86b0e874fe8ea2deddd3ee2ce78cc55be1a2291c34460714bbaa74b1af3bc8ff3f9c6561a1438ba23 SHA512 1ef9530ac963c91c04ae1873c5715bead9c982b71be248a96405171ab644880d1c2bad6380f8d193ebd0fd9dc6218558bb84e307e40670d2c714dac2ff86f98d
+EBUILD commonmark-0.9.1.ebuild 999 BLAKE2B 3eb92aa36d4331b55dd7a2cfc345d2738471be082e354ba6e32c9e25c49db233b6d199574d0297f60ef5b6acd05c21f2fd04b693b9378b53016b3e9677dc9a87 SHA512 dadce4ee293196d1800efbd8a0564c7e40eeffe3e6c2d5ef19ad2fae069ed3b80d56581617eb8a0e5b68910394030fbdecfd9f9b8b9db9b808132f9e91f697df
 MISC metadata.xml 763 BLAKE2B 9a79175d4ae0c20b1871d8f89a571e7eca9ac0788c0f3de2ba2ba9bc0fcac4616877c762beec0c75d11737e84ba9759d134f528b3c2292d2823676e8bfbb7aff SHA512 ff467de52a1e48d4c70b9b5e54e5557f4469c5c7ff75ba6e9264642f835b87862085e8ca666977bee3daff00af765248353597a41ddcc62b83c68e0089ca6719
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index 2e66dba05a98..cfd383ead0e0 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python parser for the CommonMark Markdown spec"
@@ -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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index e579f7a1993d..92426f3c3ee9 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,5 +1,7 @@
 DIST ConfigArgParse-1.4.1.gh.tar.gz 30343 BLAKE2B 8aaed3b0e85b4006c04e7910c6f7ae2c2a07d586ade777eedf078afeea4561a4504614484316afd9d234b2871c0cc45ef47f30254797f9df260373309cf67927 SHA512 304d5981c5685188edb22a63966d25a8943e4c443f2aefc323492f141885f50657e9f9200514df65683f1e13e64173d4def80cdbebcff941c3ee66ff4af0cbd4
+DIST ConfigArgParse-1.5.1.gh.tar.gz 32245 BLAKE2B 9df80b4f0b12b3777311193c454dd010ce60dd9ceb702c99c1d8ac56575c615e77039910f3b412a176c9c229b88fa8937b052076d0cde2307ecc07f3337d064a SHA512 2c3854a45d97f0352321d2442a30408248e990dd46e2515cd7e2576efe9a33e03495231f8397ba6e3d79bb04bf11edfe5930b4765d46f29ca66b7bb3d3c1e0c9
 DIST ConfigArgParse-1.5.gh.tar.gz 30375 BLAKE2B 8a3c0091dc4049e9f84eb6209f7a62cafab0c0357d4d17304520b2855d60cdb68e63607068612bc99b07709f1fde4b0a3f11dbf4e45087968eab901d2b20b79f SHA512 82121fa6e8f734898674220b888dd3670368389a5cbd40e87d9188fa55d4378fdf480cc7dc003a4b9eadc1951fa8fc6141e9c0b079321cfe70c64bebacfb8944
 EBUILD configargparse-1.4.1.ebuild 768 BLAKE2B 525ee2e3d597799d085da0c1a24c708fa8c08d79be86abdf337e77c0c128a7f5257ff9d1a1519cccbbfc1ca779e84aeb008759f8df32f49d287505b0c376c3a4 SHA512 b2f2b3d77e1f9694c8864f25b377ca49ac78f660303c48ba6c881c06337b7840aefdc4319343bd136236db70dd661d63fd12d89276e9a6bf6496fa2d16dc9e79
+EBUILD configargparse-1.5.1.ebuild 733 BLAKE2B 3427c0732415d2962af1f9d3dadb4876fdb9aba69bd363046f005ef9044d8baebeed87dce98749b852c54800be1764fb092e3cbff785681d4d8987a33739f49c SHA512 60c54a99e57ba1899e76af0cd3e79c81584fbd19286a498ea7f6e3cc4eb41c1aef06b6c57e689d98a6b997973f4074aab13f19f2897ea32f84b8a8a5d4c4c41e
 EBUILD configargparse-1.5.ebuild 733 BLAKE2B 6015c5c5e7b37c906c38ba1011469cbd829846e60c4867ec9aa600c8f1f9681df5067a6ba4ce68c11a9d467895dadd1a67054834336ddfed5ea2bba9d22f46ed SHA512 7d543ad181c7f05e278b03321742cf43f3f82ff2e96f9be359319b3819cba9210625725b772a0c9f5bff37d9b10dee2d41e5e9de9c1e11180d1666ec1483eadd
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.5.1.ebuild b/dev-python/configargparse/configargparse-1.5.1.ebuild
new file mode 100644
index 000000000000..4dd20030e229
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="
+	https://github.com/bw2/ConfigArgParse/
+	https://pypi.org/project/ConfigArgParse/"
+SRC_URI="
+	https://github.com/bw2/ConfigArgParse/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index fae05518c3bb..8466ba7a5d2e 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
-EBUILD consonance-0.1.3-r1.ebuild 904 BLAKE2B ecb906b556b71512e14f9b6bfecd939779112e4dd9c23764d8df9f6f5c4f63bba805d1b25b807a2710ae80f4dfe3daefbd4261579d0a266ef0359fbc29ee4bf0 SHA512 9298d2bc1d5eca3e92f5dd3154629d637de08e740091773323af605f4cde3bc48176f010326ff67bbcb5a82dcbf564e55716a7c751672b6cd517320f51b89c04
+EBUILD consonance-0.1.3-r1.ebuild 905 BLAKE2B d14d33acd84fd00d2c4f88d878f02aed22ac00312a78f7a1fb4e2d80c3e8ba57ab1323985d880291cfcfcab9280d8e576353c2f98b67dd1b732aa1e2c6148dae SHA512 6b4b4e270d8718e3f9641263b8b2a6cbd31d65d1dc8bf692e96a3e6fcd7e6c582343ad62f3fbc9884ff950aae9297b075470c6c7fd42f1448557b40ee6d6635b
 MISC metadata.xml 630 BLAKE2B d2441eb3403b196b5b97a7ca65b56991c11c409f85e514607f9b52e61aa7abe8541a1523c44b45b689011d788efbb0a5b613a8e0a4b555b60b980d633611393c SHA512 6f14827ea26a75f9513f3553a2c1316fa8ef7acc114f5bfb933aa273f7ae2bcdf41eef169d65454acabbde4dac16087cd801cbea801abeb86e3e94e405920c52
diff --git a/dev-python/consonance/consonance-0.1.3-r1.ebuild b/dev-python/consonance/consonance-0.1.3-r1.ebuild
index 3aac46717e9a..6764518f53ce 100644
--- a/dev-python/consonance/consonance-0.1.3-r1.ebuild
+++ b/dev-python/consonance/consonance-0.1.3-r1.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index d225ab7270d3..7da8f23accdf 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
 DIST contextlib2-21.6.0.tar.gz 43795 BLAKE2B 52e62cf56bc11c0a0502d1d43ba361bea579af98a1c820afb73a6c2ab87bdf57317541cb7051b5aca05311ee2df24010e6e96c7ef4ee7192ec792cf2937aae68 SHA512 a85cafaaf66c7c6a59a4e9ac757941b1a98c17e5a49e41573dc759fafbbf17928a21f582e8aaa0fdc60636413ec702e198bde19a78ac304237b6da1c3d47b730
 EBUILD contextlib2-0.6.0_p1-r1.ebuild 937 BLAKE2B 0eed41b8c4b22b91e2c6f707b066477beb109c6039f90dc10ce2881388a8123ee3132198ac671c795f6d5b52f30b619feb7ee01805d66b5206cf7023b0461962 SHA512 1e1a30770834be442a67a79e3ac915380cf34fa6875061e5c3d8e4a21a331a0cd8f8ea3e4a8c0e49ec154901b63a31434bd08c503c369b963b80c15f8ff2129a
-EBUILD contextlib2-21.6.0.ebuild 633 BLAKE2B 91573bdba60a3133d982b0d7261a46ea2eb3fb30b7db79aab68c085d3e5531932d31b49785e1c7b9a628d6e9a526ede4dc38f59e06d4d20e3e7c8de815d84b7d SHA512 d1bdeec008af5e386154a2d63d5dd851fdd69ec230d218f8e282233cdff2e4a095fd3d3605c1a18ba376ac85a226479ee39364ca7611fc737c3790b59ab83b97
+EBUILD contextlib2-21.6.0.ebuild 640 BLAKE2B a35104a8adc3951cce981f303a62808343a41934e49119e8a51b152a04fd4a4e0d7461cd6e55748328a65b981f1595cf6264ffc26cf5ece0db76fc5d9dd8132b SHA512 a1d40beed7241202aaa6d0966c5cc99d7c3befd55e7f87d6cd876b0de11cfafa920ac0f8d63b4b8ff040d039ff1622a217c5837809c3179386a3623befd9b3ad
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-21.6.0.ebuild b/dev-python/contextlib2/contextlib2-21.6.0.ebuild
index e9f8cddd36a0..1c336603c32c 100644
--- a/dev-python/contextlib2/contextlib2-21.6.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-21.6.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2.4 Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 7e56cece9726..f33162935492 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 457 BLAKE2B 27051167736a587cec1d1df417e26a53c1038259f30b39f2434d237895c51ee8089ed44741106fae40eb84e1349111dde75a00f57d4dc655346ea693403df510 SHA512 4b567005f4842424b583898e81a87934b946f8fbc37fbaeeef03df6b75961fc45d73e986f93c5201decadcce4593c3af9bd039f2f80deb62efc7db11a8f1a2ba
+EBUILD cppy-1.1.0.ebuild 464 BLAKE2B 68d3de294544293a5b388fa7a6f00965c457fd5a3835e5684abb4a344400162831eb668f976d9532722a51cdd3cdb2fd0858fc3944322092b5d9b0030fb4806c SHA512 9bf7a15fc75cf75d590fa14e30e92aa4f282810aadd02317c3176dc5993f327b037fe458b3601c39f093630158e5db6e4007ca5a39d3f7747cb08096ded3b625
 MISC metadata.xml 601 BLAKE2B ea350b20df37a65fb695429ebfe7a7de8fe2c2611b20aed100aee0b84693363d1c3f4d16eec0fc3df0de63dfd79a4d4b89afb175698888fe64c847962575d6f1 SHA512 a8e798ad3e49b58041127be01d4256d62400aaedbdd006a1294df67afc4624abb8c55a847c7f9e75434b1b193a882902685d53ae183b415cd3bfe54dd4b6945b
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index 2f2ab7ba3964..aa26f2a21d07 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 16a2dc67e903..95aa36137cf1 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.10.0.gh.tar.gz 21672 BLAKE2B 68b48e8359210845e35e4fe2cd1f48b48ac2c1ce67196fd9fa1e3a83a3bf15d6889a727bf62a65097d0975e93e660550084ef66a0c3a3de98ba04d439d29965b SHA512 685231d455dfdde70eb71415dfe561e07c34579d7b31ef7197f4c1441301635b387fec903d610b35406b619264f4c0cc616562de8f02b8192414c29274b63c01
-EBUILD cycler-0.10.0-r1.ebuild 624 BLAKE2B e6bb0cd9ccf4245b4dcbcee2021cd8de19ef4ba52c64ae2b041e9b59b8b7c8c6805ece87f81bb8b8ceddcfb646fe10024c22ee60abb163fecba9325377a51b3c SHA512 d1414654ac127116fded457e25ed83d70652c4ba7ea4d3e5a895414e8146a35a50415813471001c3aff42c332f2542918d7a0ec4a190d84b6eba87538f533b17
+EBUILD cycler-0.10.0-r1.ebuild 631 BLAKE2B 668c8865bc8b7340ddefc00e5f33d1770e66be0f93fa554ea90f3ec0039277f62e6c8b30ba37a3729b1b5d08e69bd0f0bf8311cc949194edcf5381e930bac46a SHA512 07998a5cb1a38bdd6dbbd6c555ebf07f4ec351d88c4fd044ee4f901963ce23910d45882c37b6d6265d81723eafdfe8c0e584f173bd6c5ba2e5557e534a3b74f8
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index af92a35ba950..1b7aa639d8b6 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
index c3c7e8d68864..f85cab6a073f 100644
--- a/dev-python/dissononce/Manifest
+++ b/dev-python/dissononce/Manifest
@@ -1,4 +1,4 @@
 AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
 DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
-EBUILD dissononce-0.34.3-r1.ebuild 765 BLAKE2B 243f9aae880fc62414b86d944a63027d846ada8f738ce9eff17366ae149cc4699f62b114fe1523ccd03dfc91288c7f2ab720ddaf243365b1ce0650bf5726a7c8 SHA512 2f29e971b504f4bc11e74c9b90494b156ae5b92fbd8230bf145622b5edc23f889d87c3de434723554264204233d492629cc532181db6fa6fba2a9614d48f3b27
+EBUILD dissononce-0.34.3-r1.ebuild 766 BLAKE2B d255eb97b6f11dc51cf8e0d58be8ca860bb03085831df9775589c6e762bb5e6895addc505a91c46888d9328c81ebe5c7f6b6e30f01528279e44066d9e061b253 SHA512 036c70bf058a79285750623c159801f4fec4e488bec2dfb60ff6f3d1ab29c37f0007dcf0673f880cef5b027e2f69e22b90655d164d9bcadbab6d96b5ea4d8e77
 MISC metadata.xml 707 BLAKE2B 7e9d43dcbf4a8f5da5e099fcd4b6391903d48a91712ea98f426e175a0d0ffe62a7bbe01a8c570a3554c9cd597ee9a6be120b0a99e5eee22e028cada3fdc15251 SHA512 6980f618735d3a2132cbc86473f09476711d61553922182f85831e91bd92737b8240e6966847797d2ea2a2e4c035b95f6719b1af02655538c107ede578bab888
diff --git a/dev-python/dissononce/dissononce-0.34.3-r1.ebuild b/dev-python/dissononce/dissononce-0.34.3-r1.ebuild
index 5e60c2fd128a..18e6ecea9dd4 100644
--- a/dev-python/dissononce/dissononce-0.34.3-r1.ebuild
+++ b/dev-python/dissononce/dissononce-0.34.3-r1.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index cdcb67da915e..d2bcb938a6ff 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -4,5 +4,5 @@ AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617b
 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
+EBUILD distlib-0.3.2.ebuild 1536 BLAKE2B 4ba01f3493512fc2225267fed74bd29d0e2b2ead0e53940aae177e23f0dd69091adc173dc3d5456ce8905eb79be55a53a8dfa7c2c94a568887e6ab99404254b2 SHA512 65e8640f9cadf3aedfef13ac24984b0a9e46dbf54655dc66b443c2aebba713dc797c7dcd0ad4e400680fd618ff453a61bd5b08a8939463fd31d49f5ade810a1a
 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
index 43cd8fc4d2ea..36e8bd9017eb 100644
--- a/dev-python/distlib/distlib-0.3.2.ebuild
+++ b/dev-python/distlib/distlib-0.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 # 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.
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 85d4bef32140..b5cf8a975aba 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,11 +3,11 @@ AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152
 AUX django-3.2.3-py310-repr.patch 3827 BLAKE2B 42f68fecf8fba65ffc23d19f95b5232ed020005d347fce1b30bd6a18755e649bc00ebd6aa7235810564e8954726dda4f541c58c599a9433d3ecd539717b97284 SHA512 6cfc9ee5f8c5c9a59bfeb5311e853604a6f77c7c747deb48780122f06e7634ea783f5ae82c4935a2a25f1cac358175cb8cbaa6285bd26da5e6fd35d3e3958e1c
 DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
 DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
-DIST Django-3.1.12.checksum.txt 2558 BLAKE2B fe31c76517811b5a69bbab6a44966059b40e26e81134682a56753fb886abb1081ad998628fb45eb9959fa1b625c1ffc7128ed0153aadde23319ca28daedf71ca SHA512 6b5a243eee10a33721725be4f09b34395f0d7b34775c72b387d47445947de25f927b2b6d3bc6d76896096b8d06080ebd66ad3a667984087b7c3505a705ec8f76
-DIST Django-3.1.12.tar.gz 9676259 BLAKE2B 91781b77b63591a9fc1dffbe341b5400898ccce6267b18236f8680e86f02bb70cc4ab3297fb504e5a809947bd7e68795286b875f319a60ad501d38f4af1f17a7 SHA512 7b58d0bd6ccd6a3222bd58e87ee26646e75b807f284cb259baa5442514c249b3d7695ed0c61e5cc544e121d06a102c5ea1b40694d17e7d4dd3a8437891284c0a
-DIST Django-3.2.4.checksum.txt 2549 BLAKE2B d7f9e0fb88d9913c611ab3e5c0c276e135d2f2dbf2ad27043a46a9c57ecfd7e7f774b1d60630f47a53fdf455e63b2deb32b4f9caed77f33732cf85c92dc03108 SHA512 67e67719eb24fdf47da9611eb18184283657dca398eaf52963e17b2ff29a2687921171b1c68853fb7e17307d03c01be0d2554931c8bff38e2252c371f81e40b9
-DIST Django-3.2.4.tar.gz 9824343 BLAKE2B 25123c228171953e057fe6ba75afadc49c49567e167045c292606e914538f58f9628e48485f611afaacd7e173f36c720391c06662f8dcd796e966f7557f60216 SHA512 5891f77c884cb4bc74f4c9759e2e7be463fc0c661b8dd4d889be0ec46919e59b81f5ce1585c28075b15f03355e66d4b8e7b09001f0c2bea15f8c8aac77d1ea16
+DIST Django-3.1.13.checksum.txt 2552 BLAKE2B e82052d952f7dfd15e11b413fe2f106af3d3774073c57538b10f1beeada3128de2cb3d861684599fbf5f337b0ae4eff3a101998da30d8d961f84ac7cb3bb31c5 SHA512 07870c27034f70f335ac35b34317944947f544f63108f21134e81326b4e8f05a7cb3d382d91e7f0a846d51944032efcddca2c3bf980f626627c74c388932e4cf
+DIST Django-3.1.13.tar.gz 9656683 BLAKE2B bb2dd72ba2dfc13c8f487d6b59cd9302160800dca4f63b92e640eddf4aba2e5b1bd67580e56477bced44a5393b5f65a463a9c0c539ba998a20606bffdfafcf74 SHA512 55b1ceb24b6e0ba542a96319f63b138439532cf4b00971a8432baaab4a8ee219cc9fbb31d457ba7da9e932c919df83da9630866d909df4a5d432866b158098d7
+DIST Django-3.2.5.checksum.txt 2543 BLAKE2B 4a07a518bdde4670dc3bf079d8d3cfa32b6580cc06f18306a2127463f3a6a2d8f2a50c4562092439c7c99ccf80dde160b061180826c94d4e1064d5064ff500fe SHA512 b073ff758843f72b6467dae7580941774de9702db02a6fab303cb696cb22c84ca961885792e8ec85545294610f34a4eb52ac3f6521c190d2c339c1957ab4156a
+DIST Django-3.2.5.tar.gz 9806547 BLAKE2B d804d758f95f18aac5c44cba9bd9248efa56cba91bea5db2ac89e8c2202ac1fd088b61d6cc98eb7d6d33a95f85983b801c6cc26a3231986a8cf224a0bbeb8a7c SHA512 03d4eee650a857bed298658c68b916beb74690d16b4b28d649c52a7c2d8a61e92f53136d2de3a77fabe1dd01c0e6b3033befc6842f39c222793fb590b1020c13
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
-EBUILD django-3.1.12.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
-EBUILD django-3.2.4.ebuild 2993 BLAKE2B 5e5a148dd83c40c8b86bbbec80e574a7fa465ac42d5b6c69e5bae60cda7a808acfea48846fd564999479cd042c3c2e80d32fdcef31ca0ebc6da3a7856a3b7b37 SHA512 04bd0a8108af7b99c1607dc78cc2f893e165ed7a2488bf713cda582e35a4418009d924a7d318bb52dc4e3d4989e315c4ecb0b423d156cf394552e20c2e431604
+EBUILD django-3.1.13.ebuild 2772 BLAKE2B fca2574b02e943a7535bfb3ed5e98402a65bc86b5b9ec72a7e814cd7c2da7d0017bcd2127e69e8ed6646ba3905d53deb657818d87435c34747b9296ba662dc0f SHA512 15e9ef76ec559b138f1d49bebdd0c5f2603d2ca48693c4066dfeb0a1e3d2baae598e8c8604e05fceb649f5c6d792ec277599ee257c91248df7db718361a08869
+EBUILD django-3.2.5.ebuild 2993 BLAKE2B 5e5a148dd83c40c8b86bbbec80e574a7fa465ac42d5b6c69e5bae60cda7a808acfea48846fd564999479cd042c3c2e80d32fdcef31ca0ebc6da3a7856a3b7b37 SHA512 04bd0a8108af7b99c1607dc78cc2f893e165ed7a2488bf713cda582e35a4418009d924a7d318bb52dc4e3d4989e315c4ecb0b423d156cf394552e20c2e431604
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.12.ebuild b/dev-python/django/django-3.1.13.ebuild
index 16ea57edc020..d6e468940850 100644
--- a/dev-python/django/django-3.1.12.ebuild
+++ b/dev-python/django/django-3.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 optfeature verify-sig
diff --git a/dev-python/django/django-3.2.4.ebuild b/dev-python/django/django-3.2.5.ebuild
index 96f67052a297..96f67052a297 100644
--- a/dev-python/django/django-3.2.4.ebuild
+++ b/dev-python/django/django-3.2.5.ebuild
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 89548f358311..377e2c21af68 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD ecdsa-0.17.0.ebuild 771 BLAKE2B e2708decf97044e799eade890a1b947521cd2c2d3cfcee9896ba47c9ae5c2211e2e961e17ca88dc469bd624fe97a59e0b55c0fdeb9b885d4645d5f079a20da0e SHA512 135442dcc2f55dcb1a58158b163d8faebe32317a8d8f9ec42cd874eb062a751889a3777ffb2b90ae0054b385b99962d633c9b980bfe857f2e4376d23eddeb16d
 MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
deleted file mode 100644
index 652c0dd68150..000000000000
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
index 027c95f3a8f1..652c0dd68150 100644
--- a/dev-python/ecdsa/ecdsa-0.17.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.17.0.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 8231b5b7607c..644ae4b64b8a 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -6,5 +6,5 @@ DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d
 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 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
-EBUILD eventlet-0.31.0.ebuild 1694 BLAKE2B 4f26e852379e20cd47bd7b6d6c42db5bfe769ed710cc890245b92a95eb364fd26384e495e9e18d80513d7c2c3716b88a0c09230312782c35d78a2f13f75481ab SHA512 19fa8af01a7e0495ee5a6bb88d4ff8b4d6c0ddf4cc83dbe3e297c12d4441c6ae1d959a30c6e07cb67e7b099fd38fd1f43e91e96d0260bbb57f9e8e885da3ce59
+EBUILD eventlet-0.31.0.ebuild 1693 BLAKE2B d263749a9074c7b39c4d0806a4ff806fe7bc50f5b8e2b5773e9d4d65d19bc5854c92e336170576e637f4996c927509c83eb40e779e04c1af5eafcaf291f48d20 SHA512 03c721c868e50becacffad8cef17633286ec1621fbe0bd3bda3f970ceacdb3de82d10324662954d0b984fa7465d82928dc244089627fba6b2bc62105cb023dbd
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.31.0.ebuild b/dev-python/eventlet/eventlet-0.31.0.ebuild
index ecdba196ecad..c335ba582bb7 100644
--- a/dev-python/eventlet/eventlet-0.31.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.31.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 4b0dafd8a432..0e3fec16fab2 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,7 +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
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
-EBUILD execnet-1.8.0.ebuild 1381 BLAKE2B 82bcf0a4966d9eaf5407940b7c614ff0ab21cefef474e7628d88c263de8f67e3a35c239b3d605c029a311909ac57faf8f158cbeeb578cd50f5acd3a39ec3baf8 SHA512 d29b6cfc9d9274ea99bbc3febeb7f7763612b4e870bbdae96ba54607736b8731d6ed98bd7751c5a4977e74295ff18568d811bfbb7e728ee9d0e32e50d1b41573
-EBUILD execnet-1.8.1.ebuild 1389 BLAKE2B fd133c769ca253de323b5ac08e8c254b1047174f9b2ae8006a4c1934d8402138fad9c873724172bf1a012a4f10e3ab9aa51091fbbf28e87650f6366af0d06311 SHA512 800df19a8356c6c0011bc4aca52241e6d3be2a479c55d1147d561ec34256e1a0b33214d59443fd09061820c3e4d061cff86e8b5f9594b3440369b7c6df1e7f0d
+EBUILD execnet-1.8.1.ebuild 1381 BLAKE2B 82bcf0a4966d9eaf5407940b7c614ff0ab21cefef474e7628d88c263de8f67e3a35c239b3d605c029a311909ac57faf8f158cbeeb578cd50f5acd3a39ec3baf8 SHA512 d29b6cfc9d9274ea99bbc3febeb7f7763612b4e870bbdae96ba54607736b8731d6ed98bd7751c5a4977e74295ff18568d811bfbb7e728ee9d0e32e50d1b41573
 EBUILD execnet-1.9.0.ebuild 1294 BLAKE2B ac541505f8a27dcedca15feee521fb85179826008e658a00ad09473881fe6a0e4b01d1d6523a2898d9dc47210426a33aaa03080d46447671ea111153390bacf3 SHA512 f2d43a54bbc535fa74e575a93e4d3e9e00bf6cbe15232c9ae774b9e8899856be622fd17c7b6a6c07226a3d4068849b92662c79a1df0cf226e93de0f7da9cc9dc
 MISC metadata.xml 441 BLAKE2B be64fae1f1acc10cff3492e6c2cd802f9f3bee83d646868d3dbe2336b35c791f8ec0be4aad6e89aaad167f03163740cdde543c5af6dc71c0780754f97a76f4af SHA512 9f17e1724f03b55e0313dd4b7528ef1f190258bd39efe35e144ad1807f4037a08e4302f749153f511c1bd0ab01a885e3700eb3ead4764d44161c0f7080a55673
diff --git a/dev-python/execnet/execnet-1.8.0.ebuild b/dev-python/execnet/execnet-1.8.0.ebuild
deleted file mode 100644
index bae6991e7b0f..000000000000
--- a/dev-python/execnet/execnet-1.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/execnet/execnet-1.8.1.ebuild b/dev-python/execnet/execnet-1.8.1.ebuild
index 8990f1adf6e0..bae6991e7b0f 100644
--- a/dev-python/execnet/execnet-1.8.1.ebuild
+++ b/dev-python/execnet/execnet-1.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+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="
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 8ca40be0c8b9..fe22a8c3d1c2 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 681 BLAKE2B 39bb24984d0889eafae1d293614657cf55eef77f46da1aa7f8500ad89c577ae785fbb1e74a61052d5fd4925f7a6adc5e5f8361c33770578ef3d3aac9ebc32cd5 SHA512 c5b33a25cd5273b546de9b804ea5740d427e4c7ccb63fa6a016d0d5cc6fb914f8192dc0fc6c878690350c84d9cbbc01ab7d2248b5294b6bd89c717147597a29e
+EBUILD extras-1.0.0-r1.ebuild 688 BLAKE2B f86f7435bb59161f016e03449250f506797acfa00cac0160625badcf7fd224d81f418dc48579b9158f153eab1df7c65931ad6d27c5f414ed38672775f2f51b53 SHA512 64602130becd268e97ebe19f7ab8318351a419ee89039a35b25141ad09193cc5c64803b6021817f544d73527f7a06733344c410986f9f274f4f49ea3ab21bbec
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index 2351a030899e..b5260d42d910 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 1baa89f114e2..4158203b39c1 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD fakeredis-1.5.1.ebuild 1022 BLAKE2B 14a9cff3b14132348ad22120228ffe9c1e544b9decfd36bff4f239f9e407a98583b4672e0d19d4ab3f33fc4b6c1376bc281347aa0f2de1492a810ba282276682 SHA512 eaeebd6bda2f6f84452e1011a24268d62b9a954e60f4969a8e9081d474b967dd209b4bb7f7335388026c31d6a7de009ade7090d95240e5ddf64b8cf077329544
 MISC metadata.xml 371 BLAKE2B 5d6b5f058881d62662d45b5f0207912d915fc731a4816b16ee098d19f7e8aa98f63e45bc68c6a41db7c09a84b4a82177a74e4edf566e506f287dc806bc461d54 SHA512 f43716bb013e8bcf042b0c75393686f1ae7eeac8b1f4b9c2d1acd27738d1f82427ded18f51d857032361ba2f4a3ea9679d3bcbb9ad2d99c3def5beac2873af3b
diff --git a/dev-python/fakeredis/fakeredis-1.5.0.ebuild b/dev-python/fakeredis/fakeredis-1.5.0.ebuild
deleted file mode 100644
index 2877b6f0adad..000000000000
--- a/dev-python/fakeredis/fakeredis-1.5.0.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=( 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/fakeredis/fakeredis-1.5.1.ebuild b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
index 7c66ea7651cb..2877b6f0adad 100644
--- a/dev-python/fakeredis/fakeredis-1.5.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 8fd9e8c0ceae..0420445e6c92 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,3 @@
 DIST python-fastjsonschema-2.15.1.tar.gz 35384 BLAKE2B 89b9be7a9dcb8b22634dcfb54abec7b5709805b7087558af93b4cbca3c71a0b876956060aac0d0e7f4467db1bb38e6a587025c1c219613a661fb0d9e656b81e0 SHA512 7eb4d512eac03e258d670f6d448c5aeb74e20f892a08fa84a0412fd9c99cdc6412d4daa74bc09f9fe933a973a81227dae36125766e64f3c5b01106435ca5d70f
-EBUILD fastjsonschema-2.15.1.ebuild 595 BLAKE2B 9fbc574ba186fa7e8d5fa3c94ee355d5adf5960dbcc973c360bc27dc2472d12c550a9b5da522beda6f2d44864945b0cb6647434e8e2df39c91643c787ead1aae SHA512 eaa44cde596be4be90daa7819e7ac7559e0c5bc39e8a936cc4bdf2badb1e20a38f672bf9e59ebf0457b5eb87dda83ab11348a553e3a8cfe2a511c483f897aecf
+EBUILD fastjsonschema-2.15.1.ebuild 602 BLAKE2B 4d88c874f1b2265b8f304eace3a12d0828583a260c69e05c96e4dde83304b25262e07485a3eeccff3ad6f2b6c9e94aa07a2dea8ae31b07e5bd6b324d391f588d SHA512 6661804f37e6b64fb21155b8f63c250e264efc844ad33ecfb964753d9801d8337f6df6f496213484f121e14c5f10acc8478bbbef2def8d5d5119f4b0f339447c
 MISC metadata.xml 319 BLAKE2B e19c02bfc0b2d83b78d1d775d34f9556025170483be474d2b3a4803d62818de81706fb50011059260011d3e0cb11736059014c549af5c2ef913b711a87e7c953 SHA512 6efd64e7ea5b5e60d33f87d5cb75941d976c5c84cd1bec89afa5ef611b0efc620dadf2983f303f6a360a6362db003ef14ff28dd4280105c61ba43ec7b71c41de
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
index 1d50bcea73bb..8f56a8be0c20 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index e93184a3d20f..2f03d56def3d 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,3 +1,3 @@
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-3.0.0-r1.ebuild 1145 BLAKE2B 7b2f717890699dbafb7bdbfd28cae7c4d7e5a5a41c339e72f4f454705ac6a07b282e40faede8d99e1ba688aa0922f73d2ac2205835400b2d6847106b966a3fcb SHA512 ea2d5b378922ba5d2c5d2431df44b1f7368a35b444e504361f3a18d79de6615c924a8281373692295492627c351c95fad5585dc7d00f99493c6e6dd2635d2cbc
+EBUILD fixtures-3.0.0-r1.ebuild 1152 BLAKE2B 589be3524927f3e75e17c998d933e061bc41d364bdec316a6ee56e9d2911ef12ae1fcfa4540204c329080f4e56c96300c01932365bffd759ae7fda559561bd66 SHA512 058fe8681360c5783ec0023101cb124aed22c941a114d1b59aada03142d7a178202ad86180a3145d665e0c1d8c0508d8bc0e4fda9166306d28ad1add2d7256af
 MISC metadata.xml 913 BLAKE2B 716897e147898c78b273f4277b5b280ef0b210364bbe2cc2cf722394c33c65c45538c941575ebae6a5636411d38ed74bafce550d5f36a470670108b5f1aa3fee SHA512 e836e15989ce8d5a4af3678e949f6f7dea9bcb69ecd1fc0c41cd768a03842304dcd50679213e1034e460d5fb7a213c118417707b8ca620d316b99659733a39ec
diff --git a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
index 71ec760338e1..78165f79028e 100644
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 66e57bebfea2..fc5c2aa8b70f 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,5 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
-EBUILD flake8-3.9.2.ebuild 1154 BLAKE2B de257f3fd7bf2f29f8ef040976e372ebf050ea58557a0a76977a63d981204b5ca84f9b35dd1516b0a42af6f7d6c8f52eb7604bbf193cf5ba6215d6f25adeb75a SHA512 2328eb89c3aab568a571af8aebb359ce15afb66ab9edea087603cf0608feecbee038d1b1f64a49f490cb4dbbd42f523624d3d91c60bc38cb8d7608972bfaec0c
+EBUILD flake8-3.9.2.ebuild 1161 BLAKE2B b5ebffac7457e1cf52a3a42b92035c5553ae208f5eef24e661b8c7164e9e0664af946360050ee117c364b36d215ca45c71d4cb1e160df068d75c565d84267494 SHA512 637b6bd0c3e522ad77c8c517e97df687103f9f217feea7d7456e940ffa7de93eeaecfc89fd23b74092720fe4bf7e5568afb88f9d1cd18e1bf5d9cb2d81e4da88
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.9.2.ebuild b/dev-python/flake8/flake8-3.9.2.ebuild
index e1bd6784975e..48d4b58f1fa9 100644
--- a/dev-python/flake8/flake8-3.9.2.ebuild
+++ b/dev-python/flake8/flake8-3.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 47ee67a5a8d3..7b59e1587499 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,6 +1,6 @@
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
-EBUILD fonttools-4.24.4-r1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
+EBUILD fonttools-4.24.4-r1.ebuild 1298 BLAKE2B f71b202b6093a8a230302e474e859a3638240845bae95d97321880dc3c669f6ab45cef5a6396085b6a93fb58b47f40e5b567100bf3762af8681c19fe18cadf47 SHA512 6a81270e7ea38ef305d28979af6acb5a550e88765afc815359e1dabdf7e10a7c399c9a9940e548da7c114761b9046aa9b40bf4e97c61216fbbed58508605e40f
 EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
index e40813acd252..76a52c4067c9 100644
--- a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
+++ b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 4221ebabb6ff..028d8d83f574 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -6,5 +6,5 @@ AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dba
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
 DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
 EBUILD gmpy-2.0.8-r2.ebuild 1716 BLAKE2B 85e9237fcdedc534b93243109f28754577f34328602317fb6a7d599f33839c5c3b019973e2a73974211d6e96e93653942de09946031ad87d996f66c90c1fc0d4 SHA512 195083630391eed0b1b392116d6a34722bbf4a1e40dc94448a0683d3b149a3f2f65937a95456879ce961fde2ee9da39370392599af5112f3ff913000369d6b50
-EBUILD gmpy-2.1.0_beta5.ebuild 1289 BLAKE2B 09e2446b7032c3d4c8c0c4e2adb4f5f9ade0133015c99ee4e47facfb789f4a0d222edc632a0b60661e85c02f91f0495b632637280d7eb71569a2e8042c7477c1 SHA512 daf789b962f9f0d9a6a951bc9b9adbc9c2159752f07824e325a1476bca0d241e523a891dd62209a15f6c2d46fb3b29d5c5ae200bbc9973bcd3777ad81a2f23c7
+EBUILD gmpy-2.1.0_beta5.ebuild 1284 BLAKE2B 17cb6202d3d015efd53dca42d927d3684978f8f9631a5421672ffb6ffa94a01ab1ee0645e6da1858179835c0cc89b0733a08903c1684bd1411a102e9711a4b3b SHA512 77c922462cac438deb4dd219691e054bd525cbd3ac8e57f87007da6a86e2f5990e70d33a8b48ac62efeb69d81ba348cfeb63755abe29e79937eacf8a89675984
 MISC metadata.xml 779 BLAKE2B 39be0ec90382e04ec8e482738f0ee8a984f7532e4efa4db27bcd4d9c201b2aadc380e6c3faf180fb32e2d920638bbed4c15b1fefad1af1edfbce8b1f6a1feccb SHA512 af0aadfa3d9c3caaddf2763c33aaf77e0ab285228448f03a8388ec0a2abd199bc88256cce57b78141a437d16eb493e57785791b953898e69f9712dbf26b741fb
diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
index 420ebc5367e4..42df930fda53 100644
--- a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 6fc4a40264d0..2157e34ad5c1 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-python-client-2.10.0.tar.gz 25252980 BLAKE2B 25932dec798518217eb724b3514de6f45e57543703396516f3d1a4599f40cb258893d2b2c7e706ef341a6217459a08ebfdf61e2d16949bf8831aed2f79fa80c0 SHA512 acc6ff1a6cad0d568e3af2c7fa4ac5fc3f908adcda1bc846aebc473cdf9f63b873fdf3182c44c3afe50a1f26a645be21b7b33335e67afb09210c001ba22365ad
-DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
-DIST google-api-python-client-2.7.0.tar.gz 25488451 BLAKE2B a8a761944fed3970ae0cf53b2cb926a6670ac37323c39085a5f7fb4f354451292fca4bbb2c34a72d086dfa961b74a72f66319f6bbc2505ef70f5c94aff3f7a0e SHA512 531e919cc9d0cffc49b31d881a6ee3adb2d9cc166813b5884c300e9a3b63b28c9c269a0d1efe47961fa61f79ec5adb8a12e2208b644fd62ed4baa66c56d219ba
+DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
-DIST google-api-python-client-2.9.0.tar.gz 25538249 BLAKE2B f0aba9aa7c6d9be51ddef29454de93efa3ee747717940f975ec04fc6ecc70560b89488b39a323f2ebb82076d88316dc6f87e35210777600714cf833d20611f57 SHA512 1cd3d9f208251acd3bb1eb372210903f80587995bf54b7addbc7675c7c8c3a1c776fa52052c15f88d112f54c333970c4845854924ff57dfbd91c0c17bd63aec4
-EBUILD google-api-python-client-2.10.0.ebuild 1516 BLAKE2B 17cf8f8c3924291ae7d1910e221bf44a8f2d8f7b181291c3399d88f9ba65aeee12b18e11a3f6425bd86372231f3ef5811c3dfd7e0a825357cdba7a7efa24ad28 SHA512 fb0700c4d7d0919ce2c7e4ec27c0f673a74ecf3ec5017a0df398f0c78b639a31ed2e25d01b2af8fe5dfc1e72b4cb67c6e6fada17921e31007ee0563843db1d77
-EBUILD google-api-python-client-2.4.0.ebuild 1514 BLAKE2B 576cae9faed55f9bc0d1ff3d428525f696b509c0517b27e464a7670701a1b3e7929cc217ea4b92134dcb11771f74dbddc78ebb759e1e75be4c9b5ea28590eaa6 SHA512 8c2c8dea75772e9d6ca556bc3c4550904b139fadb02065c91eacf90a666d65c6e8ba45abeab967071a76b732ee6c639a5d076c4f1cbc67d5232742172bd999f1
-EBUILD google-api-python-client-2.7.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
-EBUILD google-api-python-client-2.8.0.ebuild 1516 BLAKE2B 17cf8f8c3924291ae7d1910e221bf44a8f2d8f7b181291c3399d88f9ba65aeee12b18e11a3f6425bd86372231f3ef5811c3dfd7e0a825357cdba7a7efa24ad28 SHA512 fb0700c4d7d0919ce2c7e4ec27c0f673a74ecf3ec5017a0df398f0c78b639a31ed2e25d01b2af8fe5dfc1e72b4cb67c6e6fada17921e31007ee0563843db1d77
-EBUILD google-api-python-client-2.9.0.ebuild 1516 BLAKE2B 17cf8f8c3924291ae7d1910e221bf44a8f2d8f7b181291c3399d88f9ba65aeee12b18e11a3f6425bd86372231f3ef5811c3dfd7e0a825357cdba7a7efa24ad28 SHA512 fb0700c4d7d0919ce2c7e4ec27c0f673a74ecf3ec5017a0df398f0c78b639a31ed2e25d01b2af8fe5dfc1e72b4cb67c6e6fada17921e31007ee0563843db1d77
+EBUILD google-api-python-client-2.11.0.ebuild 1516 BLAKE2B 92ffac38d44974386605333b6365839193e90fc123aa9f7294c51b0bdcc2319f0647b4f339e19a17bdc89379eca50fefc1c2988cc73d7387eb8ecd87279331b1 SHA512 c9ae187e029371279d9752b49dcfcd93b9fdfb19b148cbb0db7b349b9b4ce2e25b28d25be36ab9fcc4e4121f15b6bfc9c1ffbfb2713bfe34dd780d300f0cd712
+EBUILD google-api-python-client-2.8.0.ebuild 1514 BLAKE2B 2ca4862c12887b2889440be939e080eb52e45e952260ddc50bc2f27bf3cafb323536f77ecdc7a1f81a1c06dda44974f66bdb4c0fc9902b86696d2e9f95a97115 SHA512 8aa1fb69b289ee8506f5cf7f54060407d2595af84dd0a26fc532feacc85f5ae74136fe6ef234060fbc374d8e2c7251299d7350c7fe084d670b9cda359b644560
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
index 5f95424b6c1d..53fb37378258 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
deleted file mode 100644
index e1063f778812..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="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-api-python-client/google-api-python-client-2.7.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.7.0.ebuild
deleted file mode 100644
index 5ab50082b8d7..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.7.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="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-api-python-client/google-api-python-client-2.8.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
index 5f95424b6c1d..69b970850c57 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.9.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.9.0.ebuild
deleted file mode 100644
index 5f95424b6c1d..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.9.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	dev-python/google-api-core[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		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 605d0085624c..35af4196546e 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,5 @@
-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
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
-DIST google-auth-1.31.0.tar.gz 170970 BLAKE2B ee6c9e72657d0902e53c0c56ef5eb802815979f272e9ee8e038dbb05af64eabcf3d6b005f2eedaa0d2b2c4da815bdbd89e1246fc37f9b7e7760252a040ae2a27 SHA512 c594ef070983a1b0d5dccbc42ecd8020866911463b672d52b6f32b22dbcd4fccdc038d1a56f6af556553f086b161f37eba93dee3bfb8726329249c3d73efdd9f
-DIST google-auth-1.32.0.tar.gz 171423 BLAKE2B 8888a9193b356f2d0d846a36c436cfc1cc60a973a162983c583bb1d5eacb183381424bebbaad7c4c7a9b777c8d5a3b61c490ad0cece4b9d6e0bd1e03fb71f49f SHA512 0f11de110828eca0514b032e422d72ab3979c99ed20bba3d79583cc33707a6cbfcb69b50f27f1702e803620c852eb6fe4bfc431d2e9db6774d26ca6f783042ba
-EBUILD google-auth-1.30.0.ebuild 1444 BLAKE2B 39bc2a6c2325506e7d4907520d245526d3b2210b8309c8096695ae9d79e34eaa4f2e46cfde7038eda95a853dfa54362c05d7da961755d31d45aa9710fe7c477b SHA512 6065a0445d2ee742f245809246a8f0eb5676a60d6f3a013dc5b135586cbedb8965858a596f7f6ea40f3f4d29b18315abb36f8ec4dc473e10a69d37aca163ebf3
-EBUILD google-auth-1.30.1.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
-EBUILD google-auth-1.30.2.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
-EBUILD google-auth-1.31.0.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
-EBUILD google-auth-1.32.0.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
+DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
+EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
+EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.30.0.ebuild b/dev-python/google-auth/google-auth-1.30.0.ebuild
deleted file mode 100644
index a25e7b2ceef1..000000000000
--- a/dev-python/google-auth/google-auth-1.30.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/google-auth/google-auth-1.30.1.ebuild b/dev-python/google-auth/google-auth-1.30.1.ebuild
deleted file mode 100644
index 4c3742ac5a32..000000000000
--- a/dev-python/google-auth/google-auth-1.30.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/google-auth/google-auth-1.30.2.ebuild b/dev-python/google-auth/google-auth-1.30.2.ebuild
index 02c43c1586f4..a1b10b9fa2aa 100644
--- a/dev-python/google-auth/google-auth-1.30.2.ebuild
+++ b/dev-python/google-auth/google-auth-1.30.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-1.32.0.ebuild b/dev-python/google-auth/google-auth-1.32.0.ebuild
deleted file mode 100644
index 02c43c1586f4..000000000000
--- a/dev-python/google-auth/google-auth-1.32.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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/google-auth/google-auth-1.31.0.ebuild b/dev-python/google-auth/google-auth-1.32.1.ebuild
index 02c43c1586f4..2bb9e016a997 100644
--- a/dev-python/google-auth/google-auth-1.31.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.32.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/dev-python/happybase/Manifest b/dev-python/happybase/Manifest
new file mode 100644
index 000000000000..2398ddb308f2
--- /dev/null
+++ b/dev-python/happybase/Manifest
@@ -0,0 +1,3 @@
+DIST happybase-0.9_p20210701.tar.gz 106551 BLAKE2B 66e39d8db10b8b7adbab5b77462560d50a2a494e1cd9b0411abd1c928cb4b630e42ca0cc6740c35cc9a3b65dab8e637df6ae6d4105665fa21fa7668324c82ec5 SHA512 b55028e6fe8b1087e835b01d373af6357ecc495e82badda6bd1641d1d7ef79d5ec72d3336ca7112b5b6886d28b4a6296336c96b83ce58740ea5802c4f11ab12e
+EBUILD happybase-0.9_p20210701.ebuild 841 BLAKE2B 83d7a461a15de5ed4767aa8a3590d57b9c9ec4a5ee9994c1eda73bda894be40c1c73459c1d35c3bdb3eef7e26b1af32f6e35d529cef15924ba0e6ceff74e506b SHA512 c0818a121b10f5451e159be568aae79c234b3d2bff9e9a84f10217ebe479b0a8853c8623cf3769c8c82fbbdb87f9159bd050330b0b14486001c18cda74d21237
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-python/happybase/happybase-0.9_p20210701.ebuild b/dev-python/happybase/happybase-0.9_p20210701.ebuild
new file mode 100644
index 000000000000..0490d7a3842f
--- /dev/null
+++ b/dev-python/happybase/happybase-0.9_p20210701.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+COMMIT_HASH="f5b6d104140c2be93e4175c0c844aaf094eb43da"
+
+DESCRIPTION="A developer-friendly Python library to interact with Apache HBase"
+HOMEPAGE="https://github.com/python-happybase/happybase https://happybase.readthedocs.io/"
+SRC_URI="https://github.com/python-happybase/happybase/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/thriftpy2[${PYTHON_USEDEP}]
+"
+
+# tests require a running thrift server
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	rm pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/happybase/metadata.xml b/dev-python/happybase/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/dev-python/happybase/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index edf4f8ad7dd6..bbb403c9051a 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 1356 BLAKE2B 0c56c13cd5c62560b15732711d6eb1033efd4c529e81e43aabc16746bd25f15c09e50369f9b2b8627e24e519af0cf30b8dec8087b958a83096073c33c0e77ef5 SHA512 9d78035dd3cc007b905f867b50bac18f41ab806abdcd225a1cf39751e1035c94188df91a642db8b64e06903b9c7fe3b02e2bc979e082eb3fa9d70d1d1446be11
+EBUILD httplib2-0.19.1.ebuild 1357 BLAKE2B f3939d3727c2a32b29a92f97535d0f84b9b433a08e07ea3da78746c970733deaca712d171ca8f3ba6dbaf9567e94c211c7f50658533ce1a03c157979d87f9399 SHA512 fa961a52e07de7cd14723681b88610482fdc19c96d5373c3075b2dda553159e77fc8779136660b3f149e53af5fb97cfe57d75306582559b5cbbdf01bf80856a9
 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 443501903b19..04e2897eb136 100644
--- a/dev-python/httplib2/httplib2-0.19.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 5343d6b5ffe9..f8ddfa06b287 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,7 +2,9 @@ AUX hypothesis-6.10.1-py310.patch 2493 BLAKE2B ffc3e9669407a20a2820a59980719d0a1
 DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
 DIST hypothesis-python-6.13.14.tar.gz 9134690 BLAKE2B 821fa0baa47dd896fc5ec61d0a96fec3da225dbc35306e6cf684641262c9ff0b714ca95aff69daca4bda551033a67d90b411f0cc2abff8edd41e5d749939344f SHA512 74397fd77e6e70df918e0fa605180e2bfd509fb26ef8b4a86020524611a315950073c3babd65bb2d2ff65d39e027bc52da88c0125f422cc2493076398e733853
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
+DIST hypothesis-python-6.14.1.tar.gz 9135154 BLAKE2B 0fa62cf4b512acf433a94edd14b2bc4c2c86cdbcc95e4a2760a1914e85f1149d9a5db6b22222c4954d2db109d3bff877ca0e5e8ec6842ff5b3c794a211ea9b57 SHA512 b84776e2bfff130c4db7582defbe9bc55183d624b45defffebdc954ca8e1dda1dec78f921e1bc7839a1167c37bce693711cd500da547dc6f2a8fa610c0bd3540
 EBUILD hypothesis-6.10.1-r1.ebuild 1767 BLAKE2B 34c63c1f11e6400a4df180316a6b9ee2dc2b8d1eff3678e266379c0d19934f9ae4bcedcb2c10fc777ea1e872f5cf52b9c638d559c376d4ead2661a0b1587a657 SHA512 e639122ffdfcda78d53c50b5a59795f5b7e9c22f6ba203b7894dc4087a8ac0f510e54c4001a29c9870cbc12cf468ba3bf9e28193224381ea75a230125b3f3f66
 EBUILD hypothesis-6.13.14-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 EBUILD hypothesis-6.14.0-r1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+EBUILD hypothesis-6.14.1.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.14.1.ebuild b/dev-python/hypothesis/hypothesis-6.14.1.ebuild
new file mode 100644
index 000000000000..536affb7ae13
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 445ce3975ce9..46ee005178da 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,9 +1,3 @@
-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
+EBUILD idna-3.2.ebuild 629 BLAKE2B d35f572bc1077849fc663ffd68e7660067baf710b924dc84c92a1116c4d9190812bbc6479b1dea4b396e93abb05ee0a3618a2eaf9ee2ac95c04f245cfea1d022 SHA512 d74e2af4939e768f32da63b7b286c19fe827b717b8634070ebbb324e05034a036dbaa18ac08d7bfbdca8643873e5d483b2ca47734736872553f884c0a401736b
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-2.10-r1.ebuild b/dev-python/idna/idna-2.10-r1.ebuild
deleted file mode 100644
index ffcaa9e9171d..000000000000
--- a/dev-python/idna/idna-2.10-r1.ebuild
+++ /dev/null
@@ -1,19 +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} 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"
-IUSE=""
-
-distutils_enable_tests setup.py
diff --git a/dev-python/idna/idna-3.0.ebuild b/dev-python/idna/idna-3.0.ebuild
deleted file mode 100644
index d79f51d5caea..000000000000
--- a/dev-python/idna/idna-3.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} 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/idna/idna-3.1.ebuild b/dev-python/idna/idna-3.1.ebuild
deleted file mode 100644
index f5e0c5e0d6c6..000000000000
--- a/dev-python/idna/idna-3.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} 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/idna/idna-3.2.ebuild b/dev-python/idna/idna-3.2.ebuild
index aa34addbfa46..f5e0c5e0d6c6 100644
--- a/dev-python/idna/idna-3.2.ebuild
+++ b/dev-python/idna/idna-3.2.ebuild
@@ -13,6 +13,6 @@ 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"
+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/ipdb/Manifest b/dev-python/ipdb/Manifest
index 6c91b01557a1..e2c3431849a0 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,7 +1,4 @@
-DIST ipdb-0.13.7.tar.gz 16437 BLAKE2B 3f4ca56f0279f4bccc14eb12df48e03b938ff2de0e77a5fff273f82895dacc8d079f5ebd66f63568f62f3f1ae3f266695a6bad23911a872b5ed0f1628d32d1aa SHA512 14ccccb645bf3fb303d82718ed9f1e7fd19d699c9a875358b336135b40f9492b6c9c260c53fa87f38aa381e989e6f6c801f081eaa361c8e929c6e1b0bbaa300e
-DIST ipdb-0.13.8.tar.gz 16761 BLAKE2B f049fe4cfbecc6df7162069fb79e6493fcdc9a680dc33072b00a278ce7a46187a2f132f2252989c41f7263eb5b433905facf597322c7c20a1d2b7a0ae029e193 SHA512 5018a275e47eba26fd399b6d946a8c1f556dbe9b5392ef14e2766bed3f080fb9f75fafe79a598d052eac6152a5e347ce82f455250946c5b33a96e033887c4f92
 DIST ipdb-0.13.9.tar.gz 16820 BLAKE2B d028fff2c4273fd4a57c3338093f0065868856b4f7b2b95aa0db3c2b1e7c5906fc17b5b55b79b3a3809465214bd91ac1891cefc1604ed866edaa2811380175f6 SHA512 da0ac6d8a7451e90cf433ab2a0d4e43fff76be03082da5cf31b83fdc56174fde7f0256009ad9a407d805c0bf12da5fa2f081e1aa0e0ce73ca648262acd385671
-EBUILD ipdb-0.13.7.ebuild 541 BLAKE2B a59bf02b8e23d9bbe8fbc920b49654b40ccce993f1a651aace9ad233185687c63a8acd75bd1aefa632c8c7957cf6c23e24d6f85df3c1579f92ec79d206ff14d3 SHA512 632770b68ef19b0a9669b7964052c457f83a95333be380dfd5206a560443926bcb53b48831ab4fa1596bbb3e637df057c0d58aaae97e7289ef207b15230a9d98
-EBUILD ipdb-0.13.8.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
-EBUILD ipdb-0.13.9.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
+EBUILD ipdb-0.13.9-r1.ebuild 538 BLAKE2B 503d1585b980f32462684a4b54c175c5ca4057b95aa189087491ffe5f9825e046d745455208b9d31cd2ae48e3bb31435460d807c9ae409fc079a7ed3f229c832 SHA512 5019f247668a1a76ab9f718e7c52461e3a44a733100ed1fae95db64eaa112b70f1827bafe06cef9b7bf64c6797ad4ff8982c3a8533b4a8987886e7991ff3bbae
+EBUILD ipdb-0.13.9.ebuild 541 BLAKE2B a59bf02b8e23d9bbe8fbc920b49654b40ccce993f1a651aace9ad233185687c63a8acd75bd1aefa632c8c7957cf6c23e24d6f85df3c1579f92ec79d206ff14d3 SHA512 632770b68ef19b0a9669b7964052c457f83a95333be380dfd5206a560443926bcb53b48831ab4fa1596bbb3e637df057c0d58aaae97e7289ef207b15230a9d98
 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
deleted file mode 100644
index 4b895e23400f..000000000000
--- a/dev-python/ipdb/ipdb-0.13.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/ipdb/ipdb-0.13.7.ebuild b/dev-python/ipdb/ipdb-0.13.9-r1.ebuild
index 66b81b4b317f..de8bc495eced 100644
--- a/dev-python/ipdb/ipdb-0.13.7.ebuild
+++ b/dev-python/ipdb/ipdb-0.13.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/ipdb/ipdb-0.13.9.ebuild b/dev-python/ipdb/ipdb-0.13.9.ebuild
index 4b895e23400f..66b81b4b317f 100644
--- a/dev-python/ipdb/ipdb-0.13.9.ebuild
+++ b/dev-python/ipdb/ipdb-0.13.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 62ef8cf031d8..89a1713948bd 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,3 @@
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
-DIST ipykernel-5.5.5.tar.gz 112909 BLAKE2B ff898dc10f767838353de13571de4c42ea59aae9b367046265808d9f1f7abfbd3934b7b4370fe024b647b5268316c573f7d52b2e62284a6c430005a901dfd6bf SHA512 580c3a3d5d10c325524287c091a885955981bedb8c7bd8eac569ee19393b258dbfbc7ea8700137071c2c55bfa94b5a7bfae1c687bc5e2d532525c6fc3e043835
-EBUILD ipykernel-5.5.4-r1.ebuild 1179 BLAKE2B e22ff0adfde053c8ae020cf4169198729109fd8259725f786ba007d5fdd63eb6ecf4537547c4add4c41b69939942739787d05862ff270e9da9dfb6f0f0565a31 SHA512 d40baf32263c4de155f0037ad7bce58eee9362fb16c98a54dd3dd3112e62459a579b9404a25c64b9ace1fc73b4f74766598656df23a0d85dbf623ec9e5d36b56
-EBUILD ipykernel-5.5.5.ebuild 1140 BLAKE2B a33ffe5b5e8ce99108729bd99e1074695df2a936497811f367eaee228b6e2870952bee60f48a48aea4f6194b1f813adb2ebd1b00ba2c5fa96aa7cbc7f2aa3a7f SHA512 7486b112f5189d01fb3aa9ecf058f0aeb286ce688aed329f5dfb8787a7ed28bab769193aacdd259f8856be479d30d0d5bf8c9f042602a64feeaf0276e428d8a1
+EBUILD ipykernel-5.5.4-r1.ebuild 1310 BLAKE2B 116a07cabfa93df7d827496d4d184b92ac728dc0ce1fff27e64568b1a32cf56d46f864ff34c2da9f5c5c64d88d89b49854b5c63033ad8048c17609463b6c77ee SHA512 535610b18eb24fa06fb47fe6ab0afd34b7916c91d781e844c99323e2c91ea6182164eb761e9a001a06738f381560a55c2af2d58860f060b0254da29e8e129636
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
index 65b4062023eb..2da34f268a79 100644
--- a/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.4-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-
 inherit distutils-r1
 
 DESCRIPTION="IPython Kernel for Jupyter"
@@ -14,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 
 RDEPEND="
@@ -40,6 +39,8 @@ python_test() {
 		ipykernel/tests/test_serialize.py::test_class
 		ipykernel/tests/test_serialize.py::test_class_oldstyle
 		ipykernel/tests/test_serialize.py::test_class_inheritance
+		'ipykernel/tests/test_async.py::test_async_interrupt[trio]'
+		'ipykernel/tests/test_async.py::test_async_interrupt[trio]'
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/ipykernel/ipykernel-5.5.5.ebuild b/dev-python/ipykernel/ipykernel-5.5.5.ebuild
deleted file mode 100644
index c392b74130f6..000000000000
--- a/dev-python/ipykernel/ipykernel-5.5.5.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		ipykernel/tests/test_serialize.py::test_numpy_in_seq
-		ipykernel/tests/test_serialize.py::test_numpy_in_dict
-		ipykernel/tests/test_serialize.py::test_class
-		ipykernel/tests/test_serialize.py::test_class_oldstyle
-		ipykernel/tests/test_serialize.py::test_class_inheritance
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 617a03aa3cc2..8056d71dfb9c 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,3 +1,3 @@
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
-EBUILD ipyparallel-6.3.0-r1.ebuild 1734 BLAKE2B cdba64586d6fd36c07a4c4b9f7f752ed7d84a7e485e49603dd2392f015aab95e5a718837e88286cb2cc006fcd42a9613ce341f6f61a2350a23c9507a6a603fd1 SHA512 657f6af39aabce422d5c3cad7192a33b31ced76fec9160eb989eb65d1f9c41502b4d9cacd29b1f5903c4d1f2f62a2f7a7068bea1424d889e844575b016e8c686
+EBUILD ipyparallel-6.3.0-r1.ebuild 2283 BLAKE2B cde1a44a737d1455928d6aef1dff3b0eb22264c0403350d34bcf8d50716fa9841e5a6b8cf3ee4ce687a8415a5b3d5954041d69b31e502b0a4d609015234ef4f0 SHA512 8bf8392bc81d22cb5e165ffc6fb916364541d4875126a849eb16a039e605c1a63c600e2169ffcd920b24e915737217c5725d7c2130f401ee7afd6cc9938eca6a
 MISC metadata.xml 530 BLAKE2B 3b19d29a2e5531c54fc9fb6fed6757d6eeb2a8e2f5f24318cdf8f5977f766496e575f9928d9a54a94532affc246dcc75762191fe00279427ac1110ece156d85d SHA512 cbbd4517deb574adfccd11c7677f212f1b1a086f86fe76f6aae18f0cbc5e833758d9ef574e452fe217ef92fe70dc2cd83a97f46e69b341cf9463c371bb46a781
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
index e630c3d48028..58d101acfb1b 100644
--- a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
@@ -3,10 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Interactive Parallel Computing with IPython"
@@ -15,9 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # About tests and tornado
 # Upstreams claims to work fine with tornado 5, and it's indeed possible to
@@ -40,7 +36,6 @@ BDEPEND="${RDEPEND}
 	test? (
 		dev-python/ipython[test]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 	"
@@ -48,13 +43,24 @@ BDEPEND="${RDEPEND}
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
 
-src_prepare() {
-	# TODO: investigate
-	sed -e 's:test_unicode:_&:' \
-		-e 's:test_temp_flags:_&:' \
-		-i ipyparallel/tests/test_view.py || die
-
-	distutils-r1_src_prepare
+python_test() {
+	local deselect=(
+		# we don't run a mongo instance for tests
+		ipyparallel/tests/test_mongodb.py::TestMongoBackend
+		# TODO
+		ipyparallel/tests/test_util.py::test_disambiguate_ip
+		ipyparallel/tests/test_view.py::TestView::test_temp_flags
+		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_arg
+		ipyparallel/tests/test_view.py::TestView::test_unicode_apply_result
+		ipyparallel/tests/test_view.py::TestView::test_unicode_execute
+		ipyparallel/tests/test_view.py::TestView::test_sync_imports_quiet
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# failing due to irrelevant warnings
+		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
+		ipyparallel/tests/test_client.py::TestClient::test_warning_on_hostname_match
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
 
 pkg_postinst() {
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 8b394569bf4c..2d8041d6a78c 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -7,5 +7,5 @@ EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c
 EBUILD ipython-7.23.1.ebuild 3838 BLAKE2B a48aec0e4fe0de58169bccb994bcf0c19d8973d69496e2c19a4c9f8463ba76aa79312548d59bc7a11bb5a7ec6961c5cbdd97e05094cd7aae4e53928e5637aec8 SHA512 de1faf13bded5832d60748b48e98344a9e8fefc47bc2ff0e0090fc2579ee2d760ba65546691449c1d86d95de1a27681ecd23ac7de42e34f21449060310f79ddc
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
 EBUILD ipython-7.24.1.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
-EBUILD ipython-7.25.0.ebuild 3837 BLAKE2B ca587e8357297a124cbfd87142ab20d91cae8701a8769633cf8782712d9080a6214b047058f9b9542b5d5523d4aa15cc7e65207b7741b8b07e45e7d8d3154b5f SHA512 988b7f11f07b8c8b3f3c8f4d2ecbf590e4b1181b312e1f3156c02525ee923072e97bb09c57dc0f1650878a9dfb23b665c1fda313027e8e0150c792927a4d7a50
+EBUILD ipython-7.25.0.ebuild 4159 BLAKE2B 587a8ce76ecb7027deeb2d04cb8aa6a802d2192a54faae9a03986911326b91d6d628be3be868711ce7cb0496ab52dce7533b3621cd397bb8420403eb13c531ea SHA512 80f62f9f4e4d5c7468df7af90acc2e84b41268d750704efcd18e9a9465c669cbd9ce82cab9eecb408334c439fddfbc41864ddd68b438cb8dab2a313a3c6e468a
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
index 5297ddabde62..946536ccdff6 100644
--- a/dev-python/ipython/ipython-7.25.0.ebuild
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
 inherit distutils-r1 optfeature virtualx
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
@@ -57,7 +57,9 @@ BDEPEND="
 distutils_enable_tests pytest
 
 RDEPEND+="
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)"
 PDEPEND="
 	notebook? (
 		dev-python/notebook[${PYTHON_USEDEP}]
@@ -98,8 +100,15 @@ python_compile_all() {
 	fi
 }
 
-src_test() {
-	virtx distutils-r1_src_test
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# fails due to changed argparse output
+		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
+		# py3.10 API incompat, doesn't look important
+		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
+	)
+	virtx epytest ${deselect[@]/#/--deselect }
 }
 
 python_install() {
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 55bb04236d16..5a60b253674b 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,7 +1,8 @@
+AUX ipywidgets-7.6.3-py310.patch 1526 BLAKE2B 102af6c7656f938aa6019a3e1cb82868d879f8bd233ec5ee6df99bb6e7f2f06bc9b4b90f13813844bf607f4b72908ad98823e7e2714b0919e9f61bb469471a90 SHA512 6a539b3c1d617facb0e9ebe0121c390d524a2181e4bfa11c59494a56f41265483bcedda06b9b3b6f60d81eccea971bf94a108014baa4aef78712f624ce0b956d
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
 DIST ipywidgets-7.6.2.tar.gz 4066260 BLAKE2B b0d75d83108336bac204c24d2a67e88a200939cd8308d99bdb3842916387266f24607726ce0b8781b4a8b6330b9e26bf1eeeeebcaf7588b74980d5bc6603e1b8 SHA512 a8c25ee82e0b0752f850a314fd9a05bbcdd098c9fbe8a0cf0b23e097380beaf7fc916e555fe1597a45bd0085efebc40593da66ef1408114fc6d3085467d95183
 DIST ipywidgets-7.6.3.tar.gz 4072376 BLAKE2B 095226ef6a9ee0821b875dc117afe4155132b6b2d94da71b937959c1c4e9f33fa2837d8b736a47caed77c4c52fbb95d8afb5db9e58e99e567a34d6c8cf39afa3 SHA512 7b3506b43214948d73f4f2c55af81ceacff3d7cccc167dd32c72df6bffb8b1b1f8bdbfac7162d343858f723e7b3f3a1cd78f20c2f93b14a8eb39125ae2aee7b4
 EBUILD ipywidgets-7.5.1-r1.ebuild 662 BLAKE2B 59d22bbe2c5149799509cdb5bf95592b6e4eaadb687fb8a6337ba39b111aece352e86fc44cc811ec45c174ca8e83bdc7c0c17a933312e355f5a355b19413516e SHA512 3f7c57a8e75fdd19b6a718cc09f6bb5b296070f22e2fff8a4a231633c0dd201bb2c96e8083389950086145584f592c670197fc7808fac4d96f4c7c1292e00c61
 EBUILD ipywidgets-7.6.2.ebuild 692 BLAKE2B 050bb849c9300a5ffc23659c29624a989034907527b297997517c3704ca63feba144ca276f2903d8d683db54be73cb28e3e4f333abbd23d3fc9799c48ccbc9f3 SHA512 53de75afe4494284a17082d230651f707d64e09f338b10c4523d442e4d887e5277efd5b31ddf1bcb81029ba19d73af2bde942aa9d44f06fdbb763e90f9e6d037
-EBUILD ipywidgets-7.6.3.ebuild 702 BLAKE2B ca87c39addf167bf1dbb5f92635d9007a84b76ef131389e2c8d62e0b4c765ec9697f80d4f8c1b4db5f23735f2ae76cdf0af6514571ad7e13a22ecc20760dd35b SHA512 4fa5618be4f853345a907546064b9f81b31db01e2fdaaccff7a710627634078319dad27b411fa51216f03e51cefcd707926754cb2fb2e57b79679eef4fd07b80
+EBUILD ipywidgets-7.6.3.ebuild 748 BLAKE2B 44eb462ddf12cf1a6371babdca0e6e77abe614d5fc2c5d7441dbfb136fb11528777b767e84173afb4eee1b95112645a2f48a25098f77ebcffd68019b703392a5 SHA512 a673fbb37c68cdbdfb87a10adf5139388ceb13f3d11c75753182435f8a498388f464a932f816f098fcf621a94030b05379a16049006c6530eb3f3678a0a5ced4
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch b/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
new file mode 100644
index 000000000000..f3d82d0a8ec1
--- /dev/null
+++ b/dev-python/ipywidgets/files/ipywidgets-7.6.3-py310.patch
@@ -0,0 +1,37 @@
+From f9a13dbb3b8f1ffefef483bdb4c14f04f7743ff1 Mon Sep 17 00:00:00 2001
+From: Jason Grout <jgrout6@bloomberg.net>
+Date: Tue, 31 Dec 2019 12:57:52 -0800
+Subject: [PATCH] Fix more python 3 deprecations
+
+---
+ ipywidgets/widgets/interaction.py            | 2 +-
+ ipywidgets/widgets/tests/test_interaction.py | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ipywidgets/widgets/interaction.py b/ipywidgets/widgets/interaction.py
+index 3dd7272047..6e3b9fc955 100644
+--- a/ipywidgets/widgets/interaction.py
++++ b/ipywidgets/widgets/interaction.py
+@@ -246,7 +246,7 @@ def update(self, *args):
+         except Exception as e:
+             ip = get_ipython()
+             if ip is None:
+-                self.log.warn("Exception in interact callback: %s", e, exc_info=True)
++                self.log.warning("Exception in interact callback: %s", e, exc_info=True)
+             else:
+                 ip.showtraceback()
+         finally:
+diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py
+index 1ee946744e..c792c5377a 100644
+--- a/ipywidgets/widgets/tests/test_interaction.py
++++ b/ipywidgets/widgets/tests/test_interaction.py
+@@ -249,7 +249,8 @@ def test_iterable_tuple():
+     check_widgets(c, lis=d)
+ 
+ def test_mapping():
+-    from collections import Mapping, OrderedDict
++    from collections.abc import Mapping
++    from collections import OrderedDict
+     class TestMapping(Mapping):
+         def __init__(self, values):
+             self.values = values
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
index a8791123ada1..21b3e27415a5 100644
--- a/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -25,3 +25,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-py310.patch"
+)
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 04bb2f04df1f..431dc3a8e5bd 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,5 @@
 DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
 DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
-EBUILD isort-5.9.1.ebuild 1350 BLAKE2B d3d6276bbe38f543b6a244a5cbdc39dbf144528676030becc052af9af3d155f919a36a8102488051160a7da341d5eb233c8f6cc2b0000950166fd0d6c3000ac1 SHA512 b9a1b66a9b76d804f40c560e0fe451d3b974d00859e4535a95a9a1cfc59b2b4989f4e03685983b062208e01efb69f81039e17b03a11467b59d61e91d700bd9d8
+EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
index 90f66b2f5210..146d772ec4c1 100644
--- a/dev-python/isort/isort-5.9.1.ebuild
+++ b/dev-python/isort/isort-5.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 20f1ac2e59fa..8a0ee33759d7 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -2,6 +2,6 @@ DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25f
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.17.2-r1.ebuild 2129 BLAKE2B e9f5a3ac3f0f9903f966c7ef0261c1b16d44828411e4d37dcb3096f9b708885a4296c86e5346d807e402da6c4dc7c25138522d65f45a933fd1740a5b34c7a058 SHA512 f4d01fe866bac52768e21f011fb6e4cb7d710b55b5daf1570451fc76942831be9aeaa8a96e2dec21927e9b9d76f5af09ce20dfd809c70ca7ec7cf9a916d452c1
-EBUILD jedi-0.18.0.ebuild 2182 BLAKE2B 87e194f62a4d3addbc8501fc079eb11b95f5cfb357dfd2652d7f7ba0243ec77c9b540c13d3e4731f716ff135fee9653bd69c3aabf35a109954528ad85bd52939 SHA512 52e66c6efd4505f5594fc4ebe43561e029b00b8454178a816433a1e25357d5539dfc3e53ece7d09701142aa62ec938f174ddf2ca5a83f07aac3ae1e26b6db791
+EBUILD jedi-0.17.2-r1.ebuild 2067 BLAKE2B b6f8da4804fb92e3937fba9071107305e3f67705a182a783ee7b3ca82fadce96f3f75c7d9f49111a58e8ec14b4097c480efd6aad2ea0f8373a3834d71dc98294 SHA512 fa94a1be329ccd38f377385300143606e07506baa3adc37233bb00e0626e2cdad90ab35d07c0869bdbba6b5899de3203bd8b2385cc10fd0b3a641e0e260aff34
+EBUILD jedi-0.18.0.ebuild 2100 BLAKE2B 5b039354d20eea6e5804b504314a1c01d6cb5aa9bf0060e159f683679021c7176b64ffe4e7c53d518e6f22d4dcd385a38b29b38bce7cec169eaf30e18856d576 SHA512 eff78fa0c885ad5a879cde50bd072917674d4602f633fb34524dd12628b4138bcd852fa2adff11a8891f6c7035f2ca9a2f385f3965850c837722ab546062f22a
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.2-r1.ebuild b/dev-python/jedi/jedi-0.17.2-r1.ebuild
index 2008df3339a1..71fc58c9def8 100644
--- a/dev-python/jedi/jedi-0.17.2-r1.ebuild
+++ b/dev-python/jedi/jedi-0.17.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
 
@@ -43,28 +43,27 @@ python_prepare_all() {
 	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
 	sed -i "s: --doctest-modules::" pytest.ini || die
 
-	# speed tests are fragile
-	rm test/test_speed.py || die
-
 	# test_complete_expanduser relies on $HOME not being empty
-	touch "${HOME}"/somefile || die
+	> "${HOME}"/somefile || die
 
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
+	distutils-r1_python_prepare_all
+}
 
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
+python_test() {
+	local deselect=(
+		# TODO
+		'test/test_integration.py::test_completion[stdlib:197]'
+		'test/test_integration.py::test_completion[on_import:29]'
+		# assume pristine virtualenv
+		test/test_utils.py::TestSetupReadline::test_local_import
+		test/test_inference/test_imports.py::test_os_issues
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# new features increased the match count again
+		test/test_utils.py::TestSetupReadline::test_import
 
-	distutils-r1_python_prepare_all
+	)
+
+	# django and pytest tests are very version dependent
+	epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
 }
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 2c588b7dc472..d2d0631a0fd7 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -46,25 +46,26 @@ python_prepare_all() {
 	# test_complete_expanduser relies on $HOME not being empty
 	> "${HOME}"/somefile || die
 
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
+	distutils-r1_python_prepare_all
+}
 
-	# these tests fail with various pytest<->python version combinations
-	rm test/completion/pytest.py || die
+python_test() {
+	local deselect=(
+		# TODO
+		'test/test_integration.py::test_completion[stdlib:155]'
+		'test/test_integration.py::test_completion[on_import:29]'
+		# assume pristine virtualenv
+		test/test_utils.py::TestSetupReadline::test_local_import
+		test/test_inference/test_imports.py::test_os_issues
+		# fragile
+		test/test_speed.py
+	)
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# new features increased the match count again
+		test/test_utils.py::TestSetupReadline::test_import
 
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
+	)
 
-	distutils-r1_python_prepare_all
+	# django and pytest tests are very version dependent
+	epytest ${deselect[@]/#/--deselect } -k "not django and not pytest"
 }
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 1512230db762..60b3fdaad30a 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 612 BLAKE2B dfdcb4b5642c6e13a183889acbbd34d448a0d6174bcb96781e3e451d499259c8fd6dcf301269b8990f4eafb75fec1758ef58b5619ae1f6b97187dbc90eabd5c4 SHA512 d11200f2e311655e165eda88413f4fba54ee8abe21bb6435f0ab04b0b41194d079d186ce616a1c6ce293e0c2b2351aaedcd21203f5904ef19a69288426f4942f
+EBUILD jsonpointer-2.1.ebuild 619 BLAKE2B 30dca4d2fb8368522fa8269965e91e0d016ece6d185618a4e8588be58c7bb5a8b59d571ce1b43e8b713ab4dee9ae89cd0c9a892b5e52e268d02620d15dff964b SHA512 f8e9283544ec697bb78f50c4c0afe892ec91b55d43e93cf3a93248c5d73932db504d537f7a56dd924bf3a31cb7ed96ec5ab673a82946a781daaeab2b14c6cfc6
 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 27ea50cac550..f350c5a37eef 100644
--- a/dev-python/jsonpointer/jsonpointer-2.1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.1.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 ~mips ppc ppc64 ~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"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index ea3aa66f6de6..ea310ea66dc5 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 1276 BLAKE2B 1de013d01c360d497535d6f8bbc0448ffe095dedbad6ee5a28b5bb19c94209586bdc48c28422f78a0c6fbf24a11059b14a5830d7d20572662f269ce5867dae4e SHA512 60633c46d09a761e3d0425a07ed15f95e86fd0e79440f01174e9cc6556ecfafeb8e40ee7945bb13b6c94074696a99d7044a5b8b26867936dfb82a0a773dcdfec
+EBUILD jsonschema-3.2.0.ebuild 1283 BLAKE2B 213785899c5e9ed46d98791ce02b45eeb96db799b3c26efe2285246bbd7e377a00522c1cba770f4e139736faab06d3aecc850edf2e5da2c561fd55f45f15666e SHA512 ca901919c61d47765752600d2b8390076d9a94a19a73e02e9d6259473e876e0aa84a0c7237b49bdecfef4b0d5ef449303dfa90afee63b910b900183e73823b87
 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 0c4030cc4684..951511662f0a 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 BDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index dfc0a2fec1b1..342fa8e8091c 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-EBUILD jupyter_client-6.1.12.ebuild 928 BLAKE2B d163a3423c14ec3007f7fcc16082947c374f9f1ce42067ad834a70259b95d19d35899e57596f91519b6263f42a82cb21a56939efc576ce1d3e50645e711b0371 SHA512 c3c94cd19e8882aaecb928d4f51b552d1021a744273ef1d888f825f8a480a618e80d9ffd51328c98fae305e0208b133ead8b665fdd23d4321dd5ea0951aab1dc
+EBUILD jupyter_client-6.1.12.ebuild 1180 BLAKE2B a43eb0b87166422d29e352b1d24a03cf90d826cb51b80f29c123419d076bbd245acd540f5187788a7169d589137162a3070890f20872635fe8e243782492fe73 SHA512 b848334050e8308a5d6a83f69bed43168fc3a7427c139909db4a21b1ed178a627c06b461a0d2f43f8abc73e64e0a9b0d7173612d4e5a99d0e9169efbb11e1e86
 MISC metadata.xml 779 BLAKE2B e9744283eb51cd9df5ca7a65a29d80e7712e22a1c4f039bac233a4301a821bbf616a59bc5f923dca0edfc16e32fee9a676a6aa90fd8011beaeca68ee97d63355 SHA512 3e07a943513fb5d2d0e689572c39084c63ef2b54503843897dc1492adbd9fb217a3a26931e48f2bef2fbb99e32900aec85968a9597ddf54350e174ccd82a7b4b
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
index 8743d8a22758..b5a1d4b89ec7 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
 inherit distutils-r1
 
 DESCRIPTION="Jupyter protocol implementation and client libraries"
@@ -15,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
@@ -33,3 +31,11 @@ BDEPEND="
 	)"
 
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		jupyter_client/tests/test_kernelmanager.py::TestAsyncKernelManager::test_signal_kernel_subprocesses
+		jupyter_client/tests/test_kernelmanager.py::TestAsyncKernelManager::test_start_new_async_kernel
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 86d23aa13beb..87303cd6b9e6 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_core-4.7.1.tar.gz 68886 BLAKE2B aa89351845c669474c03a307934a5d84b6357679bc99f2fc7da4f93ff347766d52ce3551780803b73941d6457f7004306e795398fd390c81e9180193a2119225 SHA512 bc190abd000566dbd097dcb14acf1926c92bb265f2cfbbd14dac6a9cf7d6a02f924ba89fa957ca30c2af57433e9187e288bb8e80d039a3d3a583c6e488a9c80e
-EBUILD jupyter_core-4.7.1.ebuild 1050 BLAKE2B c985908f435d9661ff5ad42915f99dc4289102d6c1c0d740846252b62f0727fa3186451a3349d4a3433226204d9ac1bbc841b82fc01434be4b46baa5bcd50a37 SHA512 b0f855c42d5378702325d1aa81fbce981fcac4bbccea28f402f4f7f907171b5e3e97906b0b9c2b5aa8daaf40f1227244c99fef8bcde3ce7b8c077ce97abbf743
+EBUILD jupyter_core-4.7.1.ebuild 1024 BLAKE2B b91199d72b559424b3f8c36a3cef9920640954c510b23847207ade7ad8189314c92691dfb955cdc2e42c47fbabe36ad4302f157fa5073ec55b8f99b33a4634cd SHA512 f548c4e644fc14f20981a22ffc5d88f8403e4482c7307dc9dead9099bf0f6ec7c78ffc4b6505d0f07735d444a365cf6b8f3586b3b37676fabf283d649d71b89c
 MISC metadata.xml 758 BLAKE2B 53222aff39fc0d952b84f0f6e2c8daa0946f338cb4ea36d0412ac4ef019850e8aacd4967f2602db0c6c725d5795686fc8c16e3db6aac78ddb35b698273e7e62d SHA512 e965891552fc7e537d2315eac0e32f37acab6e36acde000a534228aebf1dca39024930d2c2f3d37b6f9a7b6467bd16921288095c26f9e99a15f0644a8b172467
diff --git a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
index f3e42e833d8f..e3938fec9565 100644
--- a/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.7.1.ebuild
@@ -1,11 +1,9 @@
 # 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
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Core common functionality of Jupyter projects"
@@ -14,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 
 RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index d67911f10b54..fb5f45e06033 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
-EBUILD jupyterlab_pygments-0.1.2.ebuild 507 BLAKE2B c1623f959e19aefe8562ab035c5d7fe5ef9c7a7ba9584daff215c8223d9014bb2e3e7176c90f28cfdf77837e343fc24fe41d0c5ffc6172e3109a73036a4b4233 SHA512 961d7eb7983ecb239fa9de3c336a5c206e60a4872d31b475c4da92d08e8159ea05bb92ea762712c159bfcc06b56399d60a90a18d5ada4458369c1ade76fe0c34
+EBUILD jupyterlab_pygments-0.1.2.ebuild 507 BLAKE2B 4ec8a75c84c248450416e90108d7dc7e32d8814f66cb61ba40a17b5a0543697c5f0e4222536829543da24a095abffbfcd9d2dd711ebe2b1a0c7c2bbba6fb75bb SHA512 d3686ab2253779327ccb8c3862abb02952d158deb01b7a3115a17947af602463e91a5eed75119b6b2d834192a9167636a2f556fe986776d370e4eb8b9120af72
 MISC metadata.xml 430 BLAKE2B 76c31c9c34c245dd076500a07cd506a4673716c16ba4af9f7a444ebf2238d5fc3fdcad3ce52a046aa91032d9927436841cc051b9ec45abe58e861657d8a77f0e SHA512 0be5b66170f81b0c209b406f7ce33971cac7972cbcd87def1fae2a09c91e7a7ae18a42c36733cb3e247309be44b2eb6bf1d2f803f8d8aeb5e943247feb308312
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
index 8160cbb97d01..29c49a1fdd4f 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 2d7f350f1318..1586ce3af506 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 634 BLAKE2B 6a685c89207d50f1fc29e06b5b9707f3b4ffc8840d3afb3a0ac164ecdce64089275fe08991c579bf54772fcc784e9b4e2d98f926748ea7e38361f613e1e16c21 SHA512 831f2d0288462dfd175ed7d51f0991ea02974e0ed754e849aa2833c7a9ea5e1b2a868a1e08c2fedec675f9a0891124ad06e81d20e30a95a52a6926869399f978
+EBUILD kiwisolver-1.3.1.ebuild 641 BLAKE2B fbc7a440c60aa2b184d63c232e31bd114ba91494cbf85f83c75569299341b70a30fdf09a1ff5d7f8c31045c3afbe60770bbc969d6a2208ff8c571aa8b2a5b8ce SHA512 51376c5a0482e57d52782896fc98bbd39e5d13574943d19e069081c4d1a0344bc9967f03a935ba3c66ca0772b9e59257af8df6ad6a4cab5f79a2a8170c5b7b97
 MISC metadata.xml 365 BLAKE2B 358ba29f93baea54b87b7af93da632cf6d9e15ddbf8171b82e0745531c5ce9c5b647531bf9346d81591c713bca19d72f136221077e61baef7bbf05f3d770a62d SHA512 2516fee7907e5d0f3b401d0f500adc914cc53fa7df56c49424e16ad8d33835c3aa138632cdcee89aebdfea9b3d497c9ad6f275f22b0509ac90bcacc1647b33f6
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index 269d9ad95adc..51e80cabfc40 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 560361310146..966bffaa06ce 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -8,5 +8,5 @@ EBUILD line_profiler-3.0.2.ebuild 1200 BLAKE2B 1949ae0c2051ece27545485b1a4386c21
 EBUILD line_profiler-3.2.1.ebuild 1104 BLAKE2B 1fa42fc95ce52fddf76ba7a15f63803d2ce9eb714579427b3ed60dcdfb2be4feff5f7f85a2ec8b4fe486a410a5acad59033bf6324dfbe14823afc0e887d46dd2 SHA512 8e0d41543752019d7191132cb720ec2d0cf5a230a44946da26143bb4b7131b8070f6409170f154196784e8cbe6bc0913dbf604438bdeae28d099ce2983b57489
 EBUILD line_profiler-3.2.2.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
 EBUILD line_profiler-3.2.5.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
-EBUILD line_profiler-3.3.0.ebuild 1071 BLAKE2B 37b705e375479e658f55df58fae3365a0c437e5495e6ee10e07ece2270fcd76f5dee4469f4044076bc988eabf7f3a51f1aad6782b93f0546d7ed69c11bf04485 SHA512 f8bb3618a1d157f3e6cfb19c53c0a4c2e97a36c9d1b00a48ddae937b36724d2d2cb49c1abef03434ad66fb5fd2c3c401dd0538fa9bee290444c3a57a1cd1734e
+EBUILD line_profiler-3.3.0.ebuild 1072 BLAKE2B 29ce0340d810abcda5eecf530928180a50223ac4f724a328ff8d477f4ba6a621d67c90d95960d373a643e6c2fb75a61fe2ff5330ca35f318c75a917fe490ef7b SHA512 5ac63f08cbd550a37e99f98bd2df06579a2cf507187b1ec7ca2a1e0bc738443351dcb680a022b083f692570d6300b57a418198c73ea41fda6e7029cecd230cb1
 MISC metadata.xml 774 BLAKE2B b6b3a12e779bb827902f69c9ffad89290888d7b446489dc54f22bfe8d21547e730b694ec552b9a9004c764db543b39a8daca8cc0a28f84a5800c8555f4809033 SHA512 c63fbfbf0e20463e78bb8ae15cb9241b1122a80d7a909ed3fefaba1063325a564139f2556a09b0d394cb8fdc32ce34c5020b807c22ad38e5cd8008525fe38a5b
diff --git a/dev-python/line_profiler/line_profiler-3.3.0.ebuild b/dev-python/line_profiler/line_profiler-3.3.0.ebuild
index 1f06702ad61f..1e0c9050df4c 100644
--- a/dev-python/line_profiler/line_profiler-3.3.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # force it to match scikit-build
 CMAKE_MAKEFILE_GENERATOR=ninja
 
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index 7f96d49270bf..cdd03e7e4b1c 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
-EBUILD matplotlib-inline-0.1.2.ebuild 537 BLAKE2B c03020f9757c07fcc384e77d8e4642238875c904ca9f327573a3c71c1b54d786f37f673133e8c8114e0050e908ba2ce3e390395eca0f568b5f1d599ec851a78b SHA512 59a072e838a3d1dfa910ee2a616241b1391fba0463709e4ba3ebfa14392d97d1a4b9c524e9350c0c75f7f38f253ed5f142e84ef8c0db60aca093678fee9ac59c
+EBUILD matplotlib-inline-0.1.2.ebuild 545 BLAKE2B 02142845080982da6bdb04f7d12d1cc2bfcf9eb7e36fe4379af0ebbe90b2c93ffd080c4f7f61a45154b7b48c19c8b17371159d8d4ab8a069c649eada6fce2e36 SHA512 5e67db3688ee58f38b8f0d04c7a314b05a18b5f06cdf6a37b716ba502ce86acb437aa5d20158a2ab365049f22ee8b26a00d9cbfc63cf3c0359908850bc49db59
 MISC metadata.xml 363 BLAKE2B 3cca406a8e51346ecb5b3dbb3de8a0e3bb82a09243afd82f976d4ebe19207d11487000752cb20601a3e190ed2673dfaf8ccd37bfdb4b53a1b344fb8be2c8dfcf SHA512 eb9935d48f30a722f73335aff5bb53a539002d3018249ca57006db40621b6f3ed9af0d02596c5938c97bf8b28aa7bc3bdb2c0c14cbfa60a08400b95fd33b67de
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
index 44b46cf57788..0482346c6e18 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Inline Matplotlib backend for Jupyter"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e8284d43cd2f..e74a4f15dab5 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -12,5 +12,5 @@ DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d
 EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
 EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
 EBUILD matplotlib-3.4.1.ebuild 6845 BLAKE2B 91e4c9281b79eb1c0bba8142a8de315322198dec213755717d318b00ce90ee2746ea950d7bf3ddbcccb039d757801ad541922966574297d50843600c4bc28edd SHA512 19fc5c3e739c1d687c16339c361a36245fb48d84b31e274c15fde827458fb1723f7836a737d9750778bb1430e83ac328d9242868de817722143dba4cb7a49eaa
-EBUILD matplotlib-3.4.2.ebuild 6919 BLAKE2B bbeb96dfe6ede78bfba56d83098ddbf23229d484543740c70c60fe9b0aabf7cb41154158df770f548ea5344efb3896133f73165e6ee47d66a1a135e4782f112a SHA512 c14941e651e63f4277971378a30e082c9b68b2a411e342de261d1eaa7e4e8a7829e2409078175482348f9e905a11053acbe86648b52fcd8ede414d92e950ee1b
+EBUILD matplotlib-3.4.2.ebuild 6926 BLAKE2B 78feefafc7e4decebe6d60d63bb50baab4001904bbff744c7a347e467cbdb6fe5d4f1bf41ad6813b707d6bdc9c8d09b8dcb43ee4aa7b90ac076830c8a50692fc SHA512 11660f310fa7fe68188f7cdce7a79a4a7af19922d298be8d9e29bb23e6951d35c4e6695e17a2c4d5b6cfdb7dc3e9ff3f7134126e3915324e367c2a54942d2d69
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
index 2bc085e89cfb..79ca3e5d52fd 100644
--- a/dev-python/matplotlib/matplotlib-3.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index f54cd7f17746..ea06b344baa5 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,4 +1,4 @@
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.6.1-r1.ebuild 735 BLAKE2B 58583a144d25813d2a4ed21ff2b7151d9c2cfc62ed755286cf7977cf9945c90743ceeefa00cfd50cd2cad45240afc99889715e08ca89660c282a54d639c1b501 SHA512 3ba43ce34aa2b42013c995ea5096a665bec26b6da6ef86678fb4632a90218ede57c01b686ab0b91c31c01f811b6c233bc6300b72f76733d0a4917d7cdfa93151
-EBUILD mccabe-0.6.1-r2.ebuild 703 BLAKE2B 27960b54187b8182234d0508e893a388add95f7ede78709a0817a40b5819afc047a982b22ef3f9c0ae6d77130ed41273843e3192da229e951ce316715085b447 SHA512 0ce2bd1d16d7b0292d8b200a484d6a7be118ec0b28b6b0c1f8abc1d1b393640683226de2a23d1ab564c2ccfba3ac4e5964e8d10ecd7460e8c84c1a1614e59dd6
+EBUILD mccabe-0.6.1-r2.ebuild 710 BLAKE2B b296a3634fdb40f342c4e2085d4ebf738ab5942cebd9c6403555639a83769a63ae56cabf12c1c9124e4dec74d676b8cf08dbde1a47d5244dba94e941c5b7d94b SHA512 ca02d9490aa8ebd0a2b2e353a0d99afd168de306365da5a2f967b9a65299ef1c5010a1777a3a2d6da346e560ec004af666dad379ea9c57822ac9793e22828478
 MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index 17f04f0db442..d0bdefee2616 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mpdlcd/Manifest b/dev-python/mpdlcd/Manifest
index 3dce7f60c6ef..9727f65494b9 100644
--- a/dev-python/mpdlcd/Manifest
+++ b/dev-python/mpdlcd/Manifest
@@ -1,5 +1,5 @@
 AUX mpdlcd.confd 275 BLAKE2B 995143391e3c30486cdb98f1633005c9a059124ff2fe5a3c2eb9277769f253e9e505b22d6b45ab0f205ea2edb89d11653ae13610a48be6bc7951647787e9b8ae SHA512 ae86f6610ed529e09a365eaae4d1f503a6dc2732c7a26ef447a66509af181ee1ff64c5f4baa9b9f37bacda5f11547d911b34884a06294ead6bd9824e8f8cddc5
 AUX mpdlcd.initd 367 BLAKE2B 01dafb969e424a3dd57578890676b882e47757beeaa077cbdd76fe92cecd507901d01182a26ba7569975067548f3d24625736e03797f481c29ecb2d216e53f1e SHA512 09124a0b71a1425fb8a8bfaf0c021131a5e738856433a33e716eb691a353108b0bebff8459db190be5068e1dd5927a272cb859971bb7958d7e1eb7019325e8d1
 DIST mpdlcd-0.5.2.tar.gz 30748 BLAKE2B 5609ac149a9aa806e516202adf1b9d0f4fc88e8370f331edc836082d7b3b85c519097149dd2b5cb838d8a9ff353421e17daf9236397e4b37e2923948f8dc9dac SHA512 e000120eee1ce99b549c5ac0cd00fba394ce1a373cce3dde819f6aabd6fc3b616e59ade6d6868b1e9f14afea4897cf541f2c3f5d0eaebcbbd03b15781a63b6fc
-EBUILD mpdlcd-0.5.2.ebuild 692 BLAKE2B a3a1cbcb010026de05145987857cc9b0478d8645f3bb21ea86387b6193cda50df96977310249fae280d6053bc078d9e13d3dab7d21be6da6506dafb0dad65daf SHA512 7a6971d002bfbe6b6e1dc02d36e7724f7217d737cc100a7729e5304a23c0381515ce12c10d5d3a5ce5eb93d4436366fa38e7cb33ab3bd3f0aa405aa6d611ebf8
+EBUILD mpdlcd-0.5.2.ebuild 692 BLAKE2B 5f07cc4454e0b04ffac01168e77475acce403463ffd6ee050a015708dbaf81470c856b62c80bc9467fd02b4afc10ab615f9112eab0a6efc2277403e6c8eb7afa SHA512 3264ba4b5973529f660b751744beed71b0b418e0af7c3cc2b0659cf19ef6adcb5cc53e0054cbde52fb65cd105890561ecf88b04643ed0f53963c38e802cf687d
 MISC metadata.xml 675 BLAKE2B fd025f2d957a2f981cfce0cd485ab5fd8ef2310bea5d3d2b9e0c31626b8b654b0d8f099197fb65e7487a98ab2e7b819681ca6d72dd82ca511cd05d6677fd9314 SHA512 9c73530f9f573c3a7fbddbd69e670270ae9960c633ca285890a6f4f5a03ce8eeef96e88b474b5bbfcea2a27df67b78ab2c5b158212010a86cb767d3ecfffbe27
diff --git a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
index 62b00006e881..5bc7994d2cb5 100644
--- a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
+++ b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -1,15 +1,16 @@
-# 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_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="A small tool to display the MPD status on a LCDproc server."
 HOMEPAGE="https://github.com/rbarrois/mpdlcd"
 SRC_URI="https://github.com/rbarrois/${PN}/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,8 +18,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/python-mpd"
 
-S="${WORKDIR}/${PN}-${P}"
-
 distutils_enable_tests pytest
 
 python_install_all() {
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index e7433298eca3..add5d9b93977 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,5 +5,5 @@ DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf
 EBUILD mypy-0.812-r1.ebuild 1772 BLAKE2B 15065f178eb5205fc041b3fc49517f42f770ffdaefd688cfa54c7846232bcb2f1292f1a37c4168ca7962578add3b490a739a91f9133e592b7c64fd4c51a93f11 SHA512 608f51989f8ce28ccc3982c6b4206386a9d8fb31f496925a5311f86df871c2dafbcf2fd0b2a353d1b1b87014ce6a532fe9370e9c67320b845c8e5ab88e2c794b
 EBUILD mypy-0.812-r2.ebuild 1776 BLAKE2B fac9d47619894b63eaa5af03c7b59d8eecd431dff1dfdf851083098fb54ca32624c77d3dac019ef942099969da8680b4d832241eae2346ade8cabb7ee8b0b1cf SHA512 4058512f892c97959f5ab2d09c98cfd0f1dd5d5b13b605164126c4e0769b97281b9a8a0b1cca297c61be1884034449062952670a664a78a7c7c3fe8beff88156
 EBUILD mypy-0.902.ebuild 1545 BLAKE2B 04cc8108aa1efe1b760d96d64175e543c9762b826fe10425e3573905a13db0a7d2997d74490c69755252e23ad8fccf5391e3e9d18d8ad5146c639bdffdb59cb2 SHA512 62055af8581aeb6d6eb1a46bee126ce6bdb3fa605583d2d3a644f37ac65fb77005d1fd4fc1bcd47391a094c37d50c2bb1a93a3b93fae767bc4bec236eb3cbec4
-EBUILD mypy-0.910.ebuild 1637 BLAKE2B 9419341df308c2f926d7f9c7156ecc5e0bd00e2ac7bfc6810716ee8771df54cae3aef1c3ebab5a8eb6bd2904e7a0318e1602992149107aac4cdc2135b7c78b38 SHA512 f5b38cbf678445f9c676a192905235e380039015c254222d0d9f594861375440ee18ed5fb1d9ae974b41fc0612175855cbea05a8e50a91fffb1d33e8adafee64
+EBUILD mypy-0.910.ebuild 1644 BLAKE2B 2ef470e4effdbe0a48704eb2204f88f58ff979a32a9bfaa377182a4ad22a04f8ffa315a1e15aa57c42ac4eef0e4330ea0ffd34a51eb1f58daa091b855b1ff056 SHA512 1c814a8f81de30d2f3baf5b7fa3cf253c8b9ae693f23442d3170962924a81d8e55fd9cb28c41b1ced3b33b0ab38c6c98d8000ef500036af8281a611671198502
 MISC metadata.xml 514 BLAKE2B 12e8ffaeeac0b2501560c015aed0707a75162182b00e899221c9600b78a2969dd6e24a7cb5580aaec810885cf1787882628b2fe550121dabd3737e4cb61d09e6 SHA512 83496ca98f9207accab51a98e3e52c0e68a5b290c6b4f518544e53ecf38cee8153372212db198b97c8a1c07d922cfd00dfcfa41c3d49a9d69eb4bc146633f454
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
index c881eaa2395f..8c3b67f4e736 100644
--- a/dev-python/mypy/mypy-0.910.ebuild
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index bc3fb8bb2bcb..3282f45cc91a 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1-r1.ebuild 827 BLAKE2B 438d386367e9f75e01ae6a20f4c4c2baa9b63ba75562a1db795c3f3cd4ab6acd973e9976a6072705a8cad976172052d477844639fb75b703ac1b680ae41a8a7d SHA512 777f4c4eba7a6ce78286bee6795996706192518cae140f1a7bca2b4975cc13c20fd1add488fdf1d967fb1fb0cfdea577e6b5809d4fecb9ea680c93fb32f70a45
+EBUILD namespace-google-1-r1.ebuild 828 BLAKE2B 889abcf94a09c70ca87fbc3efe1a17e9ae32b5e91b45362dd835b06382199126cf1b07db41821184bed94d2b87d855485e4fd4355cbd2af655ba97a5f6891bbc SHA512 a985b8607227b9114efd9b4a176bf6a23fb7c71b39a1624a76d2425078ffe78bc317561d2c0020dfb64831efcd229d4d41fe74d366915ab2fd319da7d4e9cf62
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index c390f6a2fc8d..c7361b9a2cdd 100644
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 106ce0546dd2..d21e56fe3d97 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 530 BLAKE2B fdf2c03b05cfa10439ed4da9b83531f267587eb1802d32ccd2cf83c8bbe395f7fecbb52009eaad020acc18e0fab851233ad8d2a459ee9170fbfd84d120b54efe SHA512 742a14a092f9bfe52ca6c1f2ddb2a0eb550a4950e73109cfbf625f8bc738eca6bd4356521ca2d3d9293678d101da8b8ae5ce864e4c900ab484acf87b49cd2281
+EBUILD natsort-7.1.1.ebuild 537 BLAKE2B 7c3f2b882c8efbfed6df3f06949f1e624bc2084bbcb56965722f38cdba75ea0481cbf8e00542661c45c3341b8016aefc997fc3333440c1bf01c072fe2580f783 SHA512 900408dac154473798e4226efe70f2245a62e6f4a95baca2522403ac8dc0dc5b982e0175b3348af81064b01d04b05fc78fbb733803dd3052128b35531a8d30db
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index bda15089bcde..f2ee199a025e 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index d8bfaebd8999..9d62d0efc19e 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,4 +1,4 @@
 AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4
 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
-EBUILD nautilus-python-1.2.3-r1.ebuild 1066 BLAKE2B 4c9fd656ed2a8558116f5c7f66d4adffe8d2641ecfc56146ef2855bd11c2e1c453e1b402b7ba033759b9cc698201d6c3b45bcf53728a3a4baddcdeaad9ed4800 SHA512 f60e6124f2a2fba89e78d54787258e274bd8d7fe8e5f4dc9b942c1bede66d4e9c0c83ebba60e198c8edc991cfeaaefb4def02bd5d809b8eb8abd2bb1f6a89b8e
+EBUILD nautilus-python-1.2.3-r1.ebuild 1066 BLAKE2B a1ee20e2f5ebe1cbc6b8736cea8089e60be0a68049b2f52715f44a6bea3f71680dc0c56a561b40a0d14e8c899ec086d29a3daa30554f7f63f68952cf22cc3f9f SHA512 1dcaee2ab0a1fe8f9ff1fccf0a7d75801863e9bd40d2ecce1748c6485839d5d62be1f518c03c89992043ab63db973b90d533b9d7b070b393dd579e6967194d14
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
index 5381c9e0ff5d..3fa650508cbf 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.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=6
 
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-single-r1
 
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 2e8cb344fcad..b479084bfb4f 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,3 +1,3 @@
 DIST nbclient-0.5.3.gh.tar.gz 69340 BLAKE2B ef2908037b350879b4494a9676550754b51c218c0b344c8f26882fac63d3de65b37329fc8aa586f71f0fcb24d0508c2aec81d1066021abd4c66ee1b220574ef8 SHA512 16a92bdab931c2cec133389bfd491c9f3f4ca7ff3b11a3eb70fcdb568a0aecb8cca65d5a1fb25ff9a6ed6d581bed04de8e51ac2d856fad386b22aa6a2424c991
-EBUILD nbclient-0.5.3.ebuild 979 BLAKE2B af0eb0fe2b3b732ab8230d0976cc7e6cabcb7a03d039b6f2e2d42ca38bc3cb251edd0fc4777051eaf5c50701e60ecd5827c0e013f7d98c9e130b1f5f7cc972ad SHA512 f9b367560dbf3cb214b275b43bf7a2eac48b805d0028c15dd750c847c75bd5dd26acd766ea1bfd786007c95af49b18e28517769e2c8a46a5a6529077a42079ed
+EBUILD nbclient-0.5.3.ebuild 979 BLAKE2B 351d320b12f1ce10aa11943cf25dece07ce1ac8d3b4f8d925a35b819598d9ee325d73f654bf61f5c5c45f96165b533fa947c4f40fa5ab416730d2d180c453f65 SHA512 70f22b551de1f6ff12b6d08c965e4aa7eaa50880a498d434a7d769a7202743972957046913856706057202114ec889a6aa0ee670a560b41fc00d242992362d32
 MISC metadata.xml 404 BLAKE2B 72a6751149738e4d2cacf081ae2fc8e960bf0314cccd4bbb2fe7b7edb568c9fc7f6de518b66bc7dde4c712aad07f424e77bf419b9a88a67110258acbf954bf25 SHA512 3430db25e62ec960e7f36bef9ef56341f1aa2654396421071fbfefc9464c815c6ff53b5fee9d66991c144e0d2996db930b5a5bd775c88ee1d5b961a01137cda6
diff --git a/dev-python/nbclient/nbclient-0.5.3.ebuild b/dev-python/nbclient/nbclient-0.5.3.ebuild
index 5636aa1ef7fb..589d2f5385bb 100644
--- a/dev-python/nbclient/nbclient-0.5.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.5.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A client library for executing Jupyter notebooks"
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 45e5488de4b4..99f96772f748 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,3 @@
 DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786
-EBUILD nbconvert-6.0.7.ebuild 2019 BLAKE2B e294de48ba2279fb6f49eed979be120be051453e6bed16c1ad624be5f1cca3ed823b34c622fc6a41d59217642888cfaeea36da7cc4a74390c77746dfe9d406c1 SHA512 6684eb983a86e6c1c275b08455c25b1ad46d9b24bc36204edba47bf7d1366ef5c3b0410360d309c363f6c3c70b044f356eed26373d34c8a5028f57fb3e8d883e
+EBUILD nbconvert-6.0.7.ebuild 2006 BLAKE2B 94afa48c2cb1abb56ac4b06078a3108c9e41d6808210f4d9d7533208cb687a996cf370d78e2f807acdb9c312f2c84bf9f5df2f5c8760742f539aef21baf23b81 SHA512 17b794aaea0b9a8b6671cd895f74b40275a69fec01f0031ae24bf8a0a4256599064db6606b8fc7e217ad8e8dc32247717bb6a40a58658971c78b7b1854c7f6e8
 MISC metadata.xml 526 BLAKE2B 8dc0ccbe9aabcdc429a5559dc79beecd4937384f3c4d84d610f04fcc347c3b5746bfba4d096ef5251003a4f81e1159663fbe338a7d5dd0dcd19b9c97c43bc1f0 SHA512 ec7ec447bab3315501d428a1f3a1bcd6e512b028982985af9862334397d4d06c837f9e40628a6b750dc4bdb9844d2ad3fd3b4b44c8f1066e5f0fbd4e8ce1cd96
diff --git a/dev-python/nbconvert/nbconvert-6.0.7.ebuild b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
index a7ec918819d1..578ce6abca48 100644
--- a/dev-python/nbconvert/nbconvert-6.0.7.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.0.7.ebuild
@@ -1,11 +1,9 @@
 # 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} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Converting Jupyter Notebooks"
@@ -54,9 +52,9 @@ python_test() {
 	local deselect=(
 		# Missing pyppeteer for now
 		# TODO: Doesn't skip?
-		--deselect exporters/tests/test_webpdf.py
+		--deselect nbconvert/exporters/tests/test_webpdf.py
 		# Needs pyppeteer too
-		--deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+		--deselect 'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
 	)
 
 	distutils_install_for_testing bdist_egg
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 20bd6663c505..0da14666272e 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,3 @@
 DIST nbformat-5.1.3.gh.tar.gz 130922 BLAKE2B 866eb53dd3f04c09f4a08303c5e84b672cc826d2d9b369cd85038b6c4075e74dce88fbcae80fc9b5450faf1c4971d121abe35e0a2ce2a8e73e020d2bed3a5594 SHA512 b4bc3d51d6e940ce1e2b1f5ca1005cf3d466b2b7b589383a31c4d2908c4e539344f4c8fb9e92993469d4d66f363c35082f0c16b8a63aa61e19fb24fa5ac910fd
-EBUILD nbformat-5.1.3.ebuild 885 BLAKE2B 73f92ce7c800d1c3e20f31be35fd1c20eba4517cd8e7775459ec6a674941d27fcab1f832783a0d5255c0c01a296ccde112a03e5bb79e8a253d5b005a4026be36 SHA512 0b245d89c52b868644504ed3099f2228f5f8b30e5a9e585511d0a32735ce893f64c47286ec1014a460519ed95b7e97ad23d50903ea5d34b9f78ebbf351abbc31
+EBUILD nbformat-5.1.3.ebuild 893 BLAKE2B e369a8c011fd159991293fdb770ff8a36c8fa770c035a3c1577d3c8953cf064b87738d00f9c1a53b5fa452af497e37268416e2ef837dcc4c199daaffbb2c02e0 SHA512 358cd6d2a36e66185e84489b9a6f2673d386afa5d70771e3cd4060cb7b6aee97ccdf1cafa0954406bf5fbac63bacef3b24b03de0610d913b71afbbf1bbd2898d
 MISC metadata.xml 779 BLAKE2B 8608b59cf72c078896b57bf46337f7a0c78a727a4afa5272ac7a5420a39590977668d249cb84c994b9a402a0d59a43f3cb15433ed5eca0792d054fcccd291e96 SHA512 98249e1bfea7f79b978a5ae1e734113ff075c48fcfe042774ae48ccc0398bd17aba8a6267b7a58b4002d85e5e8af28e4a50c511900f7f400b6f3dacbc3cd64eb
diff --git a/dev-python/nbformat/nbformat-5.1.3.ebuild b/dev-python/nbformat/nbformat-5.1.3.ebuild
index a8ae5c5e5320..dc780140daee 100644
--- a/dev-python/nbformat/nbformat-5.1.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index c7a4c34fd9b8..8973a8cb2aa5 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST nest_asyncio-1.5.1.tar.gz 5738 BLAKE2B 0aa7d9a71c75b97b1eeb40dab8b2b9942a6c2107643aa82429b3d27c3fcc3602494a86903669ec3ee4f577802463cdf05cfafc4bf0c6721b251a61b079d7381a SHA512 cb85ce82706d17081de58e4176bbc6bba9efd9eec99a36902dd689010d08d4267e742cabb89c088cc274aac13ed9929f09e0f55f375cee35e3c15385ed2fe0d3
-EBUILD nest_asyncio-1.5.1.ebuild 427 BLAKE2B fa015530ddf29abc9310c3512c4109c55565860e19b42006c8bc82e05f750e0baea80a51cb8b26d477da80e4f445ac42af824327078e80da929eaa700a4e5ec9 SHA512 72c699985d632ce6c49808bc65b35af8bb270feb52de4befcc6479a0f50bc8944992cb866655701c66cfe4d6a366e6d9144e37e47143082aba5a146e381df3a6
+EBUILD nest_asyncio-1.5.1.ebuild 665 BLAKE2B 1dd4bd5bba4552debbc2ccb6bf344ad3abb3a6229fc6f8af6049b42baf6542abe535a755e935c4bfc2a546be74dd7849bd7d7962d3dfc3c6daac4b235f907eb7 SHA512 b8846201ece02472aab02d00edca71550c36f9d0ef88bff043ebe37c61184baef2888f7e98a32696afba52a801796774e92631e2674294bf1b7af2414248222e
 MISC metadata.xml 388 BLAKE2B 5997502316ff6f700e55980bfccbc7ddd0b4775d95866d76803b37ad0c8e6222cf13f2ad8cbee455d6327b4f96b66f7318bcf05d3f861ecd26288ae144f8a2ba SHA512 f55ce5e44a97d4cc234f0f17f231324b72d60213b9a0c4f94d6ee4cd24893cd6592f1ab8fc6c9527d482e430cf3268299ad08e3b7f76434fce2385a5f23af174
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
index 256fec2c5b5a..cde8a0405f28 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,4 +15,13 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~sparc x86"
 
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# incorrect args in test itself
+		tests/nest_test.py::NestTest::test_two_run_until_completes_in_one_outer_loop
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 8c2f4192a0b8..279b11bcd1a5 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -2,5 +2,5 @@ AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28
 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
+EBUILD netifaces-0.11.0.ebuild 561 BLAKE2B a03c6e259f7a933066f95dd6b549ca68265031980b78b8728f666cd8fd77780effc17e465b68eb2e0c12dd2c710241970f5df6186bb9933cc7952220a3dfb822 SHA512 06d7e4fe852a4c4fe1440a1073f0da5ebe6d270c114e0edda0aebe5e54fe3456defd28dc41c3acc4558e05c9f03a966ea0502aebacfec9f80eec8562d7cc2a5d
 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
index 01ec4d8c2b58..0521dcdcb3ca 100644
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index f8f728aeac66..63c04e71b6c4 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,3 +1,3 @@
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
-EBUILD networkx-2.5.ebuild 1330 BLAKE2B fdd9c830b9c946c415fb3054305d6e57f7901cb0792553592563f6324858c62383f85f210eb521062da27c76b2025ac8f399ce8609fb7275e0570abb9c52e715 SHA512 2c26a12b501d5a9cf2815f76b7769a45c60460095e85c4d5043f55b5663337374dfa4aef24bdde10034a46d684888f56b998e8a5534ee99909d70d4b81e148bf
+EBUILD networkx-2.5.ebuild 1503 BLAKE2B bea445f7ac73c746113abb9287bc38a45884a37a761186c045a472f1b0d5124bc9b880ad75931de6eb83d7d17d296011588fd8ff46153e82bfedd90a84340e90 SHA512 8b566f5ef19c4290abb5e0a7213449d2838817ad2ec4912d70ebdf629d2f1417153e64212428dce8845af7d64653fae80e11f395134c2a5c40ddc4f6fb1fb69e
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index 4b84379523fe..076632748580 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.github.io/ https://github.com/networkx/networkx"
+HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -27,7 +27,9 @@ RDEPEND="
 		' python3_{6,7,8})
 	)
 	pandas? (
-		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
+		' python3_{8..9})
 	)
 	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
@@ -39,8 +41,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_test() {
-	virtx distutils-r1_src_test
+python_test() {
+	local deselect=(
+		# pyyaml upgrade-related regression?
+		networkx/readwrite/tests/test_yaml.py
+	)
+	virtx epytest -p no:django ${deselect[@]/#/--deselect }
 }
 
 python_install_all() {
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 7c1241e0da99..76eae0b56d38 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r3.ebuild 528 BLAKE2B a7b244c549d84cc5e3ca4c48fbb23aab96b70cf41960e16cbba46fee49a539dfd5f57cc140e4dda07c7b581f77315c6b2c032a38d697b778d935c32feeffb2f9 SHA512 91d18517928b815d6d398e69dfbf2fc2b7b2fc74a9cdb62b71451c0471dd885742e9a0553e2dbe9b848ade5f137079d58c8c797efcef7047dd059194d88010e3
+EBUILD nose_warnings_filters-0.1.5-r3.ebuild 502 BLAKE2B e68001d6c4eb00d9aab8ec745544bcd986c32cc0423fba9d7d3c7abf366e9a980412a428568291065787e6c075c299900f6c8b89531a4fef604f64307602beb2 SHA512 57b4062b737a23c39f42c6a7d9cf83d307d165b01172932c45ef5bdfa81aef9eb4a3c594419590644dfcc89676ff0c5b1f4571d875c1eb5670f46a75ecafeb28
 MISC metadata.xml 393 BLAKE2B 2d913eafaf1a4ed0f91821c1f762365da85e445d8960f964044bb9facf9e099790e23fbb0e809fe256857b118dd282e9dba09e75e2d048414afbc1a21045ced5 SHA512 9e366f3dc84ea9488c736cd1165317d9886cd37362b61e1579685a9e84899ed3f9b92fc36d7cf72e26826f98e70e0ad4de7aaca462c1b768a8e0db703c1e0a86
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
index 4c7893cc3f9a..ff331584a6a6 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r3.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A python module to inject warning filters during nosetest"
@@ -14,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 313f386242b0..41defd3a690d 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,5 +2,5 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
 DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
 EBUILD notebook-6.3.0.ebuild 3070 BLAKE2B 93ecfcfe269fd845b0d11a606c1fd0cd26ad890c809b038267790c1d1e3ed65e4992d68293d5edc77c22c0f35b969c803a8daabcbaf0af7328217c7af4676a78 SHA512 2b960b7aaf61855c1ff6dac7f51051958093d0b3022b133397688ba1089bd4524a4eb34adffb6f1a94fea67603c3f1610ede263ce0df39e2006ebc09d7518e97
-EBUILD notebook-6.4.0.ebuild 3084 BLAKE2B a62cb85e71adeae7c278c19938c2029ecd483047b5edebafc3f0f41824af3fbea7bb2459cd746fecf2082b99fbc9df4db7586d9bfb2e2b6d420dae5c9e661152 SHA512 631fe74179da0dce083447c4216e214dea42530eb6bac4e375f70094b7a703738974667dc4029f8b22f8f05cf45b12a408d8c5d2b5d7df0181f4fd83f6544e22
+EBUILD notebook-6.4.0.ebuild 3052 BLAKE2B 821c206d406ff2eac2c3c7b6663a0a6ff907972ff0060ddba61c38286fa6a42ebd543844f980f9f8fed066e441f8f79ac6df10b3dc414a8b28e1b50382909fd4 SHA512 e977b480b1cfdfb1fa2748ed74bb7e2dc143f59f037c18591e259ef8435f20d53f2fa1b70b15fe6ce5eecb1a515bbd622da405996c70016f07fd601b4ca50b51
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
index 12e1bda8f5db..0857038807a2 100644
--- a/dev-python/notebook/notebook-6.4.0.ebuild
+++ b/dev-python/notebook/notebook-6.4.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 xdg-utils
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index a1c04f503582..f70839ee8fbf 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -2,10 +2,12 @@ DIST Nuitka-0.6.11.tar.gz 2582563 BLAKE2B e65c3a01f3283b24aadefc47a17a41ebae1162
 DIST Nuitka-0.6.15.1.tar.gz 2712603 BLAKE2B 8e639b19975410143d1b91b4fb4f71c65bd1d9382c07d2f1f431c16b687954cec62c2e4dbe9bb1c6f6981dda1948a87040b2e300919dbe72c7d6bfd0772b73c2 SHA512 70bdb55ff4b57f06f67e3026c6a1fbeaa729e85f0a7e698ba0ab40c4acaebd31925327dd0f5fbf8187779421968bf29f9b0fbc2995193468411b40a1d30889e2
 DIST Nuitka-0.6.15.3.tar.gz 2713332 BLAKE2B e8d61221839bb961cda14575aa1de5979510113a09b7e8df47aefbf8985b09f554b32210db9b91ca5f02593a11d7537adcdf0fd67d397b022623534bb25368c3 SHA512 960f2ef33aa2c4dcb6a86ed15b8d8fc8ca1c5f26a0dc98a925e8c0669599912f25d10e20f547d51d57c0a63a18e2f07fa45141666b740b3d8804014db5b89bb6
 DIST Nuitka-0.6.15.tar.gz 2712097 BLAKE2B 78c43be4a2ef5678d7a0d6164d7cba2b3a67a738215915b001cdb3774e209fcecc167c52db4c3b22d87dde9169e48077875d09f8601df7c8b079e3d57b21aea6 SHA512 9a41e9b8fb3f51ec16dccd5415b3b7d7d201230fea6aff902931be1764ba65e1d5e4885cd772b4c1cb9f36b1b14a02a73351bc5c1b8e7f7bbb87e5d74aad16b4
+DIST Nuitka-0.6.16.2.tar.gz 2964589 BLAKE2B b8dd49b889ab0921b6bcf25528286c72591d12e470074482be2f2919394d7c7281d15f83fe1283731a45731a6164a72fb19afc5f55c7c7ef913487cadc6af105 SHA512 58fbd015cf14f947900ccb39a82a24ba8b2da6b65f41caa6bdaff89fe8b5b00977b2f0f3e2b9c2809db97539ecb59f2835ebc30eccd726d42b3fbb49cd90ca8c
 DIST Nuitka-0.6.16.tar.gz 2891639 BLAKE2B 4d8b9c29115e333b7a876eed664c0ec7b2a9b25b00d35bfb163834579b28d6b1250b015eacced01e2c27cd9841fcc5d2a3b10c626a5c7fc098914e675e3732a6 SHA512 908ddbab62a085a478f09c18215fd9b457aa7fe926e5809cd25870665366660f59141b431346e4af6593e4bb0281d39103919c46435c158af6f2ba7c354c3834
 EBUILD nuitka-0.6.11.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 EBUILD nuitka-0.6.15.1.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 EBUILD nuitka-0.6.15.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.15.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
+EBUILD nuitka-0.6.16.2.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.16.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 MISC metadata.xml 942 BLAKE2B ec5857515914046bc074009149a2e830fd94da026e6563984f914d72183595617e1437e1d3dcff9caeeca20fe0f2be0cf33d45489a36bfde05b35815a9a34df2 SHA512 c2bcbedbfaf567f0813291fc890fccf9d59fa52808317cde9bbdfdda79337f15a1e6551587557bc0bf8ea27f5cc646674d3857c1c960f72469730fa23a43eac2
diff --git a/dev-python/nuitka/nuitka-0.6.16.2.ebuild b/dev-python/nuitka/nuitka-0.6.16.2.ebuild
new file mode 100644
index 000000000000..8810e82b4d14
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.16.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+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 64bf7cf8dfcf..ef92ea460bcd 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -16,6 +16,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
-EBUILD numpy-1.20.3-r1.ebuild 3730 BLAKE2B 7099a2b62a5d366b9a5b099fe7a8b675d1488659e48810d2e014526338ff67eec04b68577db68ce9f97b301de52dd58bd9a1df903b1b7492c6c157a34f61f274 SHA512 97c9046f0d2548cb7ff6f91c8f0d000f0e90caf9d748e9c723b957f28bdad3faad66d44b5bada93577f40cebd37fa2ad213069bec86eb925ae7c4d0b79e88cbf
+EBUILD numpy-1.20.3-r1.ebuild 3727 BLAKE2B 484a3840f6505622e69a1c817833700ef3dcb4dc98d9c09c9af8d2c04e1381e3d9379751c314793f8e590129fe1bb309a8f966366320cbdf42923646fa16ed1f SHA512 27fa9ce2b73d4cb3c8129e024051ef6777149d02cb4478a7f885529299a3d9c2a4683c8cf5e2d059fb4bb36def8313d10f06669f6795c1326540cdb1cb558456
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.20.3-r1.ebuild b/dev-python/numpy/numpy-1.20.3-r1.ebuild
index 6604eb23a4e6..cbd2bf9b3376 100644
--- a/dev-python/numpy/numpy-1.20.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.20.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 207b6f03f955..e08fcd41bbfe 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,3 +1,3 @@
 DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
-EBUILD numpydoc-1.1.0.ebuild 951 BLAKE2B 51b22751b40512897881f9d80832cf128b3c2e2f43fd6a6aec187868414c114b2e863d20e2582fd99dd5d92512494fb76dec32e2e0fdbebe9e0ed1e561ac2fd2 SHA512 5e9c5757e79b4bb5b0d89fba469cc9f5713fcc1e71df5794ba6890e15b7d9429b8058b35e387b9449fc88171fc9be97ca7b6aeb0e09519c2d8ef6204196e2f72
+EBUILD numpydoc-1.1.0.ebuild 958 BLAKE2B 92b16eabd35b23e7e3a8abe4444d3fb264fcdea9ea28737c9a3b0a8e041cad0e13562b00d3862b32801c19346d9f56a491db812b14d33a4f19460b81211f1d1e SHA512 39d5817c3cadece3951e18b2a2af0c56f11bea3c14a1a7d2bad9955973ed8610fcd2555a9609f188916ccb0c03cc016f55d426a071c47936232ccf9ecd6ab3ee
 MISC metadata.xml 346 BLAKE2B 4cc694f3ee24d59fb18bc7d1ecc4b2cce5931d450efb57b75765c2762a06ff10458f55a4c472a75ca6d64e4e1a79dac0b5ed610e4963f52498ab4a3701d18ede SHA512 737d553f25d503f5257b1bfd36bf295a528e600070b00cbe5b0fff9c1fde9f967c89b5be92968b2eef617bead31780d7cad4a0deb419f0a816c806c2a688e9b5
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
index e8e6a1d97662..af580f9704d9 100644
--- a/dev-python/numpydoc/numpydoc-1.1.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index c7bd1936aeb9..f3dda86cb811 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST oauthlib-3.1.0.tar.gz 155362 BLAKE2B 83e9331589305c85acc755f9c4dab8558a19aa247aff5be0fe6c51d047fb9e96b64f17d07a3e33378f6ebc73a283e0162bab56e110aca581f73b628544042600 SHA512 c295de232e0215532c501d8f0803bd501a15fe89a746179ba4facca878e4927c8c05f07825f483c4a846922fb49d6d89f559a8b49bb72b19903f902d772b790e
 DIST oauthlib-3.1.1.tar.gz 161395 BLAKE2B bc127841a16429364191a69777741135594366a5c99b32f063ce9bec4b6a3e9b7eb67515aee4da37f26cc2e8b2a2450fc708a21da7e4944861b9adbd9e112018 SHA512 1c18f265a6017a6f2bf77507f5de095b439be36f309316993b547ded0f306461b058dcb85dc245bf26f65a9c77be44ca38f9053f3300a9b5cb92332b61a7f307
 EBUILD oauthlib-3.1.0.ebuild 733 BLAKE2B 724548ecf8f9ccbfecc76babefb80be4eda3d9411b44ad15d44caa37287b878722d02d8739e13a3e78167a524275b1af5c0859d38c48c421fd05af37105ec952 SHA512 cfcaf21c9b4f8f2124655ffbc41016362941e8af7ae50646c348ba02d8b2aa04296ffea26d491fb4d857da01a94681f605c50ea97b106869733c50492be349a8
-EBUILD oauthlib-3.1.1.ebuild 736 BLAKE2B a0fcd64dcca45d369888174ba92adce90f69128ed3d5090b3193a90e0ec4e5a624fc4b39eab66e092656147fd3111d362b369211a5c0ab49eb47166936b51e20 SHA512 42966c03d952c642170a6ee4bde5196f4dfc836fcb6ec88b290436c692962c7a887f870e7a5306534dc8eb3c5d9a47fe2a7d5714bd34f566389150d4c301a301
+EBUILD oauthlib-3.1.1.ebuild 734 BLAKE2B 19c4b6687918b673508799f67977d76b8752c2a6b3d33adcb329c209fa2c26bba09c03c2adec6ac2c26b8e03f3b47d01b08324c6992e4f937f6fb9fa6e32bf51 SHA512 87ecdea7943b2f01b8c7dfbfe2c391cea1825bfff6f3389b53b0c247932a33fad4efe39f86c2777468495f5680c2037938869ecb3a2d9bfc9c6866ff9d799e2b
 MISC metadata.xml 368 BLAKE2B 537cbafa42a979bb60e657d4bfb49fb6dfa3d6a0c749af96bc4daa6d1c7ad070026d9cd0b089426b0f9a5e07ce609325484f66bbfb9a275b31ca1552acb70058 SHA512 9c38212110ac83cd19c1397ceaa7ec1451e58d41400084b3bfff0ea8afe14ff72a161dd9726950cc31e3ab6b5efb4962356de92f32a3c50e3e61009e40627297
diff --git a/dev-python/oauthlib/oauthlib-3.1.1.ebuild b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
index 659777bad99d..3695af141ab9 100644
--- a/dev-python/oauthlib/oauthlib-3.1.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 4d261f6c67da..3f61c51d6f37 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,4 +1,6 @@
 DIST oslo.log-4.4.0.tar.gz 86108 BLAKE2B b710d110759612dc7c1516a0df7b0ffe5af1ee83f99ff776212e72a52a4249657b4857a8fa99aa06047093ac554b6374ba529bafee75d4589beb538baca5b190 SHA512 6501963e90d40d2e722f338ec7c78fa36f6b5b255d36fc5df7d6160d1f35397ff112b88053603f6b57d9d93539bdb665e3c1b6894f3898988fd8d06b5a356120
+DIST oslo.log-4.6.0.tar.gz 92331 BLAKE2B 974f8fef0f132c5429b6512c39b770206947eae9e7a195d7a570b9da6b5bdca675440c800b6ec969ab950e375d4d4ae722d08cf662fe644949322ddc80df01df SHA512 991b661be12b2d16060b621e743fb65809f753b240d5039cd4d51f13a95d6852404156d46507fc611b612cb656d68960026c8735f4f91b32caf89e09499a3c7b
 EBUILD oslo-log-4.4.0-r1.ebuild 1233 BLAKE2B e15e8a35e677f0d69237eb4d7588abdf2d2c730c96d749416630bbc4a78fbf0295fd35636afede1a0028f4cd9f839ecc5b4ae5ff271fbb549b26779d3331b583 SHA512 2e714a380f5ba00c6bf5bc85cd2a0f4c66c903c571171066c8d77549430c9277ca1484960b378119c6939f404d56d67470d6bfded872936ebef2626cf4d2cd1c
 EBUILD oslo-log-4.4.0.ebuild 1227 BLAKE2B 0f41dbeff54622723afb2e8798a5e58452938d6ac063c2d17b616b637b70cdf2cb85fc5420492aec06ffe640c1f0c334989faa6122549e2c54ab8a29894ee2df SHA512 96b7b44e7a5cf92618d488d63f9bece74dba7cb32953447cace8ec56265b7322c6779cd32a1891ce44507a0b81f49c1ad644832379f879bc9dea761cf49458ac
+EBUILD oslo-log-4.6.0.ebuild 1235 BLAKE2B 2e9b1ef96cf221861dc98f71fae2d8ad76bbdc40840331fbf2fb9c97620e8c2f99373e85dafeb027b019d4b90b55b556b045f7feb9e2b66c70fd28ae4382a5b4 SHA512 7c0ae008e1f44766f2202635bce85825d68ae8b2d10ed5240175fb6e1a18e6ac0977eb30609b0263600849a6e3206a319c0d9ae293a8a05488d849229fbf76b1
 MISC metadata.xml 907 BLAKE2B d91afdb5f720175be1bf2f8064d509ee94bc78fda6a428059e62a6e14753a567d6e696912d841a2ac9c68acb07f076212e6ae50aec0da23079f536952311fe5d SHA512 802e195e3bd2b4ae730be1766033dea2d8df58e664c506ed1ffd4c7c426a5a740ca31bcc0557d8b5acf660a1f751c106de17825dfbb71229e84d299647a509b7
diff --git a/dev-python/oslo-log/oslo-log-4.6.0.ebuild b/dev-python/oslo-log/oslo-log-4.6.0.ebuild
new file mode 100644
index 000000000000..2f98ba172732
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index f7e985df7eed..d6be82f18473 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,7 +1,9 @@
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 DIST pandas-1.2.4.tar.gz 5469105 BLAKE2B 7f39e3ca67f5997c0668b0c2e9792869963adcd0347a3983188a992794ad58ccba82105b4dc3315cc17d79104f7fea7a273c218967eb51b1ea1514e87aeebb66 SHA512 79e7a38b8edad52b70eb81ba821141b928c782009d59c50076e7d1e7c015078d333c0c80bda7ba720f4ccb221a0ba93a02885fe6a573567ee37ffae14ee9b2c3
 DIST pandas-1.2.5.tar.gz 5470907 BLAKE2B 2c5e0cb0849aa23ee8640528a3e29a579cc051543731e44c9be41fb989c85f1b2b18bc028e97c9b200f9894e4c3ac8af6a2100586e41f6d8a165a4c4679fd649 SHA512 c8bc2ca7ff8ca1a4877ccda67aaf49c103525d0f511636f93e1db3720d9a1717aacde0a5e3f107f8f620b59f0269d9e5c9515fbef46da4e87fca678d7acda990
+DIST pandas-1.3.0.tar.gz 4721119 BLAKE2B f09eedd848686597a755da929683e841be61cce4385fa1e4616a328e267dcd4fb44bc9ad5da56402a52da6fb3b12f84795da10cd20df7fd0b349e749dd814bc3 SHA512 67145114091901d8e2a376392d8890372675a1b5831de310715a6e6f7f4509dd8cf1a4b30cab3314f849b6c709270a246524b958b686f9e7fbe2489ce5b650a0
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6153 BLAKE2B 3fb940dffdc0c19cddd05f31d7f065a5c5c873fde0e888b7a6a356b759dbfa2ae4729697c9240ac71b39957b9367bbeb70731ebaeddb46c778dba8e7eacbcb17 SHA512 44f78998f669a2df55b2b31c762c2e28c4e6064b3dd63f465e16a09a4843487e684142244348ee3f17a973ca98eb6645a73450444aa9a1fb984ef174f6a7e0c6
 EBUILD pandas-1.2.5.ebuild 6179 BLAKE2B 1830c307da0c8a1566ab2a47d7c93f2b591e4ad0f31274f133dbc374f12c6a206b7d8d94974c2063a44018f8197c78790f108988e353b84366e7e5b661a59e65 SHA512 00a11c97733b1ff262efd76f599ffcac0b46119508f5a444e386ba3c4d9f0cb36bb9d55afc397a6a3fabe7fb3a52ebedfed153e8f0ee59cd0355704c6e3afc33
+EBUILD pandas-1.3.0.ebuild 6403 BLAKE2B 54a0111d124c7280e6c3d36b4d4ccaec9b0be63b9e6d2aa4440f46f852cba42674534d2b6bbc6919b25878c8b0c25ac40c6e101e7572f587f0a32260fe8a4052 SHA512 3fc220025e0b6418cd363da9bd29c60b286f215eb1e729acc02c7d5dcd9699009c04d870651ae7b460c3a1d51c6c88d2df27ccec482501c879b9fadf56b0d452
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.3.0.ebuild b/dev-python/pandas/pandas-1.3.0.ebuild
new file mode 100644
index 000000000000..fa4aad168863
--- /dev/null
+++ b/dev-python/pandas/pandas-1.3.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2017.3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# weird issue, doesn't seem very important
+		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
+
+		# old psycopg2 API
+		pandas/tests/tools/test_to_datetime.py::TestToDatetime::test_to_datetime_tz_psycopg2
+
+		# Internet
+		pandas/tests/io/xml/test_xml.py::test_wrong_url
+
+		# TODO: some data path problems?
+		pandas/tests/io/test_fsspec.py::test_read_csv
+		pandas/tests/io/test_fsspec.py::test_markdown_options
+	)
+
+	local -x LC_ALL=C.UTF-8
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx epytest pandas --skip-slow --skip-network \
+		${deselect[@]/#/--deselect } -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 49e3c4e3e063..9d8d8382bfb1 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,7 +1,8 @@
+AUX parso-0.8.2-py310.patch 1128 BLAKE2B f052039f8aef2913cef406c97d55e1afdcd76e46d2a64e2e2f1fd2ac1b7571950ca816213b155602f7b974d01996876a4a7bb0b92f49161d9b29e4ec98950918 SHA512 5aaff0ca295195674006f1435863ff59eac121189c938ef44428eba929a2d76daea9fffb51feebcc75502dbdfb5df7ead18d62c4ee98cb53c35129b81c562810
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
 EBUILD parso-0.7.0-r1.ebuild 735 BLAKE2B f4a528e4639cb6eb70f830b234bd8391281571e9c7a3f21c02cc20b2361de21888be0549b356f4a9643e692fa2ae17471ff9a7a87a6edf3826afc73349441ee1 SHA512 adb6667165cee33cb3d46d737473e8d5c01b7313c88d2af8161a9933f6ac6c6ab70ea098574cf1d0f161cd5a02ca16ad2b5abb99c23ac7932a2501f8aec6a3c9
-EBUILD parso-0.7.1-r1.ebuild 555 BLAKE2B b714ae60de33af14b0093768310ce7714ca139b6d9d97641cb28216d2c4e5b2af82b7e198f21cfa8b57bbeb8fb521c7a1096beaba672aa109e08708384d6c0df SHA512 f1a064feca5a367e49a0d4c09035633ab5cf2659fccff08c158dd01693e8548c885ff656461a9b356d946447132299f0760f0bf81bc13646d100266b3135cf50
-EBUILD parso-0.8.2.ebuild 562 BLAKE2B bf7eba8c3272bbd63d9e3d124762cd24c4c9473de760d19773deae58ecba913aeaa557d122809ee34eceb64f1f5f99170c4181889ac09e9c9751fca16fbcba0d SHA512 aa81e4af15969b635637a06ff225a2bea55c3c3b73b65d7744d9701ce7c252635440d002423a1e7a8216624f9bae99cff5322ee0997cce7c6c31565b924ec6f7
+EBUILD parso-0.7.1-r1.ebuild 853 BLAKE2B 394b8ee3a1f2eb7fff1b1a81c4ee335166f65413ee9491e77c6cb9b84a96889d59ac6ca3c5cc3ec1e051f36e7c3ccd7d4bf173f31e296e7d0642b58317055fc8 SHA512 2f7e636c246a721be808ba86db60f63b24bbad3d1e67e4c723a61f7dfe84e96fa208cf61a13500b3a0ef62912900f1f47c09c9c76609ec57d18bfb1ab045b642
+EBUILD parso-0.8.2.ebuild 898 BLAKE2B 438f01c3e7c86b45a45ab1769ef09a423ad3fd61af7de4f8652910ad76f5c0a2e84de49e52bfb0c3cb6a12cfbad9196cba47e8b2263d054eb922d6ce745e3aba SHA512 d58a25c78bb979e61aa6d9d1d7c68359aa51c33d30bfbd82ba252c1808602e2c5caa25d80d835252cd6473ab2b60e311aff6b6d3c50ea6e860f898351e937d82
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/files/parso-0.8.2-py310.patch b/dev-python/parso/files/parso-0.8.2-py310.patch
new file mode 100644
index 000000000000..2f3487dd2f61
--- /dev/null
+++ b/dev-python/parso/files/parso-0.8.2-py310.patch
@@ -0,0 +1,29 @@
+From cbb61fb81955a8cdbb5cdeedc9bcfffa39a5f270 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 22 Apr 2021 21:04:49 +0200
+Subject: [PATCH] Relax a test regex to match new enum repr in Python 3.10.0a7+
+ (#186)
+
+bpo-40066: Enum: adjust repr() to show only enum and member name (not value,
+nor angle brackets) and str() to show only member name.
+https://bugs.python.org/issue40066
+---
+ test/test_pgen2.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_pgen2.py b/test/test_pgen2.py
+index 9b0dd34..85ccacf 100644
+--- a/test/test_pgen2.py
++++ b/test/test_pgen2.py
+@@ -339,7 +339,7 @@ def test_left_recursion():
+ @pytest.mark.parametrize(
+     'grammar, error_match', [
+         ['foo: bar | baz\nbar: NAME\nbaz: NAME\n',
+-         r"foo is ambiguous.*given a PythonTokenTypes\.NAME.*bar or baz"],
++         r"foo is ambiguous.*given a (PythonTokenTypes\.)?NAME.*bar or baz"],
+         ['''foo: bar | baz\nbar: 'x'\nbaz: "x"\n''',
+          r"foo is ambiguous.*given a ReservedString\(x\).*bar or baz"],
+         ['''foo: bar | 'x'\nbar: 'x'\n''',
+-- 
+2.32.0
+
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
index d06ec052d5b5..643c8aad785b 100644
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ b/dev-python/parso/parso-0.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,17 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# py3.10 changed exception messages
+		test/test_python_errors.py::test_python_exception_matches
+		test/test_python_errors.py::test_default_except_error_postition
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index 3ceece3224e7..8ab7282e6cfc 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,3 +17,17 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# py3.10 changed exception messages
+		test/test_python_errors.py::test_python_exception_matches
+		test/test_python_errors.py::test_default_except_error_postition
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 8f4e80de2fe5..00c285ac4e61 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,3 @@
 DIST pbr-5.6.0.tar.gz 125220 BLAKE2B fc26737857195b0dbe16ecbcbc6e389b53a61105b3bc66e714bb4fcb4907e4329ee7c76b5748fa7d892bf231522e6ff9d414328ae0d97e6262b608c44c737764 SHA512 1dca9020a84e3b9be71fa07e2feb37bbdb2bb69d0b4f69fdcee0fc3c7fe4d84ac2e2079d6bd7560192833f069ca6f5dc27d03a3ef87c168eed18eee8579647fc
-EBUILD pbr-5.6.0.ebuild 2300 BLAKE2B 073cf980c49f7476b4a1f2a79c31f5888690dbab5cea77c1abffff940949214519663dba49f58becd519b8def6a415d6c365fcb89009cd5f6e335d78a9d81a30 SHA512 bdcb1a4f0061597396915a6dc2151054597de824440afd95e0ee786ad9ff8c8ab21770b6a23bf873ab130aaf19f28fce1b20ebddd445d4852833ef4a0d27be5d
+EBUILD pbr-5.6.0.ebuild 1975 BLAKE2B 2494ab7dcd8d4be97e4ea2b467fb33561174e8a098f3794cc21efcc25193decbc1b8f6dc78ffaa75ac2bc10f5de004586d5872803b7b483e44514b3483f62c39 SHA512 88b653436202c318418e99dd96870326d04c011d5a12c84904781f77219818d31ab45689ec8b1c67fbca1539618892a007b783f7aa10d65ea76be09a6b748b5f
 MISC metadata.xml 814 BLAKE2B ca519dee02f08350185d53773b1c90724c92c7c814025417b295cf0ad961064d26323830ee19f78416bd6fc67b43517736d51bf485c4d314c9313ca4c420a6dd SHA512 0c0b2f916a99a568c224cce64636f513bc7d8bb2c7ddf690f55eb46d5b98afd0060a5db74a8515277e84dc5c08d8d5754a37eae73b1fdb3460cf1d45b5797e88
diff --git a/dev-python/pbr/pbr-5.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild
index a59c1d35b29b..7c12cac8e10d 100644
--- a/dev-python/pbr/pbr-5.6.0.ebuild
+++ b/dev-python/pbr/pbr-5.6.0.ebuild
@@ -3,10 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
-
 inherit distutils-r1
 
 DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
@@ -16,8 +14,6 @@ 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-cygwin ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
@@ -34,11 +30,11 @@ BDEPEND="
 			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-			>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
 			dev-vcs/git
 		' 'python*')
 	)"
-PDEPEND=""
+
+distutils_enable_tests unittest
 
 # This normally actually belongs here.
 python_prepare_all() {
@@ -56,16 +52,11 @@ python_prepare_all() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
+	if [[ ${EPYTHON} != python* ]]; then
 		einfo "Testing on ${EPYTHON} is not supported at the moment"
 		return
 	fi
 
 	distutils_install_for_testing
-	local -x PATH=${TEST_DIR}/scripts:${PATH}
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	stestr init || die "stestr init failed under ${EPYTHON}"
-	stestr run || die "stestr run failed under ${EPYTHON}"
+	eunittest -b
 }
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index ed5624ec2022..9533478a283f 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,5 @@
 DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac
+DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
+EBUILD pillow-8.3.0.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.3.0.ebuild b/dev-python/pillow/pillow-8.3.0.ebuild
new file mode 100644
index 000000000000..2943f29c9d65
--- /dev/null
+++ b/dev-python/pillow/pillow-8.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx epytest -p no:relaxed
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 83c09ee67175..b6f1fa0438d2 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,7 +1,8 @@
+AUX pkgconfig-1.5.4-brittle-tests.patch 546 BLAKE2B d80db0a12eee8f2007075015a46038beb3674fd89cb57105f7a0c2d8164572a3aa45377bc52a3937ed25b4eebcbcfe7bb347ca56bdc0db5d2f01901454fb4dc1 SHA512 f45782fb5330cf218b9550375f2b8f35ec82ca6bfc8a3963736a7cfbdac06a8d1fbe979fccbc78caecb7f5765f46e07f28cb3333f32f806825de2bd2e4365684
 DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
 DIST pkgconfig-1.5.3.tar.gz 7310 BLAKE2B 361439cadf3f21a76d379a8b7eede9d2c73fa114c5816e8964b7086e867ca0d089dbcfdc219ea0d481934940fcf0a0ca2398b0850448bd3e577befb1266034a6 SHA512 00cb148977fb2b25d747ab1aa8d99deaf250df67d8c3ec0f47160714aabce4de3d96cd43e7292a8e4ccf850de1aceabc96d5516995365da088e00a731d538c24
 DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
 EBUILD pkgconfig-1.5.2.ebuild 572 BLAKE2B 89b889d939b11616e7b5eca89bac2d4277c33aad92b2ec2779825295d77ffb4e73b1eabf79f98a6d06647e3aaa4199d030288921bdece66e477239e916c099b8 SHA512 f0211e5cdd45fca40cf84116f84ec8fa68ad135d821416e7f0b36a5e23d9754904889df7ed9c73739d0d888e6d44673104b30c71f971c4dc60e2f3040f83b89a
 EBUILD pkgconfig-1.5.3.ebuild 576 BLAKE2B e2f64c528c8600a2e8b3a2022b60cddf4357017f9890c59a70b3abb21d0e301d22d747df3e731d39a41e8df3631a22dcfd661f2352c0604af85de0fdb628ba9e SHA512 6900df90c589879f31e366b28e1f5200ed1675a3385c936b705518e9181b391713b6647f3a4d90da9fc78e7ca427431d6a3f65445dd5d9a8193fd49f3c215243
-EBUILD pkgconfig-1.5.4.ebuild 576 BLAKE2B 40b70e50b2855d37c3efed0c9f297bb30c6f207cbc0fdbe79caf6aef2f0df1ec3e3f6328c2c6343979042a65e57af30f20d6354fa6d0b562eaa2d1b7798534f9 SHA512 eec1c943cedcfda903e050aec0b73694645503c05bd89ab5e347c102dcdc137e0f5e01fbaf45268fbe11b35659972d6889fea2584bb01fecf42d018f0566ba70
+EBUILD pkgconfig-1.5.4.ebuild 628 BLAKE2B 3b73a5fb811d22156ac8f0f0353e805cd4243d5e748dc9f55575991807daf83b296671110d14667661922b5f6eb9f3af0f2cca2dbce06724b5dc98838d89e0d6 SHA512 8977cb9744c51d3c7931a19a3c6f65e31939eea3ebe92271996c83d1faa3cd9e4cac4c35a39bd0a85948121a133b6958bf92a570cd1803ec6ce7681b82a13de7
 MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
new file mode 100644
index 000000000000..05ba21f22acc
--- /dev/null
+++ b/dev-python/pkgconfig/files/pkgconfig-1.5.4-brittle-tests.patch
@@ -0,0 +1,14 @@
+--- a/test_pkgconfig.py
++++ b/test_pkgconfig.py
+@@ -138,9 +138,9 @@
+ def test_configure_extension():
+     ext = Extension('foo', ['foo.c'])
+     pkgconfig.configure_extension(ext, 'fake-gtk+-3.0 fake-python')
+-    assert ext.extra_compile_args == [
++    assert sorted(ext.extra_compile_args) == [
+          '-DGSEAL_ENABLE', '-I/usr/include/gtk-3.0','-I/usr/include/python2.7']
+-    assert ext.extra_link_args == [
++    assert sorted(ext.extra_link_args) == [
+         '-L/usr/lib_gtk_foo', '-L/usr/lib_python_foo', '-lgtk-3', '-lpython2.7']
+ 
+ 
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
index 086dfe2434ce..d4c0fd9d2b37 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.4.ebuild
@@ -18,3 +18,5 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="virtual/pkgconfig"
 
 distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${P}-brittle-tests.patch )
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 4e77c3f4a051..c3deac72a9de 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus_client-0.10.1.tar.gz 71676 BLAKE2B 63a597eca0f7684013ca2de8cda9d9ca7ab64d3ff923e3d328c1e54e794ea9e34771795117a8cd8254063028ceedd9c50d15c89bba48d3994e79629ebae6df14 SHA512 231c86bfeb2a35fbaf172005ead5b790b107c55f3657d94ad417c0036cc72ad6b48ebef7d52d2fdd1bca9b98032d1057250a880b002a29e98efa803886f26766
 DIST prometheus_client-0.11.0.tar.gz 72272 BLAKE2B 2526a65acf928ce5f492c6a43276ecb951d8b600eeb5050b92db091919862eb0ec4f41ca41347b4dd70a612f70e8f4a49796572de80b197d21c3a8cf8e303201 SHA512 5e644d781b7fcc3e0e386a2244f524ccaf978f1eab87b1d6d8009ac3f10fe2ca4adf2c76c2a2ffa47b4b54237cd906807d55bd99530a92d82cd3825de93280dc
-EBUILD prometheus_client-0.10.1.ebuild 598 BLAKE2B 26a1a59a070dc2454b072f8c921997fe331bbaeab0694528ddb935938045f4687558dd4f215d6819ec95108bdb5f0d3785db31e78ecb686a96b2342f4787ff5a SHA512 64ac3a6dee2732ec818336f40581cc9ed3bf94dbd89546bd9bd4eca83be54ef44a7555128acb00a97af1dfc15d95ead785ee5c3bc957b741236b45c9acf18e66
-EBUILD prometheus_client-0.11.0.ebuild 613 BLAKE2B ef5584b1729576b576da0a37d6cf902a56cd5a1755ba70563dee00054a390a63577eadc0ad7ba60d21b0927e2bd348428d44e15918226970d377d3fd8eed189e SHA512 f7871dbedd091eaa4f82991e1f4a70a131de1b78e6d4a6ba23d663b2ad680eb8f057c1ab32db15bf1b9a223f14bc918f04e34af5359e835f0a5b5d89893e7537
+EBUILD prometheus_client-0.11.0.ebuild 611 BLAKE2B 057a0de52cfe4794c71162e2f924ef22a4300dad61faf2c35e8bff211bb87ce21ceb0e86477da8e2b871240081e45702fc07bfa61406c11fb7f4d633abbbcc40 SHA512 a355ff144786eaf9b582ea99270214eb7714e76251fef1677c06b24d0993aff4196198e961be50e6e896b009ca90d8fd0312f14392c735f40ea3a34a3a805427
 MISC metadata.xml 408 BLAKE2B ea5035e286f836f3637d79b145f3d84e7dda07372ecfa66b32f9c4d4f553f584a28e5c421a1537da8d4495173dbcd1515013ccfcebf54d034e28cb8cbd864ac8 SHA512 ecad056ac13d4d78b2bedb19a6ed9c60d0c52078301a4e2397c3ee1f45fa435750c1a5c63ad95150129216201e821cb5ea9816726c0a3b383538f956ce7a3d40
diff --git a/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
deleted file mode 100644
index 020083159322..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.10.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus-client/
-	https://github.com/prometheus/client_python/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
index 5accd5943f5a..bb19b2a1a94c 100644
--- a/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.11.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 7071c36e08b9..d5345215a870 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -5,11 +5,11 @@ DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101b
 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
-EBUILD protobuf-python-3.15.8.ebuild 1585 BLAKE2B f0f489358adf04d9a88c291cc04bfa5d4eef567ec8be619f97054863ea37da42878a661501d15c8027b20c5d81e9da046f30af56c8b4622453c7b16eee327046 SHA512 7c8fa9c1ad6d4656ffc5abc0633e6142562bc13365a186c2f4398fd63578b81e63a75bb656328513bcf47981314cba5fa56f724b183837c4ee44ee8586b43cac
-EBUILD protobuf-python-3.16.0.ebuild 1590 BLAKE2B 09843dba7ac5025af39e727967bd7b5bf8948a90184bdec6ef0387673cc1d87c3bd7c6f61e031dd6e31bb918b12de815d308b61dc9fd9fe8ece607897cf850f6 SHA512 2210f36588a1c9e560ac4a14312827307aed0f2a93c649a39a9b7bf237c9e21c7372ed4bc807201df51d115324f0a63e59580c59ff32b7021a13d7a524fb2a9e
-EBUILD protobuf-python-3.17.0.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
-EBUILD protobuf-python-3.17.1.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
-EBUILD protobuf-python-3.17.2.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
-EBUILD protobuf-python-3.17.3.ebuild 1593 BLAKE2B 38ec65726b273ec5d9d6f63ac1fc73e4c38f0a4df481a5bd0c7af9acefc71df499ca6f51e2e65a1e7f4411ee2a4174da4f2ea4f8ed6448e0c39e5c69c079fd0e SHA512 4e7756e6e08cfd774f012d97dc42dc071fb09590a87fd956d6fdea97d830b96cbd856057b548d0d35449730d0f7b143ae9428c50a30efe91cfceb2dec62bb4b5
-EBUILD protobuf-python-9999.ebuild 1488 BLAKE2B e2fd094fc844aa663c5601f9c3a4d16889a7ce4c378b06568d9ae6147bd21348b954e75e228cacd7359dc8d4d2ddeb4da8f248f6e41d9c640d598b3493ba4938 SHA512 a8d40bfeef805a8afeb01d51198692fbbfe264315aeb8f9c56baec81686c80b2c4862f49be5c05b638bf1c75efb9395a014c6cddf4c3c8d4c27555eab6131cb2
+EBUILD protobuf-python-3.15.8.ebuild 1583 BLAKE2B 36534a314b41f1c7b78b7acd31d87ffb6bb070de1a6781b672fd810ffd4adf683819953ba042ce602875e1559fbb43ab707af32487efe81926b81b0bdb6e7bd0 SHA512 9f11bfbf328981faee297524d06c13233f59184919960f996627b9a668b8c2d9d12bfeb0091c848c8a77d80ee48483f61fd90b1e5c3b47aef9432c4b4907a405
+EBUILD protobuf-python-3.16.0.ebuild 1588 BLAKE2B f76b36f7e0fa22da7cd828502983f321c088dddd513004ca17b15984ebdba47745d079a727ece997881dbaaf072746e80adadbc594ae813ef52fe9e4610df085 SHA512 6377c4b561b6b7f3f74f4358c6f02509bfa5bac1be0092e4556f54a6309a9d7358b43f76cd6373c79ade95a45ee92abb5d29ff426955e607d57a516a3c79f076
+EBUILD protobuf-python-3.17.0.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
+EBUILD protobuf-python-3.17.1.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
+EBUILD protobuf-python-3.17.2.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a
+EBUILD protobuf-python-3.17.3.ebuild 1591 BLAKE2B fcc7b0c38e2ac007b2d987ce3c72047a402c23cfc90cebbfd6e1073a490032cbfea6222650ac2656583e26dabfdd06ef9d37974e1accfd1a0e7da6fb0e267880 SHA512 29f3b04bf8d151036b102aac5c30480e701938e5cc371b8dca67cc93314fd6a460a5fb070acb058dcbc7089d1be69c88aa9ba20202f139bfe781c48166c4282e
+EBUILD protobuf-python-9999.ebuild 1486 BLAKE2B b00aa33b34d853d471aebdd7309e0a5dd1ddc41bba146ae635ee1e04f3796e33bb3d7e8f0fc47d8b6ee9f09a3d4188cd8f694321d7dfcb161141de6ac9dbeba9 SHA512 73be848bb8795fd20785c4c4b08b41831dd892c34a76f58d5fad0fc42895486cbf76a9e2addebd78af6e303a15f70cebb8642f10745f97930480f1922a580715
 MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
index a58110ae3a52..2fe19c7f5cf5 100644
--- a/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.15.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
index 115530da3f0f..fbe4535581f8 100644
--- a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
index 94a49219ee7a..383ab9947049 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
index 94a49219ee7a..383ab9947049 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
index 94a49219ee7a..383ab9947049 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
index d9e5ad54cb4e..79ee5b7012e0 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index f4642d31c14e..f07439781bb9 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 39e5d5a75b7c..a502a5bcb3eb 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,5 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
-EBUILD pybind11-2.6.2.ebuild 1083 BLAKE2B e0759ff5695ef02f3b5364a6ea88b1cd2a805fa2a346b447f2f82fdad94fd467c233089d123a2c140b4743be45ff9a885f8da3d501c666a4ceeae4fdf8058578 SHA512 5d0ca9e9f74f27203aa45e7cd14d599586c2285fae03afaf72d408f0f6c7a6641b7bc977cdc2e61acc6221344d47a304e151d72abe86d007b2cfaa70a119f29e
+EBUILD pybind11-2.6.2.ebuild 1090 BLAKE2B d257373dc4744344f2e862ae70e35e620e4af9b0947e53ab16255b5d3018defe9860f48f6b72952ee817c7cfade63b3153120500f0a0558553ed5ff7bd39837c SHA512 7ab5833a1cf3a908a0b20ec135926029738a44681ddc346a4c0a5a220cd9ff850bf7ac2739cf25a996e714cc7e34e5ffb604378c1a76dfe0c8f6057e01d75415
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.6.2.ebuild b/dev-python/pybind11/pybind11-2.6.2.ebuild
index f1aa4232d352..72a159eda50f 100644
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 7a60f2b1dee3..296fe17f9baf 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
 DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
 EBUILD pycodestyle-2.6.0.ebuild 897 BLAKE2B aaafde99a58df5a41fde3241fe3427af4b2798cb6862ccb8d15bd0da07035cf23a9e04ed6c48e600e7156d34b98596536ffc3d59dc838e987359baa7a02cdf6f SHA512 6907d9dcfb2611f2c07b56a994c0b75cdf0f4e7694060685071f1f8b1a82195d96b445c1675d235966bf39d02e1c74c9133d44f4b2d95607e58df6b7a2923b86
-EBUILD pycodestyle-2.7.0.ebuild 831 BLAKE2B f948d50648e7aa211aa58f22e882914d7a9e2fcab276acfbb315274c89101c4c2ce09ece1b3494236c8f66ffc61c3eb18e3775087c87fcfdea15c4d7e6d80932 SHA512 2e7dde07ddb3e6ba103631265255cd0d1753acf48cc24d89d1b3bdb627fcc9e88a7634526f37725cfbaef243b091b016c7e3b6aed9813d39fc05e9d868f1e239
+EBUILD pycodestyle-2.7.0.ebuild 838 BLAKE2B 52001ecf3a5d9879e82707f11f46ae1beedbd13fd6ee4e903004498a0bbe7dfcbc4bd984fd65bed12d40355c98ee483506c7d7e7a2a77b3e64964f3dfd7fc1c4 SHA512 73f325ce298d025836ca5e9d4e1f9a035b5c027f933e2b8bcc4cd1b513d4aac108cf67b1353f4eba784509ad950bc5d00c5efc1146e859414913c272b58216b5
 MISC metadata.xml 360 BLAKE2B 87e79216747cc8ad94f6862c47bc9dc89f7f2060f8386f4d7c8cc4ba27ac7da428bd90cb4ba063883e5ed158b82d50276579ea7201ce84bb165fd70018747225 SHA512 45f5de422ab2b65a88d3baa6c87411d4f5bb5adfd7c7d45fe1c28bfd45d8c3ab0b391eca1e5117c1301b32ca62ba023b04199ed5efe13b84d176004ef6ebe3ff
diff --git a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
index 98e490db8c49..83ce4fd2dc67 100644
--- a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~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"
 
 distutils_enable_sphinx docs
 
diff --git a/dev-python/pycurl-requests/Manifest b/dev-python/pycurl-requests/Manifest
index d781e10b2917..ad0899b6b294 100644
--- a/dev-python/pycurl-requests/Manifest
+++ b/dev-python/pycurl-requests/Manifest
@@ -1,4 +1,6 @@
 AUX pycurl-requests-0.2.0-test.patch 1603 BLAKE2B 7f0a8964aaac2e73e5198e8e54f7ef4521c06118002950c58f214f95539f9b1be59a9cbeca7f5a790b05b877cb1d537ff59544ced47954dfebc32c4cd23088fe SHA512 6c9e4d89124ebad203847d1b905572a089faaa1e61bba8ac0105da78a0d906c2c7f602df120009775b3ffd21b522fbc999c521780972fea41c74f65a66cf328b
 DIST pycurl-requests-0.2.0.tar.gz 22962 BLAKE2B 9e28422e910ab88f2f6ace1684cd35a89eccde9eed9d63f48cb2d6f0caa30811016365fbbffc2bdd2dd8b05a3b248142a5822c092c9d40ebaabeed4ef068c659 SHA512 3bf091ff47e376a23f9046dbcc5631199da9434911d4140f5d09e5091b81f05c8cd8094528b7ac7d74f7a4b085a6dfd40bec81c66fde020a0680e2237b7af5b2
+DIST pycurl-requests-0.2.1.tar.gz 24133 BLAKE2B b5994985621096edb4ea16859fe80e2c83221e32145d2ab0a6cb414084de9966df8ff2fbd7b38250b0ee096fb2c7cf98d4632eca814365bcecc5f9d69462fe6a SHA512 83b1052c8f007282aa5a8763ec44b3434604dd0b0b025d2bad0e45117438afdc6d05c2cf94516bbe993eb65bd1dbfac182954c1ff3a641cdb767e8f22c505574
 EBUILD pycurl-requests-0.2.0.ebuild 598 BLAKE2B 36b01ae377faa61ab4af1f4251712f2eca435d6c16dcdc26961fbefb05811c64f9c6887bf3e509f49f63aa4211aef25fbc49c7af60765f061f51d27e9ec13c21 SHA512 9d77670c3bc07c50bb812cc9378346fe159b91ec32f3e607ead5b3e061ac82e64319b77c255bd00a84740fca9333d12ba0013eb504ace1aa6fd6b801e19d1620
-MISC metadata.xml 273 BLAKE2B e63a5ac24d72d1f4d149064a48900b9e8fb5613ee7ac52dc1ece604ededdee3083f6e7eaa88501c4f07aa954ad515cbbf22e0b2b187266f613b7276a9e1874b8 SHA512 0140397ca54e88f4d4cfbf84b87fcfad82e3064358c65f164aae2eab3f0787b568b7ea968fef442c6c6cc0a854f60340bbd02ce6e25b702dea0ce9ba58040683
+EBUILD pycurl-requests-0.2.1.ebuild 779 BLAKE2B 12e963ba6f233a9165e345ed0a41ba8e30803c386048af10987c9788be41e06bc2562ce260e4eb5300bd606f3a467b67f28a38731f00f59ce9c02bb0eb7df5a7 SHA512 0069742f7ad88c206ec01b0f8ca450e5ecb66bcd43a5b050b4865d5c0aca19e60dcfdcb0556dfd57f4553c25ff9af80d4461f38f8b0bbeaad0621e6fc8a0f0ed
+MISC metadata.xml 374 BLAKE2B 403cc45ca53708854b75110f58002b8d739f354c5baf912d14e2241dc380874ed4b3346f138590a5eaecbce202835d217cad3d247330e363a9648592ecb1558e SHA512 8ccf43bdaed7ca073701c3c86a7d3b5fad0d2c55b2a2d7a96d627becc2a5d3c406780fd0681d95b9fb98d68fb1c82edd0513a9821ae4d9b3ff492b53c1edb127
diff --git a/dev-python/pycurl-requests/metadata.xml b/dev-python/pycurl-requests/metadata.xml
index 3fd976494203..18a1acb28b22 100644
--- a/dev-python/pycurl-requests/metadata.xml
+++ b/dev-python/pycurl-requests/metadata.xml
@@ -5,5 +5,9 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild b/dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild
new file mode 100644
index 000000000000..f08e2f6638e1
--- /dev/null
+++ b/dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Requests-compatible interface for PycURL"
+HOMEPAGE="https://github.com/dcoles/pycurl-requests"
+SRC_URI="https://github.com/dcoles/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# network-sandbox
+		pycurl_requests/tests/test_requests.py::test_get_connect_timeout
+		pycurl_requests/tests/test_requests.py::test_get_connect_timeout_urllib3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 2ab5ba3e6651..3ecb9b4229dc 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,3 +1,3 @@
 DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-EBUILD pycurl-7.43.0.6.ebuild 2938 BLAKE2B 1791b80b9588a5d6317d2e6568b02dc211f48c84855252269de84e70a17c7c56c632b7614fe53aec9f804e7dec289ffa9a6aae1b2dab403b96aa05882edb4fa6 SHA512 ac9c0b8ba7b452d7d1e424ea4a01dfac585aef9b5953cd44f1899c18e986bba81893cbb8fe595f86002ac39abe233063dde389a474797a2af752b4641bdeae53
+EBUILD pycurl-7.43.0.6.ebuild 2945 BLAKE2B 91ab9abecb719a80f7bad6f55fdf65494760ac46b1ce46890ffec7d4b65f06cefda60b22a0163a664f4a4b22ffe0458f29955e290ebfcc6fcd134a6e894bd1ab SHA512 c195ea3d041ce9924306e54bcb15158a142df057c3c0bcdebd8d6c2712bd26b64eab858509b414649e4befb433d8a5e8e52b1df87572b0450e688814d4cee9d7
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
index 6614d8660689..7c6638790163 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index c29fcc2448de..fc2936f1f313 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,4 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.1.1.ebuild 802 BLAKE2B f14bef39da122fb745dffc55444f699900a2bde9c5a177f7276ae1f0141486b287d485b1c2a178ad02e16b3b27b9afde0fae5e0f089a1418d6ce099a1f7cfd06 SHA512 83cda62c28713de26fad2585c86bf652dcd9debfe9b995948a647f04010b0d2a575f73e053cf0fd77a9a0f661720a7f22d661e7b6b19e84ad8c375f5cbd93e76
+EBUILD pydocstyle-6.1.1.ebuild 809 BLAKE2B 5baae4dba5e849452a65bb7838b72b2c6438c86294a658113ceeb5a203abb8ce2306cfe97d722993ca8d2090cad33578fa8a4fe22e4e8e73d239b1d5e3b685a7 SHA512 b780272d6457efb7cc65c5ddcccf0900b354c5448fbdb8068c0aa0c3c69e3be8cd19f7f0acb5a570d21ed5f6f0cb660c2703c0ba05748d2377f169b4ef25952e
 MISC metadata.xml 664 BLAKE2B b93a0c28241c15026f0db4098aa48339fa0841e13b38315448dec94d2a7c0b0bf8fbb055bbbed689db92102e5b0379e5765d33f364e8f4b68832c0758ccf769b SHA512 a04b694b6bece73b9abdff12e13f09c691de413e4f8712187fe288f72daa3a8f7629ecd97bf690004c9313cb8d74de2a0109f4684696abb26df116f2a7784b69
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
index 6d90f86cec48..b1d27548c2dd 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index e11699ac59c5..b13efe9e91dc 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,4 +1,4 @@
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
 DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
-EBUILD pygraphviz-1.6.ebuild 1041 BLAKE2B 7fc4224dcf9d2294bdcddbe896855dbd5ba92181884104fd64b7e098771b57a159407febee73d9e1492f49094eb11ec2104c40939bba507e879c6661e1b413a8 SHA512 e6074731fb3649d87d3431c5e6e8f8153776b34b77a32847159da198bf006c5413b6f14fe148741ffe1de3f75ac81d9abe7da963b9a37b418f3155ec47695ad3
+EBUILD pygraphviz-1.6.ebuild 1042 BLAKE2B 392fc308251b392de90723a947174600ed1f2fd9122ae80614f3c6bada46ec56bc57b912d621d520212c9da4527ad0eb5af73ba07cb8683d9df3ecb1c65bb257 SHA512 a31cb0070dd46767a8703b9c721577e351df72a2e8d1e50f19451528dc997116a4cbff57e859227b2ce9ba4cefbbc47556b2335044bf02aa8b1da3b87a4a3bf5
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index 3c05b88c5b7b..7ccdcb7b00c4 100644
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 0718eb3faabd..cbd31b46af6c 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1304 BLAKE2B f4298e8b8ee59b1c0f8121e55e4779d15853805494d268e438738f2e03751ea423c704f3c484e83eaa4a47f18826208d3f98d6d27133ac832b9d8271b3cd308d SHA512 742554f01820592ed8893c33a50b6fcefe1f422625816329b0450130da1ed0407e9e2134af6ebfc0dc6eee2bc1f6b03ec5c188d64c77031112a21107702f6f2d
+EBUILD pylama-7.7.1-r1.ebuild 1311 BLAKE2B 49fb4dfb38d4d761fc6628926d093bb1867d3530b1480ae56e1b48747afbdab226cd7a3d7ac5a60aef92bc7fc12a65f5d6918d3d3fcb1c5de87cbb1047ceb9b2 SHA512 31a6d6f2f2767e0b666b634b47151afde7e2d371cbb148de51774a02f956d75efbdcb3f8e6b8077f4746c717a949c9a285ee0cfb0aff095c53b54e6d88f49fc9
 MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index ac4144373038..3bc25306acac 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-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"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 02db63603976..fa7c986b0f21 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD pylev-1.4.0.ebuild 424 BLAKE2B e7dedf5db044b2d043ddf13477922339ab19f4168529fe9c639d26530ed76ebe3c3de0898e610c8dc459d668ad022d99d7980970c13fc18359a1279e5bf2ed49 SHA512 9354ce56aff8caadea6ea3fe98712653eb126a60377d5f0db0905dfe33a9824d4cc5fa027957db79485bb26ca156fd88e2a4f9477c1eeeb9db57083f9f9d77af
+EBUILD pylev-1.4.0.ebuild 422 BLAKE2B 2346c62c28346c1abf1f19f39814a98f7c3f7239110868fd7cc58e4cfaf310dbcf299ac09de820d76bf4dee4f63c26de82376a9743b5546f80da76d6ff0f1753 SHA512 4acff3b697180f3372cff5cbe5efcf854eb4af20b91254d2d713645c2cb62a164ad273fc7851ff3af22cf11c9b9ec732a66e685648ec118c51e6445a096fdab7
 MISC metadata.xml 673 BLAKE2B f0ceba167d8629c9c70267f6d54e1a68f40f099a61d4f89703af2a846f7dd806fa21a194e3f65b421c5da1cd0d32c0a80943a420ce848375c2a6275d95a36365 SHA512 3d6249d4556c2726fdf1ad2fed72dedef901684a18815cab5d93a03553a6548cf5545644911a736181cd85d6ede78d04754420a3fc002ee8a7e68eb5bf5142c3
diff --git a/dev-python/pylev/pylev-1.2.0.ebuild b/dev-python/pylev/pylev-1.2.0.ebuild
deleted file mode 100644
index 4c9d4648c592..000000000000
--- a/dev-python/pylev/pylev-1.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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} )
-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/pylev/pylev-1.4.0.ebuild b/dev-python/pylev/pylev-1.4.0.ebuild
index b15eb286215b..a5db68b2d76c 100644
--- a/dev-python/pylev/pylev-1.4.0.ebuild
+++ b/dev-python/pylev/pylev-1.4.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 1760cb3b0f19..20bf7920c5b1 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,4 +1,10 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
-EBUILD pylint-2.8.2.ebuild 1740 BLAKE2B c1199f66ba7c0f97bd8a91b50d754564b953b23098f590c4d170c15ca0e8642dca414d973971986e9e2e6153dec9af6a5db0c67e551b9cc981c5a7bced2cd239 SHA512 8cb67e64d73deb35206ae787116a8f295c050ee6c9c1b496beace4f08b026e2b50ef6ce3c4c9579bd97b781b402cfb14467f92e73c679110d4aaf7a189b21ec7
+DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
+DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
+DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
+EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B a3bb2622c8b0c0efc01f6a768b1810f4c2e5abced9f64d74bfde68262ec499bb2b27f92ca54d53e90c56ddb285e1aa557cde18a1aeece020d6635a601847dfe8 SHA512 7dcc3c7ee9bbfef1251fd49e94e8ec4298c000fa3765fd63ed8737acaf33a59ea36ea655367685c2031eb2ac39e1a604db3d865ec5a2aa54a2b8f368a5e458b0
+EBUILD pylint-2.9.0.ebuild 1614 BLAKE2B e80781de4e7f7659a3ed4eb7b97babc20016788f817f8f46ccada5fc51125523b025b86328b3dae86db97bca1f04ea571318deb691db8ff9740608ce5413c7b8 SHA512 d268f97c235d15eb981eb9c68d3f21837ff3df5b87f7f9a1a7febffda82d1bc99c6a3a9e8fdd470ae523ece06ca351ec232eecd3adac8db3ba098fb320f490c3
+EBUILD pylint-2.9.1.ebuild 1417 BLAKE2B 5bc256a51f5f1789798601c125f28ca97f91de685cc955d687ebfecbb4acd3034f23c722356d2f8e8ba0e5b1aa1c2f7c396a06c5f9458d2ebfc2217cc870b406 SHA512 8508781be857a114574609adf5cf483e199ba21d5fb95a1e553ebf3c9a2a84d683852646498bf9d794d5a0e719206f5dc854e72cbebf402e41f4bb90ec28f367
+EBUILD pylint-2.9.3.ebuild 1424 BLAKE2B 52fa7d9843bba9a2a65c6fff4c724be00f92971707aee9ce9ce601bc8b4beb8ef29366b3be202e773b4f8fcfde58f14afb36061d6a8c7a6d41ebd9cdbfbc725d SHA512 d9721d86a998d9c5f0942a005718d5f71178747916d96b8fc8d170d52fd39b41f7dc6032751d901cdf9f737a41b3c8d4781b9481eb24438aa3543b270c1e2613
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.8.2.ebuild b/dev-python/pylint/pylint-2.8.2.ebuild
index 0b5c78e0158d..9397b75c7271 100644
--- a/dev-python/pylint/pylint-2.8.2.ebuild
+++ b/dev-python/pylint/pylint-2.8.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-2.9.0.ebuild b/dev-python/pylint/pylint-2.9.0.ebuild
new file mode 100644
index 000000000000..b874f1067834
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+		# Fails when graphviz is installed (?!)
+#		tests/test_import_graph.py::test_missing_graphviz
+		# TODO
+#		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.9.1.ebuild b/dev-python/pylint/pylint-2.9.1.ebuild
new file mode 100644
index 000000000000..72070de692f4
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
new file mode 100644
index 000000000000..e32124a3c572
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index c51c7cd6f13a..ce833137140c 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,7 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
 DIST pyopencl-2021.2.3.tar.gz 450895 BLAKE2B 0395ee6ef32baa57fe9df0c9960f5d761cfced1cc8b87e51e7ebcc7cda6a6b651fc491acf6be525239576fedec2a8375935799fc77568e131dcb26436a59c6f1 SHA512 41ef44eac0112ceac15c1260198a0bd642c244f3ad45aa1d7feba70b55a3f257ce01f7c5a8eaf2ce1df263492452055286caad004101d8bdb2d4f7307fb339be
+DIST pyopencl-2021.2.5.tar.gz 449527 BLAKE2B 922970c6aa93d2ce600c1e107fa3303c42bd44a264f7c38b30c8d2c909ec12e4cf8fa21dbaffa558c7b183141802ac13fe1a1032230b611b56503cfbaeae40c1 SHA512 a8784e0c6ae9a3c2d8f463405d5bbfe4ac1df138fd5f1ca8ce622afaab787333574c6ee8f4a828c09dc36c1b7a5df8fbe5d70e2236be32d457c3e1cbdeb880e5
 EBUILD pyopencl-2021.1.3.ebuild 1491 BLAKE2B 627fcf87c2a199260cb4697729d7fffe01dd0da7e0146fe6c981a7e2673c97496bfb1d90fd5c7354b64bb7a7f871d46b692855db6111f9cb4f559595de0f90f0 SHA512 820bbe51273f64d1f5aa2e781e68baebbc6ebe014b281b3c477876442e9a218d3cdad26b693aaacf48fba07df450d4c754b7356c140c553de9e6908b6af6447e
 EBUILD pyopencl-2021.2.3.ebuild 1495 BLAKE2B 31a08609895d8c8f7f7e3578bc02a13d4be00b0bfc3c18fa72790b61294e8b139aafe497e9acbc3aef4556b001bbab8189a6032b116a76e82d2bd36ba4c78f84 SHA512 8aa8bc4ab3bf426cab9e441489c0d537e51306ebef8a5fe2d26f7e6cb37599defd807ec140611c5d0fdc6e6a139ab84eb8d8a80bbbd43820b71bd8dd04863571
+EBUILD pyopencl-2021.2.5.ebuild 1405 BLAKE2B 68d74cea97af5cdaf30ab8ec8305410f1b9cb64bc5763429111c0a818e7da8ecad1de916779acc8f4a2ee0b1195205938d325a61cc5a55ec31eb0fe685d8742f SHA512 99ae298854a27a57682f2932b952d5e0b34f0c5a7056bccc06169a37421304bcd9e5a2232ddd730f83018a1f46a5e07ce7926bee7e51ff96f46b5019eb5a87d4
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.2.5.ebuild b/dev-python/pyopencl/pyopencl-2021.2.5.ebuild
new file mode 100644
index 000000000000..9c4b6ac92a78
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2021.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
+RDEPEND="${COMMON}
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+DEPEND="${COMMON}
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index f46f7aaf4ab2..71dda05af4de 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +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
+EBUILD pyproj-3.1.0.ebuild 1439 BLAKE2B aff436fb0e36addbdef3ab39834b4db2acd560f66e4743e9304076e8d599e83e413b44f9b5dd60236f24afe38c8bd71214a38aea0c828174521f3a527475fcee SHA512 8b7a1714ee9df21959093a83edb5783ffa6a8fe2300c45c897472946b479a036ef82c38a193ac984c9c3b8f895363dec473580586235794481d16d6e75739f97
 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
index 6061e44b117b..4ae225d10ca6 100644
--- a/dev-python/pyproj/pyproj-3.1.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.1.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-7.2.0:="
 BDEPEND="
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 1a5e34c8f5d6..234b50ec336a 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
 DIST pyrsistent-0.18.0.tar.gz 104215 BLAKE2B 028c26a6b4bcaa8c3e3e1ad1748a6b45f664355c66f0f97c70e4d26c66946a55b346d0340c2e697e9890039692580c03032055cab7c198c39530e5561be83801 SHA512 f56062430f914a884a9317ecf5278ccc09d98f1d6867716f89173db47996b8d4c1ef4f5c0121c955d81fc4fe8aba7d30f38679baea6208168c3952846064cfeb
 EBUILD pyrsistent-0.17.3.ebuild 603 BLAKE2B 176343e3253e7f347dbea0f041d2cce8fff737a077966ff35a9732ff41960af3becc8bdbe7f3ffe0576009dca09855a093ecbe1c71faca9a0df131835f819087 SHA512 4e3b82ad673aaa549926ba6816a4554f26f8cdf514987894b8f0b0aad31602870bce140c2224fd4d70ecc8dfd6812ffea377651424db349818906a1320d2987a
-EBUILD pyrsistent-0.18.0.ebuild 610 BLAKE2B d1b0db46505e54524dbf865ce9ad3fb9fb9510b386893faf0d15d3c61bb427210d5221ad989abbcf8a8a497d8dbbe59a4309ec4d91f2149a1347dc3d5f59b50e SHA512 430a05a93db3aa6609e71dc7938915d051f44fbfbaa61cace01ce3ce8421b977573d3f987c30355d7291000c4fb861be4d81d27137818b184b771cd81c68e189
+EBUILD pyrsistent-0.18.0.ebuild 617 BLAKE2B 562148956ac37a37b17c9d83c2ed161726c8bfa13042e08b928bb17b789cd5b9b3a980bc8c607cddf671897d604f61cfc46e8bb1f7c50796ee1aef1369696c56 SHA512 114aeea0aed9d8c38385da6255f59d3c4a9bcb9433596c3233ff887fa039c7a0c9eb66986ca07774628830044d6c3e24712d26760a59c5bb577a10759df4044e
 MISC metadata.xml 521 BLAKE2B 45117f7fb0cdd4111f444279144a45d49984102e114ba758260dc69b313ec818a4556a57a682f6762522a71a810855ead85ee667dd7524de16d97b37b77d5cf2 SHA512 f16890488984b1d31c74bb697f38d0d880390f8633347db56ef4633e77f502bfa56d9427ac55bd0da4d3edc6e8e1897f6e76b37ba75d3b4b738217607e0883fd
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
index 2fdd1872803e..4fe274805501 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index c11d6ce96e30..e6466507392d 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,11 +1,7 @@
 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
 DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
-EBUILD pysimdjson-3.1.1-r1.ebuild 512 BLAKE2B ab3793c04071be9c51237465b83fbabbf1593666f00931d1e80379541aea51da4b39b7f5bba340594ae3326c07fc95ebcdeb5bc62e29edd2995b63436fd7ba1d SHA512 93a8e90cdd78ceb402252604e8191047d653ea8409c90c017d11ce55fb16aab6453bf5a9dbbe17abb69f5a63d54cc78a7c058d710457346131744b7ce0ce0a95
-EBUILD pysimdjson-3.2.0.ebuild 516 BLAKE2B 0da10517c85e0eb5ce240c67b34252b84b5cbcf563fa960f2e8ba211218b4caf65412873f6a905284f58a490edf7944a8d8e39d3f8c681f11fb46895b64d9b68 SHA512 5f93df21da251b9eff510c518976e7de6f543b0bb20f481cf51c309e77aad56fe813220dec6f15b6d834b2b096810ece317caee9fe77aabea5d5a714d85778e6
-EBUILD pysimdjson-4.0.0-r1.ebuild 926 BLAKE2B e5f293ed566d8950148e2875f81de146cf56ca2b541d96071f86b6478398788041ff44358fe6dffc7da751c0bfbf56f9e9a071ba7961b1df3f0eed309c52442e SHA512 3e89557d79dbc476a5e737bbf1f8010b3d2c2a4bfc5a5eb45c27194d20e4db9fd26e2cf4c98a536b6c7d0f808d1f1ced5955811b953ea77565868be83e9fa38a
+EBUILD pysimdjson-4.0.0-r1.ebuild 925 BLAKE2B 9aef9bac15f86da401c3f2bbb2f53b7aa298bd8029ce8c91f5ceca7a5833b7ae0b9f3aca640cafefa746c408238fc53171742700fb668a3cff8648ed324e04ea SHA512 b22a40c50398deba7963732ea3360e967ff3bafd61b241cc12e1336f2c96da2fc91050f233689909c269247918213df2e0be932663a7f1e0f4d8dccc97da7ce4
 EBUILD pysimdjson-4.0.2.ebuild 876 BLAKE2B 3550d2f007405e291529f831ee7302cde9d81256ab19b6f9df45edb6f98547246888a3c899abea294e6332dd7d1df3bee8045d5793e746a0d229d8df593f6665 SHA512 f0b347a610eac7b6e21c1fd8b33798441694d69169df39c206d410c387c985b47d87552ca3dbd15c79baa2476aae34f2bc7194f5f53e46a77370557af913d152
 MISC metadata.xml 423 BLAKE2B 06f368507ce8309c6d7b2e2695fdfea636bb503444683450c76f8bc6f8ad7da8b7a0fdcf8ca478445dba7148bc2faad9a5c9f66026777be2c408c3765bf22267 SHA512 b24e60e618e2b4c74ec4a755e99faa0966156ceb188ae5c97feedbfc1d7c19fda73913632b977fe9a5f2ee4261c55b1c0df3488fe7303fe3b9e581cf57979f2b
diff --git a/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild b/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
deleted file mode 100644
index 24c3dc44ff9b..000000000000
--- a/dev-python/pysimdjson/pysimdjson-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="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
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6.1[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
diff --git a/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild b/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
deleted file mode 100644
index d3472efd5e22..000000000000
--- a/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
+++ /dev/null
@@ -1,23 +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="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
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6.1[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
index 165fcadc2520..e2b6c28fb206 100644
--- a/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-4.0.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/simdjson:=
diff --git a/dev-python/pyspectrum2/Manifest b/dev-python/pyspectrum2/Manifest
index 317cb0ed82b9..8846f958ac01 100644
--- a/dev-python/pyspectrum2/Manifest
+++ b/dev-python/pyspectrum2/Manifest
@@ -1,3 +1,3 @@
 DIST pyspectrum2-0.2.0.tar.gz 31500 BLAKE2B 230329f9b1f12c7f7cff234b95d9715609cd0922c6c833726dfe72e7da0ba646e8d059d2f42d70fb97c8cb755436307369336551d44bf7954f2281f49d03ea6f SHA512 40c9f7dda808fd5bca05026b7418022b660d53b6ef52d684885ed04a47185ce2d1e2988bff5b874977c736bf5cf75f10f9daf752475504327844d4f1948f2286
-EBUILD pyspectrum2-0.2.0.ebuild 619 BLAKE2B d1aff86f37f521cac766e9d428125c7a34cd81efa601fcf6dc4b1442c4a07cff1df3802a52c959510c798c17499936b5999c06211dcca17b07d3ec08e9b9bf50 SHA512 acd90916897312c94591aac7227bf221deb01cb69a221540c85e807fb44dd425cfeee86e52b61cfda4918996351dd126d295eb740f24780d58928f3f236b1911
+EBUILD pyspectrum2-0.2.0.ebuild 620 BLAKE2B e488952a6a5236f286f49b7b2276142e7f32fd62eba5e4fa17c69cc0cde08d85bdd1ef7a841c9dfc4313b1892205e2258425510dbb56c1f6fe5d1804214f7404 SHA512 149425cef90d3272af5a280fe6d50a879a677780008a56bcf52f51079b858ad975495775f35bfa881db05368946fec018e51281ec82e28d5151f28473999e1e9
 MISC metadata.xml 609 BLAKE2B 609cfa772b81ac1c1714018286226855aedbb3c4cec8ac899aa9061123ce42591a8584b79876c9f09ae0a02f08a3003f14986133712e801591c6ef712874e772 SHA512 5df36f1bbc0362891209ece8109d6c8857b19b723528a5d10c15ba255d54df2e9161ab94e9231b55c1dca2d5e55e138bb2cfaa889fba47a257d435f7cf05be14
diff --git a/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild b/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
index aee33884dac7..3e0e86cc3461 100644
--- a/dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
+++ b/dev-python/pyspectrum2/pyspectrum2-0.2.0.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index bb9e29d58196..4348f8a4fcff 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,7 @@
 AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e771824417ab51b2b7c4f1a8659ce99b727f5c6b6295142c88a8c7ce6a78eb21c3c697ab392e529bd63d04a12bce431768923 SHA512 22e34ed59ad6f3c0ee253e03e5b86e76a9cd4453e27e5aacdc82090b17b7bfaa5f38fb314b75a824b3fe72a7641fac5704255ee98e582a55ff959771ed4d4f03
+AUX pysvn-1.9.13-respect-flags.patch 5843 BLAKE2B 0759be0ccdcdd96fb2d33591772ac399baf46b37186835ecc1f13cf51cbff85d552270afc30240299a1c27cca5df99e9d97a578b0b70c18f9227bec8fbfb245a SHA512 23c7f16f3e1fa9d1ae99360903736232d09ad66591e6c49ae342d33dbd0d27f5a85584d2a4652023425963480773a3b9c0d604905d91192f399c573b06f67fa0
 DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
+DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73dd0a4db0dd0c2838cc029976d5886462705c8b6aa85c5a6f8081f94df61bcbc1698879537fbeb3125154c1a0 SHA512 26ce9af363efb1aee25f8ed73e5bab56208523cb3e7cbe657a5f1145bc3500b2f370b4dfebf4eaace9f566f5676b053c41acb4d01458e4d6b79bd852ac260aa7
 EBUILD pysvn-1.9.11.ebuild 1324 BLAKE2B a4ba06214b0f6343ff0c8af7c86857cd9565c10dcf24a70445bd7c1627828b4abf0afa015e58df190b74b6b7aae48b9fd06278b3e657988d5a7f4abeb0a1ec41 SHA512 66fcd0af0e02c94a7338db96a4fe6a29f955be2ce23f7eb580996e695d727f32985b96db1e35a318be54fce628b931e2387ba9d48de8a3155a13a1d236e0f432
+EBUILD pysvn-1.9.13.ebuild 1750 BLAKE2B 13751eb3b69b91a47b3939eb8d793c412955a5d5db88e9fde574cce071583a04b5f8b0fc6b77fd17dbade1039f2afbf59bb5a5c829f6a9d5417783effd7f11f3 SHA512 9a75ae9734ac1028e80ee6f0627b42f44d7551cc1cac15815f0bf0cd70ab2bfc2941427294e17455e3972dad54a874482398908aec822e5c60e3e055a1abe12b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch b/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch
new file mode 100644
index 000000000000..4070ba6487ad
--- /dev/null
+++ b/dev-python/pysvn/files/pysvn-1.9.13-respect-flags.patch
@@ -0,0 +1,124 @@
+From 9f1d90d7b6ece865af2a23fa412e205cedba4fd4 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 3 Jul 2021 11:48:09 +0200
+Subject: [PATCH] Respect CC, CXX, LDFLAGS
+
+---
+ Patches/test_proplist.mak |  4 ++--
+ Source/setup_configure.py | 24 ++++++++++--------------
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/Patches/test_proplist.mak b/Patches/test_proplist.mak
+index 9d9a58a..02e7a68 100644
+--- a/Patches/test_proplist.mak
++++ b/Patches/test_proplist.mak
+@@ -2,7 +2,7 @@ CCCFLAGS=-fPIC -fexceptions -frtti -I$(SVN_INC) -I$(APR_INC)
+ LDLIBS=-L$(SVN_LIB) -lsvn_client-1 -lapr-0
+ 
+ test_proplist: test_proplist.o
+-	g++ -g -o test_proplist test_proplist.o $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o test_proplist test_proplist.o $(LDLIBS)
+ 
+ test_proplist.o: test_proplist.cpp
+-	g++ -c -g $(CCCFLAGS) -o $@ $<
++	$(CXX) -c $(LDFLAGS) $(CCCFLAGS) -o $@ $<
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index 72c2c8e..fbe6936 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -891,8 +891,8 @@ class CompilerGCC(Compiler):
+     def __init__( self, setup ):
+         Compiler.__init__( self, setup )
+ 
+-        self._addVar( 'CCC',            'g++' )
+-        self._addVar( 'CC',             'gcc' )
++        self._addVar( 'CCC',            '$(CXX)' )
++        self._addVar( 'CC',             '$(CC)' )
+ 
+     def getPythonExtensionFileExt( self ):
+         return '.so'
+@@ -1034,8 +1034,8 @@ class MacOsxCompilerGCC(CompilerGCC):
+         else:
+             arch_options = ''
+ 
+-        self._addVar( 'CCC',            'g++ %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
+-        self._addVar( 'CC',             'gcc %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
++        self._addVar( 'CCC',            '$(CXX) %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
++        self._addVar( 'CC',             '$(CC) %s -mmacosx-version-min=%s' % (arch_options, self.macosx_deployment_target) )
+ 
+         self._find_paths_pycxx_dir = [
+                         '../Import/pycxx-%d.%d.%d' % min_pycxx_version,
+@@ -1101,11 +1101,10 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         # Support building in a virtualenv.
+@@ -1129,7 +1128,6 @@ class MacOsxCompilerGCC(CompilerGCC):
+         self._addVar( 'PYTHON_INC',         distutils.sysconfig.get_python_inc() )
+ 
+         py_cflags_list = [
+-                    '-g',
+                     '-Wall -fPIC',
+                     '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
+                     '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
+@@ -1159,7 +1157,7 @@ class MacOsxCompilerGCC(CompilerGCC):
+ 
+         if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ):
+             # preferred link method on homebrew for pysvn
+-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
++            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
+                                         '-framework System '
+                                         '-framework CoreFoundation '
+                                         '-framework Kerberos '
+@@ -1167,7 +1165,7 @@ class MacOsxCompilerGCC(CompilerGCC):
+                                         '-undefined dynamic_lookup '
+                                         '%(LDLIBS)s' )
+         else:
+-            self._addVar( 'LDSHARED',   '%(CCC)s -bundle -g '
++            self._addVar( 'LDSHARED',   '%(CCC)s -bundle $(LDFLAGS) '
+                                         '-framework System '
+                                         '%(PYTHON_FRAMEWORK)s '
+                                         '-framework CoreFoundation '
+@@ -1240,11 +1238,10 @@ class UnixCompilerGCC(CompilerGCC):
+ 
+     def setupUtilities( self ):
+         self._addVar( 'CCCFLAGS',
+-                                        '-g  '
+                                         '-Wall -fPIC -fexceptions -frtti '
+                                         '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
+                                         '-D%(DEBUG)s' )
+-        self._addVar( 'LDEXE',          '%(CCC)s -g' )
++        self._addVar( 'LDEXE',          '%(CCC)s $(LDFLAGS)' )
+ 
+     def setupPySvn( self ):
+         self._pysvnModuleSetup()
+@@ -1272,8 +1269,7 @@ class UnixCompilerGCC(CompilerGCC):
+         py_cflags_list.extend( self._getDefines( '-D%s' ) )
+ 
+         if self.options.hasOption( '--enable-debug' ):
+-            print( 'Info: Debug enabled' )
+-            py_cflags_list.append( '-g' )
++            print( 'Info: --enable-debug ignored' )
+ 
+         if self.options.hasOption( '--disable-deprecated-functions-warnings' ):
+             print( 'Info: Disable deprecated functions warnings' )
+@@ -1282,7 +1278,7 @@ class UnixCompilerGCC(CompilerGCC):
+         self._addVar( 'CCFLAGS',    ' '.join( py_cflags_list ) )
+         self._addVar( 'CCCFLAGS',   ' '.join( py_cflags_list+['-fexceptions -frtti'] ) )
+         self._addVar( 'LDLIBS',     ' '.join( self._getLdLibs() ) )
+-        self._addVar( 'LDSHARED',   '%(CCC)s -shared -g' )
++        self._addVar( 'LDSHARED',   '%(CCC)s -shared $(LDFLAGS)' )
+ 
+ #--------------------------------------------------------------------------------
+ class LinuxCompilerGCC(UnixCompilerGCC):
+-- 
+2.32.0
+
diff --git a/dev-python/pysvn/pysvn-1.9.13.ebuild b/dev-python/pysvn/pysvn-1.9.13.ebuild
new file mode 100644
index 000000000000..6ed9ff4b7d38
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.9.13.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_IN_SOURCE_BUILD=true
+DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="https://pysvn.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
+	>=dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch )
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	# all config options from 1.7.6 are all already set
+	esetup.py configure
+
+	# Build system mis-assumes that we have a local SVN checkout
+	# that we can query using command "svnversion -c ..".
+	# Revision 2061 is release 1.9.13 according to
+	# https://sourceforge.net/p/pysvn/code/2061/
+	echo $'#! /bin/sh\necho 2061' > "${T}"/fake_svnversion.sh || die
+	chmod a+x "${T}"/fake_svnversion.sh || die
+}
+
+python_compile() {
+	cd Source || die
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		WC_SVNVERSION="${T}/fake_svnversion.sh"
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index f09d9ba94cbc..05c402532331 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-rerunfailures-10.0.tar.gz 12706 BLAKE2B fb445acd6324a377258ebcd32255bd725dc78f2209990e5807a0553da259ffc101969b7572799efa5041ae68bcc264ab80581cf9d9943ab81d9b158a15dd71d5 SHA512 83270e18cc3f825c0e0184950a149899b99a2b46cfaa6ca1c82b7cf388144265831fc2b8b82ccebb5df57463219cb7e0b41f5beb049feedcba90ae6d48d1e05f
+DIST pytest-rerunfailures-10.1.tar.gz 13644 BLAKE2B 05b654128cbc94be803d15e038cdfcaa3879dbc43eb57dcf5cc3f5e52d0e4848a38b70048b32eb5afc99bcaec614abe6febfa95e4e8f7c7e07f6dc71dcdc3915 SHA512 9aa825c7fb1fb36edb78f1cdfc4a5f705e1688d00be0cd311e5cdf542698a2e03eed15b526235e2a35262000ce24923ea1049f3efa449c9a3723a2a5c1316717
 DIST pytest-rerunfailures-9.1.1.tar.gz 12435 BLAKE2B b2118fe9460ebb750c72b05762d70cf53703e4c9982c6343ef02ebcec6630598ac98998ff994268b9108bd6850e71fd5b9cde1d0abb727d33fad238e9b26fa61 SHA512 875591306ab010494ccbb865ea6445ab37422fce9105260d9495215af44057210564aca4fed3b4765b5a30c1cbef120de716d15d10a6db91dcb7d9f5b4f3b102
 EBUILD pytest-rerunfailures-10.0.ebuild 600 BLAKE2B 546087e808686702010fefdbc3f90786ef4486f5e3fa4dd7276171e223ed78af3893145d74e85cd5c54dac0b35d72ee61ba3fac6f35d3fdc0261138f187f923e SHA512 7fbc09b8a36a110992303cc7a44a9270df613dc30df5aa223ebaadc0b80949bc168ab8b78386aa7dda332fa573502c8f73a40bf9b0204c5065de715bcf6ec746
+EBUILD pytest-rerunfailures-10.1.ebuild 600 BLAKE2B 0da09625c6f6107b51e8439ef6406c129cea63ae351c8c135562067bec194898c3979251c984b5c0424eaca725327610e1dc25ef37eb61a82b1f0a7954f3ce39 SHA512 41211c505ff5669c4bd94b45bf195bf6d2ff2878fc53be35119f4a7fbfde189617b5fadc1191ec600de003175ed8e9ac117ff642aa334676584eba23e29be6f0
 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/pytest-rerunfailures-10.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
new file mode 100644
index 000000000000..9f3b71d0d77b
--- /dev/null
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+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-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 403a131c6866..8316192eb8c0 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-subtests-0.4.0.tar.gz 9673 BLAKE2B 780fbbdc6d4ac88c87002ee14323a0dd1036ab3dadc14b79ef11982459c60635add77e97575521ba0bda61317582e090353b427d945eca7198e294eb3d895240 SHA512 00302f47d1699e053314b6b4eee7c84a04fe0f51f287e338374bbd518c7d245d839ea0f1ccf50d4f35c86138cf6ea36da26e67bf41295205fb38323f2ad89f89
 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
+EBUILD pytest-subtests-0.5.0.ebuild 920 BLAKE2B 758191563212f5086dca9396df801ee6889ee69414c3a8cd1543a954d80b7e5cc36c4799f215caafccc2d7f2fb8735b6801f207d1e8a3b19787f3ac4337dbc5f SHA512 120b66684fb9219f4eac5e6c373ab7ae7d29bde2b393450909473dc9282c336c89315a04439447ba7ae70ae44a77f33fff9c262e3691115cbfcba946a79be347
 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
deleted file mode 100644
index 96ccd96fda1b..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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-subtests/pytest-subtests-0.5.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
index 0182bfadbb1c..96ccd96fda1b 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~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-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 14ba19ad621a..71512b020e78 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-testinfra-6.3.0.tar.gz 76309 BLAKE2B 95b4a6ac5ea3c3db2afdd537209bfeb2c188ec7c7935b73e831733fbbf2540b8769d1187338b3b9c9da997cd653e800004e7199537d95530967cd73a15cb2c2e SHA512 ff0add6bdadac92f6f997a94734d69d39598bc8d1f7689a6b269e59bc886825fcf8a42968c2d34a9ad7e77ed0112bf4044afede8e0dca2bbddc76c9c5612ae92
+DIST pytest-testinfra-6.4.0.tar.gz 77516 BLAKE2B 2baf5940e8736cbe78d8017a82b3a8fdb6df95b89acccd49ecd354447b7ea88079f48211e0acea46a0d8702b67609fe6f85f730c66e781a99d8a92b52b3c99b9 SHA512 acd2c7f9daeb391815a32c972a3542c0d643a716f3cffcb66f4203435ebac789333edb91c83d2778ae8da93b676b245fd47821bca9218faa3e7b50e6764087f4
 EBUILD pytest-testinfra-6.3.0.ebuild 894 BLAKE2B 3a4b17c1d33bd23982f78a4797c21e23aa2b54d33f9feba4a19a071954cc69a3143a544b60aa07c46c7a08aa2529cbabf6ef19f083357ab28928a18623ad9a4b SHA512 d58c5fd2fef7b6dea76b52c807c370bf64abdaccef78b6bc401d567d8c257f3f49f06f3d3f79dc89d47031f9da0fd879b5e97070449a2bfe9cb2675cb17b5528
+EBUILD pytest-testinfra-6.4.0.ebuild 894 BLAKE2B 1027b8c0a4d13d2db3612bd989f32414316fef63fb7a265682ae8dc5b992f886e6c2592f2645789abdf70bad3a4a12742c584645bbce974fe513b680cc5890cc SHA512 2b957be685f8e7961aa05093dfaa14783e79107becf42c6668a7b3c0d75b660bff45c05ac9f7f9c50e4c2cf068cefb8d3e4d6f78477ac5f9553ae8478c0438e0
 MISC metadata.xml 679 BLAKE2B 288c8de180a7dca25dd78c05228bc045480fb675a6968f24e35daf4d5b89433d040d0457d8276284019632aaf7fec979e7bf52328d08b4dd9ca1512c00add0a9 SHA512 8163d5d60f43e615e40ccaa4354713765b5a666a802b18373d06cb7d8c7f35a3b2258678f9137d0547916fa766269c5bb21c88f5b43b029e9aa24a9dddfc81f9
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild
new file mode 100644
index 000000000000..c336646d0373
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+# Ansible is called via its CLI
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		app-admin/salt[${PYTHON_USEDEP}]
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog "For the list of available connection back-ends and their dependencies,"
+	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
+}
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index f82fca0dbf48..eb8f7925d33a 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 542 BLAKE2B c9578b89b2a814d0e3f195dad858a286de51feac30807de4f27dcd8ee4dd2a89b0eaa95a240fc073a506425890e55af40344e117e3568bea803191c4b3d6144a SHA512 192883b2521edb7295414ef232d4e6f2fdac7045124f788937078dd25cf3d89e5b656a6c0a587552d6587ae6090f06557eef4785e76effda2be4fc7eca040cae
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 542 BLAKE2B 869295a960b34e60038ab3cdbde67f8bb56692ebbf44bf258192d6ecdb328573e298b1c22caa5271992c73ef78f157df692c99f3cb958e0d580acbed15050039 SHA512 cbb1ad30125b3da45b9c302f28360cd2f8bc56b761a3aaa1957b70d51d66395d158639795d416bff215f9ee3fb05c9eee29c4173570a9d7c475e5bd5c4420302
 MISC metadata.xml 821 BLAKE2B b58ea7e5dfaf7da6d01671cc94267ee94c38ee5ca5bb88f7364a48bb32468c11c36ac2f8749e019a739450a12df8e5dc69f7459e05d7e8bb2ef9b207f46b9478 SHA512 6bbec8c72bb8f08be1923d7ab5da3748d3cc69e0e04abc6b051678725efea302b8629cc47ba9d3afc068daa27ba5cd3998b9743752cbe80380a1a4d5c8770e38
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index 58766f762918..a6e2dad417c8 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,9 +13,8 @@ MY_PV="${PV/_p/-}"
 DESCRIPTION="A python wrapper for the curve25519 library with ed25519 signatures"
 HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
 SRC_URI="https://github.com/tgalal/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 0a78f8481edf..1696498eff7d 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.2.3-r1.ebuild 645 BLAKE2B 3c06fde673563c1136decc55786ae75f707cdc6b3a62f266f1041d2bb2056a2c658f9481074412b111c793faca9abbc3e3c9e71fe8a375134c34f0aadeb701cf SHA512 a07e7e662b845fd4f52b267d38daadeab25dffcd0acf054a7a1047b80bf790fcdfe68934bd7956fda00e85a358ee5d28a4604a991d09e0476af7fa2f076b39ce
+EBUILD python-axolotl-0.2.3-r1.ebuild 646 BLAKE2B 5244f7a64fb5efef8f3164c453d5b77967d109277c251d578ce6f83d86a0bbcef0c795dbf1ab6afcaff8c0f9aec42f5e57e4639bc69168a652f034cbf934845d SHA512 c8f8e3a9b103ee6e076664a3c2eaf632de24287604c0cc2978484b09ba6e2619f836b4ae832ff991719f1e9f42ad5603e9d5e10cc7256f3dd79ca54a2c80bc62
 MISC metadata.xml 782 BLAKE2B 0053ca1ef77a9b8a0adada68f3b8ac61774fea55d71b730f98ef7f1929fe5f00a5df8863d4c272d184bf9181189142d5757c67548855bec0ef0907397ce57fc1 SHA512 adabd12c0d63ccfff8925cf272a8142c2a87ba0ba74863df20a9c464f550134e9f7f87fca09a717013d3b3c27632a10e76bc854e81c179829bc1c880bf87c5e1
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
index 159606a37eac..197a10fb3bd6 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3-r1.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3-r1.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 073d98f468ad..415f9d6c6760 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,4 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r1.ebuild 1234 BLAKE2B 16afd714bc8a136bee0655b784aacafb6959ffaf5c55a1d60b9f0102122276a9a0dcc93ccb0a2559b75f00d3a33f45e478c450899555f832959e1e36973515c3 SHA512 685d54d332b909b6004d90c43091b74cd380ff46aeae12d4a06a4b6e47ceba48188e31dc273575d77b9bab0ed5c54ddede4fbd0c49174a7bdf9aefe86873ec54
-EBUILD python-caja-1.24.0-r2.ebuild 1232 BLAKE2B 00c68495e3ada0832407a877b5f1b5700510ab8d30f3273b2e3bfdc32c24c3cb6f87e9ae641267c3bbbc2b22bae3ee701be7585ab2b9434910370ba89e5cf8f0 SHA512 a8b180cbedf8835b1752274b64c851748af75f10f4f17abee0f016f5a0bb6ebc4a9f9992f0f0357f817925601815deb0e6114eb1045af5d72358541bc0b84735
+EBUILD python-caja-1.24.0-r2.ebuild 1230 BLAKE2B 66e1184bcdf2b626ab35b4c763b6d970f0bc779a72effa037aae1d42bb7fd4462f789e7dcb5358c3189af022a9a190d2019da9a4116ab2460bdcafa561e5bc60 SHA512 8b4f01abd21bbc1cc5fa41b67368fd74f9909430bdc796470984a6291502240775b1d02a276d1d0f94a0dc5f6f7ab63c434cc824f59af5a6656750b32f8144d1
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
deleted file mode 100644
index e4b4809caeb2..000000000000
--- a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
-	>=mate-base/caja-1.17.1[introspection]
-	>=x11-libs/gtk+-3.22:3
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )
-"
-
-src_prepare() {
-	MATE_FORCE_AUTORECONF="true"
-
-	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
-	mate_src_prepare
-}
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/caja-python/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index eadd87cb2e69..4e4c9419cc77 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{3_7,3_8} )
 inherit mate python-single-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 63794b195c42..ca031abfc524 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,5 +1,5 @@
-AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3527 BLAKE2B eb793ad1ec92a944445a405f323aae660031d63db7612856265c1afe339db4b05f40f2d6c94f988d47dd769b7835bdb2d438718a1eb6d192c3213ee7f055fc86 SHA512 e0c48ed24aadd457cddc98f30965bfebb1b9c9b6f8921fb43d065877cb1344ee7f0d0ba157f9090e2190419f04470e7acbd34c388de07e3e8b586ded7012c2a0
+AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch 3537 BLAKE2B 7f36974a98f5e6ff1961e91542e7c0ff8ee1d62ec4a400a8d8e09f60625660a5d76001855f876aedad7a66980fc5bab8cc2168436e8eddd9f2acfda0682c96cf SHA512 f540e9fd12d98d4d9ea2033187644856d7c7591e4a68f6143fb9335ff367a5b82f0dfdac90ba1ae8141d46a92f6a29015bfd71640fba60967571de4dfa8648bc
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
-EBUILD python-dateutil-2.8.1-r2.ebuild 1340 BLAKE2B a932d8ff478dc6a6c6a89dc369666e36a5d19c3c5ea8e81293cea4f056e6fd20b1590e4a74a45817b54b747c4f41938ba81655bae8cc5e99cfc179878ba580b1 SHA512 ae8fbd83993210fbc9b6955b627217eb5b49213af9bcd97a03168bbaa9cc6ca13ff732a9581d348d2044932b45d0767ef12ff64d914bac61d1db39327768f076
+EBUILD python-dateutil-2.8.1-r3.ebuild 1340 BLAKE2B 8f8e2e3d36045f209552b16a6df0e5648a7410865b0d7116e747bac5a59a13a9e72d9583a953b14569ded3442bc7a414005b77f2952368e2d98f10b3a4c3a373 SHA512 38476d0ba7a9d468ad98c98000e65304afe65495d4e90c5294425ff3634102268956b976937a935aec70aed31faec12164cc993c49330f4cd8f775643a917fc6
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch b/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
index a937e6600a29..abbc853e0902 100644
--- a/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
+++ b/dev-python/python-dateutil/files/0001-zoneinfo-Get-timezone-data-from-system-tzdata-r1.patch
@@ -57,7 +57,7 @@ index 34f11ad..e9870ca 100644
 +def iter_zones(topdir):
 +    for dirpath, dirnames, filenames in os.walk(topdir):
 +        for f in filenames:
-+            if f.endswith('.list') or f.endswith('.tab'):
++            if f.endswith(('.list', '.tab', '.zi', 'leapseconds')):
 +                continue
 +            fpath = os.path.join(dirpath, f)
 +            relpath = os.path.relpath(fpath, topdir)
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r3.ebuild
index 13637f402b0f..214b011d5bae 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r3.ebuild
@@ -9,8 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="
-	https://dateutil.readthedocs.org/
-	https://pypi.org/project/python-dateutil
+	https://dateutil.readthedocs.io/
+	https://pypi.org/project/python-dateutil/
 	https://github.com/dateutil/dateutil/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 04b2af215863..789b69052533 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,3 +1,3 @@
 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
-EBUILD python-distutils-extra-2.45.ebuild 871 BLAKE2B 53fdd4bd99b00ad0a55f1ad92a5119adaa0f95b100aef2ca231dffce3aced67833bf90e51921a80bfd2a14efb85dc73cb8446a84b7838088b3f633d51fa1471e SHA512 6e5691d1ba607d361098b71b32ffdba7af39cc73315ce3c43dd22e55f616fc442ee21f8d2ec8e22d00db59de70ca34ba9caf0750b2f48c4746cbf6f0b5cd1737
+EBUILD python-distutils-extra-2.45.ebuild 872 BLAKE2B ca19e571d86a908c826099ef9127ca91a8c47ceaee03b1ec4bb1ed3a04ed12464ccd2369dfd4de71e839a274b3fe81a994440c6b8a70ecb9fc215430134bc088 SHA512 9b3a89a7c8ed0e0f5960636064044c36cdb46847c75f7cfe0a0a2f459737030b670268ce71c2d888edcb8847401a072bc3f52d91fb501c176686e91f646736b9
 MISC metadata.xml 339 BLAKE2B c7a822f45ad521df2cf6837bdc46e1e8473d8fac77428f80561dfd518b84b47353a37064bd0b9ad1e77441e7f376f0f005755d9c07c67e742c38b7dda02e7348 SHA512 2b8f9ffa8823ba2e9f1811782e17e8a6b3011c2096454b3dfa9373d085b4404f6a0afd1d8d9346adedaa01e09f4410c0d154ca74a00d770b8ad5da33a1a151a0
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
index db1a7cf91174..6bf58c5b880a 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.45.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 3a884e38efa3..6717f13095b8 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,7 +1,3 @@
-DIST python-magic-0.4.22.gh.tar.gz 863567 BLAKE2B 6994869e4cc5ba5ff7ae1a6ac6117f5b1553a11079fb5faaa23b48ee241b2615e2514270f66c55b417b4051d6a5aedd7c289f139c23842979e4af0cdb7a34e3a SHA512 7f16c090a713be4ecc25727f0195bddfadfa9f54507899e35f48bd268ea1d78637ca024ecf02e331a8988a931e430f7346bb5f4b46e58ddc1ff03ec678640e6d
-DIST python-magic-0.4.23.gh.tar.gz 863739 BLAKE2B 7adcf4f8662cb5c6dab1d680a48f80db03f78d6f2f67a81f9d1464a79b820d8ed28a69ca5aa1c8eaa1b016556217dcab0878725a370318db0905985d332561f4 SHA512 8f6093ba6e1138e8c81e7afc596946c3657ddea55554edcf555f6490e2d19c936f41367cd27a04554a344b3116d033ab760c2c954ac6ffd017b9c319abe44b00
 DIST python-magic-0.4.24.gh.tar.gz 863700 BLAKE2B 09ecc8bea1696343ec2462e6989da8059c40f88e401390c8c491e531540ef0b38e5a8eac1fb8a3356203e25cf2e5caa6dad0c13d24eb34a7a299b5a071ae29b3 SHA512 b3ec148da398293465299938fabf691b56c4b3876f6abbb7a734a9c0a5180cc758a15f7085bbf1bf40ec6031697ec84d98c161db1fd04301133af09928c611fc
-EBUILD python-magic-0.4.22.ebuild 709 BLAKE2B ecc3dde2600cf2dedadc46c3ac0ca26e5408d150be3d8365ac0b561b43247b44b5fe10cf8a511e07fc773d2094a8c9b4bc3231cbec1c988132b9035fa105ee1d SHA512 f8da0055d19ff8f706b3df8301d4109ad0e7bcbcbde2f40b69b840bab972764d78e9fdd827fc0447265a732d703acc5cb48f20c4713890f74d69079c5abe5571
-EBUILD python-magic-0.4.23.ebuild 716 BLAKE2B f721574c25176c046f6d9e1b4b7660a024f85db5080659159b16538d691c4f75168e2bfde8a98c406d735257600850ef9f1a34a79cedca524cb7b9ce96c55dc4 SHA512 4ca5c665f92d8233560e099a3e4fd4475449eccb4617926edcd4713ee6e3cbd1d2c8f158b36adc2cf106a98c3044748a0bac4c7dd3154ce0a66357edb7a047a9
-EBUILD python-magic-0.4.24.ebuild 716 BLAKE2B 9089c24387d7aba4d815675cfee2789623bd2d8ef81de5ce623c411bdb9ff048f97c0941a437ef18400da7c87e0ca683a2d2d580c8fc55471495a9d133206830 SHA512 8b725a2dee2af01bf13fb7545ca0b51ff4e01e5266dcf6cfe4625e87a5e07ed6b9fdc176836bff7f7bebbbc38d8dc216d3c33d6fda9016a91f654345af939846
+EBUILD python-magic-0.4.24.ebuild 710 BLAKE2B 609c2a73f4451c175f59b8a709c07300e28d97789b621fd5ede26ea66ed06f633a8c637a93bcd4e58c3f1511d1ca412fdf61616c85b3f3c5114df19c43aee8cb SHA512 a2800a216ce1639b352c4399777f376dd3126035178680aaaa3bc80d454f47ef4ba0117f97bc4ce72d921332a927f1db8807f9d6bc77b54270d3018b7edd19b9
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.22.ebuild b/dev-python/python-magic/python-magic-0.4.22.ebuild
deleted file mode 100644
index e16d4c872717..000000000000
--- a/dev-python/python-magic/python-magic-0.4.22.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="
-	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.23.ebuild b/dev-python/python-magic/python-magic-0.4.23.ebuild
deleted file mode 100644
index 8cbe1ca0fe8c..000000000000
--- a/dev-python/python-magic/python-magic-0.4.23.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="
-	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.24.ebuild b/dev-python/python-magic/python-magic-0.4.24.ebuild
index d8f365349e63..fcc0e0be1933 100644
--- a/dev-python/python-magic/python-magic-0.4.24.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 68c3aab9cfcd..5636e32c2e74 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 579 BLAKE2B cbd54f88330a87b1cd2b55701112e9fd0e85a585483101d1ff27b28bb6f0ebb0b6afd4a979716a0dcd0a5d710240046c604ff0ea7792bf4744ccd9dbc8a77d8c SHA512 9aa79502816e258c013b2657c1d716e1eb88bf96d5ae8bcd3195f6ebaebe58b1615e9a3057503a1faf07dafba51ccb6d4f47dd55c28ea7a661dcb32ee7bdaafa
+EBUILD python-mimeparse-1.6.0-r3.ebuild 586 BLAKE2B daea548e2460b295a2c7bb28dfd2d476515394a0cd9b7c7b303e434789eeff64278790380f434f574fb06c52f78f4979a6c593ff46a02c3c0289a7f6ab49c4f3 SHA512 ecf57b9611a19a82c5a467e2bdba6bed598bb65234a97a435fbae4a990d8d0e5984fbc8960c37859ea23e5bf2c806e814a021c2fd1be3cf28000f55a2641bbb8
 MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 632a14580b92..9d10a4240659 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index 2b23a06de0e9..ee3506c512ea 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,3 @@
 DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r2.ebuild 595 BLAKE2B 8a98bf05b347053765554e94d0a2c3606b6e3c0187a2cb3dff640cf76e6150fa02e13342c7b5e5e71b1fb40c5f31edccc6b778c43274e7032b79e2ca3bd4ef43 SHA512 9c83cdf875b23678c2f241845a0d95b4b529685da47eb4cfaf045045c667dac92ae1f85f5aec480599667d95a25b141775451ec72ee5e69affece7046c7b783b
+EBUILD python-sense-hat-2.2.0-r2.ebuild 596 BLAKE2B 6b349713b78acd1804ee31f29a9e161a168c328c2e4702e00275e0c02356e6772fdf2ddbdaec8c0942498ef7f91b2f34653ce212944d5eb6a52cf84441a82c49 SHA512 02528c93e3fad94e8eec0e39b8d6cc50db2f0777f19244b3a3dd96afec62ee0ba653863319d9fec33eebdcb1f838c3279584677f0732b7dfba3e313a219e4d8c
 MISC metadata.xml 695 BLAKE2B e29a17aed92da2683733bb3657930a83fc09500a647af5aa4e3b1ad0afd9ee28d9316dff38f717fbfdcbaa7f5604b270bf6547ce3d202af85e25aba8e4c0f69f SHA512 f8d3b56dc06c0224c9af4f16ec07fc6e8eaf0f53873afff5c1b035389d97b5b5689381b67cb03573429b66781c1a1d5ce653f8de3e4366cf408a2d6a07a39b84
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
index d06c7aa586b4..7d0c45bed91c 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r2.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="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index ee61615d3ac7..2c6832cb3784 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,5 @@
 DIST python-xlib-0.30.tar.bz2 211256 BLAKE2B 979a004f6ff6ac933baa41623b346c8d1fa9944bc771308e3dd527de7ae6aebb8df0c5d269f21e7aca590ad7d3981d0deeb592981b0672c54b30ce286e650236 SHA512 52ee01cce73f024d6fdc995cff38ba9ff2838888aced12186a754c1760228f89209c1d6fc9d4fe0e371a4a43743f8fdfdef6ea32ea3feda5a85055897aaf887d
+DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
 EBUILD python-xlib-0.30.ebuild 878 BLAKE2B bf9f436dbce6e62d25663a2be2dc2a9f7401979189dc2ff113dfef60ecec4e5a9d34e73fe25345c4226a736d4c07bcd855c7e2b30e9679c060c4b6cb10f6b0ac SHA512 9d0a514942b6e7bd4ec02233b63eadaf0da516560eadca6e2cab52d02a50e18b66c538e675746b293adb6fff4aa423fba44093c69118c3a94cfc9e547b6b8474
+EBUILD python-xlib-0.31.ebuild 880 BLAKE2B 5d97c92b08dd277e7c3931c534d2f7d1a3ddc3b86b8d9403ad3d9539bfa9bf77c5209de5045a39603f59aa3178b7afaee01a96b99dec610f731b482696afcdb9 SHA512 c7797fc74bce5b4d54db4edd285007fd78024613513d5f21cd2d2b0b691daf245d29b307c916e7aa1d60d006cbd9b8c23e66f8d20706eda94037a0c166454cc9
 MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/python-xlib-0.31.ebuild b/dev-python/python-xlib/python-xlib-0.31.ebuild
new file mode 100644
index 000000000000..3a429851f290
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.31.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index fdf8e6e2b63f..96d59d10d335 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,4 @@
-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-2021.2.7.ebuild 551 BLAKE2B 9464350a8af26c40562d44ff6ab247c5967aaaf0f416b33155c3dbed2e7431b49906f1ab4edd5fb5f7b5bc41f84c2eba6dbae832a8208933a90c1a3de7f58201 SHA512 fb0b667a071206237ce63ff0ca549135cf8992a15816954ca68061f7a674609d758b94ec2b4f4b56e11fa5b94706b97302b3dac0011a16799dcc033715685d98
 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.6.ebuild b/dev-python/pytools/pytools-2021.2.6.ebuild
deleted file mode 100644
index f45014748290..000000000000
--- a/dev-python/pytools/pytools-2021.2.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/pytools/pytools-2021.2.7.ebuild b/dev-python/pytools/pytools-2021.2.7.ebuild
index 6f643faacf9a..f45014748290 100644
--- a/dev-python/pytools/pytools-2021.2.7.ebuild
+++ b/dev-python/pytools/pytools-2021.2.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index b542e938363d..28a22cc29d28 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1,5 @@
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
-EBUILD pyzmq-20.0.0.ebuild 2673 BLAKE2B 50c577da5d69834d1cd3f6ab350e198c94fd42f348827b1267b6087064204fe7f416690b6805c8a1145c786941d2fb1f2510af8fe4b4954eac7c6cb39bdc301e SHA512 010d9e997d59887f85911753b0dde3d5932c6872c6a7e06595a8e81f3e576fd73e2577ecde4206bf8372b0d6671c80b50b5adda98f42d9b69c51c7da83ab9344
+DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
+EBUILD pyzmq-20.0.0.ebuild 2653 BLAKE2B c0d0fc48eb69fc23c199f66d8171c7b3eb57d752f3b00e8f667eb41a0cce14b967b2d09a4ee98d3d3713532931d7ee154bdf0d1e67b218d24475cdb5dc761b2a SHA512 6841126e1f898b56f784606725d916ecbba38f0a99154a179cdcffb905f574072c66cea39c7f5368c064d2208a571bf63cafac4ea9b5a8af998c4d6e591ac50a
+EBUILD pyzmq-22.1.0.ebuild 1715 BLAKE2B 2eab05d7d3fde32259ec3f7892c86617b52ee5c3533631c166480b80fe31959ae803af9fbb9e750cde719d103abba2894ce37330b0ffac8f47872033e8bb7f3e SHA512 1880600c17a9af2ff9279490c69faa13bbc0d36e611c15f338e303d54d56bf125369bb94035b0d9cb0d60fdd140f530ba8f77be05b736b1db69d8bb2e45a111b
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 27c307eec8e9..1e654efef840 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
@@ -76,12 +76,13 @@ python_test() {
 		zmq/tests/test_security.py::TestSecurity::test_plain
 		zmq/tests/test_socket.py::TestSocket::test_large_send
 		zmq/tests/test_socket.py::TestSocket::test_tracker
-		zmq/tests/test_socket.py::TestSocketGreen::test_large_send
 
-		# hanging tests
-		zmq/tests/test_socket.py::TestSocketGreen::test_tracker
+		# green-thing tests cause hangs or crashes
+		zmq/tests/test_socket.py::TestSocketGreen
+
+		# hangs
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
new file mode 100644
index 000000000000..c1619471f402
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local deselect=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+
+	cd "${BUILD_DIR}"/lib || die
+	epytest -p no:flaky ${deselect[@]/#/--deselect } \
+		--ignore zmq/tests/test_mypy.py
+	rm -rf .hypothesis .pytest_cache || die
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index f2a66a829739..d081a15f9eb0 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,3 +1,7 @@
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
+DIST qrcode-7.0.tar.gz 34548 BLAKE2B 0a5f06b73f55ecc713aa34249acf5d58f71b29c90e5433411a9208124931bfcf101f016a6f1fbcbab0eddd3ffdef763cdc92fdf09565addaa86120a80d4d0c1f SHA512 2b96528582c1d80ba1bd27b5bb769d52e238bf5a3eda2fa23c4bef90778fa2d478c50a8f2b581d5b83373d778f346c410ae3475250029b878ff527edeae0f323
+DIST qrcode-7.1.tar.gz 36068 BLAKE2B 93f09da56b6e0cf6875250e46ec6b3cd5fc631c5775093317fcfbca72990ce8e4c2d50336e0a1dd67cbd69b787652de7c75d5108430871e0dfdd3cf17e9a1eec SHA512 838496be964ace361cd1b28b3203afafc2f262d1e929fcdcf54e0a632bd85518cd60b2955ed22c003c27cbe5527f89a9298ff912f6b02a75b14f9e5410fbaba6
 EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
+EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-7.0.ebuild b/dev-python/qrcode/qrcode-7.0.ebuild
new file mode 100644
index 000000000000..0185db078736
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/qrcode/qrcode-7.1.ebuild b/dev-python/qrcode/qrcode-7.1.ebuild
new file mode 100644
index 000000000000..0185db078736
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 33c001827e43..4d78992d3720 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,5 @@
 DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
+DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
 EBUILD qtconsole-5.1.0.ebuild 1270 BLAKE2B 07487143c4fdd5d3f282cf2e755c9a8114240ba31582fbed0c3d18758f341ec21193b3a2dabcf5f18a128dcc1e98c67ada4484292637e856e9dc7661ac3f2e46 SHA512 394de48ee8182970988bdc007ad1333f6772157aa37b9ec25c9ae01115d642238bd075c8b018d4e516c67f2bc46bba0cd4ad0d45a4ba0fe378037f177db86c58
+EBUILD qtconsole-5.1.1.ebuild 1254 BLAKE2B a73005cc8c0aca61aaa29892e50c91361187abf4a356d31e9391a4a0bbaad57e85cc7f7c1e94ce61b320fd6d5d628bdd5a2d497f69a601eda28356621c52de0d SHA512 9ae3d3fc72b61a373732e27884ca0b4abb178f3cbc94f476a15320d060fc170ae30cb9da0193c4b66c762454217f671aba348b1d751908afaf14806b5ddf6823
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-5.1.1.ebuild b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
new file mode 100644
index 000000000000..83475660a39a
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+	test? (
+		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_test() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	epytest --ignore qtconsole/tests/test_00_console_widget.py
+}
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 2e117fbc86c9..24e4ba50826e 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,5 @@
 AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
 AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
-EBUILD recommonmark-0.7.1.ebuild 754 BLAKE2B 146950dd30d3042eba9e619316078da06cb6fda51d40a1d65b85341659582b64000b6f63d9ce519b31f24e7694492040a5af7e9d11fee95cc58ab529d62ea5ad SHA512 a34d5d957c36214388936db9dc938a6a1916eec7131942dfafa9ecf5505cc60274343784b3a227354a38c52bb5ff010eedb01994955897b7a32987e02bbdda49
+EBUILD recommonmark-0.7.1.ebuild 761 BLAKE2B 965a10a6842f333b436171ff74d4064a3be231e96637b389db6ea7ddc54af8b9ec44a44d5073fdb85f288413f068545ef6c7a4ef4fb44696063b1c533f6bf8e9 SHA512 2a31b737530ff6754b04dc0b3d4e3b93d26646966686ad35fe95a83814be647767c31ffaf25e238fbed7b11e69fc593d1d3814bf32267f1803646b3a166c63c5
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
index 51f5b68eeb64..cceeeeaba085 100644
--- a/dev-python/recommonmark/recommonmark-0.7.1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 62f863d845ac..d8c5ddf4482f 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,5 @@
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
+DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
 EBUILD regex-2021.4.4.ebuild 727 BLAKE2B 8c568d7a6ec94ed2af98176ab5a5fec05f890781b04bf182ddd1a38a7a48e39df0d03873bef012af54a54cbed8648c24cab6206b17ed4356faadc1b8c0720db8 SHA512 965a6e5bfe52cc24b8696ab65e7bd6b499ce1321dd5356ba25653b11f23313ed62616f2e34c2ad037e200a48241399f8809958f5031ed2aa07a09c5c1f638a27
+EBUILD regex-2021.7.1.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2021.7.1.ebuild b/dev-python/regex/regex-2021.7.1.ebuild
new file mode 100644
index 000000000000..271faa2b4fed
--- /dev/null
+++ b/dev-python/regex/regex-2021.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s "${BUILD_DIR}"/lib
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 7f4628793971..5ebf5b6f243c 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,3 @@
-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.9.2.ebuild 1280 BLAKE2B 7390ce03d66e4e6dfabee8dc5a4409694d017aa83d58d4745b622389259c337df8231fc12f1302f421ee4fc98e67170d769fa43b178f162053aef3ed37f9bbfd SHA512 4c16c132ecff2ec652a61c84840315ef10c53b514c2d557af311c8193bcdbc6da7eb425ca44f01293d4d9735942fa1eb20d1b577b961936eb428002af8d7eeab
-EBUILD requests-mock-1.9.3.ebuild 1282 BLAKE2B 0d471d80b9df7e995b810737c6051d79b04231db277a637ecb625ad6a5783ac4dabf761d4f9e39e904f2b862222c7ae58273918f04e76d93123f402de350f56b SHA512 a2725095d5ad6f7e31e645cc2711c1250f5b2a534b6adc3ebfe5503a40faa7de2114020f22f101244ee97f31da4af09bf0c58d234d1f0255897cdc0180448f42
+EBUILD requests-mock-1.9.3.ebuild 1280 BLAKE2B 7390ce03d66e4e6dfabee8dc5a4409694d017aa83d58d4745b622389259c337df8231fc12f1302f421ee4fc98e67170d769fa43b178f162053aef3ed37f9bbfd SHA512 4c16c132ecff2ec652a61c84840315ef10c53b514c2d557af311c8193bcdbc6da7eb425ca44f01293d4d9735942fa1eb20d1b577b961936eb428002af8d7eeab
 MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/requests-mock-1.9.2.ebuild b/dev-python/requests-mock/requests-mock-1.9.2.ebuild
deleted file mode 100644
index db7c8a5091b8..000000000000
--- a/dev-python/requests-mock/requests-mock-1.9.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=( 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-mock/requests-mock-1.9.3.ebuild b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
index 930d9082097b..db7c8a5091b8 100644
--- a/dev-python/requests-mock/requests-mock-1.9.3.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.9.3.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 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 64b1ab657541..2affcba33ec9 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,4 @@
+AUX requests-unixsocket-0.2.0-no-pbr.patch 981 BLAKE2B 1a722beac18bfb67074f7a4cc36d843232686ab184e64a769f3f92ca80346dbdab1d3fc1fcff2201bbecbf75626e4c4524384f1bfb30dbcf2065e3e11d575c8b SHA512 ba7246f97949cbd63bb53234eeaf50bdc58a35b71e2833ffd1037710641ef28f7310667328bb9f75d70ffad4f0bae1ad8b46aeaa2984d8f1030fc7d6486d0b74
 DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
-EBUILD requests-unixsocket-0.2.0.ebuild 730 BLAKE2B 67593412eb95e8192e03bcde736eb878c750f1edf7b7bfb07b69198f304f0b64325502012ca4d5de087903bb99e2328c88526d04826b0bb1ccdc08aa860d76ee SHA512 9d604aa102873073f858bb4c4e0fb59082fd82f158b0e1a0ac6342a5545715471eb427caca2f9315e75750c0976988686db0c2c39f64393a431b0a3e7b634663
+EBUILD requests-unixsocket-0.2.0.ebuild 743 BLAKE2B f103ad87ec045c34e57c278892d60e8a7b56f08cb0b53f23086566fece34ec3a65ac7b5a387abd7391abbe9251bad56a2e81471466599cf32df7ed90313d9ad6 SHA512 0c29f3d1575f8713875450bfe675a07c7c82d55b5ee7bd350ff6dff1241d69f76adbcb2349c90c588c0602544a6fc58d3d43443d3bed5ff33b0d1a0fb0f422a3
 MISC metadata.xml 300 BLAKE2B 6eaff6b26ce22e4afdd1965c4e6dbcac3f1182283398738d1fcd7d8b3147323e95bc57a746dcf30826f54145f526a9471b49d2ab9a749806f8b2382bd278464e SHA512 3dec04e021da92dc5c63f4b0a892755840313408a61f47de8ff1b8f7b412b4a6bc93af75a916279c75e931eafbe187674a1f5f063331ec120c747612c03be176
diff --git a/dev-python/requests-unixsocket/files/requests-unixsocket-0.2.0-no-pbr.patch b/dev-python/requests-unixsocket/files/requests-unixsocket-0.2.0-no-pbr.patch
new file mode 100644
index 000000000000..82a8b36e2cd9
--- /dev/null
+++ b/dev-python/requests-unixsocket/files/requests-unixsocket-0.2.0-no-pbr.patch
@@ -0,0 +1,41 @@
+diff --git a/setup.cfg b/setup.cfg
+index 155f297..9d61d28 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,11 +1,12 @@
+ [metadata]
+ name = requests-unixsocket
++version = 0.2.0
+ author = Marc Abramowitz
+-author-email = marc@marc-abramowitz.com
++author_email = marc@marc-abramowitz.com
+ summary = Use requests to talk HTTP via a UNIX domain socket
+ description-file = README.rst
+ license = Apache-2
+-home-page = https://github.com/msabramo/requests-unixsocket
++home_page = https://github.com/msabramo/requests-unixsocket
+ classifier = 
+ 	Development Status :: 3 - Alpha
+ 	Intended Audience :: Developers
+@@ -22,7 +23,7 @@ classifier =
+ 	Programming Language :: Python :: 3.6
+ test_suite = requests_unixsocket.tests
+ 
+-[files]
++[options]
+ packages = requests_unixsocket
+ 
+ [wheel]
+diff --git a/setup.py b/setup.py
+index aa2d8a0..beda28e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -2,7 +2,4 @@
+ 
+ from setuptools import setup
+ 
+-setup(
+-    setup_requires=['pbr'],
+-    pbr=True,
+-)
++setup()
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
index cf17d405c338..78d4187b3b62 100644
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Use requests to talk HTTP via a UNIX domain socket"
@@ -18,11 +18,14 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
 	test? ( dev-python/waitress[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}/${P}-no-pbr.patch"
+)
+
 src_prepare() {
 	sed -i -e 's:--pep8::' pytest.ini || die
 	distutils-r1_src_prepare
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 398eab6043e5..86f847661d8d 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,5 +1,3 @@
-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 667 BLAKE2B 8488e4db4300d73640ab3afdc7000b8f4608c9f7bffc164354a446520f2a7f9f3523571274ffc84d6157143664c4b1d1205544b9abb818531ee96407f84f9d70 SHA512 61196011e13f718c44698e720c2ebd719129bd420b4687498b82417d4e216f79e981b332b3984cf0efdb5bd3c58b796011abaefe52c027c0d5dd043decc2ad18
+EBUILD rfc3339-validator-0.1.4.ebuild 667 BLAKE2B b5fa9d5b53ddebf112553989f4b92ab133000e5b3e0e0f09dd7bb70b8c1f7e3bac67ac5f247bcd07a10bc91cf49a02380163f80931ee2ebccd4ebc5ffb68b9c3 SHA512 6546ec47888416b10c7279870bd666f3bd0a2d9ab13a1c1b3090f47018224e3701a9793fceffa3410b1e6832413c2852130ca9702b97e3b1be96ff137a0b5772
 MISC metadata.xml 410 BLAKE2B 2e5f33d43e9db653e8ea92b820fda57657072ffe43c96e1606fd4fb09e81aec31ecf7c281b3019bc945fed28cb7c0781178bc7f136df5e1c2876384296b46c56 SHA512 695a99018886fb434079006b3e0784c609654a0482c85890774f31f9f5a3bf9a4765a4105495e67ecfe872c4ed160f07dc692e1d21d1ede2ced8692e666e95ab
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
deleted file mode 100644
index 39aebb33d57c..000000000000
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A pure python RFC3339 validator"
-HOMEPAGE="https://github.com/naimetti/rfc3339-validator"
-SRC_URI="
-	https://github.com/naimetti/rfc3339-validator/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
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 5a23d2d82f84..3ff2af693f9d 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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 6bcf56dfdb29..39fd30cb70bb 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 918 BLAKE2B 874bd0b7b5068cb6afe4b4f4eb4511fb1cf03187aed33eef97bd33616a640a76e86286c7bf38174c853176b859531e59d1af94a2f38f1e5bdb2bf4a004ddf2c4 SHA512 a405c5fb2c10b4d3827fd435b5ede72f4c888d2c224afa7977b2c349410286a163f3981ddcb79465a59fcf6e9d62ce5d1de93e7bcdf90f21b55f19bb639377bc
+EBUILD rfc3986-validator-0.1.1.ebuild 925 BLAKE2B f56d89797c9e0653edd15b46ac7d0880f3f5be8796906cebeee17316f45751181a442785641f997dbb771fd6999f2d28aaaa7b2a04a365495c4799d28468fa00 SHA512 ac9a71a505533fb0fe9d5ce4503ce5f6a332b47da26f7de0391f12b7c537860a6a56cd489f8a7d79341469a467e03ad4730d7b4cee22e67d6fe96fe76233268b
 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 e3f747530485..952325b08a2d 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 49d990e2cb0d..a24a4eb43368 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 654 BLAKE2B 77e1f8001bb3c1a58341f0155488ca06dc479d580bc0b92ea3ab84dd75af23d7257a7fe2f66529bf8aafffa2fe056bc2fd15b50d04828b0a8c3181429f0e601d SHA512 751271d27f378a4dca4a3434c0c217475d11ab4c6a1048e94c9ae57ff97e188192e8d0ded8b57eb5eb3fa94e079c1f569236c446dbd3549d1f8f78b7ac0a2f67
+EBUILD rfc3987-1.3.8-r1.ebuild 661 BLAKE2B 51ce84254fff7c6fbb109804e8f420af0c9e03eb25d2fe4612aebe3e84b421197cbc426f474749a21065004978d70b7a2f3f9a353712b909366fc7ec9ea99123 SHA512 0f6545f9f6c55e1eb13c34e4ad189792d4958a94a58e242e0472ae992d53af50a127d754ffb86d0cd5f0cb254e83bb24b6e1fdf2fcebc9e551a67d7c9ff8deb6
 MISC metadata.xml 596 BLAKE2B 4411d89d5052a1827d821c16c9e5ce0f2f78276cadbeab36b5ed49e65c9c0eb8f3b212c673af8cffcf986e348730a62815295cd8ca167be4ebbafaaa8dc4037d SHA512 bf3a9d195591b70271b33d3b102454fe486e8029e9fdce90e21e349d6cbcc5218e8440eacec042352c2c8231bfc1c6d64f4b542fbc0c5ffa806bcfb52495d142
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 7e77182871c9..2172bdddd9a8 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 381bce9eb784..72fd7767730c 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,5 @@
 DIST rq-1.8.1.tar.gz 585211 BLAKE2B 17feb07cb376c5aef88a7aab6d716f58a19f62f19db6c6b0490b4f666981e40304c6a23c88669a0aef9b75a39ce8cb85a9b10a2d42e83e646cdcb6282167d8f9 SHA512 b9df7b4e894a5da693827ff720be3068336d82d2f17928faf5ae6133b042ac2f98a3d673bb2ed86c9351479669e9ef0e4fffcb1dba9b8853f6f793db4a4678f8
+DIST rq-1.9.0.tar.gz 592217 BLAKE2B 831fbc7a3fe23ead59041e2556d37e4aa885a21bffa9aeeb0765382e84b56a2ee6d34a864cb03a9a12274c8ac80b714f10a7752d0bae7a79b8e2e7149be4aea7 SHA512 a2ec7b05fe1dda983cfb30182401c6e5367c54b7649ddcb1d3c6d0f0a5f6583665b39ed7c1cb6bc37d067926f089e3fd80ea7558856233edc1bca8234aa728aa
 EBUILD rq-1.8.1.ebuild 1365 BLAKE2B db42990a90d0a4adb2b1dbc3b458f82e27f18e5887953efffadf720350a4018a68109ae186889bcef92fbdce1191e83ccd49789eab58c5a412c55d0bc773dc8e SHA512 323c05c818ebf27372987852563829c6155045a658711a297577fe1e28dcc93e106375f95b8eee0e9bb67bf90a0abf67ae4701cce4b98b5234058a402dd0a926
+EBUILD rq-1.9.0.ebuild 1369 BLAKE2B ed157155382e0c363f099bdda4c9c63de60be4964bdf1b50b8f95e8207e20eb44352a06da4641f33247e12de51f00c13b8889e3e4f4a63dc4e1894331a97bd6d SHA512 ac88d8c45df017c600560bcd2bed430b591627064c581570f7af3bf4bbf0f9d2a9c37b3f909c2708459adffb5c39d1aa826171ba4e57ad2588c8d1322366d512
 MISC metadata.xml 452 BLAKE2B 61dd85f86606a345d1f3fa4d88f7b4e7c827d61107e0f6ae7c60d24cb3d49f9da5a472310e182a9df36cfcf50b8c3415028958b0559d84db755bf8ba16140a22 SHA512 a70bad859fd51b632427cf5aaecadc36815e4efd14f4aeb02125da4b5c04724abf3d82f42f74c9851efa60b48e2f7722f2a82182e65f90cf2045354b3810c0d7
diff --git a/dev-python/rq/rq-1.9.0.ebuild b/dev-python/rq/rq-1.9.0.ebuild
new file mode 100644
index 000000000000..ea0095ca05a0
--- /dev/null
+++ b/dev-python/rq/rq-1.9.0.ebuild
@@ -0,0 +1,53 @@
+# 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="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 8c332bd97c73..d561d94c3d1d 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 537 BLAKE2B 9b639e9c5c5a8c1ea54ac5e6e24f0693f9490c44c77114f78b1129c538d611677998443798e0ece76f9682608d9e2abe2dc177f93558ff878ea7beae032f2cfd SHA512 befe01dea47a28728d63fadd302626da8957d697a02c4c61eeddb0acc1f1e3b6c646eeddc10205d7c02377eeb4e74369dff410e52b79d1ac4e289d28389c1e6a
+EBUILD rtimulib-7.2.1-r1.ebuild 537 BLAKE2B 37852bb3ddd646b0f8e2ab2260989e2679ae6152241ac014bdd46dd811af242fd11cee6d480cd29762a76ea9c40ac08ed81dc1c848cac3923a87ba6004739d0c SHA512 63ac78f76aa1207c6afad7ab6bd1311e185b9edd544d50dbef8093f3c6d678a91a85dd113086cf85f31699ec22d145a6a76c5fe36189c63356dd946a96f0ce43
 MISC metadata.xml 775 BLAKE2B 8f82b35affece88dbea988495808f140a2cb19c6f24eb30a32466e06546cb11d75739ad6d7d637d9259bc95e7fc9a8e683c8d3df87a7716c4edef63719ca06d3 SHA512 856c089ca1be059492614889984ec1bf07b1bdb2832f2be73c2faa6e52d7cf3e9922ae63ac7e523977d9d69b615b49051bbdfd769bc87982d181bcd9b0e8a1b2
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index ce7b566fbb55..b9dd65154fe6 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,9 +14,8 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python Binding for RTIMULib, a versatile IMU library"
 HOMEPAGE="https://github.com/RPi-Distro/RTIMULib"
 SRC_URI="https://github.com/RPi-Distro/${MY_PN}/archive/V${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/Linux/python"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-
-S="${WORKDIR}/${MY_P}/Linux/python"
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e2f3cbaafc2c..e489e0bd1c10 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,16 +1,5 @@
-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.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-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
-DIST ruamel-yaml-0.17.8.tar.xz 182988 BLAKE2B bd9f19eacac51bf5032738c8cd3da08d42ee109abf69442ab079a2d88267146d23d6facb6bc8683d4b78cff0577271574a7012799828a77ba23631b7b6af5b65 SHA512 69fdcffdb3b4cfb4b7933750b2f3a0ee2f44166c38a0cf3c5ba72bb14c1513ed28138435fecf8f23d72cb76b0489450403f726c5740ee9715f7d993f95438c0f
 DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
-EBUILD ruamel-yaml-0.16.13-r1.ebuild 1232 BLAKE2B 8f8eb1f7f8000aabec62f1ce4a457c2c4989ad83687baeaa0db22982b3ec45d60114661690e6d38ac6c7c2f420ce21e22c0314ef7334c532b994f3f814c03466 SHA512 e01a262271a37c1539d9d1eacb30dc327cc0610182be70b71605a9d636f807aef52e5013dbdde898deae887e28b24b252a9a2d0660c89d67b326975ba5886bc2
 EBUILD ruamel-yaml-0.17.10.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
-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
-EBUILD ruamel-yaml-0.17.8.ebuild 1313 BLAKE2B 4b379f262a11ed6b2f7e5590ec73e09b6979f4ade58e1f0d84a2e75e75c81440915f60bf4805b7fc2a426486eb81a66b7d3e5e5e1f4aa63436e7d3dec08c1089 SHA512 c29aacd2394ded6d6b063328cede12ed116ea57d00397667d8daa9f93bb8db195d31e76bfb7a82c1324ee7d6fda9c7f5eb72878bc0ad174f1b423fd1086031c0
-EBUILD ruamel-yaml-0.17.9.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
+EBUILD ruamel-yaml-0.17.9.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch b/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
deleted file mode 100644
index 15d00625b68e..000000000000
--- a/dev-python/ruamel-yaml/files/ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This does not produce a deprecation warning under PyPy, even pypy3.7
-(last tested on 2021-03-12 using version 7.3.3-beta0).
-
---- a/_test/test_deprecation.py
-+++ b/_test/test_deprecation.py
-@@ -2,11 +2,12 @@
- 
- from __future__ import print_function
- 
-+import platform
- import sys
- import pytest  # NOQA
- 
- 
--@pytest.mark.skipif(sys.version_info < (3, 7) or sys.version_info >= (3, 9),
-+@pytest.mark.skipif(platform.python_implementation() == 'PyPy' or sys.version_info < (3, 7) or sys.version_info >= (3, 9),
-                     reason='collections not available?')
- def test_collections_deprecation():
-     with pytest.warns(DeprecationWarning):
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
deleted file mode 100644
index d1a9633d5ebf..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.13-pypy3_collection_deprecation.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-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() {
-	epytest --ignore _test/lib/
-}
-
-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.4.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
deleted file mode 100644
index d4bc00ec0843..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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.5.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
deleted file mode 100644
index 4b594b0aa1f6..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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
deleted file mode 100644
index 4b594b0aa1f6..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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.8.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild
deleted file mode 100644
index f1cb20246e0f..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..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.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
index 9cf177b48a8b..86fa6a9be480 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index dbe71d461536..ca4e0b2ed12e 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -5,5 +5,5 @@ DIST scipy-html-1.6.2.zip 23947380 BLAKE2B e4616a157c037b0830fc32d23678fb7e8ebe0
 DIST scipy-ref-1.6.1.pdf 34594740 BLAKE2B 905ddcd7a3d462b09ded688f0818204d7684fa18058d0dac480d0a000e9ea0b7ebcdd33c01adae17234dcdf630d4aef9078174127af46f1db55d5c14b3245346 SHA512 355f4681439c1720f45dca6badfe72d77edfca0962fd9b42df34f1cd8fff7121fa6e7f60570bb638abd3ba9693930fa46b25af862d8fc1568b508c6fdd785479
 DIST scipy-ref-1.6.2.pdf 34599668 BLAKE2B 9ae3221c814eb0d1b1e9191e08000955af503f6448cf8b5841e400fad106c658670339219f4838bd312023601776fe0b0d123ebbd41460c478145da2ac3e9989 SHA512 9aecb7ca760805c470c41121268281c9547aef35ddf078816c5e48f7cf4912a67cf622e267152c6cc823df9d82be1f3a875d97469169d0d91d6219164c130c88
 EBUILD scipy-1.6.2.ebuild 4145 BLAKE2B 5ff8d9071dcea9ab487dc253717939110d1e79a41492b0172a504ba14c1da81126aafdfb16312d88ad54e8f26f73f4e4ad289bf455b3c56d3186bab926f721a0 SHA512 d020e73bd5bf44f2a0aadb1a34e61d93dcaab2d1a68e50cfcc101f88b61ebcd10404efa7e2570d839143f9683b5b8e9bfc9a3645d01c710250d1ef1d1bdd0be0
-EBUILD scipy-1.6.3.ebuild 4148 BLAKE2B 4a5484e3906b615b1f464cd451cf690b50c37cfc956bc2dc96d963b615d8892b67aaeba395c3e450a709701c267c285ac3dea693dd582f567a0eee1a8ac3f12c SHA512 c6d9c686ab6ebb6aa954271968a78b8fc595bd4fcba3a9f2806afbf655490b8d082f0feedc68b13ea6c974caf5607ed939aa0bf488fbb6364fbe2bb7d693c275
+EBUILD scipy-1.6.3.ebuild 4155 BLAKE2B 74d58e7152bbec337e6b38aa11318b1885d4fd1c551a90471b4f11d55f2e8ac05ffd1cb3ce125915b5bfe4124db22c9f5bea537dcde60bb87f46e9e0310b4806 SHA512 118a42c6d7971a0e35cb3b7b3a172ee8688ed59aa07fafb3697058ac3898780e5a9dd3528750b27b2cd224750b96a5924caeb9c10d69c4d4f8158b898e64e98f
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index fa25644eff36..ecc6f1571bd1 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.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 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 31d9918039f1..f304c31b0d2c 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-prompt-1.4.0.tar.gz 9072 BLAKE2B c3ee936bb05eb39fcabd85260ef65b66c9a3fbf64d1b1e188ba889a3777d32fd90c6857d88191f5d9521b25ae46bc6ffc1777c18ace7e0aa0d96f266548ae7be SHA512 e79deb7164fe76f5f4a82855030d5eadd1966d87c0785d2a7a743205301ae0809398823e2a3558c3759774b3ee38c974638daf0b58ce565ef5b298f593ffd18d
-EBUILD sphinx-prompt-1.4.0.ebuild 546 BLAKE2B 02c1ac77ccdb9b272c044d4e33559503745f61cad3488d2caac0bbb0e15102554802829930687078bcdf9fe44c53c2947a79f27de02f5dd44bb3ccddb25cbff3 SHA512 0973e1fb5740d13ad70732758e5033980ec988c8de6ee5cc96f5dbeffef79134d0e024ec29989e98d4483b9f15045b0fe1bf84aceca021d713f01b8ba2f9b7f7
+EBUILD sphinx-prompt-1.4.0.ebuild 553 BLAKE2B bef49d7bd4e8b63d8f6a0983ddd862c8369c09694245d5fdc111f7460bbed32d7825bb45394d96abaac937d6a0b5656af891e05980816182a3ba0e06b6b0fd1f SHA512 4c2876dead9c2f8c648ea6e3fdebe6a10e763039dac37dfba3464e2228f63a645f243bc374219e93ac0003eeb69ac58c3f03b99e0c72e75cca90d50891c3911d
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
index f5f493d05a76..e695c326f82b 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index ef437604041c..7c4d4dfb35d2 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,5 +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 651 BLAKE2B db28df565855547310830eba2d101b3129c1937e55c4e13c1efe5155da052e94e1f996935f6957d6300c8edf6134ecbbd656dd4d6ddb3a36175544b71dcb357d SHA512 103acfc00d8533391a6a5391fedbc2b544dc31fbc968257beb24e68afcd48bdbe7a817f4ab2011475945dcd02e08cb5aa6ca0ad3e2215ffc076f3df80a36a8a2
+EBUILD sphinxcontrib-github-alt-1.2.ebuild 658 BLAKE2B 8705638470dbfb5af6e0c47b581ac7ce9956c01790c9e9615af5d4b47164f88bf96c11780ac4fd9db16aa724f2afb5168dcfe399b7da98dca24b6fd667fc91f7 SHA512 53879271d224892cb5a0353798e0247a7cd6846cf8fd14bc0de0cc2f37d8ee3724cc7ed5448946f413acdab8bfca31a81a6fea12822be1ba49d1a4ab698335bd
 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
index 5ef0ef7d0072..ef7a10b3143d 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 0b205fdcd1aa..2010e04fd40a 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,5 +1,5 @@
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
 DIST spyder-kernels-2.0.4-gh.tar.gz 80671 BLAKE2B 1ef5fdef54742f6c673f30c9bf174f32e20bdf31e71107883785ad2353749712cc0f607662b8246ad0b831b5cf43fe94fe24ae72a9f477ede5743c8d76af5b7d SHA512 1b448bdbe4a6b483203fe4a474e39c880e164cdf35d71eebd3ae79367785892043bf73180b4c1c9051ae75d0e7b59e845ef079d31582479c710ad43a2fe11599
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
-EBUILD spyder-kernels-2.0.4.ebuild 1470 BLAKE2B 31eb4e05849bb02836aed6230ae377f7bebfb154735980408f20ebaab65c1bb8962b0f2908fed218960bc86461d5cf501819a3362e4c0026489c91d22c298a23 SHA512 28c6ba887ea280c3d92dde5343d82eed6f63d29283da9a0a448d8c5e3d1ae2cda202093590655d14f33eabe7dc6aeebf62377a954f74a5fa0a62c87433f852c8
+EBUILD spyder-kernels-2.0.4.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
 MISC metadata.xml 544 BLAKE2B 621ae952ca69bb37d3968b2c4e0eb9d613a6082467229a66f54cb62ac13f11e9a4f849ecc312d02c16d5af45921a9c1c15cc2ad552dfe3d105abfb67effcde6a SHA512 e4c77b881f16c1017fe2c3fb2f4072db36038e8a8aa57cd69233e1a807326398d80381fbcfc156ccee3294fee759df51546af36fc8273ec09955ffd7937ef72d
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.0.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.0.4.ebuild
index 7847633a4a85..6e20169fd3b2 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.0.4.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.0.4.ebuild
@@ -18,11 +18,11 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	<dev-python/decorator-5[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	<dev-python/ipython-7.23.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index d8a3bd85267c..356c20e891e1 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -7,5 +7,5 @@ DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a
 DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4
-EBUILD spyder-5.0.5.ebuild 7876 BLAKE2B 9005dce5299217245eeca798b03aa61b0c64025bf7ecf94e6b9658eab463e4758fd58f92a70795249ce61e1697381183de728494ef15107bfdfae73ea0ebcff8 SHA512 856c5fbff97300dfba3c4522aa9ac959e42a84e861181659e73513b2feeb1f61540ca4a3c8f265e36380ada7641983b48e3726da61085f26a1b7b123cd1516b2
+EBUILD spyder-5.0.5.ebuild 8065 BLAKE2B f844924aa8896b66229e842ded6e2d3904e81415e18ca0aba398575702da35242f57e8a26a690e0091fe8f5ebfad7e9fd067334881e6c0ab1432cc680e8c228a SHA512 11b32aa695f0df8caaa98a304c547ea300eafbc14e61b1149099a266dd2198ab44b0c0041be1927db972da3ae9a441df5d66274bef471856fb207f9c9d8c8afc
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild
index eb12c15ca98a..27d30b0d5a4c 100644
--- a/dev-python/spyder/spyder-5.0.5.ebuild
+++ b/dev-python/spyder/spyder-5.0.5.ebuild
@@ -46,7 +46,8 @@ RDEPEND="
 	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/parso-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
@@ -145,6 +146,7 @@ python_prepare_all() {
 	# The original hasn't been update in over 6 months, and spyder upstream is slow
 	# in making the switch. Because we are running into issues with outdated deps
 	# and a whole dependency mess as a result, we can no longer wait for upstream.
+	# Also relax the parso dependency to allow parso 0.7.1
 	find . -name "*.py" -exec sed -i \
 		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
 		-e 's/python-language-server/python-lsp-server/g' \
@@ -158,6 +160,8 @@ python_prepare_all() {
 		-e 's/pylsp-black/python-lsp-black/g' \
 		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
 		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
+		-e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \
+		-e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \
 		{} + || die
 
 	# do not depend on pyqt5<13
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 156d49b9e01c..e82f9afd9050 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,5 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
-AUX statsmodels-0.12.2-new-pandas-scipy.patch 2752 BLAKE2B 8608a86dd777b7e3fbcac43ddafa36535e36cdf8bfd30d362f4582c3d0b34223d9c59c8ad3a3f549225fab4b82f1eb841c998dd19befd7048d3c1ee6095d926a SHA512 edf5a93b56bda05cda7243c686af43689ed792480b938a8b618b099382612cfa5b89319e3b2d29fc7cd7335964d2404719ee1e0a1fb8098fc07e4060be152005
+AUX statsmodels-0.12.2-new-pandas-scipy.patch 4730 BLAKE2B 2543000c15af63874a8d23ce8ef998e5a29ec8a6181181d22f84691cd6e258749dc202140d73d663d0a9f16cec5097df93d2e40e832e324a391f45f91613ea44 SHA512 51393795a79dda5a7d2a02b4ff7c0a0c669559774114ce5aa7030393eb25747671569331dcc48be9cae7dd98d53a95fd0368dd999e35619295182ddc434c49c5
 DIST statsmodels-0.12.2.tar.gz 17470078 BLAKE2B 7b2a17fe350489888fd05d2275b597ec7cb0f32dcea97daa5c06a973fa53a7b3af40d494c735e30cd65deec9b5dd314c0513454a7c2d2c40e22fd6de3aeb40c8 SHA512 ae4872bc7300ef564407daa8b4076fd70fc180965622ed2173871579e063e2143e000540089923fe171dbb191b7dd872077d8ba6794fe23390331375ec7ce810
-EBUILD statsmodels-0.12.2.ebuild 2058 BLAKE2B 53540f3f3b1b29ee92098d7ba3c9b524e7150d81541ae5b44718b466d8f88c5bf37168d9616d06526c7a16802c4d30fbea2e190b19eda67029c947c6b9b67c06 SHA512 5cea9a0d3ee17f8f87e0aaf950f0555d38e4d225e9d1f66d6de836fef335ff2385aea2cf8df7f7eb35fb3384578b9c4394d15e2c3d4b5bc650dc7593139efe0e
+EBUILD statsmodels-0.12.2-r1.ebuild 2091 BLAKE2B fdd878e9b9c493b46582c2a487911caf80e1f769dcf826d5dcef3bd63cb536a9a1143de9a8208bd42313f17a884d9a1a7b2c86faafaf1bdbdbaa4eb4e6b3b2c0 SHA512 150b64c3e004ed03cbc01dc16edd66f781920a303312016d8e15245fd4776386adf207af0c1e682d95b3e52922ef08dc5fc6d08fd8a6229e55803d1d6e2e5495
 MISC metadata.xml 1343 BLAKE2B a08942814d2fd32d84c562d0d83b3e63dc2ff687808dc892a2871c0a07a100a5f379f61fd934aa3d1557d0dc899d08b57affb2e0ddb540726163166c6adddffa SHA512 6d76846584b1152e7e40e52a523157c0d99ee9addf92c2813dbe3e1886169f66cfb64b2532b24e76e4f128e12a19e147c3748716f1dbf28793118a73ad162200
diff --git a/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch b/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch
index 3015147fc2c5..d11cd08ecf6f 100644
--- a/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch
+++ b/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch
@@ -71,3 +71,52 @@ index d349c472d..2ee1a6e0b 100644
 -- 
 2.32.0
 
+From a9e21aef508ea98da8c5889547b8e5748986dae1 Mon Sep 17 00:00:00 2001
+From: Kevin Sheppard <kevin.k.sheppard@gmail.com>
+Date: Wed, 7 Apr 2021 09:52:25 +0100
+Subject: [PATCH] MAINT: Fix descriptive stats with extension dtypes
+
+Add special path for extension dtypes to remove N/A
+---
+ statsmodels/stats/descriptivestats.py | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/statsmodels/stats/descriptivestats.py b/statsmodels/stats/descriptivestats.py
+index d5ad2f2a5..0fd3eb542 100644
+--- a/statsmodels/stats/descriptivestats.py
++++ b/statsmodels/stats/descriptivestats.py
+@@ -441,8 +441,20 @@ class Description:
+         loc = count > 0
+         mode_freq = np.full(mode.shape[0], np.nan)
+         mode_freq[loc] = mode_counts[loc] / count.loc[loc]
++        # TODO: Workaround for pandas AbstractMethodError in extension
++        #  types. Remove when quantile is supported for these
++        _df = df
++        try:
++            from pandas.api.types import is_extension_array_dtype
++            _df = df.copy()
++            for col in df:
++                if is_extension_array_dtype(df[col].dtype):
++                    _df[col] = _df[col].astype(object).fillna(np.nan)
++        except ImportError:
++            pass
++
+         if df.shape[1] > 0:
+-            iqr = df.quantile(0.75) - df.quantile(0.25)
++            iqr = _df.quantile(0.75) - _df.quantile(0.25)
+         else:
+             iqr = mean
+ 
+@@ -493,7 +505,8 @@ class Description:
+             return results_df
+         # Pandas before 1.0 cannot handle empty DF
+         if df.shape[1] > 0:
+-            perc = df.quantile(self._percentiles / 100).astype(float)
++            # TODO: Remove when extension types support quantile
++            perc = _df.quantile(self._percentiles / 100).astype(float)
+         else:
+             perc = pd.DataFrame(index=self._percentiles / 100, dtype=float)
+         if np.all(np.floor(100 * perc.index) == (100 * perc.index)):
+-- 
+2.32.0
+
diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild
index 9b7aafc2dc08..cb5be6cfc648 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 optfeature
 
@@ -51,9 +51,10 @@ python_prepare_all() {
 	export MPLCONFIGDIR="${T}"
 	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
 
-	# these tests require internet
-	sed -i -e 's:test_results_on_the:_&:' \
-		statsmodels/stats/tests/test_dist_dependant_measures.py || die
+	sed -e 's:test_combine:_&:' \
+		-i statsmodels/imputation/tests/test_mice.py || die
+	sed -e 's:test_mixedlm:_&:' \
+		-i statsmodels/stats/tests/test_mediation.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 8eee17ea4590..36a58024da6c 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.7-r1.ebuild 695 BLAKE2B 3191ad78b76cf8ffb46aa0e0d418ac880b91c476e2b9bd219755fac7193c6cea6cd3b572a7dd013d52e6aa451e8ad59e311e01d042a6b78496fc19d722c2a6fe SHA512 dd8611cc4040dd6f2949d73ce693b58b6e514c85ed3c2803a15379a782002ae1156d938068b27bb5d7346020bf2ef26342ae201a1a3cb723d52452cb3771a526
+EBUILD strict-rfc3339-0.7-r1.ebuild 702 BLAKE2B 9102c363e8254dfe489611193366764510dbe329b7349e95bfb38afcd9d03ce226a5ec4d5e9e43fddcb67a331d6c90edfe1c285e64ba1c7c53c0a3b626d06c0b SHA512 fc383b30e4d23596e126eea71fa591a55b9886eec14c0a622e1f5fb0a2cf8ec6cce49a99961e64eab88bbc0ab8b5cbf761fc4581b040d2acc99013a6ea0825ab
 MISC metadata.xml 409 BLAKE2B a83170ceb11e9949cd533ebdd75312b3944ff17f263d6ade09a67bfddaa8c51b86b64c36f29ce3f940d165b968f60ff61d198e9b1035210f6e0ea07fb286725c SHA512 cebb7901b80fa821caa7d7421f1701664176a16e4f3c78c0a3ab6d71d3c248720cd7f2c6aa9412e3770ca62a3a7f22a09f085093decf301b94d9c22aa9938a1a
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 83059b990226..4b8d3c2cef0f 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 5ce8c7934ca2..d41ce33ce819 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0-r1.ebuild 885 BLAKE2B cf31a167fd99ed12d3970cb048a41b4004648924ca5112b11b88dfb95d966161c47533b947a9b2bb3442c2df8941d15fb6d18d7d96f0468a17620fe898556214 SHA512 a795151a78021cdbe774ee52576d4066fa7d81c5c30ce5a90370d08aae33bee710d23c2a1805a7317eea0ae4e11c40f6e665f91fd97c566473defb4a652bbb57
+EBUILD testscenarios-0.5.0-r1.ebuild 892 BLAKE2B 9eb043bc1edc3617188620402d0879a30763debd905d5e577d61e60307d04e0274b6eedb95b6db4c543e7de9c11bde03bae9a7339f54d8c4bc33eabb3a7ca5b6 SHA512 644e95ada65d555e0680d576738c3b80ae990f3362793ccb6813d788febfffdf53799d2abb74adfc76952255e42e97cde96f7cc609808fb2fa81b89ce89812bf
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index 236199bd4748..ef33bdf56770 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 inherit distutils-r1
 
@@ -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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index d3f1b50c8957..91032077a23f 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.4.0-r1.ebuild 1251 BLAKE2B c0d65293eb06f053bf35200101aff5d07e89b95c76f26999580e92cf8f92315356d8c82e04937a8d703e44b35ecca1b0383a7128b38976b9f1b5c458f57ee981 SHA512 5f3c43ccad1f2f4f38836416b2290fdaf099301c53291ef8b8f43aab1fa7835976a4a339f69339144ff42c11dea29fb5727b0e2a30daa8e5a8fa8689e74fb880
+EBUILD testtools-2.4.0-r1.ebuild 1258 BLAKE2B 77283b33088785e30ae29db540d5ff1d82f3d69f8988558471eff5b2997e7d7c9f6cc92ce1d5ce2f3588ec939d77a191e07177c74a99191ebdb3302c380cb954 SHA512 12cec53f1fd22cf6ea44738f3237b5904960ef6afc1b290261efb4725c51041c55de1f98848dcab705de2a642a0636dacd988a1a5f6ea319bc5db77e2b1c8c3d
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index 9bf6119906e6..7ac7bd38f4e7 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
new file mode 100644
index 000000000000..db1ad9ab5e94
--- /dev/null
+++ b/dev-python/thriftpy2/Manifest
@@ -0,0 +1,3 @@
+DIST thriftpy2-0.4.14.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
+EBUILD thriftpy2-0.4.14.ebuild 880 BLAKE2B 8b711aa1c10aeedc3e4998f9fb50a3ebbbefa96513b4f7283b75854b961566e51e291847541accf91fd9aff58b0640a7fcff656968c44af8f73191a111fe5e22 SHA512 cb62288b5b9ca13d4bf0739effe56e5dab8c1a727b3a4955ae081e8a0a3e4d6430e6dad8872bb2ab1044e5393287cee345d0e52d17005149da8bc24e857291ff
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-python/thriftpy2/metadata.xml b/dev-python/thriftpy2/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/dev-python/thriftpy2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
new file mode 100644
index 000000000000..16727441076a
--- /dev/null
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Pure python approach of Apache Thrift"
+HOMEPAGE="https://github.com/Thriftpy/thriftpy2"
+SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	rm tests/test_tornado.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pushd tests >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index e34edada6722..67904538a4e9 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,4 @@
 AUX tqdm-4.61.1-py310.patch 1030 BLAKE2B 7505087ca6b5db8523a91c831d48f2dcbe34912d6eba34f80f48044bf5ff8a3c0166c02f5b4e2a693dbe49bc8a7db2682813ed495440f3f8f9fc0e69d93d31a3 SHA512 1de7036c469c078028fe0a9044ecb0ad1dc16d3642d65d13a7c61e6fccac9bea652da0dd385a238ed68a423d481b5bbaa09b2deb9a859a07d64d2eee617c53e8
-DIST tqdm-4.60.0.tar.gz 174201 BLAKE2B 78f4e2c2189621b5d276b8a9c75bae1566b05888cce81d8281de358ad2817e9751395bcf529c07620cd1ec4431c78ed7c1400dc96e9c3a99ac92daf2551b2da5 SHA512 e76dda97323353725c8e30b254bacfa328b4708d37ba2d21dadd30fd26e76605d8f077f02f2047030c6ab9761710a0e86640153fee0e3a3f972db12266fcfde2
-DIST tqdm-4.61.0.tar.gz 169471 BLAKE2B 6710b057bc5cab7afc72681c469618b442d47a0aec4300f52a360af41fff082a96d3f67cb650978c924df210a1c56e2856f181d55cdcc5692713d53581932144 SHA512 7c13c98572ac2800b695cf38d6de84b348c20967187dfcd3a358fc3a9999bfda509d3b4fbb77272840e1568ed975fc038cfb4034288c72560e09a58fbdc636f1
 DIST tqdm-4.61.1.tar.gz 169637 BLAKE2B 8b89f320e13119b24a9e121747bce0b5c6625c31feb8c427a97e71da52797d9de764ce5e5c41c07d5954a1e5e4e21913335a4691837bc243db473821b2dad1ac SHA512 6092a30389380a511abc8bee7e6144556d6dc1a993ba4a2685707afa2838a12f472aa216ac5e55d144da74f9be1d398d4c6f5352986a200557e4aba67831a505
-EBUILD tqdm-4.60.0.ebuild 1188 BLAKE2B 999390ed0073e8bc219b227f3b8015173ac05ecdb90eac7c68d58b4d6c3ece9a1d1dc772287f04718d0d7559d7272588204d5ad7e02daaf5e837c1640e21e397 SHA512 db532b87c1cdd6e7e89b047547070eb593ab03bdaea756a6ac97939e8b17a16010a8df68e1028002e8be56cf470ffcd869efba3d342108a6ddd2ec3bde824d06
-EBUILD tqdm-4.61.0.ebuild 1162 BLAKE2B a64cea2e3f57811f642377ab1ab1ff5addc6265db5b99e7b87f2b3c00a5f667d2b405fe0f473bd1861eb60592f3dd2590185f17a2fb1440b8976dd78dbf0ec65 SHA512 f8238f80c87396942e8eda8204392afb283bc77a3be0541a887a23b12c5ffd6b243db35a745997dd1b8ed3dd567168c16af92e7ab463d1122ba3c6627e8f0b2b
-EBUILD tqdm-4.61.1.ebuild 1208 BLAKE2B a6d62ea22a3f8537de5eb2905e4aca8492cf5a17f1e0d780285c4d762d214de28cbd02ca7ed6d39af1df6436385b8320066789811be59aa5e4d461071ac356c6 SHA512 3567873f7dbbe30d371e76d3dda28f30d009f04adf1e805654c84e1801d3ce84a273d97ab5a4ab1c47f5d7476eca010c8c6a9bd4dccf6d702096d888bb5b9a74
+EBUILD tqdm-4.61.1.ebuild 1200 BLAKE2B 0a796c10c2f1d1da67c2790fbdea9192b2ab613427468c73c6e3ba395c10a0aeb7d9db0621a8aba0bba23cd72176f8b7c442069f7c7b12cf46200a685b726945 SHA512 486fffe2e60ef08a9924ecb81588c4a4dace8d1aa5576ed8a2018e1485dab2381c4c176c92fd0cfd75a901433bbe5adf808d9643c4124c330dadf1441ddc60e3
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.60.0.ebuild b/dev-python/tqdm/tqdm-4.60.0.ebuild
deleted file mode 100644
index 107d99ae72dd..000000000000
--- a/dev-python/tqdm/tqdm-4.60.0.ebuild
+++ /dev/null
@@ -1,53 +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=( 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/tqdm/tqdm-4.61.0.ebuild b/dev-python/tqdm/tqdm-4.61.0.ebuild
deleted file mode 100644
index 4cec8fab24b5..000000000000
--- a/dev-python/tqdm/tqdm-4.61.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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/tqdm/tqdm-4.61.1.ebuild b/dev-python/tqdm/tqdm-4.61.1.ebuild
index 528745331573..f9721f3b05fa 100644
--- a/dev-python/tqdm/tqdm-4.61.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.61.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	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"
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index e7265dffd0b8..0f289e844e91 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -2,5 +2,5 @@ AUX traitlets-5.0.5-python3_10.patch 1221 BLAKE2B a3f8617f09ae6a5def19d319d2e488
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
-EBUILD traitlets-5.0.5.ebuild 679 BLAKE2B a602d7947c2ec6aa58ad93ec901952a9e76ddc8b77c890b9033d46fcb0ec2916e04e05e1facd46db76e9822dd3b1713ef74847220c1b237c277e6da83bd18f36 SHA512 6ee7933de6af6c74ab4aa87ed6696ec4012837e53b2f3fb5a2c2f43436d5fcdbfe95caa4a673a2bc1c93c08c629692a3d192a1dd54306cd79ae43299fde045ff
+EBUILD traitlets-5.0.5.ebuild 679 BLAKE2B 443af87c2d14ca5fc2c0169a91c2a76dc6157b4daf7bae0723b88a8d2404d1f46babaa6887687b5918272081c4032ccdd5c525c09ec3856eb2df9d5c82bc14fb SHA512 c9f2b48c195c833e61c2f9d3ea99fe5b2be2c887750bde3c2378f37d8e7d0783573646e673763c0985ad299bbde1a3bcf065aab7bcb16918887281fc12fe21b1
 MISC metadata.xml 736 BLAKE2B 4b61d7d9106717f7233fb7e4ad676efe0d543a0585ec99165d2253d75128e99be4336fcf8a473f0bb161d41d479b458b4470efb1ec2dfa6820d4a82939f8723f SHA512 5261fe54741b898efc3290f3b939fefd03a6686b2be0d43e8a9eb0bd5e506e7df4ef04bfcd6079f69e83e4c88aa6d035e572a9d6a577f1f4e8b56e01c49b0b89
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
index 2784aa2aacdd..e691554d0cf3 100644
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 722c61b967d7..81b95fcdd07a 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,3 @@
 DIST transitions-0.8.8.tar.gz 1100609 BLAKE2B 18ebbb1d45e33e7933208b043b56dca40e8dcda936ffc2af4c38ad9325f3e19c0d3c9a35e4d728be05b97feb47eb922fd48317018761bc5c3243887d2f077e33 SHA512 ff6c039ed5ce9fe484c3469d2aee791010a99af7a9bc8777842f1514d7eca3fd7714694240cb57839754367c58228d59b41a88f12c2b7d75353f75e63768160d
-EBUILD transitions-0.8.8.ebuild 1003 BLAKE2B 89bb3764cb0e2637a85061f64890d4548a482b93953b6a0e4e3a0b4e19de8b4a4f7bf6c1d3b849f353a72d1196ce67fabbf63919d7c1a0efa8dfee78ffda4132 SHA512 555c6d27c60ae73e34198482f6eef49475733440652f461dbbb83491202275ed8c1654806a3570cdc84a86fe86d5a14c09ec16e5ae4451d3ee51a17c1e6d6b67
+EBUILD transitions-0.8.8.ebuild 1004 BLAKE2B b296c0f1a80a7c13ecaca768698c7c6261383d36c65e582a75ef47aea39a57979aa641f298357119598188bacf09d6de37cd9334adaefeb6e006099bdea8797b SHA512 eea7909902ec9a3ba6cca45b09132e8bf7f1715d4d63cb3575c495f609f08f86b16f061599c41231982103d6b69bc89c3dae63e85b7d5d77c8c8d1cc1974a6a5
 MISC metadata.xml 862 BLAKE2B 32352ca5b3a7877cee77cdbde85ad75db077f8b9de8e7d38bcef726db2e071095fb17c41075c457c226a0756ecc321cae83fdc2b82a21480a30cccf2e7b4ccd2 SHA512 23ff20aa82f9d97efc8b0a396f8dc289c91d3e8ffd3335757369bc45012319120614e276c719d9e5f61b7877ca37689a7f6576ad1107bd8d5135857f2fbe0b7e
diff --git a/dev-python/transitions/transitions-0.8.8.ebuild b/dev-python/transitions/transitions-0.8.8.ebuild
index fed98ff0c272..d1f71b2a5c26 100644
--- a/dev-python/transitions/transitions-0.8.8.ebuild
+++ b/dev-python/transitions/transitions-0.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 0db1b0104b3d..4ae2961b2aec 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,3 +1,3 @@
 DIST ubelt-0.9.5.tar.gz 193739 BLAKE2B 90597750c9ae1c1a4aa9d3180119665a6d1bf9fddb57f220d8ab6d8d0daf521d4e2648247753446e0e285b9f24f57c35d10abdcdd06e566fdd3415c77f10e50d SHA512 fbe17001c03da513238ab2ae101a9ac8c334943e88bf3037243c8ad4998e42a38e2907a408866a8acf2f7e2061c86a186b7955429564a6245ffca2bed25b8e54
-EBUILD ubelt-0.9.5.ebuild 816 BLAKE2B 1978ce7f08a5d90ac94deb99784306e1b5d9f3ecc0290d3f4f7080a91c2e1a80f2f45feed20429bbf142c91133a36b5a83b1e2f024a546b26525ddd58f5d267a SHA512 aa1c07e42c652e3c09481ee3aeab3d93eaa1ef818e2981daa3fc8cc43c3c44a9f828b55db6cdb5533275cdfba865f7c5b2dd05c01ca2f7307e09de74adf8addd
+EBUILD ubelt-0.9.5.ebuild 776 BLAKE2B 2b81bb522dc0523e362221f3048a4b68d4139ff66361e97825425c571fb2f916637d9a43914a2869ddef62dd9dcf513cc22f4a66873c37d04f2d96d2288306e4 SHA512 677336d086985942cbc5f47b64a31b1172eaf9ce7a5c474e534b19201e364e11b0a5bc11b76fec4f0add76efbea875655263bd81e983ecef0cb6ba5f5b140e26
 MISC metadata.xml 321 BLAKE2B 9fadac1ff4e3774c664efafe500d280bb5573ab07b9a3c8a03cc7ea27327d18c4e570fe2f65694ac53240f5a0952df896d54fa3ad86594f201837e88a19d22cb SHA512 bfd89aad2ec12d1a6b364344b3b11d4d78eee4b97d3a0505cf0271ac884b20a5561985752045819046979fa74760c482766adf86de034f2cc553d2a53f6ebc71
diff --git a/dev-python/ubelt/ubelt-0.9.5.ebuild b/dev-python/ubelt/ubelt-0.9.5.ebuild
index 1505cc0f7ac7..e906563da37c 100644
--- a/dev-python/ubelt/ubelt-0.9.5.ebuild
+++ b/dev-python/ubelt/ubelt-0.9.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -28,6 +28,5 @@ python_test() {
 		ubelt/util_path.py::userhome:0
 	)
 
-	pytest -vv ${deselect[@]/#/--deselect } tests ||
-		die "Tests fail with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect } tests
 }
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 7dcef89bcfa5..6fb55b85b2fc 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -3,6 +3,6 @@ DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11e
 DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
 EBUILD urllib3-1.26.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
-EBUILD urllib3-1.26.5.ebuild 1970 BLAKE2B c59e0c4b55feb44a0880f19ab50ddf8ff49bda077d89acc071bea27211ebcec6f8f41c275b2e87a2395311ce380d5e547f554315ceb0807f6780e0fec151256f SHA512 7cae227afbfe5d4b8ca30f5a85e2267af6108a64f04cdc96a3b474b7f039dfc9326aada8636758817a3dfe5f66039db58fcd0de2cb4b456c4410723ccafad187
+EBUILD urllib3-1.26.5.ebuild 1962 BLAKE2B 619160dfebe98b7497545a2044c4af5522b54d3b53a956c86041bb50588562784feb41c32faaded7feb7769e364029a695decd7a22ecc5c5673a4bba5ece4aa6 SHA512 a54a2e38a40e134c8cf8fab84b99f5a810ae89452a0204ef12ee695b3aa3d616887b6ec3d908447c2f807a258050bd55ecd4a05687f38a7811f82486cf9b454e
 EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.5.ebuild b/dev-python/urllib3/urllib3-1.26.5.ebuild
index 43e5b4ba02ba..a718303d1a5e 100644
--- a/dev-python/urllib3/urllib3-1.26.5.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 81a2c5ba2ec3..5acf6702abd0 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 1445 BLAKE2B 2886ead28eff8854f2ea2ddf5ae417900e51fd85d04d91c2dca08ee0250c4aff5756911d8cc521e45b41799bea004ba7a4cdaaa0cd95a081d690ae8207b1be1f SHA512 e2bdfa7e6352ba04b2ddeca200befccf49329b9a04c15a03c563fcd1e1b5ca169e359c78f899066170860ec70cbc9e7b689469d21956a04d7a7d70d0954b6322
+EBUILD vcrpy-4.1.1.ebuild 1797 BLAKE2B 87e84d360a0d88724e45bf24d096becc6254598d588cd2192aeb477da649288ff6f62fb27b21e5579ffef5a73c54436e4c803e35e2d7d24c3b3e5acf3821b6cc SHA512 10d6eb6e92d2278caf9a3cb35b7e9cbf2097f73f416e23d36252852f596d6f4a98054643bbe95080330b731a92252a23c095bc0056844eb0d38e915f47e8f3db
 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 d110bfca31a6..e54023e451ac 100644
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
@@ -32,20 +31,24 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# tests requiring Internet
-	rm tests/integration/test_aiohttp.py || die
-	rm tests/integration/test_boto.py || die
-	sed -e 's:test_flickr_should_respond_with_200:_&:' \
-		-e 's:test_amazon_doctype:_&:' \
-		-i tests/integration/test_wild.py || die
-	sed -e 's:testing_connect:_&:' \
-		-i tests/unit/test_stubs.py || die
-
-	distutils-r1_src_prepare
-}
-
 python_test() {
+	local deselect=(
+		# these tests require Internet
+		tests/integration/test_aiohttp.py
+		tests/integration/test_boto.py
+		tests/integration/test_httpx.py
+		tests/integration/test_wild.py::test_flickr_should_respond_with_200
+		tests/integration/test_wild.py::test_amazon_doctype
+		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
+
+		# probably unhappy about ssl module being more strict now
+		'tests/integration/test_httplib2.py::test_effective_url[https]'
+		'tests/integration/test_requests.py::test_effective_url[https]'
+		'tests/integration/test_requests.py::test_redirects[https]'
+		'tests/integration/test_urllib2.py::test_effective_url[https]'
+		'tests/integration/test_urllib3.py::test_redirects[https]'
+	)
+
 	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	pytest -vv || die "Tests fail with ${EPYTHON}"
+	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index e786f7e99f29..53837ca26474 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,3 @@
 DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
-EBUILD versioneer-0.19.ebuild 860 BLAKE2B 9da61b021b2af28efdab7783d2d47069070055248fab711535965c05cf2981ececb62618333c3a34270fa49dc53f9b4c0b68368ca1dec6744bc73881c1a505d5 SHA512 996292d616487f9d9e2b96b292098e9fbb64e32fd3a112293694746a1d7949786f41cfa58b342f96ccac2d9d18abffa1beb7222566779f714970c394e39f44e8
+EBUILD versioneer-0.19.ebuild 867 BLAKE2B 604a83efa3527d3b3981f247401d775d6f48bc2d2a79963429b7df09db63546446abe5f8fb20a5cb934eceb5a12708a5bc3bf8965f891c80725f4f5a56b5d28b SHA512 47556240dff382f65a669d74f8bb12299821c9510db2273bf3bbb8b2b93957a2e6d6698be2a0d6cb33ee1ad0da66edf6a9b1af42c8400df5323d21084daf2dfe
 MISC metadata.xml 425 BLAKE2B 70d2a29bcd352f61add9b6ec9f302712d3f14556c3827c55273b4b2525c7f1b36c4ae2b2e4056aff955e864128d9e106b1c0a0424129818082047af19d8bb03d SHA512 4e2f07cd10a1dceebd43c8bdfda3c546a924b5283bd31417cecfe5b5af6b5868915f9e3343694a503c51bbe71fc9644c39f9335471b0ec98fcf780caa20f49c3
diff --git a/dev-python/versioneer/versioneer-0.19.ebuild b/dev-python/versioneer/versioneer-0.19.ebuild
index 7575c2e1e409..a29082db4939 100644
--- a/dev-python/versioneer/versioneer-0.19.ebuild
+++ b/dev-python/versioneer/versioneer-0.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9eb933a7577c..c1b47ca7529f 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,10 +1,3 @@
-AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b230c2502691f36f49502427c234c8b2da1a2d187791aced234fd70f7be98b98ff158f570747e670cc0ededdab1d5ed499d7b8588be SHA512 17f2a38d32f17c7f8bfe138939b6953dcbf13404371b8377a47759118ad37aaf73f45f670d46d5956fd5948754fb9c60248d9222920c6fd7e7c2e7c7661c9a18
-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.4.tar.gz 10579531 BLAKE2B 9e10c07bd191d745d6904f304787a3913c0c574bb4453549796052f27329cbc2e3700fbc6f40ff02f4e94b8f1c21458c8fbd706b05ae458c033722d3eaf04f2e SHA512 acc528cccfc80aeed2fcd7209cab7ff0f1a7d1dc01a59fdb6a07703c7905904ab68d3f4ff312e108c687d03495e82ed8d26ecc15c2b17b9e771605a46164b4bd
 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.4.ebuild 4307 BLAKE2B 24e82320a9e8868ef3792f41e07c05020536bff5bb3a352776f000663288f280b5722c58f1e36996488b2d81b21336243806539c0b611226b9adb12e1ca1f154 SHA512 1fb4b61299cefb90d8e1e035ebaa268ed6e378b916364c4f7dcc4b9d264f17a3e92b4aa959a203c4ba8e27a1f4751a501e5db98c257ffc6f88fa04ca66d0216d
-EBUILD virtualenv-20.4.7.ebuild 4210 BLAKE2B c9fcb852c71c09231b69d548d554229a1015ca8a177fe2d332f6aa1ac35dbbe8ac557bdc180498c8d6ea725c6d55edf727496f782cb47e0ee4717b158af2a3c0 SHA512 ab09036b3ce6c1257079325650c3eceb8e750c70ff6aac8e387d11bd4d3008b19ec2ad1c3beb5128148307fb3263d92ebb1807e652e17637853846e30a682c26
+EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
deleted file mode 100644
index 97baeb59c4eb..000000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests-internet.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/tests/test_from_source.py b/tests/test_from_source.py
-index 39d7c05..76834f7 100644
---- a/tests/test_from_source.py
-+++ b/tests/test_from_source.py
-@@ -40,6 +40,7 @@ def test_use_from_source_sdist(sdist, tmp_path, clean_python, monkeypatch, call_
-     )
- 
- 
-+@pytest.mark.skip(reason="needs internet access")
- def test_use_from_wheel(tmp_path, extracted_wheel, clean_python, monkeypatch, call_subprocess):
-     """test that we can create a virtual environment by feeding to a clean python the wheels content"""
-     virtualenv_file = extracted_wheel / "virtualenv.py"
-diff --git a/tests/test_source_content.py b/tests/test_source_content.py
-index 8eae6bc..06763ee 100644
---- a/tests/test_source_content.py
-+++ b/tests/test_source_content.py
-@@ -41,6 +41,7 @@ def test_sdist_contains(sdist):
-     assert not extra, " | ".join(extra)
- 
- 
-+@pytest.mark.skip(reason="needs internet access")
- def test_wheel_contains(extracted_wheel):
-     content = set(extracted_wheel.iterdir())
- 
-diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
-index d084af6..93d29e1 100644
---- a/tests/test_zipapp.py
-+++ b/tests/test_zipapp.py
-@@ -51,11 +51,13 @@ def call_wheel(tmp_path_factory, call_subprocess):
-     return wheel_make_env
- 
- 
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_zipapp_basic_invocation(call_zipapp, tmp_path):
-     _test_basic_invocation(call_zipapp, tmp_path)
- 
- 
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_wheel_basic_invocation(call_wheel, tmp_path):
-     _test_basic_invocation(call_wheel, tmp_path)
-@@ -97,6 +99,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
-     _test_invocation_dash_p(call_zipapp, tmp_path)
- 
- 
-+@pytest.mark.skip(reason="needs internet access")
- @pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
- def test_wheel_invocation_dash_p(call_wheel, tmp_path):
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch b/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
deleted file mode 100644
index 41d3240d47d3..000000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.7-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
-index 620c0cb..946233b 100644
---- a/tests/test_virtualenv.py
-+++ b/tests/test_virtualenv.py
-@@ -356,6 +356,7 @@ def test_install_python_bin():
-         shutil.rmtree(tmp_virtualenv)
- 
- 
-+@pytest.mark.skip(reason="This test does not seem to be working, and I have no idea why")
- @pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_always_copy_option():
-     """Should be no symlinks in directory tree"""
-diff --git a/tests/test_zipapp.py b/tests/test_zipapp.py
-index 8ef8bd1..d084af6 100644
---- a/tests/test_zipapp.py
-+++ b/tests/test_zipapp.py
-@@ -51,10 +51,12 @@ def call_wheel(tmp_path_factory, call_subprocess):
-     return wheel_make_env
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_zipapp_basic_invocation(call_zipapp, tmp_path):
-     _test_basic_invocation(call_zipapp, tmp_path)
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- def test_wheel_basic_invocation(call_wheel, tmp_path):
-     _test_basic_invocation(call_wheel, tmp_path)
- 
-@@ -95,6 +97,7 @@ def test_zipapp_invocation_dash_p(call_zipapp, tmp_path):
-     _test_invocation_dash_p(call_zipapp, tmp_path)
- 
- 
-+@pytest.mark.skipif(six.PY2, reason="seems to be broken on python2")
- @pytest.mark.skipif(sys.platform == "win32" and six.PY2, reason="no python 3 for windows on CI")
- def test_wheel_invocation_dash_p(call_wheel, tmp_path):
-     _test_invocation_dash_p(call_wheel, tmp_path)
-diff --git a/virtualenv.py b/virtualenv.py
-index 0c47e4f..d4a1747 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -80,9 +80,9 @@ else:
- DEFAULT_CONFIG_FILE = os.path.join(DEFAULT_STORAGE_DIR, "virtualenv.ini")
- 
- if IS_PYPY:
--    EXPECTED_EXE = "pypy"
-+    EXPECTED_EXE = "pypy{}".format('' if sys.hexversion < 0x3000000 else '3')
- else:
--    EXPECTED_EXE = "python"
-+    EXPECTED_EXE = "python{}.{}".format(sys.version_info.major, sys.version_info.minor)
- 
- # Return a mapping of version -> Python executable
- # Only provided for Windows, where the information in the registry is used
diff --git a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch b/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
deleted file mode 100644
index 1e9268a5f976..000000000000
--- a/dev-python/virtualenv/files/virtualenv-16.7.8-tests-pypy.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
-index 620c0cb..3284cea 100644
---- a/tests/test_virtualenv.py
-+++ b/tests/test_virtualenv.py
-@@ -5,6 +5,7 @@ import optparse
- import os
- import shutil
- import subprocess
-+import platform
- import sys
- import tempfile
- import textwrap
-@@ -342,6 +343,11 @@ def test_install_python_bin():
- 
-         if virtualenv.IS_WIN:
-             required_executables = ["python.exe", "pythonw.exe"]
-+        elif platform.python_implementation() == 'PyPy':
-+            if sys.version_info.major < 3:
-+                required_executables = ["pypy"]
-+            else:
-+                required_executables = ["pypy3"]
-         else:
-             py_exe_no_version = "python"
-             py_exe_version_major = "python%s" % sys.version_info[0]
-@@ -549,7 +555,7 @@ def check_pypy_pre_import():
-             assert module in sys.modules, "missing {!r} in sys.modules".format(module)
- 
- 
--@pytest.mark.skipif("platform.python_implementation() != 'PyPy'")
-+@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_pypy_pre_import(tmp_path):
-     """For PyPy, some built-in modules should be pre-imported because
-     some programs expect them to be in sys.modules on startup.
-@@ -622,7 +628,7 @@ def test_create_environment_from_venv(tmpdir):
-     builder.setup_python(ctx)
-     builder.setup_scripts(ctx)
-     subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-setuptools", "--no-pip", "--no-wheel", ve_venv_dir])
--    ve_exe = os.path.join(bin_dir, "python")
-+    ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
-     out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
-     # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
-     assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
-@@ -639,7 +645,7 @@ def test_create_environment_from_venv_no_pip(tmpdir):
-     builder.setup_python(ctx)
-     builder.setup_scripts(ctx)
-     subprocess.check_call([ctx.env_exe, virtualenv.__file__, "--no-pip", ve_venv_dir])
--    ve_exe = os.path.join(bin_dir, "python")
-+    ve_exe = os.path.join(bin_dir, os.getenv('EPYTHON'))
-     out = subprocess.check_output([ve_exe, "-c", "import sys; print(sys.real_prefix)"], universal_newlines=True)
-     # Test against real_prefix if present - we might be running the test from a virtualenv (e.g. tox).
-     assert out.strip() == getattr(sys, "real_prefix", sys.prefix)
-@@ -657,10 +663,11 @@ def test_create_environment_with_old_pip(tmpdir):
-     virtualenv.create_environment(venvdir, search_dirs=[support_dir], no_wheel=True)
- 
- 
-+@pytest.mark.skipif("platform.python_implementation() == 'PyPy'")
- def test_license_builtin(clean_python):
-     _, bin_dir, _ = clean_python
-     proc = subprocess.Popen(
--        (os.path.join(bin_dir, "python"), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
-+        (os.path.join(bin_dir, os.getenv('EPYTHON')), "-c", "license()"), stdin=subprocess.PIPE, stdout=subprocess.PIPE
-     )
-     out_b, _ = proc.communicate(b"q\n")
-     out = out_b.decode()
diff --git a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
deleted file mode 100644
index 1699ef11452b..000000000000
--- a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,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="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
-	# disable tests that need internet access
-	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
-	# test fixes for pypy
-	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-python_test() {
-	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
-		die "Could not copy LICENSE.txt with ${EPYTHON}"
-
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
-
-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 /usr/bin/python2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.4.4.ebuild b/dev-python/virtualenv/virtualenv-20.4.4.ebuild
deleted file mode 100644
index 5de5c2f6118a..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.4.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.7.ebuild b/dev-python/virtualenv/virtualenv-20.4.7.ebuild
index bf01692c6690..04a7f9cfccd5 100644
--- a/dev-python/virtualenv/virtualenv-20.4.7.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.7.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="
@@ -46,9 +46,11 @@ BDEPEND="
 		' 'python3*')
 	)"
 
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
 distutils_enable_tests pytest
 
 src_configure() {
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index b91b3703db79..c68e9d2346c3 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,3 @@
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.11.1.ebuild 608 BLAKE2B 639ef662c50940c51b59020ab87ba7baf7f80dfbdc159ee95c598ea01f009657bc1fcbd732589f48bc23f668da155126ae35751455e0ae6b7a718319eb9a62bc SHA512 1e3089f441804eedf1dd97bef44a032c4a2d2ed126473782bcaa40a964a2b83f238f65b34dd61bb7de4a5943a4f4f78f7529fe162bd9fd035d4b1a0b0c267592
+EBUILD webcolors-1.11.1.ebuild 615 BLAKE2B 8c21882b86437b86d0175c92c1991c91f44ee7789039f7d4ab65922de8b620ab433b0ea5654b891e410d2e6a26e3ae53b217a17b0a35ddd5885ea3341ff47132 SHA512 32b54236a07c19936d754f85043f96b57362acb208c730809eab52783fa2cc649d2f57cf1f04586aa90f4373af8ad39c522b2e98e118595273c84b09f4bf92a9
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index b257d1c8c67e..31a61c72bfe9 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 883dd6987c57..429c712741ae 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,9 +1,10 @@
 AUX werkzeug-2.0.1-py310.patch 2951 BLAKE2B d820edb9a7e8d94e1783b3a5e2dcb1a12993b00bba92593257447063073a8f9ae0787241ffd2c80776906bb28089c463b32996b7602aa9ba4a15234eec8986a0 SHA512 5f0692374be1af49dd14c8793ee827fe584e5f3d81845f7b57050c3c2ddfd7bd61812ce5d5be527c26562cbfa2c1dd0cf3932fe8e8019f8cd4e48d1d2c8c1e15
+AUX werkzeug-2.0.1-test-warning.patch 2830 BLAKE2B 292f19ade3dec20def690e56caa5191bb4a8df730c6e7476b1b26aaa52de362c0804e4d03919b6df957f51b75a735546c748553b2d90862e597381edc87d7265 SHA512 7e640954110367c631f534cb3355544fa792fc841e3f70c8de0db31a088f3b05cc81094f935b0b1b3a45c0b173115a86126f525ba8963bfaf9f96cb6d60e24b1
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
 DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb8f0d05a8cd49f09707c368b6f9649b299f427fa7bc2e54628cf3eb688c399e420ecd54f12d7eab9cb063c7c740b07 SHA512 8c8e36a58fe53ac4ad3152a34145c726a9145782262b9d47be7bfe9a8e127666b0d0c0c50d305277a153298644732efe37e3785ceaa5b11394adfeb70d86e70d
 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 1116 BLAKE2B 5dc70636a9d15c0fc897ce99d224e1cfd79e97e002dde0d742a727b7f6504ca90723750eb5e5214819654fecb1efe5b505429b04284b63016547d214ce7f61fc SHA512 bfbac4ca0151612338ad853851493ea03306ba6108ee74049098ace25376404e39f9b5406e81747dca0c696a5152a03514705185285cdfca30a2c6a63df99542
+EBUILD werkzeug-2.0.1-r1.ebuild 1155 BLAKE2B 03df232bcab1b3811f57c4beee117171081805f31a28dd61e076009797dedcd4527104c948de1dde38f5c14e86f262332ecf3db72dd3e5bf8eab26be54acab2a SHA512 e6effdb1c441442e1fd7dd0777cfb165666577b99a70a0ed0b1df4df0398e2e5528d19b551d613a72ec2cda7c60a0b0e49bbea71e6a064623b19a17eaf765d7c
 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/files/werkzeug-2.0.1-test-warning.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch
new file mode 100644
index 000000000000..3bb14ab6ba42
--- /dev/null
+++ b/dev-python/werkzeug/files/werkzeug-2.0.1-test-warning.patch
@@ -0,0 +1,75 @@
+From 4201d0f6d1b337a0e69900a79042215896eede4a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 19 Jun 2021 09:51:43 +0200
+Subject: [PATCH] Fix warning tests to work correctly without -Werror
+
+Use pytest.warns() instead of pytest.raises() to test for warnings,
+in order to make these tests work correctly without -Werror.  This does
+not change the behavior with -Werror.
+
+While -Werror is useful for package maintainers / CI, it is problematic
+for testing on end user systems.  For end users, it is important whether
+the particular version of package is going to work on their setup,
+not whether it does not use anything that's deprecated but still
+working.
+---
+ CHANGES.rst            |  2 ++
+ tests/test_wrappers.py | 12 ++++++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/CHANGES.rst b/CHANGES.rst
+index 8fa1e454..9a05145f 100644
+--- a/CHANGES.rst
++++ b/CHANGES.rst
+@@ -5,6 +5,8 @@ Version 2.1.0
+ 
+ Unreleased
+ 
++-   Fix warning tests to work correctly without -Werror
++
+ 
+ Version 2.0.2
+ -------------
+diff --git a/tests/test_wrappers.py b/tests/test_wrappers.py
+index 3ac80003..fe8c01f3 100644
+--- a/tests/test_wrappers.py
++++ b/tests/test_wrappers.py
+@@ -1633,29 +1633,29 @@ def test_response_mixins_deprecated(cls):
+     class CheckResponse(cls, wrappers.Response):
+         pass
+ 
+-    with pytest.raises(DeprecationWarning, match=cls.__name__):
++    with pytest.warns(DeprecationWarning, match=cls.__name__):
+         CheckResponse()
+ 
+ 
+ def test_check_base_deprecated():
+-    with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Request\)"):
++    with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Request\)"):
+         assert issubclass(wrappers.Request, wrappers.BaseRequest)
+ 
+-    with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Request\)"):
++    with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Request\)"):
+         assert isinstance(
+             wrappers.Request({"SERVER_NAME": "example.org", "SERVER_PORT": "80"}),
+             wrappers.BaseRequest,
+         )
+ 
+-    with pytest.raises(DeprecationWarning, match=r"issubclass\(cls, Response\)"):
++    with pytest.warns(DeprecationWarning, match=r"issubclass\(cls, Response\)"):
+         assert issubclass(wrappers.Response, wrappers.BaseResponse)
+ 
+-    with pytest.raises(DeprecationWarning, match=r"isinstance\(obj, Response\)"):
++    with pytest.warns(DeprecationWarning, match=r"isinstance\(obj, Response\)"):
+         assert isinstance(wrappers.Response(), wrappers.BaseResponse)
+ 
+ 
+ def test_response_freeze_no_etag_deprecated():
+-    with pytest.raises(DeprecationWarning, match="no_etag"):
++    with pytest.warns(DeprecationWarning, match="no_etag"):
+         Response("Hello, World!").freeze(no_etag=True)
+ 
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
index a6c56f6d470f..2a62f10069ba 100644
--- a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
@@ -37,6 +37,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${P}-py310.patch
+	"${FILESDIR}"/${P}-test-warning.patch
 )
 
 python_test() {
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 18374a75b5cc..29877548a20d 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,3 @@
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
-EBUILD widgetsnbextension-3.5.1-r1.ebuild 492 BLAKE2B 4e9146ab0ba34bc8a64a6e56dec8fda92544899fd275196dd05fb2580ead322d7c9e41a5b3d42426889886e8e839e44aa2891c04cee3784cd2754707f925a39e SHA512 03f477a1c61a26eb91b1555c93f3e958a51b4902c7eabe697cc8d327cd913fa1056428dbcb143e75ff85e5aa4eb72ecb79a17a7321dc8c5a70df86710a986a5d
+EBUILD widgetsnbextension-3.5.1-r1.ebuild 493 BLAKE2B b2ef0e37243db898bc0084f5ba5fbaa53e22375be12e0981813b3b8f2611d91ac84f70993ed15e3dec1b05e656c8cb70adb604b0ed82412ce12c5db0dfa215e6 SHA512 9b0a29d8d6c80cf1a4aa63310d58f2259823ae185c28379030571a0f134e62d8dabae1b8c1f0f8e64dfde06fbb33e516c83b5817b7035ff330c56ced582fb14f
 MISC metadata.xml 544 BLAKE2B 5ae92f8adf45b22143aa1717552f19fdc586fc657fa2dd8a335903fccae5a60967d4af5a2f11051baa03ad816d592918dee2828f5fb57355ba61a481cbab4357 SHA512 6231ffbb4147fa54e4889732d11dd7a2791c69ba947b7a803e8cf0a299dc91d1d3a4a9ab4b6f1c2b100b65991f7747b6c66f53324eb39386a706f16d00ea696f
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
index c367013d909e..149b6d7b4145 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 90a7d91f392d..8e9360f833c9 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,7 +1,8 @@
+AUX xarray-0.18.2-backports.patch 4296 BLAKE2B baec8fba250bf160e2a56873439ebfbdad06d49f6dc7838379c86b03dbb1d9cd123e8a617d44f4dd3b1cd93df5087dd37b3a5307bcb402eb9fe6f71a64276cfe SHA512 043c8bd86cbd08cef1629e7f4b4dc2b225dde73d2a1f54ffe787bcf568f15aaa5c9eb096eb0156e5fec4f519808ffbe402e2d4f36092a1432ad4ae860b896c83
 DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
 DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e5728ac6bfd3b9f104b24cc619cb1d0f05bbe6911e952c312ef229dbf1a68842b75dbb0ecf811fcc7d6e78569b0 SHA512 e1842d7bf06ee23716038fd58e7ae3a2014012cbc49394c9000272cb0498c1d333cbf3133b1d8fcdbddd524d44f6fa5fcc117c992d0ab1d3d0b9c4ddfc317847
 DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d
 EBUILD xarray-0.17.0.ebuild 1090 BLAKE2B 95aa23f92a87a18dfbb8eafb225bb00ad0d8803d153bf6dbc7c14d2098bd396f2a423642c7f0dd55b0ae3a4a0f9d0c91c4e07470e2c35b9a6d7860cf3e437a43 SHA512 7b1774d9f94f1510d3e470e4a887a8bdb9986a4a4825d42737adb45492b5701f678da43ad8f4466d52ee28a1847f7470653fe042185be7bdb950319512f36fb9
 EBUILD xarray-0.18.1.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
-EBUILD xarray-0.18.2.ebuild 1091 BLAKE2B e9df67d9c68b9d7c1fc835395dd9d5ceb70425a175f2fce50dea22f549630dbf97b0e5892129eb1827b460a5dffbe15bc31913cab26af2e7536c1de391d01cad SHA512 3d19125fa782108e5ea610bdd36976a69904f041d6c05033d3262c40cf06b665030c03afcd3146871ca9e64f23e359034bbd9679ae45db60a39a24f29c730dd2
+EBUILD xarray-0.18.2-r1.ebuild 1141 BLAKE2B 338570635e45d5ab3338db0755ec1d68cfecd6bb26a13aaba05e05f1d434271b4c62ad5e01058257fa4745a6bba3ce42e54ed19bdd2457805f3b4e13085b0659 SHA512 bf468d1fc27df838d8b97891633628bbe83f5df16892deebb0771cf514af0e8942eaf2c92847af1301244d8dd8ce6318fe62d1bee447e2481221e897a2579eb7
 MISC metadata.xml 508 BLAKE2B 173d15b73f7a3566c657ebf266b60c4c5b8b92e120fe5eac24bc7fc56faaf9378812386506914372aa9b65e49decd11e1f0e55b33ae41b1c51cda2a20f1bd23c SHA512 988742c143bbcd35de2bd649c72eb8db09f3310014b9a93033e383e1c8c6e799492616216b8389f272e46aa2afe925279550094049b9df2850f1fa78b6071966
diff --git a/dev-python/xarray/files/xarray-0.18.2-backports.patch b/dev-python/xarray/files/xarray-0.18.2-backports.patch
new file mode 100644
index 000000000000..be30702e67f4
--- /dev/null
+++ b/dev-python/xarray/files/xarray-0.18.2-backports.patch
@@ -0,0 +1,116 @@
+From ca72d56c213a1c47e54b12ee559f412e60fbf9b1 Mon Sep 17 00:00:00 2001
+From: Spencer Clark <spencerkclark@gmail.com>
+Date: Sat, 22 May 2021 20:13:19 -0400
+Subject: [PATCH] Make `kind` argument in `CFTimeIndex._maybe_cast_slice_bound`
+ optional (#5359)
+
+* [test-upstream] Make kind argument in CFTimeIndex._maybe_cast_slice_bound optional
+
+* Update doc/whats-new.rst
+
+Co-authored-by: keewis <keewis@users.noreply.github.com>
+
+Co-authored-by: keewis <keewis@users.noreply.github.com>
+---
+ doc/whats-new.rst            | 4 ++++
+ xarray/coding/cftimeindex.py | 9 +++++++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/xarray/coding/cftimeindex.py b/xarray/coding/cftimeindex.py
+index f0de5565..783fe8d0 100644
+--- a/xarray/coding/cftimeindex.py
++++ b/xarray/coding/cftimeindex.py
+@@ -465,9 +465,14 @@ class CFTimeIndex(pd.Index):
+         else:
+             return pd.Index.get_loc(self, key, method=method, tolerance=tolerance)
+ 
+-    def _maybe_cast_slice_bound(self, label, side, kind):
++    def _maybe_cast_slice_bound(self, label, side, kind=None):
+         """Adapted from
+-        pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound"""
++        pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound
++
++        Note that we have never used the kind argument in CFTimeIndex and it is
++        deprecated as of pandas version 1.3.0.  It exists only for compatibility
++        reasons.  We can remove it when our minimum version of pandas is 1.3.0.
++        """
+         if not isinstance(label, str):
+             return label
+ 
+-- 
+2.32.0
+
+From 34dc57717c82a86455a9e5abb0a47df782266c7e Mon Sep 17 00:00:00 2001
+From: Mathias Hauser <mathause@users.noreply.github.com>
+Date: Mon, 7 Jun 2021 23:05:24 +0200
+Subject: [PATCH] fix dask meta and output_dtypes error (#5449)
+
+---
+ xarray/tests/test_computation.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py
+index b7ae1ca9..09bed724 100644
+--- a/xarray/tests/test_computation.py
++++ b/xarray/tests/test_computation.py
+@@ -1306,7 +1306,10 @@ def test_vectorize_dask_dtype_without_output_dtypes(data_array):
+     assert expected.dtype == actual.dtype
+ 
+ 
+-@pytest.mark.xfail(LooseVersion(dask.__version__) < "2.3", reason="dask GH5274")
++@pytest.mark.skipif(
++    LooseVersion(dask.__version__) > "2021.06",
++    reason="dask/dask#7669: can no longer pass output_dtypes and meta",
++)
+ @requires_dask
+ def test_vectorize_dask_dtype_meta():
+     # meta dtype takes precedence
+-- 
+2.32.0
+
+From 5a14d7d398be7e0efc6d5c8920dc8886212c3b2a Mon Sep 17 00:00:00 2001
+From: Spencer Clark <spencerkclark@gmail.com>
+Date: Sat, 12 Jun 2021 08:58:42 -0400
+Subject: [PATCH] Explicitly state datetime units in array constructors in
+ `test_datetime_mean` (#5463)
+
+---
+ xarray/tests/test_duck_array_ops.py | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/xarray/tests/test_duck_array_ops.py b/xarray/tests/test_duck_array_ops.py
+index 0eb00725..6d49e209 100644
+--- a/xarray/tests/test_duck_array_ops.py
++++ b/xarray/tests/test_duck_array_ops.py
+@@ -285,15 +285,15 @@ def assert_dask_array(da, dask):
+ def test_datetime_mean(dask):
+     # Note: only testing numpy, as dask is broken upstream
+     da = DataArray(
+-        np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"], dtype="M8"),
++        np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"], dtype="M8[ns]"),
+         dims=["time"],
+     )
+     if dask:
+         # Trigger use case where a chunk is full of NaT
+         da = da.chunk({"time": 3})
+ 
+-    expect = DataArray(np.array("2010-01-02", dtype="M8"))
+-    expect_nat = DataArray(np.array("NaT", dtype="M8"))
++    expect = DataArray(np.array("2010-01-02", dtype="M8[ns]"))
++    expect_nat = DataArray(np.array("NaT", dtype="M8[ns]"))
+ 
+     actual = da.mean()
+     if dask:
+@@ -889,8 +889,6 @@ def test_push_dask():
+     # some chunks of size-1 with NaN
+     with raise_if_dask_computes():
+         actual = push(
+-            dask.array.from_array(array, chunks=(1, 2, 3, 2, 2, 1, 1)),
+-            axis=0,
+-            n=None,
++            dask.array.from_array(array, chunks=(1, 2, 3, 2, 2, 1, 1)), axis=0, n=None
+         )
+     np.testing.assert_equal(actual, expected)
+-- 
+2.32.0
+
diff --git a/dev-python/xarray/xarray-0.18.2.ebuild b/dev-python/xarray/xarray-0.18.2-r1.ebuild
index bedc8b3da110..510fc2c1b563 100644
--- a/dev-python/xarray/xarray-0.18.2.ebuild
+++ b/dev-python/xarray/xarray-0.18.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # pkg_resources use in code
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -32,6 +32,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-backports.patch
+)
+
 python_test() {
 	local deselect=(
 		# warning-targeted tests are fragile and not important to end users
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 2064dcb62cd6..23837c00eec2 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,3 +1,3 @@
 DIST xdoctest-0.15.4.gh.tar.gz 179295 BLAKE2B 0b44276a219119196543671d8ac24469ecd73b040bbd03ca416320d407f0dd34361dbb2778121621f6efb65835ea421107883277b6e712f03e4c06ea2b03dd6a SHA512 a0a35d5c73a8696266d9be44d11e9dbf05c9ac1165a05e681f7b70ef07ae7d56f4bd179e863b6675e2366f1627015e92092e8250ca592f004680db5ad886ad49
-EBUILD xdoctest-0.15.4.ebuild 769 BLAKE2B 8e7a0e547d3a5c1838870609d8e20f25a5144ad5a4ec0327c8cad2a6be87560a9be3095deb1a7a6fb70b193dce3073f2fd1db97206fb8e365482bf2be77209d6 SHA512 513fc94a1ff78a69e77d41130e86dd96f3421657c3af7be1511d664911b6777ecbd18803188b0d53e54987caf9a7562ad338d017ebde356bd5b01abc9c275b1e
+EBUILD xdoctest-0.15.4.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
 MISC metadata.xml 425 BLAKE2B ef6df66f437f7b59189999a895fde27e87580c6eff536aa9b80855b7db9e83c2a0edbaa4784f9438846800b89eac58857c4c303752d1110f86d43194fdee21f9 SHA512 81c57c3abf70d2fc182b5d935ae35187e2f5a9a99b3a5958c282f478fceb0283ee2c09ebe2561da8753dca35c73f54ec3fa17d29ecefd7c50f3c8b7bf42f9657
diff --git a/dev-python/xdoctest/xdoctest-0.15.4.ebuild b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
index bf899d7a581a..3f8b3416a702 100644
--- a/dev-python/xdoctest/xdoctest-0.15.4.ebuild
+++ b/dev-python/xdoctest/xdoctest-0.15.4.ebuild
@@ -1,11 +1,9 @@
 # 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
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
@@ -26,4 +24,6 @@ BDEPEND="
 	)"
 
 distutils_enable_tests --install pytest
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx_rtd_theme
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index bc3b60f1e16e..f88b07262893 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,5 @@
 DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
+DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
+EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.32.0.ebuild b/dev-python/zeroconf/zeroconf-0.32.0.ebuild
new file mode 100644
index 000000000000..0fadc7be4ba7
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.32.0.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_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index a4b73b8aafea..3bb4965a1b16 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,5 @@
 DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
+DIST zipp-3.5.0.tar.gz 13270 BLAKE2B ba3b6f82ed0f1a902050ee8a89b6876a839d180dc048dd19cd31ddbaf89ec0494b9444f2ac082ed347e3183ccaf2e8342748737c2a29e1a2bbc492a0bc34767c SHA512 676d7e9a7fde386b57a213975121aba015461453f0809a97d39d030b06918a4c54ba1cad21877ddf007560941ae285883098d81d5e6f17eb4636379345b4513d
 EBUILD zipp-3.4.1.ebuild 1172 BLAKE2B 057ee69c0da51eb08b56217003a10e5e569f3c3f40b3587f4f3a0b3dfb0109a1676c67342d351d20686350697b2496ff2c2449397a91b64eb5220e51d37ec56d SHA512 402dee93c3ae2d75a2e75b7831d11b57ce92094d70693ef7b8a7a05cce02682db8c3083dc21650bfe059f818aa6fff8c43ae5fa35b5d62b4f8d328eaacf3226f
+EBUILD zipp-3.5.0.ebuild 1179 BLAKE2B 9e9bc5169494d3123806aabb836a8824f58fc0c82645e5ce46aea6b4ebcf092efeb6e95af02c65c5a0fa4dd45543bf32f1301e56df7738c4290ff48860153e59 SHA512 d2af0da538f69e44581d66d8781e2e105144bc74045bb42f0f5036476d75878006c4ff294846eed1140a0857cfaba0959f8e7e021d81a1c856fc0fa548f047dd
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.5.0.ebuild b/dev-python/zipp/zipp-3.5.0.ebuild
new file mode 100644
index 000000000000..4ceef32cedf6
--- /dev/null
+++ b/dev-python/zipp/zipp-3.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip a potentially flaky performance test
+	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+	# by ensuring only zipp from ${BUILD_DIR} is loaded
+	epytest --ignore zipp.py
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
commit	7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree	8c6793f68896b341e22f33d7e6cef88e481f4a8b /dev-python
parent	9aa80713372911cec499b3adb2cd746790920916 (diff)