gentoo auto-resync : 03:11:2022 - 21:12:43

author: V3n3RiX <venerix@koprulu.sector> 2022-11-03 21:12:43 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-03 21:12:43 +0000
commit: 924750a8c767b278c9870be5dcfedced436f1276 (patch)
tree: d5c93de95fb5c2fa090e76fd12c1535698005868 /dev-python
parent: a4d4c6a7cf31d8d3248101dbfd654cdc416902ac (diff)
158 files changed, 214 insertions, 2923 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5086bb8d7a28..4fdc4682b09b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7599dd2765b4..536925c4c94e 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,12 +3,15 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
+DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
+DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-15.0.3.ebuild 1167 BLAKE2B 5a32b05a4e7c8b41511a2652be3d1a3832d8ebeba2ecc138566e8ac0ed7c78eb7edba431af20ef475d2a52b3219a9880c65c7df001410173d4d305e1bd823b44 SHA512 173ee4a9f597c2b09219086a6cf5a4e9034f5c9509e313f01947c2936525eb335aecb124dceb75ff0c09a84ffd6274e4b595457c4b35f94a96f5b4bae248c227
 EBUILD clang-python-15.0.4.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
+EBUILD clang-python-15.0.4.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221016.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221023.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
diff --git a/dev-python/clang-python/clang-python-15.0.4.ebuild b/dev-python/clang-python/clang-python-15.0.4.ebuild
new file mode 100644
index 000000000000..93cd19a2acec
--- /dev/null
+++ b/dev-python/clang-python/clang-python-15.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index f200343c3433..8de6a8990231 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,5 +1,3 @@
-DIST dj-email-url-1.0.5.gh.tar.gz 7950 BLAKE2B 1d159023f9b49f3a13fba39c29c51bb06bb6dd9d3c5303a4d246ad9f72daec9a273c15d214ad94a219883c9c210955d84bacc5861f5411845e152fedc7ee6880 SHA512 7de79a4f1f7416634c5877bc45d290d20d841e5ec470bc40ea900f04531037e2337c81788792b8f70a11318633a42f86700a5b27e611fac466b373d2d3b7f355
 DIST dj-email-url-1.0.6.gh.tar.gz 15944 BLAKE2B d10a428cca05e93129be9acb4947c534cd897a39995f8224b17017405942defc977c19457b69b07be9518b203fbe50c6302da5ef089cd54301fe3ee46c091f90 SHA512 f41f4c7cb6c2ce9ff99d9dd4d5676fcd3d82814a929fe4c64c52409ec1b12fc87e657fcb39d40d7ec24fef8fed633418ef7d7537563f753532e1348290672faa
-EBUILD dj-email-url-1.0.5.ebuild 637 BLAKE2B fb7523bb42e18110a96fa88624e9c909d1cec1bbdd7079fc8eac936fbe004e367aee517496e87f387bbd58cbbfbbab9d6695f0c21ea951e600a13ede5e5d3f12 SHA512 ac53c75740823aac7ebe7f0d817ab2eaf93adcf22cefe3f7d0a6121e58d550ae9f957f1c104002c908708ad4383acfe030a4f48a3c4cf06cb54fe966e0442f21
-EBUILD dj-email-url-1.0.6.ebuild 641 BLAKE2B fa3f6d3d934755c324fa9277800c2e208967790bf101d3885b621d14f87841c3cc71311d870654e24d316a9d0e85d0487d550e8d8ef466caacb838fe1043719a SHA512 08707b800d0cc80e2953409397ffde9db0768ade83787ccae424630f928c82ebb248a4d4523ac7df0061c6e986e09607e172b0d09301d2766f61c76f2541c522
+EBUILD dj-email-url-1.0.6.ebuild 637 BLAKE2B fb7523bb42e18110a96fa88624e9c909d1cec1bbdd7079fc8eac936fbe004e367aee517496e87f387bbd58cbbfbbab9d6695f0c21ea951e600a13ede5e5d3f12 SHA512 ac53c75740823aac7ebe7f0d817ab2eaf93adcf22cefe3f7d0a6121e58d550ae9f957f1c104002c908708ad4383acfe030a4f48a3c4cf06cb54fe966e0442f21
 MISC metadata.xml 408 BLAKE2B 13c4c985a274eb0e762a0b20976081102ff640bf9b69f6ee54639476236aea5ba08696d17cce07835c7c3bc989d8474c051e6c3d24eb78aff29c8b43b5fa6b60 SHA512 73288f6d7e447be7c42dc5014a48bdf57755e9e38ccb165a33e535463468cdef0fd55f6bc7994add0e58a624881dc73594e6cf495bbf190a7cc0c1ab18678d12
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
deleted file mode 100644
index 1ff6406e19b6..000000000000
--- a/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Use an URL to configure email backend settings in your Django Application"
-HOMEPAGE="
-	https://github.com/migonzalvar/dj-email-url/
-	https://pypi.org/project/dj-email-url/
-"
-SRC_URI="
-	https://github.com/migonzalvar/dj-email-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DOCS=( CHANGELOG.rst README.rst )
-
-distutils_enable_tests unittest
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
index fabe7b1d5f7a..1ff6406e19b6 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/docstring-to-markdown/Manifest b/dev-python/docstring-to-markdown/Manifest
index 7ef5ce5b54e5..ebd11bb928dd 100644
--- a/dev-python/docstring-to-markdown/Manifest
+++ b/dev-python/docstring-to-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST docstring-to-markdown-0.10.gh.tar.gz 24732 BLAKE2B 8e45db90642a1426da138807d4f8b8147fbf125160463a094f5adfc8e0d76f75b39493560df7cadf39e9b63c1e01763867fff38aac6454d4d7bc7ebea8d873f8 SHA512 cb716fbaa8311bd563f9275eb64bb67d2870803a6c6c6ffce7b15b672260b46359008dc9ff80a99fee3033f3105fdfd77d7a248e7d8a22df695af820eba8e319
-EBUILD docstring-to-markdown-0.10.ebuild 685 BLAKE2B a5ece42e3e075918a6e18e94c25a62023f941d02f54a2a544271990949bab9c41102b40c435874dde1ade948dbf4048af0e6cf7f0bb6b74932b0fd33b254178b SHA512 de61a923d80c07426b5ecbf407a7555bdeeaf7544d6129ac2eab12f921d5ac440969825615b94f4f5833507b25f23be3dd10c962f83b17825d9116f46dd0585a
+EBUILD docstring-to-markdown-0.10.ebuild 692 BLAKE2B bef5cfdfcb3a83c67aa7ff128f23fd38d949378adeb83e696f274ad0494d9b2eff9f9106ee9fe8ba86072cdd21fdd85262f44e59cf5283676933bd428a9056dd SHA512 19634877b361351acb5e639f7e8a49e8b40b07afab368e4358a7b9f36bd7f9b2cf2c5abed248650b8302d57432d66f517373eb41d4be8aa69804c1411bc4af2c
 MISC metadata.xml 349 BLAKE2B 661c6f1bfbf032dad675ea05faa3d58ec81fac8240c0cfb4bdb8e75b81e12cc1663670fab45201e8e18fde374b59bc60f365558ecb6e4fdb9714f779ea680cac SHA512 fba9f2c707c73fe768f3a50e3b9ed99883359b8ce3122a5b57eb8ba3286d93eaab1b19905188cd8e65440cf9ae40cbcf8b7b5593068773c07c0ea1ea3c7aab53
diff --git a/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild b/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
index ada1bafbe9c4..50c8e455737b 100644
--- a/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
+++ b/dev-python/docstring-to-markdown/docstring-to-markdown-0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-lsp/docstring-to-markdown/archive/refs/tags/v
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index f65ac7bd7239..65b257020dcd 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,5 +1,5 @@
-DIST setuptools-65.2.0-py3-none-any.whl 1232422 BLAKE2B 049fbccec71e15ed01b5e07f5d60589c662d012e4fe27c6eb8fbe3b62692bb63d891c9cf4253fe74b5a5803db39f3e5194f8481e5a3555493e9f18bd6985b35d SHA512 e0fc48a3ebe2022783c2f56d85d8ad5e17bd0f5f2caefc5e3ac6eb4ddf1464854ad9039c62a55e72ca6b0387e7f874b15b7a0df4acbf6153a51cb8e8146bd93d
 DIST setuptools-65.4.1-py3-none-any.whl 1232518 BLAKE2B 545caa5f7c551090e3dcb71c388477c4aad8aaee1dbf4a7f7fc08f27a296a81a055310b41c3d4af7cb3cf375c5ab465fec29ef3e29456281f56b7df544dd0eca SHA512 c0bc3f5f3b7c8a8b83df4d12f5f99d41ea910220abc16e8b93e3b533dc8d665802608c447e8c1eb070c19c24b1baa83faf2ac42488f95808ed585c169afadd58
-EBUILD ensurepip-setuptools-65.2.0.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
-EBUILD ensurepip-setuptools-65.4.1.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
+DIST setuptools-65.5.0-py3-none-any.whl 1232695 BLAKE2B 4079fddb68bcd123a3864a1a1bc42b88b40343caebbf4365bf7eb6379e73c7792eea36b53d7a4e63a4621f64a74fd440f555092e6a251e0943dd6eb526f89b0d SHA512 b179096ad073fd1fc2c9b68b4eecc6df5cb5e54250020b16a689f7c89ddad75ec88b8031fe4249cd609ee18e1aa22e7bc011d9ddb32b7b661e57f0645879e710
+EBUILD ensurepip-setuptools-65.4.1.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
+EBUILD ensurepip-setuptools-65.5.0.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.4.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.4.1.ebuild
index 96c75c915768..4dc09f674370 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.4.1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.4.1.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.5.0.ebuild
index 4dc09f674370..96c75c915768 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.5.0.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index ec0d2bdb4189..2d185e59e57f 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,7 +1,3 @@
 DIST exceptiongroup-1.0.0.gh.tar.gz 19766 BLAKE2B 2c4aa2c7c096b91971872b2236fad211a1bd7cb8ae921f5a0255b5a534eefdb5033bbca4c562ff7045acf30e13371a38d52851749cd5bca4df6adfe359a43012 SHA512 e2e05066c0c7664bb36696737c0c33abd811637c5f0ae7e70a20525283d4db4667fa814b15cb6b21165416ae1a0c47f22250a2ed9be4be99b6237e0c1b45fdd4
-DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
-DIST exceptiongroup-1.0.0rc9.gh.tar.gz 19109 BLAKE2B b4a4c127909908aa2d9fb2bfff0f0ae6c6b9be88046a680b6b206164b0ec0d6bc325ec65ce3e61df2270e6b0397ff5f7f11c219a62dc4a3534b1564da64935b3 SHA512 43f0f7338f5e09d45a5b4e1723ecab6dcd1872a387eaf8483961b86db5f1b7c265798538726ec9f2d0d6bd289ff3124883f5095dd7f04fd9b64c9230ce454098
-EBUILD exceptiongroup-1.0.0.ebuild 770 BLAKE2B b0bd0b8fb1edb61e570eac329219319ead6fb6273aaab2e828446f56d6534a8753fefdbd059ffab172a746d1f60ceaf7fbc281ea466af11d37f9bda8da38e598 SHA512 ddbf7e5089ad4d90183f949b1bf9122a4f86189dd98a3e53fc0d515bf1f261e7c64c71a6ef94b11a833ea63b228b3725e4f38050ce44be26f1363a0fd8023554
-EBUILD exceptiongroup-1.0.0_rc8.ebuild 762 BLAKE2B d9157df63bd73187f1abe6b2b9bc81d1920177ddcc039d06cd8f42e5a3904b9fedb695f047aafe2468b0dce6448d6db3ffb1d7856bd149f1136782a3b0333c5f SHA512 fb93d9f4e6fdbc4f7363b53777d005378d5f9cf088acb72b7cd532aaf38420c1892d4a228c9a8575f1e389c52dabdef40a3d22a382bfd738ce9b0fbc6558b20f
-EBUILD exceptiongroup-1.0.0_rc9.ebuild 770 BLAKE2B b0bd0b8fb1edb61e570eac329219319ead6fb6273aaab2e828446f56d6534a8753fefdbd059ffab172a746d1f60ceaf7fbc281ea466af11d37f9bda8da38e598 SHA512 ddbf7e5089ad4d90183f949b1bf9122a4f86189dd98a3e53fc0d515bf1f261e7c64c71a6ef94b11a833ea63b228b3725e4f38050ce44be26f1363a0fd8023554
-MISC metadata.xml 360 BLAKE2B accdc2d9dc39a31238555b937189f135482f2094a570396a741ba6202a1243ad46c99003e829e59e4e5fd0db0a01b050cc0e385bf28b44892e3e3c5615351028 SHA512 d740125cf760309a4dc5de1981b5ad704e880c37588e8a0e17816709065d80ad2ffecb3b5e50725b5665a38594a53f9659c17b35eb34bffbb06d11b830d740cd
+EBUILD exceptiongroup-1.0.0.ebuild 762 BLAKE2B d9157df63bd73187f1abe6b2b9bc81d1920177ddcc039d06cd8f42e5a3904b9fedb695f047aafe2468b0dce6448d6db3ffb1d7856bd149f1136782a3b0333c5f SHA512 fb93d9f4e6fdbc4f7363b53777d005378d5f9cf088acb72b7cd532aaf38420c1892d4a228c9a8575f1e389c52dabdef40a3d22a382bfd738ce9b0fbc6558b20f
+MISC metadata.xml 384 BLAKE2B 248abcb5fc08c91396cdbff52e5c3e4f6cce2aa273cfd52b48ee13de9ccdaecd09e9a436ed79f258d15d8d4583fe5995e054010c909a522f47e6866e55b3458f SHA512 c631c69438059cb2a6c80e595e45fac904d32dfb53f8be183142f1195d3a3b9bc14bc240f0808e14f47d31beb1887ad82ee79c5f1847c8e6b59dbfeea7913c8b
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild
index b848cb3eea31..a02d461d86a0 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
deleted file mode 100644
index a02d461d86a0..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild
deleted file mode 100644
index b848cb3eea31..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/metadata.xml b/dev-python/exceptiongroup/metadata.xml
index 417343e0fae4..e51a691f3783 100644
--- a/dev-python/exceptiongroup/metadata.xml
+++ b/dev-python/exceptiongroup/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">agronholm/exceptiongroup</remote-id>
 		<remote-id type="pypi">exceptiongroup</remote-id>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index eb67249415ad..95ad77f91fa5 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,11 +1,5 @@
 DIST fakeredis-py-1.10.0.gh.tar.gz 88305 BLAKE2B 71ffec7f872c8021914e24ee83f250e1e27bf2117fabb3513b54ad635692f43cefaf565090d3829ee189844a83ccc517016d8a4f9c31da82b2188d8d951c4dcf SHA512 8fb32917c70931de50ef90526854ee7c0d888c04582a284864c19956868961cd689db0a7b3ad39e783f53741efde5a33cc600faf09fdeac7046fe29e9cd75933
-DIST fakeredis-py-1.9.1.gh.tar.gz 86742 BLAKE2B aa3f0b05f486219cb6eb560f561ab3e39cc32286cdc3f4f9aba667e256528b9338dcc03f3ddb00c0db30ddb181afe535e209f6ee0e98c56a0cad445e2181ec67 SHA512 27b4c95e596fdd69cecc737897edfedd6f55e7c5610394b1532e4b2aededaed6ad15763582ce6cc20821ac7ea096f60204f7080d247359d8e8d0d360a61c8e39
-DIST fakeredis-py-1.9.2.gh.tar.gz 87038 BLAKE2B 89ae3059d58fc9649979b787339a98eaedccd2b29814090e1bf0cb2c54836ed722d829b9965d3d0a92ff4d8ee714f6a455b85f68b383a5ba6a67aefd20f70410 SHA512 6a4d90c0c327787b7505542a3615f383735bffb021cbfc0a2adf2cfb87326c517d67c1df2f318cd84b60b8d0f1dcb20faea05529a856bf81b0f3ae6cc16823ed
-DIST fakeredis-py-1.9.3.gh.tar.gz 87068 BLAKE2B ee657bd0b04f5701c9e6445ca646fcc510dc3235407372fec9891f7d1adc5cacbd7a52e2d520c930f53491c2a18f5578d1b5186337953439f93fbb69a5e65ef8 SHA512 5255a75bae15ac325a41a273c70a467c8622d5992d40967e4ac21920c0563dbad808e9b82af203e72e3404f74a7bbfd2c12f5d854f9d353defec5b0333843266
 DIST fakeredis-py-1.9.4.gh.tar.gz 87232 BLAKE2B b02b14960071ed38f6144b60d845d31d0d102f4d061dd2f156610f90385f35ff3128ab293fbf24049fd1f18a7558e9e13cc2f7179230a9837313acb2a7121053 SHA512 2fe74c5cc798edeef391136f8b09a651381faa04b7dd1e5a07007e6f89596e45970977b435e6fbdad03b73e9826a439da2e105ca9592fb3733547789d106182e
 EBUILD fakeredis-1.10.0.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
-EBUILD fakeredis-1.9.1.ebuild 2043 BLAKE2B c0b6eae42e2772b56ae73167087ee821aaa4c0631ec1d75feff85c5beb75148419185113f6ab98374462cb8336ebb073823490ff72b3a41d36da1fa6a3d6b7db SHA512 3e14b07b470537ed4b5ba6532fa183512ff138fd79bd357be43d5dbd7cd2939f18fe6caf4dd6e290a925328a1261f619d5bc8f1abc7eeb3f7ebbdc4b89886e7e
-EBUILD fakeredis-1.9.2.ebuild 2047 BLAKE2B 9ec125cf45e65b8c3ed480aec2cd6a2b86b192d053a0891e7b383aae488edb33f73a9361c51fceb7dd2c36d2fcdddc6be4b22867e8b12d7aaf34d0ea99cf6cf9 SHA512 9eb14c9878866aa8e2cbb3de940e5c694e5229855857ed72b488679d327e935800688ca54f47098ba59d7b28685ae96d5fd80c8eb3047e5976a892d2ec5ee89c
-EBUILD fakeredis-1.9.3.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
-EBUILD fakeredis-1.9.4.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
+EBUILD fakeredis-1.9.4.ebuild 2000 BLAKE2B 85def0d73dffa271d589c38e6cf08dd8d9fdc0d091405edf8fbcbf316b24edeac4379c36ca9a71f9d8aea917a156a6e9602eea51de72c00869667f8a5bec32e4 SHA512 4e8a5134b8bc0926682f55a21b3305304dc65eb851e90d2317e4446e07d179896e2d30a8638c3c64ad4a1e93a4031c0a12b98f784067b22ce593f594a8e09a79
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-1.9.1.ebuild b/dev-python/fakeredis/fakeredis-1.9.1.ebuild
deleted file mode 100644
index 1adc1b69c373..000000000000
--- a/dev-python/fakeredis/fakeredis-1.9.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-1.9.2.ebuild b/dev-python/fakeredis/fakeredis-1.9.2.ebuild
deleted file mode 100644
index 0b30f3d6134d..000000000000
--- a/dev-python/fakeredis/fakeredis-1.9.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-1.9.3.ebuild b/dev-python/fakeredis/fakeredis-1.9.3.ebuild
deleted file mode 100644
index 315d3ed64771..000000000000
--- a/dev-python/fakeredis/fakeredis-1.9.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.4[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-1.9.4.ebuild b/dev-python/fakeredis/fakeredis-1.9.4.ebuild
index 315d3ed64771..51b6d085b57e 100644
--- a/dev-python/fakeredis/fakeredis-1.9.4.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.9.4.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 6b709e9040b1..03359195376a 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,7 +1,5 @@
-DIST flatbuffers-2.0.7.gh.tar.gz 2018943 BLAKE2B 0fa27c79986292da1e3721c061d845b4ff3db5209956345ddf655dbbcd8fa8f460160d2359a77211139597b4635fc65fdc762cd3c62e87b361d65fb414d9c538 SHA512 15696f5f691414d2266f8bad1137ccbcf1e43e8d4fc22e8b5ef5b90351f6034b553bff7febf0e6f93a1be145e0714d7d4cb752786d0f67665165b1b6e5c1db24
 DIST flatbuffers-22.10.26.gh.tar.gz 2122181 BLAKE2B 26554240e71df9fafa814cd5c38253db89916ac2cfcf28dc33ed8ff50d73f0c09c97621eae3aeb028453098433a70277864500b99b23a9663264d3c596d46e2f SHA512 c0984fc4738516d0e4a1ddc66daf276b906d39239c4b70b14e194545d7fdeb3ce5ab34397309c16e916ff908a5483ab85283445394e5e14477259193c99ddf38
 DIST flatbuffers-22.9.24.gh.tar.gz 2091992 BLAKE2B 57130f412b4b1607a921f0101df687d987209cfa7174357967e9bc3b7aca3ef0433f56536a6c7e0763a2d3ba668ed52e50f1b99e933c2d894e5fda233b18b661 SHA512 4705ad08280f8a79694efee42c83395011c5e4513d42b3bb802e8c3fff82b1bef99a9667a1cdf76a646a7b79f083484aecc2b28a41b3933c648e7d5f5d40d45c
-EBUILD flatbuffers-2.0.7.ebuild 538 BLAKE2B ad7180c5d947fc9d11773287e65026addba75eef8cce545e71c6e47027840eb45537a473f7b6afacfed19f69a10833102b6d6e4e30a8470024be3383537d3827 SHA512 c048f9181d0c4b96ddf4c32ceddab7c7a7a23c1980225b82f6892cdc5e4b757727d6aa38e00203729410d841ac964ccfb9087e7f3280491968a0cdb1c0c93c49
 EBUILD flatbuffers-22.10.26.ebuild 542 BLAKE2B b21d6ec15ba5ddcc9bebcb7e8fbc99c1a566872b36bca62c8140bfa78d74e295f53f102741d9fe502bdeebe39593476120baf7a21cc15cf8b87203671580c71d SHA512 499fc8c7724cbade732bed01fcb59fb535170bf7a931b249813d2dbc3ee648fcbc37356ad14fcd025374e5b551ee7deb95354145233cc5f602281dc5c05a8b4d
-EBUILD flatbuffers-22.9.24.ebuild 542 BLAKE2B b21d6ec15ba5ddcc9bebcb7e8fbc99c1a566872b36bca62c8140bfa78d74e295f53f102741d9fe502bdeebe39593476120baf7a21cc15cf8b87203671580c71d SHA512 499fc8c7724cbade732bed01fcb59fb535170bf7a931b249813d2dbc3ee648fcbc37356ad14fcd025374e5b551ee7deb95354145233cc5f602281dc5c05a8b4d
+EBUILD flatbuffers-22.9.24.ebuild 538 BLAKE2B ad7180c5d947fc9d11773287e65026addba75eef8cce545e71c6e47027840eb45537a473f7b6afacfed19f69a10833102b6d6e4e30a8470024be3383537d3827 SHA512 c048f9181d0c4b96ddf4c32ceddab7c7a7a23c1980225b82f6892cdc5e4b757727d6aa38e00203729410d841ac964ccfb9087e7f3280491968a0cdb1c0c93c49
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild
deleted file mode 100644
index d39294f368aa..000000000000
--- a/dev-python/flatbuffers/flatbuffers-2.0.7.ebuild
+++ /dev/null
@@ -1,25 +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}.gh.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-22.9.24.ebuild b/dev-python/flatbuffers/flatbuffers-22.9.24.ebuild
index 7705da0c72e7..d39294f368aa 100644
--- a/dev-python/flatbuffers/flatbuffers-22.9.24.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-22.9.24.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/furo/Manifest b/dev-python/furo/Manifest
index dabb9163337e..b2c98ee9ac3c 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,5 +1,3 @@
-DIST furo-2022.9.15-py3-none-any.whl 326084 BLAKE2B 2c0fe323fb35ddc3660dd7d0b2d70bb4ab7dcfabfab894faf93651bf3b34cbd53028bde7f2eb5f9c153db5e3a460fa58df0d69c05c2e059b35dfbeee7ec00adc SHA512 a20c44d0265bd341ff08db5aa158c440b6f0b74d3fb3ef41385da73db2f75373e23f7635b829b9cee037a7f9a4987a09510cbbb328c35abe09d789061e408b2a
 DIST furo-2022.9.29-py3-none-any.whl 326787 BLAKE2B ef558aae586d2f189a0ec24e4dc5b8422167829ed8a917b276dcdac4ce7bcc12bdf9855b8fe6a75767b094e4e35b30b2eacd227b5d585de32845f2299f3acab1 SHA512 4ab394a006011ced6d74f696a49973628220719d1f8c1e5ae49b2a0c62dd3cc961f7a18d654bffcf385b07b6bc556930de5a5741c1e0dc9d7b6b6f4cc2cfc885
