gentoo auto-resync : 25:09:2022 - 23:34:28

author: V3n3RiX <venerix@koprulu.sector> 2022-09-25 23:34:28 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-09-25 23:34:28 +0100
commit: 5b14ea000f5782ac047162ffc35ef8c3c0648b4a (patch)
tree: 9bd4130367f85e9308e6d6c6b12ba58759b5f789 /dev-python
parent: 85261a4d217482e1c124937d57ec98a0aabaee59 (diff)
92 files changed, 174 insertions, 2279 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0fbd09c2407d..7d06f2518fd7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 0e4cb3c415f0..6abecba0b193 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,4 +1,6 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 DIST aesara-rel-2.7.9.gh.tar.gz 7919763 BLAKE2B f877edcc824f3d790a56422a0fa660e8e3f653fff7e3d87ef4a95fa76369b1bb5df351a571ea039d66d79c0f564512437672df76c3b82e7d660c865cf908dea3 SHA512 061f7e39343eb081b28dd20b1eb7ffc226b7e4b96695d5beb9e28eb3f5ec9480c02c7889c932290248baa908dc0047c19e4cef3c220eccc4cc617b2050a9614e
+DIST aesara-rel-2.8.6.gh.tar.gz 7941385 BLAKE2B 8e01e8afe7a4a33ad133d2759336dea66223c7f001c963d937bcae903f315b4dffbd0e877fbfe2f1b7f31b7f73acd8b7ac38a716337aa129b9a36b0367715f96 SHA512 abfa9f63f096eb6d8961eaa700a13f41833ba79d684b83fbcd7bf4a9d8f0ab49eae1bc3d1249817cf03f63526127612482cbc79c03bf2596743caca810f1fc56
 EBUILD aesara-2.7.9.ebuild 2746 BLAKE2B 3ddf8cc5b6315569f61be3d43d8f7d8f1e484657024462ef9466cd6e06e01377a18e015157d799a95b661677a9d165dd445903d305c99dc2c2f8b40a477c226f SHA512 7f37bd5c185747f64a3b77603df2c09113aabd0cd38e04e6df3a107342342f8d9eaaa824cc999db137ec9177ee0e4de5c10dbaa35937ab745145034f941add44
+EBUILD aesara-2.8.6.ebuild 2929 BLAKE2B 6b8a83d3c5353f7442cf8949a589f14e89d2ba76fc0929118df58becf9374d4a76060cf1c3570d80ef28bd0f3c7c0198afd453adabeac71ff074c94c43012224 SHA512 9f9be4b85882008b4acebab068e0d6e386c171196f2e2ae4d41f75f673d522006408a754ea17c2c6f06394dfd497fd33a31be1f74b700c9ad1719d21d3d48948
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.8.6.ebuild b/dev-python/aesara/aesara-2.8.6.ebuild
new file mode 100644
index 000000000000..00f30feaabf6
--- /dev/null
+++ b/dev-python/aesara/aesara-2.8.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not claim "bin" package (sic!)
+	rm bin/__init__.py || die
+	sed -e 's/find:/find_namespace:/' \
+		-e '/exclude =/a\    doc*' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+
+		# dunno
+		'tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak[False]'
+
+		# TODO
+		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
+		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
+		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package jax or numba
+		tests/link/jax
+		tests/link/numba
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+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/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index d9e3acd1e336..4fc022ca189c 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -2,6 +2,6 @@ DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed944188
 DIST ansible-compat-2.2.0.tar.gz 38772 BLAKE2B dbe74d23d2f2e4275bd9df2303417ea83517e780e65c6a34bd6ae1022be265ac816b50b309fc45f88e0c7fac7d7a22c83a826cc15be050698a6f35b267a36ac3 SHA512 3bd199431659ecba52743c6c985d2cdc6ee55396444241ba2456bc5430bbc87e26087dffbfff62ac341fa854e19baa0d7052cf79f20511222fd9e001dd020136
 DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6b46d7bf0077f12dcbfd9689fc7106f164a87db25de1625249ac2930858bfa655bd93d83aba0d85ed4f8bdd42cd345dc SHA512 3e941eb2c5303f83b7e7c057d08801f192889b636d9c6e56a2ac21cf75144a52ba2916eaedeba7bf848dd268387bf4d3261541d75145b213cc3f6baca6a06e5e
 EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 631de4e8e8071eed1197c11e500cf4108e879a6e4912417d66bf793e8dce0a28af76a4da7666aac77631f869d0f0eeb763b399c81de0bd08171891b1c0e7df89 SHA512 36d1c856bacbecf6eda95f0f603269a716e9e29090a92cf4c10f6bbd38ab3a7d045258cb2cf7f1ba4dc31b25d03b64b45968817fefe402b4ff15344b71d72d19
-EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
+EBUILD ansible-compat-2.2.0.ebuild 1841 BLAKE2B 9d81f9b4041f034954511e547812e6c1e3c702e691c175f7b3e4eef461a65602bf24ae37a696ea4619b2071bc9eb25d2bf4f064187bed74f4e19e2259433b394 SHA512 5541bc05ef4ce9299242feda4305b17ac250aa98a3b9d277c020a2f211128b93c30c2a5775a593d112436c76e9dbf64f1fa8efa6ad60cd916cf898eed67b6abb
 EBUILD ansible-compat-2.2.1.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
index 0a8b7add6886..5abc44e6b8de 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 333baf13d9e0..273a234391b4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,17 +1,5 @@
-DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
 DIST astroid-2.12.10.gh.tar.gz 435902 BLAKE2B eccabfbbda11edc958b0e5d5870f5df88cb267249d4d440e470515b75cda992ce9e7fd3dd50b9165ca40c6643053b0df0aeb754ec3b0461ea8a1ce45b0065ceb SHA512 55c3013a1672c4ce82f44ea85e4ac16881f0ea0a2f25b6457044e3c824699e13d46f5007f7410ca8d9a7d69c6690c8c41a187c9650fd4d4b7e9a7aa31e21add3
-DIST astroid-2.12.2.gh.tar.gz 430857 BLAKE2B 8b34366368718cd4329298bdff3b761cab59b6bf8b856660912ef44bf1766136573145630b5193481454a4bf897ae950c5b6f7bb3611d3d343dc4f3adb2e5906 SHA512 3ba484bbd98b196b4241fb8bb9405b48a1e6aafaf318a67fc9264c8c1679f9d6b6788b8139077b60c751b0a26732b905196b3bb48671da2aa15e1c323bf396d6
-DIST astroid-2.12.3.gh.tar.gz 432731 BLAKE2B 276537b9a97bfbba2177538c6546a8e55fd1a144dde2fc2104460b0867d5439433e10be58bdac4f7da17a22e61c9484045ee979b8de11dcb485b9979a50f1e30 SHA512 5927c54d2ae000a96615a7b81f83b39bd8ce4b15e6652b494d18cf085ed455fb9e59b9c0c35ba8de7e2ea12c036e06ceb741dacdf882158cfd7e9ed3750dad88
-DIST astroid-2.12.4.gh.tar.gz 432812 BLAKE2B 1efd0af2b8695411aba0c1db21c464c742058c662d14b2a338c577f41f13c582f24dd5445ee2e2aa51f63096ce086d601750b2894280fb9f054f734165755dff SHA512 55a585dad9fcd319845fc2b16536867a5c0552b7f3a87b5ac40cc069a43a25a1de2862ec6cd2b6cd8e9dbd78efd508995152012399722056949ce460c23f57a0
-DIST astroid-2.12.5.gh.tar.gz 433354 BLAKE2B dfe643ebe77200664bd630c1c5795809c8bca5ff0ad01d9361b6df302c33ab42529f33148649fada34ed6dc768c63f49c2eb2abc771ff0e13404146bee5e0fa6 SHA512 4bae868e21ef4751fd195b2990ffb3c9781e51654e9f327ee5bc220b53d553fb13744a2d683e30f1cb929ce1ec4cfd31382a4a42e867dd7a75a118202ccf377b
 DIST astroid-2.12.8.gh.tar.gz 434545 BLAKE2B 3ad3ff1a7e1a0c9433387b4167041adcc405e9b6d0fc0a850073960db9e7458d0b6989e3a0f78679ba4730f1da2fe9d35de3f984d2c79532d9f96c2a726b1f0e SHA512 76052caaef27f983751e3abfb44c38ad497a4d2d659521ee55c99080c9cacea90cf3603d6468b01cc9b127cd8318157faae56bb151c6449145c70545719c6c51
-DIST astroid-2.12.9.gh.tar.gz 435578 BLAKE2B db1eb9559429418036836c123dfadb2c9fe33c2906aa5c5646d55455c6bf322b5ab959a55c6d8a3d3e2fd5a688ff0e77781cc9161e0c25cc566ef25021c61d1c SHA512 17cb6e31c4a193c07a0937510dde3ff3b9b0fd78be2f5669c979fbbda09c5d52754564cda9a85645a61285cd2d348e5e026fd6518abb81e7ea606d34578ace51
-EBUILD astroid-2.11.6.ebuild 1786 BLAKE2B 56b20263f11843ff7b511229e3cf7af3cf61b0ae95ae0a12409fe6895b7f232bb85ba9286940b80291c4264223b9bbbcd406ffd2f7f88a029205fe195dedf50f SHA512 90e3ede82dfd55199b56671640c30adb0252df7deb49257a730a7ca13b8186425dde611b1b2539a8c5bee076bcf9dc0b96bb160276036033277022b2d516d28f
 EBUILD astroid-2.12.10.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
-EBUILD astroid-2.12.2.ebuild 1808 BLAKE2B 40ae0cdd718a0e862da50b8ff0d01081ea02b75c2725cd1cb5b18aac82c0472d9357ed135e1b5d3c3ae7a2311ad51a22edcd5d0510e3ea8a6b97da1c15e6104d SHA512 92747d9cc013de6177180c065cb1f5e92d206245d544d4f630e44592ae000cea1b15d887ea0ec02b1b6c0567b9c43a938fc91fdf14c82417c90b7f41536c2b29
-EBUILD astroid-2.12.3.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
-EBUILD astroid-2.12.4.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
-EBUILD astroid-2.12.5.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
-EBUILD astroid-2.12.8.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
-EBUILD astroid-2.12.9.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
+EBUILD astroid-2.12.8.ebuild 1808 BLAKE2B 40ae0cdd718a0e862da50b8ff0d01081ea02b75c2725cd1cb5b18aac82c0472d9357ed135e1b5d3c3ae7a2311ad51a22edcd5d0510e3ea8a6b97da1c15e6104d SHA512 92747d9cc013de6177180c065cb1f5e92d206245d544d4f630e44592ae000cea1b15d887ea0ec02b1b6c0567b9c43a938fc91fdf14c82417c90b7f41536c2b29
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.11.6.ebuild b/dev-python/astroid/astroid-2.11.6.ebuild
deleted file mode 100644
index 1ce72c9a2fcb..000000000000
--- a/dev-python/astroid/astroid-2.11.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.2.ebuild b/dev-python/astroid/astroid-2.12.2.ebuild
deleted file mode 100644
index 632eae5577f4..000000000000
--- a/dev-python/astroid/astroid-2.12.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.3.ebuild b/dev-python/astroid/astroid-2.12.3.ebuild
deleted file mode 100644
index de2148b20e43..000000000000
--- a/dev-python/astroid/astroid-2.12.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.4.ebuild b/dev-python/astroid/astroid-2.12.4.ebuild
deleted file mode 100644
index de2148b20e43..000000000000
--- a/dev-python/astroid/astroid-2.12.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.5.ebuild b/dev-python/astroid/astroid-2.12.5.ebuild
deleted file mode 100644
index de2148b20e43..000000000000
--- a/dev-python/astroid/astroid-2.12.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.12.8.ebuild b/dev-python/astroid/astroid-2.12.8.ebuild
index de2148b20e43..632eae5577f4 100644
--- a/dev-python/astroid/astroid-2.12.8.ebuild
+++ b/dev-python/astroid/astroid-2.12.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.12.9.ebuild b/dev-python/astroid/astroid-2.12.9.ebuild
deleted file mode 100644
index de2148b20e43..000000000000
--- a/dev-python/astroid/astroid-2.12.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index ef71bb846bdd..ec77301c8235 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -2,6 +2,6 @@ AUX autopep8-1.6.0-lib2to3-deprecation-pytest.patch 1094 BLAKE2B fbca6a4c342f525
 DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
 DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad
 EBUILD autopep8-1.6.0.ebuild 836 BLAKE2B 2a5c20f3034ffa486ed52cd08520c30d8dabdc764660d86e5d307bc180338a4c8c03ae74af8fb379708f777e2f9b8f3e6aafb526024de208b5f125f1a00b58b7 SHA512 782735f07b1a4a73c1fb9ec2bd9677d372069cf878756568507cd946a4c8ea44298a1669b2732127bbcbebb57fe902b9fdc980601899d04bc12eb05d75947257
