gentoo resync : 08.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-08 15:03:58 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-08 15:03:58 +0100
commit: 814f4cf860e299a046b649eaee5463427984c09c (patch)
tree: 74c45f097899310e599dad6b8df5b63e0f085bc0 /dev-python
parent: 7f0ccc917c7abe6223784c703d86cd14755691fb (diff)
332 files changed, 2222 insertions, 1948 deletions
diff --git a/dev-python/Faker/Faker-8.10.0.ebuild b/dev-python/Faker/Faker-8.10.0.ebuild
new file mode 100644
index 000000000000..ada44c6701ce
--- /dev/null
+++ b/dev-python/Faker/Faker-8.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 5d68fa86c339..9ae6ff8367ee 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,6 +1,8 @@
+DIST Faker-8.10.0.tar.gz 1149474 BLAKE2B 2a5304acb1ce88230660a468756ee79abc7ae0b6aeb850e3d05bb694cb9e5b596b1d9de4c8f1e82c208a3281efc026a290b6d96cd17bc6c523d22fcd61eaf756 SHA512 0d035663677bea9ef4a66c6f0cf5fb1e648e948deb4db07b352a8b8881f5774a9432524bef10e60f28d5d586ac66f0e207c3ad218edffd6071fa6ac614ac950b
 DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 DIST Faker-8.9.0.tar.gz 1148829 BLAKE2B b24a7fa87886cb38850808de2ffe1ceafab3c548c694af30d53b1f415d329264fe7e53f33f46b913d16310dd83d95fe591689a308bb7d4c653254e39defaa24b SHA512 d2e26ae140c30ae8069f8e0fd75bb9bf54aa00a7271b327e37dd248520256e137d192082071bc36a584fc864c54c050107ddecb40624288636c6b41caf1ea574
 DIST Faker-8.9.1.tar.gz 1148890 BLAKE2B 2cab6461bf6067d9dfd8872c19c8c11fa25ffef82b61b7e7676ffc187346d228703424a73278678f19263423716c74ecd47cfc1c17bf54d38bba712e456650b8 SHA512 f7016b320c7394b0eccc06e833a80e227cdbad9c0f34eb9f8f4413f56a4743f58bbd7ec5eac3b8c0642e7764c6c5986707d493f0c84daa75575a12061631c9c5
+EBUILD Faker-8.10.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.9.0.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
 EBUILD Faker-8.9.1.ebuild 721 BLAKE2B 507ce2b42185094a19fff4f55a8a084a15944c5df6d8d7eec5a66a20140e66271029e8d9e32d763d68f69fe66355dee528fd8288950202c2b4080d3b5145d0af SHA512 b95a1b67e85b0d7224a90c767857cd0cde0c4cc3e9c4cc35add4548c1a43d1d017a43747b7b680cbae4af80f8385b58cdb34aadf5eb3d57e7537e7e7e59d03fd
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index aa6cb2390436..cfad1bae31b1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index 39251018df21..f26bb0855c0b 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,3 @@
-DIST PyQt-builder-1.10.1.tar.gz 5725429 BLAKE2B e7aaa0a3c1eb8aeea0aa5f2d5d7beda1edc46e90c0a21b608d2dffe205a67170daaa6615253706b5f9856a27d66715692ceffe81b9b45eafd4d608df79741d6f SHA512 2e48c1066bb12c1f50700933b0f489158f29f62a1239b570dc053cb042eca9bd4ee83f66b855b0596cfb6dc2e844434c15563abbb3846bf5960d03441f497b83
-EBUILD PyQt-builder-1.10.1-r1.ebuild 946 BLAKE2B bc1cf71df7e275343282ac06e499ee38115689322adc45dc207bd857c39f180943aae8ceffeae8c81138bfc6b0edb3c1a3f9c189f4287cfe911762f7bb2d47b8 SHA512 6ea580d1b7b7304e4d948b500a9d4af3f2b35be743e723cac25dbd97883fc94259074561781b69d3e99e305fdbcfe7350f0825eec178b1a2f647371a68197f89
+DIST PyQt-builder-1.10.3.tar.gz 5725537 BLAKE2B da1abab8fa46da9dee15dedbcf84068b80ce081e87e640fc50642ff6dd15aa3963b9186a32193f3c492c4f141fb7242f13395a539f436575532a5735e3c85720 SHA512 26a01cb2dc4428277cc62da23404433d75f84c61360c35dfd9c440841adbcb1bf39b2211e4e33967ee2730c163dd1585b5fcbd88c6fd7efa2f1f84915a390e2a
+EBUILD PyQt-builder-1.10.3.ebuild 946 BLAKE2B 304781da6d7817ccdcd49df6a4051c931f26c82d209ad73599a51a24303fa49f2f609af77f4fcff124ce9fb2c885d0484764dc17aaeea8e5ba2c0752e113b64b SHA512 5a184b3c2224f97b74bba216f5e5a4e3f5b1fa10ee44d3ffccbceb27b0d1ead5d38a9d8a6bdd20e3473649db2bf030ab4d512805b9f6849acd5cc7baf796cbf9
 MISC metadata.xml 665 BLAKE2B 156bcbd9a31940a4074d395521e71452f45fc725c88825e412a73751bb869621ba3ac8fa8a96cd269130468ca28d7fbf04525b6a2caf9b871f426040e6d6c9d1 SHA512 56505229aa14dd577033cd534a837fcc3584cb4d1b482e59d65ee439b49a42cd21e3ae1ca7a02227e6183e265506910e7993d52a8c4ec9e17e44273204aedfc6
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
index 2ab937144848..4d69521c2f08 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 142ac78a67d7..b2281e056039 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,7 +1,5 @@
 DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a3ea1bd71f2d3ca8fad747ec4be0d0dd9a3991f0996ee2e723ec9bb44ba9b47606e3a2cf5f9e6beb27bfa39752b1f1f SHA512 c29a352f2fe85cf5f452fcf7b62d2ccefcac37cfec5336a5b14041cfae5a25aa03f3c95e372453d665995576b6c73765c0b0677628f2ed37e63a390f8bfa5121
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
-DIST aesara-rel-2.0.8.tar.gz 8043104 BLAKE2B ceb4f34b2017516d8d75855eb17fbce8a28ef35d2dfa22c2221f95e910b69126f6d2070654377bebaa8c149bcb13ed1e37c0fd145cad96ddf6875642a6882b2f SHA512 1bcc149e3c55eeaa4522afd48df63602b32b1702402cd269b30c85ec6abf0d4b446a3593b8247c393c2ad9f74176ebe94e7c86a94ee58b91fbdbef69dbc9acd6
-EBUILD aesara-2.0.10.ebuild 1884 BLAKE2B 7c686fdcf57e7a261037c52acf864b43f5fac125a508f338cd7a2f8fbc58023219951391259b347ae842b6f9091da8e5279975f1ee2008fc5004bbb7030fc687 SHA512 70ac7c0eb1daec9dcc02c679e33ab9bac92d7a65750f6996f4357a6553f853898ead2fc7b2e6923fccdf61c6e377e163f8c4fc808f909bf513666ee80dbfcb83
+EBUILD aesara-2.0.10.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
 EBUILD aesara-2.0.12.ebuild 2103 BLAKE2B 4ca1ff4315ed988653a3d84372bcc510a4028fd409598be93d47da36702e1662b9784dcc9c8c526aaba5838ea76f3d8e41a39052f031746f1c7b9f67a58ad7a4 SHA512 4eed528151518ab260d595fa386cda1f209a4d3b299d8c80ebadebe916b9575c3c26442e21bfc870003464f2237b1b9621aa684b84c7f306669af523393eb6aa