-EBUILD furo-2022.9.15.ebuild 976 BLAKE2B fc872e62d4ca2210695a3433dc499c133032fa2f762d1f5bd3228afbebaa316a96c3c34b67ccd74a06e0bcb8cb6fa7b680cc51a551101b49b596add8bfc8b965 SHA512 86354d69c9fd7fabe934ce4c970dc1d4a6d3341dc5b4f75869d7ed690deb9d980a66bd71c63492f9792c4fcfd422d603fd06eebff3df68e6a23793fdeb3243ed
-EBUILD furo-2022.9.29.ebuild 991 BLAKE2B b6e1cd3f72d10285e3e7159d025edb24d1c34a7e4145c63094b23ca9101d8107b5ad978863a2f2ee457acaf82dfaecf7ecc1a7cc656985cca2beac2befaeac49 SHA512 84afa612ae63cab054ee6b28b6c716aa46d06dd3a6ce2f22a7902a99f9da0ac7824c608f25fa874b25308b5c6db8aa8b54f48a9abe8b6a280ad36d032aeebda2
+EBUILD furo-2022.9.29.ebuild 983 BLAKE2B 1227ab7c3d65da8439dbdd28df06c12130886f3a77daf373fcca6776b0d1c3cb9c49331d7a9fa2a206653d48e7b9fcdcb41f24265e1bc100a221b1d051691256 SHA512 7b8f4d0851329a923ae2619770a9bde5ba4fa8459c9656a50e29d74ec5768256cb10fde19a1982f9417e6a907653da0fb9d75ed3266920e4d9fbd16cab6ddc45
 MISC metadata.xml 436 BLAKE2B 81bb1424cf305f98c15a96afc454de34c0965277a5829c1c299ee6da4c86882aa1d47d45b71cfd3413b82c68b521a0f2b4bcd37c47988a6c171f55ef97f930ef SHA512 63d65b518096cba951f2bdac8b3ff0a602ac23fee7679ba808f27b01644cc612a7223942ba01f26d4c0931f16ccf9be1832be5da650835c6f43396e2076d1d30
diff --git a/dev-python/furo/furo-2022.9.15.ebuild b/dev-python/furo/furo-2022.9.15.ebuild
deleted file mode 100644
index d23703810acb..000000000000
--- a/dev-python/furo/furo-2022.9.15.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
-
-# sphinx-theme-builder is completely unusable, as it requires pinning
-# to a very-specific nodejs version number, and ofc loves fetching
-# everything from the Internet
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Clean customisable Sphinx documentation theme"
-HOMEPAGE="
-	https://pypi.org/project/furo/
-	https://github.com/pradyunsg/furo/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinx-basic-ng[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/furo/furo-2022.9.29.ebuild b/dev-python/furo/furo-2022.9.29.ebuild
index 19c0fda7a8a4..5a2ed7bbf13d 100644
--- a/dev-python/furo/furo-2022.9.29.ebuild
+++ b/dev-python/furo/furo-2022.9.29.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index d1402db67583..33dc44062a6a 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,5 @@
 DIST h11-0.13.0.tar.gz 100165 BLAKE2B 6cb610afa474f5945151300e6ec6c2860e8b959b9ab0224b58fb047f3fa0b417499adb0119b7b7727b9ebfb4b60360fef78843fde41935616784bbf450605503 SHA512 c3a16dd66287ab6491b664aab9d72e14f1e61950c19182d60e195b81b2857e47157c38137b2ee2a9cd35d9d54997f554f768a3933051030895ddf7bc5b813e02
 DIST h11-0.14.0.tar.gz 100418 BLAKE2B 09f0dfe4e1d3d117f772ec914cddb4af5c09f07269e0b148f78d95b3b177cb9c69f6406c518ec0ad81ef960c199749317141e50c38cdeee0faf24e1f9333ab27 SHA512 6146f6441ce62ea46d824a86c1687401224ea6084ca2703b9c841dce51cdfb5de49b39a4f4a7e95efae40ed83012ea4a8641700281f728c2f580a90ce42d82a5
 EBUILD h11-0.13.0-r1.ebuild 596 BLAKE2B 84ab26b4b1f59409f44b905ae3bc704c7f746622a61539e15ac1f7eda40666b84722041252f630d87917d3a238dd2af9bc4ce0a469833b4428ed0eb17951e21b SHA512 835b5d1c5aabf260ad8e803535f713aeffc0f41e6c1657ee4180818d55d21a92c85fcaee8d4f2c3af04084f5c78f404b4a1a48134bd7ea79f787b109992dad2e
-EBUILD h11-0.14.0.ebuild 604 BLAKE2B ce0a87fc227ff00dbbb223874d9a87447a7c1a82c93b9713ea0ba8c7dcadba67587557b834752e912baae0ea9ab40e0d70c01db140f49cdc7d790afde164c2af SHA512 f58a4740beb117d0b57871e24206f44608058604d030ccb20b9b0236f72b6f5b847e43c6480a78821bcb5dc70737afd5f44b3c71380ab09de54c5a50e3a5e2b9
+EBUILD h11-0.14.0.ebuild 596 BLAKE2B 84ab26b4b1f59409f44b905ae3bc704c7f746622a61539e15ac1f7eda40666b84722041252f630d87917d3a238dd2af9bc4ce0a469833b4428ed0eb17951e21b SHA512 835b5d1c5aabf260ad8e803535f713aeffc0f41e6c1657ee4180818d55d21a92c85fcaee8d4f2c3af04084f5c78f404b4a1a48134bd7ea79f787b109992dad2e
 MISC metadata.xml 387 BLAKE2B 8bae8408691691a5ce5f285d26e819ef0030c266972cf8acd88a221898d5812f8cd1772b6b4bf762e27306bedfa485f992b24dfb092cc2cb4818ec4a2a524d4a SHA512 573a967df1b9e058dd3cdfb700d72a05c239d8c669e4c0456b23061ccb0dbf97cf584fbed2b090e5811973ba38d429df0b27bc561c4f40a87107b6c16d5863ff
diff --git a/dev-python/h11/h11-0.14.0.ebuild b/dev-python/h11/h11-0.14.0.ebuild
index 592e6d017437..d3f2e63f8d2f 100644
--- a/dev-python/h11/h11-0.14.0.ebuild
+++ b/dev-python/h11/h11-0.14.0.ebuild
@@ -18,6 +18,6 @@ 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 3bc59e632122..618e9faeee30 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_metadata-4.12.0.tar.gz 48153 BLAKE2B b12b61a02be6428f80de418b3932b917066f6e9396d85158f8f31fa1b800c9cbd3f7dfd7cec48b51cc6c4ad5e5532136cc6ad7ea688c70466621976b232d9ccb SHA512 a7e3b8876665880a42bab885014199eed90efafcb386b89fddf62f3a6dbf51b192a0b9d208a40fd1f8b6db9d1bf80cf6d6753c1073196daa54dffa22a627443f
 DIST importlib_metadata-4.13.0.tar.gz 50445 BLAKE2B 0f52430bdcf63275d16d330fd2ec6a85926ab75cc2c14d0e996dc29a1258ba71e12253dd36f776f280c68cfc0d68058ce52d246fef5eccd9c3b7e5ea9bab5441 SHA512 68deb9b017d89df05b613c564bfaafd9024f9a6b1b14973bb75c0756f29911c6a2516a87b4fad60cb15b66bca79a275163fb8db2cfbd088ab952633de056d1e1
 DIST importlib_metadata-5.0.0.tar.gz 48756 BLAKE2B 87642575d0df14a22bb3b81f68dd6504166fea1148d70b1f2689945d336f9a75257872f8953e0f86008a349ff3500b357dac7d1c381d92e88bdeab37d7392042 SHA512 29efd04c819bf2e6579f5b0ca0cf63c907e162d028244a743929c7c04989a29b84003824aaf2f2bec33867268b3106048380bd18789c790ca2d1cd89a9f678ef
-EBUILD importlib_metadata-4.12.0.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
-EBUILD importlib_metadata-4.13.0.ebuild 1496 BLAKE2B 35ade448491fca4a82f483e4c6953f1faf17ec2c35f0d8822f4c66886a14f51a5e5a9022dc826e977c51130e9b86778f24e4fc9dc69b30b3b31c53a029b61d4b SHA512 c61a2badbbdf71dd60a7a66a7a89d55f356a19b4cba4bfcb77c02b831e7540715aba9c05a118faf5b9c20cff1d2f001b86d6ab189df03add5213ea46968e4155
+EBUILD importlib_metadata-4.13.0.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
 EBUILD importlib_metadata-5.0.0.ebuild 1546 BLAKE2B 3d5b72541b2aafc21f0c872ff3e96f5b65aecd4b679f72b2194d5fe255aaa555dff7966888e085c51a58eb6c748a6db9e32f24411e43858fd15b1bcb812a757a SHA512 c9f3b1de5dc6c4de27568425ec16a6e8fff5b32db2b4823270a125806fd23d4a9c3b0876c1581c6b5dbf26ae55a4cc9e53c4a07c53499363139f9bf42dbd56ab
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild
deleted file mode 100644
index 49339f2d9da7..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild
+++ /dev/null
@@ -1,51 +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=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.13.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.13.0.ebuild
index 2441731aed0b..49339f2d9da7 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.13.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index c7e8ce0ffa90..3bda21d1f1c1 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,11 +1,5 @@
-DIST ipykernel-6.15.3.tar.gz 136470 BLAKE2B 45279a6cfc85c3c2bafe9913b78077a3212bc61b961824f449cdf6ed6a34fe777e0fef1585bc7e4062f4e73124efd24a1c6a16e4168a03d31420836105c3ba55 SHA512 52e9b20b4b9ce691a42a64f535b41b9567a9849c87c0c9903d0b14dc6a00c57ab42d93b6bca8d955be8a31354722268006ce8b576664eb8a4b7f6a3400164c1d
-DIST ipykernel-6.16.0.tar.gz 136212 BLAKE2B efb779c4585d5594dcf8beaf03f2cd0174aa3b22e184a4c5f54e0e9e97f5bcb81af27c19f503a8b8883720a4380bfb483a952858a75c5b08b19030cc84c0cbec SHA512 04c43c83d17f451b7139e3f7301b35598ff3644ac1542bed9eb2584a558ee202e66c3e36553f96484bb4ee5cc369cfe2ad2bf0054799ad29ffd0e065bdcade98
-DIST ipykernel-6.16.1.tar.gz 136501 BLAKE2B 01f335319a7fe3749f770a721bd287f357dd9d5a948368d6495642607eb43f085f529be8759cfaa72acddc4973b814599492b9a87632d48373564f668696264c SHA512 748e538a99db913bf5fa8a3bfd83f59f4209e84e262f0fbb93d65100dd70502315ba7fafa7e55445c58f5de38c09e6d155b4ec9ed12e2ac53214e041e7345aa5
 DIST ipykernel-6.16.2.tar.gz 136606 BLAKE2B 596cae97c6e4d170c51a2f2f481c306a93833cf62959837bde129ed080f70e730cb083ff0a608b7539f633898b7f79f8c5ee3495580fe2821382f0be10417ccc SHA512 3a3bae6cc8ace33b7b8c9d335c7da73c1983824b74b29b77c14cbe24239d556c9c967a759a37a60745823cb6ab698a21262457082464cf33ec1b02ebbe2240d9
 DIST ipykernel-6.17.0.tar.gz 136711 BLAKE2B 2d037334e3fbff0cdd3e2a99cb0987c2c647bf04e3eaa85ff56a202d2b2c88383ffd81f8ba74565fee9ade19ab9d6bcfcb862bd92fdea00892f0195f1c97a752 SHA512 52ff2cbf2aa8f1d02c0d25866e91e2eccddca55b70a226145b99165b3514ab1b87e797abac4423bfb7090152e7eafbc47aacde8c3373f5b2bdf0ff642c07d0ba
-EBUILD ipykernel-6.15.3.ebuild 2058 BLAKE2B 324e8d1609ee1eb272589138f8f22822a9fafbd836dbfbbfc2e710fb3e9cbb602564071c3e2f8904cf0a6f3c6770279517fd51152dfdddc7b13e001084020d85 SHA512 3f757852e4ca13da13ccdfa0615fe6342d3605ca447431eb35c80b44cb8cb36f57bef1bd12f0afbd2175dca461d0d23d8f9ccf194227634cf4fdfb0fb735aa79
-EBUILD ipykernel-6.16.0.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
-EBUILD ipykernel-6.16.1.ebuild 2107 BLAKE2B 1c64d458e4fbf2f3775c635a1a7e575a03a3b597ec02df0f545c2525a62a5d67ef16ee2c010d0de8b4899848197783977a466fdfdb449eaada78b5c134881e1f SHA512 f88cfc3f92a72f8b06b7ca89874c8ee650a2cfbe738fcb6e7d6a820cb7ddd5500f9442dd82c1d01bc5862ab84e9c7e49abb22625e7d346e61b6ea2ae883b799e
-EBUILD ipykernel-6.16.2.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f6741807f087644f5ad3586df50ff0ecaa7b16253e2329cfc7d7c3fc100e162100f19923986fe7344344dca8c48d9880 SHA512 f1bd0e18ea2dbeb437aee47e51ecb42b3360c90a1fda367fded53405613578caad801c452e616b6aa1522c2cacca28fd43303d0687deb2829d0ed505753d199b
+EBUILD ipykernel-6.16.2.ebuild 2099 BLAKE2B e65f36bb85b061fb9ac801e706a1621eefcd6357998ddc7dbc5c9c8a5ca7f7cb9fcef8b7086957df6d754cc0feb301eaf2d6481f30634990f5f3eba511bc9f61 SHA512 c6f458c6483e27ea814c94b116769a125bff1d9d4531c7861cde0c5bb164d3f9ed6d076777db75cd05d91bf1623d27b6b82367c415dfc0df8b7eabcf6fbdb838
 EBUILD ipykernel-6.17.0.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f6741807f087644f5ad3586df50ff0ecaa7b16253e2329cfc7d7c3fc100e162100f19923986fe7344344dca8c48d9880 SHA512 f1bd0e18ea2dbeb437aee47e51ecb42b3360c90a1fda367fded53405613578caad801c452e616b6aa1522c2cacca28fd43303d0687deb2829d0ed505753d199b
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.15.3.ebuild b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
deleted file mode 100644
index 6f23f0b53b04..000000000000
--- a/dev-python/ipykernel/ipykernel-6.15.3.ebuild
+++ /dev/null
@@ -1,66 +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..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.16.0.ebuild b/dev-python/ipykernel/ipykernel-6.16.0.ebuild
deleted file mode 100644
index d474b45cde71..000000000000
--- a/dev-python/ipykernel/ipykernel-6.16.0.ebuild
+++ /dev/null
@@ -1,69 +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..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-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"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.16.1.ebuild b/dev-python/ipykernel/ipykernel-6.16.1.ebuild
deleted file mode 100644
index d474b45cde71..000000000000
--- a/dev-python/ipykernel/ipykernel-6.16.1.ebuild
+++ /dev/null
@@ -1,69 +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..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-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"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.16.2.ebuild b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
index 5f03300e2ce5..17b9ec61a3c2 100644
--- a/dev-python/ipykernel/ipykernel-6.16.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
@@ -18,7 +18,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/debugpy-1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index a7ba29ff2cb7..a3497564df12 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,5 +1,3 @@
-DIST iso8601-1.0.2.tar.gz 12653 BLAKE2B c7dbbe680f2828050b2ff32765da009b5f6dafdbc5182d5136f951f8604d7ff579b85050dbefae47d2b28ce88515b9dd73a8abf73b3419b4cdc4a4dd275b7228 SHA512 f28fbfe82c25575ad73a92df144c108ef3cf4e1a5a9af8362187014904073f26daa3b77dde689a23cfd87cdbf86196b241e925dd8cf5fd81728f0dbeee4836b7
 DIST iso8601-1.1.0.tar.gz 12836 BLAKE2B 7860d52002008a76c1d28ae94abe5100c3ea434f8e19dcb677dfc84366e898d2d277d88e6591d663579281c4ee668e77db96fd586edbe8b027433844462071e9 SHA512 f3f9621863abcbcde467d38416391cd8c98f59b7b863845b670e11060f0f81bcf4979fadc51c19eb55a5fe44ee1af922976b11cc97bf7b2dc090a485ad9979ac
-EBUILD iso8601-1.0.2-r1.ebuild 727 BLAKE2B 1d06064b290ac037450137dcf94cf1dace81f4d1349460ac819171c98f8025b0ea7b44de4781e51b5c702720e036463ec4ec757f61b9045a2a2374daa26d5616 SHA512 dc13a23c275204ff4db012a0d22ae57ca4899224e106734d86e7f9acfe09549f7140c5c3a03197a4d7b8f53ef9463254868f7d2af0219a2cab27bcbf177dbac6
-EBUILD iso8601-1.1.0.ebuild 735 BLAKE2B f8091c22201d6016618619942ef83c6f880c2a3046ed8e7f5971abaf3f32fa44da54c83bf903cfb7240d5286de2b7c1f16e55b37c1dc1d5509413be95e970381 SHA512 d666ef8cbafda0a03b88c53fdf095406b5eb869ac741d9e6eea372bfaa073aa77fe88bf582d7be9e55478b5ffd1c097b6af04e3c549e9ba923e78e5e47afd141
+EBUILD iso8601-1.1.0.ebuild 727 BLAKE2B 1d06064b290ac037450137dcf94cf1dace81f4d1349460ac819171c98f8025b0ea7b44de4781e51b5c702720e036463ec4ec757f61b9045a2a2374daa26d5616 SHA512 dc13a23c275204ff4db012a0d22ae57ca4899224e106734d86e7f9acfe09549f7140c5c3a03197a4d7b8f53ef9463254868f7d2af0219a2cab27bcbf177dbac6
 MISC metadata.xml 395 BLAKE2B 5333ae06825218414b6d4dcd4b340a4592be494df7ccb94e12a4eae5b19554c1bd79acc859bcde3647c12888501e8a2bb59dad3796cda8d83dbb57ff8800c975 SHA512 fbfde32b4ac97150ac24ece6f1238bf9a11d0dee53353bbc6b08269e8dd87c3fc833f37af5b2d5939d394c738a0f175949affb0873e62c2523d9667256a3a6ae
diff --git a/dev-python/iso8601/iso8601-1.0.2-r1.ebuild b/dev-python/iso8601/iso8601-1.0.2-r1.ebuild
deleted file mode 100644
index 47aa6c695505..000000000000
--- a/dev-python/iso8601/iso8601-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="
-	https://github.com/micktwomey/pyiso8601/
-	https://pypi.org/project/iso8601/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iso8601/iso8601-1.1.0.ebuild b/dev-python/iso8601/iso8601-1.1.0.ebuild
index 853630b33634..47aa6c695505 100644
--- a/dev-python/iso8601/iso8601-1.1.0.ebuild
+++ b/dev-python/iso8601/iso8601-1.1.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index be4e8a0b740a..1a5db6196490 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.classes-3.2.2.tar.gz 9266 BLAKE2B fa9bd77cf02e46617e4f5dc414ee081b60f3c3a4b220e75df366c8efb42a2eecccf688e6a43cd39deb1642df06554484fab9d9209d567dd0ffa53b5e94b913cc SHA512 56eaf8420f0319137ecae04c61e5a866909b83d3638343ea45ed3739524c8314bb6aac7ee9b5f899e2a1a5238c2caeaa971ed1cd0dbd28d9ac01ad6716549deb
 DIST jaraco.classes-3.2.3.tar.gz 9416 BLAKE2B 00de6548b746d2e6136572d2bcbc8a9c3e6f6570a02ee27e679e6bab7b9f4b8a327acf2b8854045b5348df8760763a7bc52fedb0b3504629ceced3dd3b4588ad SHA512 73fe80de5c50b553efee6aa51fff98e30e72dcb4167b6056628d3cbbb897e29abde4fa9da79a2b413830d8440055a43ea97ace4daa62853d874419cb36c43fee
-EBUILD jaraco-classes-3.2.2.ebuild 682 BLAKE2B b0fe322458f77ed2cfde2a6939e53cd7cd25f6ca255852c2760088ed08c641ea9154367e494e8be95b0c3b20ba01fd6b5b3851248bba146cecceb96f12d4d52d SHA512 e88f5545dd655cecf1e5e4d18722d8893dce8f25420c04be1f32f89bfd1561837dbad3c95f18228fdbba4f9db3e16e5d97ff2bb8c0f913cf2f5490686e4e4acd
-EBUILD jaraco-classes-3.2.3.ebuild 690 BLAKE2B 851cd2190b6e608bf24a4fe9c7eea77adbc44f94d74c3c4c103b2a9f26a970b421a10d1b7660f01fe018b84b792329df52a3d2864b49e010ee3df7ff1290646d SHA512 a3c48c531ec0b87efa19ccb2442d625f87721f33d20709e8a82f3ef314144b1427678bb4f4845db85245beeb220b2d0da577dcc877102e026d87d9223044523e
+EBUILD jaraco-classes-3.2.3.ebuild 682 BLAKE2B b0fe322458f77ed2cfde2a6939e53cd7cd25f6ca255852c2760088ed08c641ea9154367e494e8be95b0c3b20ba01fd6b5b3851248bba146cecceb96f12d4d52d SHA512 e88f5545dd655cecf1e5e4d18722d8893dce8f25420c04be1f32f89bfd1561837dbad3c95f18228fdbba4f9db3e16e5d97ff2bb8c0f913cf2f5490686e4e4acd
 MISC metadata.xml 472 BLAKE2B f2c9615836b0be2e1820d5ab8d33b16bea45f397c2f3bc10caa9c6910a489271eb399dc407da8a3fbabe9b81fc3ee3806a70eeac65ca627357c7b64429002cb5 SHA512 1f89c22910291e406b5e7ce9c008427ea9948086d190b10da18da020d8ac1c505b068d12fd24a26ee666b1c71ace5b619d511c05fead8855ce0d6c6088d800e9
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild
deleted file mode 100644
index 18ed17044dfc..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild
+++ /dev/null
@@ -1,28 +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_P="${P/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.classes/
-	https://pypi.org/project/jaraco.classes/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-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[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
index 78787bcd7b46..18ed17044dfc 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 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"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 7a44e77ffcaf..a1caafb76ca2 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.functools-3.5.1.tar.gz 14516 BLAKE2B d58ca0e51767278988f418a5b1b736dd56da2c0ed214fa9b9b2a8b5e4ae77fcdedd431e444d1d2c3359b52a648ec85d01b8b7a2db872bb27d9bf24484347b7a0 SHA512 4496c80eae72834e5bc214f40de91a6aa603ce296b3866e0b363014c2919843f515efe9b314f18667e6b09d183a0985760e47f3340aed42dfbdba01884896df5
 DIST jaraco.functools-3.5.2.tar.gz 14650 BLAKE2B 63db54c5f3dea7b0ce939ad51fc4c4f5831a620a37a47d416079d4c9ad30cb3d401567a8da036178122431cafd8dc18e4a9b59241cd1fc0b8bd1c057dfb8a034 SHA512 3f67d151f4f6553b3e560b0e6ab71cf726d6c8f36ef5e9f69b6325605547797e19a3f9eb1331cf332db498538953ccaeb75820528e6599fd7cf125abdc073e69