-EBUILD autopep8-1.7.0.ebuild 954 BLAKE2B 886221e466249d9d282eb3969d4aac2461042fc437c3cfc07e7bd9cb1d4716edc3d3ec24b1a6ed56f4fd88fac2780de06f3b59523acdecd1bfafc0172f74b24f SHA512 b81c5fc70fe3e2920ac6ef5f15921a083f0a36e55665c0cb403f4dd3b804a34a381efac92a35240817c0b872b3649eb1eca34391a8baa8dfedf551a164ece92f
+EBUILD autopep8-1.7.0.ebuild 950 BLAKE2B 086de99551a18e855733e24d854d5b9afc6b8bdeea2f18c1fd4927dc9c13a6f1bfabf189c2b6b88818b761864cd17d94144e4ab63641f0ee95ebe3e736d680a7 SHA512 f5717728d3a1b3f83debdeb71874e789ef2b52f64ccddc0ff18ae6d0239b49144f539f53f76235fccf87f62b1ac28085c17bdc3b97feaf294490d2340e49cc32
 EBUILD autopep8-9999.ebuild 796 BLAKE2B f268b10e32865c7e92de9b22d929c5f0a632044a9311d3a6cba736c00b9b65906b30afa0b30cf8e70fc756b60093146777b99b1486119537cdb77a37be5011e6 SHA512 96d829614ed05ae8574369d8dac5146a8e20e20eacfa4d50a580aae54a99369eb21b7f5d92862007fbe423379ae9a224b33dfdde5cd669918395ca235f5d99aa
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-1.7.0.ebuild
index 8a4cf8b6e538..31163b3a63e5 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.7.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index e63f8cf21ebb..9aaf45273367 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -2,5 +2,5 @@ AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
 DIST cairocffi-1.4.0.tar.gz 69851 BLAKE2B 8037d9bc619d2e96e655dc4682bb95a1e920d0b2188963088c1be21f2e157f7e791f3994f0ae7ecd338547baf2a65d03b175398bc1b3c92145ae6ea148420b5a SHA512 7ffdaf365c1251b202e2680a2f689ec6ea04c19eb75df38137624ffeb429ab61c6f54af450aec019b2570a4e91d2d701328109e4e0f5662a3b3b655ab53705ff
 EBUILD cairocffi-1.3.0.ebuild 937 BLAKE2B 1cf24a61eac110115d77194b2d22e6d747f415b066d73faaa8509c7cf941f8bb4a5b2562b10b139c9fa47713e6c844c210ed9d1c6313752ca729f104a9d6d8f5 SHA512 b5d253eafaef2725400374b741a44d243b341cfe0d74fb48724acffefc474f06c06ffc5ebaebbad29d4b2ec100545a67c44c419860ddcf8679113d246744cade
-EBUILD cairocffi-1.4.0.ebuild 904 BLAKE2B a309cf8a4c2430d769df1256c423825214b603bc5ba202e9a49ae7aefbc74d342c797679ea45b626836a16e64a2748670c1f9b319b91a828d1be38ee81bb0c6d SHA512 ed93a6f05f6d60114d03cbedafbb3f64b8d86a3fc32615c33c90e390edbdfcf97fdf7c8675d05bc9deb9b59dec47bad80f3d42729a91b98d7194c4f98b9aeffe
+EBUILD cairocffi-1.4.0.ebuild 916 BLAKE2B 4952f1152dd775ede29abe255f6306480d642dc8b07163c0d4e2987430ec058d32dd9792fb4c9b1290d70bf310c1567bdf35aab764982af33c2f27eed9249aba SHA512 46b7b6c246cab66fa07f3cae297faecfbff556a4f782de098126ddc84f8bf901db7242b3b88829d1c7a3ca71e0939838901d52b14abce6aeb4ed362833b980f3
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index 10ddec84c6e3..9992c88ebefe 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index ed0bfc8f4591..1244edfa1599 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,5 +1,3 @@
-DIST cssutils-2.5.1.tar.gz 723277 BLAKE2B ca55d980929d48c6eb555c08166870572ac179dadef785ccba3781de7568655374f3fbe44282db7c85f623dbf0c1aaf3360038c7168ba4022ad2f68b48ae5745 SHA512 20a94d5f08f662d67f2c1a0f92ca7fbc46d58dffc8bd4187ab51c8deb6ed29154604abab474ad80c806cc50b1dda9bf8d06edd98d5e8603bdd4917052ba796ce
 DIST cssutils-2.6.0.tar.gz 723259 BLAKE2B 6548e87c78fe6b850b98989521c27cebd4170939517edca895c2787c1367e1c6dc94308355f7dd2e1dee7194f88bd025b72c801cd9b90f8a08ab244f6a4e890e SHA512 95ce26cc4816e7750fc0f1e0c4ac60f176e3c7b3ea1871440bf937d442e0f8626f9e4c75622c0ea3a84d68ceb4b768544e9642936beb87eff1b55117ce47b311
-EBUILD cssutils-2.5.1.ebuild 965 BLAKE2B 25979cc8cfb761a8e41e690ea0272fab7096bf96066efe3ce6a857671d59d4927226a5455cf7ec09ac9520b0318c974a7d0f2be5212a84baf4386807707c2a59 SHA512 1489e3b75f22e18de3ffe648b30c0c1e0c1e2f56b01c4b29db88887ae0769226a2f499265478bd0c2182deda8677ba36980306970e977292ee51cba95d5ef547
-EBUILD cssutils-2.6.0.ebuild 970 BLAKE2B d72958758560c299f03ec365dbdaf64f7863a2bae45745335dd93500c5584e2ea8f3f90b2566946a0f9fd1e0f684a7869f72a8c23ff6a966ecafa616f0c2311c SHA512 d9b907701686347c683683487c49dc8c78690cc6527a34e218b3c8ad20dd53250c604a1bb69d9f98aeef4b2a37ca3041e5d537dbf38c7e9361c681dedd356c3d
+EBUILD cssutils-2.6.0.ebuild 965 BLAKE2B 25979cc8cfb761a8e41e690ea0272fab7096bf96066efe3ce6a857671d59d4927226a5455cf7ec09ac9520b0318c974a7d0f2be5212a84baf4386807707c2a59 SHA512 1489e3b75f22e18de3ffe648b30c0c1e0c1e2f56b01c4b29db88887ae0769226a2f499265478bd0c2182deda8677ba36980306970e977292ee51cba95d5ef547
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.5.1.ebuild b/dev-python/cssutils/cssutils-2.5.1.ebuild
deleted file mode 100644
index d86e640ce2a0..000000000000
--- a/dev-python/cssutils/cssutils-2.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	encutils/__init__.py::encutils
-	cssutils/tests/test_parse.py::TestCSSParser::test_parseUrl
-	examples/website.py::website.logging
-)
diff --git a/dev-python/cssutils/cssutils-2.6.0.ebuild b/dev-python/cssutils/cssutils-2.6.0.ebuild
index f6f379e16ca5..d86e640ce2a0 100644
--- a/dev-python/cssutils/cssutils-2.6.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 69eb0531bc7f..20bea2164904 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,6 +1,4 @@
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
-DIST distlib-0.3.5.gh.tar.gz 1233989 BLAKE2B 616666e835aa201ceeeb423452a25adafab67dc20f99496b711e3ca6d4916f4e1dd39e444b1c8824e90559e898fc0588cd58d2d5be07af172d6b6ed3f3c7fe4c SHA512 927861d2e11785d8419c3125784f21ee052883c03d91d8893d2c77b47739e45cbca39e5d90446e906c71744bd57274192b28af86def239a16caeae4d3887d5a6
 DIST distlib-0.3.6.gh.tar.gz 1234082 BLAKE2B 384b736d9fb9e63d1b9a9375caf972ddfccb36c99903928505e684fe09b30190f873cf7b109beb6c32a1e4b1e11a1d9947adea74f9dceef3398fcc1963a2044a SHA512 39948539764ff5d45f14dc602ebd47d523b71b587ee081d7a267669aef4e4b1013d3995cb992038136bc4c01826ea633c6e4ffd050f1511705b296bf76f3bbf9
-EBUILD distlib-0.3.5.ebuild 1840 BLAKE2B 9ef601fc43aa276283fd7d730f129ef419e5209869121c3ec64fbd5477bdfbcc525406a09f86fc65e0d15425197742090f4bc0dee2125012a4c4ea6ac3ee5035 SHA512 e5b1d1cd3f9b1f9a7be68ba3707eb806c24cd0c56f39c3cc775a1f3da2040c9d288292d43fbcfa92b915b671a594f11ccb462b4a6996b43fa60c7c72b8bb36a6
-EBUILD distlib-0.3.6.ebuild 1848 BLAKE2B ebe2de7511c4610c38d651a9486310fe9d5194f2a797aa8b775cecc8793ea65b696a948e9a143b0249e7e561ca3fc60299ceb8b75bbc83cb94f2a6a54aabe656 SHA512 c729dbb079660c6e7e421e341ff11125f41b79af692f1adaa24cba7d74a24d58f7c622ec3c78f3ea61e85cf10f100e50a60bb1d2797a06f3375f514ad7411ea9
+EBUILD distlib-0.3.6.ebuild 1840 BLAKE2B 9ef601fc43aa276283fd7d730f129ef419e5209869121c3ec64fbd5477bdfbcc525406a09f86fc65e0d15425197742090f4bc0dee2125012a4c4ea6ac3ee5035 SHA512 e5b1d1cd3f9b1f9a7be68ba3707eb806c24cd0c56f39c3cc775a1f3da2040c9d288292d43fbcfa92b915b671a594f11ccb462b4a6996b43fa60c7c72b8bb36a6
 MISC metadata.xml 365 BLAKE2B 74d46041d58af096a40f55e08c48562eb11aa8349f2a5afeffad67182c65561b71e2723254df6176b77852f74fd569bb329e21bc8f4ba70828dc8fdb361bf518 SHA512 3d5da338be7508640eaff3ac9360387a6b98d40df477b81e9d4dd9b642e84c8d3fbdbf8c277dfaadc869bd733616329b02607fe56357139be4721d4cabb7996a
diff --git a/dev-python/distlib/distlib-0.3.5.ebuild b/dev-python/distlib/distlib-0.3.5.ebuild
deleted file mode 100644
index bacb469be379..000000000000
--- a/dev-python/distlib/distlib-0.3.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level components of distutils2/packaging"
-HOMEPAGE="
-	https://pypi.org/project/distlib/
-	https://github.com/pypa/distlib
-"
-SRC_URI="
-	https://github.com/pypa/distlib/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( 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 tests/pypi-server-standalone.py || die
-
-	# use system pypiserver instead of broken bundled one
-	eapply "${FILESDIR}"/distlib-0.3.2-system-pypiserver.py || die
-
-	# doesn't work with our patched pip
-	sed -i -e '/PIP_AVAIL/s:True:False:' tests/test_wheel.py || die
-
-	# broken with pypy3
-	sed -i -e 's:test_custom_shebang:_&:' tests/test_scripts.py || die
-	# broken with py3.11, doesn't look important
-	sed -i -e 's:test_sequencer_basic:_&:' tests/test_util.py || die
-	# https://bugs.gentoo.org/843839
-	sed -i -e 's:test_interpreter_args:_&:' tests/test_scripts.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x SKIP_ONLINE=1
-	local -x PYTHONHASHSEED=0
-
-	# disable system-site-packages -- distlib has no deps, and is very
-	# fragile to packages actually installed on the system
-	sed -i -e '/system-site-packages/s:true:false:' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/bin/pyvenv.cfg" || die
-
-	"${EPYTHON}" tests/test_all.py -v -x ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/distlib/distlib-0.3.6.ebuild b/dev-python/distlib/distlib-0.3.6.ebuild
index b9e474a8db74..bacb469be379 100644
--- a/dev-python/distlib/distlib-0.3.6.ebuild
+++ b/dev-python/distlib/distlib-0.3.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 55004fc67688..3541cf10983f 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 DIST flatbuffers-2.0.7.gh.tar.gz 2018943 BLAKE2B 0fa27c79986292da1e3721c061d845b4ff3db5209956345ddf655dbbcd8fa8f460160d2359a77211139597b4635fc65fdc762cd3c62e87b361d65fb414d9c538 SHA512 15696f5f691414d2266f8bad1137ccbcf1e43e8d4fc22e8b5ef5b90351f6034b553bff7febf0e6f93a1be145e0714d7d4cb752786d0f67665165b1b6e5c1db24
-EBUILD flatbuffers-2.0.6.ebuild 530 BLAKE2B 211d748222b49fffc936c92ec0756b855e7306c55d541d76faf5a0c7a106e5bf87b4362fa51be729db412f5e8cf9236cc427e067d8f6fbd2d565e1a8e8e09f32 SHA512 3a798c1e090d0464814705591627ea9bebb25e61e8b41489ead78ec6b55e2b170133246c9175772ae6f87af7139ff58f0dc870cc6865d96483a0afe414ffa54a
-EBUILD flatbuffers-2.0.7.ebuild 542 BLAKE2B b21d6ec15ba5ddcc9bebcb7e8fbc99c1a566872b36bca62c8140bfa78d74e295f53f102741d9fe502bdeebe39593476120baf7a21cc15cf8b87203671580c71d SHA512 499fc8c7724cbade732bed01fcb59fb535170bf7a931b249813d2dbc3ee648fcbc37356ad14fcd025374e5b551ee7deb95354145233cc5f602281dc5c05a8b4d
+EBUILD flatbuffers-2.0.7.ebuild 538 BLAKE2B ad7180c5d947fc9d11773287e65026addba75eef8cce545e71c6e47027840eb45537a473f7b6afacfed19f69a10833102b6d6e4e30a8470024be3383537d3827 SHA512 c048f9181d0c4b96ddf4c32ceddab7c7a7a23c1980225b82f6892cdc5e4b757727d6aa38e00203729410d841ac964ccfb9087e7f3280491968a0cdb1c0c93c49
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
deleted file mode 100644
index 4eddf1fbaf28..000000000000
--- a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-S=${WORKDIR}/${P}/python
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild
index 7705da0c72e7..d39294f368aa 100644
--- a/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 S=${WORKDIR}/${P}/python
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index e0dbfa061d1c..a197d5231c80 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -2,5 +2,5 @@ AUX greenlet-1.1.2-fix-py3.11.patch 7811 BLAKE2B 96312cf875837e5873e7eb56e6b4992
 DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
 DIST greenlet-1.1.3.tar.gz 91624 BLAKE2B 88ba03f7a5acc7de2ab757a04667de9774ec8979b0f3d45131f8174a4ea9a608e359e4d8ce2f7e57c58ce4844e58a082d35d983fd583fc6f53ffa38363fb7863 SHA512 9ece4a4e758de963c96c7cbd33aec33fa11ddd3d46b8dc4194e14d534f8f68787df551cb1e3be57fc8a65fbd8d5daf8fee59567927f6f272535dd7c720baa4f4
 EBUILD greenlet-1.1.2-r1.ebuild 797 BLAKE2B f7ea916a47769fd8683a14cf56cfd2ac3a5bbea78c66269b3b26c719eb9c164c4832cc0918ecc50a559262304e653ec27cb1d37274b4b2f22e4400e9cd781d28 SHA512 e682ce1e79740c9517243d678524d348aa2821442412588a5acd25a799107868ccb5fef4a919bc4f9dbf3437da2a38610452bbc55f5686c1c4dd38a9ae033f65