-EBUILD aesara-2.0.8.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.0.10.ebuild b/dev-python/aesara/aesara-2.0.10.ebuild
index a930578b0362..c60f566ca355 100644
--- a/dev-python/aesara/aesara-2.0.10.ebuild
+++ b/dev-python/aesara/aesara-2.0.10.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.0.8.ebuild b/dev-python/aesara/aesara-2.0.8.ebuild
deleted file mode 100644
index c60f566ca355..000000000000
--- a/dev-python/aesara/aesara-2.0.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1 optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/pymc-devs/aesara"
-SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e "s/tests.\*/tests\*/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local exclude=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-	)
-
-	distutils_install_for_testing
-	# we do not package numba
-	epytest ${exclude[@]/#/--deselect } \
-		--ignore tests/link/test_numba.py \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
-python_install() {
-	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 5cec170fbb0f..4e183403a6d5 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,3 @@
-DIST alembic-1.6.2.tar.gz 1167842 BLAKE2B 0b61282987e974e81b1007d4a66620b1ac2393b175f91011d0d6c450af1038a9ea553f4a7c1906b2e463f7b95617a00629f337547788821b250373f0de18d0b7 SHA512 d5b23812d3e65e9642f39e2596ab86773476a77959938f518438d7659c2da5436432fdc020a5fbda33fe866a047d9558f7a4c5eabe032a6d3f2e6d04ff7928e7
 DIST alembic-1.6.5.tar.gz 1174376 BLAKE2B a1bfdf611b30831363bd29a63f2a50d7c31e348ab6f450f709d1e8dbd891441263d8e0067de38c09351c26c26d07178e3079b30b5c976dfa90cd24d5973038d8 SHA512 8e5ce4bb41a47fb2c263d3542d7fd2dad04bd76b81a6a565fa93cef80a38a016944924b9eb57895ae71d7f8eef428bf440388444ef750bf281616e514a61c79b
-EBUILD alembic-1.6.2.ebuild 737 BLAKE2B 79af54d503298e0f13e8dc308c610cda74c0d7896c174038881390a351494eddb648806072443a13a825f05b7f0fa5c80b02d94debf2cef0ec321b740200e997 SHA512 ac4d805bf5ae7d4a1d394db2ad669f870b46ec161816edc548f31346f51dec4bd6deab764babc8f37b6d14bcac9f4cb3b5e778441a0cecd906971a9775322c06
-EBUILD alembic-1.6.5.ebuild 740 BLAKE2B b052f784a540d32d6845d9cd689ecebfbff5c1aa75d342f117d6175695b11137bb92111e30c80cb826d5fd7c033d896d245e9a59aabdf2b88872470cd9bfa1c7 SHA512 346ece73bc8650a26d35812e026a200b1e0e25ad6a423bd39ae6b9189fa17f650fef2ccac1ae3cf16a8430f2ca894be4fb251af3208594c4cdb78660a5b08da4
+EBUILD alembic-1.6.5.ebuild 738 BLAKE2B 021f7ad7fda002f0c8d0d40b044844f91e7151613f1b0e594823a456c00df4e178db9ec6756a10f60c24bf0b3886eb8b3cd8762f9e5995eaf84c571f816db958 SHA512 749dc26134dcb9ccecc769cfd1e8072182c3b4d319f2671d605ab02ce264470f36afb46d275aa7a814bf3dda0e75fbfea351cad88a1370ece6667981eb8295a4
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.6.2.ebuild b/dev-python/alembic/alembic-1.6.2.ebuild
deleted file mode 100644
index e34136d4cd96..000000000000
--- a/dev-python/alembic/alembic-1.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/alembic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.6.5.ebuild b/dev-python/alembic/alembic-1.6.5.ebuild
index 47b70503fe5a..362eedb6a1e7 100644
--- a/dev-python/alembic/alembic-1.6.5.ebuild
+++ b/dev-python/alembic/alembic-1.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 7d51dda385bc..dc426dbd7e70 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -4,5 +4,5 @@ DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2
 DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
-EBUILD anyio-3.2.1.ebuild 1033 BLAKE2B f080636c88b3790a3eceace45ec5e7074bf703cd76a74eb721a53f31ad594bf616d8b66061b5c20a6117db99709622e5c370caa8e76ce9775876f031eba01543 SHA512 555b14800a4f043d53416ebe9b9dde35865242c9d3321d60926d7f430eea5bbaac5880b309ee87e05e0b32728a6b774bbf9c81bd4fa42067a56ce7978969c69d
+EBUILD anyio-3.2.1.ebuild 1045 BLAKE2B c90673d77e33673ab6c92ed5e4ff3f2e929bdcd5e882501c0faf3c2ea650b3de1777303008486c75db56aba3b35be4e109191747d453d87111bc4db5e93a5ef0 SHA512 cc5fef483131867b5755c6df4ab160f6c3997d339bfda0196e1950bf823912ce90402549c8af8e01b8ee5f747e9ab4a221457da8eb6d3287ef7f593d783d1ec3
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index 7727ceecc614..d01141c001a7 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index f7993fc3a072..da3216f39a84 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -3,9 +3,11 @@ DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e17
 DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934b9293c501b5305b4a6ccbd22e8b12a163e20e5e02d571a8177adb6d5b3196ffa46ae68f2931b6c3ced2b4d0c SHA512 0abb186182513a6d7e4aeeeb80cd8976eebe7c40932ca7c53cd8be149e65a768235436382bab2006a79bcdf345cde55fd69eb3f28f8d14cde5fe064f7c7a76ad
 DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
 DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
+DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
 EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.6.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.7.0.ebuild 996 BLAKE2B f35028913e1ba896a4cd0047275b1c2a639f1c6339b6d44c3ef1584e20b653da5a63de8e8a3b3da7f2d0698f7588cc5092febe49f0273ef4a84a90fca0ca8d25 SHA512 b74e4a525fb9ea2ef1cf55cb180593e837833e8de81e480ba0bd4dddac08798b77d01befdc3abd1d6e8b4471c79c0bc97ff1fb1d1527681b16d72db9d94ec04e
+EBUILD apispec-4.7.1.ebuild 995 BLAKE2B d4317c8d7e04455f0755d2dbc1ec18f92eb708d072b13c34b956102fad5f4c212c29520d9af88503fdbbe344d7ab9529d470f0538b7bd5acc0956815d8ee132f SHA512 28f4b6701769f20a43eab803af1481d06108d3cc25c9e03cbcdef254168cbc39290e28a4ce92d866cc5b8ade49e286f0332db36f5e7bf82095394b7a4bf985b8
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-4.7.1.ebuild b/dev-python/apispec/apispec-4.7.1.ebuild
new file mode 100644
index 000000000000..33a1c08135a1
--- /dev/null
+++ b/dev-python/apispec/apispec-4.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="https://github.com/marshmallow-code/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/marshmallow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local deselect=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 78e9b3e64b09..b67ca135a1dd 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,11 +1,3 @@
-DIST asteval-0.9.21.tar.gz 54203 BLAKE2B c5232b41cc73184f4a9d21e257d4c517662e7a7e5c6beed0d0a1f46572310263b5370ea455f2d0640410cecd7e3b8a7686a56931fa61c3294a57a2e5ea984336 SHA512 b2930963641486f208c629300f70e41924aa59bd9c64f767ed5a4db0a39e79c02a02fed48eb0e113fb6e3fc594973c9d0afa56d768ac627758a096b1c4fe6030
-DIST asteval-0.9.22.tar.gz 55120 BLAKE2B 5712e72f69e3d48df6a6ac33e3bf87517525efb3907cb954d5a4427b4d41aac5bdfbf71376967633d36574a845c40bbeb391d2ef0a2deef280235c468732e80d SHA512 0c6e0d1273fd9794828e006c56d243e2afbf336314dad9ccc95f40b790851460beb42400defbf4ee09eb7d65532b499a762b4b19c3102bbe6d2553a3a6debb37
-DIST asteval-0.9.23.tar.gz 55239 BLAKE2B 447599078a877784c35b7bdb96f81382139f8a93d72e660658386867b0eb37e04a22ac7ba9d6afbef1a55d35ca38a63fef60e1e1382e9740694b1e94ddcc7e7b SHA512 b2755b4dbefff1e481558f886cc5724d9a6a953b145736afab237e16f7718d48d1f8f98a0b7355c5e871f8ed0862b60bd6a4d99554a5e0fd0875f9cfdfcbce55
-DIST asteval-0.9.24.tar.gz 39523 BLAKE2B c0bfecf7b74e07d32e2117bb68d0480bff4037f7ce9891352d10b29f765e3922d0f60eae66e0091e35d55a32bc6199b5949292477cd2a8b73fd3ea80ff8babaf SHA512 1bedd09aef521cf63d98a55861b983233bca297fbf4a38a1522b68808593447156748698b653a3b82451d953ada2694c3dc1520efc4ff8c6f26607645b539af6
 DIST asteval-0.9.25.tar.gz 39473 BLAKE2B c726cc4499b71534e981eb344f424af897fb397a9b60be9a1635598a354805b77429b14939f653a7c37a1ad16f26673b718e9caf796a8f06b535cc468496c385 SHA512 16601ebd84a1f6fb48c51279c9d3ae513d0b98c0407d0301bddda941b04951eeca041ccf6f6801bad194b9d3f719044efef446cd91444ea07ebab4d8b763c81f
-EBUILD asteval-0.9.21.ebuild 445 BLAKE2B 0294274fa252b94bb4f937680a9de156133c19a5ac725b6f669663500f52542988b00f0d3dfd8dcd7d3af45122b152bd3fa08f87accd4e743bc09b424d2aeac4 SHA512 88ff548a117141fd37aae50fe8588e7fd711de11edba3e03f8f0bb80173b160459204b18211c5513f9be7253fa1177428f6fa66d0357b5f5dc046f844d9373e1
-EBUILD asteval-0.9.22.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
-EBUILD asteval-0.9.23.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
-EBUILD asteval-0.9.24.ebuild 446 BLAKE2B 299b6dd67b19a0463627680bc54f4da21eb84a1066ee5cd60636f28017073536a45cceafce1abe51b973d5e7338e90ae8cf334a5fc8a8f2b19058a8408f4f011 SHA512 e8197b5398de74e102c9a8ec03430d6eda909e8b0d4afd52e92e8b1b576d42d34314de40c70bec618b930d049b4a7a57b5443247edf0dccd460f1607f54f817f
 EBUILD asteval-0.9.25.ebuild 446 BLAKE2B 299b6dd67b19a0463627680bc54f4da21eb84a1066ee5cd60636f28017073536a45cceafce1abe51b973d5e7338e90ae8cf334a5fc8a8f2b19058a8408f4f011 SHA512 e8197b5398de74e102c9a8ec03430d6eda909e8b0d4afd52e92e8b1b576d42d34314de40c70bec618b930d049b4a7a57b5443247edf0dccd460f1607f54f817f
 MISC metadata.xml 387 BLAKE2B f4d9e9dd7e5537c9f87e74daf1af859e1a14e93aad3a7a5c702cc3860288a0200ff822f8b25ad1ab9f8302214407493b125caa0b7baa3ac4af668f0ced764835 SHA512 604adbf69eac36bb9e70109021a3c3c6aae60dc67eede274b10874ebac1b21873cd6ce09bb97a2c0618c101c06e63456752f066de0bfd485c16c1307bdddd429
diff --git a/dev-python/asteval/asteval-0.9.21.ebuild b/dev-python/asteval/asteval-0.9.21.ebuild
deleted file mode 100644
index e3e5e94c9504..000000000000
--- a/dev-python/asteval/asteval-0.9.21.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Evaluator of Python expression using ast module"
-HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.22.ebuild b/dev-python/asteval/asteval-0.9.22.ebuild
deleted file mode 100644
index 9b942b300584..000000000000
--- a/dev-python/asteval/asteval-0.9.22.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Evaluator of Python expression using ast module"
-HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.23.ebuild b/dev-python/asteval/asteval-0.9.23.ebuild
deleted file mode 100644
index 9b942b300584..000000000000
--- a/dev-python/asteval/asteval-0.9.23.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Evaluator of Python expression using ast module"
-HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.24.ebuild b/dev-python/asteval/asteval-0.9.24.ebuild
deleted file mode 100644
index e44fd6fbb180..000000000000
--- a/dev-python/asteval/asteval-0.9.24.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Evaluator of Python expression using ast module"
-HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index edf905537b86..d3a06b6acd63 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,3 @@
 DIST asttokens-2.0.5.gh.tar.gz 46876 BLAKE2B 8a8da138888de0a4096b10eccc483c9540710acde0da188ed3fb3845f96b862fe2eec393c69ca62e7b313bfa0e2f0d673d828e9d1ff6dbbf5b641fe8122a548d SHA512 3e710ca9703e67643bb9c0a4db4e5c1656e6d5c904a1262a9ddb962beff06e4e8bd9815bcd2509b48974a97a565d8479a4369583c166a65b6d16c19fd926e93f
-EBUILD asttokens-2.0.5.ebuild 773 BLAKE2B b0ff6b3f024ae2668812a84487ad781b7ce9e722d1c967b7e932fac29a32275230e3c5c3ee05c069e678346b7cadf8d947be48c6161c8891f7d4daab2419f08a SHA512 d26657cbbc02f654654b92913bf4d69bd09df6ac9d3f0e6717296cb3a05808674b86fbb8ba8a59ca374b1f67524fbb89d355b7e838a372ba817087cbca83c7f7
+EBUILD asttokens-2.0.5.ebuild 950 BLAKE2B 823eab9da787046f22eb5acd44a8f3a55981858aea1f4fb8096dff1b5f12e27865b1a8763c081edc0e8575bc0acdf1a365306d1dbb0a7b16a6813d5f1baa3070 SHA512 41f176acba00467ae219891d91df722b80b0588fed4cf53415205ca120bc0aad1b992a2e3b9b83c3d98eb773a1dde8ef66e331a2e41f60f16a19aad99a895f8b
 MISC metadata.xml 349 BLAKE2B 98a5cf5c1dd38d72e3a9291bce91e66b23feaae3df2356e68e60bd2fb37a578b3f62d9f1eef8f8966c1cb10dc1c6d0820cfc9977e30c8574f9881177fc58fd00 SHA512 1bb6c8ba010ccdc6a47646021446943063034afeccf89437e6a769f40136e0a8a3875dca5eb40beb119a87e24b37db342542d89acde1fd3a836853f4524f62e1
diff --git a/dev-python/asttokens/asttokens-2.0.5.ebuild b/dev-python/asttokens/asttokens-2.0.5.ebuild
index cf7fc5d2a259..393339cec50b 100644
--- a/dev-python/asttokens/asttokens-2.0.5.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.5.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="Annotate Python AST trees with source text and token information"
@@ -29,3 +29,12 @@ BDEPEND="
 distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.8 ]] && deselect+=(
+		tests/test_astroid.py::TestAstroid::test_slices
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index a5556d0f46da..eb460b7a203c 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.35.0.tar.gz 867345 BLAKE2B b2775f9ce0d3e20fa5b3b5a9b68100f1338576229a9380cf7afb08e9c75fedfb926a06c1c71b96df9883e5306de355f720e624d0d1150c12b58c4dc4098309f2 SHA512 14e22095d497df9e0fcfdaea83c93edd881837ed57e508cfcb484abd5241dce60059b349b3bba92c307515b4c4018e8e065342e9133e401004a04baf3182ec46
 DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
+DIST aws-sam-translator-1.37.0.tar.gz 880633 BLAKE2B b3913b12fff38657662a16c13ae6ea3b836faa94eae986e7364543e7ece6cd53afbc9bc80380ce5c4500be57d1b588f617f3ec7e6104cf83357ffe733f4e50e2 SHA512 aeaf194d7c8338802762a667ac05e57a8fbffbae7d1a707a708392b1d103d4e30f42e683e077b5cbfc540bd38debac95c578dc2c02f2c3f7ed531ece64bb7200
 EBUILD aws-sam-translator-1.35.0.ebuild 1330 BLAKE2B 5d31edb593d63f47e2792a580388533b57d41465eb543f78c6806dbf64510ec19f661fb6aa705ec30196d4f380f8a2fee0f2b5d85ecbfc837b22ca1cf04119b6 SHA512 8f04a00e18491d4757758a999717cba86acab30f1daa8097d2f39848bfbe9e6d5800617d9a05424ceb491f9279da23564bc50e31bcbb5b8e19aadf748c28fbe9
 EBUILD aws-sam-translator-1.36.0.ebuild 1216 BLAKE2B ada96426305b989e71ae43b086230e4033bad4b426c01500a0a98692796eebcf1bd1a5aff3b3a211121330a74ef2b4d7835cba8c5899c6393b6c9a2b40cae2b9 SHA512 aede80a780473633841976a0a6355ce31bac5e8862692556b0af76577c7bd6653a194152f7c008d298f5a468b3c0ed7b90b9812e62f90fb795709d3ce8099311
+EBUILD aws-sam-translator-1.37.0.ebuild 1216 BLAKE2B fe9784c4435b5c56390bfce87058de70b98af7620ffc6f58e3381ac0249a9d8e01d1a25f7b8538c33f02eff149628a620301dc88143f5a68b8ca714efc5f9c89 SHA512 4b82a3f9f589eabc4197187e1e87ff2ffa4e52643ce33f84796001fdd924528e6dc108c7f784d606d91f17cf7ae9182dd6c3bf336099de0a3909641219158326
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.37.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.37.0.ebuild
new file mode 100644
index 000000000000..9b41296baaac
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.37.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 5f40872b9c19..20cdfa6e2fa8 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -2,8 +2,12 @@ DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633
 DIST bitarray-2.1.1.tar.gz 72522 BLAKE2B 28afebad24c574706f3cc57d1b82890d8e98a2ba745765a1a8d9e60a630a1e1e6e467bdd7b953c4c75b08b302658f7704d83a8e01b351c1e99e66ebd52fbbf83 SHA512 d690e266d1ac9f8fba6f2dd2770b80d1fbb2a53baf2ba759c946a2d371d9804e5bfd6792fc2a64809fc10e78563e106c2d357474fa515423fdcd6964a8191718
 DIST bitarray-2.1.2.tar.gz 72530 BLAKE2B 85b98e3e7b89ded2f6d05aaf08efdc46982b92f67eac6153afe0814537ef84528a5a76e1b0de03d771e8b9ee69ce762fe34d908d14555a5e6c70583350009a9f SHA512 1db9d54a2721741732cf6d455b36d3fdeb550a3a6370e14d794c2d67a1a0d39ca6ddc8db939ec391b33dc86962db51cc4291d8d04db878758fdb411fff377819
 DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b74179e361f1e08644d3c4557085bdd99931ce9cec633e39d4fd454fa36d0170c5057a8931cbd8ca2fb8f3bdf71dc1 SHA512 de84b8b1c84be32f946a5f12e8a6ce84f9aecba6e5dc28c0cb0e1fa59434cc5b0757cd5e0b616163b134d460edaf4d53edd53da86ea517a97c818ee83855b174
+DIST bitarray-2.2.0.tar.gz 75776 BLAKE2B 4be063193ee4ee5c991213837b360a97ef26949e9e3c83fb25796705a9d22816c16024e9c657c95b57e5f6a5d60cf8f8c829efa847dd5691d0f62ebbca214239 SHA512 74d7f05a9d03adf660f17883782eb1f2bbd08922c3f6a9a7a44eb86cfb29ab8e3b7c2aa7acc27656d04713396e956771b3f9b429630b74f0dc39a6bad869fe25
+DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
 EBUILD bitarray-2.1.0.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
 EBUILD bitarray-2.1.1.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
 EBUILD bitarray-2.1.2.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
 EBUILD bitarray-2.1.3.ebuild 557 BLAKE2B c8a3a316785b960272dd06ee3f2ad6091309cd16024f96404af5ada0cb39dbafa9ffb38df308be136291970d495b1eac3694c47e575853060df68004ab0fc5db SHA512 9f3af9db79c50d00f009490a995623e0bdcf9a066ed27154d585c11bac5453cdc0e2bfddbe97da38968755bd442313a52f89aaaea34a4b408606dbf7beb615a3
+EBUILD bitarray-2.2.0.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.2.0.ebuild b/dev-python/bitarray/bitarray-2.2.0.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bitarray/bitarray-2.2.1.ebuild b/dev-python/bitarray/bitarray-2.2.1.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 28cbb3c1a47f..f68f70e4604e 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 1539 BLAKE2B 14227596e30628b7e003d0103b15beaa88894bbfe9cf9d6d8331b5e44cbc9cd13f2b0d9d3fa986f015d3b28b2e139d9bf00790fd47807e7bf521255a057234dc SHA512 23e7a4ec22a3f2bd39e8edd745f59ff0bd062bc3851280e6f4809e8cbe359a5986bd8b022a3b9e8ca89fefabd17e9c614641e3c102826d8b804ebeb4c5182318
+EBUILD black-21.6_beta0.ebuild 1538 BLAKE2B 044ceacdc37ddd64a97d74af6ec9ec03e4dfb1979870ec23ded907515bc8cd0338f7785b85ba173eaa4b57bba806f92d40a4aaca826a499d2d549b3a06754a0e SHA512 e762ae3aaa8a311210ca5602608fe6e7adea40a839e9e4d2145b900bc02dd30a96bcfddaf8af2490e2e95e0b802eca088a7c2cf37953d120aa61e9ffba0d6939
 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 97791621807e..c69866925f81 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 411b7f97ad55..96f0217bf728 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,12 @@
 DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98042a76311588463f36f48a6bd9641fd25e07b63ad50afcb3ea9bfea0b5f3304e3c2689a2187198aac04549346c SHA512 477033e623476fa1e2e49cdb788f204ac49230088788cbae3f079de4561e7bbe56bb3b170480592a0ce056fcd2ea0cb3f14b4f5091279f46346465853a191829
 DIST boto3-1.17.105.tar.gz 387920 BLAKE2B 475342a93440418f6fc5682e7c24f386aaac8dc91e670e8c6ab7f949fb8557c97ca0f7e7929128742c3b1091cda2a42e0f1212528f8fb1c7ce1a6dcc3aea18c4 SHA512 a044f0a61f8ebea58f7ebbe670b4f0ba94f6c3abe69857340908be780e1cae5f5f3ce892ba16af44df62542883d30b93a9b42830123dd3fb31998ae8c642e1b4
+DIST boto3-1.17.106.tar.gz 388602 BLAKE2B f9cc023ce4c0810ea7eb004126941229536fc068ff51039dc9f9943d153f8fa717e832c7161f85332e3edf596f55b3ad7dfb9ef117b471f59fc269ee9c63818c SHA512 866286d91d157d513f35231f8d512cd9738c7795b044b41c8e2b1594ed83a6060bcb3a2e3c8388df2ed86c7b04e0ce2d42c88393d8a6753d04c2a007865033e4
+DIST boto3-1.17.107.tar.gz 389348 BLAKE2B 8c0893d8ad73563f63254877621440ba24dac76c577f5684bc37b5f99b9111be209f69efa324cc079209340051230a43b66004d09ccd5804d631b0c04083c384 SHA512 450222507aa3bae8062b788ac7f637dbe8a5e7a5baa0f45001a74a810c2579927a7400cef180b57a7d7e57c391d665930b577b39272681ca380b5e553385b1f8
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
 EBUILD boto3-1.17.104.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.17.105.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.17.106.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
+EBUILD boto3-1.17.107.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.17.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.106.ebuild b/dev-python/boto3/boto3-1.17.106.ebuild
new file mode 100644
index 000000000000..75afb4bcf865
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.106.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.107.ebuild b/dev-python/boto3/boto3-1.17.107.ebuild
new file mode 100644
index 000000000000..75afb4bcf865
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.107.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index bb018e903db4..a7e1e990f5de 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,9 +1,13 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a442b2d49e461a2a4c2bd613e26095ceb87f4b7ceb672f338ea04ad918060bed118f7bc4c184c46cce1d6a9f98d4239 SHA512 2201d87ce2e1c8979548698d6a46eb03c0a2026360b178fea895ad6a244efad534d9970d3c6343d50639d25b3b8643db6744658fec14e0fa29fd7c4b45c8e0d8
 DIST botocore-1.20.105.tar.gz 7883335 BLAKE2B b48347e304ea54b56a37faae8bcbe9c127118b5bfadc71ffff3f6914b57f4d819faaadfc25834e49c9523f073f639823db4046bcbd9b5b72ee1df4c2ad198338 SHA512 72267620e4ecb7e4e4fa446b8f5c0b42d2e0af372f9e8bcfea123e5d8a6f4638102d57a9eb9f3c6f2358c6c2b36e727552c0b350b07f95a79292fb3c2cf4dd99
+DIST botocore-1.20.106.tar.gz 7885164 BLAKE2B 3fa8b860a40a0915f6a59912fdee7b9e55fa88170da747d4d87464a5b44d6cbd5ce83cec383a7a1f41ec9a203d43a8cc006c7fc0005bfcf2869d66aa9f333b14 SHA512 135d789e2d5975697840dc4aca759b2d07d70d58efed7356a3323feb54faa2b8a339a48a3ac931270e335bc730eb8cc5e87f6fc2f9e3aebc452aab331ca49261
+DIST botocore-1.20.107.tar.gz 7893209 BLAKE2B 4e4882efef667ae91bb3e42a84748609390ef637d0a72a0b8b9dbab83a55cac9117553a0ef34bd38af98493d0972fd6178b322207c71914068eb3c634debaae9 SHA512 09c7a4bc4fab922aa7dbe94fcc0da6a462dbd90bdd51e8612431e5a790b46c56eab3b436048572a4a14c6ed2417ddca8efa52474d28fbe32558550c44b3fe0dd
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
 EBUILD botocore-1.20.104.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.20.105.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.20.106.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.20.107.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.20.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.106.ebuild b/dev-python/botocore/botocore-1.20.106.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.106.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.107.ebuild b/dev-python/botocore/botocore-1.20.107.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.107.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 0500c12d0c81..4cb4ec98f537 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,7 +1,3 @@
-DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
-DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40e52c21fd90d026ce0aad706830b98f10a226bdc23b819d3f1c52f93f25892a1de04f2a673b4d150a5c47fa SHA512 05eacace46c4b2f7025f12613ae6a755aa7fab14f15d0131d4d856ec5c37bea547d3c4a8afdde28c8653139be741f47351de5460df7dd3ec662325c8d1e2f3fd
 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 671 BLAKE2B ae44d926fd32f69bb540d9ca3c79e687afecf89e399b952fbc10598cbe7a9db112772a06c7d7fb51acb2f65d5f411b8eedc2205a34b50764960db9545f652c3b SHA512 346dee83e92a04da852747a76a6dbd08883439a89a0a698cb6e1c98631b0c9d1430da0d37c84847735d92084fe0f2ce5acd52604ce727eff9a181ab3e95df726
+EBUILD cbor2-5.4.0.ebuild 669 BLAKE2B 94402bbe05e2501dce140e2dadfcdc5da42a4c945cfd8760e1701d9688ea19eb8fdbb65337c3a53fdfd6375c452906369cbd3d751305580aefa64e9fa4946002 SHA512 65336ad97d2334d121ad28cdb5b0508c6c8b427db4522c5242363457679b8d64620121b77c3f3f26e2695e11740f189ac74c78446e915d78b437f89733485e18
 MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
deleted file mode 100644
index ee466b902b56..000000000000
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=()
-
-	if use arm || use x86; then
-		# https://github.com/agronholm/cbor2/issues/99
-		deselect+=(
-			tests/test_decoder.py::test_huge_truncated_bytes
-			tests/test_decoder.py::test_huge_truncated_string
-		)
-	fi
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/cbor2/cbor2-5.3.0.ebuild b/dev-python/cbor2/cbor2-5.3.0.ebuild
deleted file mode 100644
index 08eedaa0341c..000000000000
--- a/dev-python/cbor2/cbor2-5.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=()
-
-	if use arm || use x86; then
-		# https://github.com/agronholm/cbor2/issues/99
-		deselect+=(
-			tests/test_decoder.py::test_huge_truncated_bytes
-			tests/test_decoder.py::test_huge_truncated_string
-		)
-	fi
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/cbor2/cbor2-5.4.0.ebuild b/dev-python/cbor2/cbor2-5.4.0.ebuild
index 1654cebdaf94..f928522c497e 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/cheroot/Manifest b/dev-python/cheroot/Manifest
index 14aee3685631..eae74499afae 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,3 @@
 DIST cheroot-8.5.2.tar.gz 113183 BLAKE2B a3b60a9df3f34913cfb8c99fbdc8580ea436710c7979e296c18a6981f54bb959d6a300f4cf9d4e608fe2987f58d5fc6d2b8f57bca800e461d31c77ac61fd6b01 SHA512 245c4157f5e11741d94375099878ef5b31945412a2b02961502e762b9770fd968f4f977fe2d74744aa6596c668079d7f07b6f129fa11438783a95d3a5ee088fa
-EBUILD cheroot-8.5.2.ebuild 1622 BLAKE2B 1a84b43d6ecc32d815ac3eada365eb56ff0bc5567f093f096bbbd6f05fa23a12fd38a39b97ac1def2d113770856406bcd736c9533ebdb3688701810ac91ef236 SHA512 9453466be06a99467328b52031d330be2e85bb5d84e2a9724abe72ab1cc2de9116d6b8d848c082234ecebaca6a68a8d11dd9d1130199244c22dc2c1ef854aa5a
+EBUILD cheroot-8.5.2.ebuild 1533 BLAKE2B 221828f25d3b852c8efd53393941ef6b76793616ea686bad24a5c1e9280c234c84f103184b3cc2cb0632f7b32c1d22f8dde748a86d97b31aa83fb8a6dc355c68 SHA512 7390bf8a7fa356ecbed3deaab9cd45ba76c1bedb6233f724a3653409af7d9316afdf4bd3020c4ca4b1e03a8ae020dd7653f7dd50a3769c58e2dacb5671976b31
 MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.5.2.ebuild b/dev-python/cheroot/cheroot-8.5.2.ebuild
index ad187eb5f9bd..7e8619853279 100644
--- a/dev-python/cheroot/cheroot-8.5.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.5.2.ebuild
@@ -1,13 +1,12 @@
 # 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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy"
 HOMEPAGE="https://cherrypy.org/
 	https://pypi.org/project/cheroot/
 	https://github.com/cherrypy/cheroot/"
@@ -57,5 +56,5 @@ python_prepare_all() {
 
 python_test() {
 	cd "${BUILD_DIR}" || die
-	pytest -vv || die "Tests failed with ${EPYTHON}"
+	epytest
 }
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 540da3e7ad50..a3536d6a1aaf 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,3 +1,5 @@
 DIST CherryPy-18.6.0.tar.gz 686804 BLAKE2B dae7f0ac403084acdf611e4a9e75f152355491e4383a1bd1374ae77ac68b415f41ce79f1e65a7a66c61aa0965ac94cd9bfd0d425cf7752ab54edf0bc0d8cabfb SHA512 cd33303fa9b9704ef427553091a6a6c2bbfea20e7d81acd2bcdc2855f8a36a084a0781bb19f3a084b24f0664bd7b318a667c8c79b5073381901acce4602de9d7
+DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
 EBUILD cherrypy-18.6.0.ebuild 1914 BLAKE2B b62d45faf44139a435f12517f106f087110d7c083c8dc5b785c56c4f6999e5f3a22caec70f7d9a15654b6b98041020e5ca1c54546a16afabaaf53e9cd831bfdc SHA512 92416bb5498faa86190b85fd110ce5d87909894c57b5a37038cbb1316ab961fe1de2807bcc30f658da77e4aafede558d38f1667cdd22aad0c14a0f604f674568
+EBUILD cherrypy-18.6.1.ebuild 1392 BLAKE2B 4dc80d0d35303e3e55e9b2159e61c17b013ac6ef74855ad7612cd2f42497f12fb28a6c42130c4a1472bd4b458836795ca73bdf9e271d7e29ee8a66c878268e0d SHA512 afee7a4995ae794a4417db9d74c6140b6e30f4cf51a4e3c98c2389b24b9bf27568e1b7c7ea5a893708f4e0db84550dd09672b766f9041b3f50b29f5195a5d1e2
 MISC metadata.xml 346 BLAKE2B 96afee16daef8fd731513c0119b1a58225caac3a1a9550d53ac83fc79c286cbe7bf3025f37cf1ce9af8881a8a99d98141051c3130e8af93822fd79671016352d SHA512 4cf59edd86b71c5aee0863e5437fc0fdc5a37d1001b8ba87e3245444986884c4b804ed8686117f277bf6e90b310044d9b51bb3cf5271ab6db7b70a7e71e47518
diff --git a/dev-python/cherrypy/cherrypy-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
new file mode 100644
index 000000000000..25be2b216f72
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
+		-e 's:--cov[[:graph:]]+::g' \
+		-e 's:--doctest[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 8b020ea9429b..533be1444158 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,13 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
-DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
-EBUILD clang-python-12.0.1_rc1.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
-EBUILD clang-python-12.0.1_rc2.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-12.0.1_rc4.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-12.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-12.0.1_rc2.ebuild
deleted file mode 100644
index 921f7735340a..000000000000
--- a/dev-python/clang-python/clang-python-12.0.1_rc2.ebuild
+++ /dev/null
@@ -1,41 +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 llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-12.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild
index 921f7735340a..921f7735340a 100644
--- a/dev-python/clang-python/clang-python-12.0.1_rc1.ebuild
+++ b/dev-python/clang-python/clang-python-12.0.1_rc4.ebuild
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index db118a516d63..097dead9116f 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,8 +2,10 @@ DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899b
 DIST cmd2-2.0.1.tar.gz 644705 BLAKE2B 5fa3b89d42252372b1b75863f8c1293182a555e6ab1b257f1a243c87685bd0aa643d2906741636143f7d3aa3be5ffea5f8616c25e99fbb8598573d3d1feada9e SHA512 880c5f2d80f81a850b545052df2bf3efaae8f44deb30186119a2d94277da59cb027da5bf35b2bc106b90c87883c8eec1a869df65988ced1b6a0d0c7e236569bb
 DIST cmd2-2.1.0.tar.gz 643826 BLAKE2B 532a09002ee957c7fc670f7507665153e39043598a54be0f1dba36de061d8bde6eade064c93a0dd1f9f95437e1dc833a6999b1bcbcb6d6c0e1d5e136aaadfe98 SHA512 0e262ceeab908077b1d698202559a6d093d493d6dda420d4dd5c069414c716a79a53276931e0fb80ad29ee0745525cd2b6ead6150a90daf11735dbcd66eeb2b8
 DIST cmd2-2.1.1.tar.gz 659548 BLAKE2B 17ff372505398df460b56b13c8ab7c8830a1bab25cc52429555bb3e0f766ef46d14a72826a5af58a6641ef533289296d00afa1e6d2980aea33c9792ce3173cbb SHA512 03624ce8eb6d94c7234427a8a7dfb9b321bab76679b166fc3af26ba581ceae74a90ab282f9d6ab0d48eec589614d5daa38ed88251dc7400b48c112863959d164
+DIST cmd2-2.1.2.tar.gz 660849 BLAKE2B a8c8db8036badc020b34e6d4cc62a6828a6f3788562d550826369d2ce6ddc41fdd29ab95bd56d35115a1e8c2cfdb6df97e3b25c3f414798aed9a597243b37967 SHA512 3f2edb336ec662e3b2e22abc947ffb669786142d29f0723b0d5bbf898ecff12096a91e08c4890dde79915b413c0f9a70945f1b5795ae12991e85d7ee79331d31
 EBUILD cmd2-1.5.0.ebuild 1412 BLAKE2B 5e7640c0555dfa7f8b441deadc7fbf444f6ef7de931d070966695f9e6a5d842dd9a84d4108109fb38f13fa5f53ecf7b276bbec5af5bfa8f5850a777af6868a63 SHA512 aeda875bc85e14c6667953dcac3a1ddf14ac5a7a255ad7d7f46a1b2ee376528d13deb2e5c2b84821a53a1f845743818e614202adacf0bef49eba05054a173cdd
 EBUILD cmd2-2.0.1.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
 EBUILD cmd2-2.1.0.ebuild 1400 BLAKE2B 5cea68cb6690e13e75cc7533bf368890f16fe0b3adc5fe990f0a3fd36121e164033bf53dc845c39bdca28f1e1ea2692a0292ced3ef9619c13376ae226df56bb1 SHA512 eaeff2631073923d5bb6cd48b6c7edb6a1ff0bcfb4cd252803a9ba88bde6b8f7baa4c8ab3ba9e9570933d12618804dc2336fb192b0553a0cfc324d4fc900dcc5
 EBUILD cmd2-2.1.1.ebuild 1401 BLAKE2B 6d0655e38d6f9f91917057298035e818112b09b24a281979453b739cf0af5ca66287698d8582b5946f3f9c56a5c47b28348014cd87f5a8639c99210f65f8884b SHA512 86f66e4ee0252dcf4dd6e860e47c93c38dcc782a40fec4c7920a68c0cbc26eee85743e29935723e790e07129c2f65ad74b2477d07e08f4fef31e9f44590188fd
+EBUILD cmd2-2.1.2.ebuild 1401 BLAKE2B b1bca955a068f55b761600276fc997c7812e80a48a9a18183e0e1bdb8fcbf8a6c36b7e6dc0ee323084dfc66ccdd7a822aad468b988fd9d83ec1f384586946310 SHA512 417e6c9d09f29857743d4a007f75c0ca20fbd352af8e96ef4776547d169b12f974f41f64dfa3922c251558d7c5b14507126294ddfbc02f3a23c39633bb874292
 MISC metadata.xml 521 BLAKE2B 30386914ac906a5e6f08eff94faed7cc964475aca24a8055cd0636d602a1f8812936ae6a0560e7c31796d3461c07fa010e0b1d4d11eb1f6d3bbb6d414f475e5f SHA512 681e363e25381946d07e03d94649c8be03b50fa2415100be0374a69cf6225a284d37fddb002cadde62ba3ddba88e91c32d1d09e4a81266bd0fcf7eccab963bf8
diff --git a/dev-python/cmd2/cmd2-2.1.2.ebuild b/dev-python/cmd2/cmd2-2.1.2.ebuild
new file mode 100644
index 000000000000..1aace00fca64
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.1.2.ebuild
@@ -0,0 +1,52 @@
+# 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="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+# pyperclip uses clipboard backends in the following preference order:
+# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
+# klipper is known to be broken in Xvfb, and therefore causes test
+# failures.  to avoid them, we must ensure that one of the backends
+# preferred to it is available (i.e. xclip or xsel) + which(1).
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		sys-apps/which
+		|| (
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/commentjson/Manifest b/dev-python/commentjson/Manifest
index c36c2d21b246..7280214c8412 100644
--- a/dev-python/commentjson/Manifest
+++ b/dev-python/commentjson/Manifest
@@ -1,3 +1,3 @@
 DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
-EBUILD commentjson-0.9.0.ebuild 746 BLAKE2B 08d352060235204766c8c869ccc0387930c379920ad81f9c2b8905ddfca5ff1c4afb5469d1c6baa2552323a3442264b1c1f1708016691fcff866aabc99690a5b SHA512 04af3ef2cb1341e2802fef5c575a95b484062a2734fc88646cc3a0bde798318a197f5a2afb568c0b09f39db329595988d219a3cddbbcd478062d1a2fc85083e7
+EBUILD commentjson-0.9.0.ebuild 765 BLAKE2B 80e4a795ae4ad812ceb8f7920d7da289c33732b5533eff42849600718c235e9c4e3514f13c70e04f5edc29e53e18ad92e5785991380a56fb96935011d420d3a2 SHA512 b8c9f26d58955bfb288acba4d9373dcfa11263c7793e421fc76ab6b251007d2752e20ec9bf341c3de881f2719f30441b369f816e41d71986f41de0019052f88c
 MISC metadata.xml 350 BLAKE2B a14a2adc21600c7f65c10bd0d741c0f81ede15baa200532ad346a74f36e4eed3bfd4af40ae30d208bd6cb1064936b4e7fc5acb0db31890a9e7109210f499b3df SHA512 558f86dfd9c937dec4a41df69e50662a86968cf1884484fc0fbe336d95b4fb4c66c22ced5b086024364d8c02aef6ffac436aa6ba80afc5398dcbf3ac12f5f4d0
diff --git a/dev-python/commentjson/commentjson-0.9.0.ebuild b/dev-python/commentjson/commentjson-0.9.0.ebuild
index 51fdc6a6b383..548184a4965d 100644
--- a/dev-python/commentjson/commentjson-0.9.0.ebuild
+++ b/dev-python/commentjson/commentjson-0.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/lark-parser[${PYTHON_USEDEP}]"
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index 3cd7d247b2cf..741672eb4a3b 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,3 +1,3 @@
-DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
-EBUILD coreapi-2.3.3-r1.ebuild 594 BLAKE2B a70d3dea9a532bb0db1da3a06e9ab0b69fa9a5ac8011bc3d5f054d0ca8209fcf1376db30e95707604d67939546aaa128a79e7e23ea0ac721c6f30815c70444f5 SHA512 b4532d544c90408a3c56acd617bf4b53bc58f5d67e79a823e6329b97ad212b5c2694b288abf8ad56c0a93534f0ef20868fde4674fa1c1d7660999d183df9ca55
-MISC metadata.xml 237 BLAKE2B 33b0d02148a9240a005eafced88dcc3a436edb18b24a5163ac89e5ad455fa5d37c5598106496c887fd0baf951766a02dca04b2c2dd66491e4e0de2b78dc185ed SHA512 e7c3d7f0a7f8d01e134a243d640ced825877ff5341c61b9f4be6406c4353528524b111b56bce8ea311fffe3bb2782b282ba86b929a17ea8f16d34581b02e7425
+DIST core-api-python-client-2.3.3.tar.gz 37470 BLAKE2B ce3f88e1608715eec06a50fa5df4cd331e90509d0b7e9ab275ccfb4b3b5216115539b7fcd70af64794f0ae50a5084873d2dbbd38c85cb8be3f319d6880f5993e SHA512 aeae3ace84c0ce61552236b83db28e47492f5ac17a0e216e1a8eeddaf67270b94127f7a40f8a37cc5051abe097555adfd690a7e6c8801524ca77c916bd451ab8
+EBUILD coreapi-2.3.3-r1.ebuild 663 BLAKE2B 2cf29a394cf12cec99cffb07c6eada9e767240b81b462689beb07c146821c8516fe382a4e4439509cf2abd059a855e1d55f5e065ccb777feed44879f8ca59017 SHA512 0d3f99dc03f633ba7fa2f0b8a762fe5462c199141b783fe350db7631913373bcca27812be04987c3ed78ee9f0e3d22a5ef817dd8f5c8b9c2f836c81a6bb5b8e8
+MISC metadata.xml 310 BLAKE2B fa8bcf6a67719d22978f8c0fc2579bdedd266247a238869a335c0729f46ba293fe977ac988311c6e3507ce3e1978cb0a1a88d657c35f0736ab92d865b7139998 SHA512 c79267281ef13cd82a865da05d06c2816aea3830ac58660c3a5d92b45a856c81990d3268110a1c347d3729caa7a96a5cd59db4a6837d691e43d806bc44895437
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
index 6b899647835f..f1d85bb66162 100644
--- a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -1,15 +1,18 @@
-# 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} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
+MY_P=python-client-${PV}
 DESCRIPTION="Python client library for Core API"
 HOMEPAGE="https://github.com/core-api/python-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/core-api/python-client/archive/${PV}.tar.gz
+		-> core-api-${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -19,5 +22,5 @@ RDEPEND="dev-python/coreschema[${PYTHON_USEDEP}]
 	dev-python/itypes[${PYTHON_USEDEP}]
 	dev-python/uritemplate[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/coreapi/metadata.xml b/dev-python/coreapi/metadata.xml
index b99b0e0b1b49..e19a9b10f754 100644
--- a/dev-python/coreapi/metadata.xml
+++ b/dev-python/coreapi/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">coreapi</remote-id>
 	</upstream>
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 6c0d975d662f..2533ccdb20e1 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,3 +1,3 @@
-DIST coreschema-0.0.4.tar.gz 10974 BLAKE2B 8bddafea9eb82140cdf2b2cd40ffc31dd4a0457f8ca216986807657a5021f7a4319f1e3db27caf7d471f8617f6f0c3a6d79ebfe7e0285bc9a6627f93d6efa760 SHA512 21a35b29cd0bb96dacaeeb0bd0faaaa4ee8875bf9639b431b59f17c41ee4829173932a6b35760caa3b46a0ec39ca173fe896b26b740fe97df36943270bc2bd3d
-EBUILD coreschema-0.0.4.ebuild 453 BLAKE2B 5ae30ad10a930c2df442ea0e71f8286a47029eb557960a1100e26d9483d6c1a65ec98b030460d7ec5a45a35c3e57b88c8e86f4646bd1e3f654353b61e914e23a SHA512 ee59307fbf36fc6e5eb5984b24574b1ffa117e1bc77687d616a5638a0c10b71a93d108a5166846cf5faa51ddd712338cd3ef32aa94e843429b6fb06564c5779f
-MISC metadata.xml 240 BLAKE2B a2806f88669f4b5790c0e506e7058c07c9f37f009398eb9361868a3e001b7b2b4972f49b4b602469ce05d36e325b0248ebec5151edaf7c39e76bb4ee94f2bce4 SHA512 cf78189db887ce6ac5c7ba16299153ac9368dff4206421313c49bb97c833b7e93467e587e322b5c2bc524648c5c0e9864f32c508ace711bc64bf1c637c62fe8d
+DIST python-coreschema-0.0.4.tar.gz 21905 BLAKE2B 1afe09038761809fa0e12d13fb89884760d4aff325a4bbdac104c03648856f8d50b562fc00a8509fcc75f962918f33d89017fae0a6d0335def4d6b77ee9aacd9 SHA512 28badbae07284fb4dbd3f01f613edda1202902115fb166bd95bbac549d398c9e02548b473524d3b530a42319a99d7e55e92bf54269827a9812249cfb285670c3
+EBUILD coreschema-0.0.4.ebuild 508 BLAKE2B c83350a487bbd5ca064d6e62220b6578f5f6e561dbff7f59c3ed1675304c911e3b0c0fb34d02dd91d3fc0ddbb66053734d0ac14dc0a7260c7ed471bb18ef0ccd SHA512 c9bcc681aedb67c8e986758d626577bdc92a93bd9b149cd06e6e8130fe1a5473f5e07d67ad0f165380e63095068e6f25a88d7dae2592a19814319511227fc526
+MISC metadata.xml 313 BLAKE2B 70878bea0c4528cf3b4af0710e5ece8585df3403d5d41247c51aef391b48986ac845e4dfd8879f56df309d318b701d83706a454c87b4636386bad5314267e844 SHA512 bfa1e0de9caf7ee1bb67b77a2a428cd58f9bcf3c2c7abd65bc8a33314232d8ab631cc8a1c8cb3956ef66cda9d82f0cb34f98159532430797df01699ae77f7593
diff --git a/dev-python/coreschema/coreschema-0.0.4.ebuild b/dev-python/coreschema/coreschema-0.0.4.ebuild
index c9e4efbc99e9..a4c0e7af886b 100644
--- a/dev-python/coreschema/coreschema-0.0.4.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4.ebuild
@@ -1,20 +1,23 @@
-# 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} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
+MY_P=python-${P}
 DESCRIPTION="Core Schema"
 HOMEPAGE="https://github.com/core-api/python-coreschema"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="
+	https://github.com/core-api/python-coreschema/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/coreschema/metadata.xml b/dev-python/coreschema/metadata.xml
index d45b55897acd..96dce88db220 100644
--- a/dev-python/coreschema/metadata.xml
+++ b/dev-python/coreschema/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">coreschema</remote-id>
 	</upstream>
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index e04883c55522..b2ef87186b02 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,5 +1,5 @@
 DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
 DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
 EBUILD dbusmock-0.23.0.ebuild 884 BLAKE2B bd4705a564681c26f4a7df8e7c7a1ea5c81d2ba34cd9076668b6ef0bcaceb1d8f1d275845a1ef41edd2f87c59b7aa3a4eafabcdba628690c969aaf592d1216c6 SHA512 dd458558957c6a95d08462e85bc54b14ccb865bcb872f282208dd8b8233bdd43ffaceea4d6fc92ca614e12a8d9601b36d831b1685e0af1a2ca237eb047969ead
-EBUILD dbusmock-0.23.1.ebuild 892 BLAKE2B 0ee63c7e0d6ba48b0df8a5ed6d91bba31e383b9c1eab70b25d4bc0f2811e514d84149aa2d4c21c00ad5fbb3b2a4cf53259884fb0c0940bd8fb75a3b61e59dfeb SHA512 4eb1f0405fa6313580046694131c1a314080b5c570cb099d0f223c813255425ec98d190af4bd86c86de4a340e05108d7698f870cfb8705214a04ed321d8fe81f
+EBUILD dbusmock-0.23.1.ebuild 891 BLAKE2B 2303ec89e922e58849e165e37815be59e23e0e1a603a8614aacf8f97945f2a489950da9d484011ab34c592e3049920d62a5e50ef0d31e21db48223d65fdecac0 SHA512 3c1063d6c598ef9df1374521bc1e7690010b5b111669b013dd272a5cad3c9ce95c8c275f6149f6e496638ea858e98e6df63a0b05cf0778e36106906cae21f14f
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.1.ebuild b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
index e0fb9905254e..a6edf83ff618 100644
--- a/dev-python/dbusmock/dbusmock-0.23.1.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.23.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 59bebbeb00b8..7038404372b9 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 599 BLAKE2B 1b3084756fe090a7373da6da3b6a51f27b65869c971504d98b52d7135c6fffaccfd2da5e2a7dba242632e7c46519733de4f79af3fa91a8d31530124c08e75ddd SHA512 02690601778268c0f13e6b7dcf23ce96f42698eaac773e4360725d4bdfa8a28de80ed39ac6c2c562495d83deecc34b6aec516074d8a157218ab083f0a9f5f0a2
+EBUILD deprecation-2.1.0.ebuild 647 BLAKE2B 3ffa5d552429ebb8667eb784dec51139ae5338ee04fd5e71943ab34c38e230b3926677dff6c58739c62cd676e1bd75c8d1d0d69cbe45db255c85335cde682dd9 SHA512 25790f808a62ccb9e8a0cd335ea5515099c69dbf649f8c1681b1c679b86149d58fda23d712476bd68dacc94412579c079710abb95034475135a068a3215c801d
 MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 435613b78604..27e83e0c5858 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle automated deprecations"
@@ -16,11 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e 's:unittest2:unittest:' tests/test_deprecation.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 45b4556a5d11..300756964c46 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,3 @@
 DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
-EBUILD dictdiffer-0.8.1.ebuild 1003 BLAKE2B ea236f1aecf61a18297db715e3b8ea30de231dcd08a33455cacfdd0a78df6b3ee7a2d1e1ed1a02aefd69ebf37a7c427e2278ff1bec986d12f8f414884d7261c3 SHA512 169c63dd866c75f4c88c4730bd41365a935cb28c41523a7cc58f28e726a543d13a4fcdef04a4921dca6d33211b3d9a0489a3f5840f7cafd19985004caf83cc91
+EBUILD dictdiffer-0.8.1.ebuild 1015 BLAKE2B 2232a7e52868736c9ac438d07551fa151e7bfa56c1f711c5940c5afb15caf0399dc2ea0683c160afe2d096f35e467f681cba8cbad9ecb0dd9b2de84bb90d72ad SHA512 c830cdf94fddd844380b6906c66c19233b08aa1fd8af92841616f10e63f58462ad0eb32daee126c71b72c51c67f35afc1c8e5a95feeb7a7d6bbf4b3f88a70d66
 MISC metadata.xml 422 BLAKE2B f926b468982f49d593d7752f56f8cd984dbeb0ddcbbf853612a56ffc63d3a2fda04c2780cb81139eac4801b1a0ae494dcbb9777850757a9e256136660dbe8f69 SHA512 e823a29e9d83a8b011c66085debed2ae9f48ed3208ce7f79e1f51854c9ca7231993e7a426da6273ea82e0c30f1ad6fccb0c9564290026f187fa94dd6e7c7e098
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
index c0771d96705f..b1205c68e660 100644
--- a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 3bdbb8ab1de7..2f6a86b20003 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,4 +1,4 @@
 DIST diskcache-5.2.1.gh.tar.gz 652769 BLAKE2B 25fcdcf51c8be7a6e2a9de645258f776647789a7f06c70c8564ad28bd003a745167095b11a54d435e733d9f5181a1443be2510fe2d901cc208ea426d3359c0ba SHA512 6e55bada12145d931f4a465092decc3f2cfed2e618d1ea271ad6daa6caf7c3abfd6ae5de11072efdf898ebf272acd39136136b58d7b5e735092963bdd46af52e
-EBUILD diskcache-5.2.1-r1.ebuild 1031 BLAKE2B 6b9168e3c4f7cafbc4f078385a41e20a105070daa1019e2f577ab2477ef32de44f7d6e218dc4f91c557e3e2672738a313b288234afb4ea661fcd53728b3f709e SHA512 46581c60587d5f6265db433275a370160cee8977c0c233de65b9f79516ea63d0ab7013c2de07350c4ea41592af777dd65467a92d1d6565a6780885713d147f9a
+EBUILD diskcache-5.2.1-r1.ebuild 1037 BLAKE2B 90cd8f9c22648b36cd20c63ef0467215149fef1871c37a500c70107320e7f45a667752f1178e12a19fe67e05854439f9fd5204711516a74d0840decb73f55585 SHA512 bd529db091044e8b0d7f70560418b2d81d660d4c56dba75585e9907494da24dbdbc98841c7a976349170c6fa5d25bf537b4c8c82e3f53eda4a60bbf63876a41f
 EBUILD diskcache-5.2.1.ebuild 845 BLAKE2B 9b435c3adf032acdc81a283d00102cb3f0b9dbe22f76438f02eb98b0234cbe0418af1526192f84409d6c4bb7a1b6baec07dcc0ac888002c808dbcc3913462fd8 SHA512 3525d0cefdfa839fd45bf337501a2a17c799eaada4edf79e9ce7a3d890282ba98036b5dbb3741e4a53d7afdb9f0d3e21ea17fb984bd1d084f9569180769c7b02
 MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
index 634ebf8df4dc..0bba6032946b 100644
--- a/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
+++ b/dev-python/diskcache/diskcache-5.2.1-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index d2bcb938a6ff..3c96474962a0 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,8 +1,5 @@
-AUX distlib-0.3.1-system-pypiserver.py 1532 BLAKE2B 7bb2bbb2282bcaa943735804428b00f6c51fdb51c7acaec7efe653495acd9194a0544d5d49531a96ab269ab8a61ba87e3c35d4f30ce5275a0a284fadd88cc19f SHA512 b96579d450c5c33502edc57480d5bb00aa3b9b61333c43ab446a3cf7117934a6a14026b2061cbf28e69e88a515554f8a1aad732f685cb73f18686b1aba6379ab
 AUX distlib-0.3.2-py310.patch 1131 BLAKE2B d5f7dde9f3a23756d926ce39061ab1d168e3dcf1161b63eadcc2f639f58cb58d9e3dc4bf4738cd32a148fc649abd236230ea57353d851c1fd536c5fd2964c56e SHA512 d96f9ed3e023084103025650d34448cbddd301f7d43d65f565427e00976809d813730f5208dcae53969cfbe8f5eff054cd538141ff1e988dcb4396f8c94cd5ae
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-DIST distlib-0.3.1.tar.bz2 1068500 BLAKE2B 52135869242f71cc6d6887da6d9e20ffc6b46c84d8146393961062d92d8c0bd68e1309277f64fdec0319ff3c503b1caaba3d5378f5c081dca79573c8d9c2e6f2 SHA512 f259299176c45be7024b80759015a2fad120ffdde55b6abea0f7fb0335cee90809b5daedcb88abdfb68fd496284b2e478df622004b3750327bfc86807581116c
 DIST distlib-0.3.2.tar.bz2 1075843 BLAKE2B 3595dc6af53beb7ff7dc49013e6c3db3453b501b56790a953c2cfea5a73aaca71fc69de68c8121ae92ffafd32a70ffa69d768cfd42844135fd5bd6647611e090 SHA512 e033ff2ff6b760f698a20103e01d63fa87bc1839bbf44fce252284c793e10a057dac645d818a4e0a2aa8be97bb85fcf9c8706b2399c505f12a093024d11be578
-EBUILD distlib-0.3.1-r1.ebuild 1468 BLAKE2B 4b154a1d890ac4d3b9e4062c08ff2919559d3895c3f447a348be68c9ecece8080f3c3c5ad65902d5c1ec7083387ac546e61de9ab28f11659de064eac8f2beed7 SHA512 61b9b0e5555ab60f61d96607aa354d7cd574069829595caaa04f6cae10cacb34a89660fea0b0d2970c3c1cd324b932d345d951b6df400695fd951f1ce36f5c1d
-EBUILD distlib-0.3.2.ebuild 1536 BLAKE2B 4ba01f3493512fc2225267fed74bd29d0e2b2ead0e53940aae177e23f0dd69091adc173dc3d5456ce8905eb79be55a53a8dfa7c2c94a568887e6ab99404254b2 SHA512 65e8640f9cadf3aedfef13ac24984b0a9e46dbf54655dc66b443c2aebba713dc797c7dcd0ad4e400680fd618ff453a61bd5b08a8939463fd31d49f5ade810a1a
+EBUILD distlib-0.3.2.ebuild 1533 BLAKE2B cd0de8e590780513724b7ea0eaa435f96fdc98cb100e1dcfd4db7a4d4491b4af8f3a7d0e6cb3b68c86598a4764f0ddbae70453e89c5dbfda55ae83674343c95e SHA512 ebeee4a11e1a99559a1efe4d1891d0fb95d3c4b2a1c721940c72a7b36ee95a2de86127c7add7cf89d074299a5e997c32586dbec883e17b53efee82e68cfce0d0
 MISC metadata.xml 288 BLAKE2B 865be58267f18634250b494dac795da10ca6daa5defa289003da9282f06eebdcc3a3369bb39b2a7ac216ec44134b29ec9052676637564974eafbbf4c270403d4 SHA512 2eb267e476064080a3e34b4f66af276666a30d37967298384f612c2fe9a73bd805b0ba72f6c4e2c1ca6d6bf737d8b3f5484b0c3f37f2ec1616f9017124c54cf1
diff --git a/dev-python/distlib/distlib-0.3.1-r1.ebuild b/dev-python/distlib/distlib-0.3.1-r1.ebuild
deleted file mode 100644
index ab98794d5345..000000000000
--- a/dev-python/distlib/distlib-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +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,8,9} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="https://pypi.org/project/distlib/
-	https://bitbucket.org/pypa/distlib/"
-# pypi has zip only :-(
-SRC_URI="
-	https://bitbucket.org/pypa/distlib/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-# This package's tests are extremely fragile and tend to break or hang
-# when it doesn't like metadata of packages installed on the system.
-RESTRICT="test"
-
-# pypiserver is called as external executable
-# openpyxl installs invalid metadata that breaks distlib
-BDEPEND="
-	test? (
-		dev-python/pypiserver
-		!!<dev-python/openpyxl-3.0.3[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# make sure they're not used
-	rm -r tests/unittest2 || die
-	rm tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.1-system-pypiserver.py || die
-
-	# doesn't work with our patched pip
-	sed -e '/PIP_AVAIL/s:True:False:' \
-		-i tests/test_wheel.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.2.ebuild b/dev-python/distlib/distlib-0.3.2.ebuild
index 36e8bd9017eb..1f5679c4c7f4 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/distlib/files/distlib-0.3.1-system-pypiserver.py b/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
deleted file mode 100644
index beb0cd8dd925..000000000000
--- a/dev-python/distlib/files/distlib-0.3.1-system-pypiserver.py
+++ /dev/null
@@ -1,37 +0,0 @@
-From f30a24d3dffee78cf0581218d9cca0e395b75f6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 8 Jul 2020 09:24:42 +0200
-Subject: [PATCH] Use system pypiserver
-
----
- tests/test_index.py | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/tests/test_index.py b/tests/test_index.py
-index bc24367..4971e3f 100644
---- a/tests/test_index.py
-+++ b/tests/test_index.py
-@@ -52,11 +52,6 @@ class PackageIndexTestCase(unittest.TestCase):
-     def setUpClass(cls):
-         if cls.run_test_server:
-             cls.server = None
--            server_script = os.path.join(HERE, 'pypi-server-standalone.py')
--            if not os.path.exists(server_script):
--                logger.debug('test server not available - some tests '
--                             'will be skipped.')
--                return
-             pwdfn = os.path.join(HERE, 'passwords')
-             if not os.path.exists(pwdfn):   # pragma: no cover
-                 with open(pwdfn, 'w') as f:
-@@ -65,7 +60,7 @@ class PackageIndexTestCase(unittest.TestCase):
-             if not os.path.isdir(pkgdir):   # pragma: no cover
-                 os.mkdir(pkgdir)
-             cls.sink = sink = open(os.devnull, 'w')
--            cmd = [sys.executable, 'pypi-server-standalone.py',
-+            cmd = ['pypi-server',
-                    '-P', 'passwords', 'packages']
-             cls.server = subprocess.Popen(cmd, stdout=sink, stderr=sink,
-                                           cwd=HERE)
--- 
-2.27.0
-
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index ffe99f957337..438ded82d35a 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,3 +1,5 @@
 DIST django-taggit-1.3.0.tar.gz 46986 BLAKE2B ebe425bc17b67977d40c56b9072ef471e1239090056667f1a5792f005908cbffc31f9eb863575ff7d3d359ebef7263e085bad5b7b481ed9060720bd59f617bb3 SHA512 bd5a537fc11bc4b434a5dbbc11e583acb3878101fcfa7e24af3aca5f160e2f1ac8defc9454c0814d39eb47bbb8edea8d3cf47627ad4b4dc86b962cd69d415ccd
+DIST django-taggit-1.5.1.tar.gz 52766 BLAKE2B 59892ba591ad5cbc40a7515a6427722d7cb58e2daadec579b1c08dcc3522e24e041cbe06c953c3717cdf3db50aef7ff9fb5b4eac00344e457b61797745638107 SHA512 8e7afefd8f0654340e234f7bd1cc3684b3e5d1f4d94d17c79ed8fb82096c21a809e7f8db2fea9509d45c3f2bdc5e8ed52fb0823779b0a039f87528642803725b
 EBUILD django-taggit-1.3.0.ebuild 429 BLAKE2B 58978a90503dde259fcf0c9b0e7c714276ab1bf3bba34a25fd4adb2927ccb005f3bd46561e336f89d41b06680341651d588b25287570ec4a5600277f753ee128 SHA512 ead14dcc1f7495fe8ff63883e660e9f3bd5b00501649e7aa227a8ab4b955421c915e94bec82311c06c6a3ae4433b377342e5bec1d80129f8c88fb14b736073b8
-MISC metadata.xml 243 BLAKE2B 922ba740c2c2514de42be7fe3120cf65a80aa8887081415a4a19ff5f0ac00bdfe9e086092265593db35b682450da516371ce58335253cb44899f70e12d058e03 SHA512 010422b743b59d85185fe4e6ee9e5aa60d85b78f95dca86e1cc56b4e43c6bf2894b26f57eb3cd515407170e6d3bfe4780d15a611b434a22b104f6dac2c2394d0
+EBUILD django-taggit-1.5.1.ebuild 651 BLAKE2B 30cf35983a6d700460559c4a2da3839798407d7b961ffaf1063917c7e24816ed10f42d0fca5d5ea592513cf8a106587c14360e0365c982b94ac508d354f75e36 SHA512 3841045ce523b27828a91d0da10b2deb7e79cb434ce99f40d21dc0eae4a1dd9ce14cf3ffc15410661cf1745072827f051ccafccff98d5288af2cc2931a7dd95e
+MISC metadata.xml 340 BLAKE2B 236e64c48f88b6cbd3417a23823be6125606d81f0d150890123f32b5915e50de9bb47bed2a69079373055e72c267951410f12d8f018c0345f3bbb8d2b5f62c4c SHA512 e253645b70e66e062e96cf3281b668d4c0f515624305823bdb78eb9f2d14732340b0623662b1607776f5837367100d221a4f109026fc5ea940522119f5ecfee2
diff --git a/dev-python/django-taggit/django-taggit-1.5.1.ebuild b/dev-python/django-taggit/django-taggit-1.5.1.ebuild
new file mode 100644
index 000000000000..27e3b3afdeea
--- /dev/null
+++ b/dev-python/django-taggit/django-taggit-1.5.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Simple tagging for Django"
+HOMEPAGE="https://github.com/jazzband/django-taggit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m django test -v 2 --settings=tests.settings ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django-taggit/metadata.xml b/dev-python/django-taggit/metadata.xml
index 4514a512c9dc..a75c4a522006 100644
--- a/dev-python/django-taggit/metadata.xml
+++ b/dev-python/django-taggit/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-taggit</remote-id>
 	</upstream>
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 176dcbd508a8..766b7ae838b4 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,5 @@
 DIST django-timezone-field-4.1.tar.gz 8286 BLAKE2B 591a3d9a332102fd6b3a3cf865b1b9ca2ef1d7b37f6bc1a01ddc724050468d59ee5b6c14933203b6182a5efddad32e7e76b17980e415562404057b0e25393089 SHA512 3903e19ab66d636a4fa9c0364aa8232958c6b0d33c41253d57322320543e8f4993ff1eac2fdbee319b174e7e85fbb2dece9cd8db910913d4249de9eb862917e2
+DIST django-timezone-field-4.2.1.gh.tar.gz 23457 BLAKE2B 72452a21e6e086363da2ef40389d12b79860f66706e54fb9050ffe48f7fa6ad2908c75d4c7e17a79df339eac76492599dd4533ddca69a5b8757b46a36ed4b0fc SHA512 4c2da420c3aaffa23d8cdb66dbbe4b2ea8638de5a45d9e381bf9af980e52eba77fc03a2b8fee8497662199cdc9436d56543c0f6316e74ae5da68187a305c34a2
 EBUILD django-timezone-field-4.1.ebuild 521 BLAKE2B 9e9fd6e42cb5bfc36f0d5d15db80ccde90be27895e8e25b22f93dfcd8b8b7a89df98724c50645069fb02b89c25506b2647ade3a3ea24b83a5c0e5bc49f491892 SHA512 57c506aae9b717403fca3897c08bf3fd7cc1b319e218aeb4a8f574b7329d79f5fcb6803bbe798b4ed226aec86efc8125159dec408717437a1c6ab8169aad8aaf
-MISC metadata.xml 251 BLAKE2B 3b078b0494de8de6d7ce0bcacc20ce81030e714ef309f3314cef7f1fbe9a4cf82955638a3dcadfa359ae11e805f6a03ebed11f746f61429d2dbeb0f9d1ee48af SHA512 3ea63f6ca04ab11da661c2f18c99e52cd54ccca61c8dd95651361c431d61f385beb2a353c02f37b230c349a1f5814db2946be9d2c0250cbebcc36b4add22345a
+EBUILD django-timezone-field-4.2.1.ebuild 807 BLAKE2B 6b9fe27cf74bf9a38679c8c78cfc92bc8d3b60839a6118546b003d2d33b120010f084fdd785f4fdf0f9932de53e6cdf077476f0fb092461afbb2a5e79ede1d0e SHA512 1f175570d95e3a7fcc0fe3cd0a30f3908bd2bced12c0bda740a5e90347887cd7689ac60bd984c07964822d0ff242d8845b8a567cca2941cc375ce3ef802c4b7c
+MISC metadata.xml 324 BLAKE2B 8e967552854fc508cc2d465a17298538c0ba53e39399e41c6a135051053c47f29d3b9bdfed440280e32373e72fce5d8366c821a29cb8c860040b9748f2f0b155 SHA512 eac99b2e735901969cb38524fa98b0312d8065d75c1d1536dc0e6ea64f1f2db8a81dd907210f69a86fb56c159a7992dc7aa5ffc2be9e8b344c516ade0109df1d
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild
new file mode 100644
index 000000000000..0e61159b2c1e
--- /dev/null
+++ b/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
+HOMEPAGE="https://github.com/mfogel/django-timezone-field"
+SRC_URI="
+	https://github.com/mfogel/django-timezone-field/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DB_ENGINE=sqlite
+	epytest
+}
diff --git a/dev-python/django-timezone-field/metadata.xml b/dev-python/django-timezone-field/metadata.xml
index 05081b957933..eb7c1b7c73f9 100644
--- a/dev-python/django-timezone-field/metadata.xml
+++ b/dev-python/django-timezone-field/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">django-timezone-field</remote-id>
 	</upstream>
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 6aafb1dc8011..84627d818c5c 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,5 +1,3 @@
-DIST django-rest-framework-3.12.2.gh.tar.gz 8856613 BLAKE2B 77d0b3bad38c7829387de752d913eb758935615213d8f8ada9422ecf25142383c1b11a1c95d5fc9f4cf7634e494119ddcb236c810e85429fa8cd4ecd1ef88132 SHA512 7c3e712897562eff14ddfa4ded6627d6b4263001e0c9a4047b92da43c0fd86e8ac9d09bb54bb87ce0d4e7743553c4733a60b18327f7e4d481cb9898593731467
 DIST django-rest-framework-3.12.4.gh.tar.gz 8856507 BLAKE2B 48150e8d966ddd169a2b58d90656efa8f9f549c9d2fdee6025254fba2a6221704fe6bcb246567c8acb963f76ea56046935d3190c7c391daf4773b100a641ba02 SHA512 406b5354809b94e371a2c7d4b62ce66c18a1f60bd02574cba603ad4c44faa4297bdbbd6ee50de63fe21d2aae18386e05d46983a506bddd17f06ce610d5b727c9
-EBUILD djangorestframework-3.12.2.ebuild 897 BLAKE2B 5363888f5bb74b56a863bde2b9406b5976db952037ce7df5ec75db96bd75d46841d52eb278201ea817847497fdf7e76de0ea82fecdd9040d7e9df6aa9af6e394 SHA512 f1987c8a4122fc653ab8bf9b95730f58657dde1502887bbd78f6cd8a02d3ccdcb14350ebd602c3d7f2cd320929fa64cdb166adcfd24601f3ee2cccddb9502c2f
-EBUILD djangorestframework-3.12.4.ebuild 897 BLAKE2B 5363888f5bb74b56a863bde2b9406b5976db952037ce7df5ec75db96bd75d46841d52eb278201ea817847497fdf7e76de0ea82fecdd9040d7e9df6aa9af6e394 SHA512 f1987c8a4122fc653ab8bf9b95730f58657dde1502887bbd78f6cd8a02d3ccdcb14350ebd602c3d7f2cd320929fa64cdb166adcfd24601f3ee2cccddb9502c2f
+EBUILD djangorestframework-3.12.4.ebuild 1027 BLAKE2B e6debb796823873ef111093e755925a66361dc665eedfe7b5b77a08694cdca9f7d3f91e8fe2ec2df103360d1819b2728d63af0cf2daf22a1b3774bf9b103c8de SHA512 ea50d726eb11ad1e90022ab2fc4e931a99252d8ff0a6b2069595c4dbe590b3b12bc29d8d8a25947552d912b13e76ca4134dd8f4c6e9cb613b867b05c894c3740
 MISC metadata.xml 322 BLAKE2B 59f5fa6d07d7a817847f2d0a5e4d6ab5af8b687fab67b3cf646a2345157d85356d663226013255d7d5d70dff6970ad456a34a74771d8e3bfa4096d8d3ca302fd SHA512 bccd84ffc3245536c3cb21f75e56cb6a02e1ae4f565b8dcc741b5cfea37b1712e3099d6c43b6bd2d4b23e0c2cac3694a170d227984a847068f963419327bddc8
diff --git a/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild b/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
deleted file mode 100644
index 8530587f35df..000000000000
--- a/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P=django-rest-framework-${PV}
-DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org/"
-SRC_URI="
-	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/coreapi[${PYTHON_USEDEP}]
-		dev-python/coreschema[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild b/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
index 8530587f35df..8b6cfef95bea 100644
--- a/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_P=django-rest-framework-${PV}
@@ -34,6 +33,8 @@ python_test() {
 	local deselect=(
 		# TODO
 		tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
+		# django version incompatibility?
+		tests/test_fields.py::TestNaiveDayLightSavingTimeTimeZoneDateTimeField::test_invalid_inputs
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index c4822f1e6f4e..1d7d1b23fd72 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,4 +1,3 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
 EBUILD easyprocess-0.3-r1.ebuild 642 BLAKE2B e91e2594b0749b50f6d7c21203dd94888b290c578af8cb0a34d6a7a26a34f3bca9fc5d529a4b7239b24fb49be6ecda3fa3879005cfcafdc3ff53b0e01006dcdf SHA512 3aadc07bdb5c012c16f2e8a81605ea93139add64dfc153149ff53a1c94e2c9d832ebf17af3d44f610493c80d48bebff0d5092659063ddbb8c209f9b7946a9242
-EBUILD easyprocess-0.3.ebuild 640 BLAKE2B 38937850e2431502e56759991db3dbe672d5f3258068536524bae4127c53228f8a804066136a8e0b1bc581afd57cc7a8c3cfa3decc3f4d0201edb70df190bc5b SHA512 7b79a5453fd0ea8ca2490b82ba1721a8c85a22dc7ed42ba5033c9c879be3f2bdec782ee3eef03103acd605fcc56c4331ee76fbab87b0703bf27bcaf9fd915498
 MISC metadata.xml 356 BLAKE2B 46f8aa801520513b2d82a062ec01e17da2620126a20102a6ca859c28d0f3f21d01ab58f442fb450559a8cce28a73929f6586f7847bfb47066bc1efa3597e13ef SHA512 02b15b294880ebaf762bdeb5002e0d56e94632592f97116a3a5a9f61724359010e8e5da331d3775d4f57166fa2499875424c732929fc70b8a311a50e77b5b264
diff --git a/dev-python/easyprocess/easyprocess-0.3.ebuild b/dev-python/easyprocess/easyprocess-0.3.ebuild
deleted file mode 100644
index cb3c5b741ddd..000000000000
--- a/dev-python/easyprocess/easyprocess-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use Python subprocess interface"
-HOMEPAGE="https://github.com/ponty/EasyProcess"
-SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb]
-)"
-
-S="${WORKDIR}/EasyProcess-${PV}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 7c75288d9829..bba0c5b08460 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,5 +1,3 @@
-DIST entrypoint2-0.2.3.tar.gz 11542 BLAKE2B ef1ef511e02a3c5601d3147af241965fa78361a8cd070b5f0240f3842cdd49b3f93a32af4299568d201382c8c5a694ec7f85191c5880d489056744f59cbcd346 SHA512 c02ca02be9f25533c6a37a3aa372cdb75de8419349e279f7bd82369667a75943fc2fd0ba5afad49281d623f8ac4d6f97ffb2dbdb7b72b4cdc9afec80e763bed5
 DIST entrypoint2-0.2.4.tar.gz 10407 BLAKE2B 16335f8e2bc173413f387e581892b1fe03efdb6bdea2e75d20a95258d55c0cb83dc70691cb4b41b07e49881db4e5c08593bba42adf5c1a69785e32c99d68a7fa SHA512 7bf7dea2afc7df3ebe57f89f472e4456fc22d5c66720930a2b15dbe04f708ff4bb00feec79af430620d8cc6d91d5df1770869d23d2282ecc0024ecc7583b360b
-EBUILD entrypoint2-0.2.3.ebuild 546 BLAKE2B 45248bbe41b1834dc97c3f0d23e6f5e74747750a4e50d845acb2d399ca60ac3d735c19c6cdfdd62fda90b277102d24a53dfee2eba66427a6c397696503987eff SHA512 7ecc7903ef8205db6998919932bf6aab6b4b0fd74c15dd777bc77ec47f07277cd824cef875bb3ee37cf163c611743166acdda64e55b15735d3ab82671ac51e49
 EBUILD entrypoint2-0.2.4.ebuild 548 BLAKE2B 7eeb4dc0fc49dfb78b45ba7d134c3c155e05da0e1c16401759148d47e70d715e906bf7f2db999ccf2cf82aad9218bc258a7c8d854c53db73560ea53d65cc0ef2 SHA512 838bbc115027ea3bd3b05411a85602047427a7a7d39e83277448bf7259b556cae2b55a6cd96739c36387b716b63ffaa3b4a176c86775098b09c99bc057f508fe
 MISC metadata.xml 356 BLAKE2B efa83386b3794047db369036f6ab0efe0c1b6881a8375cea5f331237ef9f23db1f0b594f07fc071f0923c56a45e8903aeb87d101cb847736226066dfcdcb4504 SHA512 8b0f5502eb4b0fe766fdd706f1eada39c77e0dc1bd52f2c60d28d23ac9729f08409150d82c1a8b5d8a6c9a0c3c80f23a46c9f2e7776eea8d2d9058d4b8e87d23
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild
deleted file mode 100644
index 51a72e233eff..000000000000
--- a/dev-python/entrypoint2/entrypoint2-0.2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use command-line interface for python modules"
-HOMEPAGE="https://github.com/ponty/entrypoint2"
-SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/easyprocess[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ewmh/Manifest b/dev-python/ewmh/Manifest
index 80e3bcc2e9f7..8c88b3cbd7fb 100644
--- a/dev-python/ewmh/Manifest
+++ b/dev-python/ewmh/Manifest
@@ -1,3 +1,3 @@
 DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b
-EBUILD ewmh-0.1.6.ebuild 484 BLAKE2B 216e97beabc45f445c60cf87811473cf197c13db63e040054ced258b0df9f8b8b37b47be501009eb44d2446626ae4e210cbe550146c1e8262b91ea6e55e936c7 SHA512 811fa4028c6d8d9be03c1b3f3fe66573d0ddb059746f2b30e3fe2bfb2babe1be8dde36f3fa716a7bdde4adb67f33e393599043a1aba05b807c9a1a223583db9e
+EBUILD ewmh-0.1.6.ebuild 482 BLAKE2B 558297ba2dee5d724bc2e09ebcb9ba4f764fed37833d2de4a5635ffb5f70c3d122324df853ec70dcf94eb2b58db66a118e1a2e5824c849ea68d957d15b855839 SHA512 9333538f0360fc924b93e41e930f88b38668fb75eaddd85d0f879833cc8fb37d3e4b3bd65a72a75b8a7a55960379210d9caab7309011b3ffd335d74db71608e4
 MISC metadata.xml 471 BLAKE2B c8f09a0ac2212bac2fc9b49057f8207ff0193c097c09853edeabd2cfc5388d3b0c9b584bf3696817a29b038974724178be52a994a783ac88ab956bb97c65437c SHA512 2435b9f91a8911c6cae39a485e07b8418456d51712737c2ebe89c30085594bca821be8eef2be99db60a29cb2486b6ee5313369b81c43e2ab351d2919176f18a4
diff --git a/dev-python/ewmh/ewmh-0.1.6.ebuild b/dev-python/ewmh/ewmh-0.1.6.ebuild
index 41e1c834122e..741fd36f3ab9 100644
--- a/dev-python/ewmh/ewmh-0.1.6.ebuild
+++ b/dev-python/ewmh/ewmh-0.1.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 
 RDEPEND="dev-python/python-xlib[${PYTHON_USEDEP}]"
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 55754e8e3413..8e65071d87de 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,9 +1,3 @@
-DIST exdown-0.8.6.tar.gz 5480 BLAKE2B fe383a2092691afdb2a3fd8cfeffb78f62b23bd4dc8f8d5365102084acc8670c9f2bc3e4a0ade95a50ceffc5cc142c39dbd3e505678a238d6f39b82f6553071a SHA512 28cd68ed99d24c79a7764f7603242f2b1426f119864d39424b1326cecc5bc922ed610133099e7d03d384c485f4f67d1fefcaadee4e1f69ac8ece08136eb858e9
-DIST exdown-0.8.8.tar.gz 5523 BLAKE2B b53f23ebf133ad75973298b9b98c3f85f63802a9a302e92dda1446f0d686ba4eecd4fa72056d331b6e6caca5e066ec032a31fbfa3e74c1dba39ed007cf116480 SHA512 f5ef32b15720091c459110d6c9644b8dfcc84f6fd117f8433380704e93848cac0c9a3709d879bc42561474dd46b2035bc2be2f7e0bb5207a40ceb26ce4577b4a
-DIST exdown-0.8.9.tar.gz 5558 BLAKE2B 9fade2918bed1a6f81619e2d2bf13a2459f36e73422e271fc470944006b2fb28d5fe0c7bd01810a605fdae64a3725d96e9ea3b8b39f391a4254292244437f380 SHA512 c1d556634295dc24fb7b4a13ea73aff9a162d96e5f698c3923e87fb6a5a1b28be49d2527d91b861aeb8c26bce08b8ebfa0ad6b02553d8e7c291430ec1f72be7c
 DIST pytest-codeblocks-0.9.0.tar.gz 6590 BLAKE2B 34d1c72a891d2f2f1d98c4238322d888a48b286d628e3738043d16a59a75b3bd15b29e31c554a83508d9af31caf1b526e3c535a243bcf77c8d77f9bf5be69f5b SHA512 834002c4e9c8ad36baa9a4ed494fe28cf09460e0ee5a0a3d8d111cb0bd8ca4ed3c784a047901bc67984e7892f931b5644c1ea68112e4d9dda514a20e048b3d11
-EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-EBUILD exdown-0.8.8.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
-EBUILD exdown-0.8.9.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.9.0.ebuild 653 BLAKE2B 07eff7f1c42a3431604707a8404395390949ed67d20c65dfbf68e55157866211cdc9d4149d7ca7b8db39c132e7f152107f9fba2f4e58d6ad84ef2e7c3d1ab5d0 SHA512 62ed6e8a8277942efa99971c4e60f5ee64313abe36cf2457ea6f8804537db93fc1fd8365182efe2e798b5de8cc99cb8913f118372d8c97d2a81d04f7abf7b992
 MISC metadata.xml 506 BLAKE2B 9bd72901b30d0417e121259e083f48558237e00e01e48414e7e6e755b62df952ff0e80e6e729e17bc61ccd579335b6d913b627169c070d357894a4591ac1a6a6 SHA512 4578c9abf3abe58bfc618e04730f2d08ab539996839ee99d450eecbb312cee47c858a7800323eb26d47ae21b07380b78246bdc05c2bf8fce146cccd1e8e884f8
diff --git a/dev-python/exdown/exdown-0.8.6.ebuild b/dev-python/exdown/exdown-0.8.6.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.8.ebuild b/dev-python/exdown/exdown-0.8.8.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/exdown/exdown-0.8.9.ebuild b/dev-python/exdown/exdown-0.8.9.ebuild
deleted file mode 100644
index d8894682f3ed..000000000000
--- a/dev-python/exdown/exdown-0.8.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/exdown"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 6160354592f5..214482d24e4c 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,3 +1,5 @@
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
+DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
 EBUILD executing-0.6.0.ebuild 967 BLAKE2B f3d4b98de91121ccb7a3f3c0117aef17c0d78bbe398953001dc67a950b3024c9dba6598d4affaa66b75cf1579101c3ddd3c2e00ff4be40f10234d6590bf0c043 SHA512 5e3f463c6be4d518e075e60d563ff1ae13f73616e67060f47015ff156edda5235bd394d428767963f156780fab4f6d7a19370645a760ad8f7e18f79064c49f7d
+EBUILD executing-0.7.0.ebuild 930 BLAKE2B 1d103318ce536b06e88050d4af7f692809a474d6bd39fca706b822496f1de9a1a2a4bc64fc7385dca836d36851d2c9a045ce0cf48c90b14b6f62f9c2701f5699 SHA512 6b210a9c78b7b01a3fcbe34f63183de9818537575f05d19cee2560e2486d3ec948d4fd52a016fba055913992e37a767cb3ab3a74d959d0008f8141013f813e35
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.7.0.ebuild b/dev-python/executing/executing-0.7.0.ebuild
new file mode 100644
index 000000000000..fc9d9501f8e0
--- /dev/null
+++ b/dev-python/executing/executing-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-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="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index fe22a8c3d1c2..87f6d692c700 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 688 BLAKE2B f86f7435bb59161f016e03449250f506797acfa00cac0160625badcf7fd224d81f418dc48579b9158f153eab1df7c65931ad6d27c5f414ed38672775f2f51b53 SHA512 64602130becd268e97ebe19f7ab8318351a419ee89039a35b25141ad09193cc5c64803b6021817f544d73527f7a06733344c410986f9f274f4f49ea3ab21bbec
+EBUILD extras-1.0.0-r1.ebuild 688 BLAKE2B cb6b959d085ef45c913a0ae350ed51b9f8a469b8917d96b08263631e558aac671c892df7c284508ec2690f261996f34d4723b09759d4592a792e55c0073cf301 SHA512 c05932dce9cd89cf525ce51330e4a85e5332db814923ec60c99df268db71c379c68c86eb6884b0ffb1af6969319cc8dd266a45bc7bdd433bcfbfd61bd1325667
 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 b5260d42d910..aab817c7b3e4 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Useful extra bits for Python that should be in the standard library"
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 9ab66d362c44..e41ed24fe603 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -3,5 +3,5 @@ DIST fasteners-0.16.3.gh.tar.gz 29727 BLAKE2B 67b4bc260858abe7ee330c2c5a625ecfea
 DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
 EBUILD fasteners-0.16-r1.ebuild 654 BLAKE2B 1ad152a2d29ab8487b70412aa57889a2f7351449d221662a423fc696e4e16884af1917bd387251642cc57d3c3a21546221dd1449be577638f74f6734cf8f87e5 SHA512 28c3dac7d4620f6a6ce1a04361ce249cac21f68b7fd75ff1f83165be28050328ac9d994c78b589f17241afe52593dfac12b74a57c1f61c4675f14a454acad05c
 EBUILD fasteners-0.16.2.ebuild 707 BLAKE2B df46efc7b85996ee878b2e64764b4a32f27ae143916dde9a4fae6874b8896234a6f7e7964de826bf3c07ac23a9b6206edbb68e0ad079384f160a791151a94a2f SHA512 816ca129228a771284b482080712f98c89a1e148abf5aba95204da3735ce51fe16390dd23433b2339ce1bbb474bf8bcab429c3ee483804aa088c718bd019233c
-EBUILD fasteners-0.16.3.ebuild 731 BLAKE2B 81fdecc1eb16510c0db1deaa4ed986036c727f55b68f77e02d75f2fc74efd5d8e84a25711864f485fb5b4dc6f02f9297ea020536f92da8d3e5315bf9dfe8bc07 SHA512 ccb5b709dcdf06c99c1a67b94ed9632441df24d8b7b63968434c7410251bbe53de3faf808840217812efd36c7ea60d6ae8f5e8c7a804c3d2a816c1311e064f62
+EBUILD fasteners-0.16.3.ebuild 737 BLAKE2B 7200bfe0ecbe92f675d880ccd42cb7af219507f00efcab5304b5351219efe636ed8ee6ce553220a5fafeea402f07b13ee35ede3176b38421bdb6a8f72197c560 SHA512 0a40edbe9e4cc5ab5b5c5c9c587316ff07a0c9d5099a37be4cfc529b719c79e2640ce8fba92fa635f6b32c1f801e12a8efee574ee658bd8fa6666b1a2876ad06
 MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16.3.ebuild b/dev-python/fasteners/fasteners-0.16.3.ebuild
index fb0c3b3ada55..ac361e013dfd 100644
--- a/dev-python/fasteners/fasteners-0.16.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 2f03d56def3d..60bc366e94dd 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 1152 BLAKE2B 589be3524927f3e75e17c998d933e061bc41d364bdec316a6ee56e9d2911ef12ae1fcfa4540204c329080f4e56c96300c01932365bffd759ae7fda559561bd66 SHA512 058fe8681360c5783ec0023101cb124aed22c941a114d1b59aada03142d7a178202ad86180a3145d665e0c1d8c0508d8bc0e4fda9166306d28ad1add2d7256af
+EBUILD fixtures-3.0.0-r1.ebuild 1153 BLAKE2B 1516c28bafa43cbb899d533b3b0c2b43fbe4bd5c267b3064c10f26afd224f31725379345e4e8357960e311ed3cb930f0eb6a666bcad739a177dbbb89d5955126 SHA512 557680cad6045c5dc7c66730c2c178e4e3f733b3e6d04dbdcb26cf8c304b9b043e34fa52018141ad709dfc8f2ed8c3ff5cc74020d95e6e53b98e7bfb41cfbd06
 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 78165f79028e..b9a475aff08d 100644
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
@@ -23,7 +22,7 @@ RDEPEND="
 	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 src_prepare() {
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 7b59e1587499..7ad1fce820d0 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,6 +1,8 @@
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
+DIST fonttools-4.25.0.tar.gz 2576777 BLAKE2B 802236b120ae78e2721d734875fba794fb9eafc125fbfea6b70c68d6a18a8b3c1ce685da18c83ee3364ff38f72707e42ed0ae25bc62d362c6271fff90da56d0c SHA512 c8f7512053ce611fa07bbc1fe844ee9d50cf09e19a2a27bed7df9d37d362b7daa910fbb651147f3690a03ec4d8adc8d96e8f0310eda24bb40208240182dc9b54
 EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
-EBUILD fonttools-4.24.4-r1.ebuild 1298 BLAKE2B f71b202b6093a8a230302e474e859a3638240845bae95d97321880dc3c669f6ab45cef5a6396085b6a93fb58b47f40e5b567100bf3762af8681c19fe18cadf47 SHA512 6a81270e7ea38ef305d28979af6acb5a550e88765afc815359e1dabdf7e10a7c399c9a9940e548da7c114761b9046aa9b40bf4e97c61216fbbed58508605e40f
+EBUILD fonttools-4.24.4-r1.ebuild 1296 BLAKE2B 68cacd63793a9a4540321d43e80961691679e64d87115729d1220d4b89ae32c66ebbaf0de8d91c8559a8f4bfe066e1e6538f34988a91ede1414f08d379c5fee9 SHA512 f0dd0a116a7b645048069502f6771c6adc61739910d954927721d89301abf42583e95a0ba76e913e9b02537fc68400ef35d5ba0bab7b6918e9dc7af1b04f97b8
 EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
+EBUILD fonttools-4.25.0.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 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 76a52c4067c9..083714fbfeab 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/fonttools/fonttools-4.25.0.ebuild b/dev-python/fonttools/fonttools-4.25.0.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.25.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 506254b51b08..1ed13c06f364 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 644 BLAKE2B f43bdf1d2b46bbf8cd951f93e4129404407fc4b5f36b42057b166241f2f8161b7b09141867b4b764bd5d9aab4d5e64327faecec5490170e38f336d62b72fa61f SHA512 6821e01c298d3165007587e61696794a833097f34249ec40d7416066df5a0cf95f022df30973197ceda76b93044864af7060b9802f3eb403f7e723e07e74e717
+EBUILD fuzzywuzzy-0.18.0.ebuild 656 BLAKE2B 3c3673608fc1de2e55ef0b32407352c1f4491822719919285f4903c740d00419aafbeeab97ef19085254fb6372bb9f9c8be33743e976f26b93ebd8d9516ca97a SHA512 ab5d651351d2861566614a4acb3a22cdfd19526695e9b01c1018eb8224ac89341f4ddbc6e75e62b018d9595c4e7b30903a1654e2f286be7e4af1bd23ee6d7de1
 MISC metadata.xml 396 BLAKE2B 9d393923d1967fdc5ed931d8a0767c3b9fede9d39371349e1a6a6e1119d6fe5118ab2191bb264ecb119d28cc2f2f07816b5cfde02da1dbda0b0226a838913a9b SHA512 66404a0ba9996258fac47a0e31d6d4d8bab13ee48bf90adbbc6bb5c268ff7d4a504b6e6840bc5d9217614c6d8966c931e268af20f32689d4f233c67c6c576442
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 12c9b983d11d..4bc6ff89a5ae 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 028d8d83f574..86acd19e7ca8 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 1284 BLAKE2B 17cb6202d3d015efd53dca42d927d3684978f8f9631a5421672ffb6ffa94a01ab1ee0645e6da1858179835c0cc89b0733a08903c1684bd1411a102e9711a4b3b SHA512 77c922462cac438deb4dd219691e054bd525cbd3ac8e57f87007da6a86e2f5990e70d33a8b48ac62efeb69d81ba348cfeb63755abe29e79937eacf8a89675984
+EBUILD gmpy-2.1.0_beta5.ebuild 1282 BLAKE2B 9fae7a84825becb040e47acb2a756716a346763d8b8de873124f12cbcc90a25fbe4cb87e8a329ef04f763c636b48bb3cdae1be3be17a09417a4e7bc7a3746b6c SHA512 03d035c04f32332c125b99119202beb90fa4349cda7875cc702d91b7b52571fd3dc6e16232c5ecea864f0065a6e4bf85f78d0fed86dec2e918320f0b68095381
 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 42df930fda53..9a0d4b29feb0 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 2157e34ad5c1..dbd783360298 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,7 @@
 DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
+DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
-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
+EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
+EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
+EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
index 53fb37378258..08eb44b4eda8 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.11.0.ebuild
@@ -32,11 +32,16 @@ BDEPEND="
 		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
 
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local deselect=(
 		# require Internet access (and credentials)
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild
new file mode 100644
index 000000000000..68ec1c0b8c12
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-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 69b970850c57..e52f1f75567e 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
@@ -32,11 +32,16 @@ BDEPEND="
 		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
 
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local deselect=(
 		# require Internet access (and credentials)
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 0ffda0afa17e..3d77092a44d5 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
-DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
-EBUILD graph-tool-2.35-r1.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
-EBUILD graph-tool-9999.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
+DIST graph-tool-2.43.tar.bz2 15170272 BLAKE2B 96570242cf2003c262024545a074bcd0f0cf9351b0c8c68035529d38d535411386d5440bb5166cfb70f24ba1540d9ce65324c659564f2ab50358dbd77bafed99 SHA512 e72dec9656acb2bb7ba43e19673fa4ff70ff4819e76bb5f00e9943e4cfe6a85f1e0eaa58c8be2921ebd783ef3d978294a347238f3700a457aaff8a98ea8ed4fc
+EBUILD graph-tool-2.43.ebuild 1828 BLAKE2B 129b774dac80943f0b78f5931a99d14e973bf68fbc9021c0bb9dcf2c9e341f3dfc4265b9e2676688f4a0cb0943dc695aae92bbeef4f7c40c4e1a0088961384ea SHA512 a3d9b51f8bf4023ae67cbf06c912c1acea0dcfd760a05d48e8733755c0f9cb619a7f65d77799250346f94c6bd09357acc87b230efa459f0771c46223aad855db
+EBUILD graph-tool-9999.ebuild 1828 BLAKE2B 129b774dac80943f0b78f5931a99d14e973bf68fbc9021c0bb9dcf2c9e341f3dfc4265b9e2676688f4a0cb0943dc695aae92bbeef4f7c40c4e1a0088961384ea SHA512 a3d9b51f8bf4023ae67cbf06c912c1acea0dcfd760a05d48e8733755c0f9cb619a7f65d77799250346f94c6bd09357acc87b230efa459f0771c46223aad855db
 MISC metadata.xml 436 BLAKE2B f588384060513f0fa8ad9c77222cc04da4767e56521404f532f4e1ce61f2f0adc7aa2b7dea2f1b194703b32db7982fe61587a4e7d4bd7e0af3ed240e49c4ddde SHA512 ec4288006fa779dcb7291d2aeffecfef11bf516f6a4a8ff856f67ae21a8cc25252e49b65df7b8657ee8a35f224275bf188b05c5b10d202a5111b281b8b47e561
diff --git a/dev-python/graph-tool/graph-tool-2.35-r1.ebuild b/dev-python/graph-tool/graph-tool-2.43.ebuild
index 7f89339ef83d..cf2e5589ad5e 100644
--- a/dev-python/graph-tool/graph-tool-2.35-r1.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.43.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
@@ -26,15 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat:=
+	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
+	dev-python/matplotlib[${PYTHON_USEDEP}]
 	cairo? (
 		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
 BDEPEND="virtual/pkgconfig"
@@ -58,27 +58,27 @@ src_prepare() {
 }
 
 src_configure() {
-	configure() {
+	my_configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
 			--with-boost-python="boost_${EPYTHON/./}"
 	}
-	python_foreach_impl run_in_build_dir configure
+	python_foreach_impl run_in_build_dir my_configure
 }
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir default
+	python_foreach_impl run_in_build_dir emake -j2
 }
 
 src_install() {
-	python_install() {
+	my_python_install() {
 		default
 		python_optimize
 	}
-	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl run_in_build_dir my_python_install
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 7f89339ef83d..cf2e5589ad5e 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit check-reqs python-r1 toolchain-funcs
 
@@ -26,15 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
-	dev-libs/expat:=
+	dev-libs/expat
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
+	dev-python/matplotlib[${PYTHON_USEDEP}]
 	cairo? (
 		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
-	)
-	dev-python/matplotlib[${PYTHON_USEDEP}]"
+	)"
 DEPEND="${RDEPEND}
 	dev-cpp/sparsehash"
 BDEPEND="virtual/pkgconfig"
@@ -58,27 +58,27 @@ src_prepare() {
 }
 
 src_configure() {
-	configure() {
+	my_configure() {
 		econf \
 			--disable-static \
 			$(use_enable openmp) \
 			$(use_enable cairo) \
 			--with-boost-python="boost_${EPYTHON/./}"
 	}
-	python_foreach_impl run_in_build_dir configure
+	python_foreach_impl run_in_build_dir my_configure
 }
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir default
+	python_foreach_impl run_in_build_dir emake -j2
 }
 
 src_install() {
-	python_install() {
+	my_python_install() {
 		default
 		python_optimize
 	}
-	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl run_in_build_dir my_python_install
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 6f5ce6c81d4c..7b376e1df7f6 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -9,5 +9,5 @@ EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be92
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.3.ebuild 2206 BLAKE2B 5c9882609ad0a8a7c65d74790d59c14d09a272370a812a9d3f88186faac634281a0fd5dd592b5e2fe9d9b2266115681ee1c3b5b175ae3d1f41734e680d667f87 SHA512 c1090a1df81438e2623817f615bf406570009a99ada2e8e2c6ca0e159a7b3e2d86395eb7f21f86f6c86372ee3308012e42f89f944cee49715d67a489029c4f9f
-EBUILD httpcore-0.13.6.ebuild 2283 BLAKE2B 02693e374d7094e677c3185735317f458f169b75365eaefc3b4b0cd1e36991bb0c7d4e71732f070f4f8c915d2887922e77c9c91d21f4e0156026fa295870e914 SHA512 4b1207c1f650c3e76ed0763076aca1e6698eaf01706e7d4be51c980ccf8829f101bfff2a80554387c5719c165ae89bbfd92bfed702fcadc30450073b55e6cddd
+EBUILD httpcore-0.13.6.ebuild 2295 BLAKE2B 88e0fad7b8a341f48e0d333c61a80828117f76e7864943d4abb9d54acb3d962100a09bf867a636fc70af331055ce86cf153cd42799ca4dd0a602e4e8278653f5 SHA512 8419f4afc4b8fb2fd27b5433fc2b5012e2519b2c3d4c808230ad734ecb418cdb08d9b0aa04e3bfdd7734537fbfadbc58f7fc78a92e698f305ff6b92aa4140386
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.6.ebuild b/dev-python/httpcore/httpcore-0.13.6.ebuild
index 08337b1d6cc6..829529c8ecdd 100644
--- a/dev-python/httpcore/httpcore-0.13.6.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 3ceaa120743b..a339fd6a8a54 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,8 +1,10 @@
+DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
 DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
 DIST humanize-3.7.0.tar.gz 44002 BLAKE2B ec253c07a38c83d67038836998a7159afe7d1f3e1f0f5ea0f946f987e18bf4943d7dd48e2e156009627e1bda2140017bf99df072671008a6e1daad704b693292 SHA512 e501cdb4dcb603601624f5df9a04a256669f06ac594d8a3a0c83543d1d8503bfcf4d7198ff87827e2c60dd63897c23b722be7497179c49a9f9b05d07289de4be
 DIST humanize-3.7.1.tar.gz 61846 BLAKE2B 6ed6e35dc15ef08a88cd15211212cbd4194363889ff0dbe4e53d76adb248da948d688e4eddf5a93548497b1e1e02145431e1c157fd26288fc27f2b9b7b2c80b7 SHA512 152ee6030de83be34bdb40908427ca4f1461191ce417faef273b070a1d347a43f4a44182cd0fa79b8935c07d97679205285bbd6fa43352d2d9cada53df5f112f
 DIST humanize-3.8.0.tar.gz 64298 BLAKE2B ba367054f66351b7b48bed69ab4ba63251dbdd6bb56c21cbd8d7846401d4a2428f6e069a0219b5a24bfde173d6ed2ef3116f01551137b4c0c1eddd8c9d6fc87b SHA512 8301f461c60fd990e50a24aef714d78a3b42fb82d792ac01b088e05b6bf765dfa34e2257c1a75e3da279db3b8d837bd6434398f33578c946fa17dc1a45122f75
 DIST humanize-3.9.0.tar.gz 64229 BLAKE2B 09aeec6a92c8e2e104032d4c61f054785ff58ce2dda68c4f3acffb17c7fa4e262b28a24b7c06d33671ea18d2eb05c9bcc0a82d5491e60afa161ebc0041945bf2 SHA512 75aa8f9f6b07d4b65e5589c3f337a92ee17769ab8da6608147b0f1ec3965b95788dd90cf0d0cae1b7c9be689b44910029ee72e2eba39a60c9926b67726c74353
+EBUILD humanize-3.10.0.ebuild 549 BLAKE2B bb3562a3052c164aa92488a4b5a4fd76600f0e88c882b45daca1f61007c5083881802fc0467c3a019573671293a570120ab8ccf139501e8d4597c68805ffdde4 SHA512 3d77dfc18318baf0072a39d4cd3eb60797b7157edfb132bb1bd40f77dc36f4c766d46123de3adbd6a28f41e5efbc40420fa28c094372169962a4249e83c9b93e
 EBUILD humanize-3.5.0.ebuild 547 BLAKE2B 1e7c1ac2157ef61f0885d14b939b0a92efaa7c2d2259b5dff8709b7be500081042791ea3de8b3354a4c71e671db0825029afa5b407e92b539fff2647f6bb3a12 SHA512 c6f99389b2225d05450700755005b546bea0987bc1ac470f2700e45fc3030712d7af5c03b00f239ebaa2729255d47fe171176d7e3001ef2b10470141a5d6e35d
 EBUILD humanize-3.7.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
 EBUILD humanize-3.7.1.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
diff --git a/dev-python/humanize/humanize-3.10.0.ebuild b/dev-python/humanize/humanize-3.10.0.ebuild
new file mode 100644
index 000000000000..ce3c080a882b
--- /dev/null
+++ b/dev-python/humanize/humanize-3.10.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index d53e085ec50c..1abdfd4b4f85 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -3,9 +3,11 @@ DIST iminuit-2.4.0.tar.gz 372122 BLAKE2B f6590bb67d8c79cb8398345a76a7af7e95bec83
 DIST iminuit-2.5.0.tar.gz 375912 BLAKE2B 422bb8ec8f6a763ff010bd28f695a1b26ef3b3c44e324ffc2f4592d224ba5380d29b47b99d9f8b3f9dd8a5d81ed45197b6f89eb2d2fa599d8d1fdf9e50358e58 SHA512 25ce217ded4f9a142cf0522d9e66efeee4c3bcc16cd1f324a5008c1b64477b2a37a9655ea939c74bc60f9222cae8045bf7a77a5807b09cb3e3e61da4f41e3c91
 DIST iminuit-2.6.0.tar.gz 376846 BLAKE2B 5c5c8ec223ede39ea3c02d3df0639e52047f897eed7b441d567ed3f88656c6ae5740efffb234bbf29ecfa4578bce38a6a5ff4983d738ad1321df35efd0c14acf SHA512 6f413e11d8be3a823a7d12bf1e9197abb27561a15ec29127f6bf4c2339dfc67344b0900522d10e59dbbe1eb08bafb931950b2edb5f5679e06459bdf52abc1170
 DIST iminuit-2.6.1.tar.gz 376846 BLAKE2B bec73b182a24c242fe5c8931e7cb745728b8f492c8989c9d58615b71bcc705e5c36195e28158b550e06b9356235d5a89f9e170da62b808dd89a1083f705e0650 SHA512 5a600842c8e4ae0d2c1ec4b24d5f5a33dae6d0e7659b1908b4215289f82974d97a932366817c7af257d63bf5418080884c01936d84b55942f6149b05db7ab03f
+DIST iminuit-2.7.0.tar.gz 384016 BLAKE2B 857df47e8f4779c41b32e624ce3c5dfe16f39f57441f1f32367c9170bfe6f74fb84eb67a54b773690ce5fdde762d3383adbaf97e81d917a17e2995b9e69623be SHA512 c4f5ba80024e87e57087175b012d043df65079e5b8f0376ff7254ebb256ca845460b3c330043aacd960092178ce8fd4d8bd3cccd93ebe3515f7a9896b756c629
 EBUILD iminuit-2.3.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 EBUILD iminuit-2.4.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 EBUILD iminuit-2.5.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
 EBUILD iminuit-2.6.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
 EBUILD iminuit-2.6.1.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
+EBUILD iminuit-2.7.0.ebuild 732 BLAKE2B 0521741646c2a79d9610b8c4426e56774b281946bfe91c012b433467f4b12190360fba7861a96c0043ed6a7e0a6bb39a68e0f326f9576e2a52572ab9ecf65a26 SHA512 72e7506d58939e30f6a87cb0e1de1d9afbb60df03b9497932796fe8cf30aa023728283bf279fc7e217b90096f3372e6516586c761f3c19500a22cb0e8ab844ce
 MISC metadata.xml 493 BLAKE2B 6b9a29fc8851930ad4c8a23ee8e10983f68dd21eec5637efb12cacd6a20b154746333918f6acd81c71422dd3f54128e210448f6ae9710c180939d38c4325840b SHA512 8715ffcb3ac90a2ef0cb20efaefa6375b4bb901c5b7e224702ce951a6dc5b963a64ebd57ad55bc46eece978a9ea4c24124a2ae09dde2315d7fc4a79fbc2154d6
diff --git a/dev-python/iminuit/iminuit-2.7.0.ebuild b/dev-python/iminuit/iminuit-2.7.0.ebuild
new file mode 100644
index 000000000000..10e6b9207df9
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 909eb962e4f3..50139a3df8e3 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,9 @@
 DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
 DIST importlib_metadata-4.6.0.tar.gz 39664 BLAKE2B 62278f46b0fb3428384ab52696de724c0b13409d2b80a07885beab34019fee9d8bd49c096a0b71b10801941ba9d3e66445acbdfcd589e6a44cec5ab7855dabdf SHA512 abc98e3dafc51f1c02c6a2bee8134c17d205d3ecaab301c0abf9a5e1bc0454fa8ad316caf78d764db88688271511f954c6eefbfd91750b5c026757436c63fbdf
+DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
 EBUILD importlib_metadata-4.3.1.ebuild 1279 BLAKE2B 9ccebd49fbb6f0af8c93beb89040b67f844b1311d089bfcda67790f900424df84830fd7a09d9066cdd8c84abfd5269082217fc7ada354fa757893c3a563d99c6 SHA512 594b68ffee5b91fcbf1577288f0b35e70e7567a93d3a99ba7f6be60b102ea3ce66d0c1c059597b2699d2b66748cc8f5de7e63cc54bac8dbb25f21ed6a545dddc
 EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
 EBUILD importlib_metadata-4.6.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
+EBUILD importlib_metadata-4.6.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 3d4a4ada58bc..c7f7e597e691 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,7 +1,5 @@
 AUX ioflo-1.7.8-network-test.patch 1090 BLAKE2B 37e6125a3d26b902e3938efe49162c6e9e1beece8960fe035255e79673bd8920f3ca5dee90595accd8dc8883f63727985060e3f8c3d357333065ef1b738b62fa SHA512 76ebc002679a656b21e0e8adbfa46552172392c691db1a39320320a9b0e1261a1bb0fa9058bac0063027b3b56bffa9bfcb1d8dc0b37d232971209123d2ff8aca
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
-DIST ioflo-2.0.0.tar.gz 838200 BLAKE2B 876a38df5e6fb953eef6e65bb793fa975a4fed8d4f698029e26747a4887a449bcf5cc5c9fcce081f9b93faeb34d0f783b2f81e17ec619d7ca95810762eae810d SHA512 b4b70aef65cffe067d7563682a2cbeac0a07cd4722aa2de8fb56fd127c99df771dc5d3d22be24aadd628a26fd1b7407db684ea7257b45eba8f8376f4ad226a87
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.0.ebuild 715 BLAKE2B b72173e3f103bf4511392924bbae46d594799e73454c4f997c74a6bbaf33d1fa86a254d7d4d5f512a92d4e8a521e761faabf1e07359920e1d692b3f7a29a09a4 SHA512 b50ab250cddf468e81f5dbd62d78a8a23c36e4fd863ad813a027084b7bbc4871fce17382f0b3cd0268d09e9fa918cbd59e84612aedf1efe8dd62f4ddc3103942
 EBUILD ioflo-2.0.2.ebuild 876 BLAKE2B 037c9c8a54818b3325dc5d391187796f680dc11ab51605c48660f638a75863702de10f44187a6adae4a53631d023cbc0ad75f0823f21741a9747b9412d909d5a SHA512 c789368246b06892d92b69288b5881b94f80fd1ead3dc83e9dbe425a81064f066542cb5c12c6e8bdcd5325296d3673a908b49f72c9c01e0f894874a87a37a17f
 MISC metadata.xml 493 BLAKE2B f303d71fb596699fd8867406fe983144371e9da8143c3ee4dc4761f466503e2f6c38dbb81195d9f7c3c2a3eb40354d52401f66c231afc24eeba112966ee7a686 SHA512 2e787e4dd8f0d9f212da69c25f4a58e609d120dff641405708f08d206b07249acdbac2d6e151379c54f5c960e340f8f31c986f231fab74986d1db71539a87436
diff --git a/dev-python/ioflo/ioflo-2.0.0.ebuild b/dev-python/ioflo/ioflo-2.0.0.ebuild
deleted file mode 100644
index 8b3ad91cbfc3..000000000000
--- a/dev-python/ioflo/ioflo-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8})
-inherit distutils-r1
-
-DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
-HOMEPAGE="https://github.com/ioflo/ioflo/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-lang/python-3.7.4' python3_7)
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/ioflo-1.7.8-network-test.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's:"setuptools_git[^"]*",::' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index 035c6ab0441f..0a37355da159 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,3 +1,5 @@
-DIST itypes-1.1.0.tar.gz 2188 BLAKE2B 5b24790944b130530d4bb3f0ee266c897ebf7946a37133535622f823cc66bd2d2aba838170769b326d706fb123ccd1f4ed7aea8e877b9fe0a9d19692e0c9e0e2 SHA512 fbaf82a82e0685f54eb98bdea722cf9fa230881d1940e2a74306972eb9f99958cb0cc62b858c340b649e092262793b83dcf76d11d36d04755ecf05e7a2c77d81
-EBUILD itypes-1.1.0.ebuild 422 BLAKE2B 811f2c1e4d89ad70bef5cad8826479d941484c9e9a191636b851bb2529741f77ebd49d32366859e3e643660cf2a098cbdb07341f510c1eb3209f19df6d50bd69 SHA512 6a39ef2c55a3b65d2897ac7099b88119cc0c09bd62d5a252c0be4f0b71aa69352aafbcf9ef7bf16d7f27c58012e7cbe7030ad4a1e5f0843a1a1591756f46d992
-MISC metadata.xml 297 BLAKE2B 6a3bf5fd762d5ac69fec999adb19008bdca6aaebae6864e4130eaeae2627e51d2918994f176a9dc434883479c62311b388340c761d21846726bd2c715f690d12 SHA512 7375ab3ef2d5fe812cf7fbb825ac611d0d95b71de5b7d636b67e68aaed974a177a663440892f2dbf49c6f2df5894b5c71f7933361164772db51405ab16d212d5
+DIST itypes-1.1.0.gh.tar.gz 4403 BLAKE2B 62f7d1a96154f313c43764306ab7ea235e0ed8a60180e56760588f03ffbdb948a56b7bec9c63c861b743f6aa1510b0442d41015b944ef777655e7b152f15bbcb SHA512 2f6dd5d655f1031059df8dcfd0a2f76875796a800144e887fb66cb5585949097edb6b9f5e973de2280f43cfeb25ab99d3ca428372fe239c8cd70f385304bcdd7
+DIST itypes-1.2.0.gh.tar.gz 5578 BLAKE2B c4025c2ad54203c4f3bbcd6f369fc6a86d21bd54a63c42acd68a98b6b44404340c3242e3c7a896483860eaa7f3df156fec79a71974e3cbb7b984fd83aa631eb2 SHA512 94421fa3f9ec7d18989332ca518607f09bd9d674e80bbca4a3c7324c20c3ae4e0679457e6a328e50ffe3d94c6db733f092798293133d42c1f07d959e0f837891
+EBUILD itypes-1.1.0.ebuild 482 BLAKE2B 25bcee343e23378bf8b2c754ade50d2a935a7f973c9d43dcd0a0e5d35eb835c6f5a0af0784d8bbf7f40d7eb46372309847efe63daa1b7022f6026ae22a558c8a SHA512 bbffae692df93f966bf71389dad2cdfff61b24a348fcc16ad5d0aea8bb812ff3786ebbbaea456450abd7ef94f5b9fb5c8fbf6100f06328b536338489982b85ef
+EBUILD itypes-1.2.0.ebuild 483 BLAKE2B ca1de2729b94940a034d84c697338130273b136311fc30a050bafcf12c17fc1569fffbf063826b4c3f3c4b37831f7ddf868e2c0c762c1057400d0992db8c51d2 SHA512 6f584b66342e08b3def1674b89fc748eaf4ee89c55c14e3a28cc656d666d8dbdf5050c9a5f218c63efa18bcd371ac67bfefc995f2b27478bc732c7965a384449
+MISC metadata.xml 370 BLAKE2B c71b392edf065c38305ab9d68428151488400dae6213818e67e36ea4870f63127b11e5841a953edb5c2f665ebdbe9d07386a03b1f4a296c80bc15cf317aa3705 SHA512 8473f6a6ecbed5e3d6d77a459b65c44760fd56b25830e93a60a301daf73a53ad6b9dd854b56be04dfe8e06e8bbb3b98d460e667259ee4bdfe87a701a9bf090b8
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
index 43805bb673a9..7c0e5aa22446 100644
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ b/dev-python/itypes/itypes-1.1.0.ebuild
@@ -1,18 +1,23 @@
-# 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} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="basic immutable container types for python"
-HOMEPAGE="https://github.com/PavanTatikonda/itypes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/PavanTatikonda/itypes/"
+SRC_URI="
+	https://github.com/PavanTatikonda/itypes/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/itypes/itypes-1.2.0.ebuild b/dev-python/itypes/itypes-1.2.0.ebuild
new file mode 100644
index 000000000000..56c99da99047
--- /dev/null
+++ b/dev-python/itypes/itypes-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# 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="basic immutable container types for python"
+HOMEPAGE="https://github.com/PavanTatikonda/itypes/"
+SRC_URI="
+	https://github.com/PavanTatikonda/itypes/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/itypes/metadata.xml b/dev-python/itypes/metadata.xml
index bf9e4fb26aa5..b0231e443002 100644
--- a/dev-python/itypes/metadata.xml
+++ b/dev-python/itypes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">PavanTatikonda/itypes</remote-id>
 		<remote-id type="pypi">itypes</remote-id>
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index e2efc3977ad3..057f6b207f3d 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,5 +1,5 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
 EBUILD js2py-0.70_p20210218.ebuild 1174 BLAKE2B 0c29b1ffa0f9807e5ec7b14779aa7b728e6cbb6d7209a38027324c0cc138e6be53dccc0d72c9e1c2404e5ac033a014b62eadb7e0822f46217b1f5076281d91f9 SHA512 c6edd54f7bf75c81610fd20b749535f9a67801ac68f76e411a88c0a48f63acb91e6c694d2f8d8b71b91dc3dd4fd51bd7fd85646d685d22baef9a270ed5394d43
-EBUILD js2py-0.71.ebuild 1103 BLAKE2B 4e3fa6cc638c26c311cc541ef6b1330b5e634533441317991ee97b98d57848fa0a7ae3d99b3e5f6a558a235ee147569e6314f5fe52b4832f04ed6b986ba40b8a SHA512 a27977a7008b2666d94985e6252b9183a7dd12a4f02d6d845511f8e27958cc44ece6eee616dca13b5b2f6ac0e7b3ef1d96a682134ecab7b2835de0eea131b7db
+EBUILD js2py-0.71.ebuild 1122 BLAKE2B cf06099ea27d986bf47bd277e0cf12a057f22ff9c0b82e62d421f4c01f9cc25623053177e533519ac447560b163fbf5ced22320d063136d6b205c8567bcec9e5 SHA512 cb334c6bfb1c4dbc701fab5345d37c891458a4b90a0299271191be692d1eda6bff5efb796c2c96d02f15e1c89b215687dc925a60487a9525e327f9b6edbc770c
 MISC metadata.xml 572 BLAKE2B e7e7fe7278ecadeedc310b4adbb1cc21c7c6a5e6cb522c31695196561e30f7bbfa0fc1e29315f931d3068ef6ede674e153e81207a7e5002d9adbe68c88e2e904 SHA512 c914912aac18c8984d4eb8ceed3d27a175fe89def2ba9bf778c3e3d8c729ad030125ea8f1096487b4c35cb9c1aa1f28a3d7a168b2c8992f6d58fb477bb9ca51c
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
index 5f2222fe1893..ce887d3f5ace 100644
--- a/dev-python/js2py/js2py-0.71.ebuild
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index d3e37941cd43..f2934c7365b1 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_console-6.4.0.tar.gz 35765 BLAKE2B 48278110338184dbcae242a059c3ba7e0c642d24eaac828786ff9f3c588747f447727a8da1d366ed305eeb5d003d4fabd9b9eea063e8fd5178774108cbef77da SHA512 e2b301cfd3a56ee4cf33d5cfb297726d0f4478562167ed0f0a9320d389118fa661a85b6a5ef24db60673a76d84545bcdb9741bfdd9f8d13ccdbbc5c5e52d7227
-EBUILD jupyter_console-6.4.0.ebuild 867 BLAKE2B 78a779f2df622449e1f3a948b6f8057a52fe9115483bfd990d447eeefc9a5baeb3108a5ca308bb212c8ee74af6ba06e895f03a5f9eab6e0e35f1afc116c22b1b SHA512 29e95918882b55afa8993980ae1719aebe7d0d15866d057b3311d046f7a21b163d65b018173ee2c482c5a6becc4432b0781884ebd2db7c6c874db1c9a40d7b2f
+EBUILD jupyter_console-6.4.0.ebuild 868 BLAKE2B 7fa965533ba987fc08dc78bf1553f875f60dcacde1ad1edd50cd949236fe4436a1eb350e49138a4963d55b100428c24f04b82392a7891bf6862375a1a41067e9 SHA512 802f528c6add70101e4b6b18f53f9620a35b9791c6f8ed700234fb5b52e4282d90ab0574f40ebb20fea6af8a51f63bf8b7d5a825264197f34e3e428b40d7edf4
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
index 5df21b45ca8a..d55074977c0e 100644
--- a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 6971e37881f9..2be974b930c0 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_packaging-0.10.2.tar.gz 21735 BLAKE2B 92de31e6835a2228f85b008b0fa3b3b8b5ebd175399fa82ee79d328f97b50c09a86dbc325e0378a7f946de34522d4af12fa5997507895ff6d85e77d4e7d38e3c SHA512 c1f5562b8fd72d64998d32d1a85dd1af2b730fa7e4a0d9e2036ea4d5a607ce02b1e9c641f01997ea3b0d6e047fa797009ce3c2ca52ef866ec9c7492ef836e679
 DIST jupyter_packaging-0.10.3.tar.gz 21530 BLAKE2B 43392f938d40e859e79f42b7942a199f808218c1da697c48a8ae0b1c5a4e8a408f983196e9d148edbf17d1725186216ed79446bd42fe8f18baaf8fc9f66efe1c SHA512 7634a056d506328af6e963ac7a8d6ac5fdb5d5303a31495af2275a7feca3732b60aeebb332cdc009ab690aa4185f5b3687ae002300b4885620cb9f2da6d2c79e
+DIST jupyter_packaging-0.10.4.tar.gz 21698 BLAKE2B 5490443e197861a53587fe744d749162e412b88bc5c1e5917cd6c145254e4feecbb8b3e3853bf5a3e360fc9ee20c3345af9c7a245aeb1b03639d99d1d69cb377 SHA512 066abaaa00be8154ea39cc3db0bfa4cfe03864c3e50a741f416606c2f8a2d2e0202943f390905ee46f99414168705b9c3519609c6ea16b3b7d54820631c3ba46
 EBUILD jupyter_packaging-0.10.2.ebuild 1008 BLAKE2B b1568c777b9f90b2f9136fae2cf5f5e960bd3bc707efce70db4ac58da79adaf99bd5d103740f275888f46dd93f6db4487a27be579202991f4f6cbac403f95474 SHA512 e73d2649138659e4cb5b2dff4748c4deafc89b11aa8bb7740b90652c26bc930b572d9743a8a11fbb9f80e55c4ed136616ff9c6221d7e63bfbf3ea5663675604e
-EBUILD jupyter_packaging-0.10.3.ebuild 1061 BLAKE2B 0f8ad05bf71bb09db0e54b40ab8660e0490816925f953dbdc042c43bfe2eb663bdbc427411ef48bd75167da4bc470ceb7533caa3b04c0c85525f94989c64c677 SHA512 e48dfd6994b7db2bcef686067c19085e65eca017b81e281c8cecdf048deb4ed3a94b5241e7336cca2d7278dc301442fa225484b066bcb3c3a87e1456827a7b97
+EBUILD jupyter_packaging-0.10.3.ebuild 1062 BLAKE2B 31b256f1f8297c0632e7ce29497b2e230e43aef6c86a4819775f5dcb489c264204db5a97a1c872761ebfd0f7c465a0fc07ac1ad051e2f4a5801aa743e0d6046d SHA512 e2b51d1d5638eef6bee38b23da470922d5070224264c74c598d85429e3b52ca152688f673743c3a9508e74ff8ca3e75b6dce34e8831514645a28e0390b0688d6
+EBUILD jupyter_packaging-0.10.4.ebuild 1061 BLAKE2B 962d4d9a91f13e93ce9414afea56f3f60b5228c95530ea7cb8343cf5aa8e81a7af444de41654060eace026cdeebd494cc6614b91af630b58839ec1530bf8b8c4 SHA512 3d52dedfd365813d15b06c355eae9be720924498c0ffffc2cc8c2c3eb813d7304815ea61848cccf0d5a593c004e9bff30371d6bc3c5071714ee7b347edfbe81f
 MISC metadata.xml 435 BLAKE2B 7b243203f2745e996b80926ea2ff4737a7ab5e64c307e17fc2c354c5193fd1f543927cf4308d6101c8e38923f1f6fdd5726c219f2cec07c6ac34593faa05aa56 SHA512 cb7ed210410efaaea5f63f43f51e3da0f7c12ec66ade563456c3b3af54fd061fcf135d88e5ac753564b7eae2306838cd1cc0e5fe05181f96b2ffd436655e6da1
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
index 109b4c393ad7..7d5ef4959832 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild
new file mode 100644
index 000000000000..6440233f72bb
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package "build"
+		tests/test_build_api.py::test_build_package
+		tests/test_build_api.py::test_deprecated_metadata
+
+		# broken by Gentoo pip patch
+		# TODO: retry when we finally make the patch less intrusive
+		tests/test_datafiles_install.py
+		tests/test_install.py
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 6df24ee81f1a..448e20997893 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
-EBUILD kafka-python-1.4.7.ebuild 725 BLAKE2B 69d90b081511f17db3d6cc428dc9f4cb15e3db894d4090b3c6ac1e8b979c743b63a30f0e8c082ef941d63e3a9b41e23bbb8623bf2ddfe1e19fa674dae1969a0e SHA512 39286e1051ad198c2492e96004a02073d80b462b2b991dbef8e54324287f854e8591ff8a04da43235d5a4daf5f79a352d03f2bdb66eaf0c161869e9d7f769668
+EBUILD kafka-python-1.4.7.ebuild 610 BLAKE2B 82c5eb243dd959e97b0b7efcb3ac8840f7f3c36e5bcff600100979b9b514b1dda3922f34bfa126a02f3204f1f1df776ab3143c676042c2d0fab68882a538251e SHA512 add04f189fa7a36c7361e0668dc015149bf1b15c5f390cc1552ff91789cb2305c88c8c2d665fe1f1affaaa2e8d8d7b62258e3ed1fa74c52a286a08740ffea578
 MISC metadata.xml 306 BLAKE2B e3422b476fc8d0d7fb8576c24d0eee0ed47d822963c979fdc1f9fcbfdd99abcd0caf7948aa7fb1142ea4ca174a5e803b0884a0d707418f5ce918a4a99ef61dbb SHA512 52e23be22b6fc6964bef55d737579c013b58d09cf737781212cd1d4c99f9c1257086ebafe5ed5dcc99ae574e3a0a6eb148029958f135508afa0ac069a2169968
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
index 36adc8405d2e..0a7e9046e9de 100644
--- a/dev-python/kafka-python/kafka-python-1.4.7.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.4.7.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_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Kafka protocol support in Python"
@@ -13,17 +13,12 @@ SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="snappy test"
-RESTRICT="!test? ( test )"
+IUSE="snappy"
 
 RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
 BDEPEND="
 	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 	)"
 
-python_test() {
-	unit2 -v || die "tests failed with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index a87eedaec408..04a129e0fc0d 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,4 +1,3 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
-EBUILD keystoneauth-4.2.1-r1.ebuild 1715 BLAKE2B fdfc5016a16a9f6bf2d52db78d5d1896e9b029d2f44188f39f656c10a07d1ce5b320826a2e8297d67e3350bb80ffb904b320eb7dee2ad259fceaa57cce7dfe21 SHA512 f7f1ee43d776d59b52686339fb5f3064b49bce1ad1ebe68188fb212fea9298c5c100e8e3a651117a8efc899bdd4e66634c78bf489c344e55f5f5f579dded775d
-EBUILD keystoneauth-4.2.1.ebuild 830 BLAKE2B 502144036bfd08295513a411ab874b6b6509ff44ffea105dcf8480403527dfa37b15600b5933d0c55e151bda675dc5899ef8b7c8ef551687b729d9edb606bd48 SHA512 a395a3dc0f20357373e98c9b3f28e0fbf9fd4d3107f2d502f66701a81bda93123b0757d305c3d837692854ffa842cc686b3d068bcb0a9e2b6670093c3c36fc8d
+EBUILD keystoneauth-4.2.1-r1.ebuild 1714 BLAKE2B 57d84c384ff9331dd952ac01b30934f1d250d3408f9529efe39eb2e3a484ee5d717cec3f7577fde2c57c6fa01ca67a87f14f1ba7ed5b2d3a6a82190e859e2f34 SHA512 03d877b70ce1843b7ce62c64fcd4fd069829cf8c82211fe56bf6d798e89b3a249492a1e0df7b0d3db00baa7d42cbeab2ef52c4c189e63477847a3245f346fbfe
 MISC metadata.xml 517 BLAKE2B 89f053e99c44426b0681055c4ff962db6579b45cbd69b30d1ce3451daa7f7d358d60dd8fb0b76c47382e420941d4dc01e7c841d96b30166b12cc79d8ad45b1b4 SHA512 237f3c06e5ba66fd6b583c21e3cbc67866fb25eaa701c5eb1eac1b15d89dd9082255a15fd02a28bd2610e47ea3b6975013b7a18ad9ad8f3ec8fd6b0da9dc6bd2
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
index 7c32b61382ed..184945d166e5 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
deleted file mode 100644
index e16f73ab9d63..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 1b43d0178afa..ce3bbc3d4044 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,3 +1,3 @@
 DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
-EBUILD kombu-5.0.1.ebuild 2411 BLAKE2B fd75c9569d0122d2e7be230ca114a5fd8cdf00a17723062f6512ff69182d9d2aa2422110ec90c6950dd58921901c8cacdd922ca15f0600a914e9b55af6bf0203 SHA512 7ae55e46441cbb05c983b897ede2c2ba6edf7ac9ebb89af07b6dd305679f7833b520ec20af1872e1efb139187ece41bf38bda2f3879600846fbf71b083b7947e
+EBUILD kombu-5.0.1.ebuild 2370 BLAKE2B 0733b0f462f325644531c0afc2466a2febdd7323441a1ccf0be77f1648115cb40bf7ce79ed8fab2d82046dd7567276794804516dbe39b72ca330f4089e712877 SHA512 6318f501b42fd2a35c68ed213e75a84643ad491b5651d36274feccd1551b48a26a52f8240405dcf9c81cc7383c3ab5d523354dd2d695993927391862fa623dab
 MISC metadata.xml 699 BLAKE2B 895ddd1afe0b826cb3ae4e279b2bd12eabeac29c68104aa4b819b412a66bbad8fc0da49dcf8aadb779573247094f8a6ea60a18c967b6385515cc2fd6420a3622 SHA512 3d1f92614be2f17ef5188d0d987d17721db7af60d27cd9901ddc8adc96c0b7523afa26210e36789bc8a9096994be7cebd7df72f624610f11b45cf4aea6e56cc7
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
index 25a13582c429..189ab9bc017a 100644
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ b/dev-python/kombu/kombu-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
 		<=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index cb58e86c33c3..9853a4e67296 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -2,6 +2,6 @@ DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70
 DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
 EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
-EBUILD lark-parser-0.11.3.ebuild 668 BLAKE2B 4d7a5e9179dc056ba8419737d9106eda1330ca09217c7ddfbfa82f14b399fd1697a5d31045783c50117ad4d486aaf5ce898e58d9a2b6ab663c0f51fc4d620032 SHA512 d4c606ce536a0d30d1ad34c622f6d62a5703e5f8c306c9c12b594e01101d843d890900985c1bea3afdfcc022d4f4cfda91f8ee6adbcc7125443685644bbcdbd3
+EBUILD lark-parser-0.11.3.ebuild 687 BLAKE2B 4dc9cca1dde96561fd2ece339620754dcec5e741f3160657e6dda1d65c58c64a30fd190edab304d6ed80a38f73f01daa04bce77b2dccdb45109501202f0f372f SHA512 2de23d36eb3c178916ca03aa14566309cd5a69c5bf09336a642912c9884b55f02d49e361b28f87b62628de8298954bb2bdc5dd07144627f9bfcea7ba9f60ab7d
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
 MISC metadata.xml 634 BLAKE2B 579a43df551ac45d8653d586c6567aae74c77dcb49aa9a4acfc2940ba975629aacda078b1090ae54ffc4dfed6b771b4d9f231970cb999db3367a32c45baa7051 SHA512 f9220665198522f359ddce8a72bbade74346be4e74632fc5764beb0d386965d6e7a88d1366dc968e330394a4a367059ec08c2b3b48839789b1b271657be5c49f
diff --git a/dev-python/lark-parser/lark-parser-0.11.3.ebuild b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
index 9e3a41734141..7e9086fd46c2 100644
--- a/dev-python/lark-parser/lark-parser-0.11.3.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 4a62eb607d65..226f597b0551 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -2,7 +2,7 @@ AUX libtmux-0.10.0-more-specific-ids.patch 1092 BLAKE2B 9d29753d4da4af3c5d1f80eb
 DIST libtmux-v0.10.1.tar.gz 220592 BLAKE2B 56028bca4e6a8df788d9fc9a112731fbf17f3617410d0632ac9d3f000ca130d2f4b21c377611e1ef95bcf493fa14f885cbcd7aa986d9c1b89d2b972fb4173f78 SHA512 67ed162546a3dc5aa51e91ac03f015532d67847b0400766b442691a39a1a751c59a6b37811f6422ed713fca6a071767a8e13694b2722489d2e56cda711010228
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
 DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
-EBUILD libtmux-0.10.1.ebuild 1044 BLAKE2B d5c843fd54c13414341ee5ba14292fe08d692d63ddbb47ad2133ae0b0e9231b9a21b3264d1ca3038fefef0efcd4369891ebf2915ce723674f274d0e94153ca04 SHA512 644142825686b6591af631ab33673badb2bf7a31719d296b0ba1d10b1556e8d97449db52ccea7ace1d4968a9191af75ac85f966fb4b5b1e6eaa0b02fa275bd29
-EBUILD libtmux-0.8.5.ebuild 897 BLAKE2B c85a8896ceef6b29baa93f6a406b6256b635b76c0a3123ed5782a6f2224a2a238a35bc90284fa6bffdf8e80fc92317c60ab4e6cb2ecfbabd6beeac2f1fdcd20e SHA512 296c8a852ef822604240edabb47f029867817f86d6d4f5f0b6046f8edbf9ba9788354864ee921046621681b5942ee371372d1fbd1cd5632ef52459d68035db4f
-EBUILD libtmux-0.9.0.ebuild 977 BLAKE2B cb7b24f0ece2c8d5f7814db0767d54e1fab90789c92a3fa34a020260cef26bf31aaaf51d20480edb188b2d187df2cfdff953b58b81326ce2ebc6173d73379878 SHA512 3767d7932a928e80b6088e58f52e7f14e6810e0b76943b28f65eeac018377d3b9c93c17cb9454f5c3297253a8e79f494a90f37a71d02dac4c28988b3ee3a4c3c
+EBUILD libtmux-0.10.1.ebuild 931 BLAKE2B 7a246cb87178bd4a2f6d6b2e64ec2c57963321ed28f51da4733cefef82e6e9642b4b58c7916e5f4e75c8921e8a4f82bad6313ad7e5bd045b8eb4a6f568a8757d SHA512 4e598e1b264cc514a32e49b7edd289a5025a35005e78aebf5352952b25f1569967dc8a2bd70885020b06cf4ddaaa4bfb05c6e27e49b0143ac81a67407840ccdf
+EBUILD libtmux-0.8.5.ebuild 824 BLAKE2B 566e684154bb0b634e4d4de4985e5db159b0829909a757b9dc7f7b65ac049f1571889abd67a9db31817cb276d83db527f8d736fbb020ea25c8fdf8b8365eb428 SHA512 16c659d73bfc74aac9671cc09700e207312a8f03ed12e90a3923cbc433224d834b153bf44faa8c66937034be08a412076440dabdce40f73ff5a7ff1c08dc775d
+EBUILD libtmux-0.9.0.ebuild 864 BLAKE2B d17a5d98c59580f729c47f8a22b8cf78d59d9b8cd225d9103e17cdcfb6fc601001574d1ceb0ac0b2777d73d15d3229a1bfa7300e6562d71baebba7f676e606a3 SHA512 09a750acf79824c427c558208e6ca0210e1c9a7ca34de3bffc3073974d17c28d24a50caf0c4a862e0f1c7408c0474aaf72f7186fdd7117f1253753f1d97a415e
 MISC metadata.xml 343 BLAKE2B 66c3f5a64242dfaf69b7828e9e90de5eb93bd1d95a008cd41b748fe768280678f7be3d9e930690be44fa7f639de589074f056ec4d39bb882fdfff9dbc76f3558 SHA512 897920796a56516a2cd2455e689b364cf92080b65a3f7c0f8b40b56e2f4c1c693a29cd6eca755ff51e3b1b57a8be1136a5648f1ed8857933d6e7e20628eece5e
diff --git a/dev-python/libtmux/libtmux-0.10.1.ebuild b/dev-python/libtmux/libtmux-0.10.1.ebuild
index 4f183304d9d1..0c111725709b 100644
--- a/dev-python/libtmux/libtmux-0.10.1.ebuild
+++ b/dev-python/libtmux/libtmux-0.10.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python api for tmux"
@@ -18,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 RDEPEND=">=app-misc/tmux-3.0a"
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_{7..9})
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/twine[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/libtmux-0.8.5.ebuild b/dev-python/libtmux/libtmux-0.8.5.ebuild
index ef673057a13a..3dc2f9cca237 100644
--- a/dev-python/libtmux/libtmux-0.8.5.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python api for tmux"
@@ -18,7 +17,6 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 RDEPEND=">=app-misc/tmux-3.0a"
 BDEPEND="
 	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/libtmux/libtmux-0.9.0.ebuild b/dev-python/libtmux/libtmux-0.9.0.ebuild
index b252f9c9bdae..b1ce5d801450 100644
--- a/dev-python/libtmux/libtmux-0.9.0.ebuild
+++ b/dev-python/libtmux/libtmux-0.9.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python api for tmux"
@@ -18,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 RDEPEND=">=app-misc/tmux-3.0a"
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_{7..9})
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/twine[${PYTHON_USEDEP}]
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 4ba5923a6238..ebd72360938c 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0-r1.ebuild 718 BLAKE2B 6427ae040f42ea89e64c70bb6a70f351840e2b30cf15711c100aac6d36b50fae6592b5070e575ea0bbb902fcce9b6b3068d5f8ce3dfd0d98137c58640298b7d8 SHA512 100e09abc41168246f982b357a321192827c9775190cf8f4c26a4a7c15071552f0f96c75059801e07c318abe9096884ebe7e96ce5577a863cc36b78661345d74
+EBUILD linecache2-1.0.0-r1.ebuild 725 BLAKE2B 2fe7e9b489f4f050b40b0822654034f66008777caa294f0ab107efff8b06ac2900250211d51f5a0374cf99ef5029c50eb6ea748717ad82e8378bf50cf3eac4d6 SHA512 365efefb38065f1bd9a54c61b8e2004eafa7f92b3c137cb7a55501f03580adece86784728c2e7306d56d15301c5aa8cd3c23f285b48e63c1bbf9bab13ca23154
 MISC metadata.xml 377 BLAKE2B 7de50cf7b25ff4a5670c0976205066353aab31ca2c46d14b037253b9843af6a6d973b7a43aec2d213ea4256de851f6ed7accda0aeb1378ba04ae52e69d1c5977 SHA512 577fa842cf618ecfe56bb1661a9b5e124d0f53c204d36df681f2d2601cc797120bbbe9cb863b8aeb268127044c5d2fcc1cf5f21e953262d793d97d9c9ad98aac
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index 9b0a2e825b13..aab01856e995 100644
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Backports of the linecache module"
@@ -14,16 +13,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
-python_test() {
-	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+distutils_enable_tests unittest
+
+src_prepare() {
+	# eliminate unittest2 dep
+	sed -i -e '/unittest/s:2 as.*::' linecache2/tests/test_linecache.py || die
+	distutils-r1_src_prepare
 }
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 7f108faa27c1..ac920513ce75 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
-DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.0.ebuild 875 BLAKE2B c7eb151f6ea8accdfee67f26f9b65c41a65d61019295681572055c1771556a365f234bea7058491d2e739313b0d77063c3e9028a8f895fe5987604f0f45ab516 SHA512 772d7644cb8d84f53a5275992f2096dc3bb7ea298056da296572deb53cd3bda52c6f523d9484c48e07067dd79f6cd0ab752116b504f60ffc963431b02a4c7d98
 EBUILD lit-12.0.1.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
-EBUILD lit-12.0.1_rc1.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
-EBUILD lit-12.0.1_rc2.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-12.0.1_rc4.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-12.0.1_rc2.ebuild b/dev-python/lit/lit-12.0.1_rc2.ebuild
deleted file mode 100644
index 37168fbde9bd..000000000000
--- a/dev-python/lit/lit-12.0.1_rc2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-12.0.1_rc1.ebuild b/dev-python/lit/lit-12.0.1_rc4.ebuild
index 37168fbde9bd..37168fbde9bd 100644
--- a/dev-python/lit/lit-12.0.1_rc1.ebuild
+++ b/dev-python/lit/lit-12.0.1_rc4.ebuild
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index fa60d09588e5..f37631bd478c 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,5 +1,3 @@
-DIST lmfit-1.0.1.tar.gz 258368 BLAKE2B bd2956cb9519f9303d0d2707b0333839ce471f62f53c907870bb6b8ab867cbcd1581d82a1959a6c3c734bd6b8074a769f0587706b3172800cbdef979db3a148d SHA512 1ae3e2cb25625a9b24c261d81c8f1ba0389266724581762f6e0a96140c84e43acd527ab1b83b862bf7b3b4c0b1b9755ee38d0c52e63fe89ea41f2d010b1e5c0d
 DIST lmfit-1.0.2.tar.gz 306039 BLAKE2B ab5fcda566f81f00a9d2371f6ae5b3477ed015c70e9b9faf8c5228e3f75f0bf9085d9bd3789042af7b46813d0b6c88f96da37ce295593a5368144d53f5f1799b SHA512 85adeac989117dab3cc9aaf216c37ea5087452351a7978238929216dd9d9be8b6b6790103d4fbbf5211a943c43fb99461750cf58287e2b18c27f66eeacc6ed9a
-EBUILD lmfit-1.0.1-r1.ebuild 679 BLAKE2B dddcb14d1ae2d8b5f3db492a42f0f4a54415e45886a931b0af5ff5b6b4cf098c1f69afb5cc5826998e2e540ec3bb28c265cd08a798c668ffbcd005bc11a6c6d9 SHA512 a0c729b4a020756dfed699394b1c9eacc30942b0eb45932fecdaf3626edbf8cd7a5f2f143d2c751b1915aa8d20df53181ecce78b89abd8cd8448e9259a0b8703
 EBUILD lmfit-1.0.2.ebuild 1056 BLAKE2B ed874fe8d63dbf9e1c649770e6247c61869ddd7326af41d5c1366ba1e23072d5d17eb27f91606ece5bf4337b119b33a667db2469945c1ef4c85b4137a7a2810e SHA512 f197479a8b159a215f38ec933cca2018b4f8a2fbda3ad7df5f6239d3566f7c9379bb1b1279ef478e4c9a12324c26c1a44ffae049e3fd51126720c85b64f44bfd
 MISC metadata.xml 385 BLAKE2B f0e9be81d998336366945f8ed722ff49a2868ac446b12659241e3d2bc64e3e918a4917b8212ff2a2a7264a92ae460df98295a158ee90c8cd3a6180cdd1f5e9c3 SHA512 c1354b1220795403aa9576da5b30e7c8f2b3836d847c0e05f2e7465927209ec4ff0675d0a1853508dbd3bf41880989fa151520531e5d6612be27a13a99a22bba
diff --git a/dev-python/lmfit/lmfit-1.0.1-r1.ebuild b/dev-python/lmfit/lmfit-1.0.1-r1.ebuild
deleted file mode 100644
index e3d9bc9fd9c6..000000000000
--- a/dev-python/lmfit/lmfit-1.0.1-r1.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..8} )
-inherit distutils-r1
-
-DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
-HOMEPAGE="https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="
-	>=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
-"
-RDEPEND="${BDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index f7714bf4dda1..3bea3dbc09a2 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -1,7 +1,3 @@
-DIST lunr-0.5.8.tar.gz 834919 BLAKE2B 970cc12fb30bc849d4ef846818f93fa7b7701b1155c9b7880f3a63384a8f353c760be5dc6c37188db656e7424715aa854f20615ae652b0a5c9e656871be490af SHA512 90c279b9e91744f19c4a155947526bff749aee5d727bc38cc36ee05228a6624419a54bef4214e8195a69abcf1a5b40b29c4fa8b14bece0befbde02d13af969ac
-DIST lunr-0.5.9.tar.gz 837871 BLAKE2B 988d4b6a59a868b2e06d5454dd1e4932981328ddfc6312027f22dd11228547c6ab21c096f3e673ea5aee0745fcd718ac805bc2067b834ed64841a8592f4317c1 SHA512 e2efa0b22af79140befe9d16e8f9fd3cd57f5413b466447eecb9a21ad2f50a6b31f27510bc7558662f418023290350730e6517b202b9d5ae06428ccdac12ebd9
 DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f823218de11d701c4d44f54c06360c4c8f1c96fd36b634094b6f10bd964c9d4e154dc208cad1f36e4b32f47 SHA512 2067c34c12f77ab0fb32c7f800ea3c647a1073c061a14f2b72b2b95fc8d624429aa37e85992eee5d5b24add179eab1d81af52af09f0db67d6cae459a5faa0925
-EBUILD lunr-0.5.8.ebuild 1059 BLAKE2B b5477761c205f3638b85445424b8e75fbabaa7e4b5898d0a2005e096c51d4ad8d582525b8f0a15943cd46d21cd9bb7693036d168d9e1e3371d529d65d694790a SHA512 2f7206d376c36be97f0563a7e06d7c4cce5f5c99dff1a9fa85110a40eb6d97fe408bed86b193514432e57e7d602b57061628663a3d11e78fd3571030d87da1e9
-EBUILD lunr-0.5.9.ebuild 989 BLAKE2B b7605c7d002aacaca0c3f861378f5aa48591e72cee1cdb98100450646a26172797a96d623d276c65f7a76097a65f51c500b8ed5675592a415340550cbd2014b3 SHA512 6a78310034dd0ece86dd579b0d200fa2a582dfc34461375812c21f1a633e219b9f9b7236708ce24a383e4444e5423ff98a58e9fe9c67798b8b3af56cfdc2337f
 EBUILD lunr-0.6.0.ebuild 656 BLAKE2B 4dec4e10ba3fec027e1dafff559685512f4b09493d3f92bf3528b81238538267bf13b5bf13dfaa4ef8eb6ddaafc9b5d07d79e288720367ce9132d3b2873b86f9 SHA512 4423555fe1075d096acf3679c19d264680e73974c663c694b156b57cd5219d8781f470e2cd54485141ecff609668b7ad30c76545d409655e22daf324bf56816c
 MISC metadata.xml 493 BLAKE2B 76427e64dc660b83bf96afd10026bd8751346876ec99e1557fab59a9eb99e3da48c555b515f32aad30d2ed48638dcc53d93c5d25d3f1d754e2eaea26a58c9263 SHA512 fab22bf59bae341d289baf58e3ccb60029ed1ccc8b20000c624ba7cab9e315af46a8583c1c834493d8e1fc6dea2d60fc1637f771936f4fdbf2f9829d50414bc9
diff --git a/dev-python/lunr/lunr-0.5.8.ebuild b/dev-python/lunr/lunr-0.5.8.ebuild
deleted file mode 100644
index fdf8b17158ab..000000000000
--- a/dev-python/lunr/lunr-0.5.8.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,8} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Python implementation of Lunr.js"
-HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
-SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/nltk[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-)"
-
-S="${WORKDIR}/${PN}.py-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Tests in this subdir all fail
-	# Command '['node', '/var/tmp/portage/dev-python/lunr-0.5.8/work/lunr.py-0.5.8/tests/acceptance_tests/javascript/mkdocs_load_serialized_index_and_search.js', '/var/tmp/portage/dev-python/lunr-0.5.8/temp/tmpldbff36d', 'plugins']' returned non-zero exit status 1.
-	rm -r tests/acceptance_tests || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lunr/lunr-0.5.9.ebuild b/dev-python/lunr/lunr-0.5.9.ebuild
deleted file mode 100644
index 9db4e0eead72..000000000000
--- a/dev-python/lunr/lunr-0.5.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Python implementation of Lunr.js"
-HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
-SRC_URI="https://github.com/yeraydiazdiaz/lunr.py/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
-
-BDEPEND="test? (
-	dev-python/mock[${PYTHON_USEDEP}]
-)"
-
-S="${WORKDIR}/${PN}.py-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Tests in this subdir all fail
-	# Command '['node', '/var/tmp/portage/dev-python/lunr-0.5.8/work/lunr.py-0.5.8/tests/acceptance_tests/javascript/mkdocs_load_serialized_index_and_search.js', '/var/tmp/portage/dev-python/lunr-0.5.8/temp/tmpldbff36d', 'plugins']' returned non-zero exit status 1.
-	rm -r tests/acceptance_tests || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 88bac8449ecd..ed255b213398 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,7 +1,9 @@
 DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5206ae5badb1e9b46d83d3bdcd926d324c39321e4fa2b4fdf276158d36c2d3634086f76086dececaa24213bbb765e42 SHA512 ebb6b20ffc1b199408ede0c88d1512cada14cf7220315100398137b8374940c03dda2e6449ab9135963598ab321669068a9eca0e1c4cd2f3f2454eba19db04bd
 DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312
 DIST marshmallow-3.12.1.tar.gz 174784 BLAKE2B d3540ba833950d730db719c8ac7e8d66a54a4b06d0decc161d9b1f82d2012db2df7cc376bf3fb322e8d07e60057409f2e6ab761561e822c942d189418c70b9fa SHA512 aadbf9c3b45a5b435ce7fd7f60a4318f393221f23687be7b48af43deee111f48806489169815122f297539614a81700a435cc579cf5b7d0fffea2a2809368db9
+DIST marshmallow-3.12.2.tar.gz 174529 BLAKE2B 67c8431c1b013f40c3ebbb23631be3060e978a4cb71f3802b810d943bb69fd32bea59b3b7c92df5ea3cbcef28ef7b64f32c9fb1a6a3d5d42e4eabd6ce4b7958e SHA512 d1f5e695564d0df10ec3f74b336b6ade7b247b722beea61a8cf10e30653745d187d26dcda3a2f2d38c04423315d20a67bc883c9e7b0d4686a759e379644cd457
 EBUILD marshmallow-3.11.1.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.0.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.1.ebuild 606 BLAKE2B 0ab0d2ac445f20b651e9101ea0f4377d4ad568ceb1fe481b7b827d031f834fcc6d08bae97898f0a2a8f00b5c3a9b145f4315d7ce82d2575dd76221bce73f4bd5 SHA512 ea76fea9a0f0b477ddbb2769cce7469f2f484d67d1a4c0c220ebd7e4455d72f80d4f281eb6631a6eed0407f32735b29bb85146601e52756a5dea14c33465c445
+EBUILD marshmallow-3.12.2.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
 MISC metadata.xml 461 BLAKE2B d1723db313f210e554d88a75276965f8f1a385ba8f879d2c43d8875a774240e7db4df6e2cf2a73138069b67a65760b2170bac2ceca8d5cf8681242b01f68d974 SHA512 257a5648aa10d9f8ec87a62e1e090374595256a4cf66f32775be135772114396610ad57e7ddf5274b6ef4755c563bdd3bc364df2751e61b10593d10e12bcb654
diff --git a/dev-python/marshmallow/marshmallow-3.12.2.ebuild b/dev-python/marshmallow/marshmallow-3.12.2.ebuild
new file mode 100644
index 000000000000..7d3435061f3f
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.12.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 4c94cdeebd70..2d96eee25175 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,11 +1,5 @@
-DIST mkdocs-material-6.2.5.tar.gz 5373656 BLAKE2B 7e04a4a284c0749264be819a0b42bc93f924c84b40df9f718392912f97b4cc2288dac7d7a721047c0ad24ed4bb73e4a2d00aaedfbcdd9198c59180fcb2eb286a SHA512 3925c03e2f7e71cf25cf386a6f7c6e768c059a61201860dce186f095c84cb311645628fd8732f10e9106bd818e348115c1f22457bba7c128f6bc89e980983bab
-DIST mkdocs-material-7.0.6.tar.gz 6224144 BLAKE2B 87945b12c8f922fac925cae603ab2cf3a30ee6f707c4960826116d0e24e59f24cccb0319f19b245785f7f764326cc54db880aa7517491e9df6f70a4fd38a3f66 SHA512 8c88f57e2daca9e7d1d466b6bf78c67936c98dc1a871156ae9c29266cd6bf31c73b908b220e2a99f4c1cd77edb5a7fd6f5460885e997189bf02bb75d048273ac
-DIST mkdocs-material-7.1.0.tar.gz 6084658 BLAKE2B 33a83d6ae358bb79b035dd8ba2bf662de3475057c0248b3618a3c468052c6c3047c89d972286310996758318c25ed1dc69d361727163f6e0b8d6420449662f38 SHA512 2bdb98b980e34a6d7a98a96b6b7c1ad869df31dde4cc712bf848105c7f8ff7faebcd0f3c17c9b26697661a40ce15137f60b7eccb64ff968d00209eb26ac788f6
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
-DIST mkdocs-material-7.1.7.tar.gz 6359705 BLAKE2B c3faaa59a5e0d848be646e206aba47318e8210d50b0ffd2a092fc4c2736fee8756b41ac91a421ed6f3e874b2beba0508d2273fecefa3bbb70cef5fe1707f3f9c SHA512 4e55ee7a04401830530ecf02439c3de64bfc388847e396414ed6f3f6f12a9db8a73175144772da76836c23e08a2e5b73077b9bb69a2b56a6cc3e2200940081a7
-EBUILD mkdocs-material-6.2.5.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
-EBUILD mkdocs-material-7.0.6.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
-EBUILD mkdocs-material-7.1.0.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
+DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
 EBUILD mkdocs-material-7.1.1.ebuild 818 BLAKE2B 8458825ae0286754a3568cfb3cd8987e6fcdd09043b218f340f88d38330f86cc56e91846b2c18d07186a3c7d8ff4b4ed23d30d800f67c7c7ab8648b3ed1a0466 SHA512 13a2b6a2783b3e6368c84a30898a799d9b2d2dc4cacb9a7e0ffc187312e7ea123c8ff9975986795748b353ac251e869baf5e45c016f54afec3138060680a3cb9
-EBUILD mkdocs-material-7.1.7.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
+EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild
deleted file mode 100644
index 1fdd08b1bef0..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-6.2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.0.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.0.6.ebuild
deleted file mode 100644
index 1fdd08b1bef0..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.0.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.0.ebuild
deleted file mode 100644
index 1fdd08b1bef0..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.9.ebuild
index 4891980fc00f..4891980fc00f 100644
--- a/dev-python/mkdocs-material/mkdocs-material-7.1.7.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.1.9.ebuild
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 895b78b28c08..d5df45439a96 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f53cfd3cacdb555777328056ca61ed80e2341da86041be32fe87a0174241e3f36f0f0d7ca43538d0a8ca7a45cc06b6b4254e3 SHA512 97d8cb1ca3b0abfa362b9f71c7f881c889eb08963519ff0a356778b446c62140edb70ec344cbf54df7990e94ef515202b567799d0426e518a1abd6c3886a4281
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
-EBUILD mkdocs-minify-plugin-0.3.0.ebuild 619 BLAKE2B 21bc69da07457a68305d4fe09e8e624af1de6554bd611de1a1ba66ec30438143acc4b2874792c6e5aa4b9453b1f1d3cb70312f157f2d7cc11e5e6537c4a56294 SHA512 e24e345cfd128b0eefd7770a1e8a868c6be60ef10b90122442336d88eb0673bf711754b144cac5bdb0a9ac385b63f33848f82887b2b513e0946ae80b21a0aa9d
 EBUILD mkdocs-minify-plugin-0.4.0.ebuild 621 BLAKE2B 9e35cf1f1ddf1db3f5a29ed4099cf5b33392a55e6e8a5f4239c3e0c388d76e46e7bf68a4f407f816fa29f8356569a1a30c723c51d6b00093785a052b381451ff SHA512 76c3b5558d78f43803ce0a2dc000dc111705881be1f2c1bf6f4eb8c0cfd0afef2bc1631c17d7052b49c4a78689206654d091a9e39facff53b5ea6e22c1299aa8
 MISC metadata.xml 436 BLAKE2B 8526d6e7cfa9eacf74fded910cb20aa183404673b4f79ac8bbaebe300ab5054bd7540b31d7a56f3e26ed3cc377a75be9e204ebfd12ccdf1d2cbba573b7f417be SHA512 8ce9979defb138817298e45dfcdba9444ee8452d1f027b6ba2dd3104e872fbfc53fc97e36becea6d46cf182fea709f7fcbde6c59572ea72c6a913fc572a999d7
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
deleted file mode 100644
index 5f83e7011163..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 882b6563acc7..51abdd26b8ca 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 828 BLAKE2B 35b03e9b37eb417aca1971312e57c92070858438c3b268b407573d6c15b423cea2c5bf98f79bfe0906f2bd0b33d4d455782c4423f8224104287774e6e070e826 SHA512 11151c92c9f8cd11bdd9aa48dec49887347da04a5fb1198d21200c681641db1448354c6b3ef3af63c5862275da397b03b2047a742f9347b5ca61830073cb40b3
+EBUILD mypy_extensions-0.4.3-r1.ebuild 747 BLAKE2B 3e5583f25ebad58636d2c1639dc6a59f3e8a51959f349c879e40abed7cdb8eca729d2244e93afd9b84e60dfe47df928d313a57a4e38849cda2f2ac20d91642b7 SHA512 3c1d03331688d222903c31ea494a2c2aac15a4c8af1e5d3efd25b095a92df75903ba684e543153b0a1d8c2b5274dfe4c40a3fad57a171702b240817331397b16
 MISC metadata.xml 406 BLAKE2B 39bbd87f1c027d9f608a8cd91378b03741d8c7fe480bb800907fcdbbfe17f27f5df105259bf88ad4614c43dd2e4e2943c87b8c89c8ca866878c27862c4648f37 SHA512 327a3958e787e4d2cf43a4ec78ee534d644883a627cc7a690af90e1440f49f2f04d80ddbf9fa6dfc0048b499a441955699bf277d53f6cec1a407cc4a31c770cb
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 2fcf5b51dccc..472779e6b05f 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -25,9 +25,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/sphinx \
-	dev-python/sphinx_rtd_theme
 
 python_test() {
 	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 2913c32386ab..6f2a79cd6ca3 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 753 BLAKE2B d15143e0705156270a09c3d54dada35751c21a681250bfc84118848cf7f7a327c5687597193924489484b100f95c9fc84174ed80c97f268a1171764b03dca219 SHA512 4eecb10de7aaa5235cc55bf209feead77319e62208d5f37220a79dd93ebf63f186f23618ad9ab4dcee0283172355f5d1e07655c002848ff4b8b4e5dd1399e901
+EBUILD namespace-repoze-1.ebuild 754 BLAKE2B 84c44e41b3dfdb2870659c6ecd0773877e40162a4982172696caeaf913c5b0f1ab149e7495aac55b962bafb094b981656b5baa890b97582839ede7bdbee05729 SHA512 53478831e6b7a6862f7355fcbf245dc98441db629a5007f224476163f616fc1c98305663d27ebe09c64aa3db5dbdb49dc19ef3dc4375d2a788a9787361a868e9
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index c1bed8f726d9..56f3fe5aaf48 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for repoze"
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 279b11bcd1a5..6e3388265f79 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 561 BLAKE2B a03c6e259f7a933066f95dd6b549ca68265031980b78b8728f666cd8fd77780effc17e465b68eb2e0c12dd2c710241970f5df6186bb9933cc7952220a3dfb822 SHA512 06d7e4fe852a4c4fe1440a1073f0da5ebe6d270c114e0edda0aebe5e54fe3456defd28dc41c3acc4558e05c9f03a966ea0502aebacfec9f80eec8562d7cc2a5d
+EBUILD netifaces-0.11.0.ebuild 560 BLAKE2B c74e66764f5d255c961544d35ca87ec619aaf82b83f0d8e567fe761230a0ff8be73593626cebbdc701d4e70ea2aeae0b5c0fd652c72bd5dd6a27bae0ff8e98b9 SHA512 b323fde9b99c6fca65ac86bc0a99f1240d294f89e2676dc0d212e38abb5e74dab66673afbe08c7b4511334e8d3233b712ef8761a65db06e002d855c168f92e2e
 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 0521dcdcb3ca..c9b1511ff72b 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 63c04e71b6c4..a2c27c3dd2fb 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 1503 BLAKE2B bea445f7ac73c746113abb9287bc38a45884a37a761186c045a472f1b0d5124bc9b880ad75931de6eb83d7d17d296011588fd8ff46153e82bfedd90a84340e90 SHA512 8b566f5ef19c4290abb5e0a7213449d2838817ad2ec4912d70ebdf629d2f1417153e64212428dce8845af7d64653fae80e11f395134c2a5c40ddc4f6fb1fb69e
+EBUILD networkx-2.5.ebuild 1504 BLAKE2B c281bc937ee2e4b13a57e6e861e4dcf881498e8b645230038d53fa6b10b800a15a999297c85503491c54a091f170604a91004a4d8c7387a67b4b36d4ea724730 SHA512 1c3d8159f280fb08aaea8dba9224db19ce801f73a991e4ec5f654ada7e9d28518eb366b05242a483ecfd812cc8380fec08770e56b61bee5c17e5f36dfec0df5d
 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 076632748580..1d68a8d37f79 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			>=dev-python/pygraphviz-1.5[${PYTHON_USEDEP}]
 			>=sci-libs/gdal-1.10.0[python,${PYTHON_USEDEP}]
-		' python3_{6,7,8})
+		' python3_8)
 	)
 	pandas? (
 		$(python_gen_cond_dep '
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index ef92ea460bcd..dc4745c89af8 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 3727 BLAKE2B 484a3840f6505622e69a1c817833700ef3dcb4dc98d9c09c9af8d2c04e1381e3d9379751c314793f8e590129fe1bb309a8f966366320cbdf42923646fa16ed1f SHA512 27fa9ce2b73d4cb3c8129e024051ef6777149d02cb4478a7f885529299a3d9c2a4683c8cf5e2d059fb4bb36def8313d10f06669f6795c1326540cdb1cb558456
+EBUILD numpy-1.20.3-r1.ebuild 3725 BLAKE2B c7ffce465a67bc7e94c87d472138b55270ce1c3ab90f4a0fec4c83ffd53cc478dc2b1340e1571f642c18a6c7d350a6211d425c6760e93ab533823176fcd0a73a SHA512 848823fcf321840855e4fc89efaad6521d168b7d5c133ac1dd81d8e466eedfaff346ca6d2832b17477b3b36746db0b68869f3fd06ed243d78b83f6cadea0e121
 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 cbd2bf9b3376..47910e45729d 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/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index b3ab6532b003..62828d3ee95d 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,4 +1,3 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
-EBUILD openstacksdk-0.50.0-r1.ebuild 2639 BLAKE2B 240d308c4f45d07e6da19cc08453ae41c8d10436384d205c7ea546c6830e6a894c53ffaef6fb867d8c47f758b6fb9ad61085011cf12cf4f4f71f0e2e533f869b SHA512 84d2231c52757d026521df5b5d0d2703dc124688d898a2f8561484775083252a7bdb9e09ca2e610095f0ec6a6f12999a6686d6550993644cefeeb4578ee521da
-EBUILD openstacksdk-0.50.0.ebuild 1326 BLAKE2B 07fece6346948f5271f30aac64518ff3f123db35da212a9f0e5c37ec96416c8f56c1d6ef14c767b5c226b0608aaebd7a9528531a8da38ac20dce104da1a0ad6b SHA512 dcecca99c2329242e4ec4b4acb296e0d36bf78142a797b1f4d0b7c640862e33aedbc784f385d770b3ee707c2596f59be006c80ac08f9c863a9e1f65b10621243
+EBUILD openstacksdk-0.50.0-r1.ebuild 2638 BLAKE2B 21a753825ddba3277859677193c846e5d020a7a0068bbd0cea26556c20b91a6e45cde24d2ec2f232c87ea17c50ff78945ecea8c6363d328aa5bf88e72be73749 SHA512 1f38aeec5277791395340e3730da0a3bd9d136b4a97cf9c0e62849746a01b0f4e0a1c9cc568c27102a4651eadacd57e66f6f36b088f5c0d31fdd1e010e41c9ee
 MISC metadata.xml 523 BLAKE2B ebaf30ed0d1a7740cf6ab3d1c4166d425c52bc729aaf44984905e658dc6821756c6d652dc3ace972e0ecff1a3331147c8d016ef828f99c5fe3c1c559cec92b23 SHA512 82035e25a5b7090fa89cf36e623a972de79884ddbfdcbc3d425e989230a9e0a458048cc352f353ff9fa4c7520cd5c4d6da472862dd919c706839661499a4540b
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
index e6d70cfc647a..0a34bf4e069b 100644
--- a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
deleted file mode 100644
index d5e8c982eb17..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
-HOMEPAGE="https://github.com/openstack/python-openstacksdk"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
-	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 43edd81f4189..9d0f9f8f828e 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,4 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0-r1.ebuild 808 BLAKE2B 915dbb9688a0970b25123cc403983283545179875b6a42c4f7a4930736f64255761375339bf921a502ad2ce502133011b26116f00dd16e8fdc05b16d0b8d5c31 SHA512 5c7b2701455cfb23052f4b3061f8579ea12d21edc50c53331ecd94f84cd8df8609ddae919eac7a4c4674bcc2eeaa58f241f17b0ead655e15f248400f57a8a1f2
-EBUILD os-service-types-1.7.0.ebuild 554 BLAKE2B 6d8761c0f618ddffcfb28fb9b633c6b6006a6ed2bb48d561591a3a5767ab79b3f04c928060ac752f5ca04bc49497e84ddcd04238a197e64a1a807af953b910fa SHA512 4c009b9347bf50bc363a8a5e22dd79671c34219312d67a5e08bddd97454bb3773aeaa3f7c5e861eced64114f03e2de25c7d040decfbb2fda3fff9e4c64871c62
+EBUILD os-service-types-1.7.0-r1.ebuild 807 BLAKE2B 2fc3d5e2cf2070827b4c4b76bed505e0c8dbca179dcc467f3d200740d711f90ddfb228f2065d56b63a2985e3770ded5afbd8bdcc78f8cd8b8c9a061e090c0030 SHA512 b36d5e94a5466c7fe6a60c48483a599bae692c00261660e3b661a0f5de0e1d4decca9a53689f0026f0cc67642539593dee827504bf5c2325ad5ccff2c61410d0
 MISC metadata.xml 478 BLAKE2B b2adbb00563c579932cd362f5ff0e4c17c9d510f9210769de52d989ae734b5f4b75613a357ae850bd201dfa5408144b75e3e2a05cdf22cdd0f3e87b5e47b9b1a SHA512 edf558fd97f5eafb164af966a3dc79f7e5bba8f89e925a6cba1c3245b9b053361485fb3937c89c9fee2abb1f55582f65db6cdea97d2c8cb236f2cff62fa9ae64
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
index 6d477d30afda..7889e2f31728 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
deleted file mode 100644
index a33a43bcfdea..000000000000
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
-HOMEPAGE="https://github.com/openstack/os-service-types"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 40e5f1ba4288..2d03eae23442 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,4 +1,3 @@
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
-EBUILD oslo-config-8.3.3-r1.ebuild 1344 BLAKE2B 4ba165d1dcc6f6899e82c5fc4bb6e98e2f302ac4071b58e269a9d560341f7315eecb193a0028f82738f07f79744184785eab81e1f9d95066b0c8cc80bf5d7d6d SHA512 2298cc3567c45c1d50e01b2aa6e660c385b6c5992ca67226642112ea5e05aff637424e1ad48f0393645ccd1f2a41d7f3b99a299c3e6056ef07f661f7dfeba77b
-EBUILD oslo-config-8.3.3.ebuild 985 BLAKE2B e6e7ad1fe165466578d09ce9e9d22e9b30cbfa5fc6add48e0b54ad82b650adabe7668e0458e9899dc9b0692894d1f931d23e31c74d1e9f3cf8ae60ce7b558d36 SHA512 19810a86aa2fc185c184c05326999f1db38b1da94f2db79aecd8f2ef8608dfd7cfce355910885c583d33b3964ae0403c592c046daf188ae10df72bdcb231c060
+EBUILD oslo-config-8.3.3-r1.ebuild 1343 BLAKE2B 278b0a27e97fbdc0e6e117053afaed3f491af46e2bdac48c69274f70416c763fb5245c11b3e0f7f874c00cabad867b5b19649cf371d9a989c01183d166f991a2 SHA512 32697eb830aba5a94120174b00eb3b802424cb78ce701063ea9072fdf7e4b3bd5664a40f72163a5827d2413fad1086bb4340faa12923b4dbefff6721ccf3dfe8
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
index d1ceaf4b0701..fa2d903953de 100644
--- a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/oslo-config-8.3.3.ebuild b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
deleted file mode 100644
index 46340c240910..000000000000
--- a/dev-python/oslo-config/oslo-config-8.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 3f61c51d6f37..161ef203ae47 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,6 +1,5 @@
 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.4.0-r1.ebuild 1232 BLAKE2B 1fe33bb189daf8169e1edd1baec7d5dcdd524a1fcc830ba8c4953b50f5a37beebcb641067df4201f9e9f823251c5373587cef97975cfeb4b09ed758a77458b57 SHA512 cc9beaab24b974d4f8d2f29cea5383c47505beaa467af84a0871416b13a78e4e1de2b1bfd407256e60d383731b1c41741cdce2cf31ab4178fa15f941b62baad6
 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.4.0-r1.ebuild b/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild
index 5c2292eec5fd..3a6cdcd0334b 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
deleted file mode 100644
index 1f5b37183c68..000000000000
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-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/packaging/Manifest b/dev-python/packaging/Manifest
index d419ac42cb0c..a8baae065407 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,3 +1,5 @@
 DIST packaging-20.9.gh.tar.gz 78041 BLAKE2B d87c66aa39cfb832a26a350981722ad40a9193b70ca447030405ee474586cc12e4ae5f4dc7fbc5da6944b717545f3d3f7caac376a3da1ab95aa26429723dc6f6 SHA512 fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b
+DIST packaging-21.0.gh.tar.gz 79977 BLAKE2B 4ddfa5069f463abeab09ed92650a174d58622927d24b22eed184506d36d9144520e90cd5ea6570e7c06af3c768eda608decc4befb402942e6d6cd1ba5cb10b42 SHA512 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b
 EBUILD packaging-20.9.ebuild 895 BLAKE2B e26794d1df55cc8abc609a4f5351b0079f342289fe84a239e1ce8829a800c4456659e0b0a6bcd018e32b88fc537cb1971c208a21a17aef63abd6bccdf48efaa0 SHA512 6297e88daa3e17f1eead51de10837ce4c13eade42c4890e9bfd59be33d1e2d99156839b69dbef4017ae7ffe7cd081211f521974d79bfc81635f855e43fbf635c
+EBUILD packaging-21.0.ebuild 849 BLAKE2B 0f4bb30bb2dd11807c727538c65f8c8a153c9f774fa0400a8e14a1b2246c274d5bdf1a9a44c2a616f33898248552285ace1b9ebd9a2840a925bb59a038d5071a SHA512 d705ebdc1b67e785a5ca8afa571cb2c3064121dedda9b2c82d290a0282a6f51d10d114e9064a7ffa8fbc21d10f920bfa4270ff9ba3c5e4ca0e452ae2291c5e89
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/packaging-21.0.ebuild b/dev-python/packaging/packaging-21.0.ebuild
new file mode 100644
index 000000000000..f2ffdaca8815
--- /dev/null
+++ b/dev-python/packaging/packaging-21.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..10} pypy3  )
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+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"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --capture=no
+}
diff --git a/dev-python/partd/Manifest b/dev-python/partd/Manifest
index d8b45bceb8fa..6bd3fdd0fdfa 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,3 +1,3 @@
 DIST partd-1.2.0.tar.gz 36720 BLAKE2B dccc14704134d1453b92e896080a820b817efc78f86511307d4d1f6e2787f38935edaa8fdfb0ea4f2350ab99f5ad06cef98bb1eba4d4e45b2582a3ada2f5d907 SHA512 dbcf6a73e23aacd6502f0669abcb8e51547f280b1b7b94baa7ab5637cd838f8427ad1c4e39127fb7f8b164f3a83b66611b2c71667d31fe0137619fb6c457fab9
-EBUILD partd-1.2.0.ebuild 723 BLAKE2B c356e8bbc05de1397cd4708afbc66798785aaaa89ab516f5752a75c75b820f57e513558d051689c89c2acac4856240b76ccbaa20e3d17717cd212e99b948b4d5 SHA512 8f0c5636f654630d640467f72c66e74ef1dbd0a89e67730810e849b3390dcaac596d48f7375410dc9fd341e02adf63ed9504ecd44dab619add584a9db97f9bbf
+EBUILD partd-1.2.0.ebuild 674 BLAKE2B da3f1b7568b5b42d6cfbff7fb35aa36b6c92c97c7e8181430646f90eb9684d24f3c3f8c7a5f8e9b844504c1315559fdf9b86fc3418a589cb03e983a1dcd6684b SHA512 be2a211ef01c1c52c8d759ea3d4dce7c756bbb14a6d63507c9ea1f39d813bcb6c1ce271ad3c578f90e77349a08d13f34ed61b70f56fb1f1a9c7e5a1f6b5830cc
 MISC metadata.xml 693 BLAKE2B eeef98e5858d164721e62fdd97dad746d228423be302597c0cbafc2d4835802f33c10b63744c98fa52a11c1089888781d80555f3b29c993860c0f668c250c0c0 SHA512 eab347512f7b6519d61afb10fa404c311406d7fdd49d4525205da719f48c7688e0fa4dec52e8ea2933a50a4981f407680d8d36b0865827e85c4c1e8b3a5b3b47
diff --git a/dev-python/partd/partd-1.2.0.ebuild b/dev-python/partd/partd-1.2.0.ebuild
index f6f2f0a6e2c6..29532c22a714 100644
--- a/dev-python/partd/partd-1.2.0.ebuild
+++ b/dev-python/partd/partd-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/blosc[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index a2c584e88614..612bef259923 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,5 @@
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
+DIST pathlib2-2.3.6.tar.gz 38435 BLAKE2B 07a6db61feb56c439e0c4c97d96f87714090628d3971341b64ed253cf9b363b7a3695a665a3def5c2b950cd3dc2ba316ef3dcfaf48f25726fce34afedccdafac SHA512 ed41792338d5808cdd068f6c04021b2918e5376fc6297f163712dec6b00a1f96f7905eeea0a601c333d253e0f1663a0472d842b0d920d680992045bbc36db970
 EBUILD pathlib2-2.3.5-r1.ebuild 878 BLAKE2B 55031cd932b49489427c98dab76661ea9d4709845b0cbdc7e65d95e0568428b6e10fc26c67a679248bc55fd3321ea1862bb61573cc883254be3746eb0897568c SHA512 6e7716fd74c4dda31c8206ecdaa4848812f556bfdd5842d27bc738e805f58c8517f827a4cb0d498c49f26fd3ef2e42525269095eeb92dbc936826d49cef4f953
+EBUILD pathlib2-2.3.6.ebuild 752 BLAKE2B 6910945f64137611fce99746fd424611bbc532d56fd822a1aa92bbd7f052b1f4c202002b55b3da78c5743964fdd8b260507bbf2149178992723bbbddd022d872 SHA512 2a5950f56d2b0be44ee1c6a15f76ef9338cba289701ecb872a63d4f984a8cbd041509ccef573b4a9f6d71c6517fef9de39c70b19a37861e2ae8df0436cb263ec
 MISC metadata.xml 463 BLAKE2B 1ade185c5ac11844715bf67d798fa910d2fde357f1953688c28d94477e2b5a68613178c8a3eaba42ae8285a49cc94b37ad5a559d80771f763ed06a2dc952747e SHA512 45a09691f2b57c336a752f4a881aa1d91173102d6b89a33e7583e99d13c18610fd29f248287cda00d31bbd265a68f11b60e911644f6689c76c1704fa2c901100
diff --git a/dev-python/pathlib2/pathlib2-2.3.6.ebuild b/dev-python/pathlib2/pathlib2-2.3.6.ebuild
new file mode 100644
index 000000000000..ac123963984c
--- /dev/null
+++ b/dev-python/pathlib2/pathlib2-2.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Fork of pathlib aiming to support the full stdlib Python API"
+HOMEPAGE="https://github.com/mcmtroffaes/pathlib2"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_pathlib2.py -v ||
+		die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 00c285ac4e61..eb409a7b4515 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 1975 BLAKE2B 2494ab7dcd8d4be97e4ea2b467fb33561174e8a098f3794cc21efcc25193decbc1b8f6dc78ffaa75ac2bc10f5de004586d5872803b7b483e44514b3483f62c39 SHA512 88b653436202c318418e99dd96870326d04c011d5a12c84904781f77219818d31ab45689ec8b1c67fbca1539618892a007b783f7aa10d65ea76be09a6b748b5f
+EBUILD pbr-5.6.0.ebuild 1976 BLAKE2B 8790776541e448548b3ab6a331f76ec7dc6767fe5ddb0d26326cd179096774c5461f24082ee94cdc0a4c628b72ec7ea726056312c0cb21a9a83ee15b05980aeb SHA512 1403c13b5a0fc8be2c429568c4c6a5026c016b018f3b18cb5d92a2a87759ee74e5ffd030da6b1b482c3a44923af619a31c65675385cb121af92edac7c2ca662d
 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 7c12cac8e10d..88d74d5419e8 100644
--- a/dev-python/pbr/pbr-5.6.0.ebuild
+++ b/dev-python/pbr/pbr-5.6.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_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index f5d455c3dce5..906c0a11be16 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,9 @@
 DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
 DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
 DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
+DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a149504aed376a255453d3edb49137e979144645780777d988b1fbf5d7380b468ba9dd905f34e42f658f6ff8d0e0047d45ee35 SHA512 d177606bed9ca6f4e7f91ab695d9ae6ddfb2401f36c458907b2b6fe14e85a2ed188967da14971c15ec745b87fe794fc8ecca86679f01d3c8fb649224c2f75139
 EBUILD phonenumbers-8.12.24.ebuild 434 BLAKE2B ca7366984b77d662a0d9239e2587005262270921ea388226c39aa9e8639a92957b3bb831b99df059a0dfc4ca68772ecc5f38a38f2953ca784eac1ae4c4e3c936 SHA512 269022a5fd237ec45e78bb73ac97dc90d7ae7b507225b8d7721d1aedc77344dff47adc5bc093a07b2fe7aa5e5e2e0a626b3477cb91a23e52d3d5c8f0b95615d5
 EBUILD phonenumbers-8.12.25.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 EBUILD phonenumbers-8.12.26.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
+EBUILD phonenumbers-8.12.27.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.27.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index dac04afc3e18..34acdf5b0697 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,5 +1,9 @@
 DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2d509ebb8824a5b2fde709db341366ee2b8f8160e65d876c2fff0aa7da54eddb1fe2b9fd524b0c25adf79779e21c SHA512 6bde2a538cdaf55460083c54a6d55ddab3ec4ba127dfc77d3f79da8492ff50ffb76281312395973f8448c360ae53b0c9a0d090258f43bfdfdf420336c99fb423
 DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
+DIST pikepdf-2.14.0.tar.gz 2309588 BLAKE2B ca0af8ada258742571afa1133ba5ea282ac7a44dd34b5ebc24091dcd36629ac97b1c7b0e7e65cf86f0933a13423b9b5011d53ec75cd7b0bd614917443e72b793 SHA512 3b6c61f14581934aca2293b1d42be1303234209bd5fdd24216db57df765470591d5252b912de9b797f885cbd52ad610666d86ddfd1c279b97b1058cea36eb378
+DIST pikepdf-2.14.2.tar.gz 2310009 BLAKE2B 1afddc090e8e92c57843fc25cd7a6c8ef75e4f9c46144b10e91a96747b0a800a38715ace4d9eb5a65944b4495531417e8a34d7c34e1136f04df6c2c359ac2771 SHA512 cad165078bb634d6e5202ff71ab8d11f89a47974a3dd33c237b804f2784582b739bebfc6ed99664c98cf274c16dadb718a81d95710827be711e7d7d4c9ce5f77
 EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
 EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
+EBUILD pikepdf-2.14.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+EBUILD pikepdf-2.14.2.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.14.0.ebuild b/dev-python/pikepdf/pikepdf-2.14.0.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.14.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pikepdf/pikepdf-2.14.2.ebuild b/dev-python/pikepdf/pikepdf-2.14.2.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.14.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 9533478a283f..54389bda0426 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,7 @@
 DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac
 DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
+DIST pillow-8.3.1.tar.gz 48722889 BLAKE2B 4483c3cebda33e57f665a7a73b5898b4f0fb5be895ec05feeb266a99f33c78fd1b550d82225c201ea015d267206f5b47909b4963da9f17d51d0e5bd897332a77 SHA512 22a85a5510c8ec13928af571ec7f329f4728c46ebaadfe338d837f6d3718eedb57b7548fd9a3260a3bb0c0f97b3f3c911e730af01f90ca70c967d44b1e5d3606
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
 EBUILD pillow-8.3.0.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
+EBUILD pillow-8.3.1.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.3.1.ebuild b/dev-python/pillow/pillow-8.3.1.ebuild
new file mode 100644
index 000000000000..2943f29c9d65
--- /dev/null
+++ b/dev-python/pillow/pillow-8.3.1.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/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index c3deac72a9de..f99768bbc472 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,3 +1,3 @@
 DIST prometheus_client-0.11.0.tar.gz 72272 BLAKE2B 2526a65acf928ce5f492c6a43276ecb951d8b600eeb5050b92db091919862eb0ec4f41ca41347b4dd70a612f70e8f4a49796572de80b197d21c3a8cf8e303201 SHA512 5e644d781b7fcc3e0e386a2244f524ccaf978f1eab87b1d6d8009ac3f10fe2ca4adf2c76c2a2ffa47b4b54237cd906807d55bd99530a92d82cd3825de93280dc
-EBUILD prometheus_client-0.11.0.ebuild 611 BLAKE2B 057a0de52cfe4794c71162e2f924ef22a4300dad61faf2c35e8bff211bb87ce21ceb0e86477da8e2b871240081e45702fc07bfa61406c11fb7f4d633abbbcc40 SHA512 a355ff144786eaf9b582ea99270214eb7714e76251fef1677c06b24d0993aff4196198e961be50e6e896b009ca90d8fd0312f14392c735f40ea3a34a3a805427
+EBUILD prometheus_client-0.11.0.ebuild 610 BLAKE2B 28a939d295c394d5f323dba927d272396b378587f65d86eb795fa62858be00399fe30d93f6722af5cc943eed9d54f72b5d7e11973d8f2b8c846ecbb53da1d4ff SHA512 b8503ed93df9587ca4d67e1052d24499e8461809e3747918ba8ae4f81cc5bc55bc0c91c9fe7967e2cd624ef1ed5ed08179841b11f88ca50b5db3ec654780cf84
 MISC metadata.xml 408 BLAKE2B ea5035e286f836f3637d79b145f3d84e7dda07372ecfa66b32f9c4d4f553f584a28e5c421a1537da8d4495173dbcd1515013ccfcebf54d034e28cb8cbd864ac8 SHA512 ecad056ac13d4d78b2bedb19a6ed9c60d0c52078301a4e2397c3ee1f45fa435750c1a5c63ad95150129216201e821cb5ea9816726c0a3b383538f956ce7a3d40
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 bb19b2a1a94c..f47841f6cfbc 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 d5345215a870..87b026c506f9 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -10,6 +10,6 @@ EBUILD protobuf-python-3.16.0.ebuild 1588 BLAKE2B f76b36f7e0fa22da7cd828502983f3
 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-3.17.3.ebuild 1590 BLAKE2B da38acf037037e66d3cf3617a7f0d1d0e1b098d687af56c0f5895b5652ac1b7de7f9f6d96c75badb55ce39836f2a269bcd347bd0f0070deaf14a412528507873 SHA512 be48b980da93dc834fdc965285ef8c6c3960f42ded9f3dc1eba3bedb0ac545d82f526a13dcb8cf4c1fd85bce5e405701cf039009094c7ffde4ce788c2f90bbda
 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.17.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
index 79ee5b7012e0..3d9369545d71 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
@@ -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/pweave/Manifest b/dev-python/pweave/Manifest
index 3d0872831b83..db604f821a1c 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -1,5 +1,5 @@
 AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7ce5d184d843f84cdf9f3237038a2192aa41b834d9b39f584ee5294d802857d1fb0f2d457721b2b82376b00215 SHA512 7a4396e2383c630e1bd8cab770952e8898be157b80dab23ce0f7cabcc1ecda4bed9a9cb4ad46d48e521b05de7de324106128d281ef88e06735425cc430f43717
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
-EBUILD pweave-0.30.3-r1.ebuild 1371 BLAKE2B 1f77826512802801e4f18786f7a140ccda82cac14c0644798602d3964c1d47067338d4cfed9d2b54e1771517f78868e780fb3060d5788cc6453a28ac9e9ed978 SHA512 79973c9b0e624f3cd60da235de74c6966c665788f10f46e19a5e8f50204357dbe28dcc060cd9251fe9ecf86fd6e819a0c193b0c90c87b102a7a35a29271e94b3
+EBUILD pweave-0.30.3-r1.ebuild 1374 BLAKE2B 44d61419efaa95bf58128fc2221ed979e926cf99223da0e51faa209a789449fe4e19a3b5254629557a21a78a77069d16b5666764aca2b70d65450ee825f96d70 SHA512 5e2d450f098bbedec95b8349aa4c597a89204245667a6aef3d912599271625b79864eda47f5930cb2d97974f7a74abae5add77ed5eea8a1f2d9596b752965dc3
 MISC metadata.xml 351 BLAKE2B bc21a9b48f756787e622d2b817564524ac801c37ba98e79e12cfabfe23f0e9d10696be02c3c1a40d76828b87137a56cddd4ed951d86cec699325ac8c231e748d SHA512 90e42cbd664dc9da395b364c101a9616dbf820fdc1c4ef71b151d54fb3c129e5b6919405accf61430b8323b1878962128da1da4d48981716317aedc745f3d98c
diff --git a/dev-python/pweave/pweave-0.30.3-r1.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index 03a16a520ecf..fa40ea257494 100644
--- a/dev-python/pweave/pweave-0.30.3-r1.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -16,6 +16,7 @@ DESCRIPTION="Scientific report generator and literate programming tool"
 HOMEPAGE="http://mpastell.com/pweave/
 		https://github.com/mpastell/Pweave"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 IUSE="examples"
 
@@ -27,22 +28,23 @@ PATCHES=(
 	"${FILESDIR}/${P}-docs.patch"
 	"${FILESDIR}/${P}-rm-online-tests.patch" )
 
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
 	dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
+	dev-python/scipy[${PYTHON_USEDEP}]
+)"
 
 distutils_enable_sphinx doc/source dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 67888cbd92a5..5093a2ed4be3 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,3 +1,3 @@
 DIST pyatspi-2.38.1.tar.xz 316724 BLAKE2B 59ca2569575f3d319d33972477ebc966670138df8cb6570ac260dd903f54df66fd12beeeee53e3380938e4571910b99ae2bf3f395776b16a73ac27f8fa023c49 SHA512 bf8f1ee9a6e00014a84e4329bb971bec8b4bc8f72c3905ca585ca20b1cf000b855965159fcc10871eb92e9808a6b41b5d793f3ab563ff0867f185279eedcd487
-EBUILD pyatspi-2.38.1.ebuild 1299 BLAKE2B 4396a51ce061fad33ec0659615b3cd1d572909278be545746bd09aa8203b3740fe5923fc628f0052b1ff01aad8ef007ed256e98dc5bc1267c0ce54ba59675809 SHA512 d212efc574d37654fee61ec8180961c0485d0a42fb77ac5a22b3e758e9efe29790aba34be24328b3a4f095cbd360e2d7f32a9d3dc623d000b933314c2882428e
+EBUILD pyatspi-2.38.1.ebuild 1301 BLAKE2B b6b6f1701ff65ffb9c34b996b51aff9ed77f2f07fc1e6c09d89e33ebd3f183395a3a7608ef81b123e945702a5b0f09149abe593686a84679e00168af202558d1 SHA512 97aded595a2fd60eb97e7734d131b8a768464d69c35c8b98be5c2e2e4601842769074bd6150f2d9d366395631507bc54ff8c31d8a8e01399529b64db0739b657
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.38.1.ebuild b/dev-python/pyatspi/pyatspi-2.38.1.ebuild
index 0fcfe8055d41..2f8ef1cb4534 100644
--- a/dev-python/pyatspi/pyatspi-2.38.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.38.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2 python-r1 virtualx
 
@@ -22,13 +22,14 @@ DEPEND="
 	>=dev-libs/atk-2.11.2
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
-	test? ( x11-libs/gtk+:3 )
 "
 RDEPEND="${DEPEND}
 	>=sys-apps/dbus-1
 	>=app-accessibility/at-spi2-core-2.34[introspection]
 "
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig
+	test? ( x11-libs/gtk+:3 )
+"
 
 src_prepare() {
 	gnome2_src_prepare
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index c27c7bb427d6..b3caf1b265c8 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,5 @@
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
 DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
-EBUILD pyclipper-1.2.1.ebuild 784 BLAKE2B 5a715ed6e4d4bb14f288ace9aab40b979f641d8312e0f55507435daa0021c42abfd1063842ccd3a8972d7001710038abbe867cbf4dfef249364180cc1562f093 SHA512 33ac5860b47a74be93deedeb60888ce6f8c9134839afe8a6adb8f9fd8473221ffd0fd10106dd7f86eee182fe43c851ea71f293669378dcc484cd90fa0a749fc2
+EBUILD pyclipper-1.2.1.ebuild 807 BLAKE2B 0f9f25ae0280910804565438dce15dc39369b8533da1652524cc5cd04fdb96ff72577ff8cca71917b88281e473713585536e7b2010cc9943c33408f5699dbd12 SHA512 299b9f3c316d2a029d49e39005a8376f99957b9ca6a41eba380882a932493e94d21a92ec7bcdc26aa1052c629a4ec81a403377f72820e62dfe33e3f805e95df1
 EBUILD pyclipper-1.3.0.ebuild 811 BLAKE2B a8d1d0c90a6997525589c5b136776fe4d956382d045dd3823824865e16026e864eabfc63a9fe2db68ef2ae48e7dc916a62d1b6f86c8d614a583cfe6f533be78e SHA512 4bcbad102d89e991cb47c9ea4016225c7a2355c9a2029f9c8e3987f5e40237721af7e669a961a95181b8daab55f93aa7d2547bec4424a31b8dbdae65f08ff0c8
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
index 949db123645f..776f9a4c727b 100644
--- a/dev-python/pyclipper/pyclipper-1.2.1.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
@@ -19,14 +19,12 @@ IUSE=""
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
 "
 
 distutils_enable_tests pytest
 
 src_prepare() {
+	sed -i -e 's:from unittest2:from unittest:' tests/test_pyclipper.py || die
 	distutils-r1_src_prepare
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
 }
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 244b22253480..c04ddeb3df1c 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,3 +1,3 @@
 DIST pydot-1.4.2.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
-EBUILD pydot-1.4.2.ebuild 865 BLAKE2B ca4166cd10c0742d6b9dcddda9efe3a815edcb08d2882a657197a4e7e1845b04d65bc9684b16da0e514e793a574a8a45f7983eaee90dec982b6923047b148577 SHA512 ae173bf0a0139ee258e1bf740165ca12a8f05fe853e7bca016dc974ac3747def350af437b1d1e45c05c7f25374a0ad0859a9e914d6c79db745ca8251955e0bc5
+EBUILD pydot-1.4.2.ebuild 872 BLAKE2B 2c10eb6f0e69e078e74b2165f6e42ac875538196e3553961af4c2dd25898f8280412c27540716d00650de262bb9527a8211ae42ad07fd2e7c8fe120f2d07295e SHA512 5824987b3991cbf3aeebd0d2fd56600d556b261424f998c18f0e50c9c26888e123f57e2fd69b089bfe260cb4475c6764590de00687b042797a053c298371c377
 MISC metadata.xml 371 BLAKE2B 2593c34d4b9be527091b66e955309dbf0212067a131283eb68fdde7d9b46e124eccf9d0b492a777ebae61d65b2ae72ed79f2729b51a2512af05a6b6e42f94588 SHA512 00e92e9c7ecbaf0e53463ba97ea63973786cd9948cdfce8fc3f4fdf5cfa3973b6a6433d5369c1d956085b44675a5abd994b193b66a07c09ec1a5eb2f78aadb1a
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2.ebuild
index 74974f560a28..32771d419cfa 100644
--- a/dev-python/pydot/pydot-1.4.2.ebuild
+++ b/dev-python/pydot/pydot-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7440c2cfdadc..850f99b3782e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,9 +1,4 @@
 AUX pygobject-3.40.1-dynamicimporter-py310.patch 1785 BLAKE2B 5c1779972f3e44a711465bd7b0138f0945118e39d566a7721b71e890756f41d10ea5af1864af40d667b195c5d3658f9cd982b93e18a6784289a5ecb3df2f9678 SHA512 4794c6dd097cd708614ef1e34f0a324bc7b607d66cb05c4025492fd64b7f165c1da10650ff9067f0b9342955643ff6c9519082ec3ff5abc83025b10fe45d9e48
-DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
-DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ffb34f5c847be705953d8498f307661822462ceaa6362d120e96556a50882ed78540fce5cd2e97f0a4fd11232fe01c SHA512 c0c617e5678f942db33bdff6e149e438bd7d5f4e0a4e0a112476515d1face1c6e992457f998a5077a08bdacc1bda24711b29a4312bd3ee825b526d54a7ca3db7
 DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
-EBUILD pygobject-3.38.0.ebuild 1750 BLAKE2B 5e9fb1c304867db80e8abd422d6a2acc73cc04d04e5183d6aa6be9e5dea7a1026d9e5888d389eea628dce8fea026363dfea8325f2d971a33a0861ae3b490f6ef SHA512 aad5d9bbbc022fa21b3491eedd9237bb125387639031c2a9897cbc1d7afa6f6f26d435612a73486e157d56000a1011ea80b215ed5e68753ca432eaa07f1a4b68
-EBUILD pygobject-3.40.0.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
-EBUILD pygobject-3.40.1-r1.ebuild 1825 BLAKE2B 874ebd24bf0d966afcb38a254db85f34d8b2a015d2c5e7defdfabe561af2d01cc36963171bf5f49e4f952987f15c52785086d417caaa139977ecf7f230823abf SHA512 95b9d27a7eeb6428aba7d20bdd4c4bf6d36b06492244a1d41539768ffd3e1a636c9de3817f4939bc2b02b64a6c470de00117a7074cf90f32434823cc5b8a14a7
-EBUILD pygobject-3.40.1.ebuild 1759 BLAKE2B 66a6d8aca77da2fc35a9b0a988eaefac284ddde2377407d6edf04b7342d6b14709157b3dc432f9ed5b80a3e47cdccfd31a63cfea07df0e1c0423fcf2c056ab28 SHA512 d869ac8ca451dcc1355beae9c84147ef42ee56ee60683eb21d23a64d7992842c0880bf4462dcc99b9b2a2199d4201a058bbc112ac7b189cdfb568ab40fddd7e1
+EBUILD pygobject-3.40.1-r1.ebuild 1817 BLAKE2B d8029762266f8a60b3e6aac7293cc554691cad39401f150e020e65c1fc459141aeb0d3cd9183a1769ff1c8ef1b5342b0079dab7b6f4aa4dac8a02c1afafccd15 SHA512 bb999c619c68775b7eb936ea25344ade7c970ef002b75d0a643aa76c84febd1f7766d8a2e41dbc17530501d3cdc3edd3fd296db4fb9d5c080143ff80133e83fd
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.38.0.ebuild b/dev-python/pygobject/pygobject-3.38.0.ebuild
deleted file mode 100644
index 1e9a11a47540..000000000000
--- a/dev-python/pygobject/pygobject-3.38.0.ebuild
+++ /dev/null
@@ -1,76 +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 gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.40.0.ebuild b/dev-python/pygobject/pygobject-3.40.0.ebuild
deleted file mode 100644
index 8e08699fd4ce..000000000000
--- a/dev-python/pygobject/pygobject-3.40.0.ebuild
+++ /dev/null
@@ -1,76 +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 gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild b/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
index 01f7b7055ebd..7f4753cd2fff 100644
--- a/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.40.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.40.1.ebuild b/dev-python/pygobject/pygobject-3.40.1.ebuild
deleted file mode 100644
index a4e9a735cbbd..000000000000
--- a/dev-python/pygobject/pygobject-3.40.1.ebuild
+++ /dev/null
@@ -1,76 +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 gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index b7eeaa656cd7..298ca6712ff8 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
-EBUILD pyjsparser-2.7.1_p20190421.ebuild 743 BLAKE2B d7286845b6a0476d78236181662da34b930b0b61cecab58e0a1a998a4d96cf611f8a44f23b03c505086715c1cc2e959941eccf877c7fdf50f78cd191b7a5f2eb SHA512 4f8f315c46ec5d132737adbb90932103343ed5071cd8a6d2071648888ae28e146359ecc49c585944c42a1898a26cb2b6737ae949424badf419c4a61e6d2a0223
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 762 BLAKE2B 22a787218dcd7929ec3c80534501e5b3a912f83013ea4348b1633b2b3b043fd722e8244b93e9daaf709de49b5c0afbae6c9257653c30586699726f067fedc22d SHA512 e3cf5eb38cffb1f298e6839a888eb27fd3ef71cc991f1768b96cdd9d3aeb4bde8dad6b88f96d6a23fec97cf61a9a8aad5ef9c2178e7c7d965236b6052db09c8e
 MISC metadata.xml 582 BLAKE2B 5abbbf08ca42bed861709c7e8df70074112efb8d5270cd628fa26902f9083a242ad9ab63a6aa1f74824a2eab29738c46a3fb0684182fbfe5d692ff35d0c86570 SHA512 ca17ca99b83926f956af099be27eb359f4b2b9be425e68e95abaab8163667fa744b12734f6b8e5f72a7e3e1f9c3d684e4b1c23e3b954495575ecc934f2528c3e
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index e72231051001..21099184d643 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/PiotrDabkowski/${PN}/archive/${MY_COMMIT}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index 22c228a423a4..0a76f92d7442 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,6 +1,3 @@
-DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd25790e8df006c19205419eabec88b90645d473019951b21952ee67df25261f6eea8c2d58de95e13186ab4bce214 SHA512 3e830065d3201373695c381f45969e7b532d69de8218cb32e107ed72235cd7cff8051e129c6ae4761154ed9d3fca81c530938520d6a54e7bf467cf28ebf9de02
-DIST pymetar-1.2.tar.gz 3163447 BLAKE2B be3e06efa007db46bd90e944ce60d24389f6b8685fcbb66803aca9b46b62cbb23b27e4ef7b2dc47080b6e6c9366acd3ecf13d02ef47ca50705a7631006482002 SHA512 4f19e99f56497b59ca31620a41beb7fd896b4503ed3edd34bafc8e9158895a238cc721e4161c2940abb49b34b1a7cbeb3d97952c4b19361d74a8b3ca56ea2fe7
-EBUILD pymetar-1.1-r1.ebuild 455 BLAKE2B 2635baf43e35bd0f4c4e3948770c6c6504ba33c1b40f6b780ae8347a7148cc2abe9edb0ffc7383311f1ea1a85092ff2804708cb9b7f803c2fc042200d9767992 SHA512 ca7f89c21bacbbb3d5369e572591af533f9503ba0db9bfa68a758ed92ad8a4be35be2439fe83f0a77dd8858dab15695a6c23f529d6d1fcbd352ca320f9095974
-EBUILD pymetar-1.2-r1.ebuild 452 BLAKE2B 145a2019c700825209c9f977faf837e606f23eb0eed418642f17196e9921aec659007c6f7167c55bc331fecc3439c6c5c4ae97dfa478409c54f5e99dde637951 SHA512 7c34ffb667a0c871fb5c93a49ea38c5bc47b5ee6beb66599ca612da76fdb0fd8ae879c9d8dedbda7aab2d7f127994a705fb36628039611edc83456b65f410481
-EBUILD pymetar-1.2.ebuild 450 BLAKE2B 7c102b064c778e8686669e166eea548295a98bf6cfa8fd3418b30fb43ec931f9b7b8b341cddc57eb6c79cfcba88dd767b9bca63a726700ecb724ffd6a9c1a530 SHA512 70d069529dd2463cf29e64fd892e2b44c6bba73d3a11c16a3100b8bcc5f686ac6f4969ad53a7184e269b03654aab4783bf3a428588081ee19b5b45d2d936cf90
+DIST pymetar-1.3.tar.gz 3162924 BLAKE2B 65327935cfcd78b56855fc0dd24cabeff315e75a9262ca586df0ad20e246ff1b7781a806e62e1f51e250761d26afa14f6fb911cc1994047001f9dc20dedccfe6 SHA512 255086913de89915afc0cd9284bd1036ced9a0d02493d3eb8e2e53bcff7f14d7b9d453f3f687fe32103ce6c0587ac604b671f271013e27ea09a5062f7a7a79af
+EBUILD pymetar-1.3.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
 MISC metadata.xml 1146 BLAKE2B dad7f0dd50292e100ae7984401b1d8ef13a04ddf13943fc5a537a7807af0a5cdcba0296c9ee200c690547de3bbc70a56c70d9208bdfc8ce31aa174d19f90040e SHA512 ac50c6e1511ae8370f7b70d56918914b59a06d61c28f3d55943e32609f9c932e27e757bf72cca91106165391f29bda31ebdc20c181ef7e9b18a842e99f03367c
diff --git a/dev-python/pymetar/pymetar-1.1-r1.ebuild b/dev-python/pymetar/pymetar-1.1-r1.ebuild
deleted file mode 100644
index 3c59ec92ebee..000000000000
--- a/dev-python/pymetar/pymetar-1.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/pymetar/pymetar-1.2.ebuild b/dev-python/pymetar/pymetar-1.2.ebuild
deleted file mode 100644
index 04c8e91dd3ee..000000000000
--- a/dev-python/pymetar/pymetar-1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/pymetar/pymetar-1.2-r1.ebuild b/dev-python/pymetar/pymetar-1.3.ebuild
index 59f0836e3ad6..51894f79ee8d 100644
--- a/dev-python/pymetar/pymetar-1.2-r1.ebuild
+++ b/dev-python/pymetar/pymetar-1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software-pymetar.shtml"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
 SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,3 +16,10 @@ IUSE=""
 
 DEPEND=""
 RDEPEND=""
+
+src_install() {
+	dodoc "${S}/README.md"
+	dodoc "${S}/THANKS"
+	doman "${S}/pymetar.1"
+	python_foreach_impl distutils-r1_python_install
+}
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 1aefbbe68eb6..99443628d8f1 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,6 +1,6 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD pyside2-tools-5.15.1-r1.ebuild 1665 BLAKE2B 2e61514e8f85b6f7548fbba19a02e8c5be6ef891b962a5683013d02551c2162cbb7e086f10b037dbf0ffad40717c8061e285327f871fdb557487de122be6e1d5 SHA512 2e017f9cffc7a3ab028ef860462b293c707c37a2040c7593a83a0524e4370b2e8f58ed9d87daf7982ad8b96c945c755499eb6be6a55bde46d2768ae28b7407b8
+EBUILD pyside2-tools-5.15.1-r1.ebuild 1664 BLAKE2B df506bbd3f320d949eaebaeeafd9baf5e92d1b5bd5087a1bdc5dcf938ae46ced2f8ac5bf7831ee527a06229455dfe0d8140f4304e2f2a66683a33583c3b128f9 SHA512 e945c2577d455e12154e10cbb32ffbd27e0305565770f735a7c5a5d6c0c5444698a56ee738f3daf47cb1f890cc5ef0f9e96d5da675ec915fa1b003803ee1a889
 EBUILD pyside2-tools-5.15.2.ebuild 1656 BLAKE2B 68cf0a7a467452a7ffb62d64739d6f83ac878f492b58685c77825ad59bc82a60c385c334a7d6c7bc62e5a7b88ae951c918371e5fc6ebe733fb4f2ce4285e6c61 SHA512 2409aa14f7b05ac02d74c0a57efa94b356179a79888c8db2bdc29212aa5229e631bca576a6f860f9ff05b64ff19d6a94bf34b30398726a93512d9b68e72a3350
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
index 54ec37690e72..f060193b83b6 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 690697d8e34f..2e8eb969744f 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD pyside2-5.15.1.ebuild 8508 BLAKE2B 6e45464a5abcdc4da8f59e2c9cec66ad54257f29786e3e0e22a847003efc7a102078d822252298d8668e30fe110547435dd0a8ab1bf417a630eed4cf4a7ea099 SHA512 b91e768cea21c63659ca0cacee9a6a87eb847ab9f660acbb1856c8afc0d9df41da2d987c6eaf26eca316f1d309fdd4e6ffd09e729c1f46a981963213f43297f4
+EBUILD pyside2-5.15.1.ebuild 8507 BLAKE2B 0bbe7b1019a4bd79d1dc055367b076cb5001bacf5382913f2886a436f3ed272fb59e0335e9b6d6f578f0da168e31f175d3313502748c44aa85f9a50ed6ed0fa0 SHA512 798f62f0fba6183da092ea879beeba2b80bdfc6bcb87f49e1a09a90af96416dcd855126dc39f5c13b2e65ec43c15762edcc172fc9ed0180cee779b4737e9c920
 EBUILD pyside2-5.15.2.ebuild 8509 BLAKE2B 313c974b96c0afbb614a568cfdc73c934e7d779edda10389f2f73af19524aad20f9bb365de79c24a54ab47615786290a64e1b60ab984548da3f1169a68966e0a SHA512 b192190a03b7674b13b76b6b48645615f1cdefba6cb5d7d471253f4e753e4e1f59a844a2e335e1130a6442880304b316b3ca87f0f1d987dfc7ac9c98ae4bfbc4
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild
index f8073c8fb904..faca1fb33155 100644
--- a/dev-python/pyside2/pyside2-5.15.1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 5a3c004a82c7..2b5dc40c4879 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,5 +1,3 @@
-DIST pyspelling-2.7.1.tar.gz 149449 BLAKE2B a5faefac163850d327d64b75776b5f360ad1e1337cb3784c8d0a167e1240e92a202f4ecbe86d768341a7512b36c83981b5fbf4058a2142a5b627f40c0e60c09f SHA512 be0cc9be343e2d5d2c16b2dc9cb6f83fd5f60eba81c709711fef37b880363db8b76e86ec048b57ab270be59803b101696709bd474d4f0267c99f55c906ec7857
 DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
-EBUILD pyspelling-2.7.1.ebuild 1339 BLAKE2B 02000bbde0c75d186febae4b45309228c2c9b6430a19db3b0ce7b3d4c613452276ec0b8e2c64bd2f037e2bb1ed450c11e8a8d810d066f0a41e32a089fce7f7b0 SHA512 0eecb02ded18f6ec79f96726f17cde843160a467a6ac7f665cd266cb7bc663e0c08888fc90e17fd8f29f541d3cd403f265f81972bffe409f2718bc885474f26d
 EBUILD pyspelling-2.7.2.ebuild 1341 BLAKE2B 7de879854980c9690de5459caf5e620d06fb691a2077d2621a187964f7d8ac2201a0398f64b0da0dff9e575f857c9549b04273990957318b46657a7d634db7b9 SHA512 e8c7626558166281791fa12e17d2642fb3a3a6b154d31f265ec0084a64921595ecec32f2fe6b90713d69491537e37b69607afeb86c16b9c2bfe62ec272ddb525
 MISC metadata.xml 1922 BLAKE2B 0c37a511b81e5cbd3c859848c6dc5d6956534534a21a680abe897692e7da6f399d0cf9c0fbfde9e2246cd20fee7c7884f26c4a3362532b6888346bd559cf11b0 SHA512 64ed2646fb3210997ba08dc3a4eb33299d30015d4060d0bc3a24221ca1067aec99c907efa870092b3eafe1d5724524022d74d8f6feafba3013b65f7cdb8b2f9c
diff --git a/dev-python/pyspelling/pyspelling-2.7.1.ebuild b/dev-python/pyspelling/pyspelling-2.7.1.ebuild
deleted file mode 100644
index fd08ac4dbfe5..000000000000
--- a/dev-python/pyspelling/pyspelling-2.7.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Spell checker automation tool"
-HOMEPAGE="https://github.com/facelessuser/pyspelling"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	|| ( app-text/aspell app-text/hunspell )
-
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 7eb75a5a7d85..52c5baf9df53 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
-EBUILD pytest-lazy-fixture-0.6.3.ebuild 505 BLAKE2B 5bb269b6fda705e2a373d6e04ca03700ca0e6ab89d84d71fa4759b33b7f045964a2beaaf207067287a2eee616e9dfa2f7526f6531d924d7e6d872e8f20fa1843 SHA512 bfdac9da24ff37a84473e814ab121ad52d6d9ed4eb584aff88579c480f31adf98ad653b24be8a7d12a883e267180b0f00d51f11c82e4ac2c826db1ea43d0cd6a
-MISC metadata.xml 364 BLAKE2B 2a36168aa5eb5248f9b6ff67fcaeba8cc40edc39db94a100c7825a7ca03fafa427c2cef34a71d7f4bfcced3da83ac2a11b68cf5bb4d3da5207774636ecebe809 SHA512 b400e7214e5740f42b6acbaadda05591bf8d5a2a562e1a19c4ceaf9c050e660fd134e4c6df93d9d5185a40bcc7661d8f91549adf2ee5114f413ed2bbb1469012
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 467 BLAKE2B d060f6c8374d387893f482baa0409b5d55ee590855198ad4a7e620291d5ae91d9153b5cc98fbc72fd6bd20736fea104769d779210e71d8d62c54250f8aba7d81 SHA512 a90acceb888748b965b8eab03908faca3e51cc9db4940e31e8990bad74fc6e81e053f9ab39d92deb33659fffeb82585c0687f30865ea0fc1c196fd0c1be14fd5
+MISC metadata.xml 465 BLAKE2B a194c693bef4c8e58c14a07a4919ed307846fd178974f8e563adfffdee92216163e5f004643cfa53d9f04f61a016ba8a2738e48f021989ad65f6cf3a2e89170c SHA512 63124456f8b943fb46db7fb29f591ac80d328351d11a03849978b5a50f815aed5226e4208774375606bda4ea20080dc0839881d265d5f7fb64c11efbefb51b78
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index 690f07df3712..62b4c71cc853 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-lazy-fixture</remote-id>
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index 59dabe89455d..5b7c8f820706 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
@@ -15,9 +14,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/tox[${PYTHON_USEDEP}]
-"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index fc592dfe143f..9fa5aa79ee20 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
-EBUILD pytest-ordering-0.6.ebuild 852 BLAKE2B 2f5ea8166dcea691c196aec86c79a2eac7ecfc27fa8e470a057938d583c7ada7fe19d1a00f5c16436c9b4969314087895d87da177d87248b6cc8c423732813bd SHA512 d443affd46d59354437174e7e2541eaf4da64fa792fd1bf096694b5224e6796674204ac9f6e3b1fc6aa219b7af143f3766efcc234a9e821944b789ce0ee55ef6
+EBUILD pytest-ordering-0.6.ebuild 864 BLAKE2B 47473934c4210a3079ff87b9e294ca495c7564dec25e92fae1945caba0e9e10c966f8ebd196832d422b4467ec45ace8ec47bdcd2730eaaebafa9ae34e20b0d4e SHA512 59cc51032f00acbefba0d2d2f4fe31dcbfe23633ad130a41b0df15d998c03f9221ee4630d08606c9627cdad3e200e37fbf80a0ad6dc178e4f0c944f79bd87965
 MISC metadata.xml 422 BLAKE2B 428335d7d103e4ad6722a61bd4367ee07370c3a73f628496b73ec9fe11b6e49ac973838c790237ab489c66bb4354d098aa46a456ec96dbeb42fcea0e8a7cff0f SHA512 e3195a89dbe739651d06ed2e996877469d1c39383d2377ae5d56d56d01ed0ce9edc2e1274e3711d00f7a95d3e5ffd23cb2592e462ffb9e535995b32ea14a8fba
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 553f01d42fb2..ee8c2870bb6c 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 05c402532331..215e27dddd1d 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,7 +1,5 @@
 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.0.ebuild 598 BLAKE2B a1096ed122bb81fbe9d789d0fd8346d0935fe595bedd7d0efb354be425bd252cff3061399b2dc6d3f9d98f2a9170d09aacbc01ed1533e6483222bcfa2457098f SHA512 861186112fe5ea6d6c9b6fae638db8f78872ea71dc25b06306a23beae86a971327b225fa558d270665cde074eb345c33c69aa68f8b6dece6ab0f1fe204e50ddb
 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.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild
index ab9103a1e97b..f0adeca6bb51 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 BDEPEND="
 	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
 	test? ( !!dev-python/flaky )
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
deleted file mode 100644
index f0adeca6bb51..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-9.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-BDEPEND="
-	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
-	test? ( !!dev-python/flaky )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 1bf07c91a88e..3d49b41bf371 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.2.1.tar.gz 21303 BLAKE2B 6f4b66b713ca4976eae61bf516bfecf13b8d6f56e03ae772ba9465e7c4c52b8d5ffa713b9441c73538a0b05665da7b7aa53d5f5da1626c6c208edf1c8239b1b1 SHA512 95d70431a7c3fa3b1602e6ad0e72975cecf5f0464e1bbc21d5b4eee6aefee52794c7b1d8dacf0681cc4cbb5ae7910075a7d0b3859647cc55298a2792489c4bfb
-EBUILD pytest-services-2.2.1.ebuild 1192 BLAKE2B 626b9e8326010f7f4c99c075ad80c1c778f0b4c072b95f56313423fb552f9c7139acf65d2a7323b445f30c4a0a20d3f2ec8b709ee125153ff39968800fe8b57f SHA512 19942b36592ad2f626ee315ba0a2edf3a81f29db937d5cf3f7bcff9f0df9295e09b2c016c1b0c60b322b50b668f8e60f916056f8c0ef124ab2b7985fa441cf61
+EBUILD pytest-services-2.2.1.ebuild 1193 BLAKE2B 9c009b8fe2c2fe99688d041dc79bcd533de17feda5595c0f039f392506daf91d6e686164f14baedf7f29982c23bb47ea5fcdebb927ba95dc06261f9ec8d4f478 SHA512 ae5ec4a1a35aa991d6730d2bae2cd21983d06be95dd95904738fc502087dfe2ad9d079055e096f82737e96dfd71a5b5d3f146ea5ce31f7200409b04ba470e417
 MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/pytest-services-2.2.1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
index 0242ab588aae..8916dcea84a6 100644
--- a/dev-python/pytest-services/pytest-services-2.2.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 2ba801e9a000..32ecdd3b35d0 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r1.ebuild 1179 BLAKE2B 4da7c3e77cc02a21419d7051c9707730831fb4a0bb35b86a56bf1232b17671a4b6fc30279340d9c2fb678c211361407f60029b244357d14efc677967921a816c SHA512 64c6ba86ffd5588f50aa4afa8aa41c05804c30797f75a5a2f0bc44a38a43a435c32209a4c40089c47c732ab075c71032b8a3db15421a037a13e7ef812e0f3151
+EBUILD pytest-shutil-1.7.0-r2.ebuild 1179 BLAKE2B 75e06f8b8b53fc6b6f7be0e27b47457bcca74348bfb950c969e5e1d2fadd1e277d69c0276dde85318006498944aaa8a101c56fcd2b895379f44c4e4577b00c4f SHA512 a0e9544a2652c5bfdbceb6e3c3987ae93356ac734c3d6b10db1111031d273e52c106c498cbdadfb7207ce8b88edbf4045dd55569d7a29dd6acd1eaee479c4748
 MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
index cee304ff4f5f..8ee1fa7aea61 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
@@ -18,7 +17,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
 	dev-python/execnet[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -34,11 +32,12 @@ BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests --install setup.py
+distutils_enable_tests --install pytest
 
 python_prepare_all() {
-	# keeps trying to install this in tests
-	sed -i 's:path.py::' setup.py || die
+	# remove unnecessary deps
+	# (contextlib2 is not used in py3)
+	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 4465f878af45..cc453d79ce4b 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST python-Levenshtein-0.12.1.tar.gz 50567 BLAKE2B 795c377a29045caecee245b23138ef5499691177e2d50f1729f3145c667818b34a2c05e86e5fe8317357570347e7b21188fb64a84e85cb9645513e19f1438509 SHA512 e5b9dfda4ebe1f1111e2ac86219be5659a763368759d13393bd32c6c5d78d9b183c757c7e8ff1bd8a2f73450f0a255cc78664f03d899e1e5af2e58d871843722
-EBUILD python-levenshtein-0.12.1.ebuild 654 BLAKE2B 7a4cf340392e131a2c5c5f25f31d1af090d5b5e4af21b572110110ddeced9dd7a4ba6fb6defddccb5f8438cd9382872800eb923555c8c4765d946f79a248ea33 SHA512 c510723ab3e21c8b8e17533c3e399b4438efbec7f976cac171283d85cec6d95c05bee79ddf3e7dcc2cef65934d6ab684f3c3aac6e46ba64cdf46007d64512800
+EBUILD python-levenshtein-0.12.1.ebuild 659 BLAKE2B 6993c1499b4a9fdc3c0d564a81301e00773a577df0482b7137516ec579e07dfe9d5819994932ea9a674df0c43dd66f0003c05593aea27b5b0182f51e57c15abf SHA512 1d82d25474ed66fcab7f9f083ae9efba3b363678f8937229e3480b3d4ff781ef72b56d6ea4b38618676554de3deca9ef8a8e204de03d965804f617efdb8a102c
 MISC metadata.xml 385 BLAKE2B c550a5bf9e27b3e514164ec28c311cfef21144c746e71dbb4ea8554d87cefa97c4a94ead564a557e15bda4f60cde32cfd3cb5140524a711bf57ac72e75103b82 SHA512 4314a89127d81a04635029b87baf8b9d71b931441d6e5ffd01b96fa9cf9fb5b2f1ed5c4ff2ab4f5befab2fb0ccec8890601e98ab2bcca93da548e07bb6ffbe57
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
index 41e500bef28f..87ecd0021062 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-lhafile/Manifest b/dev-python/python-lhafile/Manifest
index 0ea824b9c7a1..5ccde2dbbdd2 100644
--- a/dev-python/python-lhafile/Manifest
+++ b/dev-python/python-lhafile/Manifest
@@ -1,5 +1,3 @@
-DIST python-lhafile-0.2.2.tar.gz 266494 BLAKE2B 03f4f8e58e261b74c32d65c9ea4507d088c5463424c4c279a320553689607e8f4ff13bab0c2e6fc4c252f923a50cae12ce8e4b8c14cb5d8eec2fd8129fa41a97 SHA512 304de9a000b76fae243f0a175040e16515524ccec051cffefd20dcf6995a37e3d4d2e13016794166a661b235700f540f8cc0be60979ed13ad6308056a95f1b2f
 DIST python-lhafile-0.3.0.tar.gz 267965 BLAKE2B 1331f21059f84f5e517339ac26546d73bc9dc125578840bf24483c274b651d8f0e2494b1b7e140bede07412b5c44e499269ea23dd1180bb955b1044b06d82ee8 SHA512 bb4db2767a702d30f2e713e5f7890d619de312d609761ade2ff8f4e99ffede8e35a72cd116abf3b8ea29b0885ebe2c993dc37f44722c8e5fe346be93dfdbbf81
-EBUILD python-lhafile-0.2.2.ebuild 473 BLAKE2B cecb678df236edba6d33efee3ae8144b9a32e8428856d2740ae6777e3b31894f1734a0b84f600c3c8eb1079de6680bfbfcc1c0f4bf1e5adf423d0b26c8bb68a6 SHA512 762cb68f11d129904392927b121d817aede8cb425da96c44e421bd1fd6253a12a098c730076a04a0afd3b13d4dbf90c08275678727a407103b15f265fd3b035d
-EBUILD python-lhafile-0.3.0.ebuild 480 BLAKE2B 355ff1a5b27211cdac771f4c7422a0bcb05787b5dce52b0d81a7db53d31b733fa0384573247e514a9017feba3296500edf0ca9c6c8765ed385c99b46555e6022 SHA512 7089408c1a886f3ab6b8cace815ae5681ce6b9e8126432859c39479b2bd15cd4feb278039a3d0990b10d90c2cb058afee48beea43267bf787962d13acf8622e2
+EBUILD python-lhafile-0.3.0.ebuild 489 BLAKE2B 0c3a2e2651d4b6ad3dac1e97d798650d7ff4ee9771b618735067f71a4bf7bc20ed4716acfaeadb86b6101b1b737f8f7bc1d4a0d5f8225e3c9c9f5cb559454bcc SHA512 08407ec660de26f4beb235273651ceb97873a3a3677f125de1b0d27faf38bceabf66c99d3cbb320e6f6e40a47c34060861da23ed844e21978222a1e28332a57d
 MISC metadata.xml 384 BLAKE2B 75a9c852faaf98efd379481d1ca0e4d9d819da1b1f276caffcd9d8ebf24fcd2e471c001f68a6f834a4c26a447a68df8f59fc5a2e500891ee763e60859dec5010 SHA512 d1f6874eefd9bc35327b7b0286a7e3637c451bad9a1fdc135cc5ee9d7cc90e1a994b32624eda59ef6632bad1950cfaa538af1a950324dea0a03f7d409a925143
diff --git a/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild b/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
deleted file mode 100644
index 4b9af2248c9b..000000000000
--- a/dev-python/python-lhafile/python-lhafile-0.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="LHA archive support for Python"
-HOMEPAGE="https://fengestad.no/python-lhafile/"
-SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# NOTE: The tests don't work, they're probably outdated.
diff --git a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
index 532279f61ebd..1e871b03c263 100644
--- a/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
+++ b/dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
@@ -14,5 +14,4 @@ SRC_URI="https://github.com/FrodeSolheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-
-# NOTE: The tests don't work, they're probably outdated.
+RESTRICT="test" # The tests don't work, they're probably outdated.
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index dcbc9cb1723f..8b1846b7ae7c 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4-r1.ebuild 943 BLAKE2B e296d5681b0d08734b49d9bcd030606df114557e19bb9175c6116f1fbe8ef1a306dada7bfbabf08688b1b6d7c76470fc9f035f19ae8a7f8cd40e33490d3861fd SHA512 4ec28baf47ab4242534be583d3f6a9f2d2aa0dde65b799da1e0174b7853295f27180b237219159fae74ad4021e7cf13ee76dcf8efc6de6cea5e8500f93081904
+EBUILD pyu2f-0.1.4-r1.ebuild 902 BLAKE2B df29fffac4cbda3866ea9ca319cc794bfb19dc5e06d1d124aa4370a9a0ffd5ab8b6dd9eace90a6b1642f9de67ef15b74f564cd3389facb55f27cdddead488424 SHA512 599b7a8a053f9a07e428fa8f26cd0b56f6aa5f6cc61a704078d2e3d08eac1fc5068a80494779c15a049fdd1fa62c531306f86856bcfeaf0eba20deb519bd4f69
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
index 5c2de55fbadb..3361d4f9f406 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
@@ -26,7 +26,6 @@ BDEPEND="
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 912d0b8ec163..3da964ef1f5a 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,5 @@
 DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287
+DIST pyusb-1.2.0.tar.gz 75557 BLAKE2B 3a2d066d4069a8662c981ab1f01237d7c0bc18be82afb96a79cf861b04e2e389c5d5f6be96bf54337ef0b2ad8043d047554caed83987328d4e453a3748d13bc6 SHA512 3aa6314bd06467cf22fe299d414ffbdea773c8784dccfe53e7d54d238285bc389ba35317a993b38d2b2027c71a990edcf17016a060b8e627fe97e9cfcc99ce7d
 EBUILD pyusb-1.1.1.ebuild 685 BLAKE2B aa089665e9e419582529ac05ec110843b081a8250fc789843a2aa5e63cc44e8434299dde0db61aba578d26cd9767bd1faa232d0a189643d0920535a31d171030 SHA512 d617a404d667a5506726a440cc251072374ef56ea5e3e33a710e4f5e8b1d8099d0bd68a946249862700ef589d1fc10f112295926a75b6dad3c5c425eb3200597
+EBUILD pyusb-1.2.0.ebuild 653 BLAKE2B 9f78d406a03a9bca19d4267d9d443d3d83fafa5bbc66d600ae854a95f5f1df7bdc7c0c791de13569e2e2944a7293eb01269b82686715be7d24edcf3e6cffa4d1 SHA512 cd76b832a07c19ee02fb7bc30688cf73c9c3150ebeb1beb60331eb990b14897167c51fcec25ffdec73e65c6859d1c65e8687e695cfdf39638503c11885262012
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.2.0.ebuild b/dev-python/pyusb/pyusb-1.2.0.ebuild
new file mode 100644
index 000000000000..24e01cf2f163
--- /dev/null
+++ b/dev-python/pyusb/pyusb-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="USB support for Python"
+HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+### This version is compatible with both 0.X and 1.X versions of libusb
+DEPEND="virtual/libusb:="
+RDEPEND="${DEPEND}"
+
+DOCS=( README.rst docs/tutorial.rst )
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 215ef395fdb3..91611d9fa7ef 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,7 +1,3 @@
-DIST pyzotero-1.4.22.tar.gz 521386 BLAKE2B 3f5cc943aa108b771675955fcf7acaea62bbed360f7b9a4de4127d086c0c11679090df1e02820c0c937057cb77923c7d48ff95b06d92a6494d2db3b70fa65a27 SHA512 c9438474c30405d54194315ee007ae53527963460621c0e74b8286baa98f324601fbc99d342183ae643919890b70f08cc0ae431836b03e3d9028e62302ec63f8
-DIST pyzotero-1.4.23.tar.gz 521386 BLAKE2B 4d66adc8c66c21c5ec3a21d7c0b2316bb9d983f3e31efdb11cb8840a8f94415b6e7e792d5870a33530fe877215855f7b2bc244fa05987cff0edf48ea850be54c SHA512 383809cf7a5ab950871c47101397e3a073f53d41f723acbcbe91d5c62d56c0618a70433a5ae3332d25195d4bce207c57b7f26b7c4c851621282b994f1afbf4b3
 DIST pyzotero-1.4.24.tar.gz 521403 BLAKE2B 225c881f85be6b04d54975b40d4254588214ee84974103dfe2cd64db01f586e93379e21ca537f1356c798125e149b15b326832abe172f029e8841d879650df84 SHA512 f2a1ac00c331efbfe32e00d8281d36cdf8112f68a5c3851cb34625090bfe8dec81d1afec86e4af9ae477df6855eb42ced75e942b18589564f9d04351117f0d05
-EBUILD pyzotero-1.4.22.ebuild 970 BLAKE2B 7062fa58ce4bbfa46ddb81b79976869b6e7a7480fc4bf631e92e13a1f9798340902fdd088d55453e5dcf0d5298c3f23fc0c0af5469d71ac3b6ccc0772de62e82 SHA512 ba10003617ebae621c6f53341da81271c0ec142bb810398b39cbded180763beb0c5bf4800b2478191157b0533e6d88d6cce82cb08eb4e9554154435029a7edaa
-EBUILD pyzotero-1.4.23.ebuild 975 BLAKE2B 5d90886cb42b8e09c05740f07500945c9495730a31df5f403efd5929c172aadc8640305052660e8851234b066cd47939152f606e096d431999b982f70070bb10 SHA512 ebeb21bd45223874a00112208a224489bb75766f7ab3510aa502365df141e4b1b1c68325e77c8e29d65f420bee213519491c77ce7bd8806fdd14611a65c1fec2
-EBUILD pyzotero-1.4.24.ebuild 975 BLAKE2B e6f2e31629a76a03180e413574a6381a315b8940f33775e791bc9425cfaf5b77eab2e1eca597f2b552eb51620ce38badae4f1e5d2631bf268b682dcff1e6f28f SHA512 30b95ac9540650f8cfc86f4ca112535ff5570ba7ccf57521c0e40c0c9b0841f4d51a05a1c093201dab4f5fa6e843be5bdcaee6810381aeba7860e2586882a30b
+EBUILD pyzotero-1.4.24-r1.ebuild 936 BLAKE2B 229a4a5cec0ca6224da052f1a8998e821f4bae0c573241383c5e07fc5394aa85607808d353f8699d035efe72556a8d927583eba4e0aba75fc18623e2aa46be28 SHA512 b0d771afa946fa858d89e2e55c2f68c8179cfd598bc87dc871387029bb2bc4dc22e47642d0e846ddb449b78023062449ebb99300747831b0f8d9f5b266b64279
 MISC metadata.xml 511 BLAKE2B 363254beff5da581cc2abe491330e1eff22d98aacb6f6c9de9146a185dea24e2958c1559428bb2cd4c7102a5cfd3eb639522c71bff823d03874ca8b4e213aefd SHA512 6f5187dabb878bbf49ab113a31692b0a9b11b517f6e8391da487775444d4fa19b281085f35928ee04c2bcfede4b2f78a15a7ef8860b97df1f8a0cc3208a46750
diff --git a/dev-python/pyzotero/pyzotero-1.4.22.ebuild b/dev-python/pyzotero/pyzotero-1.4.22.ebuild
deleted file mode 100644
index 9bea3eeaca08..000000000000
--- a/dev-python/pyzotero/pyzotero-1.4.22.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	dev-python/pathlib2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/httpretty[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# do not install tests
-	sed -i "s/find_packages(),/find_packages(exclude=('test*')),/g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyzotero/pyzotero-1.4.23.ebuild b/dev-python/pyzotero/pyzotero-1.4.23.ebuild
deleted file mode 100644
index 4fd1f87128e5..000000000000
--- a/dev-python/pyzotero/pyzotero-1.4.23.ebuild
+++ /dev/null
@@ -1,41 +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 Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	dev-python/pathlib2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# do not install tests
-	sed -i "s/find_packages(),/find_packages(exclude=('test*')),/g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyzotero/pyzotero-1.4.24.ebuild b/dev-python/pyzotero/pyzotero-1.4.24-r1.ebuild
index 1ca9deced71e..81f1a3291db9 100644
--- a/dev-python/pyzotero/pyzotero-1.4.24.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.4.24-r1.ebuild
@@ -19,7 +19,6 @@ RDEPEND="
 	app-text/zotero-bin
 	dev-python/bibtexparser[${PYTHON_USEDEP}]
 	<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	dev-python/pathlib2[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 1bd88aa223a1..2f5b333c6fad 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,5 +1,5 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
 DIST qstylizer-0.2.0.tar.gz 20710 BLAKE2B 1d751efd74e36e665823b64cfd51760bea489ac3916b7ab206d9c9f1fe9adbc0df2dfd9666a79e20c805dabcaa6f3cf4d11074943e0a54b7a6aa93a815c796cf SHA512 094d9c9c14d2000c2c2f2b428cd82a57424507c6df83aa21af3ab7b90e9006761ed131262a2e70a1c4aa4dcea87ac6d07f9137bc224967139467b3f4796ab158
 EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
-EBUILD qstylizer-0.2.0.ebuild 1538 BLAKE2B b2b08d138a8d1821be7591a0cf436e75bd897fd2a888854b833bf269dfab6e02cacb62272412c62fd8d798058a0d7b6f244173e8e21bc0fd42006f9cc3f9c7f1 SHA512 ced9484dbdb65acc9ed8425cefa268bc8e5e0ec3bb805c0d9a249cafbd492ff8d8c439b26393a76a8ee20025a7d8c770943a37172adbc355337a6f26fb63aa2e
+EBUILD qstylizer-0.2.0.ebuild 1538 BLAKE2B 665a15cce089ecb2f79a9bfff29d55007fd4caaa82babef57c915695d557a5e40483d64233697f85cc70205fa6b20fd45fa40df31670e1c1941dba57b492c6ca SHA512 ddda558e5299d7c21ef33b2c4117b1f50bab2552c4640c6a211ef433443c70d64e18fbd779e6ba7047936fd1ad5251e31190c5d379e8ac5a70ef6e36d83e9435
 MISC metadata.xml 354 BLAKE2B ea116209c46e48581be418ec1035f3459b375c4fb4623a2af488f98dbde6ddec42eb65f11844477ebe4573366bcb66558c58bc25c50eead585ca70060c0d1195 SHA512 38ac9ffbc6a2ea404f70afd4f0fc3aa8663832116a6182cb05f48736c9f44c4b9211e77c93053e24b1310f0b621784f90ed8261982abba7c6121332593ded18d
diff --git a/dev-python/qstylizer/qstylizer-0.2.0.ebuild b/dev-python/qstylizer/qstylizer-0.2.0.ebuild
index 36269b58c272..13bb8dcfaf50 100644
--- a/dev-python/qstylizer/qstylizer-0.2.0.ebuild
+++ b/dev-python/qstylizer/qstylizer-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 77afa1269efa..e56360d21934 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,5 +1,4 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r1.ebuild 1036 BLAKE2B 63271bc77a2b97af77519efc7a1ed4e57ddcf99b6709f00906b5601ead93f2e07183ea311b107d882973afe9e30744e43ff7ad90f605833859d69430ff6e7eab SHA512 016824daf78e077ad3cd4ac011e2b71e7c4bb58acc3ae8a50cc0049a2448919ed45b1f1c159ebae65473f5b17b39d1e6d48b21479c8731086c2c7843cfdd9f61
-EBUILD raet-0.6.8-r2.ebuild 983 BLAKE2B 11d40206877bb71538cc2602687a25e9d761e50d8924dad64133affd4794d76de09fcfbd3fd9e56333f41bf65de23f8958242d2b4191fb9d1c3b3e4e6f3e7929 SHA512 f5538b3fefc01de2aed617bb192195bd0b53d08bd55dfd1dc2102783e05036cbd62714cdc4221103964cfcb69b49d955ef1219aeef68e1e4b63ac47ef02e33c0
+EBUILD raet-0.6.8-r2.ebuild 942 BLAKE2B ca89b2ea0f37d2608e37afa6a893bab336b566973683ea0fad8e4a0cd4ce5a33721af845119b4e16e5b262b31a8a5e51c9a73b491e1897a39ef969d60ea38229 SHA512 ba3460bf49627f306fb394e9ab388906a5707d4e15091b6002ccc849a626e9b738644826f76d8bc713b3868c2795580d2eb2d956127fe479383f3d3fa38221b0
 MISC metadata.xml 474 BLAKE2B 8b186f4c18696c3df8e3d6b29f5d45d3c040156a473edb5066fa79f449642e4f1a3274974bbfc02733cf9ae3bc04b22c06cb8ef80b9962d14b4ee26dedc329d9 SHA512 33760bd0996fbe1d95e4f4ed658eb4a6c221b4c8911842db2e0f443d317c9c079ecb5a8e8f5cfea1c47531a944c6d79b4f4bd29775ddef6cb6c6008c4f359e15
diff --git a/dev-python/raet/raet-0.6.8-r1.ebuild b/dev-python/raet/raet-0.6.8-r1.ebuild
deleted file mode 100644
index aecc0c927c17..000000000000
--- a/dev-python/raet/raet-0.6.8-r1.ebuild
+++ /dev/null
@@ -1,41 +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="Reliable Asynchronous Event Transport Protocol"
-HOMEPAGE="https://github.com/RaetProtocol/raet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/ioflo-2.0[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# This is from https://github.com/RaetProtocol/raet/pull/14/
-	#${FILESDIR}/raet-0.6.8-msgpack-1.0.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "/setuptools_git/d" setup.py || die
-}
-
-python_test() {
-	pushd "${BUILD_DIR}"/lib || die
-	${EPYTHON} ${PN}/test/__init__.py || die "tests failed for ${EPYTHON}"
-	popd || die
-}
diff --git a/dev-python/raet/raet-0.6.8-r2.ebuild b/dev-python/raet/raet-0.6.8-r2.ebuild
index bd9f9feb3a4e..e6a8e72b2ee8 100644
--- a/dev-python/raet/raet-0.6.8-r2.ebuild
+++ b/dev-python/raet/raet-0.6.8-r2.ebuild
@@ -21,7 +21,6 @@ RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 BDEPEND="${RDEPEND}
 	test? (
 		>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index d8c5ddf4482f..d08929420a92 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,7 @@
 DIST regex-2021.4.4.tar.gz 693187 BLAKE2B a13a51a883599f726c20cdbf28d5b0f1a53d8f2eec5f4047da0ede2951694507c5065de5a84152510874db087c342d52f19d920a7b72c034325ddc91f5fb75ac SHA512 2eff9867639f16ad7894997f399262d653a9ef0bb4e8d40bd977e5c55625cf57b4bb593f84504009a0b3cd50b3876d1938c71fd733c0ad1a076de32b6b4b33b9
 DIST regex-2021.7.1.tar.gz 693459 BLAKE2B 484259e14af99d911a20835be73686fea621e501756b02e760128b60a52eb62719efaa0b788ca57026dbdc3dfd55aa321a0feb8e73f6b7435f8711cf465ec2f6 SHA512 7b28e24a829b8ac8f43fdfadf012e833c715b9743d1c9a7cd34eea2789ec54df23d651c8a15aabe8c5d69662402f6302cfdeb23287c49d91b4e9fb3b9452ef73
+DIST regex-2021.7.6.tar.gz 693843 BLAKE2B 9acbca300632ff45744d509e47de56625b003b2046c068f3bf5cae3987bc9bbd51e5cdc442c3e72c6c9c0daeeacd658c56b56754c0f9e83c03816237cc311000 SHA512 0849caaafc669b6dc322dcd4d48962cefbe955c19f9ee3d657b7b8389f77ab2b2e27ec341745dff01a60dd3930904d69015a334ff748de10be2d0b7c421b0967
 EBUILD regex-2021.4.4.ebuild 727 BLAKE2B 8c568d7a6ec94ed2af98176ab5a5fec05f890781b04bf182ddd1a38a7a48e39df0d03873bef012af54a54cbed8648c24cab6206b17ed4356faadc1b8c0720db8 SHA512 965a6e5bfe52cc24b8696ab65e7bd6b499ce1321dd5356ba25653b11f23313ed62616f2e34c2ad037e200a48241399f8809958f5031ed2aa07a09c5c1f638a27
 EBUILD regex-2021.7.1.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
+EBUILD regex-2021.7.6.ebuild 734 BLAKE2B 1010613ac705325563111fe6c89aee0a60b71ed283fa5c64ec5d4e28c2b27539b2d80fd47439a716ad9e400b0dc91c1e3613a921519026f63ab8d0c1f7de711e SHA512 b42991f21d156a5b9cd01268460fa3e7fec12b06cee038bdce6eb9b8bf6bc53d94b708414015c8b5dd3bd63c696d833b50558fe017e45da89bbc6d55063ce2fe
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2021.7.6.ebuild b/dev-python/regex/regex-2021.7.6.ebuild
new file mode 100644
index 000000000000..271faa2b4fed
--- /dev/null
+++ b/dev-python/regex/regex-2021.7.6.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/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 488a3b04787f..2cdd4f808309 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,3 +1,3 @@
 DIST repoze-lru-0.7-r1.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
-EBUILD repoze-lru-0.7-r1.ebuild 717 BLAKE2B 2b417d5682de975e2ec0e8244daf333ae6c0de55278041d9e5465725a29bca85a712f251095fcfb057daf5c4f455d73a668760fa54fe915e062c1d1c7e2f907c SHA512 068f02072ff987f9168a019e93261a1941f112be9094b4b5e7d1df3cb7fc8fcd0e657e502d6e0571b835a3d0fd8a04baf211f53aef985ed03b98b26191eb009c
+EBUILD repoze-lru-0.7-r1.ebuild 686 BLAKE2B 34af3531268bfe0ae8256734fa13463b09bb4e63a1bb25c0f8f45e278c67f7c04f62e6efa29f1ce615cca13a9a872505ba36b64aacb9c10d45bd7d3fa189e94b SHA512 6677c75c06fc4c660f9e559e1c74145cc633c889c01e8337aa3d3427f88313553c11af5339316f2e0c5cc1d661ba09a18b74d5f4cae296bea1016f1bb5ca78b2
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
index 9300bf8f0145..6ae8a1e6b5d1 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 8367a4b558ed..82b6bfb3c083 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.12.0-r1.ebuild 813 BLAKE2B ef06da51557c0735da67f9cc0b0ec86ebcf67401eca0bfa6f6f1e508edaa66a57af3d5def1e380b8ca75841a96772801a7309b612b9580afd27abbc014edf237 SHA512 9e79694513d9eb3e8f2d5410bfccd7517f26d73cbe77e0fed9ea44c72419e38c582b3ba405f0da3a65cf8c8e9a960654b7e035788f8a360c7ca80ef029aeb1d5
+EBUILD requests-kerberos-0.12.0-r1.ebuild 812 BLAKE2B 9e368b3945f7353ab20f6b5a4e0decc61aa192eb341563a57a0f5e6f1ecc36eef75d48a3ab8ec698a2a52c2f5d4cbe298bd98c93e20ca36b4d7a53c4dbdd02ec SHA512 dc29f7d917a43815482f173d5a5eeda373542faae56734fb2f4dcb9584d61214b0ea1166a89ea66446514869c0835d9c3a1b33d3876dfcce478974ff946bf356
 MISC metadata.xml 386 BLAKE2B 6eee29cfd3bc3387cf97222bd167b60be9c45f8d0dc417c428241660c8151f74d284423f7a7c324d652f99f677c86b34e48fe1a627cdae52af349f37e7a77aa8 SHA512 885e86f315747187bff26ee29b88892a93712250923b5ec94a7baa1e30cc4e28cced1d93e055eb4a0bea15362fe9047d133747812393cd83ee327b9092a95127
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index 9fee5e2978af..c20f5da1dc42 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 5ebf5b6f243c..33db500e7536 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,3 +1,3 @@
 DIST requests-mock-1.9.3.tar.gz 67988 BLAKE2B 8ab651adbde9e18370641655589f5d209d2a9ae07d82108c64e4269757217cf01588066ebc3005852cf48527f911d3fb76cedce3e88bc74123db81725b4b5865 SHA512 bcded541d78670a1b1fc87f97d35286ab4bafd6946beb9d9b44886454c26a4d8c05834add18914f3f72b1d3c0534311efd1cc80e711b5085eb63053ae24cbb6f
-EBUILD requests-mock-1.9.3.ebuild 1280 BLAKE2B 7390ce03d66e4e6dfabee8dc5a4409694d017aa83d58d4745b622389259c337df8231fc12f1302f421ee4fc98e67170d769fa43b178f162053aef3ed37f9bbfd SHA512 4c16c132ecff2ec652a61c84840315ef10c53b514c2d557af311c8193bcdbc6da7eb425ca44f01293d4d9735942fa1eb20d1b577b961936eb428002af8d7eeab
+EBUILD requests-mock-1.9.3.ebuild 1277 BLAKE2B 1bfd12436b9d49a47ba5f94f5d9d526d271dfdc0eacbbb1dd4e9bff249110406b899b48f7fb9f872bf5a35a514226e5e60fc6cd0eb3840104d57aec981a2ae16 SHA512 26fef01935bbcf7a848c049c2d42b13dbc15763aaebd419fe7963cec8637f63fced167023f03a8b788b8b70774449c855437b6384984d3f2d9fd69bec3432873
 MISC metadata.xml 478 BLAKE2B 73ae7388ccece263501b7b1b4b1953e2528cfa2287460aae4f9d4758dbb9a41ec38d6a00c45f74e87e4625243660ba530f85e37328ade1b88dbda55a20ea739d SHA512 5efc54aa7f3fda2909ddb82975cb6bd554ad90924075a22ecba41e50e4af8a70722ec9f69c7a588ba2cd01cf937d887a11f747bb0787f20976567423feaa5867
diff --git a/dev-python/requests-mock/requests-mock-1.9.3.ebuild b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
index db7c8a5091b8..ecf8e6aa4b5d 100644
--- a/dev-python/requests-mock/requests-mock-1.9.3.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+EAPI=8
 
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Mock out responses from the requests package"
@@ -13,7 +12,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}]
@@ -30,7 +29,7 @@ BDEPEND="
 "
 
 distutils_enable_sphinx doc/source
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Disable reno which only works inside a git repository
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index 3ae66107045b..c1a8c6d1fb81 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -5,5 +5,5 @@ DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd21
 EBUILD resolvelib-0.5.4.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
-EBUILD resolvelib-0.7.1.ebuild 574 BLAKE2B 2b179bdcdcfe5ecd75eb21bd2874dd39a4f7b99571ef8841049d6b73b72acd528383055340170b6372b9e2aef1932fd10b3078de0644a827dcc35e84c270dcb7 SHA512 ed59942aa892f60476c9270743fa436effc33260f6d20d78ff9e02e9047f449e278584cd9f7b13150b846b91aa8e687bd8360386a3cd600490848161c5805238
+EBUILD resolvelib-0.7.1.ebuild 593 BLAKE2B 206bd7dd4d41822052a7a252b9d3b5f586f2ee4266b9b9bdbda895bea2e9ebb965fc85456fb63cb6dce7c70dc56d829ce22c45e7956adb63babe016809b5b6a3 SHA512 2a925e88f6aa99b6112497f5dc10d0b4d94772ccb8c21a5507efb398f2177140b03fe048eeb7d5a55bb2cff0a1245837e14d391cce6441a963c611e0f6eceb25
 MISC metadata.xml 853 BLAKE2B 6b194c20227de800cc062248107ee5b0726199789af9837807523b335b1e9a63e850270060fb4d306996a4113ab2975102e285bcf52f8dd4177f71038bf65e2f SHA512 a86ffe23f2067369d2794f3cf013fb3e3d4a685273397f6f221f67e251939c17147a8cd30aec92cbcc40fc38e770755ca53507c42f8b84da66a96ad46e24e90a
diff --git a/dev-python/resolvelib/resolvelib-0.7.1.ebuild b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
index c9746c36a67b..ff9b580980e0 100644
--- a/dev-python/resolvelib/resolvelib-0.7.1.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 971a4339179b..9b7b5275f6b6 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-10.3.0.tar.gz 16237609 BLAKE2B ddac8f2ed7b3b39e647179cd03cf59994729d7d82bdfad6670284a692871b79f2f6ceb86fae0d47d76401f756c122ebcb5978d241d4a95b4f3d6c54de67132a1 SHA512 91886b19c91052a7fe24fb9ae8c98a59f882e6c387036420f17a4867f581e71839b990541fcedf7831d361a9cb535f05c13e45bf5505a4d1fcdc0d0f8e8b39c8
 DIST rich-10.4.0.tar.gz 16240850 BLAKE2B 76874e3efd9a8d696ba96579e1c658b1c76e71d353574cf3f9fb5d8a15810879f649d0ebfcbd1d72d9d496ce438cc08099b5d0416b932875704be2d0b4b28d0a SHA512 ecf6234ac862c1e04ab71c39763857d770c20200f5e1903a7d8e90fc1a67b5702a9eb0c67454ca48fb786a7631f60401f0a3299e82d864eca8c7afefedf21e26
+DIST rich-10.5.0.tar.gz 16242786 BLAKE2B d4d612555f9dca24b5150f5502d95bede784d7e6481e15948614de15a914d0cb3c83b64148a02db4ce8693feb1604c3729006fc0ca347eb10313aedcb795feca SHA512 c0471c0f35d3d9e5b5baf5798911073de02820a5bb5dcf42324bef2153a49a3019db44bc96b95247defe3be65f18097fc266a30bdeab153d9dda0ae38d34a79b
 EBUILD rich-10.3.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
 EBUILD rich-10.4.0.ebuild 823 BLAKE2B 120174e85e952b8c8d177d9da9e66b29067bc76085a4cb33e6883f64254020f46b1cc69a1a1d658905cd840cf7a5dcc357a2818fdd684cfc52c35c56a74300dd SHA512 dbf3d8030491acb2fd93f41b122362d14d93f917863609c0f08fd08eb96a5218433ff4c37a1afd3a6bd906fe496fae49cba7764e963f1feb6783ccb84b36b39e
+EBUILD rich-10.5.0.ebuild 735 BLAKE2B 2c23538ece26718559c8d0de5d8dfa8dc285efbfe4ac03e2f96b86e693f576fabd0213c57abe42068a2d0c4caf07d4b5df08d63b7eb8c3b500dce2884c352ad6 SHA512 46a0261d511fae0adb555234657eb80c2382528a86e8a7ce06fbcbd83dd682fe4d0855ae2e31e135bbaf4b6caac65a77754397d9ba5ef7c69430157b8ebea895
 MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/rich-10.5.0.ebuild b/dev-python/rich/rich-10.5.0.ebuild
new file mode 100644
index 000000000000..6d4831ee5fd9
--- /dev/null
+++ b/dev-python/rich/rich-10.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index cbc882e506a0..00e23b476a47 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
-EBUILD routes-2.5.1.ebuild 1464 BLAKE2B fa8b3335bb5ab81a722ac3348fe6c6759c01225f2f41e714a1c197bcc5af849a705ac82ba61e3f6caf74d328774082f98aa9aee24802ab3faf2714a8c05cca6a SHA512 c1e6aaf7cb3851466cc019848b718498d16a18d5ebb911afcf8625f65de0ca42c3bb40b65f9280406bc99e7145bdd9411ab33c0e6981eecaa47b567f0e3f402d
+EBUILD routes-2.5.1.ebuild 817 BLAKE2B 30db54839777e4628fe46e0560e188905305af674f6fef42b824b75bc63944ad1e16f69b32fb8ab4ff37d6e1af5bc99d0ff252b4d51d3310c371533b4257ece8 SHA512 d2995b03cc1593f6c688c0ae2ef159095fcacdf2f53f039867178fba93654439c389d77c113da5bba9bc8cdbdafe5f6649bbb774e0ab9ecfbbefc2f5fca5a8cd
 MISC metadata.xml 333 BLAKE2B 894039eb9f3eb4315a4dffd10e6e3cbebc93fd00aefcc75fb416b3f6f7c903523b2948bac6dd7670c98c6993ad3ffabe6687180199c4dc7c7613c89b3c2990c0 SHA512 55e3e96b801df914092aa8dce25bfe06894fede931263ade1643a8ea762cb720c4d9da14980dd03ad1eefc838c78757a3b768942b0baa664fb7fc6efe30fb8a4
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
index 98c48ad54fa4..37cc32289ed2 100644
--- a/dev-python/routes/routes-2.5.1.ebuild
+++ b/dev-python/routes/routes-2.5.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 MY_PN="Routes"
@@ -18,7 +17,6 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
 
 RDEPEND="
 	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
@@ -32,23 +30,3 @@ BDEPEND="
 	)"
 
 distutils_enable_tests nose
-distutils_enable_sphinx docs
-
-# The testsuite appears to be held back by the author
-
-# https://github.com/bbangert/routes/issues/42 presents a patch
-# for the faulty docbuild converted to sed stmnts
-python_prepare_all() {
-	# The default theme in sphinx switched to classic from shpinx-1.3.1
-	if has_version ">=dev-python/sphinx-1.3.1"; then
-		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
-			-i docs/conf.py || die
-	else
-		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
-			-i docs/conf.py || die
-	fi
-	sed -e "s:changes:changes\n   todo:" \
-		-i docs/index.rst || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 78fa2da4a471..f5a82024fd1b 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,6 +1,8 @@
 AUX ruamel-yaml-clib-0.2.2-python3_10.patch 1223 BLAKE2B 6d221d4ef7aab6d8f9a367fd877abe459243159d5e199fa287fa3a526d8888512ac16611cb377f50ba53fd8811a1d7193a0216ac37bb5bbcc16145e979f7b9a5 SHA512 0817dd4c459067b4545276e8cfd9e8e1ecd73bac5d9b3fd822501c80a41ecc766f0440a7b518b7554ee6cab82586920b19dc1c340f8136a0e8cf5724d5e53846
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
 DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2bdb9a6e5b15144b808c3065f3a003f12ce99c4b97d4b5056235a78295ed7a3237a325c8dd2cac036da3ac54c8aef2d7949 SHA512 f9d986175c241db4417a1d71e47a6eeff6f059ff204ea25a5b4ed365f732ae6872000c53f0ad1336d3ce80383e056df42f2ad9a6a05b92932332289c5129abf6
+DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 657 BLAKE2B 58b1721a76de3ab26136eb97971efb21d657f7e8c65501e9af64e3cdad4b7572caf7f87ad83267a6c7542d168b113f411da4e5242b07ae1205fb8462d10cb7e9 SHA512 1262d96f46b03a8b693a0e9d7fbb5b6949744cb592b01962b6f579838b487166e60945380f289ab380e3f9f11ce2fd85c025688169b5735dcb6eea496f74f2a3
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
new file mode 100644
index 000000000000..ccfa6dccc704
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 7653c8b9214d..e5126d166154 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST sentry-sdk-1.1.0.tar.gz 215946 BLAKE2B 486f32430a03d42c73814195ef16ec4efc71512faca197d8020fad7b3d1e7350ec619ef453075bc4fc4e0e454f3aa6eda41ec29b88af19d75b5f6a10273db325 SHA512 500d0d3add4bf8e74f2e34d6c00491f4bbd45a2226cc0ee93ca0f63f5ae5aea61be6730f845d50e10909c9ede6918ec6cfb90e5ebe80b753dd634ac9a9238061
+DIST sentry-sdk-1.2.0.tar.gz 218371 BLAKE2B dcba23b246d4620f93b82a07a9fa9c73ae8b67d54e9a690fc53c1b08580433b2d37a50f29a47e01c7cdcc29eef45cc0b67e96f1e9b333496002ceea5ce7388a9 SHA512 86705fab17331bf5cbe4dbb25562d80b5b080d2bee0a9bb2c153bb379e63ada10465bd5fdfa24d71fc50cc1d80d5afd3e569a779f2a11bde671cc6782ddca347
 EBUILD sentry-sdk-1.1.0.ebuild 2235 BLAKE2B ad0f7d0491f5ae9e64fdd6fff4f80b2e4970ae631e1a24b0ff150f89561d243b84dd0850cfd94dd8cf6f4a9b8e0bff615c1d61dd2a2c38d51c8f629b553f219f SHA512 b46de1ff55068ba6dff4885dafb1e0826d102fb6db2036b9bf4afed5a1acd4bc4ad29bf9c53787b0f9c7b002977a2716e5912babde6c97f89c9de5859e8f05db
+EBUILD sentry-sdk-1.2.0.ebuild 2348 BLAKE2B 3da27b983c50cda97e229946a537d2b44adb4acb3a508f1652788d45c6425f8a85df7ad1638a8572af316a5cfe33ccbe4542bf44526080e0a6b824b697492797 SHA512 bdb8d55494c9ebd309a1b1f4e729d92bb312ab24f66d5337dc7ffa4f23008749880a988adc3244f83b176412c4f179b1006b20e2159427863e81204207cedfc4
 MISC metadata.xml 509 BLAKE2B 5b68b368764625061ea2eadc0161570e46760904015f6e1e3e97a7a4dacd3604a18b2cbfb665e816981a40f95ec9c4f0c4a0447ecc968cbdf1fd21dcd4149193 SHA512 c42a1f7972313d3369ba392347b0efa700ee9c9b01d3275b3973b8137cf00fca693288a1af57c355b2d87525d9fcb7a320ad571fe8be5531472a8710f9b287d1
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild
new file mode 100644
index 000000000000..1d3e482c7e75
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 15be32d1df65..e4414d238bd7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,5 @@
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
+DIST setuptools-57.1.0.tar.gz 2144012 BLAKE2B 148eb7b5e432461f692faeb3fd4eaafb99bb9fcd2c430cbde40fb16b365ed011ce49966a8923337a860b63cdc6d8f3a26efdd138cf4c40c99e72f7d714fce57c SHA512 dfcf75584b3d7ae07e0f58ce8f596d7e9cbe3a0c178411053b066fb4362226bcf6467a79aed0853acd0b9f6a3371c47ddb07d77cbd780fe9782b8c19bce2e5fb
 EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
+EBUILD setuptools-57.1.0.ebuild 2328 BLAKE2B 87a70ef14e6c01d7d28c69eb6bee16a57ee6d228bf002d2614fc67a8e4a7479ac21fcc2234869bada3ed4224f3a22ce2a45bcd3625ddc122f60ddf96ce28e92f SHA512 a1fb816d0e6fe413f6f96129821625a7b8556cdb59ca3d84509e9cf1792e599e7567ac22f62b815dca978644bba1fda0ad10d991cd7bbb113b94b6b7aa1a9e44
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.1.0.ebuild b/dev-python/setuptools/setuptools-57.1.0.ebuild
new file mode 100644
index 000000000000..df9cd63bcbe1
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.1.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{7..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{7..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index b6eba4a05d54..ef4227ee8285 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.1.ebuild 6589 BLAKE2B f38b94bba343e9586e52e2035b6187c8e65d67823e9b0a00c38f37054358feedfe44c0443605f403ba331175052cafd5278d6f5760943791faad8134230116a0 SHA512 1e841df36730fcfc8413fac983980ca027f79059702bd28a4faa4678e2875a12a91c6ccea6a262ecfe6c431e6b32f29e6940eb3f8ba15e0ff0838b8f9e2f8891
+EBUILD shiboken2-5.15.1.ebuild 6588 BLAKE2B e62c3cbf2d3c7050012de985c7cac72cd379ee7551f5c2317bb6218a038ca5581477b4267ce5e81b22b2b9637c329db9605f6c23e3b33c72a2f3775ca1599504 SHA512 24fa578ba0163f72ab58f335b11649de6fdddc327581f8f7941d05945335a080f644640fb80aefe1bbccf7a6ba5d948161b62dfa04c803b2bb80b313f4efa45c
 EBUILD shiboken2-5.15.2.ebuild 6437 BLAKE2B 0e6d4b56332293168a6b55701fcd3aaf21326cd1de5c06a985616ee9ff5e57744e0279d7c89801171fd9694c59bf9452499599b0a1cef05d1ebefd6a846d7732 SHA512 79e49f5668a8c272155ff2b2584a0000d17114dc03f562f4283d271534234abddc0356324587c3e5e42da44d3e0c2078ba6dfd28a32a54fee2a1f7bc98629a8d
 MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
index d4a9c6996bca..7acae0aa868b 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index db43ba14e9f8..3d432bd3c3c0 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.1.1.tar.gz 1441692 BLAKE2B 89a350be3e8c87cb76ec4222f0ab753213f324bc4573bee82bc4d014e8984d9d47a6f384793f618d090620a9efa2cfb906070a7d99312a29cac715ec98d97f15 SHA512 94e413c3af4dcac9cbd1eef368f4e88c0b3bfe1ad8b97f4a6ec39af1a448fdf1d79f3c845cf8c9b0ed78b04f2a18d176d750a39d13a47f9122e575d034ed88b4
+DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02 SHA512 35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873
 EBUILD sip-4.19.25-r1.ebuild 2274 BLAKE2B 6c6b9eda1e03e05a1e92da561a4ab208ebf80b9b546c8bfa0e1a68830d8e6889a1fcd5dfef10c2d184aa8dae55c14b46f1bf281bf5ba87ce80f256f12be6174b SHA512 8fa6edfef0535f920e2fbdc08db3c705d27abdbef4442f72ff7ce796de967190cd7aff0bbc710f3bbf9c481aa984ea44afa7fd6a4131405266dc07200277f3a7
 EBUILD sip-4.19.25.ebuild 2266 BLAKE2B 0c407d5662f9b4a52c6609f26f2af147c9f545408d85f4b0ff3607858057f5c8d8e2fdf9b43638037289b1dc7378c77667894b046a37e62d2268e7af635b5ef9 SHA512 ed0d96b98948b38564c61e95d25546306891652fcc2cacfb47fa9d6e535595a4146a82458943cbbc5ed02f58283ebc9ef338c39bd806e3e79114a3e34633bf51
 EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
-EBUILD sip-6.1.1.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
+EBUILD sip-6.2.0_pre2106291255.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
 MISC metadata.xml 638 BLAKE2B fc7e45529b0822365db27d281febae466f128ddf88223eea8fd2dedc2c4107e0a91a2784bdac69e7ecda930a76e25c5ad80cf3c6d8ef326737cc47e12a571ec3 SHA512 a603d5a00a8315fcf19b860a45660c76c3f4b47199983d2a0ac73ef1d1617afc7c56f67e2ff1c60bfe3fe644aad57ddf47e55ea2fc400fd9851c3a010fcb4cee
diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
index a541809c48fe..e9cccc902285 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.2.0_pre2106291255.ebuild
@@ -1,9 +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_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 28f93ecbd49a..a2e970495c7e 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
-EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1071 BLAKE2B 232e4fc5172631566c439f9e5e05c7517794d57b93706a82a3cd51a83347f6358d51f7ad5cda6617b09f89b9b436b2f7dd0176ffdf340a972bbc677f58c78021 SHA512 ed6ac9f0b68f26eec2c409b8e1f85937a5ff9c30b7e23f421c7923312e6da76fbbcfd1f02f99281d1fc7d473b75a36159fc8678d62438cc38f7f0d99c4a444d9
+EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1083 BLAKE2B ae3d4fcd96626edf0107bbe80dc995afb4fb0ba1a4e8c1b2f26fdc646924b938a83e5d1edb8e1f1eef5d127dacc17c790b3db0e361e210de73e5197c784a35ca SHA512 5e9e7e7b641d7c08f2714ebc492494ea3c54275a92e5108b819a95f2fdd05e68584830176e958ebf4525e5d40be3ef10d641e60d8791c58d154a16c34eae1f5d
 MISC metadata.xml 701 BLAKE2B d1c41250ae7a9f233e1e208443b764522071d4d0ce3274b28ca95135c01b780d38faa88c8bba7ab7874584b420dc81c8b43e629718fd085d461bdcf755bb9e79 SHA512 952f4e2a940fe23acd47a9e0f101c6d78c6939fb9ad69920a9cf9770b44ba3dad7e65e708ca0ad54fac5ef871a18a737e9ed200a678210e93740eb065be81a0d
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index 6aac93cbf715..484ce1b9f755 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 13d4309b844b..a3930da8bbfe 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -2,6 +2,8 @@ AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe8
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
 DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
+DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
 EBUILD sphinx-4.0.2.ebuild 4294 BLAKE2B 192a601e803f47438f757baf4f0b981a19802c46c6f0299ac3990ebd5eedbcd8ad37ed6b378df3b03fda92b92db6d2d955f917c7c52bc7b4184a7dc988ef8e82 SHA512 ae00b4d6e7455fa035fcf5a5a67fe9fb9e7d0a72c8b1b5bcda75152378e855213181c294f773f1bb7b974ef3adc29dc85a3aba92af3f025e4edf9075e7038cf1
+EBUILD sphinx-4.0.3.ebuild 4301 BLAKE2B 96935c2160318d1cf0319b2a7d6d0a07922c2648a22ad7299d25a23cedf2eb48e2bdc7ee2002a852eb5e073b26a8ac07ea23e874da8110313cdccbab66863bd1 SHA512 d45a38d1d526c9f5b99fe5a37eab96178d449cfb9fd5ec6a5149768db007e97ca492876670232ea0ef8c57559aa275e77b833213d266eef4882dd92037eff9f3
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-4.0.3.ebuild b/dev-python/sphinx/sphinx-4.0.3.ebuild
new file mode 100644
index 000000000000..343eaaf18187
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.0.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_7)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+	"${FILESDIR}/${PN}-4.0.2-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index f1695561db79..e17ea5470f16 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
-EBUILD sphinxcontrib-programoutput-0.17.ebuild 817 BLAKE2B 9dfbec11e83045884e6862d2f0bc9f31962fffdf8bebf3965e59c176a7b6d3ef736904269c0829e869aa147be37da25fc03fd28c684f69742b0ea8961e51b247 SHA512 8c23c1480257ce2790c674c6bd7066fddaeac0f9c386885f7970d3f35285f6bada862ef6e89e7730892b0a8ebd73bdf406d3d05237c4e914f8a90952252a275b
+EBUILD sphinxcontrib-programoutput-0.17.ebuild 829 BLAKE2B efa2da2d4d1d4962dffa247635d71e899074d0fc4b01faf945e85f8e13ecc46ecea2ce9aae9b450e00275d43de15bee3999868aa1423721acf6e2dee813497be SHA512 9ca9a31cfd15698090e64bd828c51fe4849b3eab228dd13c7b5ebe0d4f784f129d36824a3995115b8ff180b3b0a36aa89df02a875ed3b639ca0e9592b25ea103
 MISC metadata.xml 1356 BLAKE2B 26ce7a37f737618f8788ee73f94f25cdbf5063044ac9014235f907932184168912a75c4c9f08cdace99522b2d8f157bbce8da79c7e3a55953d4692716c738849 SHA512 1f950132a2e93fe93bebcec0146fd343548b2ceb2f4d2cb99ac4e4afe428282e81b87ebdec77ae8191d51f35385ada447939a9d92f0b8e3c36af1b4fab0cedd2
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index 798cc4319b00..ce96b561f62b 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index 85f4d23cf9c7..05cdc51dd8a8 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 994 BLAKE2B ee66aa5670da27b77ce7924dc59f9d28db58b6e8a579aca18ee738804a7abd547f00743733c07f2269ded748b899ee03a8072b3853c29f1b9cd5bdfe6e1050a5 SHA512 7968d02e4c7064528fc4a7b62eac4c70d769403f088229e7872f5fa5d323dba7c402c34b2862ffe9f3bc8262eabae0e27ce9efd8b3eb9752967d0fa9193e6f4e
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 950 BLAKE2B 12fd6f2af4ad378480b6c5786bf893943a7c74f7ee9ee3e99cb8f8a1dc97c2e3d6bdce09bf140246169541ffd4cc1cd414a7721f8b1426161c8fb9272835c113 SHA512 8bfd94913e08b27ba89453c512d99f8a594a649cd10a5bf5c8ce251af7aad35a1ec028c0a9d1c1dc0795a81def3414a3a49d750da07e832a05ef6f2adb9ef66c
 MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 384fc0ddd4c3..e7d283d6943a 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.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="Make Sphinx better at documenting Python functions and methods"
@@ -23,7 +22,6 @@ RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/contextlib2[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 )"
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index da9c3d47fcd2..8cbcdd44f7ab 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,3 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1.ebuild 1386 BLAKE2B 998057e12baa9c3451edd31be2c8819bab204090fb25616041a226f0cb1fdf76c0e188f1c1487f7bc4feeccb379c3cffebc68dc10e1bf2eb2f2baee78527d436 SHA512 358c4c640e1afa0635f6a0b4547f157eb85f73e0bae575d7dbd1b8b4015c1d023b0dfd80137a53d43448ecb0544ac8fbc7d58667b2120e1e40603b7d9e69b9a8
+EBUILD sphobjinv-2.1.ebuild 1398 BLAKE2B a42a4d56ec678c22d404118492a53dafa79671d4c78cd8f978bd4fbc14a6bb806c7a8eabdd887dda6a91817e9c224f8e3ba91a1abe42d6534597fbaf340b7522 SHA512 2bc31e30789b9b8bd7e8bee5dfb3f098f734a46d3e4293707c1830dd185c5ec73cffe2974d89660e475feeace21a5b00b3d92ad7d0b55a42cf3df46423d80f7e
 MISC metadata.xml 893 BLAKE2B cf258281d276e039b3eef66ea4612b3b8df3578265939084d02f9743c5aba3a5b27cadcb406f8dab157d9c0b52bea1ed23a71b989ffd20c236d7cb93aa8c52d2 SHA512 87bf6bb4eff58e18e351fd0512c89cca99bb72dfca01dc33b892656a6ef283d3545072bb47a0f1034f27781df1647f3d046440392fd040481b687f75f589d44e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index 678a76fbef07..b081b5f16e9e 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 2010e04fd40a..a5423d730eeb 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
+DIST spyder-kernels-2.0.5-gh.tar.gz 81123 BLAKE2B 390c3c5d8ceee787f6699dd41ecc9e015050db86d0e416e32be28ebe0a62b09c611707ac6427e8cc809303f41a77b7d9289f15d71d0b2a8ce17ff87af79ea5ad SHA512 b44702a0964bde69a9035839e3ca052a4ccc60340de83ccb9f1b0e6b93b73da5554e10b5eb61b8965416130d8f658f1a18fb1164c59cd27134298c16d3442dbe
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
-EBUILD spyder-kernels-2.0.4.ebuild 1469 BLAKE2B f865f1bf5562695201d6c0d94053ec5dd308de044c085e2de6084224cd3f3c4327c6dbe3bbe3ed7f2cfe5a0cbc6d7ba9494913e813fca4561dc59ac29f3fabb8 SHA512 25536520288ad3e2e17a42b1b6b5c815c3ebd03ce113671fff457c44721c8a3cf1a76cbce5e06c0c2f5d517e76905b9dbad4fc31a4950b5a2022d35824db65f0
+EBUILD spyder-kernels-2.0.5.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.5.ebuild
index 6e20169fd3b2..6e20169fd3b2 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.0.4.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.0.5.ebuild
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 0a2b0a49237b..3adf7bac25ce 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,4 @@
+DIST spyder-notebook-0.3.2-spyder-5.patch 38116 BLAKE2B 2f311e179d1e0cbdf458773eb0e8d71f1f7cb9dbeca9f01b3dd12120f12177b2bb84ac6e09d7a17a9b26d667523bd28027f80102ff90889d6c781f7b530f8c95 SHA512 e57bc9d9b85622a64d151931d5b96a0c8d448075535ea9e91dfde5326c5192b3cd2d96c9fc88fef95237d4ec833e47238ddc3a3d12de25b4a8dcbda65c92e57f
 DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
-EBUILD spyder-notebook-0.3.2.ebuild 1228 BLAKE2B 364fcc006db8d5bd53ba15a80e832f6e1171322fb94e613c150f42fc7af6592b8cabbf992648c748a48418f25a674fef36d0a52f30fd98eafd853eaa6c57fee1 SHA512 27642d8542400ad94a7f437bb046aba85dbb446eb4b0dab767e6ea9bd1298ba77e80d4115861acf7b3fb534f14815896f0a98ce526b52e818dc6f8b76c251d53
+EBUILD spyder-notebook-0.3.2-r1.ebuild 1292 BLAKE2B 6dbb8cc563c0ebaffa690d47939ff7143b609b67ea3da32caa53cae4cd1b1909d41330e9934a244fff27c0ca4e1cf32b4a87d09e4bd9576a9e23fc624757bba5 SHA512 72938777bf6120052beeb36ba24f4beab7cfe8a207eb02bb9b9f9baf7d4967198e84f23d07bdc34e16c4517026835bbb7e08d0985f8da4bc9c138f5f557ea95f
 MISC metadata.xml 360 BLAKE2B 0c9d7f85523a02c6a4c867c2a4ae0c706d69f9bf7ffde077c28c97d9b12348ff797101cb784e702b4b6d910823efe5f0d426fdc4c7952efa02ae79c2cbf3041c SHA512 679dbf9cc9d01046262a7371dc9b523349583a6f8e2586f5ea06c1e91332f6aee004109c62d255a9d8ee61be40706097427cd1027c4a63487ad87609de9e3fae
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.2.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild
index de8761f5d3a7..8a3c6f0edf6c 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.2.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.2-r1.ebuild
@@ -9,7 +9,8 @@ inherit distutils-r1 virtualx
 
 DESCRIPTION="Jupyter notebook integration with Spyder"
 HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~andrewammerlaan/${P}-spyder-5.patch"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,8 +25,7 @@ RDEPEND="
 	dev-python/qdarkstyle[${PYTHON_USEDEP}]
 	dev-python/QtPy[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-4.1.0[${PYTHON_USEDEP}]
-	<dev-python/spyder-5[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 
@@ -37,6 +37,10 @@ BDEPEND="test? (
 
 DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
 
+PATCHES=(
+	"${DISTDIR}/${P}-spyder-5.patch"
+)
+
 # Tests do not work inside virtx/emerge for some reason, core dumped
 RESTRICT="test"
 distutils_enable_tests pytest
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index dd78f2ff41f1..c45a060c1281 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-terminal-0.5.0.tar.gz 10070777 BLAKE2B 2b556597b62e822a94102c393818c9b479292f1e9b61fb70a48f9627bc5ccd493eeb5624406cbb205970a2b1613bb47310d92a969cf190dee296e34daafb7c2e SHA512 8a73a46adbd628a80a8a7c8f9f50c8ed4a00c64adbb6f0934a32840397f9a5840f516380728abe1e31b659415e82bd38d1a5418bae43229b61e4e6340fc8c19b
-EBUILD spyder-terminal-0.5.0.ebuild 601 BLAKE2B 2075d0a23fbec1e74fa089ee902115e7f92d407321562cec87cf5b8520f8c9b3895e6427317b0a36d19e34cd71fb408b88ef3da1d8a0f5a79b185a87e220ec81 SHA512 804e0871a44ce6994e103da52f2c3cdd277ed266fb83c3b32e5ee20d18e7567d5131702ee08c1f820b58f72623b515cfd423c57d530b1814e06dc83aa9748116
+DIST spyder-terminal-1.0.0.tar.gz 10098665 BLAKE2B a81e4cd2b1194cd750aff7d5a4d2c587ab60264b89e6e4264352b5f8ba850b66f278245fffed176dc36c2d5912e6f676ba2701d0a09bb384810230f631534059 SHA512 aa426e037dce6c2c7010fbf924ace27fa5dce9f736cd3b6b55d8ba3935e02ba4f6dab8815930c8686525c6e74f4119f781afaf9432f22f5436abec2c5a14c570
+EBUILD spyder-terminal-1.0.0.ebuild 601 BLAKE2B bdb5bed1476fa329c256ab323a6304a09929770d2a18c6f9ec632d1785d8a9420f3f9bcfe210c6416a5575ce2c5aa37dce768be980ffd9ea150f7e0d54c5510e SHA512 1cfa003e0889d617d0157fc9a2ca024d521ca0c88cd6a3ca91847cdb9c06a9b1cf321b152a749406437eb9049f61cbe80524636aad09463dbf5343e6c473dd23
 MISC metadata.xml 360 BLAKE2B 76b0535377eaf46594ae7a7dd1fabd1d5c3a53e476e2068c66b7b50773f21e7fe1bf609b12e03763e276131d5f426aa95df7d483d993b0cdabb683fe884a2db7 SHA512 87e065d435f8fcff1c0da0e69c50904e5ce13980ae5463cec66013acdff144b5274289347bb9fa16c519cd4345a22062289b74537a5aaafc5606ac4614cdefa5
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild
index 60fa73fad683..4150c3b690f6 100644
--- a/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/coloredlogs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/spyder-5.0.5[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.10.0[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index ba34593adf70..8d73060f3812 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
-EBUILD spyder-unittest-0.4.1.ebuild 1087 BLAKE2B 115193cb8c05517fe0cea34a539c566af576fab8eeba8e09fa60c42976392a8bbca4b275f4679287ac8a0401cbc14ef308477884c0b8cf0a762c7d6c6dbdbc22 SHA512 3d1e2dc0ad19de63ecabc27759c1409cd79c89079aab2bcf01a496adc3e82904c1a8ea596913fe0136b5e80d4d5ce36810b773e61693677e94b49416697e63a1
+EBUILD spyder-unittest-0.4.1.ebuild 1131 BLAKE2B 74a73101befd576e43470861ab715864173ce23a413f0142389c031314b990659fbc42f917aeaf71d05cc2f4d4144915779e306161240a2aed75a72d25cdb7ed SHA512 9a9685721c56c33b0db0fc9a556bb10b46685aebb90d21d8050f7bd0232b6c74785ffd7aa1c67b4d70d1699128015bdcd3a55ac0031c3c2b242034198a76ffc5
 MISC metadata.xml 360 BLAKE2B 8157712dad4e0e35bb988afacd2c0d4a6b1e5cdfe16c64958d7aafbab827e87bcd8cbf4e7de4c04328311d3a80b609fa53123e92c53562bab77fb95c23bfdcba SHA512 522539af150d97c3ee19cb04b110584777ac903cee791a635078f4b14a1c215f43d6327f7e0e3345e217e4501676f0d91e2276ff0b824fb95ab38e73db659fe5
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
index b7c4d7427f18..ca9b9487f598 100644
--- a/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
-	<dev-python/spyder-5.0.0[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
@@ -29,6 +28,9 @@ DEPEND="test? (
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
 )"
 
+# Tests fail with spyder-5, however the plugin does load and is usable
+RESTRICT="test"
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 9a931b5e4afa..a4ccd744d898 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.3.0.ebuild 511 BLAKE2B 47b82a5de8cbaa2dc8e3c7490e05fab00bc09a96a828fef19ed0bffca471ff65ffd02d4e28f49d165d1c82734c1b41e348875ab4cf59ffc73ed9c874c3e68f19 SHA512 b2d3de39249addce7c64e58a3e4d967e752efbeadde94af78698e88f150f6b09853080ac3dbfed3bb1a39a8cab47e79525064649610ba29105393aa590e5c126
+EBUILD statsd-3.3.0.ebuild 510 BLAKE2B 33691fa546f94f42ca6640cd1eb9fc4ec539ecececb28b456fb51ab1b9f8a717fc8db74d8c29bb2749716118f05d2e6ce7f31a6d7f837d179bd705939cd0bcc9 SHA512 51d38f29728d673aac17c4fd0c645d6861848a97dacfe04c911cf55147a3737ebb8bf2f84f7ca6e6951d46f7cdc1261fe078b3577d80f3ddd4aa2f2cba5c945c
 MISC metadata.xml 498 BLAKE2B 5b04a0ca7dbdadb6dcabca0314db852b0bd1bc5a9034af6d0ce278be50e6ae64f089f3735cf58b34446e03c7a3ece7af7d9526ef61c7d730b3a95b5670239dbe SHA512 6c083a1ff7255ab9f40c56358411f9bbcdffc52df95b928f518927e632fc4d892aaba03340b3fe9e0c7b7913d375f2d3fb3ddb2485f5f7a42c2dde23397c77cf
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index d21c127fa961..32f619417936 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P: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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index 6c7b9d595818..41a9b509f513 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-EBUILD stdio-mgr-1.0.1.ebuild 782 BLAKE2B b4e3c23d8e427c549fddddecfee2bb76561ef237be093a63bb58e04c18837d0da21ea0a7eadf3cd32e0ffe9ae510b2bcd6d1f05e5e5e4f036672de3432bdf57a SHA512 0d5fc93b2cefda85289810e90c874689dcbe74f16e085031eec60a69859296f314f6e7c6b3ce770ccd6412e8a334001a44b7c4f0a1e1365ec28cf5813de52094
+EBUILD stdio-mgr-1.0.1.ebuild 794 BLAKE2B f5a39704c235188eb74417d9963eacac7531142725735c71d7393d77815c66bf564e43d5906b8814dbedab7fbc39edcc21b694158b0ddfbece1f17d6c21b315f SHA512 10d0257a0b8085c28070818d7c3c4dc8a4ddd8c474cfac8b4a0014c32851e34f1771192a54a02d65aeedcd21f04098ac042e6d761759612d135d132ffc680ac9
 MISC metadata.xml 938 BLAKE2B 63b86f805c3eb74bd92a09792c04f91083198595c38def2fa795bc66d37af74b6017c801adcb17ad0cf65b7fa5a9a5271ebfdf1bbe295b465ef94d8b11535b7b SHA512 9850613726ea4ce8f6bff5785e2531479bcf1754999273b647f77d6774cffd79925193d37793b55702271364339a128b906bc4b9e49bec98dec5bfdb60f78759
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index 182d8813b39f..019d1863b719 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~sparc"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 25cf490a3e2d..55223005e1de 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.4.0.ebuild 2473 BLAKE2B 5e0d27c7b6bb4ba263b27f85118a42e2aeb3e3b6a0a50f775dfb51b96ee87d9e99225b40546182205cb2fcb8b4c51e62a28cc55359f392b818d14c0c7b90ba05 SHA512 246d6a042d0e056765dfd12785f7c443d3c59474be16b6f4a819dd1ed90af88652482cb5e1a60b57debb90588316a84731286c45bfb1c63b98df6f0101892a9f
+EBUILD subunit-1.4.0.ebuild 2582 BLAKE2B c9b7618e182ed1259979e8d00b74637b9defc0ee565039e56f7b78ee61cf9c1059f140f0487c6e7e7199e63fa488e21438a1e22cfa4da02582195b98a46bd383 SHA512 47d61c6885a804955a4792e68841863abe959f0e0f959e15aa8539e5ce9762eae3f1f64fd824decc19fcded16dc181adfed6b80f6cae4f7ce06f2fe84d48118f
 MISC metadata.xml 474 BLAKE2B c6e5e74bfae996deae0adce7fbdd4262c55c67389b62e549cccca2d42a464bed2dd9d711585ca391cd30ef1f76da30beafa5a8d54ad8f79b539106265757c039 SHA512 d2041aecf3846526bdad951d31ca5d9014efb7cc711f5cb974cbaee3f87e9c705ff8ac6bf02433685d19a57ad7930ee1a25267fffe8db54341e0ca8812fc7008
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index ad4beecffb57..284468711361 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
 
 inherit distutils-r1 multilib-minimal autotools
 
@@ -48,6 +48,10 @@ src_prepare() {
 	sed -i -e 's:test_add_tag:_&:' \
 		python/subunit/tests/test_subunit_tags.py || die
 
+	# eliminate unittest2
+	sed -i -e 's:unittest2 as ::' \
+		python/subunit/tests/test_test_protocol.py || die
+
 	distutils-r1_src_prepare
 	eautoreconf
 	multilib_copy_sources
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index e46d30e328b3..90c801598ef1 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,3 +1,3 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1.ebuild 940 BLAKE2B 2d4dfe1b923c90cdbd8a21384133146e4da96f55b803b165ce408b61d155b7b594d72ab472a365feadb26cdc5b2e0a6a2861066de9139821169925d6c881c696 SHA512 6088597a8076767b30e1009497676186d63045b522208bcf00b5dd484cb70eeeb196f3f07f151e622d8c9315d8f8c6061d04c1cfd5a7531af2bf8045baa2350e
+EBUILD testresources-2.0.1.ebuild 815 BLAKE2B 229e7637852ab5df133a73efd60e58c8b6cb8136190639c49a59dd25bb1cef2ba45a9971c191c40fc263fd940f510ed38194dd18be0f2a77f6dd4d4f1bde7451 SHA512 b8a6a918e55877af514f9974fa95331d3656e289f86d3d98df35866bcf67ec3f47760afcecbe1767e6d26beeb5714ce6869bf4ddc9e657563fa812a7db3a8b5e
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 20aab49f4082..fac3d7bddf58 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pyunit extension for managing expensive test resources"
@@ -14,24 +13,19 @@ 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 		dev-python/fixtures[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests nose
+
 python_prepare_all() {
 	sed \
 		-e 's:testBasicSortTests:_&:g' \
 		-i testresources/tests/test_optimising_test_suite.py || die
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index d41ce33ce819..18ffb4fb20dc 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 892 BLAKE2B 9eb043bc1edc3617188620402d0879a30763debd905d5e577d61e60307d04e0274b6eedb95b6db4c543e7de9c11bde03bae9a7339f54d8c4bc33eabb3a7ca5b6 SHA512 644e95ada65d555e0680d576738c3b80ae990f3362793ccb6813d788febfffdf53799d2abb74adfc76952255e42e97cde96f7cc609808fb2fa81b89ce89812bf
+EBUILD testscenarios-0.5.0-r1.ebuild 766 BLAKE2B 04a783d073a792e96873c1647c96fbdb855e2e6b38f518b3001fb51e47b09f193a78a425d06847179c86fc68ae11f5772bf8c58f56db0472da5bdcc02180ec3b SHA512 54fec6c8cc7278fd40df580365014085450af76cc4015567a56f67b22d47171e07465369e65dce67b6adc94513b44c4b334260fb88b5b88362a99245a0965be3
 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 ef33bdf56770..48131c36af92 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A pyunit extension for dependency injection"
@@ -14,20 +13,16 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/testtools[${PYTHON_USEDEP}]"
 
 # using pytest for tests since unittest loader fails with py3.5+
-DEPEND="
+BDEPEND="
 	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	# Remove a faulty file from tests, missing a required attribute
-	rm ${PN}/tests/test_testcase.py || die
-	distutils-r1_python_prepare_all
+python_test() {
+	epytest --deselect testscenarios/tests/test_testcase.py
 }
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 91032077a23f..fd3c3b3c45e0 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,6 @@
+AUX testtools-2.4.0-assertitemsequal.patch 869 BLAKE2B b7fe42aa06c20c0c281d275530b64480d69b0d4b569c9d785edffa66d8d47422777fbd98aeb49e1ab96a4126672750d0b639812db3fff1c39370d8fb20f390ca SHA512 4481ab0fd5d0c3d15b1a8e50166d5d9a850126b1aca9b945f29d0ca4504e2f31528985d251058049973dec63f5dbca217963cb0047d14f447620b85a188545e1
+AUX testtools-2.4.0-py310.patch 1325 BLAKE2B 3b7f3b370d2ce5b98e2a80ca438eaba4a224bcbde0c5f4307baaa5faf1b35f8dddf77b5fca8b45c6870910fbb784ab064c0178f8d77d7cd644c44ca94f2bd62b SHA512 bc96d58c2dd1744a7381d1418a000f213ce2c9253d54ed63fb11e686d05d684edb9e2873f0b15b7b99d5ae3deb1d435e4512ece1d1bad96947cc6654a7e6ad13
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.4.0-r1.ebuild 1258 BLAKE2B 77283b33088785e30ae29db540d5ff1d82f3d69f8988558471eff5b2997e7d7c9f6cc92ce1d5ce2f3588ec939d77a191e07177c74a99191ebdb3302c380cb954 SHA512 12cec53f1fd22cf6ea44738f3237b5904960ef6afc1b290261efb4725c51041c55de1f98848dcab705de2a642a0636dacd988a1a5f6ea319bc5db77e2b1c8c3d
+EBUILD testtools-2.4.0-r2.ebuild 1714 BLAKE2B 605564e5cc81276e89709b78fc7c84ee6df8575b25ca7ed539b344fa6db5e8bda8443c35870087db10512d91e3303460fc6e84ac76ad472a3c8d77b24cacfb5c SHA512 ac5d3f78bc3c6909c1e719fbeaaabb5c89955c5680aa5311b73e1cae56ad20b9da3fe90085bbaf632bf77b841d91cb2bd3493f2e0262cce240ffcee76a3bd80d
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch b/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch
new file mode 100644
index 000000000000..e46bf29c8bfc
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.4.0-assertitemsequal.patch
@@ -0,0 +1,27 @@
+From 2ead7c11a54b0860e02992212e302c4a7bd26c35 Mon Sep 17 00:00:00 2001
+From: Matthew Treinish <mtreinish@kortar.org>
+Date: Wed, 8 Jul 2020 14:22:24 -0400
+Subject: [PATCH] Update testtools/testcase.py
+
+Co-authored-by: Thomas Grainger <tagrain@gmail.com>
+---
+ testtools/testcase.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+Rebased for 2.4.0 by Michał Górny (eliminating intermediate commits).
+
+diff --git a/testtools/testcase.py b/testtools/testcase.py
+index bff5be2..22e9143 100644
+--- a/testtools/testcase.py
++++ b/testtools/testcase.py
+@@ -501,6 +501,7 @@ class TestCase(unittest.TestCase):
+         if mismatch_error is not None:
+             raise mismatch_error
+ 
++    assertItemsEqual = unittest.TestCase.assertCountEqual
+     def addDetailUniqueName(self, name, content_object):
+         """Add a detail to the test, but ensure it's name is unique.
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/testtools/files/testtools-2.4.0-py310.patch b/dev-python/testtools/files/testtools-2.4.0-py310.patch
new file mode 100644
index 000000000000..d2d0c092d14a
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.4.0-py310.patch
@@ -0,0 +1,43 @@
+From d528842b99b16efce212e15dae3f0a54927d06d8 Mon Sep 17 00:00:00 2001
+From: Cyril Roelandt <cyril@redhat.com>
+Date: Fri, 19 Mar 2021 02:50:13 +0000
+Subject: [PATCH] Fix tests with Python 3.10
+
+In Python 3, error messages have become a bit more precise. For
+instance, the following code snippet:
+
+----
+class Foo():
+    def bar(self, a):
+        pass
+
+try:
+    Foo().bar(1, 2)
+except TypeError as e:
+    print(e)
+----
+
+will return:
+
+- in Python 3.9: "bar() takes 2 positional arguments but 3 were given"
+- in Python 3.10: "Foo.bar() takes 2 positional arguments but 3 were
+  given"
+
+Fix our tests accordingly.
+---
+ testtools/tests/test_testsuite.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py
+index 7ad5b74d..65cb88d7 100644
+--- a/testtools/tests/test_testsuite.py
++++ b/testtools/tests/test_testsuite.py
+@@ -181,7 +181,7 @@ def run(self):
+     test.run(process_result)
+ """, doctest.ELLIPSIS))
+         self.assertThat(events[3][6].decode('utf8'), DocTestMatches("""\
+-TypeError: run() takes ...1 ...argument...2...given...
++TypeError: ...run() takes ...1 ...argument...2...given...
+ """, doctest.ELLIPSIS))
+         events = [event[0:10] + (None,) for event in events]
+         events[1] = events[1][:6] + (None,) + events[1][7:]
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r2.ebuild
index 7ac7bd38f4e7..fdc73ff2db99 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r2.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_{8..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -22,8 +22,6 @@ RDEPEND="
 	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	dev-python/pyrsistent[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/traceback2[${PYTHON_USEDEP}]
-	>=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (
@@ -35,11 +33,28 @@ PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/testtools-2.4.0-py39.patch
+	"${FILESDIR}"/testtools-2.4.0-py310.patch
+	"${FILESDIR}"/testtools-2.4.0-assertitemsequal.patch
 )
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
 
+src_prepare() {
+	# eliminate unittest2 & traceback2
+	sed -i -e '/unittest2/d' -e '/traceback2/d' requirements.txt || die
+	# also conditional imports
+	find -name '*.py' -exec \
+		sed -i -e 's:unittest2:unittest:' {} + || die
+	sed -i -e 's/^traceback =.*/import traceback/' \
+		testtools/content.py || die
+	# py3.10 changed the output
+	sed -i -e 's:test_syntax_error:_&:' \
+		testtools/tests/test_testresult.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
+		die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/timeout-decorator/Manifest b/dev-python/timeout-decorator/Manifest
index 3994c817fa04..188663530e3a 100644
--- a/dev-python/timeout-decorator/Manifest
+++ b/dev-python/timeout-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz 6178 BLAKE2B dc89ba8c4fb861d3e69322b531a944ce6587800ea1f6d871fd5bd95e69ce4fca74c403cc430adefeda08675972a11e872e2296e14b7d7819c78a46fa08db5fa9 SHA512 2e691d40fcbe55a3d6be81f9744c2a06c436b61a17d701ad0e9df7003e7cf41b6e4876b48d4bd4a5b429ae2139e8f6ef8ae05092b599d80b3b5aa05716bb124e
-EBUILD timeout-decorator-0.5.0.ebuild 594 BLAKE2B 3cdddf3f62c3a9af396c4d8eb11295cd2789843fdfb47e0be863841c8db43e74d1737527e41b410c94147cb92d7cd0b08a3b861528a3bf2e473d6cb219f7c65c SHA512 6dc03f22b4c5a5c0da4a4710b9294889470c848166ee6756b711651a33e9166434264ac7f12f6c00e16532f89f799b72898008dfac4cafbd3d010073d830c452
+EBUILD timeout-decorator-0.5.0.ebuild 606 BLAKE2B 5e0a9023cf3954f54e73d967e5d9832e254e79a5f3396e6a7348c1cd98a63c1fce5f2cc113b45bc96ae693b0cb8821ca9775dc0336086edf11efc19d11cc2942 SHA512 ff9eae966abd138a3c729919983286071b4500aa6381c013af5f39f015cbd948d1913111a7c00a571c36bebb288ec4983af27ebbb0d9eae2b79f5a5abd97fcfd
 MISC metadata.xml 386 BLAKE2B 4f198691f778ea9233ba84506a7a598558a1ef412bea88e50ba63d7567d51fe79586ff416a5e016b8604c0c96a7c0eba427d279667136617f219efd8db24b2dc SHA512 aac2b6666862755f80fce2932cc9a22278ebc445820803667fb23f834cfb07210c9f84cf5fb798f0d82702a1c1300cbb1acb7553b237c03817cda8f2b5c8e69c
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
index 3d7f90dd9adc..073cfc250006 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 67904538a4e9..18b37ab0fbd1 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,4 +1,6 @@
 AUX tqdm-4.61.1-py310.patch 1030 BLAKE2B 7505087ca6b5db8523a91c831d48f2dcbe34912d6eba34f80f48044bf5ff8a3c0166c02f5b4e2a693dbe49bc8a7db2682813ed495440f3f8f9fc0e69d93d31a3 SHA512 1de7036c469c078028fe0a9044ecb0ad1dc16d3642d65d13a7c61e6fccac9bea652da0dd385a238ed68a423d481b5bbaa09b2deb9a859a07d64d2eee617c53e8
 DIST tqdm-4.61.1.tar.gz 169637 BLAKE2B 8b89f320e13119b24a9e121747bce0b5c6625c31feb8c427a97e71da52797d9de764ce5e5c41c07d5954a1e5e4e21913335a4691837bc243db473821b2dad1ac SHA512 6092a30389380a511abc8bee7e6144556d6dc1a993ba4a2685707afa2838a12f472aa216ac5e55d144da74f9be1d398d4c6f5352986a200557e4aba67831a505
+DIST tqdm-4.61.2.tar.gz 169665 BLAKE2B f5dff67eb549cab0dd667815c25f6e885a2e0cefc2ad68e97fdc09599eb41b13589f7a88d5a445813973454a5e5f835b3139651ec2e09b717db0fd6dc705890e SHA512 bc33e8fe00244f90f61ab51d0c7c0b98d5580efebd9758284d9dbe2a699eabeb0d92871eedc2f95f377e29dd0f7ea4b5247b96cb4cc1687dcfea3a9ed1152ab7
 EBUILD tqdm-4.61.1.ebuild 1200 BLAKE2B 0a796c10c2f1d1da67c2790fbdea9192b2ab613427468c73c6e3ba395c10a0aeb7d9db0621a8aba0bba23cd72176f8b7c442069f7c7b12cf46200a685b726945 SHA512 486fffe2e60ef08a9924ecb81588c4a4dace8d1aa5576ed8a2018e1485dab2381c4c176c92fd0cfd75a901433bbe5adf808d9643c4124c330dadf1441ddc60e3
+EBUILD tqdm-4.61.2.ebuild 1163 BLAKE2B 3498857b43003f27f533ea645e815e37e9462d1ea786028c11454b2fe0244e9036d34075c03648253defa0d8404359d4799cf47822478f4a2fe3f6dc1bb43887 SHA512 0e4b11197bbcd9f2b291ddad36afc2a6e442671afd0fc08687ade7c6612287f725d4711aee2c77e160bf6ba44f6696e03cd22b8c227a38bebd276a07cd88eced
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.61.2.ebuild b/dev-python/tqdm/tqdm-4.61.2.ebuild
new file mode 100644
index 000000000000..376ba7ad0389
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.61.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+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/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 4dc6e79d9a10..bc23a530e950 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
-EBUILD tzlocal-2.1.ebuild 547 BLAKE2B 6501acdab6f3cc56b94b196ae38fcc3bfa830528fa7278aa780e73aebc7869c136548b0fb426ba7e3691f54dcb82e14e3efeb66d7781465bfaa7eed5e30a1006 SHA512 48c82b14933cc7c511522da987e0ce3738790479f61b710b9765743d5a1e3d0fce228af46eadbdc1c31a7e41d8ce14cf6ec16e1d48276674dfd2abc6eb3f87ce
+EBUILD tzlocal-2.1.ebuild 554 BLAKE2B 8a7935d0888c64d2c6b7661ccf9a2ed78c0f7af62be67c2ef451de439becbeabcb0dd955557ec712b995753af1ed0f6076eb17b1081c7a295b3baa55175602b8 SHA512 443197d87eef2a206aac7ff9e5ce4aff7f588a4522efc8560f1b411e08458fc303784e1da08a9d410ca5fa9ed1ca37077f4416d9e1cdb9e3c1c4154cfe128ea9
 MISC metadata.xml 402 BLAKE2B ffb6b7524232f23d77799fb244ee455c98bf36b2284d2493e79b9fe6e41327fd9e2134e9e036678466226f895c481d81dd351db3294da3ccd7a7a0a0360daf62 SHA512 c29fedcb3c915065ee5fabb28b9bbf8cf9ec4653f9d3ac076706f3cfb9519f376756d752ce51ec15e4421842228693c4c24b3a15241ec8feee283172a3c00963
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index 417e905d44f3..9db3302f1bcd 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index eb8fe6c6af72..0c9d51fe1a6a 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,3 +1,3 @@
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
-EBUILD uvloop-0.15.2.ebuild 1160 BLAKE2B f9fe8e6e754af89ce2d7fb13ddd9962c088f5756077b384274f6699b82c73439d29b60b6a5ce013c81d02ed6e9ebc7ef5d2702b9716c6094b7662afb18f1fa04 SHA512 ff325edf57ca909fedcf1fb1af479f165883605ba66fc86c81eeb0591a531c09e0595d64eb2ca5d73362064155ca3e89be4b43218198369810ce7adeae797f8d
+EBUILD uvloop-0.15.2.ebuild 1172 BLAKE2B 428618b1deaa45e9bcd4d0479efdccb5b5951b9e2b4b6221b270b0b9bcecdf611a94667095f162bc564f8c5a721b1236146d1e6173dc8d8613349c154d4c359b SHA512 2383c7cd3cdb3e7602cf51c986856f8ef9d507d81faba0ceea48292d87af7b13e5576e14ae1c58d5eebe73f2343b904846ba9c407b7d193e0442ffe0250ccbd2
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.2.ebuild b/dev-python/uvloop/uvloop-0.15.2.ebuild
index 30c71f86b778..f78559def7c8 100644
--- a/dev-python/uvloop/uvloop-0.15.2.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
 HOMEPAGE="https://github.com/magicstack/uvloop"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="doc examples"
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index b073f4d6b248..71a22bc07707 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,5 +1,5 @@
 AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d2a845daa0e9e932452ba34416b088531734013f1617901617d82804b32ec22026d50c27152b68fb548b0871a11ac20ffa21fc5b435b0 SHA512 3012d74e348f7965fee811c9b0e290dcefcc4f365159ecc0fc5bc9dc77ff0e5e6d1448b62b0ced1f9e87dc2bf29f9a831d110301257d260dcb3f2d1ee7ed4f80
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.5.1-r1.ebuild 1786 BLAKE2B ea8be6aede0a3602fcfd41f066f06bd87f50bdc39016e4d378d5f77c5027c653c024cbed16a14a4404d7649f938bd90a9b6844cbc63e82231917cc4c80722c50 SHA512 ecdb19ee5104d10ef32d0101ca17e1206389ad935acfb3f9efab322fa2aa12c81e6e38a1010975994377118c49c227215ee74ea4d8d5b64a44ee4838bcad47ef
-EBUILD ws4py-9999.ebuild 1788 BLAKE2B 8f28b558ffa7494b52dbe6676b02bad4fdf4a064d47f1be19d4659d36f565f148f79118342f003ba51d94b3ece32ba4936c60ad27989593ea46439132b05bc6a SHA512 ff8c9974aab71564e8b20847d36ff795d8bc7456b4011146677124df23575fd327bdaa2c7534af65614c7fd475446300c4161fd56db74f11d27931f9d154530c
+EBUILD ws4py-0.5.1-r1.ebuild 1745 BLAKE2B e73eb3b3e414bd90b989f40d5d6daabf1d254dfc6f0aad892a97d1ad24a25d3999e06601883d52405f99f52d80cef135ae48d48fdd9f6b55a80244bda39e30ae SHA512 f341e9a11778273ff584fc7c2cd3f20809ed3f28f96694b7d3b5887d8213ce70e686ed895c780a2df6f279718c75b729f60016a82255c7ff6ce1c0e517ad8603
+EBUILD ws4py-9999.ebuild 1747 BLAKE2B 6f0a6094dbc9974b37cba29097c99894fcb869f981a6881bec2e30a68b7c8bb66cbde8e26cec2fc22bc8f455967bcc4de90db1480730409ea26efaea4ae43c46 SHA512 8f9117dcbb745096140dd1fde0ee932586f07413011498961c6198dc6fd2f6da66849305350b086c10941b9238f820d5b8c187cf9941e55a1cd328833c90e8b0
 MISC metadata.xml 507 BLAKE2B e068388bd7979e65aa1319f5f528003dc2d2e20f686d9f7fdc6b48d98b115ca156ac05866fc5004649edcc64448e5a24f4b05818fa803827fd0ee3d053eb1da4 SHA512 658be5099572b43e2a0f23cfcb05f3b1e7b9e3e42e7686759b956ef0ea5407d5f4af72995ba4360d4df097099cd3058b5f9783be27ebf953098a3bcd5cc66a89
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index 94d185d86706..dbf1c8a54b9f 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 
 DEPEND="test? (
 		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 5d471f0ff142..d38a767a08cc 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
 
 DEPEND="test? (
 		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 75d40673b707..5bca054ffd80 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,6 @@
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-EBUILD wxpython-4.0.7-r1.ebuild 2349 BLAKE2B fd3d0cdcf1329592a47f489bd0db216dafa28342bd9c4490f6639bc31d2fa51dde89d35546e65a3ee5a0be3ca683c578f5cbc09da58b0d9f621d6fa40e7b9da9 SHA512 6137383cb8a368c521fb67dfaaa34b488eb5090a1e4f590a9c9cb50562da29debfaf7542c1b456c43106739dfc9e6e9b01e255e5f07ddb9ec066877b08765cae
-EBUILD wxpython-4.0.7.ebuild 2312 BLAKE2B a52439c2f604250fb09d6c94509d611fbfee7031d8126966ebd0fbef8aa3e53ba32c51bedb3cea774b1abff9528a7218a1ae4c3df5929e89cbb387ef48e197e8 SHA512 d78319bca605cee9e167ca8f684dd2766810eb4d76b364a7adb4663bbc5e8927a61d81a2a718d7c98d8ea2942b24a67d48bdb42bb13c18ec6fe12a3c919bcc86
+EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 83770d2ffd159ef3bd344fb8ecfb51e7039962ca305443bd307d91b7bc738bfa4abe48c89275ec980e80be8dec8486153fe6d34a4cde5d039a92be4ffe9477e3 SHA512 b09cb313c1359b196187901a1c34560a25d674f532d00f3ecc0fd8a71cf17c2760c35a5c35de1cf90683aca16bd00ef635f38304727c7ac3ab29e16cbb6ad97a
+EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index 7585b66bcd42..46eb5b0e1ccf 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-doc/doxygen
-	dev-python/pathlib2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 7f2ab983c45e..dcf072142cb9 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	app-doc/doxygen
-	dev-python/pathlib2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 3ac6b5132222..331a5dac818a 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,5 @@
 DIST XlsxWriter-RELEASE_1.4.3.tar.gz 34122578 BLAKE2B 7f9a9f2f9c7eb6f425192e30961d455dc348b51cec72ce4602b975c41cdfcbfc4e8d49efe62877d8f96dc6ce02320f64fa2ff55586a17d29cf2a950c9eaa9593 SHA512 38b12e3c6bd14122ea9bf652ef33078cf4aedc2be7ce8c3151960331827642713d25f3f9bff9ad7d375d251086e1cc58b09e4d77141dd2973c21a1d24c0b0dd0
+DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
 EBUILD xlsxwriter-1.4.3.ebuild 553 BLAKE2B f3c325966e3b460ef97bb74a867bf6e4ffd10e8b7ae6298ff362e0a33ae3426a83328449cdeb2c853a5842b697cabbab5e387436bd23f06015cfe55ef3ff7a46 SHA512 ccc45f615c70873a740f9ad4203ed7322c913f8935dc48e4d9bab5ad7fa888d7967fd5bf950840ecdc42e5e46e7fa1e5a2ea8dae83e52438d823b931c7f96a10
+EBUILD xlsxwriter-1.4.4.ebuild 554 BLAKE2B 84e1db376b526b3cc358723a0ea1e4952d60b5f2d0e6fa1bb0acb3e255c46ab71dd0056c5294383db116c95f2581768bfc892a4478db42755b9b1b515c27d427 SHA512 5b73a73f39e9c8bdd573dd4bee060fd846cd9b807a4d11c6db7fd6e554819deb9ab024b8e2981126a5be74d57657de73e3a8a9932ac2f8fe191a3c88204d6e2c
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
new file mode 100644
index 000000000000..71eaedb1ac77
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index f88b07262893..f5639247be64 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,7 @@
 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
+DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
+EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.32.1.ebuild b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.32.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 }
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-08 15:03:58 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-08 15:03:58 +0100
commit	814f4cf860e299a046b649eaee5463427984c09c (patch)
tree	74c45f097899310e599dad6b8df5b63e0f085bc0 /dev-python
parent	7f0ccc917c7abe6223784c703d86cd14755691fb (diff)