-EBUILD jaraco-functools-3.5.1.ebuild 1576 BLAKE2B 336a1679f662443c131639e84910f5dbbe5eab37349e0b77e55f9b3bf40931baaa09671a7a1e7687759093d91c0153587f37a1cc9a11d457284f5688616f5376 SHA512 9fb408c1e66711c7ba73e8d34ccc29c18f5329dcaf87d6f2a7dce7038339623429477444887cb09207d1f3f486ab280b9adfed61efe4844e6b2c91ce8852f90a
-EBUILD jaraco-functools-3.5.2.ebuild 1584 BLAKE2B 98ce14b5b093e6e56075e97717cffa9435c2583d3ab8b5fd9ef76d84f0d5f5c8a2a8d3bbf9e6ba16fa33aea6d30092380b70e383054d5f7a9483744ed1478c93 SHA512 d98856fd7baa11413f44c391f2d79fbbcad30f3f0ea0b59eb31ce35e2c9c97cd447f8dce452b84ac3c81454bda9c69cfd19ad65bb095590b25d78b59c6cedfd1
+EBUILD jaraco-functools-3.5.2.ebuild 1576 BLAKE2B 336a1679f662443c131639e84910f5dbbe5eab37349e0b77e55f9b3bf40931baaa09671a7a1e7687759093d91c0153587f37a1cc9a11d457284f5688616f5376 SHA512 9fb408c1e66711c7ba73e8d34ccc29c18f5329dcaf87d6f2a7dce7038339623429477444887cb09207d1f3f486ab280b9adfed61efe4844e6b2c91ce8852f90a
 MISC metadata.xml 570 BLAKE2B 5841838997ccd442b54b3eb9c20efa7956ca94c8e6430184990a16370891628b25fac7fe154b6777f606ac8f448e9b54d5cc71118656abee37179c6a18e6ce4e SHA512 15c90f04baad75fbc5e0b59d9dd661467bf5ae4df6e242a3f48b3fedeb8648c9ec690f459d033713002a604ed7acde9f023711583181551565ad395856ae9b25
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.1.ebuild
deleted file mode 100644
index acc8167daef6..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.5.1.ebuild
+++ /dev/null
@@ -1,57 +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=flit
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.functools/
-	https://pypi.org/project/jaraco.functools/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "jaraco.functools"
-		version = "${PV}"
-		description = "Functools like those found in stdlib"
-	EOF
-}
-
-python_install() {
-	distutils-r1_python_install
-	# rename to workaround a bug in pkg_resources
-	# https://bugs.gentoo.org/834522
-	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
-}
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
index 623bd91af000..acc8167daef6 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.5.2.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 6c432dfed7a5..13b49214cadc 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,7 +1,3 @@
-DIST jupyter_server-1.18.1.tar.gz 451117 BLAKE2B ac9088f8f5c5afa6455f41b4006c0d49286006574101b42dd8e28501c97dcf10d7ee534d54b8cf26a8f34c7d2ba446485ce273ce04e22c39a22e5346d55ea4f5 SHA512 7acf101f337af903318de263dcf78cf3b45b799bb6095bc79568fde7f3f56ca508d39a1d40ffe2a4ab0bdc0173f0ee2f4a7426f41e0855c1b7f9dfd86f7e6d73
-DIST jupyter_server-1.19.0.tar.gz 453227 BLAKE2B c411ea965bd1948cfff488be278e9d6d4374482f0017e8e6f0b557628f1b571735008db3217035344ee1d38bed45e9c74c16fb365899408e0565d31740ee1a78 SHA512 ba1316418662bf465f5252de97efa58ecea237b51dfd83b17643176f95382d47759b88a2a79945e6bbf688dcdb3f99d091a035ab0a8a04706c6e6ba0c8a7fcc8
 DIST jupyter_server-1.19.1.tar.gz 453411 BLAKE2B 800231e7e7ddfcf2a2c2f2725971983d754c76940623ce000e6b86ad503bc6ca68a27e55ca3766193e58184a7148471464dfa9c27076e53ac84b176b8ff65897 SHA512 f4228c73950e49fe26add11c61f3de425b963726908a2df7dae21bb38b986c2ebb6abfc3319ef9e3acbc2fef9579a1a70ac594920985977adf580a082d272368