-EBUILD greenlet-1.1.3.ebuild 754 BLAKE2B 2f6448b53d3ddd92ba7c1851ce2f29c62fe20742059fcbb7a7c0241288179775588abbcd595a2647d69130aa72fc97511eaaecb614c098729ace4235332a99a1 SHA512 3dfffd77da55d822f2ad540de017bf62fd9ceb769f4bad0dd4b79030f58fda3714b011f1802a6571d47072cf11c8d55614ac9e77cea1f1845cb097bf933de4cc
+EBUILD greenlet-1.1.3.ebuild 750 BLAKE2B c332830c2f1f806d64ebc6b9918f782eca17134ad111d67b599afdf4f3eac3c6797e7734062445a00b311a31381dd1be9f74df58c4daee12df39ca95dd6057ea SHA512 d5a79561a2986fb3aea70e92bfa89166864c8abaff257501ad363f427d99d96bbf38ac0e78b3fb1c0a0fa6348786d56cd74575e5bbdfff84f0556a1c4a0c4f15
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.3.ebuild b/dev-python/greenlet/greenlet-1.1.3.ebuild
index c8394942b116..0423e7e7b065 100644
--- a/dev-python/greenlet/greenlet-1.1.3.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e716e79f8dff..aff021389c54 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1,5 @@
-DIST hypothesis-6.54.3.gh.tar.gz 9325211 BLAKE2B e0d6bc21057b50676ef98d1c9721b82c30986670758b2a7bfd1b101cc8d42258bf0d61887867445aafe13b8064c47d64583ab492e21b6fea510ef0c26fe01782 SHA512 288c5ea9c1dd8ee0839c11385f52ba8b8122f408aa11c6d2416460233ef78890e3014e659ef4312da4822da3abe2dd9163f68d2711556800e805ae41280aa132
-DIST hypothesis-6.54.4.gh.tar.gz 9325437 BLAKE2B 2000c806a0c791d1eb353a829e5e96d53e935d360fd450b3807186121fec4dfd171b8821e08b6c23b0cbea8d24b0d88c32126281173a0de2f12b29d09ec2d62b SHA512 7e5b70cc2df874163205e3d35f3f5e6a71319e779b35f1596c69222373e9b766a143ccf37aa1699de6b98827978e44ccbca0b1e30e6ffe29c8b68c83bb3af869
 DIST hypothesis-6.54.5.gh.tar.gz 9325448 BLAKE2B b4cb8a413ad96f11f4dbf4a1a529e389dbca45561264cf0922721a25009d1065fdce21064faf53bd7aad2f589c159b52d899aa7b12c12da68beae8c9186c0505 SHA512 37205ea28b44537409a94592e466376e9612f84a8501ad2ff5504fc648e062555ffb600416bdd1f9a74f39ba39729defd581025e0611c501839721721f7cf6e3
 DIST hypothesis-6.54.6.gh.tar.gz 9325898 BLAKE2B 01dde1d57192ede0a732ba2a50954fb6b1a1532e584715186f813977b2f22fd3411ec489874da67e687ca470ac58340dc45b821923ab01b03888c44a7882c0c0 SHA512 d678d0936c7906c839c29ad6c08154a067f8be2e18344139051ecc4b5c737f5088d2775a25758da2e29b74574b47c5f817643ccb762db851bc2b25e4fdbb3259
-EBUILD hypothesis-6.54.3.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
-EBUILD hypothesis-6.54.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
-EBUILD hypothesis-6.54.5.ebuild 2093 BLAKE2B f23735568bc80bd7999e4fc273c2ee2b3b965ec27faacfeff9a8b9a9d28455ae79d96bff4dc386f681f1aae8c81affa5fc2187fbeaa5ebdfbd0cff034b60dde5 SHA512 10c7aaae01d3fda6e927cdaa8e38356942f911a1ef430d61cec1923c7aeb061f28f4090b3e4b104ee56c00cb394b0d07564330c29b18aef401e492100f39682e
+EBUILD hypothesis-6.54.5.ebuild 2085 BLAKE2B 7d89dfb7307326147b2f0109fdb92fe86622608c8df2940fedf7c5ca42afcf50c01e15b58ae4d9997c6297aa3ed5f6add8706d4ed27703c060157d301125cdb1 SHA512 04978bb6be8253fa5cd7497164b8f963c7a3f883cc64f99ca25de547ed6c2ef06a8f2eded042322ad3547319c3a53e62227734e535e8d04fd9cb83c6a1112ae0
 EBUILD hypothesis-6.54.6.ebuild 2093 BLAKE2B f23735568bc80bd7999e4fc273c2ee2b3b965ec27faacfeff9a8b9a9d28455ae79d96bff4dc386f681f1aae8c81affa5fc2187fbeaa5ebdfbd0cff034b60dde5 SHA512 10c7aaae01d3fda6e927cdaa8e38356942f911a1ef430d61cec1923c7aeb061f28f4090b3e4b104ee56c00cb394b0d07564330c29b18aef401e492100f39682e
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.3.ebuild b/dev-python/hypothesis/hypothesis-6.54.3.ebuild
deleted file mode 100644
index 4fc4aa3ee205..000000000000
--- a/dev-python/hypothesis/hypothesis-6.54.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.54.4.ebuild b/dev-python/hypothesis/hypothesis-6.54.4.ebuild
deleted file mode 100644
index 1065b755121f..000000000000
--- a/dev-python/hypothesis/hypothesis-6.54.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.54.5.ebuild b/dev-python/hypothesis/hypothesis-6.54.5.ebuild
index c45634356c75..0eb4bd6ad325 100644
--- a/dev-python/hypothesis/hypothesis-6.54.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.54.5.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 2e95aa5e199c..fd06ebeab890 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,3 @@
-DIST inflect-5.6.2.tar.gz 69378 BLAKE2B d20739928bc0a5e181456c3bbc583e5816bd87b615ad1f6c1ec6edede3a67614ff4a97db4973d940d2615f40958efcf24f0de3cecaaaf2e892defec322481b4c SHA512 0bf66803c888575be478d45c1ddaf96432b8883af2b854a874678643e7b92a6a1bc60eb0d6ee324346dd4df7482364a7525a40f04f31910263c840196ba49d38
 DIST inflect-6.0.0.tar.gz 70108 BLAKE2B 5e20c265ef7683d1cd671d86697b8fc8d683ef4e7dd856fe0e0797e39a5e97a9a62984b9dd39f54187e54e3a7b961dd6c77b0f50822fef19bec462c485ee7600 SHA512 8cd38dc2e59bba5b47dfbf0f7626fce43bc4ecafa22f4555e48d9827b4f7f235c282477e9a008f172cc08eefcb5f44e2133de2c28e04ddb29c9392a5486b2719
-EBUILD inflect-5.6.2.ebuild 617 BLAKE2B 9dc0fccb61e8cd8133edd89ad0b0fde7ad15783866cd06aadad9a84a3d7c75a715ca257210d24bfca8733a19dd722dfe36b3683e368a0175e06e6aba3a7ad0f5 SHA512 ae11ec54c11d6a463f8c965231f27af5f8efce904e8250f41ee0e06ed3f8d50e4083bc5e217ec7015fe67cb0a3bf7a75450def633669923868d4e9c15d2a7778
-EBUILD inflect-6.0.0.ebuild 676 BLAKE2B 0307f6dc05c854826318d4cb79f3c56c0bfc6ed80e4857b9fb21744627bb85b757cac9d61c7857e0e2308b45076a203b8bcc13fbd4b74aafd6b6859bec50e343 SHA512 dde54311c3df44e17fbe64c4c96a3bf9001744fb131e588bb2d5e43bc8fade1ab1eacc95e72f595d825945b5a9dfa139715c7958ca6b51b31ecc73a3f3918d83
+EBUILD inflect-6.0.0.ebuild 668 BLAKE2B e9edddfe3b9c5e90476079cec80060fc8fbdb655b6c3f27416621806dd81a9de3a984a2b6a061bbf4cf9fb7b18a501a6176033f699a1869a66f1494f1f18a69a SHA512 0b27436afeb0ca71e8410acfb677b020cf60a3c84552f7267e117dd822d4e65e06e2e9f92199c0f8f869fe114faf14d97200e439ec37e7567d5f6ade493583a4
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.6.2.ebuild b/dev-python/inflect/inflect-5.6.2.ebuild
deleted file mode 100644
index 1eee83767dac..000000000000
--- a/dev-python/inflect/inflect-5.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-6.0.0.ebuild b/dev-python/inflect/inflect-6.0.0.ebuild
index 6c75b4dd9ddd..5657a339fe33 100644
--- a/dev-python/inflect/inflect-6.0.0.ebuild
+++ b/dev-python/inflect/inflect-6.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pydantic[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index f2312a12dfef..5215e78a30ca 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,5 +2,5 @@ AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b8
 DIST jupyter_client-7.3.4.tar.gz 329871 BLAKE2B 34f4cc01ced39e30f81e0c7524ada9319f7bea6fb0f941dad85ac3f969de71b68bde22359a9d343df84432e320994a8c4c4aa9ebd390b841e4b18042ac6f0b14 SHA512 3bb1fd7c93e16c03db0c249810fe48428dc9c1fa24ae885a3d30b4ac2d2e980f48edc06c2c6065b3e8f91610bf5bc7500854986f55c18bd9f695f192aa470beb
 DIST jupyter_client-7.3.5.tar.gz 326758 BLAKE2B c2ac76eb6511b29c38d7e7441e1191bae1f931da27f2eb95d6cb842a0e36f36a6f7a1421253b62abf52243f9fdad36b34828e6d5cd13a0411fa4ce09b447c3bc SHA512 5a3471fe03f44671fc2a06f8c78c11197084c8c951a1f8b55b89d651a6aea2ae1bdbb451ed463e52519954e7dba99b4e2298a6511eef2a3618f095dc864758d9
 EBUILD jupyter_client-7.3.4.ebuild 1202 BLAKE2B 96b4a62eb48dd0f1eb013620fe34895b66f0449d7e4a1a159dcedf4d0684196c9067ec8610521f10e5ddbc63974286bb24c31ac5d534cd6b5ff0d6fc4826c41c SHA512 a514e0e53a19f54bc0d9d5f5a91ca5b9d6ab26554724f97722bb573de158990a61f43e4ada9a0bbc0da5f128b5e2657ea7bfedd73226818bd97473f2a97f6393
-EBUILD jupyter_client-7.3.5.ebuild 1210 BLAKE2B 1dd9017817afee9f187a0751b4b227ae919e44a093f538e46ce1533edde7f28f608ea1f4b67a99040e48c95f25b1cf14a66e9859aa5f0fb7c5707b7a8df22b82 SHA512 05fb1637fab8cd863d47a2da148d9b97eb8d5dd2c95a4389ddf2ebbe68b6c10ac02e2758e084d30f0345ce2f066ef1ac18bd805a32ce1fc71a79f7185fd7256d
+EBUILD jupyter_client-7.3.5.ebuild 1202 BLAKE2B 96b4a62eb48dd0f1eb013620fe34895b66f0449d7e4a1a159dcedf4d0684196c9067ec8610521f10e5ddbc63974286bb24c31ac5d534cd6b5ff0d6fc4826c41c SHA512 a514e0e53a19f54bc0d9d5f5a91ca5b9d6ab26554724f97722bb573de158990a61f43e4ada9a0bbc0da5f128b5e2657ea7bfedd73226818bd97473f2a97f6393
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
index 8b28df440476..4ee8e59fa00b 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index a05214e7b48d..4f603000f683 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_packaging-0.12.2.tar.gz 27990 BLAKE2B 0cd07fa760fe0bd4529e8430bd52863034cc4c78d8f906f55530a6825c496b8a1bf2fff76da3f4e963ee43c80fc19347edbaf20d16fbfe51584b040b0ab4d3ed SHA512 f4167c7beb3188d2e4b0fa8601fb8cdede8b20dc8c16e0bccbcf9e317e75e24ea1469a9d904bb35b2d81dec351caf49526ef35e5d91460a099a8e4ed6974e1b1
 DIST jupyter_packaging-0.12.3.tar.gz 25350 BLAKE2B 62c9f35a3008f8252f8ae8a55b2f7156fc98347b48dbe9bf08101b9c9b0cc892886cf248e0d916455f472bd5130dacccbfb9e206818c5f096eb759bb6149f758 SHA512 a81a4b41ba7b31b9d71aa338617ed8567100a64d999e6cd0a14586350bcd37bf9782cbaabad755c0303510bd342ec141af01157cbdc1e4373289700dfc40c3c9
-EBUILD jupyter_packaging-0.12.2.ebuild 1036 BLAKE2B 3c9f32cf7a46e88b61ce836c8d6ec053e86edf684f4412c8ad4fb038eb80c2120d0fc1e3fd2f6571cda1c510212c86fb3c6ebfdd6c46bc9ad7027b1546fcb46b SHA512 2f3ac5cbb9a7fefc31c8f4b458cb6d8014b299435e52b5839ad8e06091cd3630c506bc17cfc827358196df3cca182fc79dcd9dc2fea24d3a0223b639d07afbe0
-EBUILD jupyter_packaging-0.12.3.ebuild 1044 BLAKE2B da3689ecc34d35f9260c0bf53be9161d8637a30ecfeaeffd6af4b340bcf0371419d7200e15d3e918611cd30fe60ccf379a4d4232dd10feb367cc88e78c738480 SHA512 8383b60b04010967608208556aee03294356aa91f6b390aa67dd97a319517440745edf0ff9bdda0a89aeb0f87808de288406afff497954a7d2646548525ec4e1
+EBUILD jupyter_packaging-0.12.3.ebuild 1036 BLAKE2B 3c9f32cf7a46e88b61ce836c8d6ec053e86edf684f4412c8ad4fb038eb80c2120d0fc1e3fd2f6571cda1c510212c86fb3c6ebfdd6c46bc9ad7027b1546fcb46b SHA512 2f3ac5cbb9a7fefc31c8f4b458cb6d8014b299435e52b5839ad8e06091cd3630c506bc17cfc827358196df3cca182fc79dcd9dc2fea24d3a0223b639d07afbe0
 MISC metadata.xml 543 BLAKE2B f22c42fcc55d0a26966abd01c5e4fe480edff112a2e34ecf0214a2f1b50c120f937a6d377a544136e1cd55e89216efc0a9788ed6aeef8403e4e30a15d9d9af12 SHA512 3243614660159c0c7afed90cc084e4c0c7d85d71628f437ee1ecfa84c9a080f27cff92c5a40a134e579e03b93a1777232add591c7f36262d5bb3e7ec83b6441d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
deleted file mode 100644
index 68c1904798c8..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools to help build and install Jupyter Python packages"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter-packaging/
-	https://pypi.org/project/jupyter-packaging/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# require Internet
-	tests/test_build_api.py::test_build_package
-	tests/test_build_api.py::test_deprecated_metadata
-)
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild
index 60f174880fc1..68c1904798c8 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 39bb42ef6dc7..42a088da6ba6 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -6,6 +6,6 @@ DIST nbconvert-7.0.0.tar.gz 860724 BLAKE2B f333145df45f7295259e964f50a68ab6c33f1
 EBUILD nbconvert-6.5.0-r1.ebuild 2130 BLAKE2B 4aa566ebbaea70b1b416e7d89f6b81cf2441ef06e9b3fbf634a8a3023bdf61623e4ee89a66bdeac1d7a19ac7862b3449d43362b7611356c0ee458fee66363030 SHA512 3e1489bb742474e7458473b29348a11c1684b30c6970a5d441269f8a1b9323a7d7cb607775cbef8ebbe9b21e04e04fedfcd5fa2ff938aa8f576144ee399dccb1
 EBUILD nbconvert-6.5.0-r2.ebuild 2164 BLAKE2B d5a83ecafb3d5f53da8873bad5939a55446251151ca75eb4c5d1e259dfbb66cc218d46b5b3e36bac7bdecd7bce46769b9ae3235139f692510c4a5dbdd7394a77 SHA512 65ce070a061f9d4f1f743c638d99801f55b92af42a9b44c9e7a748abb95fc20d68cc71dde036e09fe7f8baec6238d17d9f8b1d8e13166ad0575c9a85daa3ea3b
 EBUILD nbconvert-6.5.2.ebuild 2210 BLAKE2B 927c3852ea378865068dc02d09b21cfe83fa3cfc2a336c229a8126e0afdb5e06e1c51c05c9afc8659ebf79e792d6a1d6ea1fee2dde947bbffdbd34fb1c596a65 SHA512 b826f1fa592ddd39dba20528aae8c0285953ab94ee2ca661572b1c15e701f001719fbff1989afd098832af22c42cb8b275aca33752cb812b13f3372d31177e34
-EBUILD nbconvert-6.5.3.ebuild 2217 BLAKE2B fd177bd1c614657d0328acfed12b1cdfaa016ee1450568f090f0ecdba39919e8d290479c818ebe3b991c6d6d2802eb0c77faea52a14dc2cdfddab091deb5b947 SHA512 6956bd1772b9fbf217ef2fafc1a0a28e8f22e79621ad58902655bb9bb37312b403d1284d52fe849bc32441c95ff72c8423e754cd7b760d4b419cccd7a1bffc3b
+EBUILD nbconvert-6.5.3.ebuild 2210 BLAKE2B 927c3852ea378865068dc02d09b21cfe83fa3cfc2a336c229a8126e0afdb5e06e1c51c05c9afc8659ebf79e792d6a1d6ea1fee2dde947bbffdbd34fb1c596a65 SHA512 b826f1fa592ddd39dba20528aae8c0285953ab94ee2ca661572b1c15e701f001719fbff1989afd098832af22c42cb8b275aca33752cb812b13f3372d31177e34
 EBUILD nbconvert-7.0.0.ebuild 2749 BLAKE2B 98617950e2c60b91d8d9942887f72200ba5e3453e2d9af80e8cf4e1b8ba888bc00e141650826415fa09b0dd3fafecadcdb6cc6640aced93c9e701f7218a8c586 SHA512 4b1d90c5dd6fd3b5b2db1c2256c809fb6b7044f9847b98199b6efe8e6271a4264e811ec3d420cbe371d727e332d30f7806b804197a89838d03b7b95d88097a0d
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-6.5.3.ebuild b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
index 476cb552e368..c906c6a98bbc 100644
--- a/dev-python/nbconvert/nbconvert-6.5.3.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.5.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index b2896fe1d242..c89eda8833ba 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -5,5 +5,5 @@ DIST pikepdf-6.0.2.gh.tar.gz 2905158 BLAKE2B b80bee6690513ebd43b590ec5addb40f81a
 EBUILD pikepdf-5.5.0.ebuild 1597 BLAKE2B 8319cb40e4d91004e5b7f9de651dcd0814cef376e9e05a309f86ceac434bce74f5f918d2ea011d7be55c63455b6fc6b2ee4356d89df581f22d924be8ec466d8c SHA512 0d1472ddabaa4361b2fc5485e2f89832b0297ff4960ba782d965f5a76e0874f2f2fc9bdfb8d171c650b98a1859eccbd2f3f248fbdda5a7ced1f89c3494aec211
 EBUILD pikepdf-5.6.1.ebuild 1598 BLAKE2B f7191dda799b549a49be5ca55c7cf404af5a52a2be9b68bf7df0cc35e1546117cf433cc17207188954ac2b2856f611abf0447548ebe89553da676e7957e0d6a1 SHA512 d46bd02a44433d50ae1c57cd8fcf031b6987b5aa3727512a3bf883555ab883379377df4ed2825e3c0087e289363f482d13bfe0f9980df13bc820ce7884ec79eb
 EBUILD pikepdf-6.0.1.ebuild 1598 BLAKE2B 94d59af463276a04503f5fe18611f7848aa4087285f9ce20536af3bd5d31c957b1e135e368533f61853212805d3849cd94ee56248a27e009152cdbd08ffea12a SHA512 468e85afcb180a010048c203c6d10c224889dd68b40dc064b516a61f8a10fb916cafd249bffbec4e4c723b206ea2c6d295cb3ab6180a062a2933813caefb8c5a
-EBUILD pikepdf-6.0.2.ebuild 1598 BLAKE2B 3874777b0395611c2f0eadbc5a3268dbc72e6789193f2fe974f0606285eb673ae45f1e6812ef8d0c1f71249ffe331757291e3a5c4ef190275b2ab74819227f08 SHA512 9c58b6673a198dfa6b748826b1f79b82dc9c00ff395c6ec3aa19940817ad4c6a02cb0ac854eeac0405d7ee1ecd0b2287cf37ee3e1d09badec1c3617c6c897dd0
+EBUILD pikepdf-6.0.2.ebuild 1610 BLAKE2B 3dfefff27b46ccc0ada7894dd551eee6b08e109ea5f4b7493e527d0aaaa8e0cf893aeea151570a0637900abed5205e5b739d44d4587c5299e9565ba68486ac5d SHA512 cd079718bf83a3290ca7826d9e8dbd97f101387d960732b937504afe80c629d9a41f34c17122c9c906d98282147cc67da5a14ca3ef452501de535f78cda4a151
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-6.0.2.ebuild b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
index 0bf44a4e158d..bbb61de9afcb 100644
--- a/dev-python/pikepdf/pikepdf-6.0.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.0.0:0=
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index a3c273353086..a4bc643913f1 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -4,7 +4,7 @@ DIST pydantic-1.10.2.gh.tar.gz 888288 BLAKE2B 9aac69ace185ccc56255cf36f9af472caf
 DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
 DIST pydantic-1.9.2.tar.gz 307957 BLAKE2B ee3b188dcf058fc81b5f8491a5e757114a3b39db4d9aee3265051559f6ac25cff01bfb3b0536d0f0425534bd9a5a6444b6e6f2ef84b91a6c11085e15ac25265a SHA512 524595aea9401e82d2e985fdb5aa9b4a8b39edfed856d08e057695c786d65c3455991e4f57ce326902ff9cbed328bcb5e6f4133bda769fecea5affb68f3b4345
 EBUILD pydantic-1.10.0_beta1.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
-EBUILD pydantic-1.10.1.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
+EBUILD pydantic-1.10.1.ebuild 1963 BLAKE2B ce8055232098d40bef26a270b36eb61540bbab56b226e35910f6f221eee0bbf778835b3561aeef42110d768c80293b57af1c2720099a016dd9864f45fc8851e9 SHA512 0cc36d046db6e97f5c5bd960f77e0f2479762f5b6a404fb8de5d6cbea2abbf93442bd478f854957bca0aef0f50186e729da2041274b72d00eb62e76ed5b533ed
 EBUILD pydantic-1.10.2.ebuild 1967 BLAKE2B acf8f14dfbdeb20ecd389acc4277dc75b1aa3901c1cf623061d55c65e26941fe2be673b02f4523dfb50f2b8e526f6081116c4ff3d566243496569e531d3a5f2e SHA512 14b7500e7ef2ca647a4e6d7b31ac8aed7279754ca07c08c8bd46d66aab36821dd0c6f6d6217a9584cf167aba1293ea89b721880ce23f33e4a76f2a41c2b428c0
 EBUILD pydantic-1.9.1.ebuild 2099 BLAKE2B 10a509b9b1b527e01c0aac2542a09dd9dd0a38132d45c2e02f3b8c0fc1d469d4d4ae6a5245e27ccc7cc85f8538edc86cf249c14e365e43233dee0a5127f85852 SHA512 c28f602375c529b5081ba5823c68452f5372fe97b9cddcd09100a617834f01fc9bfac731643cc18dc370387934c14c40a9afb4405a8c56f589545b243f82ac05
 EBUILD pydantic-1.9.2.ebuild 2099 BLAKE2B 10a509b9b1b527e01c0aac2542a09dd9dd0a38132d45c2e02f3b8c0fc1d469d4d4ae6a5245e27ccc7cc85f8538edc86cf249c14e365e43233dee0a5127f85852 SHA512 c28f602375c529b5081ba5823c68452f5372fe97b9cddcd09100a617834f01fc9bfac731643cc18dc370387934c14c40a9afb4405a8c56f589545b243f82ac05
diff --git a/dev-python/pydantic/pydantic-1.10.1.ebuild b/dev-python/pydantic/pydantic-1.10.1.ebuild
index c666dfdb266a..dcf64256c714 100644
--- a/dev-python/pydantic/pydantic-1.10.1.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 23da7e7ae358..ad378b277fc4 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,9 +1,7 @@
-DIST pylint-2.14.5.gh.tar.gz 1275994 BLAKE2B 0d490e81f758cca0ff5c4108090414373c3276b3a51f54df26938e128d82b15ca976cb62d999d8b012ce1fe69b56988a385110be02b1d2a281e39d9f91cdb378 SHA512 8c4d2b17c078c305b081e7dd225a1e744420e01b27f63217f80d61e6bcd0e4f8381c94c504cacd3b8f96cc58c3c53d693fb59277ccbd396ea31f6c72af666042
 DIST pylint-2.15.0.gh.tar.gz 1304038 BLAKE2B f22799cca283cd9a2721e264aa125e6df2a4eb9d9fe682a54a2a62adf76171b13de43b5de6fa6b58253bcafefb7f88b43615427a01edf9a0cc4a956266833c4c SHA512 bbcdff2569e53e1fafd94a8d484740470e70b075e52a07baa5ab817a62cc0c5ddfee42087bab172cac441c74899a4f2446efba9b2bd8deafc5a0338df2cd87aa
 DIST pylint-2.15.2.gh.tar.gz 1309122 BLAKE2B 8dd36d770e5fb232378f15bd2a9257aba7b504e747c6d57fc94a4e8bf2b46e1c30a9063f2243cd46f40fbfc9ecd44c2a657f353a36682a71408a49f250a5fd20 SHA512 2c3fa51718cb6722c5166539e5464110a7d51b9c565d181385197395ee75d2f1360553b0c6d0a1acefb500969f8b4aa8d564f4818086d413e7958e834f1a7337
 DIST pylint-2.15.3.gh.tar.gz 1310617 BLAKE2B c060178b83b76d5d12d7afe702ba34684c84314cb17ce03e5549eb4e5cf3cd11df86f0c6cd3823b88464ccef23cd2d1d68e50fb813a2a2664f9b43ef0f872425 SHA512 7cc499a718924d936964f644d27674df16a342ea6cd4228a6c0b5eeccf468211290eed34df1614f99c63801b7d7713dcaffe09cae01e4ee9869e11d5dc63ec2a