-EBUILD jupyter_server-1.18.1.ebuild 2275 BLAKE2B 6249b549811fe6c9ab2713962068b4ce74f4a4427ced95919bda24ff9d86ffcb89016b00876ed6b627f34dd84121bddb1edb6c75bf8501df8711bde39f93d431 SHA512 47c26f3e524fc559162f27e05980965a6d5520ffd7a0ef7e6479afb2a312e2fabff2c06050d6ea20e283effe5af261b9fe9ca9c9d9c51e9afdc89e6452701528
-EBUILD jupyter_server-1.19.0.ebuild 2283 BLAKE2B 80c0a313006573fa093a6affab31a0d5beca7bc80b68ad5ba3fd3fa880b79d8102cdba23fdb83199d714eff9949f9abe4a119e2605076cfbb4c652fa6f5334ab SHA512 b18f75a8ac687e70e0dc65cef7239a10731a24f4630aa276ffb921c00eb8e766eed0b438fea2052f19982f74c0402de0ff6e8dfa986c5a3b2e5042ed26de73ac
-EBUILD jupyter_server-1.19.1.ebuild 2283 BLAKE2B a7dbd1f455f8ee97dac55c1a8afe1a7b501c427ab546207908aa49de475c7bf5e76190218d7996f9055754f6b78f682f7ab1f8e9c3d99d2610c0418f976ef2d6 SHA512 6a13b3cf041847b91677bf26f00b77396381172e4a2c644db913f01a9884cc347caa41ff9f68dea5965dc2c257e136e7a13e93ba3459ff49480e1d4efd1db83f
+EBUILD jupyter_server-1.19.1.ebuild 2275 BLAKE2B 643b3ce206dee3e89eb6fba2bf0f30f5b94a878f6d6faa7ef440a3a73861fcb8938e6221f7d48375208d5f43782a6f3f1cbc4118ebeca9b26e1dcca68ce0da8c SHA512 d42536a2e39588c6f42c36d5f69a8186be3c85895ff833e5e591cc0ad185714cdbfb25b4956fcd738836da2d555ef4ab3dfe07e41691379ee2da38cb6caec5d0
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
deleted file mode 100644
index 0e0ef8e39a69..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.18.1.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=jupyter
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-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"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py::test_culling
-	tests/test_terminal.py::test_terminal_create_with_cwd
-	tests/test_terminal.py::test_terminal_create_with_relative_cwd
-)
-
-src_prepare() {
-	# disable npm use
-	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.19.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.19.0.ebuild
deleted file mode 100644
index 296736ccc44c..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.19.0.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=jupyter
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-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"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	<dev-python/anyio-4[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py::test_culling
-	tests/test_terminal.py::test_terminal_create_with_cwd
-	tests/test_terminal.py::test_terminal_create_with_relative_cwd
-)
-
-src_prepare() {
-	# disable npm use
-	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild
index bb47bf11ce0a..4867ffd513a7 100644
--- a/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild
@@ -14,7 +14,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/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 5e26b4e10670..377c3e62c10b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,12 +3,15 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf
 DIST llvm-project-14f996dca8a2b5b17d6917528bfd9ee71ba6192a.tar.gz 169054148 BLAKE2B a23af6658a6ea8a7cb4272faef151937da229e39383ec068d7ef81e72a25d2a46dc2a86255a7f1148b7385b339d1c17e62f627df834d8eccc39be8921575f88d SHA512 e719d296016e7af718d022424c337a5df8d7124fdb49b9f219ab2a5dc592e6a59f6c09064775ea9349bcf4eed9d72214abb648de649ab872174c35635c945c04
 DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76522f444e63e3dfbe546793f8e67821bcd403bad460ea176254c9e0b72d60ea56b8480e498a7f610477c1108732d178804c26cd SHA512 d378d417f01c56534f301cfe6cb4958d811c04ae22acaacc917e7e5f0380859d40ce19dffb265d046b70fff95dbc2e759f492e4d5af0ade52f21ebaa8da65856
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
+DIST llvm-project-15.0.4.src.tar.xz 110936424 BLAKE2B a02b76ad161e352b4d3d84baffdada9c6a0e704de7a2c4017df4d4d05a9e9d02113791cd7d91c3edfa1f5bcb7ab95e1772d60f7061514928c6828600f41a8322 SHA512 9d5b664dd77c08130601636f9d6c006b257f369470ce823aa56d06698a9f0edfec42f2c90da934b9ad52c4d7960d9a024ea46dc9640275be6d191b1ba9869459
+DIST llvm-project-15.0.4.src.tar.xz.sig 566 BLAKE2B f1a7be65fcce932dc125ae2b498f68a14e68dad0d7a1e031343c52c5dafb7b123e346f3efa50a7693584361abf01efe9401b1b5781dee6b92dc1045e538e9b7b SHA512 35899ffbd13fc44cade54246a423450571cb4b62b8d706864daa3eef2377c48e24ef3113218e39e29de995b7f7fa307f9187552766576c9050fd924beb517f6e
 DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAKE2B d3a82a07f855b038071fc8eb3f41a88b4c220a577219985ecddeb9a535ea8b159dbad575699997d90a49db74c074b5f4354ad707e91d6934daaa7319e0d8ee9b SHA512 3f5525c7d893bdac701cff4cf82dafc31608920d788d9b7401654f320b2432528cf4ae8ef013182807b3dc0c5b758c71f1efeedb672dd47fdb8aa6f434dfb583
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
 EBUILD lit-15.0.3.ebuild 915 BLAKE2B 39561af9fa2c903cdd5d329a48305c2bdd6862dd5ccffb9199b7483bfaeb76e9b67f70edfcede8190fe6ccdf145ec70f95a71956284a4b84db074b999f4a50c9 SHA512 fffee7c0e0087f67f69758dfed647bee7ce94278c214fbc3912460e9e62b61ff6d48f9586879adb33cf516a494b094645a7361bcdbef661be61fcdf9b57ef9e8
 EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
+EBUILD lit-15.0.4.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221016.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221023.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
diff --git a/dev-python/lit/lit-15.0.4.ebuild b/dev-python/lit/lit-15.0.4.ebuild
new file mode 100644
index 000000000000..a79ebb91d54a
--- /dev/null
+++ b/dev-python/lit/lit-15.0.4.ebuild
@@ -0,0 +1,42 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 5fe527a46467..8282796ca0dc 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,7 +1,3 @@
-DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
-DIST markdown2-2.4.5.tar.gz 109389 BLAKE2B 52ef708f0b6df4d948f909b08a94c584738a34fdfc2c063713eead5b3ab9e657468ad2c112951f3296e167efe52c183997f5102a2dbcef15477de064b16bd89e SHA512 55ff010691110c2f79844031b0d4d7c6982c92dc75a1820e8659be02deeda868aca15931c1060795096e3228e6d451d247addc090f1d4939444331d37d5891c2
 DIST markdown2-2.4.6.tar.gz 118321 BLAKE2B d6d053f9f19da0857664275280c9e12d59da9c88db5643df04c4538b3ac9e24feca66361dd05685b2a0d0281af353324e1b051bc315e78f2be9edb20367fa9be SHA512 4c8dbbfa828e6a01e05e714a5d79f8ec4137e80bbd221251d81fc9185f175dc9ac7ebd7b043d052a4b0c2963715d0d25429a22b2671f1512e92c48177c56e2ea
-EBUILD markdown2-2.4.3.ebuild 695 BLAKE2B 74b22100d1710ac46b0608ffc8e3d319fb074aa28ca861eff3031a14dee6856eb8c48111c6baf542d1056124e85c179dd7d6828caf5315cada0b80996b63ad9f SHA512 e899f1614f394328fb04daf2145fcafbbec589e0e98cc81cae253cb52a1fb3137c4495d7fb284762f72804426285a6a3c6e912d9d88233305581e098fd1c83c7
-EBUILD markdown2-2.4.5.ebuild 707 BLAKE2B 43ebd28d32c818dff987e0a5cbce09e7bc1489247c4205341e9762146cc7bcadada23f4446422016ee53d2441582da8adb7b460aea705a63d256820fb3f65529 SHA512 f179f8ba15dcf40a2c8ddbdf7212b150ac2c6bcd31f96104605fa413f72ee1ddcad770916f3375046a7ea8caa71d7d2d2e43e75859166357305aa73c80ca45d0
-EBUILD markdown2-2.4.6.ebuild 707 BLAKE2B 43ebd28d32c818dff987e0a5cbce09e7bc1489247c4205341e9762146cc7bcadada23f4446422016ee53d2441582da8adb7b460aea705a63d256820fb3f65529 SHA512 f179f8ba15dcf40a2c8ddbdf7212b150ac2c6bcd31f96104605fa413f72ee1ddcad770916f3375046a7ea8caa71d7d2d2e43e75859166357305aa73c80ca45d0
+EBUILD markdown2-2.4.6.ebuild 703 BLAKE2B 83e0643b80cf8340ccb43d6f94b95b8958fa204e7c76766cc7a07b911863cf452077c7e59c8e1d5578a77acaab8676b9b838975103c883f25095f0f9c95746c5 SHA512 53a5b605f37bc0fd8679525b9df92429240024528e1d6f4c5593e0a1920d7137a2b37afc131887527fd79b97fad8d563202cb67f124e3b4e66cefdc1bddd2293
 MISC metadata.xml 551 BLAKE2B 293046752073df3a0fe72acea3165d62ae78297f82aa72e40edeaab6bb6021ccbeaa8cc145341aa05dd3fe87c2f89e88f2281ca95ead33d99bbfc5ba53573ca1 SHA512 9d30d896754f1379f4fae79f86bec966cc3639a42e5e7bcc7e8d2e94881ee8a75b7e3ddedbc1573f1eb3c429aea636512efdb887f2827dc1b1aaa4caaa44e413
diff --git a/dev-python/markdown2/markdown2-2.4.3.ebuild b/dev-python/markdown2/markdown2-2.4.3.ebuild
deleted file mode 100644
index 6ee542b38514..000000000000
--- a/dev-python/markdown2/markdown2-2.4.3.ebuild
+++ /dev/null
@@ -1,32 +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="Python Markdown language reimplementation"
-HOMEPAGE="
-	https://github.com/trentm/python-markdown2/
-	https://pypi.org/project/markdown2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.5.ebuild b/dev-python/markdown2/markdown2-2.4.5.ebuild
deleted file mode 100644
index baf14a7088a0..000000000000
--- a/dev-python/markdown2/markdown2-2.4.5.ebuild
+++ /dev/null
@@ -1,32 +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="Python Markdown language reimplementation"
-HOMEPAGE="
-	https://github.com/trentm/python-markdown2/
-	https://pypi.org/project/markdown2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.6.ebuild b/dev-python/markdown2/markdown2-2.4.6.ebuild
index baf14a7088a0..506cc5ca676e 100644
--- a/dev-python/markdown2/markdown2-2.4.6.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index e8993f17c13a..a272e5c196ae 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST mdit-py-plugins-0.3.0.gh.tar.gz 50654 BLAKE2B e84842e7cada1d9239f1d449c1a21ed654ab13017ea92f82190053b37371bc7e06d7afb65f6f56f7fa935666d24d05dca99628121bd4092a1143c289588ddfa4 SHA512 dd6aa738c6d93e45437326b1be52e0a9fc411aa3beacb61690919c272979c97ac1b38116b1ebb01c7d8fe724d4af9621c81ccd45131a690df8a2c0c325eef0e8
 DIST mdit-py-plugins-0.3.1.gh.tar.gz 53897 BLAKE2B 57bb08ec6f90d28beb10fbd57d980b1d6f7b1df5d5c3d537685ec1c34d2ea74ea9e5facd0ee432d12924ae2d35d32e3c4dc3600485486b6cd49d5568bffbf48f SHA512 a934953e95eba04f5c1626d8256fed53cbbb26e35d816b41b7aaf968b452e3bfaa99e3008009dbdd8d9e7c89497916916c2cc1fabbecb735624231cafee864ea
-EBUILD mdit-py-plugins-0.3.0.ebuild 737 BLAKE2B db6237462ce2f25ec581a6548ca98aa69f73ea8cd48dd737320599b3fb8ce0c9fcfa77808359c96b31737cc3244467826778c7092cb17571e76f4441da246cd0 SHA512 ee0b16ce7180e957e2665d427f7ad9a6bb5f51f39ba6ea289cdaef7e4dbb185d73e453dc56928be6e1939a48fadda33d9f9eb0752583adf7f80707072cd402a0
-EBUILD mdit-py-plugins-0.3.1.ebuild 746 BLAKE2B 707776c5748a248dbdd9797049be0530c9c1fcbfe69b97cf94271ddc8ae1a9f86ccef5b623e760c0548604358c0804bfad66b6a02ef6d90fa607186234b76813 SHA512 ee174fa9bd2f7a7dbdfab4fe01fa66c6ac3db0bc937af5220023c2ba728e0218a641aaaebc1538b5da03d2be0d6993f898673bcf777c68eb4a1e4dc7eca2ab60
+EBUILD mdit-py-plugins-0.3.1.ebuild 738 BLAKE2B c6fc3bca5fe9a7fe9696eedff67021e6383f4f3bff9e2af96a28da3ec4e19ec9ded362d00c080425b173ecbcf49a9895c9d41fcbc92922ca3e5886c649c0580c SHA512 ee788989d317c63ab8a4619e4c1edf84b5ccd14fd5595a35b54b85395622e6448363a4588b7ab80741605d6a3f4d893f2ceee32844620f8645f19af8b80facdd
 MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
deleted file mode 100644
index f61d57f5aac8..000000000000
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 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="Collection of plugins for markdown-it-py"
-HOMEPAGE="
-	https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins/
-"
-SRC_URI="
-	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.1.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.1.ebuild
index 896354240c94..9179cade1e52 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.1.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/markdown-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index cd4831d1b6df..9cbf281eb28c 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,9 +1,5 @@
-DIST mkdocs-1.3.1.gh.tar.gz 4088396 BLAKE2B b54d0090318fef205d84c4e914f916f91309bdfe6857cd2592fea24e6fb68baaa2eede6dc768681c85ae37adf794546a6ac82dd34d300f421969991f9a796cae SHA512 6eb041f9d0a628eb3a2e6585fde0959f5ef35501edf2c69db640059d98523e2cfa723bc49aedfac1dea4804dcf3c51791e4a052b77ef97bd85a0f4ace2a4d9ad
-DIST mkdocs-1.4.0.gh.tar.gz 4129220 BLAKE2B 2bd216f569fa7778d40faf4af019304651b72d48bc9cdea7c378cb955d842547c41544c5491aea22b16be6a7589ef42e3ec1ab9bcfc0d77d3cf096a2002bc67d SHA512 83da22c71345829f86c2add0c11a74cc93da12e61e5036fa8a9699569be21e31407057b246f050f3de31cb1d9a554399b778932c7b3993316908b61cf240ffb1
 DIST mkdocs-1.4.1.gh.tar.gz 4018962 BLAKE2B 68484fa4866eed96ecf91d02e308f08480f3dd0ad261a4b94256585ec604126a59aef37b4d61962ed155ab4beb9be14d09574c9b403403fede14cc25579f9780 SHA512 880ec0e6fbb5cf48b998dd685eeebdb25ff0ed4fa9eef8869679550efad15597cb98d00964c3fe1a86c23c5afe2aeee91d704779b4efa42010ce1a582e02bd28
 DIST mkdocs-1.4.2.gh.tar.gz 4018656 BLAKE2B 325e940c72f6a8fe7f353a4ba2f65fc6b123c5be04173e5469d3165d25b3d6bb8983b5c541b0d1376770a8205b54860b756eca1719decdd77e7e4c57477998e4 SHA512 cabdb86a5934672645e29055c04f5c877dd5527df909a606d94f930211cec9f4f29f89137dd413238c07af4108d870dd3b880cba447c55690583cd1b13b179b7
-EBUILD mkdocs-1.3.1.ebuild 2334 BLAKE2B 58d905956b9c7cd92c64f4c82401cd8c7b93bd0581699c725f67ce7612703fabe6908b73ab0cf156b5ff2dfcfc921e8f9bcada912d6df4e229b6b75823fd05e2 SHA512 8e1503b2fb27c7cf4833b0c2c00fbf3cec0bdab8a990265d91705d81bb202d6eb8377f41e1cef0decafdb4b10d24d0c9b0e494f053f6c01bb7104c1abacc7341
-EBUILD mkdocs-1.4.0.ebuild 2412 BLAKE2B e01dae83acaeaa4c68b9a175eca032b73674f205bce5a1b8a15428ae9cc297ac21272ba21ff88d90806634569a06b968bfded280582dabccc0551b7397b1c351 SHA512 2fe2b8c25ae84fa33ddbe7884f2cdcacb1c9a5b2093bfecb98183546374518cca28676f9dd734aabebf81f9ae9d1933fc7d33ec9f2cd5687cdd8bde24a0b3a8b
-EBUILD mkdocs-1.4.1.ebuild 2411 BLAKE2B 46b6453f03b57768646d33ffb7f31867011cc191608bf810702de1da1cfd577a5db9c78222f672bb43d3c6b9e002fb2eae2d065a9b01eb465fcf5d102837fe87 SHA512 df06d6aafc26d240f3174c73e67fb199f2f7eb5e7297c3584e7005d7d9e972a6511ca31b023f14dd982efefa536a5c33dd2f50fa49f82a4a02ee7451a5f7fdff
+EBUILD mkdocs-1.4.1.ebuild 2409 BLAKE2B d96a7b83d4e23dca6388789f5726cbea001acee6d9fd36980c85bc2fde861625052348c988d31f48846d0f1d0b340ccbff5e7cdf5c513a86ad8c76257a62a7ff SHA512 69a64c122d37f4a4e14f699b2ec5447a1de881fab68ca65f1582debca7472df0c5becd75cfdb5fc2ed15f21e4d74d07841108796694c297b25b9468849761fe0
 EBUILD mkdocs-1.4.2.ebuild 2411 BLAKE2B 46b6453f03b57768646d33ffb7f31867011cc191608bf810702de1da1cfd577a5db9c78222f672bb43d3c6b9e002fb2eae2d065a9b01eb465fcf5d102837fe87 SHA512 df06d6aafc26d240f3174c73e67fb199f2f7eb5e7297c3584e7005d7d9e972a6511ca31b023f14dd982efefa536a5c33dd2f50fa49f82a4a02ee7451a5f7fdff
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.3.1.ebuild b/dev-python/mkdocs/mkdocs-1.3.1.ebuild
deleted file mode 100644
index f983b35fa552..000000000000
--- a/dev-python/mkdocs/mkdocs-1.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
-
-python_test() {
-	epytest mkdocs/tests/*
-}
diff --git a/dev-python/mkdocs/mkdocs-1.4.0.ebuild b/dev-python/mkdocs/mkdocs-1.4.0.ebuild
deleted file mode 100644
index eec0c48d1698..000000000000
--- a/dev-python/mkdocs/mkdocs-1.4.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# https://bugs.gentoo.org/873349
-# Building documentation requires packaging: callouts and mkdocs-autorefs
-#
-# IUSE="doc"
-#
-# BDEPEND="
-# 	doc? (
-# 		$(python_gen_any_dep '
-# 			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-# 			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-# 		')
-# 	)
-# "
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.3.3[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Tests fails if additional themes are installed
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_error
-	mkdocs/tests/utils/utils_tests.py::UtilsTests::test_get_themes_warning
-
-	# Does not work in emerge env
-	mkdocs/tests/config/config_options_tests.py::ListOfPathsTest::test_paths_localized_to_config
-)
-
-python_prepare_all() {
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-# 	if use doc; then
-# 		# cannot just do mkdocs build, because that fails if
-# 		# the package isn't already installed
-# 		python -m mkdocs build || die "Failed to make docs"
-# 		# Colliding files found by ecompress:
-# 		rm site/sitemap.xml.gz || die
-# 		HTML_DOCS=( "site/." )
-# 	fi
-}
-
-python_test() {
-	epytest mkdocs/tests/*
-}
diff --git a/dev-python/mkdocs/mkdocs-1.4.1.ebuild b/dev-python/mkdocs/mkdocs-1.4.1.ebuild
index 96747dfe0782..112dd416b8a4 100644
--- a/dev-python/mkdocs/mkdocs-1.4.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # https://bugs.gentoo.org/873349
 # Building documentation requires packaging: callouts and mkdocs-autorefs
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index e3e61a15f818..9902bacc6181 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -3,5 +3,5 @@ DIST mypy-0.981.gh.tar.gz 2628442 BLAKE2B 484ba2da1e3c8988ce4bfa7681592b6ca4f409
 DIST mypy-0.982.gh.tar.gz 2629381 BLAKE2B 84429715255febd3fb9b2b313c7ba20ca54a73aa26fd908c1f4c7be40854052a2e40babf333bbb39fa30e7de14e0eaefd6f8d301cc2cb721b47acf034b268212 SHA512 524565f40a0c13fc640c26a345dccfbcb4d777ba8a96933771263d2fcb2f02b4405ca3afd02d886e2894dc06b9aa476ea8c3a35cbae856cabecdcfa43f3494f5
 EBUILD mypy-0.971.ebuild 1768 BLAKE2B c9adf0f3b1706821722be1c77370052585e7ee5aeabe44f0903c74e71163de44358ac985a0c251217bee8c657944370842c31a4e3042ce270cf12beacc0f2110 SHA512 fe5abaa26482495522c4c958d6ff71248a72edc7ac51b2fa2b4b3dd9ca4ef83d1f9e476120d7fda83a864117f0b4420eeece7bb505c87dd5f00b753c2790f945
 EBUILD mypy-0.981.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
-EBUILD mypy-0.982.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
+EBUILD mypy-0.982.ebuild 1772 BLAKE2B 328c828828f39106c2897de01eaaf9b56530e439ead00687608f6bc654184a01bd01e8e9ab40a658acdfc0d1ae2fc8e6f4d3b9b4710ed91a64f4e64e53f3d362 SHA512 1db1b71a6e77e111db3901d5815535e3c6a31fc91cdeffce252d0f3d98d9e6174a1efc8e4d94ca01ded7d513e307abc8684b00b6cde52fe8ae684ed2e788da60
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.982.ebuild b/dev-python/mypy/mypy-0.982.ebuild
index 75044659afd0..17328df70e23 100644
--- a/dev-python/mypy/mypy-0.982.ebuild
+++ b/dev-python/mypy/mypy-0.982.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index c4002b50c701..1b10beba27d6 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,5 +1,3 @@
-DIST nest_asyncio-1.5.5.tar.gz 7386 BLAKE2B c5d3704dae962ec82a515e2c056c24bd0fbabcf1cd2347379e1d58fc23c922325c89ed0941aead4dc90e0a94fc39ddb5e38fe4decc6e444b0c1261ae955520cb SHA512 8f28b4495f1d595f5943fb8a40c8894183398865059c42686483d6c4af6634b5119ff6e694b98662bfdd71046ec0bed70f5fcceb67971637c0fed91cb6d6eaea
 DIST nest_asyncio-1.5.6.tar.gz 7444 BLAKE2B 04b5808b3187c1155c440c903f0e1d5593f49204e6ffea2a37dc2b6112a365b94ab80823ce512a4cdf6c0799ef1c18d55fc0a841030a2cb93e0913fdf770f247 SHA512 9672cdd72b2bad7c968fa23c94e8bf8014aabf0aefd79b260503e7fe640cb7649f5c266133a4eb87aedcd99cea644fa51f8cd09d789777aca11eb64e84cf4ca5
-EBUILD nest_asyncio-1.5.5.ebuild 503 BLAKE2B 641735bf6b59883d13a4436451a4afb209195e6c091ba869ae388dba89b0c4cf48bb22642a791441dd70ee8696560f587b22f710d6f0a1a774aa02a1c9bfe5ed SHA512 cb73fabc7222ce7e08e295a996d24a5f29e3beb19223602505de6c77661187e374b1f1bdd6755f9b258df1efe872bde087602168ebe74531f658106c3f58a313
-EBUILD nest_asyncio-1.5.6.ebuild 511 BLAKE2B 6dc0bde277e713941b97aba931d9358293eb80054e41273c875be4342005d883194eb507da44aea82cce79e4ae3a26955e28e3e9287c3a292cf3d5bd80e87288 SHA512 84a4030e61c977096a1f9cfdea541c5646bfd8a4ecee1e9f8c96ac47a19243f03242cf9f0dbb84dca06ad0ee44280278894c920a8339e4aad4d25231b19c45b5
+EBUILD nest_asyncio-1.5.6.ebuild 503 BLAKE2B 641735bf6b59883d13a4436451a4afb209195e6c091ba869ae388dba89b0c4cf48bb22642a791441dd70ee8696560f587b22f710d6f0a1a774aa02a1c9bfe5ed SHA512 cb73fabc7222ce7e08e295a996d24a5f29e3beb19223602505de6c77661187e374b1f1bdd6755f9b258df1efe872bde087602168ebe74531f658106c3f58a313
 MISC metadata.xml 389 BLAKE2B 7725ccfe525c9aa2f6b3330e97fad88e1dbc5dd829573d9c32bcf0b492af7303e33668e1370dc6cd8fc89cd55f0be20110d72de0caf87eedf61869e8231f6ad0 SHA512 f1ab8ce0f9568dc9d533d5c47135a937bb5f109ff49315b63444d963c4572602d3bcef96f182ca54df7bbce676e50ee2f0ba795f5310f022922b0b49edc23518
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
deleted file mode 100644
index 528c66ce4771..000000000000
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-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="Patch asyncio to allow nested event loops"
-HOMEPAGE="https://github.com/erdewit/nest_asyncio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.6.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.6.ebuild
index 3227cbb79d8d..528c66ce4771 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.6.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.6.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 8c1857be1bc4..e8341f080b65 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,7 +1,5 @@
-DIST networkx-2.8.6.tar.gz 1957238 BLAKE2B 70c5256440d94c1b0fa01f733ef46fc5da6846cf57891b344b6a82c27029b983827ecec9f1154d47771cff464b789bf84a9150111a0ecf1533ec83f1d41b718b SHA512 d56ab1a3007a914227f09969c9300b0582a640e5c3ad35b25400d8159ec35986a5e9bad5d7f86f1474b7293f495471fa3cd9f3b890a0d5287646338128d09d35
 DIST networkx-2.8.7.tar.gz 1958634 BLAKE2B ca67cea6cd3c04868bf72a16efd211a3caec7819347a161f69433cea18aa987c0b8e15285a24e3aebdbbe7fb431b3a6748195a0049cb563a2ec6c5f2cdca5b15 SHA512 e525bf8a80ddb18607ac390475d9bf23dbcdaeda4bb277c428ce2aff8c0f62ea5adbf0c7746059b8145d6f38fcb32b581da48d9fa10536265ef3c78cf2751a59
 DIST networkx-2.8.8.tar.gz 1960828 BLAKE2B 074e902c2c31e0641fe651d2168c77e62af04b322485bf002f557a42c7a7c63d1391c32f9de95b9d5faf13f7eb9ece93171bb1fdba8548d59df5075ac72263e2 SHA512 c698ed2dcc4221662af585940cf5d6ce1ad97b6b8f6d84348ff1d6b233eb69a36f5fba362bc4bb3a08ec8716434690b52b1d66dc4122edb0f420eaa10023d9d4
-EBUILD networkx-2.8.6.ebuild 1929 BLAKE2B 2d1ea8a1591b62673f1357f6d3c2611e07fe041b9e30200600383c7e7413941e7876ab461299c175dc88cb02b6022e95bc9307c6a4a87cb850963e7670e05d7e SHA512 76ce67cae18a4d67e1ae45eb39e5d9ceedb66a8975eb6298b7b734f9ff0202f768cf1e1ec132712cb42dafec2ec027d208149c24f087dc368b4fe0361f8ebc6a
-EBUILD networkx-2.8.7.ebuild 1933 BLAKE2B 8d827b44337ea2f1262dbc784238a42f21cc9034e14e25d62806de754b1872382a58b3b73cbe4cdf8a16b29e42e1d401559ac6c464b5c3a83c7c2c8399ac7465 SHA512 1a3347153a47144a74ab9990e9c6c89c90f646b2dd00b5064282aac9debd02a09ae1a49ad4d7c0fad3cd8e6e94b4632d0b3d4335eef76515a549743196558867
+EBUILD networkx-2.8.7.ebuild 1929 BLAKE2B 2d1ea8a1591b62673f1357f6d3c2611e07fe041b9e30200600383c7e7413941e7876ab461299c175dc88cb02b6022e95bc9307c6a4a87cb850963e7670e05d7e SHA512 76ce67cae18a4d67e1ae45eb39e5d9ceedb66a8975eb6298b7b734f9ff0202f768cf1e1ec132712cb42dafec2ec027d208149c24f087dc368b4fe0361f8ebc6a
 EBUILD networkx-2.8.8.ebuild 1867 BLAKE2B e437c2f75bf8d0c41ba61860cec05fe98125778c1de66412a1bd40ed728f80c177d3a7ae79c081597bc055b42e22cea2ff23b167b91a65431010b5a88265dc93 SHA512 6655b7e2f877ddffe3f08646a2726729fe626364a994d14c1dceded86e16ed4f9d046c8c158b63647e79c794190105835e2f55cac398968e49d425bc3cd404f8
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-2.8.6.ebuild b/dev-python/networkx/networkx-2.8.6.ebuild
deleted file mode 100644
index 4cb8514883a7..000000000000
--- a/dev-python/networkx/networkx-2.8.6.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_FULLY_TESTED=( python3_{8..10} )
-# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
-inherit distutils-r1 optfeature multiprocessing virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="
-	https://networkx.org/
-	https://github.com/networkx/networkx/
-	https://pypi.org/project/networkx/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# virtx implies nonfatal
-	has_version "dev-python/scipy[${PYTHON_USEDEP}]" || local EPYTEST_DESELECT=(
-		networkx/drawing/tests/test_pylab.py::test_draw
-	)
-	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/networkx/networkx-2.8.7.ebuild b/dev-python/networkx/networkx-2.8.7.ebuild
index 6cfbc22bef65..4cb8514883a7 100644
--- a/dev-python/networkx/networkx-2.8.7.ebuild
+++ b/dev-python/networkx/networkx-2.8.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/notebook_shim/Manifest b/dev-python/notebook_shim/Manifest
index ffc3fa9a7477..0da262f55220 100644
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@@ -3,5 +3,5 @@ DIST notebook_shim-0.2.0.tar.gz 12063 BLAKE2B 78c8bdc54cbfe93b5ad0801eef59b4e5b2
 DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
 EBUILD notebook_shim-0.1.0.ebuild 963 BLAKE2B 0350f66265a980d4f30efb50fd832ca498497f40bef9ff0e95df9b9cd4f5e11597facbe18461fc01c334b847e2f5f9dd319e8ebf42f256883acbb6d2de13a750 SHA512 51c4c1d523c396425ef105b820c4992d8327797d17ede1f7bfb06c9a8f760f1284bdfa1f16388855d4d58dc19aede7785dbe52727d43ddb5902f4c05a4b9c466
 EBUILD notebook_shim-0.2.0.ebuild 970 BLAKE2B 3adc0f53c8a5b6d8a21628ac634c3deb9ae5209f37abb8dabec509dc240566be7417bd89f5c04fb811fa0d6e96d4511c4518364bc1174709ffb5a0914c8649a0 SHA512 94f980543278074e1be4a7ae5c8f4531e0f6318812a67f500fa3534c02c6a6bafe8428c4095348c35c02e464aa31ad5ec53a295540a79d376d26286dd19e0b86
-EBUILD notebook_shim-0.2.2.ebuild 790 BLAKE2B d372728063f7bc0e095d66522cf71a3310defdc343769a015a0595a56f930ed09394ca7f4384dcf38d9d8584ea3b7e9138821dd3d2fb2027d7a367b444deab1d SHA512 c7b59ed8e2571a4bc77c5597c09632579c401742fbb19e2467d189fc31d5da8d2ea86115f653351630ed766ec2ee1224eb0f79c29cdede38fc6c62e9ca694bac
+EBUILD notebook_shim-0.2.2-r1.ebuild 874 BLAKE2B a937d21acd72bd23f237c7ea542278455923346f854802bcf70c3f88e7f51c0410fa857fc01f5729c57ef11b9e30949b89c70416a226f7bd0580a63aa6ff8668 SHA512 60afc2238856580be66c7a31497a738cba7e082d5d8cf41c959186a582ed1773ad32ff7e5ed2f9b60c600b721d586f51d4cbce67bbbdbfe8ee849bdbbef2ea70
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index 17126685a250..7aae57be1d88 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -36,3 +36,8 @@ python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -p pytest_tornasync.plugin
 }
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 482ce1bf85c9..9c47958e84a3 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,5 +1,3 @@
-DIST path-16.4.0.tar.gz 48289 BLAKE2B 5ae3272ecc92689c18ffc612b8b11923225dcface88fa47dc4f42b0dc960034fa6a3c856a9521ed83c9507616577efc3d1c0a5119b0c5605ea6f6b758cfe6d2b SHA512 bb78119f929fe3b160646b06db8911e737060695ae89c28bcce84835213dfbaa12a34300b540be6b51e9462c5b378b235e1e72536524750ec910255399c513d3
 DIST path-16.5.0.gh.tar.gz 44286 BLAKE2B 1d96b0003c562044c1c2ba5eba7a525d5503bd9a58ec1f9611d74e9d52581f646447d3d754809b49b4418c18de9fbfd5de34077fe9edb1c4b3d3fd49f9c2af19 SHA512 0b9b306b2b5cce1e51d65a7555e54770e19a3d4796dbaf2d617bbe8282c771e3d7975112e443462e9b43bafc533d6dc61bedb8608b0d93cc0d1febec995d1780
-EBUILD path-16.4.0.ebuild 939 BLAKE2B 90548c033f04219bae6890a200a912b51c64af262a56102be69e5cfe0c2b5927533223ab5009e3500804a5a6d1870762d2ba65282a5b33c27f1f008cb6a7fa27 SHA512 ab9640a54d97adcd7b44355aa8bef25b3d9b903c7b71c63a98c8b7b00f92a16d4ff2fb1383fa41e52a29c0f3a5dddf6354b0d25bb494db9cec33970f8ddd152d
-EBUILD path-16.5.0.ebuild 920 BLAKE2B bbfc51ae3e83c511322a9123e2ab974970c697d259c1c05f3a8393548b367dfc78fbd43f63edda4942d62e6ce07d315281f353676e796cdf1c1e5f7c61a85593 SHA512 fcdc1d9f63008a8437d2b6977f426a082cd242918faf471897979f006586f65dd4bbd4741c46db74bef980cbcbd8780a27282850148d522ee18facbcb6c17289
+EBUILD path-16.5.0.ebuild 912 BLAKE2B e5f67f0ab168f5ed17d15e6a072e47fc922dabef4c9b834e9b32d3bc29da62066c4e7341f5e96732b458636144eae0b6e4c5c3a93a503496257ff0b7d7fd4ffe SHA512 d7db2839493d6a642d8242fe5a8a69d22031b192b05896deef3abef68d91118e48b023ff277ced94149e10237c9fd18588631f8c4a68222c570192161d45fc60
 MISC metadata.xml 383 BLAKE2B 30f12776bf4f9c1995774d7dc68cd8d9a85b74d514e8239ba76af336e6b08979e496ddaffce999bf0a3557f88ced148335024628b61f765b5bd08bf90b453c5a SHA512 aaceff1caa2714c0b8b3f7373c8721358e63833cfac824e3feda8a34fd1d6a961a27805c012a1125cad1f76d8bf7b1a92d7719480d90b344e5b4d0260ccf0547
diff --git a/dev-python/path/path-16.4.0.ebuild b/dev-python/path/path-16.4.0.ebuild
deleted file mode 100644
index 6338c832adad..000000000000
--- a/dev-python/path/path-16.4.0.ebuild
+++ /dev/null
@@ -1,38 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_P="path-${PV}"
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
-SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	!<dev-python/pytest-shutil-1.7.0-r1
-	!<dev-python/pytest-virtualenv-1.7.0-r1
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
diff --git a/dev-python/path/path-16.5.0.ebuild b/dev-python/path/path-16.5.0.ebuild
index ecd7e2ae4fa3..ff84d0db32cd 100644
--- a/dev-python/path/path-16.5.0.ebuild
+++ b/dev-python/path/path-16.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 2ba6f61d8b2c..9e3fc8d24daf 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,5 @@
 DIST pyatspi-2.38.2.tar.xz 318596 BLAKE2B aba5d4fbbc9e0ce4793843270394712e675e6546c781f0523f7f17a79f018fcf4cf209257e9ef0dc03cbe92be7a17c774fd82f2d9997d9aa8c6b6be65a72ef8a SHA512 03e10af5f0eb2ab89518229f049f497635ec1ae85a948a02813a5eb00eef395a3934f578b56054f8e73ae3c5c28760ad1f2b93e8876b8724c64b622d966aa5d9
 DIST pyatspi-2.46.0.tar.xz 324112 BLAKE2B 653e80be2d17f3246bb6bb60c2135f158185374c995ca37d4f132c90d0bf02b79cfcbc4f64d555c557e9f7fd1cf0720de2c5d177b303e35a84d8e4490ae2e660 SHA512 4e9d177c930db3ccb5aa41280e33a58b6700d9c45f08b6a2f32fce0ecf5f1faa3f91c57281a5661bb9ccaafd0935e90b44f328a62988ae838b4a008916d2aa0f
 EBUILD pyatspi-2.38.2.ebuild 1308 BLAKE2B 1cc1211a2ab3988d8de5ab2e8a69f7589dd23c1f7047589ccdfabd04456083a950fe63ddcc508f86a542295100aea720262f451e839b579521b0f4ee4a424b04 SHA512 dd6208aba13ecd5044af792ed5a4a0713595fa84309d922a8c21e3e65c76ad0f9a05d81d05c91cdea1db6588ac6ae753f9c259826e2593c382e92e463331d65e
-EBUILD pyatspi-2.46.0.ebuild 1324 BLAKE2B d537d1f8bf82951bc862c03c9386619e257c020687eff2c07f328f27d6b46c7d75c1c1067772202d741b8f7cae0abf75d63ec332305a548af5e1e86ea5420c0e SHA512 3a1e7f5a6055cc7743d1fb70df0be64e46caab7737d9e668eb3a3ebbf60e676ed804323b274fb732c4c49f25589a1e7ee931ee6b47593ba85bb6d918baf8b1bb
+EBUILD pyatspi-2.46.0.ebuild 1323 BLAKE2B e5f0baad9e515d3cc8e6a632efaf53f86014c90cece555d264fc252a2c9f0e0e58e5872cf2ab4c81301c090ddeb1c6ab81f6b849caac1cd593bed85950fb5d89 SHA512 e41c2fd2b3d847188b68918ed0e188e373d0c5be207c3faba70fbec720989cf8f18fe7c2920767767942d24334ee81f8416002bb198dfd7ad6d58e87f3a1013d
 MISC metadata.xml 349 BLAKE2B af48f6da9752ad965ab10c2bf3322d4321f084fc392c78e2c0fa1b48728f6b0f9e391b97ee9df9880fbba4c47ec798e0218f3800bb044ac8d9609066dc883580 SHA512 629ee6df4926ec37c3811388921ec024f7b1a50a819b74715dfac905b7830da3d7d64ae1886703b694049d06422d36e551d4296b2892cc43d60d45291d287840
diff --git a/dev-python/pyatspi/pyatspi-2.46.0.ebuild b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
index af4901a332e4..bcf6cea25b54 100644
--- a/dev-python/pyatspi/pyatspi-2.46.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index d0f92c193f29..1f4fc1e14ad5 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,5 +1,5 @@
 DIST pydev_debugger_2_8_0.tar.gz 4171117 BLAKE2B 4f0ea0eeb228cb66f71e2046438396ff5ce59b42e620a067bc515ff504fa2da151e05f8ea6cf2d1aaa0768122431ccb45708a88c0616fb2859e96671b172e822 SHA512 b0189f1824b52f8ad35d1d1cfba0bd734806541ae2ff4f410c110763201630d296d10c2b7eaac8c656dfb3ff0f3c31bfdf2de28323778000cc7821e123a877d3
 DIST pydev_debugger_2_9_1.tar.gz 3974089 BLAKE2B 73e0cea547964e313120af2d27ce0166b5afc2d613428ce96cbc58786dddae99507058a217c0eac7cb071bead8d52b2e9bda8e0c88aff31566a979edc420278b SHA512 67f4d31fa59512ec6738a777537a6f856d312f3a81d7bee497ddc50bf02dcab8c04c64c7e5181e48afea01f9de4300a1cafeb3745cea841d7bb7c26b15ced40b
 EBUILD pydevd-2.8.0-r1.ebuild 2535 BLAKE2B 18ce93e55e8ab42920d85fdca24c3523014cfc3df61a6f17eb06caf09ba07d9ab15902f03fe150983bf027bfcbe0f63d4ab084a49badc28295ee41522b347667 SHA512 dfc41379f6d0fa9aedc028bc0e09a082854c532379f8fc1242cc9e6aeb615a08390042ae1c2974e683c908b29b7ef5ea3abe0c3e4e1ae89ce65ae7489461e6be
-EBUILD pydevd-2.9.1.ebuild 2543 BLAKE2B f59a7c8fa984838b599ed11a07a1d07636b6f80940401d4ca3c7b5b563610728de67fe0950ab00fdfe4d0a814e8e04803267ffddb2d255d9b2c53bd0c5a7fa9c SHA512 21d4b67d3ab8e727c1921788c25544ad4cd974424d8a4d65995b952b7a37982683665fe8273c71e8f11bcd8196bcedaed64324320aa24d7e580c1db16aa621cf
+EBUILD pydevd-2.9.1.ebuild 2541 BLAKE2B 2f1c092dd418293680895c84544dd877c694994d1f0d2acfc33ccf303f7c68803938312b0b37f1618cc422b34265cc5d80f3f4a00c6bd03941d11dc46bca9b39 SHA512 6d6fe04f6e6e8932254aa4f714007ddac5dc30e37eaa82f407bb901f2c47b823d715b271a5c572141ea03148bbf4df9d54dd5b65a414b1f8c25712592332ec48
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.9.1.ebuild b/dev-python/pydevd/pydevd-2.9.1.ebuild
index b29b57fa428f..627da1c32048 100644
--- a/dev-python/pydevd/pydevd-2.9.1.ebuild
+++ b/dev-python/pydevd/pydevd-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 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"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pyfuse3/Manifest b/dev-python/pyfuse3/Manifest
index 56501d6a1dab..772bdeb84dba 100644
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@@ -1,5 +1,5 @@
 DIST pyfuse3-3.2.1.tar.gz 509083 BLAKE2B 16ada8aec47d8049907ef2710e9bfdf7991a8127560e7264e4eb58f7062efde478d2914597333991be4a6ef67a2a83c470560456287c1298b2008454ac831fb0 SHA512 468ef4cf9e2caef346a108f481a4c6dca8909ff3ea5aed11187df4c70c72c6180af9004348d25648368598495e5a5d9be2ba95d37f4d6d8a8c982f4893471b04
 DIST pyfuse3-3.2.2.tar.gz 510868 BLAKE2B a6f11083a3ddec031fdfe5cb810be526cba26d7bc9599a64d28e9a45281aeb04fca8728ff3788e44f1736475c89e64c3c1fd7cb964ff81fc30ce441a5dda7fae SHA512 91787c4198592ff5f0c022141e6c3cb1701108a6635b4d26347c4f7efff2a83aec206e939b44879ad1fd5c6c85aa6731b7465c998ec55ec032a6db024ffee817
 EBUILD pyfuse3-3.2.1-r2.ebuild 809 BLAKE2B f8aafadf8bb2b7d878effce64315ed4ae9f325b3ae306f9413b89d2e7abeaade638bba1ab73764aa286e52ed3c5c2459f3a9b91282d56ea871b52b4b809ff434 SHA512 80eca650efa91feb083f50613f8df7e96623d03f07e1f6e35fad63234468e3266eb273b04d8eac1072af004d213ac074e4af6f513e9fabda18a6be0d6c5d82a6
-EBUILD pyfuse3-3.2.2.ebuild 768 BLAKE2B 8109a1fc152fad48d2b61284111361c94d23a16bea782cbc362337712a306b94de1e40b0996ad65ef289d7012b62ef2911ed7f9ee58af7dcb8f12e6551c9dacc SHA512 fd23a04bd89f875701c400fa112e446e08309f45410dbf68c616afda1b0855bbfd854c88275162dbbc017299645a9b25196a71c5175747d52243189e27aa552e
+EBUILD pyfuse3-3.2.2.ebuild 767 BLAKE2B 1f22d02b6141c653bc03742829315ef0c888358e6697ddb4d1bec3a306a7bdddd78db5b545c57e72d079e5cdfdb823cf4e490f56b9e5438562559e2beb359f85 SHA512 82a18c9e08faa1fdf7fca942fa060ef6c5e5245cc2abdb62f28527820ca4a46e446cd613a4dd97ced087fcfec2925183849b4d07d275bb2241ffd4b3dbc012a6
 MISC metadata.xml 378 BLAKE2B 1eab581597bf836c57f06347fbe9f5abea4aabffef115536e20a7ffc598e0c124197bc6edaa79c92158f1b5339a465d584501705f1f4d26857b92b2cbd518778 SHA512 7893dc5830a0707d32e907d133cb5e2a6f86bb531c31f71926790d6ad9704c9dc85693ef91aa19a5c4ce755956400c8b5d97882ae4a9f52c2d19f64e06f3bcd9
diff --git a/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild b/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
index e681ca0d9809..26f744ab47b3 100644
--- a/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
+++ b/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	sys-fs/fuse:3
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 92ff84580f1b..336c7bd64151 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,5 @@
 DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
 DIST pyOpenSSL-22.1.0.tar.gz 181704 BLAKE2B b10a8db111726c5f6626cae670a04af73cc1856a3084d3ca683fcba942724e99e5bd4ab6eb7dc4eb02ea4c6f14aa21f7744020aae1532145e1db24dbe58976cd SHA512 7cccb48cbb1655414d21c5e66e7defee7ec370cb6b46294ae0307208f9a9bc13708345b2c088a43292262f5d5bb3d45241c18ae66d2ad6824046ffe30f0c707e
 EBUILD pyopenssl-22.0.0.ebuild 1528 BLAKE2B 1ee2fa81f0d398cc094bde03512dce68da3b4c8ae84954f46dd0edd4adb0a698640fcdb3e40d131793ccd5f0d7c29b41634a574b0c8cb9cb54cbe4422e57c8ac SHA512 d15a5002a68204ef0c32819fa2adea72157fc777b0c60ebd9f9a5c275843d74e2ddcfc10390eb3c3ff92fd054b36dd6156db13e9621a047ecebee1fd12a17ce3
-EBUILD pyopenssl-22.1.0.ebuild 1584 BLAKE2B f09adef45b8d0909e56c9336d8167a81f62246a5f76713abd1d5d135e2de81adbb6c0d493f991ec42776ed61d249834212fdfa4ad497687ddecd66436f47752d SHA512 851fb91036e4ef17d4579cd74c7c70a1189d05ea8f0be3088bc2edcd7f6496079c933f3b24f0dd9ff58cdf23ff2219aab8cf4bd303785ccf6a08076c1e76502f
+EBUILD pyopenssl-22.1.0.ebuild 1581 BLAKE2B 04ff0a24b4e9ba44aeb1f18e391c3dccea2e948079bc783560e29b0787de558b94b6fab182964bf5f08c68745738f1977de1d6132995c123e7d13fb2048459a7 SHA512 584dab425721e9157016dee48c6dc5dc646b71b321f45adb4ad8038928e436f1239c326ea5caeb518064e812985118cb6bfb67521f6b3298db4927a072cb7530
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
index 65a2ff20464b..fce9ddc87d2f 100644
--- a/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.1.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/cryptography-39[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index 497cab0703c9..02a8a685967c 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,5 +1,3 @@
 DIST pytest-check-1.0.10.tar.gz 15603 BLAKE2B e51dbb2806bdac73e202b14668c76675979113f661eb339a1a3cff07069d3d4709869d67ea2cb6384483ebde8b68288026df9b7492b17ea67c79ee95e6865809 SHA512 dc3a80b20637eab8adda085ca8172bc3bde75bd47566972a07cf226bb38771933a531d99e139d7c220cc149715fd7d98ab964f72e0b520e8dd3df7633a6e5a90
-DIST pytest-check-1.0.9.tar.gz 15260 BLAKE2B 8bbf0299e76a0e5acbb6ab4e8ce2bcb386ad2e1e91e1596e317bed9800b03c0fcadf76abe76a0ab9d2d8d190dbd839e042579abb08ea898b8325c27898670088 SHA512 058bb17255f08b83e0fc9f6c91be99b2a17676eae903f70999598c1ee69cf0b89cbe3767bbc3fabbacb2a5db35d26ed825599f401f693f4dc6195c02fac5c923
-EBUILD pytest-check-1.0.10.ebuild 814 BLAKE2B 39db3a15198300fe7029baf743d752d23562d63d12a93990c5e9f091486c758102d0255bf697a405f056d6e43f6d0d21567d975380a2747169fae24144cbbe56 SHA512 5bca09de91899dcb24af7a7a7ae7736ca1ea72a6a8dad928c0a8630257361363aaf5e892c6d6f24316a4d378bcf4c863c47c18ce21c10e5b90e974ff4508db5f
-EBUILD pytest-check-1.0.9.ebuild 807 BLAKE2B c3aa0f860155660588326f82afa57021271c19a9afe01d378dbdda6f87753f5056442557e0b3c09044cba9cfe4fb5ff3cd47eeadef2ce3bb5ffa94dc23132109 SHA512 1104ee4ae8b6a41f5826efdf9737d52a53148987fef67b7d28649f8e89cd4abb175e4ab0882735d281cb1de1ef9fc8a4a3667215c26827417556a74d9720094b
+EBUILD pytest-check-1.0.10.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.10.ebuild b/dev-python/pytest-check/pytest-check-1.0.10.ebuild
index 31947e866cc2..6e39e332ac34 100644
--- a/dev-python/pytest-check/pytest-check-1.0.10.ebuild
+++ b/dev-python/pytest-check/pytest-check-1.0.10.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/pytest-check/pytest-check-1.0.9.ebuild b/dev-python/pytest-check/pytest-check-1.0.9.ebuild
deleted file mode 100644
index 6e39e332ac34..000000000000
--- a/dev-python/pytest-check/pytest-check-1.0.9.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-mock/Manifest b/dev-python/pytest-mock/Manifest
index 5686bcf90a2d..4c36cf92705b 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,3 @@
 DIST pytest-mock-3.10.0.tar.gz 28384 BLAKE2B 2f51f8be34094054b8f7864eb083dde00800adb73af668444d21c95d8f159594bed0f68694e7ffb0e24da402a4865f37c07d85622ad00f130ccdb4e3d189bf9a SHA512 2ad6866d581a2999899e399ef5516d478a6172f52923f03703e3e3708229fb3b1178c91225b5cc90734c96abcb48fea517b11e0fc193da6fb592295395c14cd3
-DIST pytest-mock-3.8.2.tar.gz 27734 BLAKE2B feaa92ba63626d7510008c41491bd0ab649b2a0cb55c888a472a5f6100a18d8b4a232532b6b3a860483bfd1676fc1216ca368e215b8f11fc6211eeef62f5743f SHA512 039342de6a22921ebac3f54a1f217a7a5d4cf9833ce4b4bee0a18ba5409d46211cd2d9ff9620a1576560d32f5e5799483e6686e3b58d32123f41dcd7a862154b
-DIST pytest-mock-3.9.0.tar.gz 27883 BLAKE2B d1cf4599bdc3fa21df83874c26751791f9ec891184baa2a304a8d4e48e5a03194718afb80e9019f914150ef22c1b3a787ac17cfadf10deae5584b8e39e32e376 SHA512 ed918574852ac70d863589d976fd65ac57c61ee1fa072651b93ee58f2d1154cef6c0ae1c2cba822bb1c6a2bddd6442b49e256652e2bd55fd3b1bed73017ff7b6
-EBUILD pytest-mock-3.10.0.ebuild 1067 BLAKE2B 2054d7347b138717e9c83954c1c813a52b09081e375fe73de0bfa6dba9881656f54921a7a0c63d030e62abeb74c4ba4295cb58196af46801abc3e511c6dc33dc SHA512 427607c7a44bed7a2f47593ca67db71ec97f809dd91ceba04cd4fac564f041a22aa1d7d4ba0dd544bbbe465a4db21c6c4487bf4d857b1ac9b4777f91d495fdb4
-EBUILD pytest-mock-3.8.2.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
-EBUILD pytest-mock-3.9.0.ebuild 1067 BLAKE2B 2054d7347b138717e9c83954c1c813a52b09081e375fe73de0bfa6dba9881656f54921a7a0c63d030e62abeb74c4ba4295cb58196af46801abc3e511c6dc33dc SHA512 427607c7a44bed7a2f47593ca67db71ec97f809dd91ceba04cd4fac564f041a22aa1d7d4ba0dd544bbbe465a4db21c6c4487bf4d857b1ac9b4777f91d495fdb4
+EBUILD pytest-mock-3.10.0.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
index ce9187b4e2e5..6266e8ce070c 100644
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.10.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 ~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"
 
 RDEPEND="
 	>=dev-python/pytest-6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-3.8.2.ebuild b/dev-python/pytest-mock/pytest-mock-3.8.2.ebuild
deleted file mode 100644
index 6266e8ce070c..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.8.2.ebuild
+++ /dev/null
@@ -1,46 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-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-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.9.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.9.0.ebuild
deleted file mode 100644
index ce9187b4e2e5..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.9.0.ebuild
+++ /dev/null
@@ -1,46 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-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-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 0e3dbb9fb60f..6c6d98c41298 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -8,5 +8,5 @@ DIST python-lsp-server-1.6.0.tar.gz 85242 BLAKE2B 52fcca5a93035a6ec8179908b2139e
 EBUILD python-lsp-server-1.4.1-r1.ebuild 3086 BLAKE2B 7b2f1851b082ae6ac5ec8353a1e8d155060197602c4ddb68a1d7487590313dd08ebdbde64d78ea0cada6fd309945824621d45206047fa8e16c290fd90c23c973 SHA512 17b3cf9fa4de342e3455d65f76aae4c1c0c1bcad73fd142974249aa09b08edaa32200650ac89761c42be7ce4722534b47c4913b7727c93443ab584775a64f467
 EBUILD python-lsp-server-1.5.0-r1.ebuild 3094 BLAKE2B 894dc5c522e2f54de16a984424dbdab8cd27ba652a5638057c96a269cd73c13afda493beab06bfbd6ecd9716c01a00d81114b00c423227d061f06e3afc178aef SHA512 123c56730b3b9f771966fae2de4ec1115e29fd44b965bddbf169addce637526803a470fc0a475add11f2547e14be9b5eb32acd97e48cf3ef7851204419e990e2
 EBUILD python-lsp-server-1.5.0.ebuild 3296 BLAKE2B 59248c3e0a31a00bf18405278ed3ecce81df6135b5e53df76e69f96c51630841955132cd4d857fbf07fa944726c3162a68ac4e9472da6fd0899b2fe5f140009a SHA512 3402de9df0437626ecbab351a383853a72f49ae192e13a477ff7f43593668eb9711115c04f53a2eaced1b24d901f1aa5552b98743c864def7c8d5bd875eb0abe
-EBUILD python-lsp-server-1.6.0.ebuild 2978 BLAKE2B 471f3478ea119f68f09910ed57c7750477b5c56f518118d682f40d408c301156305cf7472e8c44fafb988bd3ab987f92489a27595dd37f226e0ef0261047b76e SHA512 25f9b7bea8adeb37bfee35c493185f94279bd4dafd345685d151557ed6c180cb351e6e5920562f23d3b6646357e80e07a7cbb14b3f316f0d1d16e910f90336fa
+EBUILD python-lsp-server-1.6.0.ebuild 2985 BLAKE2B 866a64755d98182764ab921c71e9d825e6419bb78feacddab0281be724a7be50aa31f789fa5e972f501a12da678a441318d9aab8b95d5a7eff912c08aa1d6051 SHA512 03d199f1598644b8a516865ba7eb02c9d5e8488b6edfc0d786efe54666f3d80ee54eacf240b4537a1d45674813396b688654cf637f8eefb3549483c0ba70daee
 MISC metadata.xml 542 BLAKE2B ca71a08385d37c7f5cc562986630ae482970842054ffa944151d2e4a5d8449329b71c16c61e2a81f3d3d93f02a61ce637fe0bd0961ba3f86b7182b9728b62d5c SHA512 2d5103643838ba8aec53e7d3e924517cc3d735c724b6dfea249bcce3716aebb9f54e3264cb2cccc15dfe7d0ad4b7d052388122144fe6248d4faeef3482d197e7
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
index 9b0f7992662b..8069bed53991 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="all-plugins"
 
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 436a91b08760..7f05c06f78fa 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -2,5 +2,5 @@ AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262d
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 DIST python-systemd-235.gh.tar.gz 59858 BLAKE2B 8dbf112773dce4dfe9fb2b0e660a349481fa29c9532c5aa2d125e5bfc255b2408f63b5bd873b6fee9ebbad775ecfaf32497593b17052189797403fa31b05fd6f SHA512 f1286a477200cc7b4d2c44b43452da576e8e660925711466659795775bcee44796688e1ede6cc22e61cb5b03e631c396d22f9a133327ae1147506bce09bab47f
 EBUILD python-systemd-234-r2.ebuild 865 BLAKE2B 8707e264d86df1a815c2b6d1d88c73717cb1066b7f7e11aa86679a18c769b487dab7e4f0bd14f2500d70dd51e5c916cf1fd9437b1524b2393492c1951ff8a1cd SHA512 88ab314e34907113fda7cf90f43bb921b46f01fcd517a428e0518caab541ba96abc44ac2bcb28b7ac053eaa17770718e48d0437df681b134cb48fd3ae792b432
-EBUILD python-systemd-235.ebuild 825 BLAKE2B 1d95320da9b9a32f6cd06353b55e29e343378edd5b16befdcc20a7d349777134d853106d36f6490769017076e091d9658b69234600ffc1f39b9bebc22ab57a2c SHA512 f9eaaee80c1dfce832a4181f6882550e1dabc0a464146fbd53e0330bf11fe0f482a2ba89dbdea7a44756a20950b7e12ea357a5bc0c0f2e21662ccb0772b8dda7
+EBUILD python-systemd-235.ebuild 823 BLAKE2B 4b1732b9ce6c993c45533d7f8b8f1a541a9d271deec2f07e71568b536b12247d11241f141f52eee05fb8c609fed2e5199e3e5d50ed9977ec32404f5a24a32db5 SHA512 5525db07895e9bf3256fc4bff62bc239ea5cbcc3c3a65197697aeaaa5250fbe5b8386ae231ae86c7d3a2b195e6158d4bb87fa757fe70b3f0790c11810757d080
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-235.ebuild b/dev-python/python-systemd/python-systemd-235.ebuild
index 1d5b8750518a..a2b0d218ce18 100644
--- a/dev-python/python-systemd/python-systemd-235.ebuild
+++ b/dev-python/python-systemd/python-systemd-235.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="sys-apps/systemd:="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index cfe95b643cc9..912943a0ed77 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,7 +1,5 @@
-DIST pytz-2022.2.1.tar.gz 316105 BLAKE2B 74a3f416c5e15a050cc62594851d80022c81cb611e6c1d1130cfc7e1bc9cb3b833edca9e67203695c50abb7587bf514216f8c0153890658bc8a9f1498e82f867 SHA512 9c78d9f484e2e0e101ca7e10fba8e6c9870255b2c320b3499a0cc9b480adac64b07f2f124048aa957c6bc9311a4ac43060368e1f0d85d8e8c8f7df598e47912b
 DIST pytz-2022.4.tar.gz 316055 BLAKE2B 795ac83f9d695f40d0675b8e53c8d573ba1799cb4037edd18974a1f5a5f5e1f73e871852ca4f4098facccf1589dfb22a4948375149a7ae790b98317d1442ec66 SHA512 4dc42def7743cacb13fc8c4b1f8f49b3a49c68c93e7444985eb7242c0d9fd0f95bb9d1be934c4ad5519c9fbdb2aea4d6b8b563d71153c86a40d2e1ee8abb6387
 DIST pytz-2022.6.tar.gz 313766 BLAKE2B db52c5dab06c90f6cacda590682a8011e59a2f1155edb1147a656561b29098bcaa34e2140f260b314b360efa879e822ca76e14e637f5cb5581b43d93c12958b3 SHA512 ea0343453d011e252fba64502984e2a43ea7c7437a211025ca68a4a45178c8aaef4c2b65261434289b21166a99a1941ec9e2d9d26bb3d22a76cbaa421250131d
-EBUILD pytz-2022.2.1.ebuild 797 BLAKE2B 4074092d41c3e2133a58d8a3ef75d3f0f349487b4f288c8c271c23acf0189dcc173dc925e36a6a426e6f551bc34c6497dd7cf41a5d56f04e51ae3a9e7d3a5edf SHA512 442747fd7f390b23b54257f90b87d9a374b28abff9cce1b2296bb5c2983c810317d89bd2071f791110ecb3d09a96109b755622583383fa01be1200cf5008a5e9
-EBUILD pytz-2022.4.ebuild 805 BLAKE2B 3c6565965f2e2b40b38e549724861b90b1bc69972fcf9aac3dc9b2fdf93bf8eb0ac3a740a402d0b2a1a9b43aebcf21ed1408b7a82d93bb8aea5add6e66ab44a7 SHA512 1b6b20b532ef5aa0d7bf8cfb60711e78d7e30818ba39f6e922546f5363e414baa60fa0def8ce8557cf57f87f3aadef01e894ad8f71a8302d35d9c5f2f0237dfe
+EBUILD pytz-2022.4.ebuild 797 BLAKE2B 4074092d41c3e2133a58d8a3ef75d3f0f349487b4f288c8c271c23acf0189dcc173dc925e36a6a426e6f551bc34c6497dd7cf41a5d56f04e51ae3a9e7d3a5edf SHA512 442747fd7f390b23b54257f90b87d9a374b28abff9cce1b2296bb5c2983c810317d89bd2071f791110ecb3d09a96109b755622583383fa01be1200cf5008a5e9
 EBUILD pytz-2022.6.ebuild 834 BLAKE2B 030a22826423e11d49b14fee15deaa439e4ab078799c46b14a96a0476a1e5430655750250bcfe0c64e2e76b023745db41979cef87ff426cc99b9c37d90fb0461 SHA512 f246763a75b2a9408eb375aa18b9d00f853079757c150c198c96e407426df2a272f83bb2fcdcdf47b4e970e76217569942466530803b7c7811cbad008ef03a0f
-MISC metadata.xml 767 BLAKE2B 7946b98442051ecb46ecd8fb9b44cf4444739d0c75d3c6d5921b22a8e7d703374ca94f9eb65f6fc8e556bb0a8953fadb14a643d343a1a2fb9e0a99d9278d42b4 SHA512 dffeb0c84ef5b844eedecea6eecc323ef09010a59463aa7b86daa630ce39edd47d1e3e6da0731c4e59584992ef9f728866e498d52f659b3a5b79a176bd66bcfd
+MISC metadata.xml 816 BLAKE2B fbebba08fc9a0eac3a94dff015dea77b57f01559bd703b906d7f922aa88b8aff3a43ca2391210533742d2ac6c16e6bf3e31b1a6bd5dd2ebf47ce7a29edf5040f SHA512 2614764bcffed71e746257b6cce2bb68de1205292001acbcff5bd69e3564ecabce55970967394ee3900e21dcf29d25150fa579bf39bffb189fd3b4e509d7b412
diff --git a/dev-python/pytz/metadata.xml b/dev-python/pytz/metadata.xml
index 3b48078e441b..5e6047818028 100644
--- a/dev-python/pytz/metadata.xml
+++ b/dev-python/pytz/metadata.xml
@@ -16,5 +16,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pytz</remote-id>
+    <remote-id type="launchpad">pytz</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytz/pytz-2022.2.1.ebuild b/dev-python/pytz/pytz-2022.2.1.ebuild
deleted file mode 100644
index 5fb359de5776..000000000000
--- a/dev-python/pytz/pytz-2022.2.1.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=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="World timezone definitions for Python"
-HOMEPAGE="
-	https://pythonhosted.org/pytz/
-	https://pypi.org/project/pytz/
-"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	|| (
-		>=sys-libs/timezone-data-2017a
-		sys-libs/glibc[vanilla]
-	)
-"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytz/pytz-2022.4.ebuild b/dev-python/pytz/pytz-2022.4.ebuild
index 02775780a89a..5fb359de5776 100644
--- a/dev-python/pytz/pytz-2022.4.ebuild
+++ b/dev-python/pytz/pytz-2022.4.ebuild
@@ -18,7 +18,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	|| (
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index f637c4cef692..f155ca669dee 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -2,5 +2,5 @@ AUX pyzmq-23.2.0-libdir.patch 510 BLAKE2B cb7884416d3e15f735412d69a7ae0decbbf8ec
 DIST pyzmq-23.2.1.gh.tar.gz 402170 BLAKE2B 4cedd065cecbabc0e18928423e853a38953cd1f360fc326573c60bf69ffefadf3bed556d9d71eedf824e646ae23640d14b6aa8938c397c367be32cc36d300e38 SHA512 4ba236b87db062b245a04530de5b1e8385491107ae8de465f6f664c75ab8a929d57491eb3f8dddf31ff1db7b1eee89a6892a9a844bc285096cc9960704b36c9c
 DIST pyzmq-24.0.1.gh.tar.gz 404000 BLAKE2B 01928ba3c64a5afce8e7a97821658da2067a5f6c36c0173ab2f818e83a729939f346ef67bb9a39251abf365f5772abdf7e9e62afb4cc434b5603f474485a7427 SHA512 d4b6346e780f356941a624321f1619771fb2f0ef9f65a3c0a03e837ef081ece7ed59c03f57e8647ab1cd38cfc7404d597dd294768f9e9b890115b9eebc085484
 EBUILD pyzmq-23.2.1.ebuild 1935 BLAKE2B 855ac5336b9944d944924bfaaca47880004a19e0a47e540601709716b8e3499a36c70e72846cf86830d44c0155793641d9c3f598269b7b09a87663e9e2ac37ab SHA512 69105432699471bf11dfd0c47459ec56c0cf797b10da5b147d4d428f9d14b6a8424c3252fb824e2f30cccab98744434e8e42f676bf5175471a28809a1c13e620
-EBUILD pyzmq-24.0.1.ebuild 1949 BLAKE2B d6702f81949271fa81a8e6b0459613369d106e1172d973bcc97551a53070e576fc1326c35e41913e29a1bf3e221165881f39892b0563f7cf78f2ad484b994d7e SHA512 3dfabf8cff5ec6bd34517f8fd50a0a8c04beadca0374b3867bbd22a6c4c6f4616c8b656dba1def57c30cd57fe31983585a055a1c1331e79ccca3ef3e97e4a1bd
+EBUILD pyzmq-24.0.1.ebuild 1947 BLAKE2B 71a1d623d2529af4e6c97b18b66bd79997531ad62311f31f0e36835af5fa174314a59d9a97bdbc7755bd1d36c73f2845f14133c07155c5d5076db4b1a86b3074 SHA512 aad744b20de04ea6c6aef3558e7c561e7c0e98c25e0113dfbbf9d149dfebf25e936b7e0c1b1dc3fb40cc233f1c5d28f044c4c1f12e8dc576bd8d2b53a65c2964
 MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/pyzmq-24.0.1.ebuild b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
index 51aabf1d69ef..0ccd8f61086e 100644
--- a/dev-python/pyzmq/pyzmq-24.0.1.ebuild
+++ b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 9ba5fe9c33b8..dbd9da7edc9f 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,3 @@
-DIST rich-12.5.1.gh.tar.gz 15034345 BLAKE2B 0ff73986d46c70ad6c959bdad2a28e25404bc7f50567f2d559213dfc5341a58b3e3f5e20907275b507f12c107e5d2e947434949ffb7887abad86d4df8cf3ba72 SHA512 41b4328211b825319962056a56df66b86770f62556f84c6c9ad276ae919ec352cda58ecae4535cdca8461913b6be4b8f30d81e0a91cb9a2944a890206215f11f
 DIST rich-12.6.0.gh.tar.gz 15056457 BLAKE2B 58367ef0acb61d68931ea0394ea458e29b3bb59726c6b95d4b179553183c5cef2766484e0d040203181aad927add70198fb3483bfe6113e20851db141de3a867 SHA512 e05a0ad1d6b4f1e4f7e5e3d09c70d5892a618707ae0952e34274c5ffb18a833fe85a4ac15024cc34915515b63059c02f0df32a6c97cbe91e9ac96928c7134fb0
-EBUILD rich-12.5.1.ebuild 1484 BLAKE2B a51891d479aad08cb6b3077beaaebdc550917d5f65c254f6445b3ebf446a121e6789178e5c34febb707be699c7dface9c70df548b8d24d0e552b19aaaa114c56 SHA512 490be77fc00accfe30d9076464d5c29a61a838fdde564c94ecd9c42b2ad294fc756d75c89c9eba2fb206138f261b5ac8ecb7cdac0d96fc461bfee47b107443eb
-EBUILD rich-12.6.0.ebuild 1574 BLAKE2B b7385080e05817a31d8e87f4d4de7ccb3c4362918a52a6702d4d375d3184f9f94c5432d6d338026a0e336e4c0bb7bd2c8a0f30abea72efe2fa70c3d63bb33ca9 SHA512 558b64e890c22571d7cd17ee6d7002bc8c70e5210d0c61317c09cf2352cc48f5dab48245649ea7045748e5f9b43e1886160b187090d7ab7e2050d692d1c28749
+EBUILD rich-12.6.0.ebuild 1566 BLAKE2B b94f72c62cc0f9fa817457124f92ddf4afa1a476fdcb71e255cb84ace59d057f98781c8eb7199c4bb71377068f8a7f1dbb609d4632e20c545669dc43c1130e69 SHA512 4ae59947e8f807511653a5a334f85377327d388475385161e89c1275a261ffe6364e1bf51e4b63088e39889f448238fcead2e26864479d9af87baf91ae2636dc
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.5.1.ebuild b/dev-python/rich/rich-12.5.1.ebuild
deleted file mode 100644
index 7bc3d6877b3d..000000000000
--- a/dev-python/rich/rich-12.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with =dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# the usual deal: output changes that cause test mismatches
-		tests/test_inspect.py::test_inspect_text
-		tests/test_inspect.py::test_inspect_builtin_function
-		tests/test_inspect.py::test_inspect_integer_with_methods
-		tests/test_log.py::test_log
-		tests/test_pretty.py::test_attrs_broken
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.6.0.ebuild b/dev-python/rich/rich-12.6.0.ebuild
index 9ba4c176535d..a33e4350f8dd 100644
--- a/dev-python/rich/rich-12.6.0.ebuild
+++ b/dev-python/rich/rich-12.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 829cc2186b03..b8d56eae832f 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
 DIST rq-1.11.1.gh.tar.gz 604043 BLAKE2B 57169a50fe9c2724c4e61a23e4d73d23af6aae241276dac414d2a065675e64bdd1fd35500903e7c276345a0a713a87dc7642894cdb887f019e82606fa668eba3 SHA512 ce5a2bf1fb2757d248704461ef9b631443610a11fa1c832e8aad62e68812d478c51e7bbd0d1ed4a9af678d3a9c85067e1cf16547653851ffb8c19e36b97ba945
-DIST rq-1.11.gh.tar.gz 603425 BLAKE2B f6295e1d7ddbe229001076b8ca04f0f8c323eed988a7963449c2240cbc6168d48539297c16e1ce95f7ec2b8824e6f65fc1e026e76a6093e73c06dd1b847d1c5b SHA512 6e208f4c1c8c55f5847843d7933f17d2fae58e2b24cf1461fddba08894a860f8bcb55aac5c6840f2d9223b88538070c414e2e540e9bc846cef05a26b0ef38ffb
-EBUILD rq-1.11.1.ebuild 1408 BLAKE2B abf3f5364d9fa86144f600c584c89f3155fb417718ae20571e1948e8348c6ef89307a6cfab8e0962b5171f6682921363a67af5dc7a2aa4274023641575721115 SHA512 708718d2487eba1e660e6fc041a85506f364d4263ddcc47b472f389b7d92ff3936f1244d6604e1f256429d174ca3b5572c58e464662d4311af16e50517e634cb
-EBUILD rq-1.11.ebuild 1371 BLAKE2B 3fcee646908865ea25633787fc3ab2aec1a74f7ff74641405b907e2022d549bbe41d524c34f5de419c979487ca8ef92ac4623f0aaa6561d71ed28643a69f3db3 SHA512 8292eb24a5aebeefec61da1855f6905293f0cf16416f2fe3193ba8523ed04276f0d645d9b946c3e853d6f754568988a1544a1954fd7a7f316f5f275123e510f3
+EBUILD rq-1.11.1.ebuild 1404 BLAKE2B 14507cdc8f2daa539e98208e33cb3f8f978703548e07e48ab619c74caabad1434ec898f00961b64a770f48453fbb3d05cc0966eef83399553d1e0b8f90a8b71e SHA512 b0df931a150c520a3efdc4783dd3c5ed88d97739e229b9409fc27c86b7f4af4205096e3248c1a9a585e2905bd11ce87984dec32f81f299c394380a5f2e788712
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.11.1.ebuild b/dev-python/rq/rq-1.11.1.ebuild
index f88cc4b6eac4..7a6f9ba2000f 100644
--- a/dev-python/rq/rq-1.11.1.ebuild
+++ b/dev-python/rq/rq-1.11.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/rq-1.11.ebuild b/dev-python/rq/rq-1.11.ebuild
deleted file mode 100644
index 65c60c770fd8..000000000000
--- a/dev-python/rq/rq-1.11.ebuild
+++ /dev/null
@@ -1,57 +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_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 55523c1344b5..ba2fc86bf5d3 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,5 +1,5 @@
 DIST selenium-4.4.3-py3-none-any.whl 985964 BLAKE2B b89c8d8c8a59c6fc8cc6aae84456e6e30f651148880f54bac84f4d82a2281d4ca1841e872fed80746c75fc795b8154c925386245f36940c9a54b1ac746d984dc SHA512 14142389a19cd311be229555b06c7dec5a11f852332775def10b6ffd956d07d0394f7af1463fc18116b0e4df055168158a5c2cc6794af760f16b6ae6ebb88aa4
 DIST selenium-4.5.0-py3-none-any.whl 995204 BLAKE2B 214050a4e410a4689255ec8472a1cb35a37596e73d46c48769aa8e184b6f84e281a20e7e5f812b8185edacfcbca6eed77507aa59ffcaeae384f962b4214928a0 SHA512 b22d80d750c85337a2b793799b5a63b11bed45d11b874c1a64c02f53b4adb57263e69bebc79203de3bdfa5b8708203959971723cf0aef7fb68bd1b2a9028e9d9
 EBUILD selenium-4.4.3.ebuild 806 BLAKE2B f8b3b8f2d3e05441d427e0d7ca1b7ac48b31875bb2ff3e0f5db8d937c3c4114461894fa74441783fffc766ef4311fc24f6638b26165c6ada72922340260e4a52 SHA512 9ab7c3166881ccacf9a1b8f7fed9de64ae48068f734df7dbe894d5b02e82b48a018cf50be367ea028fe03c464ef8f78a1aa1d02807db788a18a3518920c5c895
-EBUILD selenium-4.5.0.ebuild 814 BLAKE2B 978b07161efd0127a6c0aec5dcbe5ab771fde8ddc10e006bdfd84bfddfdc50a6142e5afbd5aa1f27fb860f6917c8dbce99bf869779122231b53e82f3c223f673 SHA512 6a9c76a5cecec461d809c00ba2d9168aa6616c278f24cd9bb9aab5ab485f57261e2db5fa8fc8d471e093b6405a7131f15b7edebb2258e2df1c01e640e18849e8
+EBUILD selenium-4.5.0.ebuild 808 BLAKE2B e86b84bc2d4f2c60968970e5099f76db341d09d1273299672b4ac4874ea651e21838f2c6aa94caa445bf0ddbcc600d2284efb7f5f4fa0ce6dec1404ab290cc29 SHA512 df40f2bb339512fadcc0322e69c21bb7cddc47a722017b31d284de63c10ee69b95b79b1d6dbff3dd71b7ecfccfee51f735bae1030bc7350fcd073c5f61be072b
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.5.0.ebuild b/dev-python/selenium/selenium-4.5.0.ebuild
index 5a7d0c13ff2d..99cb1872c142 100644
--- a/dev-python/selenium/selenium-4.5.0.ebuild
+++ b/dev-python/selenium/selenium-4.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 "
 S=${WORKDIR}
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index e50ad9b3f982..4093b4915670 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,5 @@
 DIST sentry-sdk-1.10.1.gh.tar.gz 292186 BLAKE2B 03181c0118294d4221b176b1e4fd38b4b2147a3a1b6eae709153f92717da77e889d17e715ad1795c8d9bdf24ed2ca5718a88b4f3fa25d240ec8e5804d1041a56 SHA512 135dff6db284439812d74b54f301ba0ce25444f71ad0b7d3ff8869399dba97affa40673fd306960bc6665118e0aabd1a3420976effc9a501d51d9f2174d615f4
 DIST sentry-sdk-1.9.10.gh.tar.gz 282661 BLAKE2B dbecfafafebb52f288ff977dc39b7268c0cd7fc78a643139b9baf9345eb216842bad426e860914dad325096306dc515bf48ddfb26f524c95c718787ecadce3e1 SHA512 293f38335692fe6ec215d470b436d2a8ae49ac8471722c555405e920a41d2d591682c956bb01ad43bb3705566353a878f8fabfe74248716e9cf5a2ea2c172649
-DIST sentry-sdk-1.9.9.gh.tar.gz 281232 BLAKE2B 8d1017644c2ae73c4e070f7b1b0a6807ab1d7a7655986bb9a4b457f72c98b3df0fd5f3af8722ea91e13911b1ce6d7234542af195a0b80ec5e9e939f5de3998f0 SHA512 613b504c9e0071657241c7724206d3e99f62fdc846cda98fa4830cf29eee24c8d2ae2abb265fab5d87f47d064d8aed60e105c2d2090fb24308e65b7e74e2974b
 EBUILD sentry-sdk-1.10.1.ebuild 3198 BLAKE2B 8fed7bcd61a24b231a7669529b4811e835d6235cc7565673d63090d0e1355a464427b735e32362a0ba449a4b9bed3ba83b0fee40b2bcf33cc4b17c4f9453ab15 SHA512 d0a1b5c928db9e5a07c3f306707f8952eabaac727aad8d2e2ca148576513f81670d9d849caec69a9074d55a9ee754fce60e76938c90ad1b6624940de58e78d4a
-EBUILD sentry-sdk-1.9.10.ebuild 3118 BLAKE2B b05d1a708a7147961127f8205fe7c0c30d70286ff55ac3338159a48074ba565b734c955388ba74909ac09bd129cb90db389201bf8f8fec89666abb24f150dc26 SHA512 13135b27c419b67344e250198ca576e78e5689d27080077656a6f67a79591aefa5452e2fad05424f262efdadf50cc59a5b447b08722811adcf750127076e08bf
-EBUILD sentry-sdk-1.9.9.ebuild 3114 BLAKE2B 4cab202dcaa7f81e652d20b2e2f9a80c8c84c209ce51644f9b31581f7d02df6c94a0d361f9d47bbb6a6f9afaa74887653b5e502580747bd5ed86f849b7fc40ad SHA512 57763afb76f925ecf24915f61efe6385f22c47496e2f30e2077ec81f3d24cb1c6e3df04a77e3df6c139605dece27e2f40fca7cb97c58fb38fbb8f477a46921f2
+EBUILD sentry-sdk-1.9.10.ebuild 3114 BLAKE2B 4cab202dcaa7f81e652d20b2e2f9a80c8c84c209ce51644f9b31581f7d02df6c94a0d361f9d47bbb6a6f9afaa74887653b5e502580747bd5ed86f849b7fc40ad SHA512 57763afb76f925ecf24915f61efe6385f22c47496e2f30e2077ec81f3d24cb1c6e3df04a77e3df6c139605dece27e2f40fca7cb97c58fb38fbb8f477a46921f2
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.10.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.10.ebuild
index cc94aef4edc6..680e0e88eaeb 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.10.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.9.10.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild
deleted file mode 100644
index 680e0e88eaeb..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.9.9.ebuild
+++ /dev/null
@@ -1,93 +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="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# requires python-multipart (TODO: package it)
-	tests/integrations/starlette
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 6a03a5c65088..1e8ebfc08488 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
 DIST setuptools-65.4.1.tar.gz 2615710 BLAKE2B 12e644412c7f910a8bf6fb470e0c7e78bcd11a9403d7d0821eecad156d0a4ed03751de6bd6c51ebc2ce1c0925386120971c0da129ebd7e1b8376feee1f8edc7e SHA512 d13253bb556380b1b45d4b51dc7922b0cffa390ba92d97ccbc43c314aceccdcf51ee8b5c751cf6f36c6c8955836bc248214d55fe7419ff0332719862772f0f95
 DIST setuptools-65.5.0.tar.gz 2616463 BLAKE2B b2f4ea3750a6ebd2d83a99e2c6beaccebf2c167dac23c901937fecb3fff9891c8c2cf4f150281c00656d2057c89ede80a7b47c73c783b268c91a3700426fd66d SHA512 5f65765a2971662ef4864473d7b54d7d5357fba2b6e9369f1b7923ef5466463852a714e6ee0b6581835c1524069cdfefd907cc65681c7f2b73c6ef278bff6228
-EBUILD setuptools-65.3.0.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
-EBUILD setuptools-65.4.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
+EBUILD setuptools-65.4.1.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
 EBUILD setuptools-65.5.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.3.0.ebuild b/dev-python/setuptools/setuptools-65.3.0.ebuild
deleted file mode 100644
index ca559b896870..000000000000
--- a/dev-python/setuptools/setuptools-65.3.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.4.1.ebuild b/dev-python/setuptools/setuptools-65.4.1.ebuild
index c11a0923e907..ca559b896870 100644
--- a/dev-python/setuptools/setuptools-65.4.1.ebuild
+++ b/dev-python/setuptools/setuptools-65.4.1.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/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 7d8b96f3c781..86f1c2067ff6 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -6,5 +6,5 @@ AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4b
 DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 DIST pyside-setup-opensource-src-5.15.6.tar.xz 3580388 BLAKE2B 8a3b15d073bcbb0c6734f500ca906e56387cb8fc4bfcfd996304d71b54edd5f4568976049519ed26aa718bee9e43f59a0c4ef53837d5a341219b991a8527a800 SHA512 99a0c1a05e722cbf33128cf25742e61b92e151fdc05b79db9bafe778e024a0c6fc2886ee3d0b923ff681c55916f5c0eea4197f174432587fd662fba4390b26f4
 EBUILD shiboken2-5.15.5.ebuild 6563 BLAKE2B 455dc6f82e4269b6cf3f22574fe0a11c67caaa053ecff26b6b3ab2d1288f578fdca91e2d7ddedcdce0182bf3efd637f6514fb991fcd8b6abc4d40df76b5bba56 SHA512 850fdf59276270cb14fba754c9b405d1c4e2615970b9826ed4542822dc80e0a711efa8728f87dbfac5b3a3855a204be1af31c8ad0dce8083bc680cfb15e0f12e
-EBUILD shiboken2-5.15.6.ebuild 6696 BLAKE2B 681464449bd6e3e7f3e7bef09e15d6053bc09cc955c758165067fc678c78128a5dcbfd9e3588f0119fc786e359fc0b34a83a14702091bfa33d9577ed3839c7ed SHA512 3b781dec823f9bdb75a298121819f1dd7ae2e036c468df6fec18267d41a537a5244c6068fe4db06f48f712f10d3f138b4a15c48c87580d3247e5348db56ab0a7
+EBUILD shiboken2-5.15.6.ebuild 6695 BLAKE2B bd1a67d8f86f9c7799f546599fc5deb8fd7ff79d68196f1023127c0cc907ab0087ed8093738341078ed6b50c63bbce2f08125f0affba39ac8905ddfcac6e24c2 SHA512 94b8d1875b3072b56c79b6d2c3fccd2dd22ad4cf2dad21285fcdf3c09f23a7dc9214f84dc938ead167f6254b06f85fd2439142ef7439059f39afc7e4450ebf82
 MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24
diff --git a/dev-python/shiboken2/shiboken2-5.15.6.ebuild b/dev-python/shiboken2/shiboken2-5.15.6.ebuild
index 02fb51cd1408..602918150df9 100644
--- a/dev-python/shiboken2/shiboken2-5.15.6.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.6.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 83137b4e7d28..728451feadb9 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-autoapi-1.9.0.gh.tar.gz 84730 BLAKE2B 31547c0dee076736d65867d9856e713581c440d2b1f01b7ebcbe09b31a7bf2979346bcbe18d6064fd5656b7d7dab9149c67fe79f0db7e5757c2581370c11a8cd SHA512 f098f474d9821c974c2ede77de30f3317c87cb87ec00b7a1c021add1d07a1ed59fa3b4165edf2b7f5165004ba9c717394962154098bc89b52989d0e604c542f1
 DIST sphinx-autoapi-2.0.0.gh.tar.gz 86051 BLAKE2B af6c2f997e7e018304c5f19d978fc87fa853d876781930c1220e8e823a078c80c86851a141ed01d7ab94fd76d747e8dfd7462dd5ccab84127f1c95d225324a92 SHA512 7188ed167de808028b2ac603abb6a136584698a1df4882755b80609f4760dab818cec5f4684bf5d16afc2ae1be112ecb96c7f02f989fcb67937c19c045f45b81
-EBUILD sphinx-autoapi-1.9.0.ebuild 1065 BLAKE2B 88f28fe9b865a202421fb2ed3f6e28ddc40b5fd0dc565934ead1c53db8a34e96490645942915e99bc7fc251b95ea1d71dac7a142c9573f56947ba6cd69834ba4 SHA512 99fc2c264bcfa59e49516e857179666616521c83c135d73360d920c6bce014186869184dd40e633d24833542c78b0d457d5b74b31650bae44aff392ba5f2eb49
-EBUILD sphinx-autoapi-2.0.0.ebuild 1075 BLAKE2B 81763ca798724ba0f2e502edbb82adf35a7b0fd1560fe4db135aea34ed54c8b584e1ad0bf173142901ad820bd1ae846011172181517f14338f217b9bccd87ebd SHA512 6a66a48b3dd8389aa0f3f6d77901e829d5f9bbb56d54ee9d983603be4ca4d16c9bad02f98c28f5a3840bb1265eacf686461ea3b98f01cf20352a62d32b3ebe33
+EBUILD sphinx-autoapi-2.0.0.ebuild 1071 BLAKE2B 9fc1a74d4f8796e67ed8925e34f95bd3ab377529ee1b28c5f26df7309dd2af855d3146c9a7b8e322053e21ed2f625b4d13055f69a4210954780c262a23986525 SHA512 773caf9b993791d04cd363284fa727628948b55acd3ca21298554599995fcbadb4a023209bd236663957c02e384ef19d5bd8a73138508cd72753ef9fef0966a0
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild
deleted file mode 100644
index 7d2482bab97e..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-1.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 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 new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="
-	dev-python/astroid[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-# Test requires pypi download w/ internet: https://github.com/readthedocs/sphinx-autoapi/issues/329
-EPYTEST_DESELECT=(
-	tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample-override_conf2-AutoAPI
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
index ed1cb2fd23fd..8e2b4490c507 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	dev-python/astroid[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index e852d11c86a9..35d919e1ebb9 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-autodoc-typehints-1.19.2.gh.tar.gz 26983 BLAKE2B 694edbf94bac05670adad992cfdc7e1146228af7b888a97c4f8e2394623ef3e42251ba0f3c22985517b2a251996cc41a305ea5497b2369363bc00d4bb3d24da7 SHA512 c35c7ed3f0698651be5ba4dd2232912d1f6d9d30e08153527df3fe16001266abc80cd1b11e3a41ccf92140c6baea98105e9bccd9466e65664dcf008f9a944634
-DIST sphinx-autodoc-typehints-1.19.3.gh.tar.gz 27694 BLAKE2B c1528fa4d4e055dab723bfc40baea591a201546abdccbb81e7dd9ada8620ea74d7371f9c47a8ef310f57934de95b5c295939fa9c095492e02606ca9828bf921d SHA512 fba1b5b39b9c8556ffa75e1a9d2427623bb8ee6f412b78c293c77b248b81d73f624beca9c155279147951510daed7cf5a5120e714efbcce4d62251f74f0924a4
 DIST sphinx-autodoc-typehints-1.19.4.gh.tar.gz 27724 BLAKE2B 5d22561515286a3530a86dad5cf80f0f66068ee50e10a60513dc66bb17be9a8aabb10fe9a35dd6cbeddc6eb78c2403e8f880cbed01e048c5bb3ce48716ff6bdc SHA512 d36a8b3f32dfb6204a248b91f20882b97efa9aa746cd9eeb445945de165511ddce4f9d3cc63799a5f9acc5b2fa6a4352eb7205e679b8937138a12cc462c94056
-EBUILD sphinx-autodoc-typehints-1.19.2.ebuild 1066 BLAKE2B e43ac460f86ddb31256e3e303b3837f542d0b2b296eb3b917f877dfdd426b542b779d6ca0e4036e80d6689e8de3bda3c2259923400bdf6dc9a46faa6fa6ab012 SHA512 d841abad7e984d33a332262f92eade154363aec0f1fa9588381e6ab9c1c6f0e193f05ccc5d5f9755df52429f096238f2c1b51e2040ae24cca027a5d3fe8492c1
-EBUILD sphinx-autodoc-typehints-1.19.3.ebuild 1077 BLAKE2B 4e9ade2d098b25db13a49fd2f63cff7045af6a5ccd098d8d69f019d179a7feab1f9452c7bff6e80f4dd6a67c549b1eb7c5cfeb5084202e1519b277fe5520c5c4 SHA512 76d5fbd4b18a28db31758010d2917d3f69f5b1caf405c96f849cced5bcee225dd4580ee3c789b49b406eaa801be3d1aa13f809f532ea7f01572870385349dade
-EBUILD sphinx-autodoc-typehints-1.19.4.ebuild 1077 BLAKE2B 4e9ade2d098b25db13a49fd2f63cff7045af6a5ccd098d8d69f019d179a7feab1f9452c7bff6e80f4dd6a67c549b1eb7c5cfeb5084202e1519b277fe5520c5c4 SHA512 76d5fbd4b18a28db31758010d2917d3f69f5b1caf405c96f849cced5bcee225dd4580ee3c789b49b406eaa801be3d1aa13f809f532ea7f01572870385349dade
+EBUILD sphinx-autodoc-typehints-1.19.4.ebuild 1070 BLAKE2B ffde367c124e6d1992275855829f155cafb1fe1d42efb48e86d50ff5ce29f4e04fadce31784ce4e6375668b5f6e1a76a355f4420061dce9ce339e69725349fb3 SHA512 ca8fde96c3c4340d950cc053f75f226647eca137feb0d86b50ac3551dd159ac2d193c1273bb256942812e1ea4e9fcf9ea0c46177c7bf52ff6ab151f8cc22dc00
 MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
deleted file mode 100644
index 8ef083efe1aa..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
+++ /dev/null
@@ -1,44 +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="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild
deleted file mode 100644
index b61995da51f2..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.3.ebuild
+++ /dev/null
@@ -1,44 +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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-SRC_URI="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/sphinx-5.2.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphobjinv-2.2.2[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this package is addicted to Internet
-	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.4.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.4.ebuild
index b61995da51f2..91b9963b69f0 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.4.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-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"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index bc4e63b4e691..500c34c4400c 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,17 +1,9 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
-DIST sphinx-5.1.1.gh.tar.gz 6766329 BLAKE2B ff385abe35d4a700cbb3cd8acc72313f7c923d48b38934cc35ea6128ef6c16eb6a33604daea25f81f60b65951b4623f62cd4c1a482b2c5e7285ce0ddb6226c80 SHA512 23261cabbcc73072134c22e7fb36f4c7911f4284cea9cc7be6006e500d9de65727f43214fb4427d307845cc684b9a569960ed276320855283a33b9542a2a6918
-DIST sphinx-5.2.0.gh.tar.gz 6777631 BLAKE2B 53514f0561a53e656f15f434f79a2e2a6c0b41989bbc98f8c7e3e0548ab180339d2908827a933124576dacbed76db7e519ee1e626597a3f50900a90cb8b1c23b SHA512 480c288cd9bf3c1bc61aa97fc4549dd6f0c3d23c2fb5cc5f15a20780984c518f50638a42a87b9c2c0b4eb24ef57e6cfbd812a82a9227ae439028a0fdd5f165a7
-DIST sphinx-5.2.1.gh.tar.gz 6777833 BLAKE2B 128c8bbeb1609eef353da88a6d7dc561839b9e60abc46325b96e668a2babc39695f65d7e9539ab8faaae7ba27f558e6ec300579f94f1a62da9ef0d9804eda893 SHA512 bb51a91f7eb9643cf30be732cd0d9d45a90a1358d8379d89ac3ec0a46dcb0724a57ec4d5062375b6a98bfbb5d688d709ca9a1ed65d7825f4402cacf01cc9e034
-DIST sphinx-5.2.2.gh.tar.gz 6777525 BLAKE2B a6b5ff51072407be6e9bc7ae4d287826b8ce391c1ed712595d99c35af6279ea5404e28c48f8694620f246001824bb7cf2b0ac18d90f859874740d54a12ff9c33 SHA512 290ccea3ddf8dd73679976064fde6130213085c352972da0db4aba1a8f2fcb2e69ed52f2bb2469661bdfd90a1bf75255075e133e08cfcc301f28116415bad080
 DIST sphinx-5.2.3.gh.tar.gz 6778166 BLAKE2B 0ba15fb7d558ee4d2d2ead5e04aa65d32dbda3b711d43723f8267dcd88ebf18711081aecdaa607e4bcac1198bd3f55409379f5f912e3a6a672508b941ed72891 SHA512 8a78beb63bdfafe4808c12e3d09adf1e222f0555171eb177f578c4434a454c0527171b1fc751e5df654c7a5f78b2b5709be5b32edaeb98f5f6ae71719efec327
 DIST sphinx-5.3.0.gh.tar.gz 6873479 BLAKE2B c57ede5e3d83447c6152d050d45df73bced62ce0cdcd84ea6316a48bff072590ad036c469dee053a9dc5eb1a7ae53b350aa25b5fe14c3378dc6543186552f720 SHA512 6877635d46f2e1f2b4cf4edaca463d85bf740a13bbeb867486efd57904aacc42626e6a4f58ad971e50808d31391d068702c4f2910a95e5c86dbd68d87e2552c8
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
-EBUILD sphinx-5.1.1.ebuild 3952 BLAKE2B bb5c2275de2ab18a564e742d5a1110d5d3c3b42c9892826eaed7cc421260e9bb7006e3bd43025882d92a93d57ff3b838745f544d44ca241bc46ae0e7d128542d SHA512 b1b476e9fe5c9e0159373e4149d807a8ae55117d82e381f29b64ec7d238c63c34585d0c045ed3e0da35dd7b822541d9a8827de65fda72cb936f9ce5e051a4e8c
-EBUILD sphinx-5.2.0.ebuild 4006 BLAKE2B d89b7360a35d2a40f5f4a9e077173bbbba98e46c40dd443f90bbc31cabc4b76284e1068d54ce33c0f628973c623d2c3af67541edbd8bcfe3b01254384e27a0f2 SHA512 4eb42fc2bc1ef23ac95d0c77ce5cbdeafd789c16e5005e173797ced0c5fcb8aa31b2866cf7926c40d5907b8806d750ba1a88842b6549b604d5194a8972a7c7af
-EBUILD sphinx-5.2.1.ebuild 4006 BLAKE2B d89b7360a35d2a40f5f4a9e077173bbbba98e46c40dd443f90bbc31cabc4b76284e1068d54ce33c0f628973c623d2c3af67541edbd8bcfe3b01254384e27a0f2 SHA512 4eb42fc2bc1ef23ac95d0c77ce5cbdeafd789c16e5005e173797ced0c5fcb8aa31b2866cf7926c40d5907b8806d750ba1a88842b6549b604d5194a8972a7c7af
-EBUILD sphinx-5.2.2.ebuild 4006 BLAKE2B d89b7360a35d2a40f5f4a9e077173bbbba98e46c40dd443f90bbc31cabc4b76284e1068d54ce33c0f628973c623d2c3af67541edbd8bcfe3b01254384e27a0f2 SHA512 4eb42fc2bc1ef23ac95d0c77ce5cbdeafd789c16e5005e173797ced0c5fcb8aa31b2866cf7926c40d5907b8806d750ba1a88842b6549b604d5194a8972a7c7af
-EBUILD sphinx-5.2.3.ebuild 4006 BLAKE2B d89b7360a35d2a40f5f4a9e077173bbbba98e46c40dd443f90bbc31cabc4b76284e1068d54ce33c0f628973c623d2c3af67541edbd8bcfe3b01254384e27a0f2 SHA512 4eb42fc2bc1ef23ac95d0c77ce5cbdeafd789c16e5005e173797ced0c5fcb8aa31b2866cf7926c40d5907b8806d750ba1a88842b6549b604d5194a8972a7c7af
+EBUILD sphinx-5.2.3.ebuild 3998 BLAKE2B f6b5d5747796776b17dcaaa47e1fa0ac09593991c32ad01ed94e70aa8c91aa0cd5e8d13b4f11a7a433fb1576f3b6526b5a8449021b3fa2492d64af1d971d0b5e SHA512 500bff7dd746bf3f552b3ee0d4de9ddaefd66bddc552a6242e080a649f0924289eca7d1b114438ac196b4a7095cd9a0c78f32c906fe8a24288d12d250863c985
 EBUILD sphinx-5.3.0.ebuild 4176 BLAKE2B e7504318bac6fce706a5f2bd991abec04b7acd4c2e3a0acff1ee184ca4fd1bb6520811bb143a8761e575202ad29111d6f91c5412b9f952316c958b9b0001d833 SHA512 5eadedad95c9dcb9a9482620be661db0e4ce391ce1f4dd80764b30fc4352ab014bab3d962ba05ebc49fc8dc52ac2f4313e98c1ad3ed7785c7c6984a3868634b5
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-5.1.1.ebuild b/dev-python/sphinx/sphinx-5.1.1.ebuild
deleted file mode 100644
index 2680fb049358..000000000000
--- a/dev-python/sphinx/sphinx-5.1.1.ebuild
+++ /dev/null
@@ -1,124 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.2.0.ebuild b/dev-python/sphinx/sphinx-5.2.0.ebuild
deleted file mode 100644
index 46163127e936..000000000000
--- a/dev-python/sphinx/sphinx-5.2.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.2.1.ebuild b/dev-python/sphinx/sphinx-5.2.1.ebuild
deleted file mode 100644
index 46163127e936..000000000000
--- a/dev-python/sphinx/sphinx-5.2.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.2.2.ebuild b/dev-python/sphinx/sphinx-5.2.2.ebuild
deleted file mode 100644
index 46163127e936..000000000000
--- a/dev-python/sphinx/sphinx-5.2.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.9[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-		tests/test_ext_inheritance_diagram.py::test_import_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_util_inspect.py::test_isattributedescriptor
-		tests/test_util_typing.py::test_stringify_type_hints_pep_585
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-5.2.3.ebuild b/dev-python/sphinx/sphinx-5.2.3.ebuild
index 46163127e936..cf5cba18ac86 100644
--- a/dev-python/sphinx/sphinx-5.2.3.ebuild
+++ b/dev-python/sphinx/sphinx-5.2.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index b45f163f526e..93398b98e0fe 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,3 @@
-DIST sqlparse-0.4.2.tar.gz 67771 BLAKE2B 790ba224ed04ce1952602e7d01a2f0bd7e830e62a38c35d69c3fcd2b5b1016560a1e23c24ec82ff4b2e7021cbeab17968b9cff01acc8674fa18a05ab88efb84b SHA512 8136e5c14650b5286616958bfb19039a6981e4c84bf955b0f668053f5427202eff9a6472f71820293ddbe55c0f793fb690d42d0e0134135aed7eb6e13edca01e
 DIST sqlparse-0.4.3.tar.gz 70771 BLAKE2B 23c80d2ef9ef094cfcc9742213d7db07cf927cd415f93db29e71bfd1c9033f2a392d69691606c8c32b9a4148630d2c5621a9e3feaab2fe27d61fb8f243783997 SHA512 4061653705a7a44af4e89d370f0b21f276271f9fa75a30b8b1df278abe742e579c7f15008e65d2e1f29e0e815fd946cb9f3c35f1aa391e5698705b8c7bc0945f
-EBUILD sqlparse-0.4.2.ebuild 611 BLAKE2B 58e58e52e89a875adac6914b03ece0f16a0bbabf27c013a819c022fd9f4bd496dbfb4989b7840f096b8ac27fa1b112448c9818f6e31fbbd1fea49e6476fcd38e SHA512 22d45dd864161602392e866343cd8a700bb7f3e44eeaee504e04b45f95d9d634e1ad3ca9f6a5048c85b240a64dc33a007baa36c8808224ff6d2878bcf53530ea
-EBUILD sqlparse-0.4.3.ebuild 618 BLAKE2B a825780d5314512911f1681719bd2b00885e1ff3cb03b030f2b283ef37f3dce9ffc248e72e58422c70665597a6f8b0970385469d8945e0f2da76c4ff682c795f SHA512 aa644f70c17ef3a417fd44b162f804e204068cc42d1151ac8e14d8eca613b0a8799aa0b0203696a454a2a7619845c21492a6c7d3a918732b45740f1072205e13
+EBUILD sqlparse-0.4.3.ebuild 611 BLAKE2B 58e58e52e89a875adac6914b03ece0f16a0bbabf27c013a819c022fd9f4bd496dbfb4989b7840f096b8ac27fa1b112448c9818f6e31fbbd1fea49e6476fcd38e SHA512 22d45dd864161602392e866343cd8a700bb7f3e44eeaee504e04b45f95d9d634e1ad3ca9f6a5048c85b240a64dc33a007baa36c8808224ff6d2878bcf53530ea
 MISC metadata.xml 410 BLAKE2B 97f37f1bbd08aa14f30b7057399220b2f94d0e3d28261beb35b8572a8bd54edc7d5cb20a6d66f3e4d37a629b350f452899a12f76c59e71796bfed61e071da18a SHA512 a55605ca5c16014efda6f2c489d8598bf355fb776f1f7972d734b533291dce3f39996a86cd4d6f86296432898e54086cca614e89bc04b200b6fea80ae7a1ccee
diff --git a/dev-python/sqlparse/sqlparse-0.4.2.ebuild b/dev-python/sqlparse/sqlparse-0.4.2.ebuild
deleted file mode 100644
index fa28d5c85917..000000000000
--- a/dev-python/sqlparse/sqlparse-0.4.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-MY_PN="${PN##python-}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${P#python-}
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
diff --git a/dev-python/sqlparse/sqlparse-0.4.3.ebuild b/dev-python/sqlparse/sqlparse-0.4.3.ebuild
index 1aa42718e4ff..fa28d5c85917 100644
--- a/dev-python/sqlparse/sqlparse-0.4.3.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 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"
 LICENSE="BSD-2"
 
 distutils_enable_sphinx docs/source
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index b188ecd07dc5..93f953ba2a73 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,7 +1,5 @@
-DIST stack_data-0.5.0.tar.gz 43332 BLAKE2B b9583717633902b4618981ceeb53eca7b817b7985fd5401cc79fe35b194e77fdb57e1c5c51adde0b4e604f6df5424d27056b2528c356a808a4b4c9e1dee1c56a SHA512 82573d9b115daf23a04921027878d55cf9de897a01cb0089b082ec0e7a7b42461afe47dddf4d16adfe186259280b57d651857884ceaf9673d8c983c48f479684
 DIST stack_data-0.5.1.tar.gz 43435 BLAKE2B eeebca4d2d8e3c8795e05d4a058c4a7421a2669e28b476400d541c79d5d7ebb66dde16cd39e2586eafa2f653341c041351c2684440d879ed71b2adf83ea1b4d9 SHA512 b33e3bfd31d285fcdb8f6db8f3e59b6e99fcbc0b912c7be01e52b164554a5914bc8f1a7fb7e665a18fa2d164b248afeb3c6a287f8e27ab7fa44f69b75d93d375
 DIST stack_data-0.6.0.tar.gz 43595 BLAKE2B 5485fbf5b332a52567d8f42dddb4ea5c01bdcab8c6f3a2ce451ac06ea165bb55fa730b0ad546b6ee04f0791c044ac240e8b840fa74644f2e90916e8b806ce31d SHA512 0fb3ab635977dfb5886efda6d9d55bea6c4bfb932528e93713fb3cf4cdb3557aa46e06bded2956e93ae2fb69c2d4bde31001f111e217db7cc1501fe9332824f2
-EBUILD stack_data-0.5.0.ebuild 825 BLAKE2B 575800f98c667835be726a01e4d2d0bdf0e7d6f26e4554bf33670fc7c6732fc147174ad15441bb6e3951a474478ad1b90aea7ba2184e02d9d5b53a58ded08a26 SHA512 b639c0422e76e42d661575378191eeba250e7f35ca96b5ae8c2b8ddecc0cfa530140c2336654e3d04344b45ebbb6875b9673733266df54e43ecd25149163d8a6
-EBUILD stack_data-0.5.1.ebuild 876 BLAKE2B f5bb2a12099ee1b20236148a4adb5b93f54971fc56e8ec6a7f8ee24f14735492a869f44760655b8a7f22404d6ef674b0e1903c425679313041467a9acf99104d SHA512 5740daa892dbccab5987211322d705fe8c944872eb150d04baeb17ca83d00fcde491597048b6e8827431f60466601b5160e5f4d7b36dac71f260f0ff92073d26
+EBUILD stack_data-0.5.1.ebuild 868 BLAKE2B 28692f5239b1a31fd75571b75667c353ff00a4834ee93770a84c1d6f6a9aa2911a94f048febc83a56a552c108c95f259d553d59226bcbf7cc995aab7f9cfe0d9 SHA512 8a35a537a2e3de7374b1d5c7d1be81dc9d5f44ac40b06e37787656a509abcf662c52feab78712787515cf9a7feb7dfe83cc1e68d413616dfbb36ff884dba4bb5
 EBUILD stack_data-0.6.0.ebuild 892 BLAKE2B 3984b9aeb5690ed9fd0fa4d894a1da5ae3754cdd63b92ce0c1df5d4ae492fc72edce709d855104672d591a80cd23d522a85de67d0e977dcaf9adc666d2e072d2 SHA512 ad166149b800dc32b654d9dcc196d9de047ea8dda79518afdd304973ad6b075e1f08ffff2c848139c4ba7553bcc4f7799b5f2f2748b71be93577afbfef53d88e
 MISC metadata.xml 399 BLAKE2B 6f2f1d18b8e574335af618995b745aa50ff1db8c58ea881b3596cbc9c22796dcf20b78ae52f370d308999a337233c6ab5a778a555876877851cdec20ac4e14b0 SHA512 474c2eae21a1617dbbd8002189fff802764bdf24bc854dd68b1feaf3e7ec4ba7831678b5facc9cf4587c784874cd530b11140ee345e831a9b7824e6752d2923e
diff --git a/dev-python/stack_data/stack_data-0.5.0.ebuild b/dev-python/stack_data/stack_data-0.5.0.ebuild
deleted file mode 100644
index 833bda6e4c4b..000000000000
--- a/dev-python/stack_data/stack_data-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +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="Extract data from Python tracebacks for informative displays"
-HOMEPAGE="https://github.com/alexmojaki/stack_data"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/asttokens[${PYTHON_USEDEP}]
-	dev-python/executing[${PYTHON_USEDEP}]
-	dev-python/pure_eval[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-		dev-python/littleutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stack_data/stack_data-0.5.1.ebuild b/dev-python/stack_data/stack_data-0.5.1.ebuild
index f894cfc16ab9..8743cd721d1a 100644
--- a/dev-python/stack_data/stack_data-0.5.1.ebuild
+++ b/dev-python/stack_data/stack_data-0.5.1.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/asttokens[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 9fe1e9f8ea3c..a48c3762c0e2 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-4.1.0.tar.gz 266799 BLAKE2B ce801bd6d4536163d7fc56b46b23a76d0ed2c392be65b8891750d0c413e3d8195004b09603fc3f360ea97e32e6472f887aa41ca502cf8a0460b9bac3ece610b3 SHA512 6a243526d56bc83caced776850bc3d2582c19f28779684bbf7b0a81f477d8c02c21151052b05b31160f2f81a83f5d7260bd82c171681a059b12012e794c6e5cf
 DIST stripe-4.2.0.tar.gz 267578 BLAKE2B 1cd08aa37a3735928e65fb401d8817694cbfceff05722aa96ae4880da6ccb6e3139dcf55804efe26a4e1c1814a6734eed1b5754c06efaf2003d9c28efbdb8731 SHA512 8a2660878838b0a2602afb6716db0dd91c2896b9f27224c2b04c800f32705e876d2915b0c5f4f1bdcf8d3d508ca050660e2e923f999bd0a10f9fdabd3acaa750
-EBUILD stripe-4.1.0.ebuild 1816 BLAKE2B 2c462bf9592508166663cc3d513b273909bd70b3bf5e893d8e9f6ef7f9e35de652a193aba5c8fdc2a4b1314a1b761328f3f1b8697852bb3b5287092735677b0d SHA512 ac57bec27d9711165ce23c8c08c48199d567c060bd1a0b37be73b74861a0c30779a011418779980d934516c68c1f88a8a1879dac77cd17f2252870f91f8fd1b8
-EBUILD stripe-4.2.0.ebuild 1818 BLAKE2B 62e5d31e23a51d274c3ce0c6adfc6793f79574e94f82ad6959472b84dd476f9843117c91fa28becb41262dd2f5a857c48c78c39d9b09fcc1c0be9757bd60c4fa SHA512 31bedf5400003a964b3294dc070a19ae1a5e622a22f69ccfd4b095498dad40807c34dcc23866e65933600e702cd02538d704ac098eb32f3d978a6a92df3e2d88
+EBUILD stripe-4.2.0.ebuild 1816 BLAKE2B 2c462bf9592508166663cc3d513b273909bd70b3bf5e893d8e9f6ef7f9e35de652a193aba5c8fdc2a4b1314a1b761328f3f1b8697852bb3b5287092735677b0d SHA512 ac57bec27d9711165ce23c8c08c48199d567c060bd1a0b37be73b74861a0c30779a011418779980d934516c68c1f88a8a1879dac77cd17f2252870f91f8fd1b8
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-4.1.0.ebuild b/dev-python/stripe/stripe-4.1.0.ebuild
deleted file mode 100644
index bd7dee2fb86e..000000000000
--- a/dev-python/stripe/stripe-4.1.0.ebuild
+++ /dev/null
@@ -1,71 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.141.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-4.2.0.ebuild b/dev-python/stripe/stripe-4.2.0.ebuild
index 85f74b80fdad..bd7dee2fb86e 100644
--- a/dev-python/stripe/stripe-4.2.0.ebuild
+++ b/dev-python/stripe/stripe-4.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index b93a0f804043..ff9bf95dfdd0 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,5 @@
-DIST terminado-0.15.0.tar.gz 29599 BLAKE2B b287e5c28fccbf9116d727e11e0a9d3d89f45a16374c7ee950b30427c8f52064dbb59c36fdb7b4d1457a3526e51254708ee13ef3505303c6052da050460046d1 SHA512 9aa00b7e6d442a7358f007be9d45c6a5326243e64d51a2e9fda863ab5ac8f12b72b1684aed91da376e2c45347635fe64a66da5ff2792b2b15d538080fa6f832b
 DIST terminado-0.16.0.tar.gz 28839 BLAKE2B d74846455e1a91e1c16c7cabb42be4e6915d130149a660ac3d555f6bf5a9ce47c7af1f802eb5c065ca99e9cd733b51b31df2bb799c82cc482ba0d0e3c0b36265 SHA512 1b52d6c60b0bd21d19633ae586c7a974035f43dafbf711fc86d667f965de783efc6712e8fe586685ab65b63b3a689b01f730cac6c68a9517e5421b1814f9f897
 DIST terminado-0.17.0.tar.gz 29184 BLAKE2B 2c86d69e08bebe54f451ed2ad0786397e8ef6fb320c233b6361209e9c4e7a996c5b55824a853ec3a9668b265f02f7cde2ed124a6615e0f364cdddaa6270e39e8 SHA512 41e5ee052e8b688d136fd494db3897d703f3666a0b02df71ce3488f2e462ca2e79c631f251cd7721892035c97e7a29662238293010897d7c5fab10f9290adfc9
-EBUILD terminado-0.15.0.ebuild 830 BLAKE2B 7057e5b326c7ccf9d6161d605305649e2e5d40ede784d545d78cc643744a3635a9ca5816902b61031499e4eb5be680a8b92242f73ba2ac41ed67fe2fe73a8383 SHA512 661d79d5eee9d676a19161118105178a2c7db5ac11c32497ecd4851b3abb9e7862275cb2e5b427726ad4e9d8779faf8dc54401d540584cfb956fc92f270cd254
-EBUILD terminado-0.16.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
+EBUILD terminado-0.16.0.ebuild 830 BLAKE2B 7057e5b326c7ccf9d6161d605305649e2e5d40ede784d545d78cc643744a3635a9ca5816902b61031499e4eb5be680a8b92242f73ba2ac41ed67fe2fe73a8383 SHA512 661d79d5eee9d676a19161118105178a2c7db5ac11c32497ecd4851b3abb9e7862275cb2e5b427726ad4e9d8779faf8dc54401d540584cfb956fc92f270cd254
 EBUILD terminado-0.17.0.ebuild 838 BLAKE2B 04a0470130e47523e8fa82cc795bccc9b241b173c0566c3e04baba80e28ab98456e4eeea2e246a80ca0f3169899b19d2781823848492608e7b6f5e6d67f56f07 SHA512 3de45b9c351e2b351d0c3eadc5f2a76809b44edb3622c31529e4baded2dec2abdd3a645d969a6c30572a4bad948a82893f529ae792753bae2e849f5d5b2ecf88
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.15.0.ebuild b/dev-python/terminado/terminado-0.15.0.ebuild
deleted file mode 100644
index a8e9bd88c2a7..000000000000
--- a/dev-python/terminado/terminado-0.15.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=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="
-	https://github.com/jupyter/terminado/
-	https://pypi.org/project/terminado/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.16.0.ebuild b/dev-python/terminado/terminado-0.16.0.ebuild
index c0e795c0426f..a8e9bd88c2a7 100644
--- a/dev-python/terminado/terminado-0.16.0.ebuild
+++ b/dev-python/terminado/terminado-0.16.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index b03e3c3c0620..285c86e016ea 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,7 +1,5 @@
-DIST tomlkit-0.11.4.tar.gz 187608 BLAKE2B f6920eb53c4b5dc13afd5ccd8b9ac5ae867e4b353e6bcc2be4d5e4d8774e2869f93f4c222931b2b3c505371b8812de5ef1797891ce828889a806e665ab32aa84 SHA512 b68b5d2c5f2ad7aa2cbeac308008467f22c0c9975862506bcabbfdf1de677dbaab1c5cead17c68f4bf2977a7077ddcc46ef6383bd8a87e2ac1252641ae463335
 DIST tomlkit-0.11.5.tar.gz 188079 BLAKE2B 5ef55255904d3393c5a0937b6df30d95c9a41892848abaafab844233bfe9c656cdf4348a468cf2c9afa912d14a334874ac7854a9e94a4ee9b0bab35021d18667 SHA512 71225787e3543f995358b288bf459256632a8cd72a52aae2a1c6ea04e7c0978fb9ccfa856fa5e96e6d6c9d416abcefccec3e94985421ea14e31a755ee85a3dec
 DIST tomlkit-0.11.6.tar.gz 188290 BLAKE2B c0fc64177dff2254ab4d377f15bada1093e69ed66f815b04f698359f096b123b256949e871344276e6fcda26e43ac22c505460c4f906505ea9676774cbfb0c5f SHA512 692f2facb18440609b63995f690f4ba29e82d696f5ce612f872499b4a42bb0ab33fcbf52abf36057c25448b3e29f30955dbc7e0ba34f10d21cb9b5d36e9ad9bf
-EBUILD tomlkit-0.11.4.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
-EBUILD tomlkit-0.11.5.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
+EBUILD tomlkit-0.11.5.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 EBUILD tomlkit-0.11.6.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.11.4.ebuild b/dev-python/tomlkit/tomlkit-0.11.4.ebuild
deleted file mode 100644
index ae58bab0c59b..000000000000
--- a/dev-python/tomlkit/tomlkit-0.11.4.ebuild
+++ /dev/null
@@ -1,37 +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="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-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"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# use setup.py to avoid circular dep with poetry-core
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["setuptools"]
-		build-backend = "setuptools.build_meta"
-	EOF
-}
diff --git a/dev-python/tomlkit/tomlkit-0.11.5.ebuild b/dev-python/tomlkit/tomlkit-0.11.5.ebuild
index 8f575bb2866a..ae58bab0c59b 100644
--- a/dev-python/tomlkit/tomlkit-0.11.5.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.11.5.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 3f1f40a397c4..25c94be59554 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,5 +1,5 @@
 DIST trio-0.21.0.gh.tar.gz 491228 BLAKE2B e5f65d3aa9e4bc0c449e3986048d63fe3001a2eee96dbe5d8c088e0fce786b1d50861b47170baa7cced097938b16c92f0efd51518404a5e0ea6a17a48d656823 SHA512 383b11f264ddf4c78eb75829472826ebacf32d063790e8d4681d5df2f21c4f9287884db1752fd19976b674643adf7299816d4404e3032193ef90f522ad9cfa79
 DIST trio-0.22.0.gh.tar.gz 517482 BLAKE2B ab1fcb22d8f0ed9c8de831a9384b55ab433811863974cb767cb0ea4eb3a0df7372b5ea2c2d4c2af3ca1d3c8c3144d5546ad8cc68276b17ecb3d20ea1858ba9e0 SHA512 45b813d6cc65f8d49f70cb0ea7f33593fed0cc5989c60ba449f0b38c4759604aa7360cd016758fd364438b92516be549edf1efd583c7f5ee2de8813334f182bc
 EBUILD trio-0.21.0.ebuild 1742 BLAKE2B 2767c2507e50c4be163201cebd1f573f1aebc5d585b7b5670d705268ce2b61a2c69788ec1e60d384fae1bd47990701840960cdcaf509a696bf091f9d76da5590 SHA512 443b76f264efba62737f5452e6c9a108ae4a3c31fde001a0c0ad540fd831dbb344c7f5bcb401b58e08f0a3afbe1df2ee6f9deec0a4eea9931eac98c85aebd6a8
-EBUILD trio-0.22.0.ebuild 1810 BLAKE2B c24560985632ba3a49120363b6cce04cd5a45d6c02c050f3d9bccff5b1d0ff90f7bad37698fbb201e4637a1637969fd8daf4d8ad9bc96a9a2d69b1fdc76fc622 SHA512 ada67b323545a0c9af446069cc07dfa792d55915fddbba8898850ac1dc0d22a48e63e422bc8f27ddf70bf44eded3c53f4084f72203fe08908e8c1e28042803b1
+EBUILD trio-0.22.0.ebuild 1803 BLAKE2B 8fe44f49bcdb86066be3f782462dd7929059c8a73ed881fba89adf3cc158c89f58d3c0f0d6c89d6f4613a328fe8b530a12f55ec7eac953e35184d345d0b74a77 SHA512 2c70a415ddcbe443c069260eb974eba311051c6e704395b04694d8512a57f1319551af2d7d367bcd5c279ea4be2c696b76ad95c9beaf3d7c0420cd655eb7f088
 MISC metadata.xml 2060 BLAKE2B bb6ddfddfb3c19038e5982227a8c5f9999b93868c343a9a5bf7af5963006b5b719ef960f65b91747dfddf19544134db9e1a2d65e94192c079c64c303cdc8997a SHA512 4b86e7cccddc200d5616550e309ad46587f900ed13c38196e874e5110974b856d65e18745b8b7b42858cb672940ba280b0c2ea54d33f9b5bf32a375fa1232088
diff --git a/dev-python/trio/trio-0.22.0.ebuild b/dev-python/trio/trio-0.22.0.ebuild
index f4ead3cc9f45..88fa5db8d5e3 100644
--- a/dev-python/trio/trio-0.22.0.ebuild
+++ b/dev-python/trio/trio-0.22.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 83a01ad8eff3..3edff758ab69 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,7 +1,3 @@
-DIST Unidecode-1.3.4.tar.gz 192346 BLAKE2B 34edea805896022fa42f47929a55ba01850475cb49431c4c50329caa2f198455704224320887ac7dcad5fba3517ab42cafc8ade726e785be0d0141814a5ad455 SHA512 bdbf482abd0d93ea8d891b95aea9f95cca6f85dbe71cd2bef4664216b3aa1d672c2f4ecf3b8bf356cdb1d8e4a1141c296728498473d9d0067d9774d0a7de8d48
-DIST Unidecode-1.3.5.tar.gz 192386 BLAKE2B b5a92b2bdcd6e19e6f499a1a1cb46eb2fbb1d44030a6652ab2c2946c5ce9acb313a6f325e69862d72c19a620107ab31e8619cc77af4f73a10724571d16ceb9f9 SHA512 3188071077b08c8c3473ead56a36774590acd14e4e0441cf6f744f7947a8f03e4d6930894c19cf29962a307ac16828218a90231bee5758f9465e4cd52ec9cd65
 DIST Unidecode-1.3.6.tar.gz 192466 BLAKE2B 62a2bd04f5d3f0c257fd5d001891a4021cc42eeebdc666cff69714ce6211e33ea9d2f44b9cc1b0d9c8bcdcc64ff256765716d48b32d9e0750049e0511c914d96 SHA512 97eb31c4f7e70a13628b4878a1cf91fc3a3b2525727a27b466e4e88d8f7db32054c93462d8aaf5da83b6f00cdd01dff258b93ac7b5e5e1a2d6dcdab608b89216
-EBUILD unidecode-1.3.4.ebuild 554 BLAKE2B 67782efa40c5adaa4ba476ef32b0e63b615911598a092f8b4edcdff6bbc9a877f4f2d6531843476f94002888137024b0cebc18744b9e4491b87e94e05b3b8574 SHA512 86deeca9109ecab541fe07dc4f4ea16366ea29b692c8333776459917ab43df7e992c1649ffe95bb99cd59f48692fa734e49b01f8e0fed4ef14871544c2b22bed
-EBUILD unidecode-1.3.5.ebuild 561 BLAKE2B c3b0be68d04752039a0a14a4ee8323dabfcc0c81561698ff0e12535288828ba7206935f3a0cfd7e66cb7492a94f5adfc23585f02372ce75c1bd97a08fd72e395 SHA512 2042c0766bc2683903032c365998080f74d8e1aab81b130abde0efd0374c2372fea585ba53365409eb5d4c8defd6761f1ac00c06b5a44f5c79e143920c32903b
-EBUILD unidecode-1.3.6.ebuild 561 BLAKE2B c3b0be68d04752039a0a14a4ee8323dabfcc0c81561698ff0e12535288828ba7206935f3a0cfd7e66cb7492a94f5adfc23585f02372ce75c1bd97a08fd72e395 SHA512 2042c0766bc2683903032c365998080f74d8e1aab81b130abde0efd0374c2372fea585ba53365409eb5d4c8defd6761f1ac00c06b5a44f5c79e143920c32903b
+EBUILD unidecode-1.3.6.ebuild 554 BLAKE2B 67782efa40c5adaa4ba476ef32b0e63b615911598a092f8b4edcdff6bbc9a877f4f2d6531843476f94002888137024b0cebc18744b9e4491b87e94e05b3b8574 SHA512 86deeca9109ecab541fe07dc4f4ea16366ea29b692c8333776459917ab43df7e992c1649ffe95bb99cd59f48692fa734e49b01f8e0fed4ef14871544c2b22bed
 MISC metadata.xml 457 BLAKE2B 43e1b676ecfc82f845bfc1b3dd2409756ca419086ccb693b39f73e2598b5de9a463fecb3dbda76d7e375b23a6ba06589231d6184a92872bd4f3c16080bef6353 SHA512 7cded888473c7a7829aaba7d63d5a54bc22f5e9829733d961d520a7d3f0ff57ee00e16c42811a6b63c0d02f9e3f93a1d0f539c8c79242038bcdfd594ab7d07c6
diff --git a/dev-python/unidecode/unidecode-1.3.4.ebuild b/dev-python/unidecode/unidecode-1.3.4.ebuild
deleted file mode 100644
index d30a1472394b..000000000000
--- a/dev-python/unidecode/unidecode-1.3.4.ebuild
+++ /dev/null
@@ -1,21 +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_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidecode/unidecode-1.3.5.ebuild b/dev-python/unidecode/unidecode-1.3.5.ebuild
deleted file mode 100644
index 737ca84c1ba9..000000000000
--- a/dev-python/unidecode/unidecode-1.3.5.ebuild
+++ /dev/null
@@ -1,21 +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_P=Unidecode-${PV}
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidecode/unidecode-1.3.6.ebuild b/dev-python/unidecode/unidecode-1.3.6.ebuild
index 737ca84c1ba9..d30a1472394b 100644
--- a/dev-python/unidecode/unidecode-1.3.6.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.6.ebuild
@@ -16,6 +16,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index d151c8262191..48802e356dab 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -4,5 +4,5 @@ DIST xarray-2022.9.0.tar.gz 3030815 BLAKE2B 71bea98d49fa9ce2e8e881bdcba7872293e1
 EBUILD xarray-2022.10.0-r1.ebuild 1100 BLAKE2B 94d3b2cbd5167a14f107d424c2a31ed2a3f8705c4a8d9d2f2c7b638265520dc2502df7436a66a760cb55a5ba5cad9016fa3cf8590ce980f4dc77cd7fb52a454e SHA512 cf1f2e42ea1c43af41b2d3408fd9624b45ad800d95b04bd8bbad004dbcc48cbf2fe22b0751614fc7f469e5746262e2660e260fde1580779c85b060838fe4a518
 EBUILD xarray-2022.10.0.ebuild 1113 BLAKE2B 7c6c9efa34384aea2c7bbcc0f263d2b5fd4eff771a5e3eeca5bced653384d635e22863da38011c6f3875e6eee169cb1e75e52d689b2a42b810e6ccc4b16b9709 SHA512 20a3143028e3c8d42e881cc9bf0c286df66f5a79e1f30b8d956b7579ffaef5a13064e9ec61737ea45689fc779ae51377bbf9e81692fa57182cece4a7c86aee8f
 EBUILD xarray-2022.6.0.ebuild 1100 BLAKE2B 69026f76a222a1c1f6f4a52dbadd28d70154c6355fa8b21541697a9859716b566264d44f9ff8819705251556337dbb84588859e4f18ceb474e72b0502ef11006 SHA512 5ad0633eff44291cacb14c40477944ddbcdbcee1ad7d618c5b677bbc409912b4be064c00814b2ce21f542dfd1056050b7f4384b38d45fa395f0d6c0ce42b40bd
-EBUILD xarray-2022.9.0.ebuild 1106 BLAKE2B 42f7907525a13a7051e1d7d801df654b04b696a4bcc54254898bd3e4a70d8892d8ca1747e63e1c67ee1aae50142219d3f15c2cff97f92d7af61f919f8d0b824f SHA512 f11c67003d20f5e6dcd9990773653c9baf9fe6ca00d65b462f7e01055186a1352fd7fc5eb9fb968eb889b36cd83fb1ae680fae0740c6f119360ed7a2950084ff
+EBUILD xarray-2022.9.0.ebuild 1104 BLAKE2B cf3cccf32ecc2bb755c851b1f47513a6f8922f8b716ae8c287e342f1eb8f5ef82c0fe1faa6172862eaf39de77735e066f1566aaf6ce333df1e8562636dcb0e4e SHA512 d6de93a804dce1a62e4ddd66bf3fd03cb3733d04ec067e0c08acacbd4e096dbcd9f3bb407556c77eef992afc1938a763d57b591696897fef98899e701220f439
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2022.9.0.ebuild b/dev-python/xarray/xarray-2022.9.0.ebuild
index ea669bc76788..c88b5b864d45 100644
--- a/dev-python/xarray/xarray-2022.9.0.ebuild
+++ b/dev-python/xarray/xarray-2022.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index fbd1436c46d3..639b1b343911 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,5 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
 DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e2d068b1f5ad01c25d4ed75e3187854da24156c3c5396a559b11c2d6949711b793c5bf5c83e18e9aa54307983 SHA512 6530fb53fa18a3905d7c9e8dd5d05ea084de4a5f392e32953a9786998dd194b2db55b54fa44dbc3e6b68e68ae00431de7432d6884f777734409d660dae325d6e
 EBUILD xcffib-0.11.1-r1.ebuild 745 BLAKE2B a0e3c87ace0f3dad3d9759b8ec6ed0c5b288899a13447e031f97be66d744a8101f6d10b0d4995c1559c837664d6662eb3e0f3f992a7bd7d0dff2e91c25222168 SHA512 0790044af8566cad69538bd6c3044b64861b1a2610e40cf0fe3d30c2d2be4998c94fe777ac9cdb6dbc3fc8089d45b2334a80ecf02842f30e030870ffd228e3ca
-EBUILD xcffib-0.12.1.ebuild 796 BLAKE2B eba3162f57fd8df21538b88e666a3b15dda50762dc8fa3f1350cf021bcc7cc2568ed684bb0f2cb6e96ddf139ff3249ef9fa6bb35988992d84b1b505c29c1cd0f SHA512 44936f157cfdc8ba754d55d28b2b5b5334da3d2cbd24377d55e65bc27dc12e2895aa1e890c55146847a40f2a9771b7cd1cb7b1c506c45d73bc71c557e87e763f
+EBUILD xcffib-0.12.1.ebuild 790 BLAKE2B 5fffd06a3d8a2d9e48a92497e16eebfb72ca1ca36ddb13d9ee51daa63e9d29c2749d12ff04c9c5779ee2201f7008c76a5cb7823eb9051d3083227fbf4a57d2cf SHA512 618eba23328c8448c05690144f5e94737c7bc91408b7a053c48f592bd2b9292ba1ee395de833f9ecc6a2c21facf12c9b49bb2e48f6e856934c86cac2587f563c
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-0.12.1.ebuild b/dev-python/xcffib/xcffib-0.12.1.ebuild
index e4702f7739ee..2b1564d33ed9 100644
--- a/dev-python/xcffib/xcffib-0.12.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 DEPEND="
 	x11-libs/libxcb
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 37323938c658..3caa9b1f5c4a 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,3 @@
-DIST xmlschema-2.0.4.tar.gz 481517 BLAKE2B 105f382dee65a55c6b3073d20fee8582123e6f7aa55e5c02f57e8278354ecb5a05d3f00f5a6fac7a53168e8de258ec8380d6637eea881d5725cb8980c3cbff7b SHA512 57902a14c6b038f3f8e2e996ca9f07e87341a754ece9c4b636d1f8b53db1caf176c6d4a975a843ccdbf7e24ce721f51fb3f0a0efd04719c6f81601c0b56910ba
 DIST xmlschema-2.1.1.tar.gz 482988 BLAKE2B 8bcd66518e99b6df96a48408830388cba33530b8787ab733f5710e8ebdee3243cbbe8968c25060396c4d0e577dd40ae2438dab7afae5958386c886f235b3d96c SHA512 2c55de21ab4aaba9f499a0b348e60a50939af41b5ce43787c339ce86e4067681acf28b155bfba90346b1e8d976c468ad0ca21f73f76afc55bd700b1866bba945
-EBUILD xmlschema-2.0.4.ebuild 875 BLAKE2B 4160eff1285865b83536704ff512eb58b88e4ff5aa007bbcaaca3b9d2ebd3ff6741014de41d35676b2a44200304710fed320bb0c67342b0a3abd4670beed8cfe SHA512 18784ebeb0afbf3239bac54eb40adc916a0eb88db6bfe64f5297496d659daedef93c07fcd99057bb787fb05c478bd1a1f9104c3179b44e755c79fec4353382e6
-EBUILD xmlschema-2.1.1.ebuild 883 BLAKE2B 8b7f637076f0664cfe0af5fe48a7e0bc339e4b8243f0db82322ee94e1c5da32fd686356409cc2619784c79de4f214f2aadd127efd201b017ad7b53230e6d048d SHA512 4854d40a14536f72b017a0989f5a80aca4928e906a967eb74dde69fdcba40a543f3f78530cfaa9572b5676d6da2510017a8e36f90c37fa3d97e1054fa4eec1a2
+EBUILD xmlschema-2.1.1.ebuild 875 BLAKE2B 4160eff1285865b83536704ff512eb58b88e4ff5aa007bbcaaca3b9d2ebd3ff6741014de41d35676b2a44200304710fed320bb0c67342b0a3abd4670beed8cfe SHA512 18784ebeb0afbf3239bac54eb40adc916a0eb88db6bfe64f5297496d659daedef93c07fcd99057bb787fb05c478bd1a1f9104c3179b44e755c79fec4353382e6
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-2.0.4.ebuild b/dev-python/xmlschema/xmlschema-2.0.4.ebuild
deleted file mode 100644
index f4753500ef02..000000000000
--- a/dev-python/xmlschema/xmlschema-2.0.4.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.1.1.ebuild b/dev-python/xmlschema/xmlschema-2.1.1.ebuild
index 829df9709686..f4753500ef02 100644
--- a/dev-python/xmlschema/xmlschema-2.1.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-2.1.1.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-11-03 21:12:43 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-03 21:12:43 +0000
commit	924750a8c767b278c9870be5dcfedced436f1276 (patch)
tree	d5c93de95fb5c2fa090e76fd12c1535698005868 /dev-python
parent	a4d4c6a7cf31d8d3248101dbfd654cdc416902ac (diff)