-EBUILD pylint-2.14.5.ebuild 2300 BLAKE2B e24521d06896cfd5307dbed340d1035a182b42d985c59ce6750ea709aaa3658d7d4516e216751b7088c9946dd5bfef15f428c4b0f139cbb2a78731396b3229ac SHA512 3613ba3e532e7be60f89c21775009289e65a536ffae46b742a5e74bffa1f91e8f9d59de831bb479ebef1fea1fe5074816d0f3497f5a047c729b1522bbc357d5d
-EBUILD pylint-2.15.0.ebuild 2308 BLAKE2B abb3e3f981aa66ecd7b32c3b249bb3eed9462df776f4725ca46557f0820da33d7fd4b44a8069ca083de8c1ca770c1b1db967df62db5b9c5b7fa71c7480d83d34 SHA512 f556375145be01a5494b42c764417d87a2430e870e1824da97919a955656f7e506a57c6a4cba2ca0f90df8f8cc65d8958a97664a3fc27352b75f726d9b4b5486
+EBUILD pylint-2.15.0.ebuild 2300 BLAKE2B dff27aca2f0dd150541a4dc9fc21203aef23cbc02546a6912c48ca1d92fbdee5fd03f48a0e748c75c7d8d2fd20f58a5f558e762def70ddaab2d9bd9eeaa13b98 SHA512 7e0828ec8dc4cdec698f6fda0b7ec29f32926120b0c5398a72bb93e35999df3e6c5e267adb0facaf592d169ea76f8bbd6b65525d731d475655983a0f468b1604
 EBUILD pylint-2.15.2.ebuild 2308 BLAKE2B abb3e3f981aa66ecd7b32c3b249bb3eed9462df776f4725ca46557f0820da33d7fd4b44a8069ca083de8c1ca770c1b1db967df62db5b9c5b7fa71c7480d83d34 SHA512 f556375145be01a5494b42c764417d87a2430e870e1824da97919a955656f7e506a57c6a4cba2ca0f90df8f8cc65d8958a97664a3fc27352b75f726d9b4b5486
 EBUILD pylint-2.15.3.ebuild 2308 BLAKE2B abb3e3f981aa66ecd7b32c3b249bb3eed9462df776f4725ca46557f0820da33d7fd4b44a8069ca083de8c1ca770c1b1db967df62db5b9c5b7fa71c7480d83d34 SHA512 f556375145be01a5494b42c764417d87a2430e870e1824da97919a955656f7e506a57c6a4cba2ca0f90df8f8cc65d8958a97664a3fc27352b75f726d9b4b5486
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.14.5.ebuild b/dev-python/pylint/pylint-2.14.5.ebuild
deleted file mode 100644
index 89b5e676d2eb..000000000000
--- a/dev-python/pylint/pylint-2.14.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/PyCQA/pylint/
-"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.6[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf pylint || die
-
-	local EPYTEST_DESELECT=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
-	)
-	epytest
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.15.0.ebuild b/dev-python/pylint/pylint-2.15.0.ebuild
index 1306c2d288fb..4db2a615b75c 100644
--- a/dev-python/pylint/pylint-2.15.0.ebuild
+++ b/dev-python/pylint/pylint-2.15.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
diff --git a/dev-python/pystache/Manifest b/dev-python/pystache/Manifest
index f0257d2c3502..197af49c25c0 100644
--- a/dev-python/pystache/Manifest
+++ b/dev-python/pystache/Manifest
@@ -1,3 +1,3 @@
 DIST pystache-0.6.1.gh.tar.gz 279050 BLAKE2B 2c61ba260764aa4bf62039bfe1f844d34e26adc29af2f1e1d98619892bfabd3151aa1d34c69596389a68f0d84ce994ddf7114c091d42b497a17b300a5aff36cc SHA512 516d286f84d2c77650550365f6b219acb712376f0b7302fff2aba7dee4d64e3d3fc2d781782777dd37093f6debf52f9d2a40b6ed8b65aa5f7025ff762cb5efae
-EBUILD pystache-0.6.1.ebuild 854 BLAKE2B 6502fefd9cc74e265a52933dbf6ea08f6c139f035daaac4b78687df6c30ba094f5f242ddaa51c9f4b79ba83d7f6afb07b716f702147e17e54b4df9c4838d6dac SHA512 0be98ab2ef4d29c384e0e241334f2e28d4f681abe908c82df18fab44fc9b7b600d0e6e381d61a0170befb80f7065d8f12f061b5642b4229ac9ff716d234705da
-MISC metadata.xml 508 BLAKE2B 7630eefd70918d888f0cb18a8f4c2f053b8a25902e8063c2eb0ce388bcd2bbc26e51e0f18a6d354206f474bbc84d1982fd75ab8f67a5b9ebd2ed8dd45e1ce860 SHA512 b1b92ea9ea7ce37d8bbfcda2bb7409d73280b843aca7f0367d7b3b57d192b591fcbc888d18fe554faa064f81519aad6202d6ac89b19b949b0ddf9e40971fef3a
+EBUILD pystache-0.6.1.ebuild 847 BLAKE2B e84a6749ac232e521f13312a8ed2a0b30777840f1e4a04b3b9272d8e2dd7b47a6c69de3b2d3a0aa8f15beb5c185567ee2cb7123c1d0a54b2b2cb46e13fd9d48f SHA512 25a7790b1554398b4f7398f9217914e0ab5f93129e367eb8cbbaede1d173f3748e08a0e2a546d96e2f45c5abb55b0261af3bd0a5d153b27263c3271632f2c6a4
+MISC metadata.xml 500 BLAKE2B cc318e5a7404297e5766f09b3a56615d2c6b60befa2efffa25c61c63de716cb0e48c906c5d315d7078218f7ab3fcfefb2423d48f1c62c988333d949e14918f42 SHA512 9f2a81c3e164a107c15026b222414284aa105d37dad12c5ffc0650992c0112b701eaf6550e325acbccc34e7ca83b22e31abc15047c3763d95b8aa0fa90e4718f
diff --git a/dev-python/pystache/metadata.xml b/dev-python/pystache/metadata.xml
index 4732addd5f39..abfbdc95383a 100644
--- a/dev-python/pystache/metadata.xml
+++ b/dev-python/pystache/metadata.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-		<name>Steve Arnold</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">PennyDreadfulMTG/pystache</remote-id>
-		<remote-id type="pypi">pystache</remote-id>
-	</upstream>
+<maintainer type="person">
+	<email>nerdboy@gentoo.org</email>
+	<name>Steve Arnold</name>
+</maintainer>
+<longdescription lang="en">
+	Updated Python implementation of Mustache, a framework-agnostic and
+	logic-free templating system supporting both Markdown and rSt.
+</longdescription>
+<upstream>
+	<remote-id type="github">VCTLabs/pystache</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-python/pystache/pystache-0.6.1.ebuild b/dev-python/pystache/pystache-0.6.1.ebuild
index 5c9556870963..537b5773b2d6 100644
--- a/dev-python/pystache/pystache-0.6.1.ebuild
+++ b/dev-python/pystache/pystache-0.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-DESCRIPTION="Updated Python implementation of Mustache templating framework"
+DESCRIPTION="Python implementation of Mustache templating framework."
 HOMEPAGE="
 	https://github.com/PennyDreadfulMTG/pystache/
 	https://pypi.org/project/pystache/
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 01db70cbf15b..8d92b6cfc45b 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-check-1.0.5.gh.tar.gz 10296 BLAKE2B 8eac4185e223736181e9465c8d4220874553d9e12d068069b40e7a1ea150c93d533facc8b3483649eb00da9a2286544c58e2c530138f830155466e3bb71aeedc SHA512 73c42c98639bf3026e62f5c2c9ce404ddbd4711afa1ff31d207886329a45cfc1c0f263dd3321a9b203b9b68cad87f76bbff61894ed7a67d0bd26e7d0d20ede21
-DIST pytest-check-1.0.7.tar.gz 12980 BLAKE2B ebcd8aed8ca20c67c9683a763da181981e0814bb10aaacd803f827610a3f33730655dfa684fc273b347a2542bc6c3f20e8253cc17d8a4bbe05c9938076784e4a SHA512 5cf5b25bc264475d475433f1418376c933335dbc7c765419cb00e6143a18d0ef560f027d472c21e2a339cee5111c487d7edd5b5cd149315e9d7cca956b928959
 DIST pytest-check-1.0.9.tar.gz 15260 BLAKE2B 8bbf0299e76a0e5acbb6ab4e8ce2bcb386ad2e1e91e1596e317bed9800b03c0fcadf76abe76a0ab9d2d8d190dbd839e042579abb08ea898b8325c27898670088 SHA512 058bb17255f08b83e0fc9f6c91be99b2a17676eae903f70999598c1ee69cf0b89cbe3767bbc3fabbacb2a5db35d26ed825599f401f693f4dc6195c02fac5c923
-EBUILD pytest-check-1.0.5.ebuild 853 BLAKE2B 6ba896d3749b6cabe9fdb7300e8fefe013b65ae2c4644a7cde925bd2f068bc5d2fd7c83ef35efa1c7a450b8e2725a73a353425eabffedb48a3bb4f08db64c2c1 SHA512 e8e8eda9ec7a1d578ed02b4dc41249b959f99d841e15671b82d074abe22cf7f0360babe01c71d10d3c0f9a345dae6b2010ca7f10ae3a562c20b1057d77177889
-EBUILD pytest-check-1.0.7.ebuild 814 BLAKE2B 39db3a15198300fe7029baf743d752d23562d63d12a93990c5e9f091486c758102d0255bf697a405f056d6e43f6d0d21567d975380a2747169fae24144cbbe56 SHA512 5bca09de91899dcb24af7a7a7ae7736ca1ea72a6a8dad928c0a8630257361363aaf5e892c6d6f24316a4d378bcf4c863c47c18ce21c10e5b90e974ff4508db5f
-EBUILD pytest-check-1.0.9.ebuild 814 BLAKE2B 39db3a15198300fe7029baf743d752d23562d63d12a93990c5e9f091486c758102d0255bf697a405f056d6e43f6d0d21567d975380a2747169fae24144cbbe56 SHA512 5bca09de91899dcb24af7a7a7ae7736ca1ea72a6a8dad928c0a8630257361363aaf5e892c6d6f24316a4d378bcf4c863c47c18ce21c10e5b90e974ff4508db5f
+EBUILD pytest-check-1.0.9.ebuild 807 BLAKE2B c3aa0f860155660588326f82afa57021271c19a9afe01d378dbdda6f87753f5056442557e0b3c09044cba9cfe4fb5ff3cd47eeadef2ce3bb5ffa94dc23132109 SHA512 1104ee4ae8b6a41f5826efdf9737d52a53148987fef67b7d28649f8e89cd4abb175e4ab0882735d281cb1de1ef9fc8a4a3667215c26827417556a74d9720094b
 MISC metadata.xml 509 BLAKE2B 15bcbc2bd083ae1bb1175a40ebcb86b223b2ed783d4790a75512f86bf2feb49e25d205378bf8acaec2db5aa32e3bb73db668654b5712988aa2b2f620995f12bb SHA512 851c945ae636a64f1782a315603a27f2a6fa085ec40baedba98f31bc90cb5f9b4747561533cfd6b526fc889be3b67453091fbd0439a94a5e6dbe6ad9aef99dae
diff --git a/dev-python/pytest-check/pytest-check-1.0.5.ebuild b/dev-python/pytest-check/pytest-check-1.0.5.ebuild
deleted file mode 100644
index ea988a8d67e3..000000000000
--- a/dev-python/pytest-check/pytest-check-1.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest_check/
-"
-SRC_URI="
-	https://github.com/okken/pytest-check/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Fix expecting result in case pytest throws deprecation warnings
-	sed -e '/fnmatch_lines/s/\* /\*/g' \
-		-e '/fnmatch_lines/s/ \*/\*/g' \
-		-i tests/test_check.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-check/pytest-check-1.0.7.ebuild b/dev-python/pytest-check/pytest-check-1.0.7.ebuild
deleted file mode 100644
index 31947e866cc2..000000000000
--- a/dev-python/pytest-check/pytest-check-1.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin that allows multiple failures per test"
-HOMEPAGE="
-	https://github.com/okken/pytest-check/
-	https://pypi.org/project/pytest_check/
-"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Fix expecting result in case pytest throws deprecation warnings
-	sed -e '/fnmatch_lines/s/\* /\*/g' \
-		-e '/fnmatch_lines/s/ \*/\*/g' \
-		-i tests/test_check.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-check/pytest-check-1.0.9.ebuild b/dev-python/pytest-check/pytest-check-1.0.9.ebuild
index 31947e866cc2..6e39e332ac34 100644
--- a/dev-python/pytest-check/pytest-check-1.0.9.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.0.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index c7a907cc0195..49ace60cd3c7 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 822 BLAKE2B adb983236b3a11d64cfdb6ff061bfd025dc79b6a983bd5c49f794ee6088afcd3b923212c434fe9c382f11dc200aad57de37dd956fefc860cf9bb7b51d2d16eaf SHA512 965d7bc5765b89ff7cbbf094a93c1654087f6386879dde9440534a96c468c141860d639a580b75fbe75a2facc617e9122e74ac3e88a866dcc660553301b1f655
+EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 834 BLAKE2B eafe9233057caea6152380c8133b20ed9421b299236fefebb9d7320b919db2dbd858bc0c9888be832a6e1ce20cf932b01f6f5893e07e967b961ff36ab48c3de9 SHA512 237cef07409cabe83d4c446050f17e1cfe02993f3040780a7489d340987dfff9fe7f80a3ce7c8be5dbd1e8e200df50f92a69356d7bfa28c917703da4069326d5
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index c53f9037ac21..c89cf6a1eaed 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/python-xmp-toolkit/${PN}.git"
 else
 	SRC_URI="https://github.com/python-xmp-toolkit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Library for working with XMP metadata"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 0bc4ca00d41f..aa24fe2fb9ae 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,5 +1,5 @@
 DIST pyudev-0.23.2.tar.gz 87199 BLAKE2B 0ce4300296f4fcc3a56ba4100d3ebe7734330b3096fde59475fe9880758a3279324c4c3df883b22d1ec9f4e0cfa83fc7c25fbe54ed03a5e019567595deb21211 SHA512 40b947d363dca73789f5ab77cbda4b48349e28fe04f2f5cafb93d20799d842ebeb2b7d78d1f16dcbcaac5c20aff1b931b372c75852706e731337e6e1d30b8538
 DIST pyudev-0.24.0.tar.gz 85887 BLAKE2B 82f23a1bbcd8ce5dd9e6f0551d967e7209067541185410668944734a5f0e17a907d6143cee81decb868d64cf8a0fe642dba7dc600f5ae3f03d9487f882d0aef3 SHA512 c711053a58cd857aff9e1df116ff11cfc17426d9f5a092810403150bec36239213a87b428bc31ec862b75b64a027f2d21081e15f76d914b67a9ddf39b0b73379
 EBUILD pyudev-0.23.2.ebuild 1439 BLAKE2B 399c7dff384a4ca53b02a822cc3291f6d6ccabfb6965bc368ad0c11d7cbf2fe5f56e8ff9f5202dab723acc5574d8201e49719f39bcee2bf678dd1ba59f795211 SHA512 22fa81be3998cd43d4ed122588a336cf88672deecc39c9cd35e748a99ed48159e50d6ca4ab880952526eb41cad46d19b94be1773ed7cbc96f265169570632eda
-EBUILD pyudev-0.24.0.ebuild 1377 BLAKE2B 826df3e60dd6d8a558992eb12c5b49cd340dd9e4bbe01916f52879c3ce048a153f7dc98f2f74e14db6dd418bd1bcfa69d18f9c34b82540ffab8a0d266d3ca545 SHA512 81c10e574ccfd7ecdccd7211677ff7877b05406844f64d7248caacf8df79debf49b77331da95b12d4174a409dce027348dcb4afb28e7e1183c75c5dd9c8270d1
+EBUILD pyudev-0.24.0.ebuild 1373 BLAKE2B 9f61058d3f3eb5bc73b0816406528052806866adb72e78089ec1fa64e1a1c54fc9a4fe65d3ada8c164a10ea947c5e499f442ef0c722e60058e3dd2ee17cc9587 SHA512 5f569a25a53c6e09785103b1c55b18904f7815c413cb136ede9f553543d63af092bfa23d73edb230c9c038221e10a1f5d2df58d7b80479f0eca9ca8851d8caea
 MISC metadata.xml 705 BLAKE2B 5668637e59e1d434d0a72d0856e7ed614a2f5a3371e3fa4e841f4d516228f8b8a5567bc6a91cb07c8ee1f9c14db76ce238adac5bdab987a810adc2aed994b5a7 SHA512 a73f8225942c597d02ed08d3dc03724858f33cc07a2d9fcde64fe20f5c4263d1b7510e26e6365af120b72e7c8ebb075b7606dde493fe6464db2a585a23ca4b6a
diff --git a/dev-python/pyudev/pyudev-0.24.0.ebuild b/dev-python/pyudev/pyudev-0.24.0.ebuild
index ca4c6d46a0be..558b604e2843 100644
--- a/dev-python/pyudev/pyudev-0.24.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86"
 IUSE="qt5"
 
 # Known to fail on test system that aren't exactly the same devices as on CI
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index c4c4665a4221..b3491af24e06 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,17 +2,9 @@ AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79cc
 AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B 79fba12b6219d0a9e3d25140359bd9589af0f501345797d74ed07d6efd0fe239b4ef2a357bb65d16c0544224022323418a4d3f57358433d776a4f2d41b7bbbb1 SHA512 696454cd280fe603ae014b829577cc3fd1b968478cf327528229cdf66dc0069fa2748cbc7b8519b26b170e9f01784523da2862dcc8623d24a8b7695fa3f4d42a
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.6.10.tar.gz 4518482 BLAKE2B be43079f4695bf20804864e5e0a4957093e657516dd6da45ca6b51a5da4522bed80ee0050fdd213c1fa6556c6c3e3c0173829fdc336c0d63b92ef3560c351675 SHA512 b079db8a51c917de1ab6f27d4ba733568e425fb73041331a9da842cdc00f583fb4196e5fa2a5cbdd3fb7f3681bba850950d5b391a38cbbf25ae904b88d0c278c
 DIST reportlab-3.6.11.tar.gz 4519404 BLAKE2B a099a4adcaf7186cbb558ba708abf47019cff33c6a5335b27bb1eb1377c3276ae9ecdf33e66f614880de2f72e195333f3a7839ce776b8946431e2d23872fb13b SHA512 2ef81850f4e30e78ef9e923d3aea7efac6c98dce83f90c0edd47384febd68eb6ac81e05c7038e7d67458bdae16d1b19b75e9aeb8da6a5283e9173e27e4369251
-DIST reportlab-3.6.6.tar.gz 4509457 BLAKE2B d2cb5c764aa86000dd97798b5aea25fdc07e4230015dda6c11099e379884ca74532327dfe723069d5e56569dd7e120d94918f64a5f705bfef212b484f812aa7b SHA512 6f05e5f7c6b6c0b6f8d65fe11e2900ecd427f6c293672b12a4cc094476da1cdebc0df59198660614251d388241d7c886c345f958d337d351ea048b3b25a71ba5
 DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdcb37d47b5e869e34e5fea93dc9ba017d09f088e18b6479266354076b89461849dd1eb7d1d4e8b12a9c4a95706bf66 SHA512 51f98900ccf7ef34fefc237bf1c787931a525cd82284685bda26f411760b97d1b85fce5bffa59b133705f6c1769a8d3616ef85ea368ed59dfc72f24d5faf6e88
-DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
-DIST reportlab-3.6.9.tar.gz 4507750 BLAKE2B 881eeaa36fb3934a75e420822d5b0d0f1718da190741190e58756c952bc3efac304e2c7747d8748713ef3f9449ead40c44d6774d6ca90218db51c16790d9e8cd SHA512 401127eaa3e4c9f303f5c13f96151a563a16efb15d1e9aaf6dab04cb23f275b552cdd8fb9a3a49bca420a8ddf83423c481dacdd11e39220592cf0ad911b70c42
-EBUILD reportlab-3.6.10.ebuild 1245 BLAKE2B 0b7cfb248e32193c06df4a017b018ebb47baf5786b91b12e641f43e7a3461d8a6933e4a7753860d1ef14b564aa6fe1ddec11ed1472bf20c61cf33ada6d3b781c SHA512 cea1cfff67c11de929dbcdf8126c1a078333ea96048bbe191fc84b62d047d08b74a831bac49b636c0ef2d787dae611d86478e113d09981d0b23d562cd3c9c5de
-EBUILD reportlab-3.6.11-r1.ebuild 1321 BLAKE2B 802b81d0f876ff4462a28f5db5cc290a777af0a4b99e0d7fdad1c6e3cbf8ea790fd6f28022e585ccb8f79f97efc4b6d7cacc64cba553311bfc858b7396b333c6 SHA512 b0ae90e750114013994805c3c8ce84623c09bf1271d23131dcc592e0554999eb7f91d461460d7f9002925dd557d33dbdd114132724f4520bb6ae927094f43df8
+EBUILD reportlab-3.6.11-r1.ebuild 1317 BLAKE2B 5cc053e94cee737957b8ba502b3e8660e00cc8d1b0750b32b3087ad837eda42e4dc9569aa2fef8622245bbe02c5a9ccd7048786891da6407bce342e1f461d700 SHA512 c9aa51f072f5fe76391604235a2069340a7e682d6da4236c44d5c188adc94bb6ad850a6de78cfafff6e48584635d5fa042dcb6f3718c4ac48f8b82a2ddcf14d9
 EBUILD reportlab-3.6.11.ebuild 1241 BLAKE2B edfab2fcbabdf284b533ec8574056e0ef39b9bc9b2e15d105c1dc794283a9a2b9a3eede59ea53c359c8c3be8a98acd070bd3d9848a45b52f192d2ff134dc3aa0 SHA512 52c5d09997aa27cfa523b18a4faad3e1bc4f81bce4b78e4e81b98aa856218a2145c4dc6d11adedd16894ae3c5cc17311b1cfefd06018a8c0276113131e276d3f
-EBUILD reportlab-3.6.6.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.7.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
-EBUILD reportlab-3.6.8.ebuild 1294 BLAKE2B 4f05f621cebd0f1bf5c81731b305f6c95223ace2e0f41f5202780b12137f9bfcef709b40d16fd3f3893da4a2bed0daa6826b3968d48f64852cee6deedaf29eef SHA512 38aef3cc5db138fb2356a5752e8b8c50a85964c368c211efc12c6e9b989d43d06bd8d59d05e4a7ed43c0f5711c985973010275d65e35659ead775dfadc0b8d29
-EBUILD reportlab-3.6.9.ebuild 1245 BLAKE2B 0b7cfb248e32193c06df4a017b018ebb47baf5786b91b12e641f43e7a3461d8a6933e4a7753860d1ef14b564aa6fe1ddec11ed1472bf20c61cf33ada6d3b781c SHA512 cea1cfff67c11de929dbcdf8126c1a078333ea96048bbe191fc84b62d047d08b74a831bac49b636c0ef2d787dae611d86478e113d09981d0b23d562cd3c9c5de
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.10.ebuild b/dev-python/reportlab/reportlab-3.6.10.ebuild
deleted file mode 100644
index e432d96c0d39..000000000000
--- a/dev-python/reportlab/reportlab-3.6.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-3.6.9-paths.patch
-)
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.6.11-r1.ebuild b/dev-python/reportlab/reportlab-3.6.11-r1.ebuild
index 990ad409b8ab..80413922f619 100644
--- a/dev-python/reportlab/reportlab-3.6.11-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/reportlab/reportlab-3.6.6.ebuild b/dev-python/reportlab/reportlab-3.6.6.ebuild
deleted file mode 100644
index 39cae44658d1..000000000000
--- a/dev-python/reportlab/reportlab-3.6.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.6.8.ebuild b/dev-python/reportlab/reportlab-3.6.8.ebuild
deleted file mode 100644
index ab5df4dfed0a..000000000000
--- a/dev-python/reportlab/reportlab-3.6.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-distutils_enable_sphinx docs/source
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild
deleted file mode 100644
index e432d96c0d39..000000000000
--- a/dev-python/reportlab/reportlab-3.6.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-3.6.9-paths.patch
-)
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-		use-system-libart = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 6486d457658c..c601daa24bfb 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,5 +1,3 @@
-DIST rst.linker-2.3.0.tar.gz 10146 BLAKE2B a2c1a97a8e734644f5124f89878d770d186c16a44d1eaa98281592754e0a8db4be1e019001448890e712b4e4fea3f4a0f0675009d5285ae94483ef8e8d34ae6f SHA512 a4190c3349c85ee52d17498c99c7879be3f0a98cfc0b5966cc2f6161f9b374d52a64be7035691256d96d4c2ebb2272d5d10802e5e716efedf78859e418e561e0
 DIST rst.linker-2.3.1.tar.gz 10436 BLAKE2B 0de71c1994b65c20f2ef13e1e8f9f04d431d9bd7215ca9dca2c51d78deaa55803f69432d27dd14b3b5f9d224b75f72a56ac4bba72ec3fad660af31b248a265ba SHA512 0c9f236e372ffe69c2b37983c491c5b6fdb41f1c2a4ac16d3d815bfe5e8b93b58f001d449a57e663041d69d0e13e13d17178c477a1ea37f05ba7e919fcee698c
-EBUILD rst-linker-2.3.0.ebuild 804 BLAKE2B 85233769a50031566cfb1e8f8567d50a32aa754c79f00960981ebad9e243f10e74546d2b4ac114c01c8997fcf263edb9342338ebed6409d67c8e91e52d7e93aa SHA512 bb48fac4d3d9d5b59850c99c3b8ec8f77863673b9445f961b79ed0a0c6a7815171ea8349db14f7e75952498b3294d4adf759df83ce6d051f65c77cfefeba18dc
-EBUILD rst-linker-2.3.1.ebuild 812 BLAKE2B 4a825a3255ab831930cdf139fa2c2acd44a5070720bcb1e5ca5332083142153115ce798b66feb8deba46aee13054b8bda23a4e01d6f90d43fe0ab62b311a0034 SHA512 7f702239367e1fd9de5b1e93147e2678792add9606f107060a2f288a5657c6fba950d7b1d0d7061f0a32fc9c1aca3c1a9dff9ce626f07474654d250975f90de5
+EBUILD rst-linker-2.3.1.ebuild 804 BLAKE2B 85233769a50031566cfb1e8f8567d50a32aa754c79f00960981ebad9e243f10e74546d2b4ac114c01c8997fcf263edb9342338ebed6409d67c8e91e52d7e93aa SHA512 bb48fac4d3d9d5b59850c99c3b8ec8f77863673b9445f961b79ed0a0c6a7815171ea8349db14f7e75952498b3294d4adf759df83ce6d051f65c77cfefeba18dc
 MISC metadata.xml 566 BLAKE2B 25dde9994c8bd1a39a9ca0f9a35d344730f43711d1b1219b834d3eee4232e5a1b2843aeac4f16cc780c96ec7537b750380d8adf4e06d6aa14eb4a2334c53db59 SHA512 31e07b2b90a0288af173214898a2f7589aa58c14a7641f05e18c4bd4a8623a3951d297337e9708a3c732649d23c74a22b1a1cd4cc7a18dbb28d0ead1a5eca87e
diff --git a/dev-python/rst-linker/rst-linker-2.3.0.ebuild b/dev-python/rst-linker/rst-linker-2.3.0.ebuild
deleted file mode 100644
index 80cbcd25e33b..000000000000
--- a/dev-python/rst-linker/rst-linker-2.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="
-	https://github.com/jaraco/rst.linker/
-	https://pypi.org/project/rst.linker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/path-py[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
index 60eacef4533c..80cbcd25e33b 100644
--- a/dev-python/rst-linker/rst-linker-2.3.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index a101ea785a06..1bd385427409 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,18 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-63.4.3.tar.gz 2600453 BLAKE2B 927be74bdc11271589134aca26849e61c5ae23d5780a57c96b9c4a9fe5f93e57fa8a80787c8db1c555f32fab1e007a956e91a374ed285db393e26d9486805ef9 SHA512 f19478921ffcf5441ec60a2af17c695456fee064f287e2130c4ff14d471a1124bd37104ad43adc7623ea0cba4ed170ed4aa37c6883aff8fd811ab960e6d12453
-DIST setuptools-64.0.3.tar.gz 2631478 BLAKE2B ff21a4cf81aed36561ac5a0da7d44c1cbe714bbd39de30041c48134c8e1204ad9edcb74540c392e4f4cf01ea161ae0ca4bdc55319e015748069986f30aa2d337 SHA512 0333322479d40b9d30187bcbb3ceadc5dd5ef8a5dcbcebc75f451b9fea06a5b7ca5d5db44c39278d62e932df7f563578c86fcd2cab9a41000caf15374a5cf182
-DIST setuptools-65.0.2.tar.gz 2619562 BLAKE2B e00e6ff7fd18c77c3924151bdbb40b36243b48eb389b67cee3279a82abd41943e08b4f8b7422edcce67b90e4c989fc170d96b140a18c78918ca7970039af8b29 SHA512 ccaf438b78a0d33ec4ec606f0fe64dcaf306dfe8935076b7534b984d0c0bfdf023d37a2b50e94572d54a5c8150e1458baabe811a4236410aedb75ee2a9215862
-DIST setuptools-65.1.0.tar.gz 2614949 BLAKE2B 89f4556b292afa7b46e558ff059647798a720647287419515cd3717ac37c6511f6ce2976967ceed98d1a34946116ad2fd366ce509b86a8153dc581171ab9c129 SHA512 6b18647b7a8a4c22e3115f233eaf97f7f564badcc31b2e5ee762630bbff3ef7f59397ca05cc4dbce65191f480be43f5e92de79eeaf8de6d32f0a79d88814e7e5
-DIST setuptools-65.1.1.tar.gz 2615020 BLAKE2B 1c45d7106e5845b95e6eec52b72749f80f799f1c5695b39e79ae7b49f52c0eab39fba305a7d2cb54a852679479db3c512e562b52a931e6a325d640479e5d4399 SHA512 29ec01558d6f6432c82797313cf12f1b3125c2000d9582e89fff415f59362c44fbfa00340cfbc4f7f4f9898161b3b585058115d1bc5b4bbcdfc0991812f858a8
-DIST setuptools-65.2.0.tar.gz 2614890 BLAKE2B a2da0870eaa0d36200dcfcab3fc63ea641d7b8451467ada32e834e94a9d33f84428e517a402d5e64ee999b5b8c2a0fff20044781fa5227ce3e2cc2fcb8f0796a SHA512 84e6e23780e6ef2e0010d4574bebf373f25f6c1e833b4e914f510e2fb3eabdbe1155c8b7d2cfeb93fd59c73fd3ad5b47c7b54e00ffaffa9ea84cf33fa5a6ee69
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
 DIST setuptools-65.4.0.tar.gz 2615629 BLAKE2B 778b0acf1a447fbc72043113da757d73ca5dc0df8e6be8dceff7e35d64a920793dca6098d8747bd66bfe1159236570bffb6f2545a0f89a2a7916f94f849b89a7 SHA512 4c8c6348fc5e9e2cc2d7b143b050103e7ed4252dd58ca5aae8d50ee9ec522789ecfbe61dd87513d47bfd1d4afc290a7abc07fd0a6e8d27155c6732111702032d
-EBUILD setuptools-63.4.3.ebuild 4145 BLAKE2B d81e28c9628dd01a3249b6d774c081c550f501be6056ac62a36e7208464240269841f78c8ab257132159a0281b60adb95b8203efdd98cbf116ba0b2d84568db9 SHA512 830f2c7c85c4e8e7373075025109b0b37b896f0126ffb3a032a4f57edb694fde68fb48500034a9c58b9e80fec6398909654c53b48881492a3b0193061f07a9a7
-EBUILD setuptools-64.0.3.ebuild 4265 BLAKE2B 90a66c5ece54c235bc5a0a0adc1fe880458bf8629e61f12877bb8fd9fc363f4a1b2e1bedfb9f809229de227dd2ac31b7c42a44b0bc7efa3f11173a58d48d5ee7 SHA512 ad5c82bb94c2c97dd4af5216b1cf1e53bfa9a58445ad5e76dedb346a4bcf5b2e51c2c9eaa03681d4428f8d5b19685b7644c4d9064e7af752d2be13a0b6dc3b67
-EBUILD setuptools-65.0.2.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
-EBUILD setuptools-65.1.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
-EBUILD setuptools-65.1.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
-EBUILD setuptools-65.2.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
-EBUILD setuptools-65.3.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
+EBUILD setuptools-65.3.0.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
 EBUILD setuptools-65.4.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.4.3.ebuild b/dev-python/setuptools/setuptools-63.4.3.ebuild
deleted file mode 100644
index 60dfa52f8888..000000000000
--- a/dev-python/setuptools/setuptools-63.4.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-64.0.3.ebuild b/dev-python/setuptools/setuptools-64.0.3.ebuild
deleted file mode 100644
index b79ed67ff041..000000000000
--- a/dev-python/setuptools/setuptools-64.0.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-wheels along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.0.2.ebuild b/dev-python/setuptools/setuptools-65.0.2.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.0.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.1.0.ebuild b/dev-python/setuptools/setuptools-65.1.0.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.1.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.1.1.ebuild b/dev-python/setuptools/setuptools-65.1.1.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.1.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.2.0.ebuild b/dev-python/setuptools/setuptools-65.2.0.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.2.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${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/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-65.3.0.ebuild b/dev-python/setuptools/setuptools-65.3.0.ebuild
index c11a0923e907..ca559b896870 100644
--- a/dev-python/setuptools/setuptools-65.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-65.3.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 8251daf08a4e..d605edff92b1 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,3 @@
-DIST urllib3-1.26.11.tar.gz 299255 BLAKE2B bf4d5f0b9f8a95c825b9f8fd963a1dc46688123641c3198812dedc11155f445f75ca321e3e283b649bc30cda8de497d0fb88298d6ad41660d91b8843121e50a2 SHA512 d2cc0f57469b640147f2087e2844a7c2c45e5a374ad0f28c1639d9a38ff6d6760f65b9b3187409cee29782d854468a1e4bc1b20d96e010fdd1fd4213bf1cd924
 DIST urllib3-1.26.12.tar.gz 299806 BLAKE2B 17c1f02382101b5a44fbc456344befe671c9579f6208ea307866ae0e2fabbe017fdd4b751a6053a6d014bf007f114ca4fc81e2149c9814ab5bef057ffcbce2d0 SHA512 c34bc2cb92ff5fb4e27948b6b8bf286d1f3993d8e399a7dc99e8c1cb07b364f16f9c8d6fc3e5e22e6f2d9285454a945174a9a1de3cb0fcf08e673ba316bc5469
-EBUILD urllib3-1.26.11.ebuild 2307 BLAKE2B 3f7465fe5eb0d5babf0f63795bf1e529c94c74b7db3083d0827071f8a3f96968ba294ecfe8056fbaec34522956be80849568ff013e48a02d787d50190d45fe1f SHA512 8b3574e934e7598b20e8be3409aca9ee7ce969b95adfa2ac6f70521ae8b49595597ce66c4c94b9fcb88e808dee1fb8b04b843f59a04885bcf07372020c92488c
-EBUILD urllib3-1.26.12.ebuild 2315 BLAKE2B ec115b8e76fca07a4b2c8405a97187ff99cb69647275300a0ceb884709ea311010b7f605db8076969e2c8db5682b3c5a8cda0d04e197ad97b698c1579e9e7c9e SHA512 ddef2fb641fa2cd8b4e1679716b8b914eeba0f7f0f38e10e7106bfe6487eb7d9bf93fe50142fc627bf8cb9f3b79297684276f92bfdcf71ffc1d56f40f4ee00e5
+EBUILD urllib3-1.26.12.ebuild 2307 BLAKE2B 3f7465fe5eb0d5babf0f63795bf1e529c94c74b7db3083d0827071f8a3f96968ba294ecfe8056fbaec34522956be80849568ff013e48a02d787d50190d45fe1f SHA512 8b3574e934e7598b20e8be3409aca9ee7ce969b95adfa2ac6f70521ae8b49595597ce66c4c94b9fcb88e808dee1fb8b04b843f59a04885bcf07372020c92488c
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.11.ebuild b/dev-python/urllib3/urllib3-1.26.11.ebuild
deleted file mode 100644
index 9f87338afe5a..000000000000
--- a/dev-python/urllib3/urllib3-1.26.11.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{8..11})
-	)
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle urllib3
-	rm src/urllib3/packages/six.py || die
-	find -name '*.py' -exec sed -i \
-		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
-		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
-		{} + || die
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	if ! has "${EPYTHON}" python3.{8..11}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# unstable (relies on warning count)
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
-		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-1.26.12.ebuild b/dev-python/urllib3/urllib3-1.26.12.ebuild
index 47fa4076e5a4..9f87338afe5a 100644
--- a/dev-python/urllib3/urllib3-1.26.12.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index aae0e006118e..9b2665e9bf96 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,7 +1,5 @@
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
-DIST uvicorn-0.18.2.gh.tar.gz 712706 BLAKE2B d8d300579d945a5c2f51b7746b93cd64710c103cd0b7694ce858ec0f4e9dc09f89e9663529dd84c13c9f6334d0f4543cc9442e94aedf8dbddd72a6a0394ba370 SHA512 d2e05198cd833efbe7dddffc30f9a52be3168192269cd493816df8a7d4053e312f534988ee09c5270d63f52dfa48d0b105862c9e05acad41ebf3a40e5fa1aa76
 DIST uvicorn-0.18.3.gh.tar.gz 713216 BLAKE2B ba1fb1f2241fa3c23bc4115d335ef1c176937e8af5e33ae7d1e615271c94bc330ef5cb21d6bedd697ecb2a38798758ea47d5523ea6ee45295cf447e81503ff05 SHA512 a4983e7095f3596ac54557432a074eb8cae4c6dd579fabfe8b6c34606ba8258e6c0684c2e34e8019f2455fbfd1771f8c2c88bf8b01fc505abfae93655f61f032
 EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
-EBUILD uvicorn-0.18.2.ebuild 1673 BLAKE2B 22a286fd646394076e5c3ec3958709559bca6349e80009ee64dc75e941a1625d21594989d8b2ec97720697619a0be0efab45ff1950cb0649504d1e4f125f37ae SHA512 913f3e72abcc10ada0629218f41bb98f85afdf6ea4b4cf42df90b8dca3be7f864ff242a61b7a7f6fd95c31c84f2c512b19a4a31fb7c8a170a6a3f289a6822ace
-EBUILD uvicorn-0.18.3.ebuild 1680 BLAKE2B a20a31ce9f222039bde644a208fa34185133e1b0dbe62ce8c4d02bf9b6d65c2480a7b8bb41cbe1727fad093895a0f76e7757ee65b3e44316629acba06a47930d SHA512 94a4d3db98ffa4b74b0ba19051975fe5cc9a21efc345d5cd19f9235a2bb5b13283d9949d7eea03e66b25e0ebd013cdb75a9f1783c282696b2acca744fc879e6b
+EBUILD uvicorn-0.18.3.ebuild 1672 BLAKE2B 9ca1d9a303ba136326695762cd9e6242a04c2ae9660e9fa397c83f9ecacd6e177f054af68585f4135d620ef018830be5f047ef13671b762fc9445c403d36998c SHA512 1a3fe5dfb54a312bbd5d99ed317d63cc8310c96d2734084c89c2a3c6ec961ab3b6fa0d01869012b3ad9851199bffb4d24db804a4e5c6acdf93a3cfbc547994a5
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.18.2.ebuild b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
deleted file mode 100644
index 8176b7865f0f..000000000000
--- a/dev-python/uvicorn/uvicorn-0.18.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="https://www.uvicorn.org/"
-SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# need unpackaged httptools
-		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
-		tests/protocols/test_http.py::test_fragmentation
-	)
-
-	local EPYTEST_IGNORE=()
-	# love from Rust world
-	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/supervisors/test_reload.py
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.18.3.ebuild b/dev-python/uvicorn/uvicorn-0.18.3.ebuild
index ed997d18da2a..f0b82f0f3fdf 100644
--- a/dev-python/uvicorn/uvicorn-0.18.3.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.18.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index e12e01b98138..c491b1fe08a3 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,7 +1,3 @@
-DIST websocket-client-1.3.3.tar.gz 48250 BLAKE2B 1d6027d7ad2f45ad774da8c4d5ad9c19c084998429cbd0ad5ade89700bcc21dc7c2ac452d0f4238432c0af16ca82d01442d002f988204c96e655d810906730b7 SHA512 e70b6c074cbcac1e97dc11b0ccf60dc67fc066f8394b6cbd20349c1d41d625966c03645da5ccd0a81198c80e2e40fdc267ac599bc5dfacadad4c511a83e06de1
-DIST websocket-client-1.4.0.tar.gz 48470 BLAKE2B fb61ab005099cb213361c3b7ac0ac824a4780aad97d4fdad72dff71a06f626179e6416ad0fe9ed87112a2714db90eb06616584de7331466f62d2e8864689c62b SHA512 3f746f2ecdd4694e4d7c62eeea193015d6a082b149ca5db16e3cbd305955c99e126bbfd62513dab0037a8bc06999c67b016461137bf271a8578bcd6388e637fb
 DIST websocket-client-1.4.1.tar.gz 50883 BLAKE2B 4d80b5d5f407fdd81b5468f37b66759970cf96395738b67271388c55d13c30c36c9f7a5a89b10fb78bde4870e25bea5761c297b3fc85b0b8d62eda24443421d9 SHA512 a2804421e97ccbfb61cb2e8a2be6ecd5d5d60210971e27ca4e00a4854fb49df2e3c87ec87c0ec11565d7ce03f419dc3cbd8c2402843a8fced49d75d65d07b502
-EBUILD websocket-client-1.3.3.ebuild 760 BLAKE2B 045744d48d8e7e6919b4be5f1484cd8f3449bdc732e2a4202d114f009d4f0eec6e5e97e7611a11c44be6c4bc1cd928b23b842ed71340ca2723fb6bde64b3ec7e SHA512 0b59ca720529f82ba4fd6cf6b615d7936ae9ce56f2bfa1377820a3b19684768cbaa5c5faef9afa81afd5d27c79b10d84fd8263214e78374dc9f05f60aa71c612
-EBUILD websocket-client-1.4.0.ebuild 768 BLAKE2B 847d9a3ef01883de1346f3bbf9b8d9d02b6d32bf7e68c34c58c49ec85743634a027d12380bd09ef5ac2a6740af5dfaea7cf94cb33110cf9761a00fab5960f9b2 SHA512 cb3cf8c86ad48a3171871e870ab7bb1365f05d8e220533f90a12581ef231b0b12fdee8eb2d54d44b8d0932db5a1c9c147a6f301e7de743d5eb2e2584a1cbf8f2
-EBUILD websocket-client-1.4.1.ebuild 816 BLAKE2B 52d55ac6237a6ce0b5de36c3e5d5cdae69b2ec5401c09c8b5512663c327655d269c87793e743d83d072bab4c65107ce248b1a41b7f430611f33e41dfd24097f4 SHA512 baba222bfc2b038fa835a4d636c736ef3e6c6800150bdf30b507f74eca3c25645ca4c9354d11792ad92fc78c387418829ea648022fcde66b9a687e5daf9fe6ec
+EBUILD websocket-client-1.4.1.ebuild 808 BLAKE2B 72dc35bcd75084c2d035de991deacc1a3047f0c8f3de23af9c725016b781876fc7ffcc2e46083a5f0dd74c4f5be7abe0185045eb2389c41c408b7c2e813a1871 SHA512 2dfca38ad3326b9ed47215cddf3f3fdbac9de0835c30095a67ef879119a0851794cc5d95ff6a9593a23eeddf088316de7742cd95e9dcea329c2775cadf7060cd
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.3.3.ebuild b/dev-python/websocket-client/websocket-client-1.3.3.ebuild
deleted file mode 100644
index 408b3a8a2e8c..000000000000
--- a/dev-python/websocket-client/websocket-client-1.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.4.0.ebuild b/dev-python/websocket-client/websocket-client-1.4.0.ebuild
deleted file mode 100644
index 688e78df8634..000000000000
--- a/dev-python/websocket-client/websocket-client-1.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.4.1.ebuild b/dev-python/websocket-client/websocket-client-1.4.1.ebuild
index 78665da331ef..4b0d756352ae 100644
--- a/dev-python/websocket-client/websocket-client-1.4.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index bab83fce3303..99a265c94a7a 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-1.1.0.tar.gz 52928 BLAKE2B 837f5d8411a55b026d8c5df8b03b44c92f71fe2856884e5199e639a5c060fabbe8eec39cb6861e8f88ae7fc366cbeef4f9d62dade2c95857d27339fa73e90638 SHA512 0cd726bc62ca4d11e96f470f51511008bd43dbb9e99a17633d2a40da7bdaf19716e0a1c995350f5c8f418f906848dd6f2b9b0a853c1b6858ddafa1cc02fab710
 DIST wsproto-1.2.0.tar.gz 53425 BLAKE2B 0b6bafb5d67be54a9b9c77a9682caf1071e82321fb9112ff977b643956ef5d2d5dcc7e523c6e3038c4548adb7b4f022fe2664112b7a10ab0e183d578158b0711 SHA512 43270687a1cfb5f35423c527de5b9db7ee2ddf27d416f47358386c1c94dc3f836a601f300bf66441c4b90130e6e6f502fb29dfeb2374dd76aefa19cfbb70a372
 EBUILD wsproto-1.1.0.ebuild 611 BLAKE2B 60015f4a5f0bd4185e6144e288b4480cf4271a92d3c9900aae381ddaef6ac0cec492568099224084760c700b5c875df28452c9d5bbfa05534dd8ae33776d4828 SHA512 b4e2af51d6a6c3e1ba99ac5b992b5414b70cea6ed05ee6402a986094ab6cab04eb5dbff137f39a30dbb3485543a091dc2dacc9c4c489e830a361e9dad94b34c0
-EBUILD wsproto-1.2.0.ebuild 619 BLAKE2B f4d330a31c31bcad792e354f6bdf883a121000d6b4e888de9fe4579b3fc7abd9a69d29d09dd350969b70441312f1f64ba219fd555e7671ecccd9acee09bb0296 SHA512 6e02771f4c7b3a1ab49cee9b26b7554aa0450b3e73a6b4503ec57cea20342b54178fc1a10ddac2552925d1b4b5ad3e7a7ee4bad606de715f20dc678aa0706bd2
+EBUILD wsproto-1.2.0.ebuild 615 BLAKE2B fcbd470404a0a3c7a99e70c0b3a57b04e08e8f1da11c4d27bfce5d33f5c518b1b460ace9dc517c1d4181ffbce0489af5efb49d97133efe424445457c46dd4357 SHA512 994a54638536aa31b092a7f46d2d4988f6f8c8865c04c9ffba3aace4ae4afc615b0647d994daae358b0777e77328e99ce4223b1fe32391b3968299a4e7b35051
 MISC metadata.xml 494 BLAKE2B 144d8a2efbedf70327d0f862e9e1b9d70d8ec72939cea4239e877f183485c9d4075cbadb9423f74b08e8c0ae806b8786467363ff0aae0845be227059e33304ba SHA512 c5818f8c26a0aa8b88b54259ed81c570bee27ca44a20a2f487109477608724f857a306c2b9b82a2a8a03d5852edbfe4ec27f81b60ccf743e58dade14ab992da0
diff --git a/dev-python/wsproto/wsproto-1.2.0.ebuild b/dev-python/wsproto/wsproto-1.2.0.ebuild
index e4c144526888..4f285bdefd6e 100644
--- a/dev-python/wsproto/wsproto-1.2.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 281b68eb4a7f..da0ba49fac03 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,7 +1,5 @@
-DIST xmlschema-2.0.2.tar.gz 476241 BLAKE2B 56d1708a2139591d4efaa93a448485cef28f6a4dfd602f6919a4d7afaf249c5ec8d4500062a5f959d2d4f7a28819d8e45724830b09e1e66298192af0f8ddd32f SHA512 3ec7a6a8337e1c342e4f4db02fac51a5b31a95f21b4630d8750014c418ecfd12fecd271309bd18235288f373f3e01511998af907adcd444720b6f14d13762123
 DIST xmlschema-2.0.3.tar.gz 479014 BLAKE2B 19b5e3892a59e780c23c4b9789901a55509b63d3dd3466d473a47aa43eec8894ad2f99dbae7fa2063a53430d99db1455dd2e370fc0e1932750bf6aecc6657b8e SHA512 ab805229d28d53bbc265a4393ca286d0df81803c53ec16b52879ce3edcdc5e7576602088b5fe977e13dcfb5039af652ef96be5a3e9d23592fee104da5a486516
 DIST xmlschema-2.0.4.tar.gz 481517 BLAKE2B 105f382dee65a55c6b3073d20fee8582123e6f7aa55e5c02f57e8278354ecb5a05d3f00f5a6fac7a53168e8de258ec8380d6637eea881d5725cb8980c3cbff7b SHA512 57902a14c6b038f3f8e2e996ca9f07e87341a754ece9c4b636d1f8b53db1caf176c6d4a975a843ccdbf7e24ce721f51fb3f0a0efd04719c6f81601c0b56910ba
-EBUILD xmlschema-2.0.2.ebuild 875 BLAKE2B 4160eff1285865b83536704ff512eb58b88e4ff5aa007bbcaaca3b9d2ebd3ff6741014de41d35676b2a44200304710fed320bb0c67342b0a3abd4670beed8cfe SHA512 18784ebeb0afbf3239bac54eb40adc916a0eb88db6bfe64f5297496d659daedef93c07fcd99057bb787fb05c478bd1a1f9104c3179b44e755c79fec4353382e6
-EBUILD xmlschema-2.0.3.ebuild 883 BLAKE2B 8b7f637076f0664cfe0af5fe48a7e0bc339e4b8243f0db82322ee94e1c5da32fd686356409cc2619784c79de4f214f2aadd127efd201b017ad7b53230e6d048d SHA512 4854d40a14536f72b017a0989f5a80aca4928e906a967eb74dde69fdcba40a543f3f78530cfaa9572b5676d6da2510017a8e36f90c37fa3d97e1054fa4eec1a2
+EBUILD xmlschema-2.0.3.ebuild 875 BLAKE2B 4160eff1285865b83536704ff512eb58b88e4ff5aa007bbcaaca3b9d2ebd3ff6741014de41d35676b2a44200304710fed320bb0c67342b0a3abd4670beed8cfe SHA512 18784ebeb0afbf3239bac54eb40adc916a0eb88db6bfe64f5297496d659daedef93c07fcd99057bb787fb05c478bd1a1f9104c3179b44e755c79fec4353382e6
 EBUILD xmlschema-2.0.4.ebuild 883 BLAKE2B 8b7f637076f0664cfe0af5fe48a7e0bc339e4b8243f0db82322ee94e1c5da32fd686356409cc2619784c79de4f214f2aadd127efd201b017ad7b53230e6d048d SHA512 4854d40a14536f72b017a0989f5a80aca4928e906a967eb74dde69fdcba40a543f3f78530cfaa9572b5676d6da2510017a8e36f90c37fa3d97e1054fa4eec1a2
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-2.0.2.ebuild b/dev-python/xmlschema/xmlschema-2.0.2.ebuild
deleted file mode 100644
index f4753500ef02..000000000000
--- a/dev-python/xmlschema/xmlschema-2.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/elementpath-4[${PYTHON_USEDEP}]
-	>=dev-python/elementpath-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-2.0.3.ebuild b/dev-python/xmlschema/xmlschema-2.0.3.ebuild
index 829df9709686..f4753500ef02 100644
--- a/dev-python/xmlschema/xmlschema-2.0.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-2.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2022-09-25 23:34:28 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-09-25 23:34:28 +0100
commit	5b14ea000f5782ac047162ffc35ef8c3c0648b4a (patch)
tree	9bd4130367f85e9308e6d6c6b12ba58759b5f789 /dev-python
parent	85261a4d217482e1c124937d57ec98a0aabaee59 (diff)