gentoo auto-resync : 13:10:2024 - 04:04:06

274 files changed, 876 insertions, 7049 deletions

diff --git a/dev-python/Faker/Faker-29.0.0.ebuild b/dev-python/Faker/Faker-29.0.0.ebuild
deleted file mode 100644
index 1ed745f46151..000000000000
--- a/dev-python/Faker/Faker-29.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-# note: tests are flaky with xdist
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-30.0.0.ebuild b/dev-python/Faker/Faker-30.0.0.ebuild
index 7dd2e7763f07..1ed745f46151 100644
--- a/dev-python/Faker/Faker-30.0.0.ebuild
+++ b/dev-python/Faker/Faker-30.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="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/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 59badf071619..7beaade0d1ec 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,9 +1,7 @@
-DIST faker-29.0.0.tar.gz 1795098 BLAKE2B 96f6ee6166cc4dde4c6c8e1be2ac9cc1f529c5afe371cbb75c264777fdb390aa6dfaf199e6671b9f3e4658937c7fc0953aa31e548d3ea2e7ae948d8e2ced8e7c SHA512 09f46d2693b611277312cd39a5a6b7a40271c7136fd42c8a02c6d55ab10caeddb8d614db81ea76bc37879b21c6bb53297b04b7169410da7d6d183cb1406f60d9
 DIST faker-30.0.0.tar.gz 1795010 BLAKE2B 01e93e39bb22db8220400d28f92ad08f4f1f971b7023cd76c6ae5b965800c6f44a0d67d22b48c4ced732b89efa8b7290e94b1a163f164c3f67d1e830174cba4e SHA512 21bd8d4d2ada7c579cad16ed019bce1187427dd1c5806bc97d055ca9e6a2477bbd2fd5861dc60bb1961ff6613fedabdff9cb59b453434fc80bbb52b336b78f89
 DIST faker-30.1.0.tar.gz 1796615 BLAKE2B 448e1361fc397d13898778f32148a0ff6b13dd8ad232a29931ce08a5575986f832adb1167cff5de3a866bfdf5e8b06645bc46643f2b690e82c7d18c721fa84e4 SHA512 53828e30eeff7ffd5ce3b34dbdbe8d0b38b119f58e44dc3f0a5af47df48d8226101fa00dbb08594d03dd0369f7c6067f5f573eaf329133b3a7fdc3846f0e3780
 DIST faker-30.3.0.tar.gz 1797350 BLAKE2B 3c8da599ea115637687d168acc299803844ec42d645ea6485f80911becdde4c0e93a1a065f831048651f1c749c74d05f57eb978ddb95f229f58d194710b3fbf8 SHA512 843d7b46ad5585b715a73a831f8f5fb912f545dcec1d12fbf2296278feb8b0838aad613df8f39b1c515657e617737795ce5775eba89d0d4e645325dc2f50b0ad
-EBUILD Faker-29.0.0.ebuild 945 BLAKE2B ff465988fb90fef2a5c5332ea40d3df26077ca0ef937a00392609a212d303a9292afdb38684e66d7043e3f1c855b34b7a4d7aac58b4216c542c9a6bcdc9e2e4e SHA512 379311c4d16fcbf97a2a621b90d4fc5ba359c249059f0c3e11c1f0e60a3c7d25b8c8223c8d65c54f5fd534c76806c296e225e948545e8d05c1ff054f3d5b7625
-EBUILD Faker-30.0.0.ebuild 952 BLAKE2B d916f38dead48afe6a35c9055acdd8a4061901973f8b4bb587d2b6403ecae168880479fa7232cf6140909952b647ca6b298663f84a8f11ab4a52f6c857a1425b SHA512 edeac7681eed700656317e357ebb2f44a4671ef1d523dc101be73c96bdb6978d7656e40fe61ae6a085b584fe55a03d38a41fbef9f63aeec766233e7a4845c324
+EBUILD Faker-30.0.0.ebuild 945 BLAKE2B ff465988fb90fef2a5c5332ea40d3df26077ca0ef937a00392609a212d303a9292afdb38684e66d7043e3f1c855b34b7a4d7aac58b4216c542c9a6bcdc9e2e4e SHA512 379311c4d16fcbf97a2a621b90d4fc5ba359c249059f0c3e11c1f0e60a3c7d25b8c8223c8d65c54f5fd534c76806c296e225e948545e8d05c1ff054f3d5b7625
 EBUILD Faker-30.1.0.ebuild 1000 BLAKE2B 910b6c3d4b14ded04e82086e398bddff73202f984bb76ff01f8c99ab255840abc8ba94f0914fc0d7076c0d901ad63364afc03b438884a7b911c957ebf611774d SHA512 f4f4c7f35f518342a00afda816f30a81a9d9b9c1977f45bb2f2e32b698dbbbdb0eacdf5bfe846755d273299410f508e4bb7a898ececf4b2b16ecf2a53fb1c4dc
 EBUILD Faker-30.3.0.ebuild 1000 BLAKE2B 910b6c3d4b14ded04e82086e398bddff73202f984bb76ff01f8c99ab255840abc8ba94f0914fc0d7076c0d901ad63364afc03b438884a7b911c957ebf611774d SHA512 f4f4c7f35f518342a00afda816f30a81a9d9b9c1977f45bb2f2e32b698dbbbdb0eacdf5bfe846755d273299410f508e4bb7a898ececf4b2b16ecf2a53fb1c4dc
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 458881f9abb6..608fdff9a7e7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp-theme/Manifest b/dev-python/aiohttp-theme/Manifest
index 12bd0375887a..2697a19a0ae1 100644
--- a/dev-python/aiohttp-theme/Manifest
+++ b/dev-python/aiohttp-theme/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
 DIST aiohttp_theme-0.1.7.tar.gz 11509 BLAKE2B ddb92ac862f5e93f33eec508c706d88112f043928ec48b4e7ec7000819f12b8a06ed7c3aa3c1590d5678e45573b295882158394904328edfd623068d89b8bf8a SHA512 2c840fdfb8cbdd58c8b133cb44345cbb55629591ea066b86b09df5ce7d092ef96291fce7cd4e1814b46805e41b20aa8ecfbc41f820242ed46496b14c5966e58c
-EBUILD aiohttp-theme-0.1.6-r1.ebuild 488 BLAKE2B 027b89999f71e785c6bd275fa9186523aa9be2690f5e020635fc54944669081e0cc3876750b85927c79b47eb1d653a4274fecace07ebe7e8067ee98adb771dd2 SHA512 c4f0a2f5a4ff450ac48a880ff8369dd985daafa038a06e13dfe659cda87003ac8de80ec1c0b6fd55e4c8540776b198432d6f812af5171c4bdb45d25cbf550e85
-EBUILD aiohttp-theme-0.1.7.ebuild 499 BLAKE2B aa5ca3c9c6efe0fb202fd26acef3c6b0d41b97cf5be9132f23caedb38c06ed937c8da03ad7c8698cfbb9c7c2d8faa341547bf732e9bfd26aa3e52ca5b5cf331b SHA512 61edd408bc8e0a4e9867f77d6ff9e7002d1ff5fe22ced1b1eff6c833f1cd3ee651bb4298d0a7f2a46a53ec4cf85c06e114d4aa872e51ab218bc97e4ce424c733
+EBUILD aiohttp-theme-0.1.7.ebuild 492 BLAKE2B 24158097bb36ade2977700be09160e08e9f199892eef8c89ad57d068dc2e5619f19083d89ce4c844dacb10cc12dd61eb43adc1247aed031e2896b2a50919fd2a SHA512 28b3aa17d9f5c82de424a3df7022b527e2c0de89da7b7d86e4f7987e988778ac42a9367eda9c9c38ed83086b95cdc59b1370ff9a01d728836db57ba468a43534
 MISC metadata.xml 381 BLAKE2B 288ec644e49f4faf57d9d5dac331a3a69b507c04c7a9e03564ff88ca9c24fd6a8a7e33f4c36c2e40b6db8004cd9b0e0d5ae559880b162e823a42df66eb2d8fed SHA512 b38f855cf814202f4f01c4ab677af6026090740dc2db00b52ceca8d6ceae39d47c49317bd9e251ee1316d1920c236b8286017fbde011963ad464d3c293c3351c
diff --git a/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild b/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild
deleted file mode 100644
index 97574cb8e5a6..000000000000
--- a/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN="aiohttp-theme"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx theme for aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild b/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
index fa48f2771f32..f386fe258573 100644
--- a/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
+++ b/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index daa46262c0ba..c5079fd7a14b 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -5,7 +5,7 @@ DIST aiohttp-3.10.8.tar.gz 7540022 BLAKE2B 8407815a0f65035032c9c59174642784a9ad5
 DIST aiohttp-3.10.9.tar.gz 7541983 BLAKE2B 3bcfcd09c537fbd2a976f95b5c8387280ec0256bbc231b2bc5a07a1524e6926bfdebd182b1365d950b5a1465f44c4db004a645af7490c57cd4637978595fa6d4 SHA512 0b52ba3ff2c78113117f56818ab177791f2764b2e5ce6531ce5b0481ab9d22b4fe621d70c1c2067eab8cfdd423a2cf0fdaefd8b13231aecf0491326bdf12d1a0
 EBUILD aiohttp-3.10.10.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
 EBUILD aiohttp-3.10.5.ebuild 2927 BLAKE2B 29d95839a6f30f2dd64fd2a8e9b34cbd43932f0b87c8492b13d0b8dc50b590cdfeefce33ff24b6249da913db8ff11ab148cf824c7952c197ded287a4dbe128ab SHA512 ebed49d5a8c321251208200e4adae397df80965ad9b2c7ada52953dc9db6c345db01deb5c853bc9d617dc176a3e5ef02d70c9e8d113739d3b10199e54d48b893
-EBUILD aiohttp-3.10.6.ebuild 2938 BLAKE2B f5ab1487ecf4b0e2bf6179877229556a4765c8da18a4b9668e7da7b23609e10d2c7fe6861e314f13e93032c64fbee7f4262dfb2faf68599c79775807aac89f0d SHA512 d3ac2316f618fa8f037725d02b3b91d68fab42774dec5768c0d93d2469c6fa81f2b0c56388fa58fa73b47351dd208c947305bd9ec9bbb1333a8ca9eacfcb177d
+EBUILD aiohttp-3.10.6.ebuild 2932 BLAKE2B 8beecd2d219546127a91ff2816146914634cffe7448eb706befee1ad1863bf7c46c13a9d7476847c012e4e1ddc481aa6f05166def735d7374762be578922c162 SHA512 e01024eba5132c4bfc53b31ad8af9f0e62995faffb200c90ea1fae203d0f234d8a2757ac98a652ab4420c7445207768d3a8977ed28a9e6f7ede9af0bf07df16a
 EBUILD aiohttp-3.10.8.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
 EBUILD aiohttp-3.10.9.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.10.6.ebuild b/dev-python/aiohttp/aiohttp-3.10.6.ebuild
index fe5aa190cb8a..5244fe916dd9 100644
--- a/dev-python/aiohttp/aiohttp-3.10.6.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.10.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 32b07be1f302..70a5c1946511 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,3 +1,3 @@
 DIST aiosmtpd-1.4.6.tar.gz 152775 BLAKE2B 6432388c563bc9e8439f0e685130e103a855004443d24e004ab7bf740c0e93cb7601fc435104f7c1c450e1d6374fe9070ed4a91df58ca0f013e516cd9f40e748 SHA512 5aceaa03d6a00c3c99cd2d53b9320aa3a044d0ee09c22bd4fadf3ee56ea0e307120d1fe4cc798d7a04d53059da674f6dba816a6a6ed7326a510f6caf074e8f90
-EBUILD aiosmtpd-1.4.6.ebuild 1205 BLAKE2B 762f0dd53922d1d3045509e12cfc72794870150389ab988319a78d0931882da9349cb61a3c6168bffb68760cb1d60bff347069965400a473b4f92b66d93ef424 SHA512 4bdd078f815e7d78b3580aad04177ebf144f6f1faecdbbc14d21edbbef7313ef8360bc510073a02935ee82c44f0c0d6340b0f47fe95c645d2fe84a4f7071bee0
+EBUILD aiosmtpd-1.4.6.ebuild 1204 BLAKE2B 5d3771144cef83f6f2297f8418fdcd8f22623c344c407fc3b873812b8aef31b7d75f2cb7be63260117e5778508977d8b4e337279547160f6119e43061f9bed44 SHA512 4bb5a67730c707e0bac7dc273feba7256d60cbf8eafff2311e6cc11632decd7fd902eb0527d0424231cc66a9ccb472745a6a7aa7d06752348379c83968d1869f
 MISC metadata.xml 406 BLAKE2B cd739d7ad278ddd958ea696ec4ed98c44a4a5cf719b93b09eeb7aae4af37e0bc755302d0c27b36645b291071d7ce16e45ef8e77275ef68cdc9f9cc759d2ffb1a SHA512 3f3459da7aa5b686f38b5554a64d0c8344bacab39429a19955b56b3b829f0aaf6fd5e6c337394134ba59c3b2d5b5be1fa1f917775b6827b56f055a8203339ed7
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
index 0fe574c996f3..9550d3f728ef 100644
--- a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/atpublic-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 95cd7217f37c..de7c01f222ff 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,3 @@
-DIST alembic-1.13.2.tar.gz 1206463 BLAKE2B edff3a244fa37556cd656e60940d94e7df75b6c67aa4199b673851b5b06e84dbf51e53f2ac9781465aa923c0019fcd33a9c3b4da90d64f583956e390ca1f5fa7 SHA512 c4952123ba00403bb030606c736dab8d5494b01662d02914fb0d10d0c1d99b27a97cc4a800cdfa32d53870031c46e351f97815e337c71f3a0a824b6403bd75cf
 DIST alembic-1.13.3.tar.gz 1921223 BLAKE2B 25f0dcc806e5988e54f2557bce31bdb50ff94ea6a312fa71a82f61114b4b34a5a2b8003c8174d77a4e202c60d84f8cad4b61c048b093e2159a6dd85ca8f38ce1 SHA512 5661098833a4314484a6e7ea4cdea9755ed84982eaa914972265943c8b62e17d5a2831d323d238c4a37d71de61251388d43f5b419e2c592753f6bdc5fc463563
-EBUILD alembic-1.13.2.ebuild 1059 BLAKE2B bbcc91dd352f0a453892f7f19160469701918718113912522eb99781d2cb31001c896afd8c32665c0042dda7cfcecfca1832cf25f8deac2269c3e440369bc7d7 SHA512 3016dbf33d7b6b8dbedc780627e24b46385e1b6b428924375359a27912849d4834f916464c8e7ed795b65bdbc941e2cbf0f1e46f13a9316dc9d66f8949018a69
-EBUILD alembic-1.13.3.ebuild 1062 BLAKE2B 53255b066cdc9a0f0f6f656f1255f9db9911c5167d23de18f762cba6f203523f3a87a2375d33752285e9ec10efedf9f4343cb9a7b12805a55aac37cb6b098709 SHA512 326ebc9001902109b3a7bc4cef661b5ac6c0fa8031422b5270ac53c16ed6a32af14b0e1520337ed49f90d474ec22d16328f7779aaa29d8c243c951fdfa5e263c
+EBUILD alembic-1.13.3.ebuild 1059 BLAKE2B bbcc91dd352f0a453892f7f19160469701918718113912522eb99781d2cb31001c896afd8c32665c0042dda7cfcecfca1832cf25f8deac2269c3e440369bc7d7 SHA512 3016dbf33d7b6b8dbedc780627e24b46385e1b6b428924375359a27912849d4834f916464c8e7ed795b65bdbc941e2cbf0f1e46f13a9316dc9d66f8949018a69
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.13.2.ebuild b/dev-python/alembic/alembic-1.13.2.ebuild
deleted file mode 100644
index 954c93539342..000000000000
--- a/dev-python/alembic/alembic-1.13.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-libs/timezone-data
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# setup.cfg contains -p no:warnings in addopts which triggers
-	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
-	epytest -o addopts=
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.13.3.ebuild b/dev-python/alembic/alembic-1.13.3.ebuild
index cf8af9852135..954c93539342 100644
--- a/dev-python/alembic/alembic-1.13.3.ebuild
+++ b/dev-python/alembic/alembic-1.13.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/antlr4-python3-runtime/Manifest b/dev-python/antlr4-python3-runtime/Manifest
index 6bbc03b8a921..6e383e4456f6 100644
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST antlr4-4.13.1.gh.tar.gz 4164054 BLAKE2B a51b91ef93bd4b540a382f8d4eb2bcd1a2e47a29ab20a601a2fdc6ea3d17f9acb62a4bda1a9383ba1d40853a2346f68fe846d700c3f8ae6c9a0f940ad8c660be SHA512 79ac3cdfc8f2368c647d06aec85d87507629a75527205ff2cbf7d9802989b0c6e6a8fac76148ad101f539c9ef922e431e22ba489f899f847ccc3d3d889bb2b70
 DIST antlr4-4.13.2.gh.tar.gz 4167326 BLAKE2B 709f3c18329e08a811d7a4e5258fc0183ba6fa6ab62fe83ab694360cf1ce2bb3aa3f30cc62a0339a6ff8b64dd0a766057fd6f751cfc34a4e05051e4d54a57fad SHA512 afd8ecab637a0e70cddf98f63c918eab2b907f87207624e20e80a79f885d6502d4ab734a602b1707969d61944410828b689ec2f8b09c15314fe991024cde1613
-EBUILD antlr4-python3-runtime-4.13.1.ebuild 809 BLAKE2B 319db8c141b85cee4fa8c39237124de3dd39e2d4bdd15135c73461c8af5c09117dae3baf52dd817551e50b5f1a0a7075e05952a41e54e16a313e50cb682eb223 SHA512 c4319dd9711817db5e7148a8e2d3a0222d19e00b52cc5dc8a751dddae1dda2df3c673e6bb301fd591d65c1ddf6b57223efaef3ad94f4b4a948c8b131dbddcaa3
-EBUILD antlr4-python3-runtime-4.13.2.ebuild 823 BLAKE2B 366a7b950c93c27443f76e714efe45bbf7e89e47108405dde399997dde049a38f4ed68e4e49f5ad9e4ddd6d8fceb3e0596d39665f88ab8a5f7499f23401864be SHA512 8397699fa875432f7eb78f18091fd4ab59b79d19696da26f895df49e93b6c8fcafa5cf5b91562dd5f9cad592a62be8dda58e9891c05626b7da7090ddc339d2ca
+EBUILD antlr4-python3-runtime-4.13.2.ebuild 820 BLAKE2B d6d564555e578f889a93507b2e03e100882ec392ac6039e41e2f55787ee6eb7bdd0077f0db0d3ec08effb77a6711b50ee13470d7c99898c71e22173509889f80 SHA512 00906d8b356432ee58c8e6ef6563e2a3079d610be69387ecdb6f1affccea29b3f767a9a18f6e50935f39445743b4669677267fb5fe7511e03fc86c33d3ca763f
 MISC metadata.xml 378 BLAKE2B 48715a41ca9be1320797167b50ac774f70d099e6c862911b9763a16faaeca1bd99f3a549d1b39a3f3334767b798fa85247ef3631893d8ce5defe327358910790 SHA512 94447ca115a26f5fd7e651677ccb35b7eda73405e02da9834b208f46cec42c6b2005ed45e46d2b1d51eb1f79043237a4e19d892474e9f26aba348a4d77bb4703
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild
deleted file mode 100644
index 55b749cf00e1..000000000000
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=antlr4-${PV}
-DESCRIPTION="Python 3 runtime for ANTLR"
-HOMEPAGE="
-	https://www.antlr.org/
-	https://github.com/antlr/antlr4/
-	https://pypi.org/project/antlr4-python3-runtime/
-"
-SRC_URI="
-	https://github.com/antlr/antlr4/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/runtime/Python3"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	# https://github.com/antlr/antlr4/pull/4593
-	sed -i -e 's:assertEquals:assertEqual:' tests/TestIntervalSet.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
index 126238bbae0b..cecacdbf48ca 100644
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/runtime/Python3"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 src_prepare() {
 	# https://github.com/antlr/antlr4/pull/4593
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 00c5f747dd3f..04eb8fd41585 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,8 +1,3 @@
-AUX anyio-4.4.0-py313.patch 3403 BLAKE2B d58254482e73351f19bdc63dbb0aac98e472a780e5e646caed3ded574a17346ed9f9a25e792d4877b85f13282bb0e0f2159ec561fc0be936f1fc07bcabfa3c54 SHA512 37d248f1a4aa9b1644c0c6568789852aeba062b3c80aeb7f6b06a0e6d4b1c92b6f289f0d23d5479a59b9329a8b7e9587a79e440e381dae2ed99b66ff3fae4637
-DIST anyio-4.4.0.tar.gz 163930 BLAKE2B a37b8bc05e43cf1a4bc3f15ab399c78c7a76235942d776848307b189898973e46ddfb553bd20da154dc740d8b8bb93050ac460e56607b686bc2936c5a1e09332 SHA512 db8ad7a4faf257269de9975c3a6325023a95255a8bfe1a9642221080f44a2487160f3c0e8b220d637816e9eb3641550393a3c80b23bddafc33fd9ebe9a23b33d
-DIST anyio-4.5.0.tar.gz 169376 BLAKE2B be8b68729b9ad3c6ff39844617ebabf2b36facee5b1e4cbc9933fb6315a70daec785d2aebab9dc29d387987bee20bc6bf56f3befa9a997a4caa2ef9d7dffcc23 SHA512 12dbcc59888c555381589a820713c636f0f1a09d7999746ce5fbbdaa9a4cad5644510d036287d202db617ee16d59231a8edc824b003056bad22a189b5863c6f5
 DIST anyio-4.6.0.tar.gz 170983 BLAKE2B 686cb9b622cba29d02fe6e440502de80c159dc40547124aed79eb7558fe147fa62f378745c2aa5487ca1ea7c24e1f3c6167f8343236dbb7e0876d95f741c46ec SHA512 4828198d3e2b2924b3490c305dcaddc14b5746b29a0cb36f75913f897254fed0ac46e075a3c04bf164a7d4d597b0dcdd991fe5cb26ffce477d029db7ff924f38
-EBUILD anyio-4.4.0-r1.ebuild 2337 BLAKE2B f82fef9559b6d3354e4b5596219844ee051b155a52daac734691f02052661410cc8caa6054ec88d5543d09f51dd19dc597d2d869e0cb9d368e13422bf0287856 SHA512 e4eac2aa027aadba42c21eb495473bbcc50f810e7423685a89d35707e9c7a1ba5408a04c4503d76ba4bff5e666445a7b32cd685ee94e5fe8cba68374c1205d48
-EBUILD anyio-4.5.0.ebuild 2122 BLAKE2B 222be82cf3f0009fe2fdf50dac744d10605560d7be4beea521fae8029da2f581f91a3c7b6d917e8097d1e6df045421965ddbf988c6a170c43842426aa48de86c SHA512 a19884faf8ca0e9550f91bad2a2678378dc1d4b20d42dadf740a4c9a21e6d41df5ff4daa99252eb9c2e2e71cea449659221f5f26dffc1168af8adfaec276163c
-EBUILD anyio-4.6.0.ebuild 2127 BLAKE2B 975acdb2b688cd60c79d633864a0b3df7af0f364145a46c6af397f37c983d0f7b91bdd1cdb813ec6e6ef776094f6b71ca38a995bea94e828bd69388c93c5eeea SHA512 bd5ebbc66b589cdb8685f96b8dc9e947001d95a9b1cd40174a6990611e032ad591b8b5a5496bd5edaa5fa594ed222d282d8174db2f4f8a82690b3446ca5e4fa3
+EBUILD anyio-4.6.0.ebuild 2119 BLAKE2B 8f8111b32af15191063c06144ec16d409460ba382ff8c10f4d0ae8923c410c207299440d75da10c5528583393d8fb710264a35a6858976fec8616f0d2eea7e4d SHA512 1b7677d3a04d86edb3b2296640a3c900a931a0568aea403ce1d4aab4f9501f40094c197fd871500d938c11bb0b555d6fa7a891c6d92297d493545b825c74d137
 MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
diff --git a/dev-python/anyio/anyio-4.4.0-r1.ebuild b/dev-python/anyio/anyio-4.4.0-r1.ebuild
deleted file mode 100644
index 9dae25bf5777..000000000000
--- a/dev-python/anyio/anyio-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/trio-0.23[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.17[${PYTHON_USEDEP}]
-			' python3_{10..12})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-PATCHES=(
-	# https://github.com/agronholm/anyio/pull/740
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local filter=()
-	if ! has_version ">=dev-python/trio-0.23[${PYTHON_USEDEP}]"; then
-		filter+=( -k "not trio" )
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_plugin.py::test_plugin
-			tests/test_pytest_plugin.py::test_autouse_async_fixture
-			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				'tests/test_fileio.py::TestPath::test_properties[asyncio]'
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.5.0.ebuild b/dev-python/anyio/anyio-4.5.0.ebuild
deleted file mode 100644
index fdce513c8b72..000000000000
--- a/dev-python/anyio/anyio-4.5.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
-			' python3_{10..13})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local filter=()
-	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
-		filter+=( -k "not trio" )
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_plugin.py::test_plugin
-			tests/test_pytest_plugin.py::test_autouse_async_fixture
-			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.6.0.ebuild b/dev-python/anyio/anyio-4.6.0.ebuild
index 15e58ff7d1b4..07e1a47c5d38 100644
--- a/dev-python/anyio/anyio-4.6.0.ebuild
+++ b/dev-python/anyio/anyio-4.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/files/anyio-4.4.0-py313.patch b/dev-python/anyio/files/anyio-4.4.0-py313.patch
deleted file mode 100644
index ebd3763f7544..000000000000
--- a/dev-python/anyio/files/anyio-4.4.0-py313.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 8a4d651610abb71da66cef58f350788eab6b0bd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Tue, 28 May 2024 01:00:49 +0300
-Subject: [PATCH 1/3] Added missing Path properties from Python 3.13
-
-Fixes #737.
----
- src/anyio/_core/_fileio.py | 24 ++++++++++++++++++++++--
- tests/test_fileio.py       | 18 ++++++++++++++++++
- 4 files changed, 47 insertions(+), 4 deletions(-)
-
-diff --git a/src/anyio/_core/_fileio.py b/src/anyio/_core/_fileio.py
-index df2057fe..8053dce5 100644
---- a/src/anyio/_core/_fileio.py
-+++ b/src/anyio/_core/_fileio.py
-@@ -358,8 +358,28 @@ def as_posix(self) -> str:
-     def as_uri(self) -> str:
-         return self._path.as_uri()
- 
--    def match(self, path_pattern: str) -> bool:
--        return self._path.match(path_pattern)
-+    if sys.version_info >= (3, 13):
-+        parser = pathlib.Path.parser  # type: ignore[attr-defined]
-+
-+        @classmethod
-+        def from_uri(cls, uri: str) -> Path:
-+            return Path(pathlib.Path.from_uri(uri))  # type: ignore[attr-defined]
-+
-+        def full_match(
-+            self, path_pattern: str, *, case_sensitive: bool | None = None
-+        ) -> bool:
-+            return self._path.full_match(  # type: ignore[attr-defined]
-+                path_pattern, case_sensitive=case_sensitive
-+            )
-+
-+        def match(
-+            self, path_pattern: str, *, case_sensitive: bool | None = None
-+        ) -> bool:
-+            return self._path.match(path_pattern, case_sensitive=case_sensitive)
-+    else:
-+
-+        def match(self, path_pattern: str) -> bool:
-+            return self._path.match(path_pattern)
- 
-     def is_relative_to(self, other: str | PathLike[str]) -> bool:
-         try:
-diff --git a/tests/test_fileio.py b/tests/test_fileio.py
-index bcd7fe1d..ff9178e0 100644
---- a/tests/test_fileio.py
-+++ b/tests/test_fileio.py
-@@ -186,6 +186,15 @@ def test_as_uri(self) -> None:
-         else:
-             assert Path("/foo/bar").as_uri() == "file:///foo/bar"
- 
-+    @pytest.mark.skipif(
-+        sys.version_info < (3, 13),
-+        reason="Path.from_uri() is only available on Python 3.13+",
-+    )
-+    def test_from_uri(self) -> None:
-+        path = Path.from_uri("file:///foo/bar")
-+        assert isinstance(path, Path)
-+        assert path.as_uri() == "file:///foo/bar"
-+
-     async def test_cwd(self) -> None:
-         result = await Path.cwd()
-         assert isinstance(result, Path)
-@@ -269,6 +278,7 @@ async def test_is_mount(self) -> None:
-         assert not await Path("/gfobj4ewiotj").is_mount()
-         assert await Path("/").is_mount()
- 
-+    @pytest.mark.filterwarnings("ignore::DeprecationWarning")
-     def test_is_reserved(self) -> None:
-         expected_result = platform.system() == "Windows"
-         assert Path("nul").is_reserved() == expected_result
-@@ -339,6 +349,14 @@ def test_joinpath(self) -> None:
-         path = Path("/foo").joinpath("bar")
-         assert path == Path("/foo/bar")
- 
-+    @pytest.mark.skipif(
-+        sys.version_info < (3, 13),
-+        reason="Path.full_match() is only available on Python 3.13+",
-+    )
-+    def test_fullmatch(self) -> None:
-+        assert Path("/foo/bar").full_match("/foo/*")
-+        assert not Path("/foo/bar").full_match("/baz/*")
-+
-     def test_match(self) -> None:
-         assert Path("/foo/bar").match("/foo/*")
-         assert not Path("/foo/bar").match("/baz/*")
-
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index eec7a2f90b63..1edf0a6226b3 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,12 +1,5 @@
-AUX astroid-3.2.2-py313.patch 6670 BLAKE2B cb969f85e7810a2d1ef8088a9d35bc086df001589bd0de58be204db762e59aa145f930d275a02f49868277514a5ec492020d1537b323582b79733a5aebb6ba28 SHA512 d2800eab3ba1c54048a24758c9fbfb911a5af0add7a24d0c00f3b245a1a7fb5efbed9614ed5e0032fbf619a473192ba8039047bffdf33fdcdc027a22db2a5643
-DIST astroid-3.2.4.gh.tar.gz 465788 BLAKE2B 745a860b7bacb45cb86e9b232fe3a37cdac40cb471b00832a7dd7da4c3374760749cebe8c8688748e750cc3639554515a7a9e24f5f4d2ebac10af2c906fa04a9 SHA512 e48289794f67cf53bb8a2dcf357c1e892140a0a625c2e19601cf5ad579aaa33a94f0e052915fa6e854bc0a2e626f41b2d13773aa2b2af2412efeb33d030ed2b6
-DIST astroid-3.3.2.gh.tar.gz 464183 BLAKE2B a891a57ce697e539b865ead8f1a1a42aa57962d1ac3cb39624f3c8cac1a233ce5ed207a87f6b8ef0b2fcacc296610819d5612262a6fbfe08eed20a2955b168c4 SHA512 dc9777e701f0bf3dc5367da8e7c79eeba18f485ad1425f8e3e50814efef9f8fd0e11f30363d1c602cfd05c51b2b2e9749989da1413db59c9f648fbc47cfbc8ae
-DIST astroid-3.3.3.gh.tar.gz 464883 BLAKE2B 0a0324619c15c0b5341f6b7d271b45a3d716814c5af35966cbc17dbd499196dc282b44e7a6e2904fac34d416343c79d2194f98f4811e16a2f7ee3365d759aa77 SHA512 a8f130bbf26d8cd3dd696bd6198e34f4e1585f11360acb068f95f26c4b72ec2187ce48533e3b00b4c1e3e33cbdc0a684999cc044f23de39f61111dc46781a1e6
 DIST astroid-3.3.4.gh.tar.gz 465703 BLAKE2B a6ee3a02196e1fe67177339c235aa43419459f9b82d98e0cdf681e24321bf77517074ed756693b6f8d66e167f6d567e01694cb9678b4f60857fc6cd80365104f SHA512 fd826d8d08f3031670959eb0ef27108c6df632d951d47e75ee870d866b80da37e3880bfc51843ec7cf0a6441d6f9a85a16757a6b0c777844dd7ee0445fb8ef76
 DIST astroid-3.3.5.gh.tar.gz 465885 BLAKE2B 64453a7b17aa1584083ca3c1fea4fdf8a236a1e0b80a66d8fe83a7201f2ef7c1cb362370648d61f766e8dc101c7797fbb7c5a2ab6f21e23da3830072e6a66c23 SHA512 323774d0853e8bebf5074eab3da3c29dfd2c04c96f222eb9a7fbe8da37544f7e6dceed8d0fd163591a2cd56a3d06ebf8ec33d23baeb921aa49cccb0f29cae426
-EBUILD astroid-3.2.4.ebuild 3139 BLAKE2B d19fdb72ab41af9b756225dd1d0e276eca369c68067c3e406a4fa9547bf9965c7d27a692e6b2c144b638a3625da4432d559b52f240b843b4c9dbc3c6fcb3bede SHA512 66bd5aa50697534a7b6e5439176e8980c3722e7720b916a4259ef52f71f692456cc2d6ae9786b975a396c22a7214e45fde2aae1be28b5fc78d5cf90263c3d4ba
-EBUILD astroid-3.3.2.ebuild 3026 BLAKE2B 599c666c5b38ec6040107079be187c7d8ca3c58fd028a12df6ab8dc6ffc9e421794d83d3ec3ebbd9f1467eb4ed71cb049bcd90871dc959c5e1cad7833db0f0ec SHA512 f7cf04317a3a038f430729c2f519177869a8250aeb9cd4bf02c6907eab26ed75ff4add1b1c8b186693b8f83a1ccafdb3c2f209666d900d593c196c6cc6b03bd7
-EBUILD astroid-3.3.3.ebuild 3034 BLAKE2B 2e12e035ac338558dbcb06bfde557a2586a9c4c3ae477e2367ab8b9ba16b61fdc6a79fc57dafdc1abb315dbae0f0cc889970bd798477747d504dad0dd162053c SHA512 f9cf6786341175137551b2da820b1decbd0105dedab6be6108ab7fe584f5b33cd09379abad3f0ea0260646e95dcc0e8c7d05910dd1af81e009df98996051e1d4
-EBUILD astroid-3.3.4.ebuild 3034 BLAKE2B 2e12e035ac338558dbcb06bfde557a2586a9c4c3ae477e2367ab8b9ba16b61fdc6a79fc57dafdc1abb315dbae0f0cc889970bd798477747d504dad0dd162053c SHA512 f9cf6786341175137551b2da820b1decbd0105dedab6be6108ab7fe584f5b33cd09379abad3f0ea0260646e95dcc0e8c7d05910dd1af81e009df98996051e1d4
+EBUILD astroid-3.3.4.ebuild 3026 BLAKE2B 599c666c5b38ec6040107079be187c7d8ca3c58fd028a12df6ab8dc6ffc9e421794d83d3ec3ebbd9f1467eb4ed71cb049bcd90871dc959c5e1cad7833db0f0ec SHA512 f7cf04317a3a038f430729c2f519177869a8250aeb9cd4bf02c6907eab26ed75ff4add1b1c8b186693b8f83a1ccafdb3c2f209666d900d593c196c6cc6b03bd7
 EBUILD astroid-3.3.5.ebuild 3034 BLAKE2B 2e12e035ac338558dbcb06bfde557a2586a9c4c3ae477e2367ab8b9ba16b61fdc6a79fc57dafdc1abb315dbae0f0cc889970bd798477747d504dad0dd162053c SHA512 f9cf6786341175137551b2da820b1decbd0105dedab6be6108ab7fe584f5b33cd09379abad3f0ea0260646e95dcc0e8c7d05910dd1af81e009df98996051e1d4
 MISC metadata.xml 1148 BLAKE2B 29a6cfc0c292117920be154d37ed4770f1fb1679186576fe6151cc02d1d6be766045e0231e2fceb87cbd250dbed3888c99b7ca7dc0182cc700a11961d9cd6d9e SHA512 6821d13f5e82bd73ee4fd165c0b4c94f40cd6af536dee1658cccb4175e67da2611c4d1478cdef1607535f23224116ad482197e0b0eef8f0a94d596bf250b3074
diff --git a/dev-python/astroid/astroid-3.2.4.ebuild b/dev-python/astroid/astroid-3.2.4.ebuild
deleted file mode 100644
index 810ff14e4489..000000000000
--- a/dev-python/astroid/astroid-3.2.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
-	# https://github.com/pylint-dev/astroid/pull/2424 (rebased)
-	"${FILESDIR}/${PN}-3.2.2-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.2.ebuild b/dev-python/astroid/astroid-3.3.2.ebuild
deleted file mode 100644
index 8e973999aca6..000000000000
--- a/dev-python/astroid/astroid-3.3.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.3.ebuild b/dev-python/astroid/astroid-3.3.3.ebuild
deleted file mode 100644
index adfa5e854419..000000000000
--- a/dev-python/astroid/astroid-3.3.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.4.ebuild b/dev-python/astroid/astroid-3.3.4.ebuild
index adfa5e854419..8e973999aca6 100644
--- a/dev-python/astroid/astroid-3.3.4.ebuild
+++ b/dev-python/astroid/astroid-3.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/astroid/files/astroid-3.2.2-py313.patch b/dev-python/astroid/files/astroid-3.2.2-py313.patch
deleted file mode 100644
index f8addfe9ef7c..000000000000
--- a/dev-python/astroid/files/astroid-3.2.2-py313.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/astroid/brain/brain_dataclasses.py b/astroid/brain/brain_dataclasses.py
-index 88a4385f..743dfe96 100644
---- a/astroid/brain/brain_dataclasses.py
-+++ b/astroid/brain/brain_dataclasses.py
-@@ -19,7 +19,7 @@ from typing import Literal, Tuple, Union
- 
- from astroid import bases, context, nodes
- from astroid.builder import parse
--from astroid.const import PY39_PLUS, PY310_PLUS
-+from astroid.const import PY39_PLUS, PY310_PLUS, PY313_PLUS
- from astroid.exceptions import AstroidSyntaxError, InferenceError, UseInferenceDefault
- from astroid.inference_tip import inference_tip
- from astroid.manager import AstroidManager
-@@ -503,6 +503,15 @@ def _looks_like_dataclass_field_call(
-     return inferred.name == FIELD_NAME and inferred.root().name in DATACLASS_MODULES
- 
- 
-+def _looks_like_dataclasses(node: nodes.Module) -> bool:
-+    return node.qname() == "dataclasses"
-+
-+
-+def _resolve_private_replace_to_public(node: nodes.Module) -> None:
-+    if "_replace" in node.locals:
-+        node.locals["replace"] = node.locals["_replace"]
-+
-+
- def _get_field_default(field_call: nodes.Call) -> _FieldDefaultReturn:
-     """Return a the default value of a field call, and the corresponding keyword
-     argument name.
-@@ -618,6 +627,13 @@ def _infer_instance_from_annotation(
- 
- 
- def register(manager: AstroidManager) -> None:
-+    if PY313_PLUS:
-+        manager.register_transform(
-+            nodes.Module,
-+            _resolve_private_replace_to_public,
-+            _looks_like_dataclasses,
-+        )
-+
-     manager.register_transform(
-         nodes.ClassDef, dataclass_transform, is_decorated_with_dataclass
-     )
-diff --git a/astroid/brain/brain_pathlib.py b/astroid/brain/brain_pathlib.py
-index 116cd2ee..d0f53132 100644
---- a/astroid/brain/brain_pathlib.py
-+++ b/astroid/brain/brain_pathlib.py
-@@ -8,6 +8,7 @@ from collections.abc import Iterator
- 
- from astroid import bases, context, inference_tip, nodes
- from astroid.builder import _extract_single_node
-+from astroid.const import PY313_PLUS
- from astroid.exceptions import InferenceError, UseInferenceDefault
- from astroid.manager import AstroidManager
- 
-@@ -27,10 +28,11 @@ def _looks_like_parents_subscript(node: nodes.Subscript) -> bool:
-         value = next(node.value.infer())
-     except (InferenceError, StopIteration):
-         return False
-+    parents = "builtins.tuple" if PY313_PLUS else "pathlib._PathParents"
-     return (
-         isinstance(value, bases.Instance)
-         and isinstance(value._proxied, nodes.ClassDef)
--        and value.qname() == "pathlib._PathParents"
-+        and value.qname() == parents
-     )
- 
- 
-diff --git a/astroid/brain/brain_typing.py b/astroid/brain/brain_typing.py
-index 9965abc2..7a7c7183 100644
---- a/astroid/brain/brain_typing.py
-+++ b/astroid/brain/brain_typing.py
-@@ -15,7 +15,7 @@ from typing import Final
- from astroid import context, extract_node, inference_tip
- from astroid.brain.helpers import register_module_extender
- from astroid.builder import AstroidBuilder, _extract_single_node
--from astroid.const import PY39_PLUS, PY312_PLUS
-+from astroid.const import PY39_PLUS, PY312_PLUS, PY313_PLUS
- from astroid.exceptions import (
-     AstroidSyntaxError,
-     AttributeInferenceError,
-@@ -168,6 +168,15 @@ def infer_typing_attr(
-         # If typing subscript belongs to an alias handle it separately.
-         raise UseInferenceDefault
- 
-+    if (
-+        PY313_PLUS
-+        and isinstance(value, FunctionDef)
-+        and value.qname() == "typing.Annotated"
-+    ):
-+        # typing.Annotated is a FunctionDef on 3.13+
-+        node._explicit_inference = lambda node, context: iter([value])
-+        return iter([value])
-+
-     if isinstance(value, ClassDef) and value.qname() in {
-         "typing.Generic",
-         "typing.Annotated",
-diff --git a/tests/brain/test_brain.py b/tests/brain/test_brain.py
-index b8bc84e3..78b6f8b3 100644
---- a/tests/brain/test_brain.py
-+++ b/tests/brain/test_brain.py
-@@ -647,7 +647,7 @@ class TypingBrain(unittest.TestCase):
- 
-     @test_utils.require_version(minver="3.9")
-     def test_typing_annotated_subscriptable(self):
--        """Test typing.Annotated is subscriptable with __class_getitem__"""
-+        """typing.Annotated is subscriptable with __class_getitem__ below 3.13."""
-         node = builder.extract_node(
-             """
-         import typing
-@@ -655,8 +655,13 @@ class TypingBrain(unittest.TestCase):
-         """
-         )
-         inferred = next(node.infer())
--        assert isinstance(inferred, nodes.ClassDef)
--        assert isinstance(inferred.getattr("__class_getitem__")[0], nodes.FunctionDef)
-+        if PY313_PLUS:
-+            assert isinstance(inferred, nodes.FunctionDef)
-+        else:
-+            assert isinstance(inferred, nodes.ClassDef)
-+            assert isinstance(
-+                inferred.getattr("__class_getitem__")[0], nodes.FunctionDef
-+            )
- 
-     def test_typing_generic_slots(self):
-         """Test slots for Generic subclass."""
-diff --git a/tests/brain/test_pathlib.py b/tests/brain/test_pathlib.py
-index d935d964..5aea8d37 100644
---- a/tests/brain/test_pathlib.py
-+++ b/tests/brain/test_pathlib.py
-@@ -5,7 +5,7 @@
- 
- import astroid
- from astroid import bases
--from astroid.const import PY310_PLUS
-+from astroid.const import PY310_PLUS, PY313_PLUS
- from astroid.util import Uninferable
- 
- 
-@@ -23,7 +23,10 @@ def test_inference_parents() -> None:
-     inferred = name_node.inferred()
-     assert len(inferred) == 1
-     assert isinstance(inferred[0], bases.Instance)
--    assert inferred[0].qname() == "pathlib._PathParents"
-+    if PY313_PLUS:
-+        assert inferred[0].qname() == "builtins.tuple"
-+    else:
-+        assert inferred[0].qname() == "pathlib._PathParents"
- 
- 
- def test_inference_parents_subscript_index() -> None:
-@@ -40,7 +43,10 @@ def test_inference_parents_subscript_index() -> None:
-     inferred = path.inferred()
-     assert len(inferred) == 1
-     assert isinstance(inferred[0], bases.Instance)
--    assert inferred[0].qname() == "pathlib.Path"
-+    if PY313_PLUS:
-+        assert inferred[0].qname() == "pathlib._local.Path"
-+    else:
-+        assert inferred[0].qname() == "pathlib.Path"
- 
- 
- def test_inference_parents_subscript_slice() -> None:
-diff --git a/tests/test_inference.py b/tests/test_inference.py
-index ec8fc71b..95f00821 100644
---- a/tests/test_inference.py
-+++ b/tests/test_inference.py
-@@ -4458,8 +4458,7 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
-         # and reraise it as a TypeError in Class.getitem
-         node = extract_node(
-             """
--        def test():
--            yield
-+        def test(): ...
-         test()
-         """
-         )
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index bd319ee32f00..1c528aa8e756 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,5 +1,5 @@
 DIST atpublic-4.1.0.tar.gz 14426 BLAKE2B c535d36b8c4723fa0c36ed543461f8364445c52893e8a5cd6a6bfdec0a387308a74d9f6a9d4c204ac753fcc847a105f6f4a5dc7afa5848d08f0a269af8b01397 SHA512 bd840a44f3f9d8f7099c22d67866744ef43ed4bfa00e0fd8a6a7516e8e995287b234fb97eaf30be494f06a8ff1020c0479533bfe33adc56ae62bd976bd997b4b
 DIST atpublic-5.0.tar.gz 14646 BLAKE2B 92d545d7f8d90b47348a302662473f154783d0f5e3aa6ef165f6ddecbd7024792ef5dec02edf9b513c03021c5550cc915c258b5ee600869e10ba9c6c99f1dafa SHA512 b5b3dabb4891c0aa75a6e2f0d6f19e1447ba358c139a73bc582c2ef58bec0ea44bfee44f44635de7da1e1c1e4e7edb99ea7e6a2090c1df710a200eb16440098f
 EBUILD atpublic-4.1.0.ebuild 650 BLAKE2B 964ce7b6bd087614e7e54d70152f3d38c123f67679b95ce0de567db7dcd9b450e656634bc51c3a903fe72e18b72f972f06509eeacb275611b198706c9690882c SHA512 8715249a80148ff62830f1926df12dd2a871b31ba0897ef3987137299ac58de8bfb3c62a6b78557e16ad807113aeaf45ba691da4f44f4a9f55c3bddf838c7ebd
-EBUILD atpublic-5.0.ebuild 553 BLAKE2B b314cc95183f643ca77557f72da92d22b654a2a58ccbdeefd15f7fd68aeab3b9eeee760f688fe163c4961bfb054683dc4187e010b2dc2e33e61d6f0ef20e8e55 SHA512 1d02ab77beae9a5fcff5f0d6e778805031ff1bcdc941a143491a70d529c75e3a8dd044a0fd29c6d6f6a5eaa01cde51ea968af529cc869f634b93646934de271c
+EBUILD atpublic-5.0.ebuild 552 BLAKE2B c1e60b4aa5c3ddd9c7305bf3a51edfea82b52da35adf7b91cccc626e23f76d5a60678f9c8fe46b248b41a599ed258b2484d58e2c238e604a0d95d56c936d3096 SHA512 2ae58bc3bdd8bd3d1a71d2d5faab24844738e09c021303dc169e91ae49a1c3116dd2aa171356bcd8e3a3c7cfb2d1e8794957e676255970ce36293175cffd9109
 MISC metadata.xml 504 BLAKE2B 3b732123bf02f2346619de1b3e68f451c58e1138868fd8c52a24f979188115d9abf9308c390d061d5e679cbcc9bfa5059414dfd69e6fdfdd052e4bb1e61d496c SHA512 5ccf87022bea4e77dc26275572a97530d340b70f1b428676a6d86a3f24666ab702756cb285216a7ce6e670973a2ff50d7ca3f848ebab24c318d39563ae01305b
diff --git a/dev-python/atpublic/atpublic-5.0.ebuild b/dev-python/atpublic/atpublic-5.0.ebuild
index 669d6f169a5e..adc6829acd44 100644
--- a/dev-python/atpublic/atpublic-5.0.ebuild
+++ b/dev-python/atpublic/atpublic-5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 72f2e8efb339..3a7b5c4349cd 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,3 @@
 DIST bandit-1.7.10.tar.gz 4228540 BLAKE2B ca1fdbd5061a635520500cb583b739d19335920eeb89661c7ddf2a2c3a97d3c55c2ce7797be984dd1dba2613a38d6b2e0bbcfde655f9d4ed76582ce831e4b42e SHA512 c9c5d098186a23f856f4bdecdebfe863f7ddce8627608b80c62a537416d2aa91666a95c304f5cdde43ff1a41e1f6a58b30dce1042159a1ea74b8b5c9a8ee381a
-DIST bandit-1.7.9.tar.gz 4225771 BLAKE2B e5d20fbf4c3a33b092c23ad356dad39543ccea4d552687b97350cb6fe960dfa004cbef627ee0e0911da147ed53c6eb57046ec57c76858c58e772bf81e2c2b82e SHA512 a71e3eb359fad952afc9e210795fb8cc6fe178305bb837e002af83eccc4a958664b69422ba93d7d72b24089ba3142667ca17909d712db1b447e78d6f7f4c9634
-EBUILD bandit-1.7.10.ebuild 1182 BLAKE2B 0c2798662b0b9b0b0223b8b15fd4c1a28ae76bce5b77e2fcbec35fab5b9152e185c74ae57492456443ed701fa3db042b838892430b01f9cc53fda0a359934de4 SHA512 e7fb100e3b4d87d7e4229af61c7768a6e0fc6307a6382824d6386e72b0f6b1ec03bba7e34b439d1fea33f0fb6d48cfbf6707b2a5fbf8f6b2272c23fc3cce07e2
-EBUILD bandit-1.7.9.ebuild 1179 BLAKE2B 34faa8a64ad99f56da78e25a9a49e6ddc104802b268db7d4bde0fc3f0df33d4173c971605be42e2776dd9b4e486bb763a0154b7c6866f68ed7c0639356f43931 SHA512 1aa68f206cf7964f640c6b6ae9bf45c610e39eab2b13a93fe1dcff1ebdba97d820980e55f3940971670f7b1e32b62e5ef6385713b13715dd2255af6b77eafe3b
+EBUILD bandit-1.7.10.ebuild 1179 BLAKE2B 34faa8a64ad99f56da78e25a9a49e6ddc104802b268db7d4bde0fc3f0df33d4173c971605be42e2776dd9b4e486bb763a0154b7c6866f68ed7c0639356f43931 SHA512 1aa68f206cf7964f640c6b6ae9bf45c610e39eab2b13a93fe1dcff1ebdba97d820980e55f3940971670f7b1e32b62e5ef6385713b13715dd2255af6b77eafe3b
 MISC metadata.xml 810 BLAKE2B 6f836d0afbb33f233618f056a9d4161cbdafe93abbed2f321e4e799bb75a86e2c4cc27cd43e74d05e1a15496ecf52e6a575ecd8dd4ae463ee37f742331b0086d SHA512 e3dc0280839cb1a54a2585fd6fe19fce66ceff73a7e010479e99e9631c224851b303d577b5de0ba62bc94b78b9b75b30c0103421441bba9753e4231bc3914481
diff --git a/dev-python/bandit/bandit-1.7.10.ebuild b/dev-python/bandit/bandit-1.7.10.ebuild
index 608a06da92cc..27c35a502ccb 100644
--- a/dev-python/bandit/bandit-1.7.10.ebuild
+++ b/dev-python/bandit/bandit-1.7.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bandit/bandit-1.7.9.ebuild b/dev-python/bandit/bandit-1.7.9.ebuild
deleted file mode 100644
index 27c35a502ccb..000000000000
--- a/dev-python/bandit/bandit-1.7.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="
-	https://github.com/PyCQA/bandit/
-	https://pypi.org/project/bandit/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-3.1.30[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/beartype/Manifest b/dev-python/beartype/Manifest
index abefd449b6fa..4b33594610fa 100644
--- a/dev-python/beartype/Manifest
+++ b/dev-python/beartype/Manifest
@@ -1,5 +1,3 @@
-DIST beartype-0.18.5.tar.gz 1193506 BLAKE2B 497de6f326a3b600992748db8b74ba80d4a14003a0cc484b3eeaf48f0f808864fe64462ef3315d421dc4b5fe5d7060b48585ee00eb822c9f124612f394ab93bb SHA512 114b256619c6c7fc48fbe28db00ae5a8ddea4ce11c5394a06fa026f0317a34907ff12ef0c0009cff7a7b83742e6b66bc8b503b4c0e382c0b6cf79d43780bda5b
 DIST beartype-0.19.0.tar.gz 1294480 BLAKE2B 7a0d2800a28af49815bf300c93081faee0e01c922497418bc7328c0968cac077a0fdfe984de66c214af610bb972a217224a6d164a2f3aac9c0a2d067c0658fc3 SHA512 9a87086736ba0d3497f3dfc3b57fdfd3ebb33812aaf58d195f1161474a553499e87d6f3f9c12bc66ab33cb3ca1697b00220828d004d568495ac743efb473c1e8
-EBUILD beartype-0.18.5.ebuild 855 BLAKE2B 780c2859946cee302ba87d63141000d6934f01b7013b0e91ff7198e31ebf204c7568464dbc46f796dac6d718a6ff5ed6c6880139ad0be1c1feac688bd9ef511c SHA512 d3f5d208b4ae7946d7e3d729cb401abfaf024b19c499da02647c0777e2a4693a45731c2bfea174bac51efcc43f8ebc2c5416188b31a01480c4e5a6964c1e4cb7
-EBUILD beartype-0.19.0.ebuild 856 BLAKE2B 32f851b0ca1ddac04e704c77ebdc93f5cd062f4d4b63096d7782bd3b69275e227d5036936329711471131e1d968cf36cae2fb1423b071a479540e890edebb3fd SHA512 fef336dd428c18d9cc83777a8619ce8e6210774ac9fba91df8238d1e32f83f86a29a284628fa5e75bb3403aede0635b19d32729e192d25d722421aa874aa7b42
+EBUILD beartype-0.19.0.ebuild 854 BLAKE2B 89e2dcfe65821fe987b18a337950840b0afdbfb7e51529b67cbf59937b4194978563afda5b078c6218cd5f3683d7f90a94309f2b89df34026dca285c3b4dfeea SHA512 231a8873494767c51582e508795c257a0b46dde1220a639efe233594cf80280d32cc0e8b81f08e3d445cdb3582af55eb507728d899186ce98cc19dd598f15d11
 MISC metadata.xml 393 BLAKE2B f22040a947a67160c9b4c2d41db713ea69ae7a272aba75c04b1620e3f813d62718425acbc8c18716981e4176ebeabc5b60e9376d9927552ea5a36b51b7baccdd SHA512 dea8caeb6e9091672994cee213be075819d593d1034cbc7e2b076f3fc32bd2afde13b6af094956885c9ddaa72f272c6a198f4f92e7b095606fdf900a4cec47ec
diff --git a/dev-python/beartype/beartype-0.18.5.ebuild b/dev-python/beartype/beartype-0.18.5.ebuild
deleted file mode 100644
index cf8363a1d705..000000000000
--- a/dev-python/beartype/beartype-0.18.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unbearably fast runtime type checking in pure Python"
-HOMEPAGE="
-	https://pypi.org/project/beartype/
-	https://github.com/beartype/beartype/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fragile performance test
-		beartype_test/a00_unit/a70_decor/test_decorwrapper.py::test_wrapper_fail_obj_large
-		# test for building docs, apparently broken too
-		beartype_test/a90_func/z90_lib/a00_sphinx
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/beartype/beartype-0.19.0.ebuild b/dev-python/beartype/beartype-0.19.0.ebuild
index 000466fffd5b..28e4d32b8c97 100644
--- a/dev-python/beartype/beartype-0.19.0.ebuild
+++ b/dev-python/beartype/beartype-0.19.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 0a3d7715da99..880fafd2dd2a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,23 +1,7 @@
-DIST boto3-1.35.19.gh.tar.gz 861578 BLAKE2B 5011df66763e646768232a65022080ffbe3db08253f1bf3e192cf57be010ccdd08f8add78ec365e1c04d78ba1722cf6ef54fbc170f7f2419fcd370c08d48e3ce SHA512 faabd3ef8eb35a323ed64a711e0a026f8f77974516b05a93d389fb82b84932f69a2c784a1065811699dac4db016549f3756f24b879485b2dfb6ca380e6873670
-DIST boto3-1.35.24.gh.tar.gz 864653 BLAKE2B e2327ae352d17f0cfabdcca6d7db07e0212ea740c66d8f36baf44d0617cdbfdcb018388fed1deeea37bef5e44edb360f2cb77b41085e7a3308f7d4045b0a4aa3 SHA512 e34b02cf141bd77d92a34dbef266e07f6d45d46aa924e3941dbe09a9562253f375b79a6a4f1e3df248d711341e00367a8519f816b2200353a6262de72a40fba0
 DIST boto3-1.35.29.gh.tar.gz 867438 BLAKE2B 7a47e8156bd438e94fe2abf9fa978aa243bf131bf7c9afdafeca7f7ada9b014daea410da82417e95bdd57f14bf5a973429cc7b431ba72088f9f9619c59cf9b93 SHA512 7238f353520768576390651a4a90a389b24205b38ff9c58829ff53b6210fb3a4ad5c27301e5be27bb10ed2017ff29691780102af983e16d0b14a4f9add17ba12
-DIST boto3-1.35.31.gh.tar.gz 868424 BLAKE2B 28c352784c8af273f29318b788ed2c29b88e2e2deb248849937f7a33d0a0d11132a8ee571bce18486c60e63c5c2972fa041389f8ea41dda7d18fd7ee21a30fd2 SHA512 2f614c8f0fc9631a7c77889e392c789493e836d195d5210fa5a63d10bc67c8879f06251a006c6d398afd71fc646320e4571060174a277538fcba63930d6183a7
-DIST boto3-1.35.32.gh.tar.gz 869127 BLAKE2B a7a269b71f8a784118d0d9092ef95b9eb8344c6791e37a68d1645bf629f7b724e556dba02fad5685af5dff543a3646dda9005cdf0c7a92b47431dd1ba9ce6d26 SHA512 2cd51232be313b407b4a2b799bdd487242f3e61a9bc63df2d59422ea5b7abb2f9c382b151d17efe0dfed31b1d0cf9719a746fd3c8de314e080e774c1c4951ffc
-DIST boto3-1.35.33.gh.tar.gz 869945 BLAKE2B dfff3fe81c88f6bb971ad832559974d54e2ef74c8c8398148906b301183787e0adfb28b7095b7fea48e2079bff0c7eda12305f666f463b63f02988738ac01707 SHA512 e7a0bf1d1aaa83dc519b46ca97cab04ba785772f3042a6c7ee1a1780c5cefb412438a5b99d27c9b7a3adaae4f643addcfe0b75001b129671b503106a5d6440fe
 DIST boto3-1.35.34.gh.tar.gz 870029 BLAKE2B 5cd9cfa0a742b8d01a6229183c3545945bb5ac89aa5b469123fcfda8a1dc3c0b505bad00a28cd6f48d14526a069d6206151d5482529ce1e35fe16f5f8180753a SHA512 6488c9dd37886bd500d09c4eef51b50c70e4d8cb2e796caec0b5fd57bb67df0663845f0fbf8507ad0d133759d1a83ac720a0bcbd703624383d1cddeb7dd92d1a
-DIST boto3-1.35.35.gh.tar.gz 870230 BLAKE2B 00f8272dc5f184ace7fd38921a1b131d2154452951a0fa5170a1eeb8aab0d0c61d69836053fefd19ac6808d2c50ac2505b76ec9088761aadf8ed9509115bfb13 SHA512 9f7bebc232754f21fe1fcc4d8536ce39ab00d0fd0cd5560d256250b8efc8d60f8183825b67f90db0a8dd31ea48073d84b508acddaaf03cb68c98c9ecb0a92b23
-DIST boto3-1.35.36.gh.tar.gz 870548 BLAKE2B b61e5f2ebbce178584d1b7d8e185c13f4536ad4615fdc242fc8ec1faeeeff4b95594c14f89c1b1cb2047fcc25f8b31c84a70b2fe056d10968ceeaaca08109a41 SHA512 a7ed7f87a5963cc6c6a52329765925afc9a7270b7cabf6f5f5aacc7ee42e031dba835f5d4f4aad1a5c06055b714b5ec1965986715ddf0b75994941962e25d460
-DIST boto3-1.35.37.gh.tar.gz 870622 BLAKE2B 488022f367677230defe90cdef0716fc1a2dfd97f5a60a24dd86e6c02bd487f9bb4b6aa14f12add60393598e5804a2ad72a774e4b6460c28eee54cf227c235f6 SHA512 77919ac52f928473a64ad71c6467a2d976a4c276535e6ada9ce2cab0c1f2a87baec5516cb4a5777bb4b5a10b1cf4102a417ebbf32170127a5def638e2dc163ac
-DIST boto3-1.35.38.gh.tar.gz 871729 BLAKE2B 6d0d8294abd2e4fad3698ef066356d77d4b177b0248a71617677e89ccc9c64ab83bf7752421a66713d639276d136029fc044bbfc2daf7c778c3dc5642c827085 SHA512 ade967cd3ead490a9168fa10d17cbf3916170a36cbae04e5dd82c380cccc02ec2cd7ef29be1603efe686c0d457e6f87c2f82bbe505eb6b26251c76693a069b19
-EBUILD boto3-1.35.19.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
-EBUILD boto3-1.35.24.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.29.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.31.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.32.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.33.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+DIST boto3-1.35.39.gh.tar.gz 872172 BLAKE2B 1baad362b9bfcf68ea89c9ba9ea473fcf2451a71be8121a443830622114b3577ae83500aaa0cbef86115e24d276ffa5660fa6e9c08d2358fa493367405fc8dd4 SHA512 4244e71a3773d9abfa419c34220fa2c44c90a93b11b8338535582aee8fe9cd788672d6833ae97f1b32fb6479b9be97f1b2db953f24b403b07f2ee3153bc833aa
+EBUILD boto3-1.35.29.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
 EBUILD boto3-1.35.34.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.35.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.36.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.37.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.38.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+EBUILD boto3-1.35.39.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.35.19.ebuild b/dev-python/boto3/boto3-1.35.19.ebuild
deleted file mode 100644
index 54e9299b7dca..000000000000
--- a/dev-python/boto3/boto3-1.35.19.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.29.ebuild b/dev-python/boto3/boto3-1.35.29.ebuild
index 8cba6d95740e..54e9299b7dca 100644
--- a/dev-python/boto3/boto3-1.35.29.ebuild
+++ b/dev-python/boto3/boto3-1.35.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.31.ebuild b/dev-python/boto3/boto3-1.35.31.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.31.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.32.ebuild b/dev-python/boto3/boto3-1.35.32.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.32.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.33.ebuild b/dev-python/boto3/boto3-1.35.33.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.33.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.35.ebuild b/dev-python/boto3/boto3-1.35.35.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.35.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.36.ebuild b/dev-python/boto3/boto3-1.35.36.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.36.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.37.ebuild b/dev-python/boto3/boto3-1.35.37.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.37.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.38.ebuild b/dev-python/boto3/boto3-1.35.38.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.38.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.24.ebuild b/dev-python/boto3/boto3-1.35.39.ebuild
index 8cba6d95740e..8cba6d95740e 100644
--- a/dev-python/boto3/boto3-1.35.24.ebuild
+++ b/dev-python/boto3/boto3-1.35.39.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index edc3d36f4ba8..03a62c467c81 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,23 +1,7 @@
-DIST botocore-1.35.19.gh.tar.gz 13376459 BLAKE2B ba64ff0dc221782ce23592a6d6a146a680e2b86aa734673d4b16d6fd83355958b32af0e86a6769d2237e6234d80fb7fb23d52e3bcd2187cfe7d3646307fdea38 SHA512 6988f442b573e951766f1978325937a29141436d976baedb9c29959d5ff64014520c1bee4a8ce9b0d4226f62a6efb081a0532b2a825811e8cb2de3217ed311ae
-DIST botocore-1.35.24.gh.tar.gz 13406391 BLAKE2B ddc1c456e4358b3e28ca8f6a92230fb843309fd6059eaf909a9fb3de0bd580fb52389173187e0794054b9f1bc21a829f457b80067868c13fd7987fc682acd024 SHA512 7a1e8c1a85e8699a811a41b59cdefcee2457c5dfdf01d54f3048f894869c5c4033287909095bf15304e408c268cf772194655afffff280dbb6fd6c6daac1d8cb
 DIST botocore-1.35.29.gh.tar.gz 13404400 BLAKE2B 41dab50dbed91c55df3c74cc3c57bd02a770b37445cf26690d199c62642b2d96d1c56d06cfea58ac23e6fa0826be99c684bd98d5e00e0e7aa8bcc0b599f70bce SHA512 c82c942942c5ad7c0b941bf1e89003730bda68fd9a2f623e8db85690f8157f73517b0ff6b7009cb15461bbff41b7ee713c5ab935cc0eb96ba3ef3e3100e363e5
-DIST botocore-1.35.31.gh.tar.gz 13414420 BLAKE2B 942455ccd037fb7cd9142a43cbc316ccc0ff8a7bc55f00096bea11527d2701cb6ac89984faca19793dcdbba5163bba330f1cddbbb9427a411d9db0cf50c9cfba SHA512 972a9f72e2d922f95e7df23ee087787962062dc97b1aa1c7732fac7a4de17d8728bad0f38dfa4dd6963c285acdd10a327044e6aba43b54953d8ab9531619b927
-DIST botocore-1.35.32.gh.tar.gz 13422242 BLAKE2B d1b553be9301b5c9aa674e9aa32d15b69e3fd56eb9d906fb979967a1df6fbf69fac6795dad133bcaf63c8c955d3f234087a7285ba7f603de83f015fc7fcea1fa SHA512 174bed147fc9708e2c1e500276597396a4f63d0417bfeb6058296a9aaeb6f21a56e8bd63d06248641e99f0e38e1dbc5c1a3ce8c17c28e1c3eea8044f58ce0642
-DIST botocore-1.35.33.gh.tar.gz 13432128 BLAKE2B 363eb3dd1f819294ff099a9af0a8deca0078d7d7ec533f3c64a86bc5a0228b7d9180dbbde5ebd8af4e5114373021981c5137ca314ce18773a1339f65506700b0 SHA512 a5a7f3afbb9ded8df9419892427d9c71f281e1f974a5b797405ed564f27f26e9b33580de4d5d2ac96096fff46425a39db2b2ee09718d1db89b3847ed7f53d60c
 DIST botocore-1.35.34.gh.tar.gz 13432167 BLAKE2B b39c70faa7312fecc748286162c3b3f21ed56ba705d0f8385a157c25d3d25ceb2d3ca7fb8234372600e5738bc7dd562e67368a863b4853da890009af6fff75ae SHA512 116a5698b1a9e60ea47adb1fe51148c0a5025e8ce940bf5b5c8009e77ea0cc850febc45df9581dda0e2238f2d42f6b8afd674d80e11d88047719874b5cb63198
-DIST botocore-1.35.35.gh.tar.gz 13440561 BLAKE2B 7dedca0fa7e492279f1bc138c7cd4d71a302853d311441f57520bde7643c3f47d7c6952d69f0ac9591f6e639cb22986414a01df626c022dc2c8a84d98804160a SHA512 670301f0a56b6c610d9ace6d36b36f14b62aa74daab3087d2ce24370d27485de17928386a5319f4f4483f88096e2e1f8e71923918511649e20535fe88c1b5b42
-DIST botocore-1.35.36.gh.tar.gz 13442036 BLAKE2B 44f999e07f8296295e0c9d90a268ef59ac2c3d5a0cf3049bc978a0000418908f876ece8f3ccc52c4b3826a305b76f932df227bbdee8cf144da5990f31afb8e16 SHA512 8c9894f32d26dbd38ddeee8b02ef5948404fcbf41601dd8c426940dade3a3ed6674778b1299a32e2a3c699676016de1d8df5aaa186452438d256256d38ae7286
-DIST botocore-1.35.37.gh.tar.gz 13441841 BLAKE2B 69b7f4981080b48632e44037988c90683e11d559ee9496a7f4930d7cb632ac6aedfdbcdca8ac56462ec19c65937c187ac6fa9a647d26c84ac09b3d79237cb294 SHA512 84a2240ca369060fa7837c95117bd91ce6c4914f8fd153da46a8c4f42bd7b5b837277624e22d350bc2bb476b57e355afb4545a46568ce3c6ad947592bcc55620
-DIST botocore-1.35.38.gh.tar.gz 13457067 BLAKE2B 15128282a46507fe3e57dd0949e4361875a5aad4af4cce4db457f7eb8683ba8c9e3f3c2422f535ad55cc17d9a7d9a5bd3a46d1c85b7866cf136eb4de46631799 SHA512 4374d7e8c67735a7bc5458a0b7d26b46e5271e3b25fed1de4846b3e201d223869b92558af479dae191b1a37580b7dc33a093990afc09f8920a605d178bff8a37
-EBUILD botocore-1.35.19.ebuild 1665 BLAKE2B 1171f3bdcbe2eada97adf58c2011691cb51300028737903ec51e9fea4d80943dc3e199f4a1671be350ca2cf921e5dbdd4e7c8ca4658261143646cf9c0c82f522 SHA512 db8027472dcb87b167d63ed89910783e104513361b9191f5e2e2928a2904493c22d9629aa206f61206c4f29c6a9c43e8208c57a9b9bf99b031101b915d326674
-EBUILD botocore-1.35.24.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.29.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.31.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.32.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.33.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
+DIST botocore-1.35.39.gh.tar.gz 13458607 BLAKE2B 631b16d9a4acf1a2c594318f20fb9755aebb5f4b390388e1c4348874948b08a8ae3b571378383fee55d9228983f89f334d208fedd2fbe3e233d9b546490ac204 SHA512 642e5c82c22c0186addcd527985132790a046f7388ab2d0fb5219476d610a65bec2d7a6e3b0123328601f91f570ae4050449b58d0ec61f5e4291abbd7407d12e
+EBUILD botocore-1.35.29.ebuild 1665 BLAKE2B 1171f3bdcbe2eada97adf58c2011691cb51300028737903ec51e9fea4d80943dc3e199f4a1671be350ca2cf921e5dbdd4e7c8ca4658261143646cf9c0c82f522 SHA512 db8027472dcb87b167d63ed89910783e104513361b9191f5e2e2928a2904493c22d9629aa206f61206c4f29c6a9c43e8208c57a9b9bf99b031101b915d326674
 EBUILD botocore-1.35.34.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.35.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
-EBUILD botocore-1.35.36.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.37.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.38.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
+EBUILD botocore-1.35.39.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.35.19.ebuild b/dev-python/botocore/botocore-1.35.19.ebuild
deleted file mode 100644
index e3f2c4490826..000000000000
--- a/dev-python/botocore/botocore-1.35.19.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.24.ebuild b/dev-python/botocore/botocore-1.35.24.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.24.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.29.ebuild b/dev-python/botocore/botocore-1.35.29.ebuild
index 4f1ad852bdc1..e3f2c4490826 100644
--- a/dev-python/botocore/botocore-1.35.29.ebuild
+++ b/dev-python/botocore/botocore-1.35.29.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.31.ebuild b/dev-python/botocore/botocore-1.35.31.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.31.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.32.ebuild b/dev-python/botocore/botocore-1.35.32.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.32.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.33.ebuild b/dev-python/botocore/botocore-1.35.33.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.33.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.35.ebuild b/dev-python/botocore/botocore-1.35.35.ebuild
deleted file mode 100644
index 4f1ad852bdc1..000000000000
--- a/dev-python/botocore/botocore-1.35.35.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.37.ebuild b/dev-python/botocore/botocore-1.35.37.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.37.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.38.ebuild b/dev-python/botocore/botocore-1.35.38.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.38.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.36.ebuild b/dev-python/botocore/botocore-1.35.39.ebuild
index 0f88c5cbe9f3..0f88c5cbe9f3 100644
--- a/dev-python/botocore/botocore-1.35.36.ebuild
+++ b/dev-python/botocore/botocore-1.35.39.ebuild
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index b51ec794007f..b5df5ed9974d 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -2,5 +2,5 @@ AUX cattrs-23.2.4_pre20240627-py313.patch 2699 BLAKE2B d57e952f73f866cb72d29568e
 DIST cattrs-23.2.3.gh.tar.gz 612120 BLAKE2B a227cc50cb23a76931562f17444fcfb4a5532cac74f80b478a8abb6d113cbb0a06c471c3ca7ee256f74640486464762f4a13387ccfc1cd144cfd1a9bfecddd8e SHA512 76a75ea0893bb1549dd5178436c4823ae5b918c16f0d8195203c48e894438ec792cee77698d783f7e43c07445c46a6041a309c3d3bbcadcff95d9c4079e3d622
 DIST cattrs-24.1.2.gh.tar.gz 428615 BLAKE2B d6874493083c4a082b319a12bead71d8a147a35019f3b08a7f16c4c982c061b98db71d6e1027215df53efc66c93688cbd6d5cfaaa9a46f9bd1a39893bbbc21ee SHA512 00316c062343a91cb71ba297af7d74798000cd44afca6eb6286278b3340efc27621486336c095e21a0e1701105494d60b72991aa00b8ab9bacf30a47eee877ce
 EBUILD cattrs-23.2.3-r1.ebuild 1792 BLAKE2B f07ad5423715b70a902013cc5107d846bc33410b6218a2a9f44b5dd7a98a66530ffc65d2879b32daa41959db81569cab91e4f852881fa50b83ffb250e3fa960f SHA512 c7ee2b1e54d3b21bd439dc21c16517cc323ab02fa4b553f76ebf2337b322316ed5f066d4fbe45fc3f34fdcd35854645b9107d854dcbf7b5ff17fc49a3113a625
-EBUILD cattrs-24.1.2.ebuild 3073 BLAKE2B ac67b9efedd058aafa27c76efeed591cd21606ba7538b755b74e435823b2c508f3429b739968c8cad65f46799c79e8600440e76189ba3bf1e4146fe126a69aa8 SHA512 015c2dbb0f35321f49a83397c4095291af4468e4458120503547bccbc0a36e72f08fadd32268fd3dab347bdc364c0bb2b8ed2826074a9449a209e5792c7fcb9e
+EBUILD cattrs-24.1.2.ebuild 3067 BLAKE2B b09bffccff0185fcc5699a4519e7cae040e6ab5cd4c573e7591acd74c20e1145a756edc98c5529f71353b70c2f50e280126a6b89741108cdb789f2e4ded0adf7 SHA512 64db569cd4bcd74633e5c50e44539a5d56818a7b92cfb296d0489c718eadfc21115e8ccfabbe7948fb1562194eaa6215e1e34aa9e75530e889bc6b9797c0accd
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-24.1.2.ebuild b/dev-python/cattrs/cattrs-24.1.2.ebuild
index d11360512066..5040922e4aa3 100644
--- a/dev-python/cattrs/cattrs-24.1.2.ebuild
+++ b/dev-python/cattrs/cattrs-24.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 01dd9e37147a..fceb0e8ddcc9 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,4 +1,6 @@
 AUX cloudpickle-3.0.0-py313.patch 1225 BLAKE2B 59400a08fa7db0943989fce0039cc9707f107660c9e1fab0bd698459c215e3e50725fdd3f9b00f8a879c0e1a63de2a4c7edc1bde2fd467f1f957c76cc3f54dd8 SHA512 eb7c8094320fb6e27cd6df77b4224c460c481b9b6e2b7046c84f171b1074e1e4ff4d1b29deeaf27b7bd0e2be12254fcbeeb6609dd5449d9bc66371f21cbc64c6
 DIST cloudpickle-3.0.0.gh.tar.gz 59519 BLAKE2B 6d5c7b98990bb4d59ffc4e75efe109814430c8b73753d630b169ce0c455e5d5105782a314d4921b5051d458758980c954b8a84cf79a9534c9a382a8066d03c27 SHA512 e091cc0de2489c06e020fac2852d25f7fd832036a2b2c4c34f0cda0c642a1c65413fc0f21dc51fec75803e7c7da37f26f613620150acd9ab4aa2bb7b1eaabb79
+DIST cloudpickle-3.1.0.gh.tar.gz 62638 BLAKE2B f99e2c96aa60a98ed401c59d8bfb6fc18735cda685ce669747e50a28d19cf27bea6e863af42b8e93c28ee7ddd0a075359864b683fca356c74c425a13f9573833 SHA512 1ab356d394af43496ab426c58a33e087dc2c71da77a7e744f860115a40217bac9f16d10b9510543415f8b8c1799729c6a6bf0f4c6b4b5eb82fce7a25fabbfa1d
 EBUILD cloudpickle-3.0.0.ebuild 1024 BLAKE2B 4c63cc4dea5ceb0197c65de8f28c036606d76c062cd82404ac10d117c08b4bbd0f61fd2d14ccef7add700415af3f563062d7a82b66589cc282baf0f1a883f606 SHA512 a7f4be46b660702a9edca8f2e27376bb758b80b891a11acedc7df1100902cec7c2fce218ffb9214fc8ea762cecd8c6624b9085ebf16d871bb824c0d565e13235
+EBUILD cloudpickle-3.1.0.ebuild 934 BLAKE2B a4b58e1759721d69860505e1e48300524010684dc91cee6c0e4b2afd6c3a14afc4affd89f921c6349b371d730565d26468801cd97b4c22f7add55a78bd084932 SHA512 fa6507eb676a98c0a3f9057cbcbcbd1bf24875eb1dcfff76fe67b24f18a6e3f82de5d402f2fa567c4785ddfa4ca8901cad0f1a0ccc979bad236da1a414b2e2af
 MISC metadata.xml 400 BLAKE2B 6b8036e6fee459cd45ff48884ade7ba9471d948ff06e46062584e5953fdaea8197525ec02e2dc44d4daa6326c7a1859680340e616f27d72ea1d98fe5c011a5cd SHA512 70c88c748d18923d3205c9f2ebc683e6b73240d4f8215f1bf3c3c91bb5eaac259066dc735f10806c43375432df581545831c616ab3aa7218981193956e6c0450
diff --git a/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild b/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild
new file mode 100644
index 000000000000..61806ec5e6c8
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://github.com/cloudpipe/cloudpickle/
+	https://pypi.org/project/cloudpickle/
+"
+SRC_URI="
+	https://github.com/cloudpipe/cloudpickle/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	epytest -s
+}
diff --git a/dev-python/cramjam/Manifest b/dev-python/cramjam/Manifest
index dae66b9edc4d..69e324c4a20f 100644
--- a/dev-python/cramjam/Manifest
+++ b/dev-python/cramjam/Manifest
@@ -248,7 +248,7 @@ DIST zstd-safe-7.2.1.crate 21122 BLAKE2B 49df1ae857449393e6a09293b8963702fecb375
 DIST zstd-sys-2.0.13+zstd.1.5.6.crate 749090 BLAKE2B b5714217ca68255d0881adcaf282a6309de322c481fe4cf8c10d9b68748008a9ca0287e8323f5a118d3b052b7dfb257182555718599da843e09068a1e8df8c5f SHA512 c1f0176ebd0914879d0060796776c7fe376293ce9bc9f8f07ee3b809932a75aa033881d59a1bc99b6cd9af85b8e225fc09bcfc96013e556d7c11f155b759ecbf
 DIST zstd-sys-2.0.9+zstd.1.5.5.crate 728791 BLAKE2B f08f8730d9cc1efc5520f223e9bfb0854b3a67a2907e47c38e0572d8eca688c1bae61560e11e664834dbff1bed3d40608b23d08f102ce6cd7f1af72b48446e4c SHA512 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa
 EBUILD cramjam-2.8.3.ebuild 4107 BLAKE2B 3c05d8bb7c7c28404c493959cc94999d711609ae7520f91132260901e29b6770c0fc2e17ab22823879997824a49cd6fd289eebd3745d145728b962d61189bda7 SHA512 f2f2661cb5842b80ca6151fd4eb795331882af43fb4b64fe9a302ae3c727ec3e7c9c7799c81f3374a62d3392d9fffe1b3cd5e8495ca63e3bbd6ec398f12d89a4
-EBUILD cramjam-2.8.4.ebuild 4406 BLAKE2B 391206889950234a2ae4e6f4e596ef8a06b0816e247e33c0ef7a22684846560eb8179d9133d2c96cad75a271ad52d41b42d75404f369ce570fea1b580cfd82d5 SHA512 0572a0c06799c6d4c2a789df3bae6209eeec50aadc0d93f0452473dbee7cce942d6d75acd2e24b8296c8287cd4dded7f2f96db745867943543ef9f565645cdd9
+EBUILD cramjam-2.8.4.ebuild 4404 BLAKE2B be4b9c47826ade1a49cef039b9d97de2ccbc58a38abbac56eccc8a193e29a7435e439b18a9aba580c315f0fb15532e0874efb405d1ab737ce44e591270b252ac SHA512 bb0dba3f8b1b36c3bdb05bef8818bbcfc0043661babfd5aae00b792cb42e0a508cb6b6dc7fc1c6fb2e7f279c7727fd5a4096029d995f0a4fd8af9aed8f83ac6b
 EBUILD cramjam-2.8.4_rc3.ebuild 4115 BLAKE2B 03f6168c9589cbe73ff2d1ad7580744f3a9862c25c4f03cbb31c915ea9a777e3c4a3f2b26fffb3cd12fd1878da48335d05cecba390a756cb813d115aca8785ef SHA512 df7e3adf967ff1c86e600abf2c9e776e23ec90d2fe021d1c3da34a178f0643f0a0bdfcb6e4b4cf92cae1bcb8800bd3fc2a5c5d8807384999d5d3386b7cad6c55
 EBUILD cramjam-2.9.0_rc1-r1.ebuild 4502 BLAKE2B d9e3825d4780613a8b0a93c711cd0e07e51bfca119e64c50b6029fa119edacc5eb0c3c16ec74f9215d5eb922043b4ead78f8c6cc08c94db06ac09e699f149115 SHA512 59aa50bf91b9da05c50f65ebf9ec745d8a854e62556f2eb05987237b35221da3ba169c673ca04162823741bd9a2d8fabe7e930b9c96ed6bbf168c6ebe09b1f50
 EBUILD cramjam-2.9.0_rc1.ebuild 4554 BLAKE2B 9a90bef43c0143a0c6af69764e2a0dc0a0574e119500435858a5b20e07aee45ef77661f37875e852d285603cc0073d3ca1aea278d5472e0f95e0359ce44f49a8 SHA512 2be51ef64187332c0ef5940532c8e52958b318ff35602ad83527242b996fc9afe2758cd8d4d88b9a75b991fa930603e93ea76148281a757e263aa97068c21a9a
diff --git a/dev-python/cramjam/cramjam-2.8.4.ebuild b/dev-python/cramjam/cramjam-2.8.4.ebuild
index e2c64e49b829..800415fe85a3 100644
--- a/dev-python/cramjam/cramjam-2.8.4.ebuild
+++ b/dev-python/cramjam/cramjam-2.8.4.ebuild
@@ -131,7 +131,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	app-arch/bzip2:=
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 07d522160568..ccb44b2fba3a 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj_database_url-2.2.0.tar.gz 10874 BLAKE2B 71bf484ba339edf9dc304085d433ae29b1efae6fe856152173989411cfffdb52297f7613b6f9337972cc8563494be4a94919055a0b7a84a0b066d64d5fe60d59 SHA512 17c26dc07e309ba448976fafdbd3bdc74cc2f5f7022fb1f041494f2555b8a77b9fc602c1f11602da5b8574487ca997e7b71d7859dd08875b2295ae08262c39bc
-EBUILD dj-database-url-2.2.0.ebuild 673 BLAKE2B eafad0082c9b8f0cbb689d85fd285aea53dffc23409a46949dbef326a92bf92a7425dd983608623265007b2ba9c58f465ea67e0a1018286fca65ff71ec6cb3c7 SHA512 b7db188c655768785db83fae17a66a874e839f7bb32b02edbae1f441c18f60a189b6951ad6f297ddd9eb5307a069f0255b7be511178fb9fac55dca35edbdff99
+EBUILD dj-database-url-2.2.0.ebuild 672 BLAKE2B db1a838ba1bd5145dbc06d05bbe477fe975a9ba86de2c23758f126c61c434d6874d7de76add1290bc166b1ccec5ef71019ec88294536db7b57081cb2726774fc SHA512 0f82e9bfdb1d202de011c5006b23f4a0ad7b3a243f6e970b8796c0a941a55f0e2e821e80d4ea951d98ded2636280843ec7f3f50bf05fe308c5748d5fd10fdc4b
 MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
index 44baaf4a04ce..1a9da86ea7eb 100644
--- a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index d508c4745601..e99fe2d6b9de 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.6.gh.tar.gz 15944 BLAKE2B d10a428cca05e93129be9acb4947c534cd897a39995f8224b17017405942defc977c19457b69b07be9518b203fbe50c6302da5ef089cd54301fe3ee46c091f90 SHA512 f41f4c7cb6c2ce9ff99d9dd4d5676fcd3d82814a929fe4c64c52409ec1b12fc87e657fcb39d40d7ec24fef8fed633418ef7d7537563f753532e1348290672faa
-EBUILD dj-email-url-1.0.6.ebuild 656 BLAKE2B 2218b2a5ba09fe508d46ece62b6f9d00a9659bfc3b319848c44d9a9458ced5e35f938ff620b1c599f55f81bea10533b205a7a24ae509f0368ccea92e3b62d2d2 SHA512 b0f718bde64e341fddc2f3d41a0fa27f24f6f5a85a6e40161ac89b5358696376abb36e0c956a9568b17bcb7c15b71ac78eda3c5e99f73a0695b399c923bef99b
+EBUILD dj-email-url-1.0.6.ebuild 655 BLAKE2B db15cbbe749a744100b1e9187a361e4e8cf80ad4ae59c9d353f5b533bf920baf3a6cd9e074c86fd8865c4dfe9252431867959d503af98675bd8039bc05fc38ee SHA512 6175bc4be3038569560a124271c7eb21b67718c62a1f004d729c88a4db5553bddb949f1ead27f9a0ac35b31fc8545f0119bf395def00629f93e135cc7ab36d6b
 MISC metadata.xml 408 BLAKE2B 13c4c985a274eb0e762a0b20976081102ff640bf9b69f6ee54639476236aea5ba08696d17cce07835c7c3bc989d8474c051e6c3d24eb78aff29c8b43b5fa6b60 SHA512 73288f6d7e447be7c42dc5014a48bdf57755e9e38ccb165a33e535463468cdef0fd55f6bc7994add0e58a624881dc73594e6cf495bbf190a7cc0c1ab18678d12
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 2158d12db266..b5a4d4a69ba3 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="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 4ccc7248544d..3f3ac5f90850 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1-r1.ebuild 492 BLAKE2B eea0c768e65097ad41313a6b2555ff57ec286efb237d87933d70763a77de22094641beae4db89b99429728a7eeb5c91f23e61ff1fd44c46784e6a67f7607085b SHA512 5d642a24b43b61ef7bee216ec66835b4e48af95f1ade704593eff0aa2bdfa84b3ddbddf214c5534c919f61cd27c918d223eee7cb789f22c095e203e8f86c7809
+EBUILD dj-search-url-0.1-r1.ebuild 491 BLAKE2B a9b6d34f65c7cf2a8e434c056d474b772095453ea198d686654a414d38b5a340b9a97408db145846fd8fd4fe3a9a4ebc63e91702cfaa5f76a1c8f2275114d24b SHA512 2b912284e34d0d71a7258cdd854c453af9ae8e230bb706aba99359140c17d07030879312bcf98fdd01ce975923ffc7d93f2d49407758b525538b3750c9124e5b
 MISC metadata.xml 380 BLAKE2B 7a9b7eca520f86c5a047286b9556513d719043b71f58266ae247e0477fdf01c7a11db14acd3a8769763f0044fb4aac14c1d6c542a3a1e64a4e26d8101a4ef823 SHA512 987cebd87fff24b8900502450523c6218b7d7c10a48ccbbb1b36fce6adc404d8d865503c10b2dbfc9872deeaf5ab1583db79034d091ddb08575c44baedfdea19
diff --git a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
index 5652ec0da182..8790c5d51d10 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
@@ -17,4 +17,4 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index dd9025782b2b..197841480d1a 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,3 @@
 DIST django-cache-url-3.4.5.gh.tar.gz 8761 BLAKE2B 44cfa956f33848dd7947a97b390ba792d44eb1fd42b4c33ae57e3575405c40d93be4716c9b990e20a482b4398ed69ff838993e30ae0bdecb5a33c3fd7685a6e6 SHA512 532f47f6c8d8150d3ec484e533b165430ee6fd9854ed1b0404b68f8acaf388bfa2fb9beba8349d56e1e9d00dd65065425fdbeeed5eb698d9a745f8293f8d93ee
-EBUILD django-cache-url-3.4.5.ebuild 790 BLAKE2B b6ec1921ae1b350b528ac5a9e65dc5de8b31bc8773c7764c0f5b940cfcae1b08f11ef7fb60faa5317fa6aa78df803dc616e2511b044da7b84ad8f327637ea74b SHA512 402eba601f6eba257944655a8b4bfcc7261ea8f293c9b7a00eab3b4800713668146772ee96257552eb00ac6900f0ca4645ea822c923add7cf572b2d884466b5b
+EBUILD django-cache-url-3.4.5.ebuild 789 BLAKE2B cbfb4836445f2399b84198b52f1448f12652079f3f17b28aca538a418ce250c1115471de16582e159265e40e4698edd6fe599261fca2363f1d18de24473d4d69 SHA512 1841dca9d974c4123e01ae484070e0a033f32a70a32e0d542e960368cdf053da0b869034bf1247174d16cb3a9073f1cf93039bd90ac620120204367988a1f3fd
 MISC metadata.xml 515 BLAKE2B 0933720797d254031a1a8b134cbede61196f6f6bba8e09decb144c0db328e42faab7cbd3015dcc682711ce45cfe3466fb4c4ffa65bb18305be06937460e61822 SHA512 d6be30d34de3601f3c364094d23a3d322e3fed2f3badf28f132cc6464996bf7bda32cf970b397997554649232d72af747ebc1d4f4815397a6a32e2008438d18f
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
index b2c49b580ce7..ea69b1ae5624 100644
--- a/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.4.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index c8416ebde1ba..51bc73665c70 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,4 +1,4 @@
 AUX django-configurations-2.5.1-test.patch 503 BLAKE2B dc4cd0f5bb5b31006ba3ef59043733361ccf861988ae3a66e3eab16e7e6a65648868ca21208fa100fabe1d52afcb207e107a1ac7cf814122420a1c00e71dd215 SHA512 0054795af026a7b0e3047d880540a7c2431c56f65222594efb97ac30e7522bec4d2f9cd3d48006f698ce2c4481f323ca9ee5160c153fe866d2bbe567798cc73e
 DIST django-configurations-2.5.1.tar.gz 43225 BLAKE2B 1b9cd14ea50d03500cc05790e831832f6e4e3a917903eb48aa40c2d2dd46a59684ce82b484229fd912a18bcdef4d1887989489b4ab461740f981a87c3a7914f5 SHA512 5584446a1b48a0c080401b377786864a905a28337e2912c71ba586ad438df6efeb74c2de1058b77d79f3ba7db85dd443f05dc81013576d301a43bad6736e72e2
-EBUILD django-configurations-2.5.1.ebuild 1265 BLAKE2B 3ccd53a0ad37f0e835e425e55ec43373e4f6c109d678d1a0c5f307dac8fa8bf4e52dd9629a8bd2e8f92381f2d2c7f58e62d4022ef13378a08daad761f6356dc2 SHA512 b24a814941a38d552060dcd0ce5afd8665201815d8b9660c06b862267f5c05e37042931672bc729d571c398910e76899e77cfb931c1cd6ae4c615c8dde69125c
+EBUILD django-configurations-2.5.1.ebuild 1264 BLAKE2B a7d9b1e48662566d21cfa4e3adbb509473e2b5997f8816f28e3e49ae649e6d566b926c8009064081f521938786bd32b150b9c9f1c164ed4215b5d8afb9106479 SHA512 7fb077f33d5920965b5861ed496c0a66b93e35f06834216b1571e410e8bbfd9654ee0f07d4e3bb2b1c89d8ea2b76323166230518294ab156f3ece7cb4bed9aa1
 MISC metadata.xml 397 BLAKE2B 704a6d38af3df4b99f24a394dce870ce4f3e1e16c2a30b87ab25ab4b3603451651db062d2aca6669b410bf5350b0edc7b4848ef55bc60c69edc3aedeb8a7c0fc SHA512 a37389a326e763452c7ea138da3eb33dad53bbce24fbd9229e58020063d4e726e68e482500c87238bc0c53b9ee335f93f2d89f39e7ce3e2a087175a2393c66e4
diff --git a/dev-python/django-configurations/django-configurations-2.5.1.ebuild b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
index f49240d83fae..8a54344bdfea 100644
--- a/dev-python/django-configurations/django-configurations-2.5.1.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.5.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8f81f39ed3e8..2be0a79424eb 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,7 +12,7 @@ DIST Django-5.1.2.tar.gz 10711674 BLAKE2B f2020899c59a65aac74800db0f96bf93a10d01
 DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3
 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b
 EBUILD django-4.2.16.ebuild 2937 BLAKE2B 8eb01973edeb43f968efbce8c905682962ee846c6619b72fb95065f094788c77af5b7b310fb18149ee427d88a87cb3efe516b052abefca168576cf67f790cc72 SHA512 3b852ed8ea22dea59632cb0116a59d8afa1e6bff4aff96a76df150f7c0a5a58e05004c5c4b306f5e172459b0af7fe257008fdda2cc91222ceda1d8a285737796
-EBUILD django-5.0.9.ebuild 3096 BLAKE2B 37f18e57d151a2207090779b67eaf12d2fa4d4303592a7ddf5cdbb04e1b06b42e7ecc4e216c839914618db8665f1f4f9da77561e99a7f03d40e2d8d5d9ca4f30 SHA512 fe3a1531da5d35ac643402b7d864681e7ffc1dcb6eab4f4cad6604208669738e20662f30f8907503a573ea1c84eef3dc8be93f8b9745aedca9aa8e252e9a9834
+EBUILD django-5.0.9.ebuild 3095 BLAKE2B c5b806d9d776e5b1ee15bdccb006996e8ea435d1f6234b7992bea3758a2aecf703269fe7b87a5f8ac569172849ec86c7873b6625b33f4f7883e4b2ab58265e90 SHA512 e30c201e54738639bdb5da312e7986691ba7bdd4479663986e247afd4e7a3c4c56faea9963ba02b315c8fe4c01ed193821762bb8c3c1201ed07e82c74983faa8
 EBUILD django-5.1.1.ebuild 2845 BLAKE2B b2b4792b0f07bcb69194c2a1314590557effe9edc9ab9f5a79e31e583811924c17923d717490232ebb3efd790cc0be3b17c2221769d2b697a9dcab7a8d11dcae SHA512 7a8503af32b7a8a334b5f28c399565e4feed014fdd03a126232698a52a499c7f316ac62dc36b13f33d46c3ccd9f05cc13132653f98739e292de0aabaa2801a6d
 EBUILD django-5.1.2.ebuild 2851 BLAKE2B 34d5ee39eebd55a8c2254d7cae0de19e6814cf63f598c5f493eaa1eab004a3db3a66c7b73ea19c93fec87b9ec7bbb6fde0064709e8414be9e523dc0928b7e85d SHA512 0767e301f37315279dae44150f5acca43b0aeeb81f0ca160db79b4e6e4a1339f5237792a1b2d6623cad360cb5e18bf53f4ce67e87f6827d51956ffd8c93bf7e2
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-5.0.9.ebuild b/dev-python/django/django-5.0.9.ebuild
index 29fcd562b6c8..d557d9aec904 100644
--- a/dev-python/django/django-5.0.9.ebuild
+++ b/dev-python/django/django-5.0.9.ebuild
@@ -28,7 +28,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index a9354a4ce25c..d5e4bab9ad0d 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,5 @@
-DIST emoji-2.12.1.gh.tar.gz 503707 BLAKE2B 75d81d99cbb5c89b3f63ccee57f20e13cae4b3d1bda5257c2f5382a6595d62c1159ecd51862b96ff6a5d9c920dfece6346d1ed36c2a6567d7c50eed69c5ac373 SHA512 98c1ecf986c7623122c9d101c82f7667d30b58b6e45c834f2644bae1659c67755dd9a4f025111b74508267861ad155131d4aefb8f951566f6950e64e7d3a3d24
 DIST emoji-2.13.2.gh.tar.gz 631138 BLAKE2B 8a4c1c98b2053623a10b71bd0a5a41e10687917e2120107c5e01ec75125a11b4f07dd0457186cb20b53c841e2bb04168f5ccef7577afcae474349072dec9ed48 SHA512 2d2962de896986f1f3ecab9d9e56e2aa5b47062214699285ca5e83ecd10b0c1ce3158ed4e1a6e3976c4f905ae207d351f67b4ff59bde279b5c85895610116bf6
 DIST emoji-2.14.0.gh.tar.gz 664189 BLAKE2B 1bde169cfb1d82d86cc2a5720036fdc44e2009880c21756bc48588f0e6b8e34a512309b0b01899717c49fc9dd6800344e182386e72d0824f120012a29941d8c2 SHA512 6e91a67702b42e246003feca13b24794faf55cbcbcc06c66ed7671f0407cf68ac66f8b076655b550c5b5ed7835d1c13ba680128fea8a656721780eac2fd9ea46
-EBUILD emoji-2.12.1.ebuild 571 BLAKE2B 2813f58dd6006a142f947b556016ba24ec2fec3bbe94691bde74138d30532e96489ef22c949e5d577688c2efcbee6f430098e38db8a099342285603ddb71b202 SHA512 2e98af89266eed7eee269d94714dd1359cca126c2517ee66cda3ea8224f5ca2aa94ac1df4cc58fcadb9c9a290c1517749e64e470a94cae8ab5abfc90dd745612
-EBUILD emoji-2.13.2.ebuild 504 BLAKE2B 155147625240b917471929bfd4184d73fd35e7ed92cc9930e8c1ca9fec7781fae7c7bd728d54c99ad8f9336b304c3b44ac8b6a8c091a4f04b5224ad2ee5ab2cf SHA512 1c9ccb5855952eff9462e559092aa4df473adf2ca473163fc80a98b14b748ded27363cab4ff3deca54e5feb2de776e8dffed785378de6bcc4c7840f134db1940
+EBUILD emoji-2.13.2.ebuild 502 BLAKE2B 73b4ade81f687638590a7b35eb45a40b488d08e57baa31d68523565375e850b62fe4dcb32affaba6262b7e98e782f5c665fedafc4b6eea8bab47e9d1dcdb8189 SHA512 7e8186fd99145b5fd110f7560726eabf0930e145bef07ea5c6a142e736bcdde46de56daf9547fb2e79eb76906b552fe668061d03c3f23dc0e3481791f8bb0085
 EBUILD emoji-2.14.0.ebuild 504 BLAKE2B 155147625240b917471929bfd4184d73fd35e7ed92cc9930e8c1ca9fec7781fae7c7bd728d54c99ad8f9336b304c3b44ac8b6a8c091a4f04b5224ad2ee5ab2cf SHA512 1c9ccb5855952eff9462e559092aa4df473adf2ca473163fc80a98b14b748ded27363cab4ff3deca54e5feb2de776e8dffed785378de6bcc4c7840f134db1940
 MISC metadata.xml 497 BLAKE2B 9aed8cad26be7f372b19349aeae8e7916b75444e32f0d60e589ae27fb324d0cbab86cfb827ce6cfd1f9002338a7bed44f7ed297e64199af0a00c6d5e07fa992b SHA512 e938bbe18a83243acc1d2614100282b913115fa7f91ad30f05833fbe73f711ef80b14e974c8c0e0c03454c216145e8f7d10c4a952a609486a3da95cf72756208
diff --git a/dev-python/emoji/emoji-2.12.1.ebuild b/dev-python/emoji/emoji-2.12.1.ebuild
deleted file mode 100644
index 7589d0f60c88..000000000000
--- a/dev-python/emoji/emoji-2.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="
-	https://github.com/carpedm20/emoji/
-	https://pypi.org/project/emoji/
-"
-SRC_URI="
-	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-2.13.2.ebuild b/dev-python/emoji/emoji-2.13.2.ebuild
index 64f8c79c701c..fcfa79db4a02 100644
--- a/dev-python/emoji/emoji-2.13.2.ebuild
+++ b/dev-python/emoji/emoji-2.13.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 7ad9b7ca2df6..3c2b9703f140 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -2,6 +2,6 @@ DIST setuptools-73.0.1-py3-none-any.whl 2346588 BLAKE2B 74c84539d1c3592aca5678ec
 DIST setuptools-74.1.3-py3-none-any.whl 1262070 BLAKE2B 967e581556dee96b068a762605e340a7dbdb7eedb62fc2224fa3cbff8c29c6dd8966831bf4d2c4714401c8beca6ff81ba64823ec55ce592ff3bf10ddee370975 SHA512 8dd7f782ccbfcef04462904f3211569a2ca0be7f370a75cd1d77b77c1f38fcfbea8fd401646bbf436c093ad4573e32f0a0eef030644df48817fde43ae59ce0aa
 DIST setuptools-75.1.0-py3-none-any.whl 1248506 BLAKE2B b26751d6594b8772d269d7e6cf299002eb7e8609e9048136c3d00aca1dff05b5dc89f6170deab337891f26a1d5d6ff585319f7767f2f93f3ccbb5af7e76cb608 SHA512 952385f4185068fd01b54c496686e4d03bc3f8674eba7fca909c2df0e674706bc8a1607cf0684c8a0202921a0c5c939a6a305068cade00b5af78c82ad7949712
 EBUILD ensurepip-setuptools-73.0.1.ebuild 604 BLAKE2B a767b5faff2b0e321d03bb9ede76a11655067f25ee0358e7b7628468c755c8b2bdbfa8d8811d88cb3f724e08725dfe58f7283cb74dfbd51c5a8e6087955bf809 SHA512 e75c3a5b0f13197157cf3d81ded126c889085ca65921ce4b0b05f9dd3780b795977627689a85f1cba8b6dcdd78b550041da39551dcb18309e4189e5716526816
-EBUILD ensurepip-setuptools-74.1.3.ebuild 612 BLAKE2B 1cc5e3edaf72885561b47a30db86d88fb25f0a0dc11d0461e346841fb2de9ded656c54003f8867da984a035556595015dea95eee6b2e6dd0e2bbd604ce0c81f2 SHA512 fdb3240d48a5642517ced7a777dd023643ca559568559347870e78db49e8fde54e61cffb8124980ab935f3f7358bf9f576d109c150f1e0eefce758dd85772c75
+EBUILD ensurepip-setuptools-74.1.3.ebuild 604 BLAKE2B a767b5faff2b0e321d03bb9ede76a11655067f25ee0358e7b7628468c755c8b2bdbfa8d8811d88cb3f724e08725dfe58f7283cb74dfbd51c5a8e6087955bf809 SHA512 e75c3a5b0f13197157cf3d81ded126c889085ca65921ce4b0b05f9dd3780b795977627689a85f1cba8b6dcdd78b550041da39551dcb18309e4189e5716526816
 EBUILD ensurepip-setuptools-75.1.0.ebuild 612 BLAKE2B 1cc5e3edaf72885561b47a30db86d88fb25f0a0dc11d0461e346841fb2de9ded656c54003f8867da984a035556595015dea95eee6b2e6dd0e2bbd604ce0c81f2 SHA512 fdb3240d48a5642517ced7a777dd023643ca559568559347870e78db49e8fde54e61cffb8124980ab935f3f7358bf9f576d109c150f1e0eefce758dd85772c75
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
index c48c6a133f1f..894ea82f77e4 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 7223ee2c75af..4757e7f13142 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -5,5 +5,5 @@ DIST fonttools-4.54.1.gh.tar.gz 3863311 BLAKE2B 879edb1d5639b2d5a40d10531209504b
 EBUILD fonttools-4.53.0.ebuild 2479 BLAKE2B 9cbce6c2b99c4262ed0d2b1ba4276f5dd8c50dd75488a3bab3c9bd289dd4af9ccd5a74d257087dda0980cce01c16844c7dccf9ddf9845d5ba77417f1a991abc0 SHA512 7f9bd6c171d50b586b40dfc1c78411ebeeeff362cddb2375357ec86d6f2709676a118ca774cd89210067fb5dfe5aab9e14a44415afc4b093b7f68ac7f6d9bce0
 EBUILD fonttools-4.53.1.ebuild 2480 BLAKE2B 4b717209b380796d2c21d0bef0f246419bd51565de86cbeef0f78eee1834aff35181e6cf21baee526e3dbee547d2abe5bdd54643cdaa710956ed65ecf699e8b0 SHA512 55ff7f044d322d1ef0ee86725f9f380622a85172d0a666b0ab1568520082089b251ff95e25e7bbdffd7f37e2f5c7c70429e3e515215d697e4c1ba7372f80a164
 EBUILD fonttools-4.54.0.ebuild 2487 BLAKE2B 605d0a950444383dcdf3a1e98cc83298780f861f2b86d8547b00584e917f216f8f996d26f1245a5a632df553b41e5e743605ecc3eeb57af0b4560aca90f1f94d SHA512 7850c1e063395fe234a03d714fff1e130b4ba57019d6c04776414e375146768eff3023b870fee7a30f53efb8abe47442cfe5a8b46db4c33e95c4bf19a69e29ed
-EBUILD fonttools-4.54.1.ebuild 2487 BLAKE2B 605d0a950444383dcdf3a1e98cc83298780f861f2b86d8547b00584e917f216f8f996d26f1245a5a632df553b41e5e743605ecc3eeb57af0b4560aca90f1f94d SHA512 7850c1e063395fe234a03d714fff1e130b4ba57019d6c04776414e375146768eff3023b870fee7a30f53efb8abe47442cfe5a8b46db4c33e95c4bf19a69e29ed
+EBUILD fonttools-4.54.1.ebuild 2482 BLAKE2B 6bfd69d61fb4d71c8f8084c739a818855ee54be9a5ddb5079d82219a61afb1ed2321461e6ffe3da176c8fa4484dc521d4c2ef22074fa9e668e22e255f8e9e80d SHA512 77966684d12151887cdb562abbdc53b8ba97f95d6fd2ff11d98c5c9aba73caf4a09da40c9412cf6ac0b9c8061a02eb56aac9ddd8d38a3326860a51c298f3afa7
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.54.1.ebuild b/dev-python/fonttools/fonttools-4.54.1.ebuild
index 80efba1ec9e3..a3fbb21f5fa2 100644
--- a/dev-python/fonttools/fonttools-4.54.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.54.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index ff5935b4bfe4..c0dbae4f3bfb 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,7 @@
-DIST google_api_python_client-2.146.0.tar.gz 11690645 BLAKE2B 850f8b5b383ab8485b4b8aef77e94a18971498b51e1689aa707997931ba908e97e590681900beec42fc0f50adcbe8488657fbf0be0d8d5c6a55dc424a49ed86c SHA512 5789e69f1d279f8e53d40348af770aa03738853ebf19cfd4e50f23dca3412ca7d360993e4e00c4f0e654c65b3dbddfc2ffca069ebb26cc13b674bd622e90ae2a
 DIST google_api_python_client-2.147.0.tar.gz 11729279 BLAKE2B 319442376870b780cf9c42e6e9c7d25f5f2b4b1ecda33f3179773cb18c9c447748528e575dfd122cb5153870c7fc26900e092d24a9362deacb905fc6fa740205 SHA512 5a4abdfbaebfeee4c2ded84f19e1f5b4f888179964e76b7cc88c75b7dbe75c735d0a024f068a5fa8f0994b56671c94c60d9bd81648c123309e1c1087329b1a2f
 DIST google_api_python_client-2.148.0.tar.gz 11762466 BLAKE2B b075c0379896460e0550dfee3fdc015f1a31dc3e30387a5c5e231c6f4b7ec3b922e0e4f6ad56da4c37773a03e791725679f8e29e200c4c9b08321d8dd39186e6 SHA512 3dcad3530a46095979fcdbbffa97a74e48d2fc4cff35863c65f6d0994a7e92ad884f533f41ce3744fdcb4a5fe5fd61ba04eabeeb40e9dd7a826ac9c4ccdb8a60
 DIST google_api_python_client-2.149.0.tar.gz 11791789 BLAKE2B b4397d1e0a6b064b9c7aa7b4ada816a76871de089776f6aab4cc1f962171a427ecd1e4c1ba9e43455becaddd31cfa50082aa498a1443d2116f0acb678d221549 SHA512 3602a9d5f9fd5e00605a2b12114a81770662ac1ad168c65160d6c64340d8ea3f3da2765a5cc5959ef09f5b72725baa493a0686d976e3d22add49bb86b21626e7
-EBUILD google-api-python-client-2.146.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
-EBUILD google-api-python-client-2.147.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
+EBUILD google-api-python-client-2.147.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
 EBUILD google-api-python-client-2.148.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 EBUILD google-api-python-client-2.149.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild
deleted file mode 100644
index 56cf84636d29..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
index 58a0eb467bad..56cf84636d29 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index e4341a949110..a61ee7f2ef59 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -2,5 +2,5 @@ AUX greenlet-3.0.3-py313.patch 8632 BLAKE2B 74d1119fdadd1f08a9a0e60398033be9e537
 DIST greenlet-3.0.3.tar.gz 182013 BLAKE2B 34ba9f13dd01f5bacedb69952b4d3d08e55eba82d94c5d95cf8bfeb0f1ce94dbde9d62f5e56c33cbf2467d82f6ffd8d05a37048d0292102b1dbb68c67e9398f4 SHA512 20d8818376a200332cbc2c85968317ddf828d2adf3fcc3c53623cd1504ec9a4e4e987e841bd2fe65e934e2b8a5e73a7205847526f0bd196e7afcdf3ae40e9d9b
 DIST greenlet-3.1.1.tar.gz 186022 BLAKE2B 1d73f63d3bf881534bd64eca6510f32d1596261bd42176d396c7a0442494c73f8b03e57621bd11fc1bc67db550514c26a94926eaba8c53e08eecb3f999c9ba16 SHA512 915a6e22c20b235de472c61c7bc4cb60a08b79e29127c4fb817c362cee37f589bc362f12ed31bdc7dda91f49976d4e2784c8d13202bf598156a0aacacdb7f6fb
 EBUILD greenlet-3.0.3-r1.ebuild 1284 BLAKE2B c66f36eb0edbdd736aa22a678493c72c1b94ce5c7abf1dc30120d3ecd802eff1b06baec7bb83d434c2399c883f7c11dbb7cac39c34e77b95aca71a081d2ca473 SHA512 181257056ea9968a33d4332122886afdb53fbb0ecf4f6907e17f47b1c55a882ac8c22692fa54b3f7596b9764e72313428a6ad431a1317a00a8fc9e27afd1ffd1
-EBUILD greenlet-3.1.1.ebuild 1179 BLAKE2B a662b215fd4b8fb77d33dde0fd76bc48745bd01cee7725b61c96598f3725d3de3777451856f42f272e005f7666efc361fd85f77e9df5efc5e1c67b19316e390d SHA512 aeb9e1f3ded799bc0a296ac426c371dc10345bd09d8713a98e554a35fed7b89ad2c386aa2c7a5a2bc82c5499a7bf42f60f6d116ad544d3c005fc2d52bcc092a6
+EBUILD greenlet-3.1.1.ebuild 1174 BLAKE2B db2cdf3f73c44ad464d02caf5eeda9b761b40d449cd4ec9d8ec883e410fdd296af8f90b279faeeab667336fc367ee27a45b3118517d381811af3f65c2dcada97 SHA512 ca93c6e9da6ed9ddf7ceda5bfa3d79b3500f183be108fb207cec0d89d79fe04d8726f77093f53d3095a37e07addb4184a5f081ecbe703b47e4eba990cd6644b1
 MISC metadata.xml 388 BLAKE2B db0aba92c5c405fa5736f97c2db14319514e95296ad11aa9aac26e95bdb630961e2ae430cbfcdf2b72425c805b83556f3dda6983dde075be3cb0a3f7d0a45e8f SHA512 3b9003e181f15b46ddd5af3e4a6012f115ca42be0bf2f4e40c0fbb196231de8a5b1320d402de6d4105f61d7e4fd5d868131404796cea19a7547a53ee17c26ce1
diff --git a/dev-python/greenlet/greenlet-3.1.1.ebuild b/dev-python/greenlet/greenlet-3.1.1.ebuild
index 4d6eaeb489ce..805bbb305ceb 100644
--- a/dev-python/greenlet/greenlet-3.1.1.ebuild
+++ b/dev-python/greenlet/greenlet-3.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index e3610beeb8d3..4d64d4c07720 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,7 +1,5 @@
-DIST griffe-1.3.0.gh.tar.gz 383337 BLAKE2B e1908e68f812b9227f4ba7249a8f20ae1d75cac3237ca90c5f47adb51a8d0efcd31b016f30f9f9e0af2a2292b86cf5fb08d9314e72ca4282bd36cafce19030ac SHA512 839d0bb8fc36f5552d50721f72905d533849d9b7258ba1ed1eabc783dddc4aee87ea612605bd23268f4282c06e71e010e76dfebce0951ef92917abc80211e7d1
-DIST griffe-1.3.1.gh.tar.gz 383076 BLAKE2B e7bc85daa49531c17215ce64209db89c3e4c12fe7b20a7ba004ee696c1fa0307a1753c7663d455ac6562b226c6526725750c0b25c2e148af468431d1a38d8aad SHA512 45d44cc81ca3e108127470271f058dcfaa80702ed4e5d2610a9b4f6bb5e1e16052c9ae5c6a5b396b1cc8d6002b9cf3531cae611b15e7d54b1096d74b4bf04976
 DIST griffe-1.3.2.gh.tar.gz 383330 BLAKE2B ce96d0ce14dec7a48172758cb08331e07b36c436f953061aee375fbb7c4ad7fa01050b6a15335dae44d292c90ea5724c85abda9b4f8dd231e979ca1b8d2faa38 SHA512 098f78f95e89d22738ef5b8b6e91fffd7f0c48705492081aee0c072d2ac409f88bb7698ffbcbbfa9cd7627d081c441a8eafba3d261a81dba02a92e04ac80d7c0
-EBUILD griffe-1.3.0.ebuild 1096 BLAKE2B 3886294c47b5384a087a051da90cc310016714bb7a47c27c1b5f0b4084212f1b6571648c1bc99c735c09424c98b2b298bf85e59fbcafcd1855ade5ba6cb1dd66 SHA512 7f1c9c445dff41dfcaf59ecc1badc863fe2eff1c11d5d8f8ef2f0522bf8181936297f55dda47d054eec6b54af61ee1d6c5e0aba814a532dccb6c2d0a3af246ce
-EBUILD griffe-1.3.1.ebuild 1096 BLAKE2B 3886294c47b5384a087a051da90cc310016714bb7a47c27c1b5f0b4084212f1b6571648c1bc99c735c09424c98b2b298bf85e59fbcafcd1855ade5ba6cb1dd66 SHA512 7f1c9c445dff41dfcaf59ecc1badc863fe2eff1c11d5d8f8ef2f0522bf8181936297f55dda47d054eec6b54af61ee1d6c5e0aba814a532dccb6c2d0a3af246ce
+DIST griffe-1.4.1.gh.tar.gz 383674 BLAKE2B d85a7c7dcc1406d361bd13b7a356b79d02d00d3bf24bb21a4f279b537d1001263b61af959ad27be50422d4cf56d5b75db79150b6d9bebfc4191217b2b9e4b09b SHA512 cb6c498daa6bce724c1cfd008e3b6c5c17ada8027a9cee58705a64739b7d049773d13fe08c7519777cb0c4870619d2b51426c2cad1d87404c6487ac10a60d703
 EBUILD griffe-1.3.2.ebuild 1096 BLAKE2B 3886294c47b5384a087a051da90cc310016714bb7a47c27c1b5f0b4084212f1b6571648c1bc99c735c09424c98b2b298bf85e59fbcafcd1855ade5ba6cb1dd66 SHA512 7f1c9c445dff41dfcaf59ecc1badc863fe2eff1c11d5d8f8ef2f0522bf8181936297f55dda47d054eec6b54af61ee1d6c5e0aba814a532dccb6c2d0a3af246ce
+EBUILD griffe-1.4.1.ebuild 1096 BLAKE2B 3886294c47b5384a087a051da90cc310016714bb7a47c27c1b5f0b4084212f1b6571648c1bc99c735c09424c98b2b298bf85e59fbcafcd1855ade5ba6cb1dd66 SHA512 7f1c9c445dff41dfcaf59ecc1badc863fe2eff1c11d5d8f8ef2f0522bf8181936297f55dda47d054eec6b54af61ee1d6c5e0aba814a532dccb6c2d0a3af246ce
 MISC metadata.xml 393 BLAKE2B f207ed2887879f849db9133aac5b82d507a5c6fc3fed0b931dd0aec5ec8d48991731a15825c7b51d82f1f148c2f6818e3102e963d3342aa248bd475d4b29a692 SHA512 b541674c9f9bf9e356d46de91673e384f50ade9b6f19b0218f03b6e307dde88df2d0078f202bc0a77e18b0d91e89cb6d36ffdac23689ef35306167619404dc01
diff --git a/dev-python/griffe/griffe-1.3.1.ebuild b/dev-python/griffe/griffe-1.3.1.ebuild
deleted file mode 100644
index b3ab8d048238..000000000000
--- a/dev-python/griffe/griffe-1.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Signature generator for Python programs"
-HOMEPAGE="
-	https://mkdocstrings.github.io/griffe/
-	https://github.com/mkdocstrings/griffe/
-	https://pypi.org/project/griffe/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-1.3.0.ebuild b/dev-python/griffe/griffe-1.4.1.ebuild
index b3ab8d048238..b3ab8d048238 100644
--- a/dev-python/griffe/griffe-1.3.0.ebuild
+++ b/dev-python/griffe/griffe-1.4.1.ebuild
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index dc364f97972d..61e24ed32fc8 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,6 +1,3 @@
-DIST h5py-3.10.0-cython3.patch.xz 3868 BLAKE2B 3c0d952bdca5307ebf0bf878c26b94d0593bb89ac538a51017fb94e1e488bffc1583dcf4e713005b87d1b5e20d7b73043b24d65404faf60fb69515e598ca2133 SHA512 a0a0e3d1a9bccad1c89aa7efe3ba1e080eb70cae1f42f8de1021c212817970eaaa7070131e8e39859eea3c18d6c1243a17e7f53f2179f34ff6c406b315bab8fa
-DIST h5py-3.11.0.tar.gz 406519 BLAKE2B a5568c96290eee1f6da965174b6fa398f94e2e1825ec4ec50efd856b37ccf2bf634cfeb32101c7c53712fe9c68b0617774e9339a3f0d9373d3df24e6763a20cf SHA512 05d99093d5e7c280779b4167bd3594488dfc348b800da95c2275ddc8d77b4208fd1353942bf8863c4859d0208e8aa8bf84e628b3c5942eb947ecdcf0a7d19e88
 DIST h5py-3.12.1.tar.gz 411457 BLAKE2B c8e2bb453b9f7f1a79b9061ec3564bd8f1175c286a163b43f340cb9fc93f0e279131e4ed658066b870237046766aaff1289f22d84ee318108c96840d257baafa SHA512 a96dc5b7a14408c73db3ef758e0d3cff5d4469d6efe19a71af69e049f434aa62f01fbf44464cc5a3d15b89f00b9864cbb42b1b1e59bf3f520b458007f8819cd3
-EBUILD h5py-3.11.0-r1.ebuild 1383 BLAKE2B 1061565c3f050996739f1b73c9a1448719c3acb49f856046b09e715c23e059d9b3967886950ce4194235efb1023d6beb4c9f301ea2c47fc1567b27efc409b9e1 SHA512 8ed6a2fc1838be40538075b1c3d3393d46165f8869d0ec5a3fb180febe59a069b640591f43b30e759d5da14b1d2eb1fbbc25601ee2cb692e4d3715b4d7a7a9de
-EBUILD h5py-3.12.1.ebuild 1332 BLAKE2B 7d0d53de0e672d25120bd09d7feda40a8b0801d7ff2454fd7082d6743f49a6ec4cc5e8d35b849bf99520716bd71c20388c5235be9f06d7d3432222ece7701b77 SHA512 955255d82375b1fe1a7c7fe5139ebae319f643821245663dd4bb8243a7221d2f038d4f026bef907c2675c6752b6041befad8fb87a35181c4d1eb0153d0306a0e
+EBUILD h5py-3.12.1.ebuild 1329 BLAKE2B 1a45ed2f1efaa34a80b63725cccfac43c57d313c913b7bf06ab2c10d6be4801fc369de3fe2e3276afaaf3a7cae961bb428c6247519429d5d258969772b218413 SHA512 3dd0801c3ddd5c6bb67548c6ae1bf7fb6780690dab486b35bd67c54b9dfa2fe46e03821f48a1a85e4d6d2137e536adc1c99b28b0b4d1ffae46d2d8a9ec448cc6
 MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
diff --git a/dev-python/h5py/h5py-3.11.0-r1.ebuild b/dev-python/h5py/h5py-3.11.0-r1.ebuild
deleted file mode 100644
index 961ca41db084..000000000000
--- a/dev-python/h5py/h5py-3.11.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-cython3.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	>=dev-python/numpy-1.17.3:=[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.10.4:=[hl(+)]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-BDEPEND="
-	>=dev-python/cython-0.29.31[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -m "not mpi"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.12.1.ebuild b/dev-python/h5py/h5py-3.12.1.ebuild
index fae61ce66d1e..cb45865861de 100644
--- a/dev-python/h5py/h5py-3.12.1.ebuild
+++ b/dev-python/h5py/h5py-3.12.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index fb43e5185e20..2bf50ce7008c 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,7 +1,5 @@
-DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
 DIST importlib_metadata-8.4.0.tar.gz 54320 BLAKE2B fc8912dd432e05c5ad82428f47b6265588d6b20c364321bea5ffb1653f2f9d6b2aff3d35b399d1d8237d328414bc77697bd4dcbd56611f39fd002779328c78b6 SHA512 97d904225f478bf9877a62e2d1a43dc88e2d9d74ac4488ddbdd2371066b08429d11e10a5a9bb484a93e86a01f13404b57e0350726c1c13c6cb1b2424970da2be
 DIST importlib_metadata-8.5.0.tar.gz 55304 BLAKE2B 801d7edaed5a42ef5c871830286e698620cd06cde43178c1ab65a5d35f6055fdd2a02b0f14bada94704a13a6708ea3091e634548e534df2df92d942c83192c3b SHA512 86ceb3ff408705565628b71a740a9e9123eee4b49e2ad029b9ee204548a78257dfefe9756194ce660939806f75983dd4b858dacd642b40fddc4188e699ef4e19
-EBUILD importlib-metadata-7.1.0.ebuild 1403 BLAKE2B c89747fef1cbd76e380e66a2c175fc6588a52951eea94de2ecfbbbc414bec302e4cf7c86fd734efb77c40746f0cbacc0ce436c68571a9ac61ebf59832b009db3 SHA512 8471231f4a14152ddf1f9a975d620c7a6376f0dabf161a40504042dc76deeaaf61377d20833fe21aef5652716514c3cfeae043be3782cafac7f06c5baf808e19
 EBUILD importlib-metadata-8.4.0.ebuild 1403 BLAKE2B dda37a3a97e13613adbe6362df8596ea43a5f98f0089c58613d6b1aa630527e86bd0ba6b192d09dff8bb1895ae80522046ceb54ffd2c2d861e522a9652887b17 SHA512 1e723e74870054c74ca72d79393f0f8e32e01e127ba4569d7ab73b2b76c17b841fb4555c9cadef9bbfdd86f7e6e38236a0cb07d3ec6c366265b2db1dd35945cd
 EBUILD importlib-metadata-8.5.0.ebuild 1410 BLAKE2B 32a9f046abc26af372b4d560ad835348a02afdf9661c93da977c9a0ade3382a32da7b95f73a230d872fc4447c689a4015930b1481f7cf43a32dafa509978ccb1 SHA512 6860eeb1f841e97bcf8eee1abfd5cee86e37cfa1fc59703083faece6bd88e8163f868d7dfe257c7667c917125788701745e99a150ab8770f6150ce3a0b1be50a
 MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild
deleted file mode 100644
index 1f6892a8bd06..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-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_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-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/jsonpath-ng/Manifest b/dev-python/jsonpath-ng/Manifest
index 41864aade300..f07669df5eb0 100644
--- a/dev-python/jsonpath-ng/Manifest
+++ b/dev-python/jsonpath-ng/Manifest
@@ -1,3 +1,5 @@
 DIST jsonpath-ng-1.6.1.tar.gz 36024 BLAKE2B ed6b47974e55c8bb5e086249c24d847dc0e1719d6912c0097bf6bcc06ad096f54b99f9c7053c088bb2efae4c612a49364cae3b061593890508e408b6776e73fb SHA512 84f4ceb3b2e76665b56df6c6cd9bf8c155d3677cc6b4798531bb35e95a591e98186c7fa756d400cbbde4c62acc7da077d0fdf989f5101846fb74bba83dd4be58
+DIST jsonpath-ng-1.7.0.tar.gz 37838 BLAKE2B fbd9a77e332eb691444f29f27de1f00f6bd68d2ba729e94940a55f13fe948d73d46f3b54dc3e1097165164aa011ee7f669ad01324031d869ca33f2da5dba5991 SHA512 91dfedeee3ff3eab7df318ca02572caeb03a70a02146e281d849c7263147269610a65d81738972c436b717cef18c3a10efe106cf013e651f7acaa5ef81d71705
 EBUILD jsonpath-ng-1.6.1.ebuild 572 BLAKE2B ee83331d2b58fb7274b3caf06ef4f623f44003ff168112bd097ad5ee17f24af555ae120dd665dfccd0b7e0c6436166d3681f510bc545aec3a4eb6c4967844748 SHA512 bedb946e5ccb534896264544f4e9965dd78c8fa497db3c3766401277691d4113b4a0e67edee37fe64cb0639a0461c7ce4b9ac7f9c3b0e2b2715843976d158cd3
+EBUILD jsonpath-ng-1.7.0.ebuild 575 BLAKE2B 30171044cdb39c97441a85ce210195dcc94ad7c60f1fac59c6286fa2ae97e6cccb6c2df4a0ff11da4c06e58df9b5a18d1c1b314c44585f834a7a19efc73858df SHA512 55ec8447a1027afd18df1d44895556f33a50c67f1b3007066229f8873a094498255d4598507050e165ef5a619a36b0fe57b8c2c7df04755a8b5bde2a850e9a5c
 MISC metadata.xml 377 BLAKE2B 773ec2b58b38244bf4925bcb99751e180092bf55a4b20b937647867a696c673592bf0bef11e2835820cad1da51783bfad76bde86200f98b0f2f1c7bac491f36e SHA512 7b0f8455e40e1db69768a1d451888c04a6805b78fbf5f0d81e4adae47539acdd3b7d4e0f33a93e81261ea7d1c5cb48fbe460d4516e3a85a86f52023270744309
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild
new file mode 100644
index 000000000000..c61083eed613
--- /dev/null
+++ b/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python JSONPath Next-Generation"
+HOMEPAGE="
+	https://github.com/h2non/jsonpath-ng/
+	https://pypi.org/project/jsonpath-ng/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/oslotest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 9395e2f3beb8..3cdba1bda775 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,3 @@
-DIST keyring-24.3.1.tar.gz 60454 BLAKE2B cb0a9b82163febbbd737f2f25353bf96cbb7b8a87c7db00523960b3fce5595c6af65bc02b7d070b0fa5a466fc53530975de8f7a44ab9a9f783d2db34b1a67901 SHA512 53f26763175c7f1de041d8805062696ef3ef6c79792cdc75ae72621da8e729ac4cbb6e76937db2a0a5ce4bc41ab92c164d62e4627f92edab8c0d0fc02ca4980e
-DIST keyring-25.3.0.tar.gz 61495 BLAKE2B 3286c2de8a2113ccdace88c44f40adfebcd42d08cdcc314a2067ea9911e63a193b68947ccce106a521cf4e54b96887db4ba06a76dece536f72af608473ec5f1a SHA512 80f3be5990f18aced25d6f75a8ca2b2033930a6bc622d44ab8732dfdf17343bfc9a19e5818dd170ce5c8a528b87f911522ed94c0237ce8fb2f39f97b6ad2ceda
-DIST keyring-25.4.0.tar.gz 62307 BLAKE2B 0f1f6f72f7d844c5a45389b3c6d78459d8c308982c4e86bb7af8e524f758a1c26ad94886eb214f6318485022ee1c46df7060a2ba9d0d0163d68077efd0e2faba SHA512 ac971ab9317866cab85b9507f2b1016c6de6f8523a4c25e866ef2b06b31bd34cffd9f8dfe51c911a0ea791c80f3f40cb3493ae3d35f1ea46f74f1763ddf2f101
 DIST keyring-25.4.1.tar.gz 62491 BLAKE2B 48a808185c336493d13c4839346984084881824fc94f6842f7eb4d4a1adddc9b38fe57449e77ddfbf9cb3637c15e31492e9283d2060e7a5960638c9569d83890 SHA512 19df186202220a234ab3d7b3bdb2b31ffc78ccc9c569841a96876048d65d1f7ac5573028f3e6cbf31b598001edf592fa02e19bd036af2f5af9baa7d746175ee7
-EBUILD keyring-24.3.1.ebuild 1125 BLAKE2B c22b69ca628616f2f9191b9b29a6dabcb46d9e24eb178183b083416a7c76107cd0eebb280900bc30a8c4da712cac31f52abf5ab73c1c21e7c269507d932a7c25 SHA512 c8e3fd67de779d3c1301ed4efa893a8fb9443bc248e8f2f5a71f95f5a461399f8fea42b5e500a2b4c1611eb536d3de8bc2f3b4b999752b769bb27149522f05a9
-EBUILD keyring-25.3.0.ebuild 1374 BLAKE2B 8b345a6c693c41ed6115c6351a026f0d276f06c307beda2393a4d5be7903284e2659294ae5fac9f5cc443b00a3c4dd8bbfa35b7015e6d6f06d1501db7212e6e5 SHA512 2ffd64123eaadda0ad6cc54c57ba2c0d8d3238df82fa800b189c85785856cc759c9c43ccf470fa001bab38f7d4cac773406c673b8d38db22c98b2439c81338c8
-EBUILD keyring-25.4.0.ebuild 1381 BLAKE2B c1eadcc27918aee3943e51ce3732e23857319828704094d4719b8f43984fc6acfc52f5210838f9cf30a6b04f8c34d7d49e1f21b661932cbdb91ecbfefa31db44 SHA512 7945695abb9dee95d4ade1433616ea3de3248a1c27dda02e9d6e8987744707577b66787693d74f9527c10fa398b4f75cb43eceb4f7705684fff5fae7997e73f8
-EBUILD keyring-25.4.1.ebuild 1381 BLAKE2B c1eadcc27918aee3943e51ce3732e23857319828704094d4719b8f43984fc6acfc52f5210838f9cf30a6b04f8c34d7d49e1f21b661932cbdb91ecbfefa31db44 SHA512 7945695abb9dee95d4ade1433616ea3de3248a1c27dda02e9d6e8987744707577b66787693d74f9527c10fa398b4f75cb43eceb4f7705684fff5fae7997e73f8
+EBUILD keyring-25.4.1.ebuild 1374 BLAKE2B 8b345a6c693c41ed6115c6351a026f0d276f06c307beda2393a4d5be7903284e2659294ae5fac9f5cc443b00a3c4dd8bbfa35b7015e6d6f06d1501db7212e6e5 SHA512 2ffd64123eaadda0ad6cc54c57ba2c0d8d3238df82fa800b189c85785856cc759c9c43ccf470fa001bab38f7d4cac773406c673b8d38db22c98b2439c81338c8
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-24.3.1.ebuild b/dev-python/keyring/keyring-24.3.1.ebuild
deleted file mode 100644
index dc123238abaa..000000000000
--- a/dev-python/keyring/keyring-24.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-25.3.0.ebuild b/dev-python/keyring/keyring-25.3.0.ebuild
deleted file mode 100644
index e6e8c540e9b9..000000000000
--- a/dev-python/keyring/keyring-25.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.4.0.ebuild b/dev-python/keyring/keyring-25.4.0.ebuild
deleted file mode 100644
index 6253b57dcaf9..000000000000
--- a/dev-python/keyring/keyring-25.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.4.1.ebuild b/dev-python/keyring/keyring-25.4.1.ebuild
index 6253b57dcaf9..e6e8c540e9b9 100644
--- a/dev-python/keyring/keyring-25.4.1.ebuild
+++ b/dev-python/keyring/keyring-25.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index db381b8caf51..f72c0426d7f6 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,5 +1,5 @@
 DIST kiwi-1.4.5.gh.tar.gz 91741 BLAKE2B cebdf8269b063d10f85a303cf5fa850f87c911aff9be37ae2b6762f021ea25b8b8cb3759e7e4292bc8c2fdbdf5d73ef6295263f541adb283969509cc11d8428a SHA512 889e106c27915cb773bc13969605812c1ca01a139e992d2b3517eb20989ae41392bfdcdd63184a7777b13eff5109d167869087ea09149b1527e56a3455213b14
 DIST kiwi-1.4.7.gh.tar.gz 91607 BLAKE2B 560b811ad16e7063581c6a448460035a8b880a9ed11e0be0da8f587dfc88d9f8c8341aca9fa26920be8d7478a0920cd0597f045b5d2efa80982b56800ddbcf35 SHA512 74e9b78980a348314b569cc8f922e7bddbafc3798c23526eb1746d4a5d0ae17681cd291c8ebeedbe9e7af25b4d0b32980e0c63c40a070f617cca9dd5915ea668
 EBUILD kiwisolver-1.4.5.ebuild 917 BLAKE2B 1ee2100f769cf66dc3a4cfa5896a2f0f420fabbbe4bed4f6f65c96fe316bb4610c081a56cdbe0c42fb111ad811c787295e89c1f485c33a6da5c8b77051b80566 SHA512 4a54351b95552bdb264a1624a4ad82acaa5da21a65e5e38839bb8d374047c8f386e1467e8a17bf12b9bc8b2c6984d10b95d7ad2c83ec1aa4073b89eb759f4da9
-EBUILD kiwisolver-1.4.7.ebuild 919 BLAKE2B 5cb6602bdeb95d81cd138f2c99028d7f8082297032480d71d09e779ddf851942f25b45b32c05f7bc6118181c46610d3144ec53cce4efdb808788ff8e6dfc2f9e SHA512 e8ea162a30f2191007946c7052dc7642ea6505b1ca5da31c4788815c97ec1f546df8232b002a76e7b14f0484511851b25f4fe73f456ca7bede7497be283ff9c7
+EBUILD kiwisolver-1.4.7.ebuild 918 BLAKE2B c7ba2d4e8b420edbb6c90614a29d8a80b38c2de449f0dc2f9a607cbae90e2bc6569bb8dab57baabbd005d7aff53fb1347fcb831fcbd5fdea7e49a6ef72d13c66 SHA512 6874629427e87323fc8d2e106b82956e6fc07e84cd8f19b9a3d712f41bcb48bd990b6e8ce351d6fcf855443871f4352b1cecaa10b90dae7d72b4291ee6767cdf
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild
index f941b5a86271..3452c95dedc6 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.7.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index eb99add6ad17..cd5058b11e64 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,5 +1,3 @@
-DIST makefun-1.15.4.tar.gz 72160 BLAKE2B 361e598bf17c3e235934d65de48e638897dae9f93285269c39d97d1202506dd7e0c688b628d1811571fc259c39dbe345e8b269809c5079bf651a9ef09b681331 SHA512 eb6ed268137726ed306c7b118307ada365832d6f17a50da2804cc55708d114ad7e630ed4fdbd15a411d92ce601c4cc10d671d1ade7e270349009c10fd82618d7
 DIST makefun-1.15.6.tar.gz 72583 BLAKE2B 00cee1083a5c36d70e9e480af526ab2ee4f62ddc34a2320f6adb8be96a87ea13a8eac261b715c02311fc877d8a25f0779b891c41f1eb9cd4766eb25dc37a8393 SHA512 b495d28d838989cd67a219be1d4b8f3a1b5a03aeceb76c6445074d154b1b7c65a9bbc9ae8a3ee0aa6e991a9572f43ba93ed949bfccb97dc557250e4b735f0c2a
-EBUILD makefun-1.15.4.ebuild 520 BLAKE2B f9fa6923f159d6e51c10dbb0287decf0289060bc2eaab3cad954ea8cf570b9d1ab35eb2037a750423839f9a20db4b90b567fefbe1e15224befad8a5e59bbbcfc SHA512 beb1a09674b26c0f1226cd49739fea5d05d8a2521c077cf08f9743923f3d6366cb4db81f4d23b9a2b9f49a585264b5e167a08c827b00c3a97213d5bbb69d6d07
-EBUILD makefun-1.15.6.ebuild 523 BLAKE2B 021b1f3d56c5cd43536a4511657a06f1cf2e275f47dacf4bc7222910babba93ac2062a9d53feb3ca8dbcc7214a0162fb05de930b3c743df2133a1d3ea89d9694 SHA512 eeff59e7fe29c8c8a3a79a48f6f008afce8052ca2c50a6572d4d5f61d8dd106909b3eb6057f37fdc4aa0cf315536d980ce2b9cae6c50f2e8825688b9210f06c6
+EBUILD makefun-1.15.6.ebuild 520 BLAKE2B f9fa6923f159d6e51c10dbb0287decf0289060bc2eaab3cad954ea8cf570b9d1ab35eb2037a750423839f9a20db4b90b567fefbe1e15224befad8a5e59bbbcfc SHA512 beb1a09674b26c0f1226cd49739fea5d05d8a2521c077cf08f9743923f3d6366cb4db81f4d23b9a2b9f49a585264b5e167a08c827b00c3a97213d5bbb69d6d07
 MISC metadata.xml 396 BLAKE2B 541c5e69fc3236d1aaf79505272c9bdf2a295524bb9bb04e782a4cd15c022e74651a9c4ebaa244672418e5fafaed97a48568538fcd527b135c279576f09350d2 SHA512 a500a2a8b23673ea11ffdd81cae9c96fc1368121cd6ce7955fb61bc59319cf87607b134f6b5d04aa6aa564eab9c2c1248c47d0ccc624cdd8ae58f5f12d96e279
diff --git a/dev-python/makefun/makefun-1.15.4.ebuild b/dev-python/makefun/makefun-1.15.4.ebuild
deleted file mode 100644
index 9778e4c78944..000000000000
--- a/dev-python/makefun/makefun-1.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small library to dynamically create Python functions"
-HOMEPAGE="
-	https://pypi.org/project/makefun/
-	https://github.com/smarie/python-makefun/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/makefun/makefun-1.15.6.ebuild b/dev-python/makefun/makefun-1.15.6.ebuild
index f926c1a858f8..9778e4c78944 100644
--- a/dev-python/makefun/makefun-1.15.6.ebuild
+++ b/dev-python/makefun/makefun-1.15.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 645ae6a1b4fd..371ceb3ac546 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,14 +1,8 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-9.5.35.gh.tar.gz 14791440 BLAKE2B d6cd4826e4a9f57e7c1790063e1b6aaff3524b07f532bb6ca705186e633b345d3526a4ea8423c7456a342536f7a6253e5add0b9491fdfaa61a932039905d28c9 SHA512 d35ad9ee7140de4d22eee4a6cf75d2cd522dc13394ef8be4cc2360291ea4a78f7489f014917beae7d9484103f6c6642e9e71d556839c5f523921588a7b001d8a
-DIST mkdocs-material-9.5.36.gh.tar.gz 14794813 BLAKE2B 607df2d24803cf8ff41243e9583128f9b9e49c077f6242b3949618cc6e8da9dc8b0e6db8caa0e5bad7f7f2607f4f313e954304091bf80a454ad3d913625947e7 SHA512 d5d86feeb35ca85d47d98ad09285a30075c0e6b925240d2e31d1050f8d55468f33b5f80216eb0fd1fc7833074b97f02abf3b9c277b9d64eec002d487bae8a11c
-DIST mkdocs-material-9.5.37.gh.tar.gz 14792573 BLAKE2B c232f9212ed47da3524497705a5ad106aa486a0c79ef739bf586d561507f54a0487a609ea4662a7c83aeedc7264ac44f2571d88ac20baac622bab0f696b3a3e6 SHA512 6fb62d4d6e67c1219deebd6313f1c0f3abbadc7f3bc8d0d187ac5a52faf1535a3b0544da0617aa180cf454a6bec16b8ba04067364dba802fc0850ad2aedb3f13
 DIST mkdocs-material-9.5.38.gh.tar.gz 14793685 BLAKE2B 6dcfafc67fec3a257a5609bbfe1bf1e0ad246c48d063d94adc221b0cb9caaa3a83647637ecf70143ace738fb600d652315ac9f652bf3f57c0f2a3e01f95be5b4 SHA512 735de92d151df519f4950e0bb9e77e9055472bcb177ddab73ebc8339f4a8f8c8b6bc80a3c9402c3e95fad469f79d253883e538a6d7ec57cacb562150e0a50dea
 DIST mkdocs-material-9.5.39.gh.tar.gz 14799240 BLAKE2B 7dcc1ae2cc17c631e76810cb255b894b10c984b083d462b804f3054c3beefcc04b9780a0fa252961ebb5ee2bdb9753cb137e4e2e643edeb4aadcacb1c17bdb9b SHA512 ba698cf60db9f5b991a6193cdab42b6c13c5269fc2ff6bc985f90577e088f7182117b356d5c20a584b5ad56be4667c59f9098f7daddecf39dfd73008b88c2493
 DIST mkdocs-material-9.5.40.gh.tar.gz 14758053 BLAKE2B 26097bff4d0ab90548c0e7ddf2e6b06fdc6601b100a30074cb6702df763dbcc4585ca8dac6089e4682ed1cf8be76b01e9096a9bf880354297139eaece00d6568 SHA512 e43519a9a719311146470b9fe10be7227cae77c5ce8625aa04751ebca16ba0645bb93d367046816746bd7ddd11e42fe44d522a616d773d610089c415ff8d9f31
-EBUILD mkdocs-material-9.5.35.ebuild 1794 BLAKE2B 982474c0246f3a60db2c86bd493db20aa8d9ffaf16eb2ee93ea34ded0bf9459a7caf3ba8b420ffdc45629731d8ce99eb2b8934918762a35eae6d26f0be3169db SHA512 459700ca251fceff5be81e2e6a9ccd24ab68612d0bbcabf9e033054adfaf99b6f24b80113067fe63e50c4c24752b1af44c3a2bcb2ca49c826431afc3bbda9b73
-EBUILD mkdocs-material-9.5.36.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
-EBUILD mkdocs-material-9.5.37.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
-EBUILD mkdocs-material-9.5.38.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
+EBUILD mkdocs-material-9.5.38.ebuild 1794 BLAKE2B 982474c0246f3a60db2c86bd493db20aa8d9ffaf16eb2ee93ea34ded0bf9459a7caf3ba8b420ffdc45629731d8ce99eb2b8934918762a35eae6d26f0be3169db SHA512 459700ca251fceff5be81e2e6a9ccd24ab68612d0bbcabf9e033054adfaf99b6f24b80113067fe63e50c4c24752b1af44c3a2bcb2ca49c826431afc3bbda9b73
 EBUILD mkdocs-material-9.5.39.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
 EBUILD mkdocs-material-9.5.40.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
 MISC metadata.xml 1146 BLAKE2B c9eb031eb40f303fdcc39f891cdd2d4317075deb030d0f8374f874ecd63bf73960427eb3ee485b5b28515f58689b1e1bf977ee7b565bf8f9275b115853044f2c SHA512 01db399842cb09af4823278f84fcf8c51ed42609a2e61d8e64964e1759e14d22ed2f32ec0565f19184575089a218dad4939337798cd3a5b39f5be55f5f7edb69
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
deleted file mode 100644
index d79902da91b8..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
deleted file mode 100644
index 0aabdac3ae43..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild
deleted file mode 100644
index 0aabdac3ae43..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
index 0aabdac3ae43..d79902da91b8 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index db46cc9f499c..634714d2c5aa 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,10 +1,7 @@
-AUX moto-5.0.13-date-fmt.patch 2044 BLAKE2B 98f3f72c339a35a530c2281ad62d367b5fd15ed588ebafbd61f4120469e0b11c7b98055f90f21997c3f90c2a1f2759a9c2ae27735f8f00c5e91494da8264c195 SHA512 24719ef723be91cfbf2f2f9272493e69a95ffad64dcd86624745eec85aec0b91b6370ab2706f052640113b96b5ed08d250fd3d25bf6993e2f48505dad505af8f
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
-DIST moto-5.0.14.tar.gz 5436824 BLAKE2B 9bcab90605a73c9b03c09285a00055c552437545b6d524377cec816ac569e4a1e399d84ccdd54ac0c1ac00ae253f8849bb5c3892e8d95021d31fa5c05705b3ba SHA512 063fe3b518263f0dfb9d0dc569d537bcbaba4a439e4945806c641cd7b0bc32e7431972ae800d4d581b1ae200122f5d22870faf8ce025377c174360cad2896aa5
 DIST moto-5.0.15.tar.gz 5465282 BLAKE2B c043b0cf5ce42d0633f25ab874e787315367836d54c59ceedc3e85a161b01974671eb6dd42916e45ccaaaab9a48bfa217c0b8f22fbd817da3d2a9b4ee4522a03 SHA512 95c20146d6d5dcb6b49c3bb90e23bc6b656f6773267263bfd6a4f069a572311ef47cde3e1797dce78cfa38a28894b5deaf5e1bbe4bfcde3b49cfeea90cc63b25
 DIST moto-5.0.16.tar.gz 5483357 BLAKE2B 7486a17627451494d09dcad8987da1ab456a9a8ad8fa6bca4650cf1c582e3babb39b502aec0b8c389415181af7e3c8f91ddde16715432a69ade0eb65c0e84ea2 SHA512 2201fe7b74eec9b2896afa5d7eba814c41ffae73b7becfc5e6c80523d51bf19d1de6713a5713758909c8d2343cc0ca1e0e238655153d91da161d043336c1e313
 EBUILD moto-4.2.14.ebuild 6506 BLAKE2B dca88183bb8c0d935869b2293abf55c4c1687b79faa305fa971cffbd52e987cd0eee4ab92b837125625898b6c083a88a682cfe04a3438536268bac87ac659a0e SHA512 aa0e668f2566e657a19d22c4fff4ef213b47837ed9b2a833eb6594c5b6261230ee675151a0c6d4f8d13764b028c0f3f55094b30cc33f025df3bf8ecb1d719105
-EBUILD moto-5.0.14.ebuild 8632 BLAKE2B 4a695528d6144b2202149893ab85695b6a8fec0cbcce58bf3015db38c599c0c6bbb5b339af91187bfa79ce8d9568c72b287f125f528621a3f845ce6d518911c0 SHA512 6f0fcd0b94f4b5e09259fa16afb1743b7e442c054b4aeb0dc977dd56ce6ed67f72bd39cd16aa7822dabaad18e5e45655c777e1eb036b149e96ceb69ede7352f6
-EBUILD moto-5.0.15.ebuild 4679 BLAKE2B ab2881f7e7c897364acdc7073fea8231b3268ab560cc75e12293ed5a64fc848e8dac3d07ec208e379f9c187d19fe478921ad157e87a0b5f7dd2d5d3fac389d74 SHA512 0b92c0701b7b462b9d8881b3dd9325fc2eb3cda8306f1e975effa6a38ab2fcf9e671eceef2d78c7aadd4d5ae402be91b2d3ac784ed7b4b616de72a7dd460096c
+EBUILD moto-5.0.15.ebuild 4676 BLAKE2B d51ba4a77cc0219edb8c4143fb8ba9f505c977f38ee5023274c6999c1f96733bc404197768a5270ca4a09a6838c1d73c3ea308a0eed35655812e5a4f79599c9f SHA512 1b8d0a79cd9155b39ed72247309ab7c4c53c771a7d2739da85dafbd15a27be35425a59d58112f1f9318d46fa8f39926249385a3e7f79273b988b52e57718b2ca
 EBUILD moto-5.0.16.ebuild 4773 BLAKE2B c4cc25e115f88697550a9c8572bc97bf33b70a5468996aeb0fc934c25057b9990d854c4bf1bea8e42d8a480c5862b013cd8cda70ad9263f24fbb09c178799e8d SHA512 a8aace7be339395f65ee87d51f79259b282f3403b9623660543cd9cbf3f6d0b1aa515a54d630c825bb61583c24d79abdb678d39f100ce7d6c53cd6045cb9a640
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/files/moto-5.0.13-date-fmt.patch b/dev-python/moto/files/moto-5.0.13-date-fmt.patch
deleted file mode 100644
index 5f9750656e9e..000000000000
--- a/dev-python/moto/files/moto-5.0.13-date-fmt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3bbc65d23cb58904f8cc79676e4fb079d9f6f37b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 7 Sep 2024 20:20:42 +0200
-Subject: [PATCH] [transfer] Fix date_imported to use a correct ISO 8601 date
-
-Fix `date_imported` key to use a proper ISO 8601 format (with hyphens
-and colons) rather than concatenated numbers.  Botocore expects
-the former rather than the latter, and when given a bare number it
-incorrectly interprets it as UNIX timestamp rather than `%Y%m%d%H%M%S`
-date.
-
-This can particularly be seen on systems with 32-bit time_t, where
-the resulting timestamp overflows (it would correspond to year 643378
-today), and causes `tests/test_transfer/test_transfer.py` failures
-such as:
-
-```
-E       RuntimeError: Unable to calculate correct timezone offset for "20240907201715"
-```
-
-When using `%Y-%m-%d %H:%M:%S` format, the relevant tests pass both
-on systems with 64-bit and 32-bit time_t.
----
- moto/transfer/models.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/moto/transfer/models.py b/moto/transfer/models.py
-index ca9f5e69ec9..599a6f5e2ea 100644
---- a/moto/transfer/models.py
-+++ b/moto/transfer/models.py
-@@ -167,7 +167,7 @@ def create_user(
-             }
-             user.posix_profile = posix_profile
-         if ssh_public_key_body is not None:
--            now = datetime.now().strftime("%Y%m%d%H%M%S")
-+            now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-             ssh_public_keys = [
-                 {
-                     "date_imported": now,
-@@ -205,7 +205,7 @@ def import_ssh_public_key(
-             raise ServerNotFound(server_id=server_id)
-         for user in self.servers[server_id]._users:
-             if user.user_name == user_name:
--                date_imported = datetime.now().strftime("%Y%m%d%H%M%S")
-+                date_imported = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                 ssh_public_key_id = (
-                     f"{server_id}:{user_name}:public_key:{date_imported}"
-                 )
diff --git a/dev-python/moto/moto-5.0.14.ebuild b/dev-python/moto/moto-5.0.14.ebuild
deleted file mode 100644
index b9a79fb2e3a9..000000000000
--- a/dev-python/moto/moto-5.0.14.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi toolchain-funcs
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="
-	https://github.com/getmoto/moto/
-	https://pypi.org/project/moto/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/jsonpath-ng[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5.0[${PYTHON_USEDEP}]
-	dev-python/pyaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/sshpubkeys[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
-		tests/test_batch/test_batch_jobs.py::test_failed_job
-		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_core/test_docker.py::test_docker_is_running_and_available
-		tests/test_core/test_request_passthrough.py
-		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests
-		tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-		# TODO
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
-		# require py_partiql_parser
-		tests/test_s3/test_s3_select.py
-		tests/test_dynamodb/test_dynamodb_statements.py
-		# require joserfc
-		tests/test_apigateway/test_apigateway.py::test_update_authorizer_configuration
-		tests/test_apigateway/test_apigateway.py::test_create_authorizer
-		tests/test_apigateway/test_apigateway.py::test_delete_authorizer
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserDeleter::test_authenticate_with_signed_out_user
-		No
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_email_is_
-		-
-		tests/test_cognitoidp/test_cognitoidp_exceptions.py::TestCognitoUserPoolDuplidateEmails::test_use_existing_email__when_username_
-		-
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_different_seed
-		No
-		tests/test_cognitoidp/test_cognitoidp_replay.py::TestCreateUserPoolWithPredeterminedID::test_same_seed
-		tests/test_cognitoidp/test_server.py::test_sign_up_user_without_authentication
-		tests/test_cognitoidp/test_server.py::test_admin_create_user_without_authentication
-		# TODO
-		tests/test_dynamodb/test_dynamodb_import_table.py
-		# hangs
-		tests/test_core/test_account_id_resolution.py::TestAccountIdResolution::test_environment_variable_takes_precedence
-	)
-	local EPYTEST_IGNORE=(
-		# require joserfc
-		tests/test_cognitoidp/test_cognitoidp.py
-		# require antlr4 (which doesn't support py3.12)
-		tests/test_stepfunctions/parser
-	)
-
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		einfo "time_t is at least 64-bit long"
-	else
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-		EPYTEST_DESELECT+=(
-			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
-			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
-		)
-		EPYTEST_IGNORE+=(
-			tests/test_route53domains/test_route53domains_domain.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-
-	local serial_tests=(
-		# these tests set up credentials that are needed by the tests below
-		tests/test_core/test_importorder.py
-		# these tests apparently rely on some other test setting credentials
-		# up for them, so they need to be run separately, after the above
-		tests/test_awslambda_simple/test_lambda_simple.py::test_run_function{,_no_log}
-		tests/test_dynamodb/exceptions/test_dynamodb_exceptions.py
-		tests/test_dynamodb/exceptions/test_dynamodb_transactions.py::test_transaction_with_empty_key
-		tests/test_dynamodb/test_dynamodb_update_expressions.py::test_update_different_map_elements_in_single_request
-		tests/test_events/test_events.py::test_start_replay_send_to_log_group
-		tests/test_lakeformation/test_resource_tags_integration.py
-		tests/test_redshiftdata
-		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
-		tests/test_s3/test_s3.py::test_delete_bucket_cors
-		tests/test_s3/test_s3.py::test_delete_objects_percent_encoded
-		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
-		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args
-		tests/test_s3/test_s3_copyobject.py::test_copy_key_boto3_with_args__using_multipart
-		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
-		tests/test_s3/test_s3_list_object_versions.py
-		tests/test_s3/test_s3_tagging.py
-		tests/test_s3control/test_s3control_access_points.py::test_delete_access_point
-		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
-		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
-	)
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT+=(
-		"${EPYTEST_DESELECT[@]}"
-		"${serial_tests[@]}"
-	)
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email_validate_domain
-				tests/test_ses/test_ses_boto3.py::test_send_raw_email_without_source
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_specific_message
-				tests/test_sesv2/test_sesv2.py::test_send_raw_email__with_to_address_display_name
-			)
-			;;
-	esac
-
-	epytest -m 'not network and not requires_docker'
-}
diff --git a/dev-python/moto/moto-5.0.15.ebuild b/dev-python/moto/moto-5.0.15.ebuild
index ab59f6c3391e..5ff700207b86 100644
--- a/dev-python/moto/moto-5.0.15.ebuild
+++ b/dev-python/moto/moto-5.0.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 61dbb2406945..a3bc9ec85739 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,7 +1,9 @@
 DIST networkx-3.3.tar.gz 2126579 BLAKE2B 37d5d536e2564f9a219df70bb7f1b7c0717b99e9cdb7a4050aa321609a0ef34caecfda5a6ed8cb17f4d3b305b667adf8e40b58568dde8eb942d4a00b1ebdb255 SHA512 86306cabd7e15aa79cae4d84a42e8804b1e904fc2127725067a80e3ddf31f0fa72ebb9d21284018e72bdfc662c766a5be55564572aadaf7392dada7ea93d1ea4
+DIST networkx-3.4.1.tar.gz 2151310 BLAKE2B e61270372fc1a334a8d9484275a3da72e6f45c405b9e867efb67dc32b4a0fa8973b5ecaebf3eb7d978314252c5bd4096844bf1648337a53d051d99628c93ed08 SHA512 44ea25509398c837d9c90ee2a47c980eac3bf3efe2dbf83c8cad0952a9c4b7b08e9c5c7e41ac96f704ac6d38533efa7af449d39804c1eb3b78781bd3eaad47be
 DIST networkx-3.4.tar.gz 2151262 BLAKE2B 77bdc5262b173b7ce566c2d55e9180eb796f9f57eba0725e122d3dd51c62ad1bf6eb02e6f9daea592c3fe59ca17a7589b53089fdd069729bfff56aebfe536ca1 SHA512 f86957669256313af31d6743b29ad80b918a64084bb39fde077c151b886cbe1cf9b93c801e6d72f78ec9a15e790af462f463cdc56e785385dfde22f11bdf0bf7
 DIST networkx-3.4rc0.tar.gz 2146054 BLAKE2B 9a183740a97136c85c75c1f34c11a6a753c0b1fc418074bcb02388822ddd2b7f5a53fc8f3866736dfb9833a300cf2e5d0776cbdceefcabdf0470cc89e790948e SHA512 14f19e1e524b8e9dfa55ecab34fcbb426460e29633284ec62957abd143f54685ceae3993306f3beff3a33d3cb7f3e408be417971fde11c75827ef05d999dc5f0
 EBUILD networkx-3.3.ebuild 1936 BLAKE2B d0de5aeb36a997b33fe92aba67b77abc865cfbe189dbc8cc7bf5b39ae157f010048eef7c9f4c2c1ca03f663b0ce7d7a9ecc57e9e19b29e826e77eb3d4417fa9f SHA512 bfeef522c7ee4897e5d61f99c739ba378e0110529e696940b09beb4de319b4d9bf5fe6e703d3b9712907bc48ad3ec98ce1c860bdcb147614a23c4b4b0cb3cd25
+EBUILD networkx-3.4.1.ebuild 1940 BLAKE2B d79565c9fcddf60cbfa40c03f84f76831e3c3957d1ae34e47892b6824f84e87e5e56978e0cc8f387637755b62538b0093ccf95a8bc2559511314fe2054206c16 SHA512 17b60c99351e3608f3aef5aaf90a7b3c0f3d851927981bea269cf07732af2be3984fce18f8521698b7048c5e06312ed2c18fbeae7ddd552cfd31bb91c57062fc
 EBUILD networkx-3.4.ebuild 1940 BLAKE2B d79565c9fcddf60cbfa40c03f84f76831e3c3957d1ae34e47892b6824f84e87e5e56978e0cc8f387637755b62538b0093ccf95a8bc2559511314fe2054206c16 SHA512 17b60c99351e3608f3aef5aaf90a7b3c0f3d851927981bea269cf07732af2be3984fce18f8521698b7048c5e06312ed2c18fbeae7ddd552cfd31bb91c57062fc
 EBUILD networkx-3.4_rc0.ebuild 1940 BLAKE2B d79565c9fcddf60cbfa40c03f84f76831e3c3957d1ae34e47892b6824f84e87e5e56978e0cc8f387637755b62538b0093ccf95a8bc2559511314fe2054206c16 SHA512 17b60c99351e3608f3aef5aaf90a7b3c0f3d851927981bea269cf07732af2be3984fce18f8521698b7048c5e06312ed2c18fbeae7ddd552cfd31bb91c57062fc
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-3.4.1.ebuild b/dev-python/networkx/networkx-3.4.1.ebuild
new file mode 100644
index 000000000000..b386d30100dd
--- /dev/null
+++ b/dev-python/networkx/networkx-3.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
+
+inherit distutils-r1 multiprocessing optfeature pypi virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/matplotlib-3.7[${PYTHON_USEDEP}]
+			>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.11.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/networkx/networkx/issues/5913 (bug #921958)
+			networkx/algorithms/approximation/tests/test_traveling_salesman.py::test_asadpour_tsp
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# virtx implies nonfatal
+	nonfatal epytest -p xdist -n "$(makeopts_jobs)" --dist=worksteal || 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" "sci-libs/gdal[python]"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index dcb8d650c29a..ac3dc827d02b 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,5 +1,3 @@
-DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
 DIST opt_einsum-3.4.0.tar.gz 63004 BLAKE2B ef9174bdcdacc5bdc2a132ee45cac4ebfb57eaf00bf23638254434fdfd9648244fea27e91fc984112b43088876b99119b174c1cc6d7dfacfa46febff1ad072c9 SHA512 1f1dda6a6994394db9ad8d48a1cd7a6200ce0c5f8aae06748a199b4e1aa70b60ad69448d3d332d97d41bd3c94420bb00a033d67b4a6b3c2373d6678fec5834a4
-EBUILD opt-einsum-3.3.0-r1.ebuild 650 BLAKE2B d0f461e517297c68ca3025f9c9296903ff222a709356d3d66f743a3009ba76b4ccdae395fdcd09b1b33eb8f51fd66963d2ed7e79480734ee272e5bf39be86c85 SHA512 2e0be8f768264a36d23b2b584ec7dbae7cce9fd21054d5278164938a1118ea012d641cac8a1b9be97f4a6d8ca650e99a08680e3fe8c2724cd92774c86d6ca382
-EBUILD opt-einsum-3.4.0.ebuild 608 BLAKE2B e8576f76ba3847cb6281170e456e982a12ddc611861595762eb7e202eaaa8e2b9d4ed6e0ac68dabf05a591308bccdde502bc993f06e6a72bfb358ad4a3f5b892 SHA512 d966fd861dcc7221a1bb0b6330ebe04dab2313267e03a12c0133134b68c311690cdcaf0ed595701b7f5f4cda574082b1693e9f95f17ff7ff3de9e25ed3ec3e45
+EBUILD opt-einsum-3.4.0.ebuild 605 BLAKE2B 7ed4eba136b0d1ecdeb1873af50c2eb162925463fc4bef7c8e172de73af437f3d4dd615f47126bae90623756b963ec62a0a82a2765aaeff4cefa8b5546fdeda7 SHA512 cb057b96d5164cd50dd3b9c8591a4fb913d4bf5e5e4c0775cf868150d42154e516f37833d1e41a31676b5ecaa39252facc5b9245829e16d2d10d1ef16bf24371
 MISC metadata.xml 530 BLAKE2B 657b3a76e2d097512c79cdebe6f9eaf334c788b525e4c6f7a02ee90be68d36d19261972393a47739be4a8f405bbd07fa8678e9b84c8bdafb8c8808ccf4356ce8 SHA512 0301af745cbdad5ebfc9f87e07f5e0782cc80d6dcf449402757267e5894ecca087f169dd68f9e3aa33818fca3349e90ccd421c8e19edb00dcd8da67069aa044d
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild
deleted file mode 100644
index 82f33bea3144..000000000000
--- a/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
-HOMEPAGE="
-	https://github.com/dgasmith/opt_einsum/
-	https://pypi.org/project/opt-einsum/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# ancient, broken version
-	rm versioneer.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
index c9acf9a60c96..f6dd1aa60dc8 100644
--- a/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 56cfe058e7af..9a0396c196f2 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,3 @@
-DIST python-phonenumbers-8.13.45.gh.tar.gz 4913395 BLAKE2B 78cf1a38dba34f4c989b39b676fcb0e78369a41cb7882fe59e48b9c36af9471082153a194ba75b72e7b25515eb0bcb7749eb0af78175f49c2933e17efc13c263 SHA512 28abdd0ae5f28b38c5279a850ee36812ddcd8eed6f57c9f1e816406c25896e6fdc547d7802ddd4b97a9253c3962946a8c17aa4c96e6a62823a9ae80c74a16024
-DIST python-phonenumbers-8.13.46.gh.tar.gz 4913455 BLAKE2B 1310c5e2c58d1f16c7df4d2e4beb4b9754f00b7adb630691ebe1600a9b4b4ccf4ddbf86c0660daef53bae03f98a79a6856f9e10976c7c69de616f1fdd5dd5241 SHA512 36d6611196e78b02d7c77d8fe1f99f4a02b5a13d1bf5f6d1eac751988ddbd239b28081fbd2b1c582e8ff2d58e792f765070d3cbb5392a9c095faf102ce8c51fb
 DIST python-phonenumbers-8.13.47.gh.tar.gz 4913983 BLAKE2B adf167f95ec4817c3adf92ffe4e0e2eab3ff99ce572023d47adc88b03e29414721ed6ed22f4029fb9e56d4f8cf8c5d9cf65e59209c6a4e5ae41e89d24df509e5 SHA512 a25ce93f79f7ec17b4dd3334b3912c8311c8ad0196e91f554c59b2f12b85f2c5936ec280bb2a5048c9ea8e274cdc632e42566153d87992db3601ddb8f93a0eaf
-EBUILD phonenumbers-8.13.45.ebuild 816 BLAKE2B f6c2960a4435c0de44a1a1ab02278402f914bc58d8795b83b527003bb116ffeef3711a02c7d00e48999f924cb7426f0e657d5b1aa930cde98be4d273312d3223 SHA512 36a31a824519dd72fcedf797fa0164ff06d57429f46c1bd7c6d4d7de3d2614974319267d9cd5f44475180fc16fc3800417c931e19c0926ee120235d884eadda0
-EBUILD phonenumbers-8.13.46.ebuild 818 BLAKE2B 52157818a6a593c18dae9039574a974275876cee7dd286fa069e0014213f2c79bc748601d48f83b9f26c2a88319033375b987885fbfa6e664ceb674c6a36ce23 SHA512 4bd185fd81d09f95142678bc08d2f124877c09af6f58ad83115569437c2fa3e6d90b4ef7fa151bd6d5e2cb464a90dc0392bbc228e6aa9fa3a42952d570872ff2
-EBUILD phonenumbers-8.13.47.ebuild 818 BLAKE2B 52157818a6a593c18dae9039574a974275876cee7dd286fa069e0014213f2c79bc748601d48f83b9f26c2a88319033375b987885fbfa6e664ceb674c6a36ce23 SHA512 4bd185fd81d09f95142678bc08d2f124877c09af6f58ad83115569437c2fa3e6d90b4ef7fa151bd6d5e2cb464a90dc0392bbc228e6aa9fa3a42952d570872ff2
+EBUILD phonenumbers-8.13.47.ebuild 816 BLAKE2B f6c2960a4435c0de44a1a1ab02278402f914bc58d8795b83b527003bb116ffeef3711a02c7d00e48999f924cb7426f0e657d5b1aa930cde98be4d273312d3223 SHA512 36a31a824519dd72fcedf797fa0164ff06d57429f46c1bd7c6d4d7de3d2614974319267d9cd5f44475180fc16fc3800417c931e19c0926ee120235d884eadda0
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
deleted file mode 100644
index ac05eba6ee74..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.46.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.46.ebuild
deleted file mode 100644
index 43eeff396e3d..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.46.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
index 43eeff396e3d..ac05eba6ee74 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c3332807e2bb..77187d6c43cf 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -5,5 +5,5 @@ DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e788
 DIST pillow-10.4.0.gh.tar.gz 46617167 BLAKE2B 3eb7852ab087d18e5b9a03d6cbf83ead96b637a71d4209a4574d66c9d098936d240c0be3235d9e951ec094b9b0def196b265a8e68f59802f843171c74ca7bbac SHA512 835a8766c384ec3fcf67b42c9bbad35dad0848cc5bd9eba1b0768a864e174a1d9c4a5e989f22496a40f2c29dd7f492f6f80465903fe872b10749cfa0340e1bc5
 EBUILD pillow-10.2.0-r1.ebuild 3265 BLAKE2B 5a95a0777e9a5db4fc6f77a63292d489638241dce247d54fbe5deb0c2affff91dd7887646cdf92ac1d21eb89b302a0395dd35deecdc62cb6ce9d918d23b2ee1a SHA512 92b7156bbd9c3dc2ae5fb38e7ebd4fd20a1a784651d7fb32e798e70497d6aa4ea4acd8b2c8b0056488817b55459d22aa48937c0ba33da23b47167e50c436e4e9
 EBUILD pillow-10.3.0.ebuild 3453 BLAKE2B ca42e9e8ca086a04bacae7feddf787fc3c61670ab77bca49dbf9f8288e50e4537dc173f4df9515cad93c2fbce321379ef00862f80f987532bfeb232b3a4c2baa SHA512 9f2beda5c4276b9a4c62746c89cd89a90298baff6a9f1c432c0c576e435ab620e2025b0ddd56f649fdd1f663c57a9e6258187cfa3f237662b1d3b4bba43df090
-EBUILD pillow-10.4.0.ebuild 3377 BLAKE2B da80618a30c12ad8370c367197754d6a39b3532214feee2d3ff11ce440081e14118e4d6720171fa08f420fded93d942bd39df0c49245d93215901a8d189e92ee SHA512 9322c81ac23f8cd76a5060f9c4455183889eee03b92c363cd1124833c55174d83e6194f1b14a753a0a1c19290efe96f1e7fccef29ed38b87637f1cc57fd6c38a
+EBUILD pillow-10.4.0.ebuild 3376 BLAKE2B 7a97c501376a84236ef8cf1e5d128a20510a3ac0c8ee278241596bd2a67be08ba6a4d1512304d24a459dac15ba340ece49877936d5dc919cc6dc6cb417159f95 SHA512 54d5277fa23251448b9d0be74940e2b79d38e32e78a872e93c7f2d37752b0432e9752b7c88654651bbbf0cd712f3bec6ce0f82cf4775603376ba75bcb2151332
 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb
diff --git a/dev-python/pillow/pillow-10.4.0.ebuild b/dev-python/pillow/pillow-10.4.0.ebuild
index 35937d67093a..4b882d2ca2df 100644
--- a/dev-python/pillow/pillow-10.4.0.ebuild
+++ b/dev-python/pillow/pillow-10.4.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index aa7206485bac..757179ba1213 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,8 +1,5 @@
 AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87
 AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650
-DIST pipenv-2024.0.1.gh.tar.gz 10805446 BLAKE2B d9fc964cc3a204bb45c299595c238e3d37368e53b39d8be0cdbcadcec3ca395adbb03bf7abaa7d5d729ed47443c40b908f74abbff475e4a99c7e6d4436f04ee8 SHA512 67acff8e4c40e18a60e824420752cd2e5633e50c138b64131ca19cce15e97a1e36b9e685b92fed7378eeccce8154d3d36701134854d60b0fbc47e341b18f945e
 DIST pipenv-2024.0.2.gh.tar.gz 10812462 BLAKE2B 450c8027b2720188edf284a2644a705a3004ee481553871781d8906f415af56ef87d6cdb5ebb00df96bd36fd4dce8dad29cfc2480d9afe3be6ed6891458c188d SHA512 a414727d6ce5a1af565870cb75dfd57731a0513b97c818f304654867b87cf3d89e857fed45a898d19acc37d272d32897f838328fcd7b780fb4ba3e235c77bbb5
-EBUILD pipenv-2024.0.1-r1.ebuild 4939 BLAKE2B 2d1ac34a44f47cded99578589fa016da082fe0f35c87ebc72c3e1a926ae71821f01069358e4a9b52b63929d08c9ef9d11938fc4dcb6d3515c424953c23dd14c5 SHA512 c299e17a08c124e8972e7d07b2b5e30157b1809483d89d8f62709955d02f392380e8f16a64e75e849047d755a58107db0edcddf10ad0b4310131195a3853ea4b
-EBUILD pipenv-2024.0.1.ebuild 4938 BLAKE2B db14870f08a080f5ade4871de332e057d887884b630a10e35e699958b789b65fe51b16b2da3482fcede8b2faed82bfdab7866d0f080099e5f7b4bed40a423567 SHA512 a8c0b080275bf30b8db52af0e141ea288d8055173b5778a828b22f29576fe8fbe2526eb1e5a99f0a04ed2e50fb09a17dad145c2f8ff65ab6a6e9eb7feedd7e1c
-EBUILD pipenv-2024.0.2.ebuild 4939 BLAKE2B 2d1ac34a44f47cded99578589fa016da082fe0f35c87ebc72c3e1a926ae71821f01069358e4a9b52b63929d08c9ef9d11938fc4dcb6d3515c424953c23dd14c5 SHA512 c299e17a08c124e8972e7d07b2b5e30157b1809483d89d8f62709955d02f392380e8f16a64e75e849047d755a58107db0edcddf10ad0b4310131195a3853ea4b
+EBUILD pipenv-2024.0.2.ebuild 4938 BLAKE2B e31c27af6bb6d40850898637e3edfe9bd5bb9d953f36abd11102e6fc2aa674bdf2629791b07d8e117c0bc06904ca2345f5811263566417899dfe50fada5c58a4 SHA512 d242067e7c58f5387d458c476a2d032b45dc8d653b65aa274ab98177a728a39e8747ca84d1c2d66a3632c11bb345900a96d23b5a0975a007dfbde667c1691620
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild b/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
deleted file mode 100644
index 92b2a3583056..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-8.4.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.1.ebuild b/dev-python/pipenv/pipenv-2024.0.1.ebuild
deleted file mode 100644
index f0f6dba4941e..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-7.1.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.2.ebuild b/dev-python/pipenv/pipenv-2024.0.2.ebuild
index 92b2a3583056..39e1f5da992d 100644
--- a/dev-python/pipenv/pipenv-2024.0.2.ebuild
+++ b/dev-python/pipenv/pipenv-2024.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 PATCHES=(
 	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
diff --git a/dev-python/plette/Manifest b/dev-python/plette/Manifest
index 5820ba686f51..232875a02778 100644
--- a/dev-python/plette/Manifest
+++ b/dev-python/plette/Manifest
@@ -1,9 +1,5 @@
 DIST plette-0.4.4.gh.tar.gz 36359 BLAKE2B dc630b9e98db9a8f6047fe0bb31c2ab29d695745b59d457c9cac218922c0d578a474f80ddc419364fb8ef92c5952c5cea33ee571cce2d698015466edb738885a SHA512 c4342ce040966730d2eba638c718c1db9340051baa89238b99e64cf8ef734fe448f0aaeae224e9f6b51c9e38458e9caeb2c8d6abbd5db76249529aaee90ed5c0
-DIST plette-1.0.0.gh.tar.gz 54297 BLAKE2B 7ade29df8bfc20d5c98f5f3290acea2f5e884f71b13c0950373f41240de54f3ea672d16c0557fef2e1be25aef0da68d4a7449ebea2f206d92901d7f11f6cc2bb SHA512 72a3f270f76dbf32cb418628f1b24046111a46633603b07fd44fd4ed50d946653afaec070bce8e67a1ecff3ec8607f2476d3b25760c76726218873898bef97ed
-DIST plette-2.0.2.tar.gz 12905 BLAKE2B 48d8e50b24a2b61a12f798467ed443a7a043bd6efca7cb99ce35e5e05edb44af327e3a2e5bdfde0e6db4a4be527ab668edd6433c195fe4f72975170bcb6acbed SHA512 9f273af721b29b81ef8921fa9bf42856711242cef04372c5e1c632e907d889554beeb4d85c47cc9f2003984004dfa97a239643d9307389be9a6710dec26b5b28
 DIST plette-2.1.0.tar.gz 12908 BLAKE2B 7e710826374f12317d93cd7410006059ecffe82095ecb05f5e30d3b1db56802ce44fb31ac5ef9fd6c6a1a83578cd69ae87c324a470a532557eed69f8c73923ba SHA512 ce75385d958be6c0adc0e11a8431484a91eb7b7e237218b37e073411551813bfbad4872fe6f1b3d5980f9da5f0465c66de4e19646d11716079a6be67b2c138a5
 EBUILD plette-0.4.4.ebuild 658 BLAKE2B 2f4c66175bc6172eb36c5e6b2def44fd7ea8d0548bf55d4c3ca72fd46ca21b1b6af64f6c92d2d43257db6ce5a3afdd4bf2384b45355b9bcaec9f93accb8f1e49 SHA512 687133254c0ffa2278e996b770fa1d76f2f47188b671fe1d93d2b9ebd939130174701a5f0356866e1112fb4b9fbfc87356000d253aec2dac1065c4f167ec5570
-EBUILD plette-1.0.0.ebuild 659 BLAKE2B 9e1e3c35e874c7570f23cbaae9ac10c9c596c8ba6937162551a84013b8d7ab69caf9027a2e2bcca488e727f1bd043cad7f6f507ba213730d143ef460329ebc90 SHA512 2befc9b3f1a28052d6711630c92e25f0328e01393f5409bbeaa8dc66dcb072ad2673eb1936a51bdfc25ec906eae1a3de05027313929e49677256e7d71bdbc13c
-EBUILD plette-2.0.2.ebuild 532 BLAKE2B 70df5f690dcfc062558c4fdbd3ac9a51dbdc59571ed4b7b4fb4ec33c536fac497adb5ffb3b85a945d6a764e22c1ae04425bcbcedb2074c0be91eac6a08144a5c SHA512 989b95ef76af6563be0198b5bb44aa15e50beb75e01a2d9b230b9fe81706db394e95e68cc8bfb720c14bf0f968a697f26761f2b63b14bd9b00c285c62446abc5
 EBUILD plette-2.1.0.ebuild 531 BLAKE2B bb9feb0f9d4654844fe16aac3d480a1b33cef243fb40bad0402523a7d3ca346eb2d375f0629afbfd5dd6e517a816cc3511e7e34fad8d257663a1338a594cbe90 SHA512 29c5014d4542b46344360237dcb89f7ac4cfac0eb40f9203fc12457e74dff9db036795525177edb93e71ae5c9604dd19415a29cfea704ddefd92557759925dcf
 MISC metadata.xml 538 BLAKE2B 105eebd42009f9fd6d9d12033b3d567f2f62bbae8669209f2b3c4356b6ac99f06ddaf0db81f487d41c89f18b8076417554d22d617e5f9010fd414913ea17e97e SHA512 acd3520c007aa9fb0b454d44760572e1b9f320734fa8175937e06a3b4278861c505a8268510d5e1bc2e0bba20e2bddb850e0dc7bab824ec7164f80337d57125f
diff --git a/dev-python/plette/plette-1.0.0.ebuild b/dev-python/plette/plette-1.0.0.ebuild
deleted file mode 100644
index 5a6f62b698a8..000000000000
--- a/dev-python/plette/plette-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Structured Pipfile and Pipfile.lock models"
-HOMEPAGE="
-	https://github.com/sarugaku/plette/
-	https://pypi.org/project/plette/
-"
-# pypi tarballs are missing test data
-SRC_URI="
-	https://github.com/sarugaku/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	dev-python/cerberus[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/plette/plette-2.0.2.ebuild b/dev-python/plette/plette-2.0.2.ebuild
deleted file mode 100644
index 31d962c16d70..000000000000
--- a/dev-python/plette/plette-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Structured Pipfile and Pipfile.lock models"
-HOMEPAGE="
-	https://github.com/sarugaku/plette/
-	https://pypi.org/project/plette/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	dev-python/cerberus[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
index 5610a2a153a4..162bb9511c13 100644
--- a/dev-python/prometheus-client/Manifest
+++ b/dev-python/prometheus-client/Manifest
@@ -1,5 +1,3 @@
-DIST prometheus_client-0.20.0.tar.gz 78278 BLAKE2B ae7dea79a2c4f7b6870da9f749e9be09c353e062e744beb98538eba45d0394ef2ce5b99a696e40620b38ea228711dff30a2a571d09d7e1b4a3d75ca713938f92 SHA512 9e5aed628b052790af8954eee7914b6480226368229bb0dade2f8c3f88ab04971d2a8a55558fd7dbb125894f30cea56363cc670deb0aa6822f31562437031fb2
 DIST prometheus_client-0.21.0.tar.gz 78634 BLAKE2B 878c6b3948ebb45fced9ceb24ef5ebb07b2538117712dc2b0a6365282fa1bd0e732f5c79bf496aa54386cc42ced458202b1537c6706e3906a6c48d71a3709437 SHA512 ad86e7d7eb1919bda77c5fe80e800721c6d93f8b849955903ec346c2c6d35130f7e179b470c261aba3d8aa2f2cb10c43dcc5e8c06024dcd79fac5818b87f76c5
-EBUILD prometheus-client-0.20.0.ebuild 757 BLAKE2B 916538286d6a49288eca5297bba304253dffba100259a83623a707c70fed2d25a21a8c2c06430060b6f98565233c7c973f9f91924d618c09a4935ca82a72ccaf SHA512 575651be9905a3992c1406635d2ae005a9c07cf3efe36e5e7758bd8eaf14858ec07a971d7bc33fbf0c0c864c5cfe90b16a27e2a9b4fb8d6ee906644a8a967bbd
-EBUILD prometheus-client-0.21.0.ebuild 765 BLAKE2B 35358b08106884d083d68d2e8f6d9c7dcc0b70be29613402143b14e325a9f29b68e0e7ce648b81a9a996eef033be3e656ad6e867a4ab20c3f3b11029cec7190b SHA512 26383654ab74a10134ce01cb7217f9b6057946c3c4fe6930bcb78c4a82745713ccf37e5216665f7ed78bd349013b235bfbdc853eeeed82106a3fca33200d0c19
+EBUILD prometheus-client-0.21.0.ebuild 757 BLAKE2B 916538286d6a49288eca5297bba304253dffba100259a83623a707c70fed2d25a21a8c2c06430060b6f98565233c7c973f9f91924d618c09a4935ca82a72ccaf SHA512 575651be9905a3992c1406635d2ae005a9c07cf3efe36e5e7758bd8eaf14858ec07a971d7bc33fbf0c0c864c5cfe90b16a27e2a9b4fb8d6ee906644a8a967bbd
 MISC metadata.xml 409 BLAKE2B 900f1046ec87679dabe88792bfea55cdf6dbbc1f332260e5487628530a1e5b2e07a1b5776313c484ed2355c205dea165547628297da3fd3e0d9e7c352f4f7a54 SHA512 beee1bb3823aa235e8c2667b18157254335777dbf1169beaee54190d41819dd0e82c58a8ea09c4981740370d7e5463ce11d327e02bf411093dfb653a557077ff
diff --git a/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild
deleted file mode 100644
index a583ec6e9662..000000000000
--- a/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="
-	https://github.com/prometheus/client_python/
-	https://pypi.org/project/prometheus-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# optional tests, broken with >=dev-python/asgiref-3.8
-		tests/test_asgi.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
index 7819cd833828..a583ec6e9662 100644
--- a/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
+++ b/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 56e7fe711497..5f5560cb85cd 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST prompt_toolkit-3.0.47.tar.gz 425859 BLAKE2B fa12151c48126c971b2dc468a6e1de4ede49ade08f637e9c02d2284f74f07cbcf4d3167447e616af3385eef0355f8928bfc50632f0cf61138320d7e75777c07e SHA512 c27dc03929f0bd373e41bf70e19f82f97c8f0a6308e51e079e89d6233f1e638c34703cc056fe8c86cc9b63f91b5d345c28ce0e418f79f6e450ca06bcda5820fd
 DIST prompt_toolkit-3.0.48.tar.gz 424684 BLAKE2B 2b22cebfaf66c07bf9e2ba2677be4c36436c0b5679e01cf39b7335f1898e33f7bb5b4f3a147a39feca37bd3921b8cbe8db98c948d2819c0e7269cca5e2b71d26 SHA512 f999c0d6df94a1a640d735e4b6f4bebd496693b8ae7267c4a8561c726a8148f937781b07f8e76a045ac0b90fa1d98fb767c153c3a96e25bc5e610c873f8e76c3
-EBUILD prompt-toolkit-3.0.47.ebuild 717 BLAKE2B 1e4443ed0e7ccba5266298343dd20546fbd3bb027e6008825072780d8290a2520c8b3302aa0b05c83525705385962079d86510c04aea21cf9d9e692345730111 SHA512 990857090f9c7b5ab6599d34818ceb199433430208328940531b964ced0f7db255b5d003f26d278c5679deb61b977a87e94d98a851fd7176c8a0df3140dd2163
-EBUILD prompt-toolkit-3.0.48.ebuild 725 BLAKE2B 385b43a98785869cd2cb28d6b1942b2f8383a211f2fff7bd43480747ab3f7c08e38271f72e51ead667d97086db4666c3fdee342ce075c5fcf354df9a06bd3a9c SHA512 9a604959fd1622cae2e3c1eb79b91bc7451dda9c8d1cc0eb0c599e3529b10438ad83e40a00285dce0b86fd697d22dce7994093dc1f2725c97030b64a488dea09
+EBUILD prompt-toolkit-3.0.48.ebuild 717 BLAKE2B 1e4443ed0e7ccba5266298343dd20546fbd3bb027e6008825072780d8290a2520c8b3302aa0b05c83525705385962079d86510c04aea21cf9d9e692345730111 SHA512 990857090f9c7b5ab6599d34818ceb199433430208328940531b964ced0f7db255b5d003f26d278c5679deb61b977a87e94d98a851fd7176c8a0df3140dd2163
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild
deleted file mode 100644
index 2d6742a2563e..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires tree-sitter-languages
-	src/prompt_toolkit/lexers/tree_sitter_test.py
-)
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
index 5a656ce67ca9..2d6742a2563e 100644
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index e087cbba4e8f..94d82e5039b4 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,5 +1,3 @@
-DIST puremagic-1.27.gh.tar.gz 311630 BLAKE2B f2856a138600ae8d9592870080c04ca15b2eefbb774f1156f52327d6a0fe26f419ade498a8ee08c02b0f09f4ea6427ce595de8b478d2e17fd00f5f7263364051 SHA512 56365dc122160d306704290a054afa7be5007ca3634275fab168e1ea8bc29356477c5455abba3d84c9e229dc9ce3a21df58ed7e6ff216fe0c60d7257e4b02584
 DIST puremagic-1.28.gh.tar.gz 315168 BLAKE2B 8102fc7a2fb2ecffc3b38d90ca4ca848c78f8989eb43bb74c5ecab3388238c9ee6285b8423ca0b999ea22462a150d5ecd5e59450edc136d666e8f68bf272d0eb SHA512 8a9d04b34d32a552fa51de1c720556d46c2aef99913d9c339838a682e8758ba16c66bcd4d205fe59dd6ae7cd27c311b24638a4084baf7a27869e5304e4994d27
-EBUILD puremagic-1.27.ebuild 632 BLAKE2B a05216707836158ec9988e1c3fb9090e6dfa09760f1d9c244eeb9197246c858b6a3430680486d4a2dd17975159d68cdad5f0fc7a679a2d56544a6937d1d7b7bd SHA512 af9161937efc171ee05b350241bab778f9d9faee5e6645d75b44dc5f92b301b7df1ed4c02527f71b2ff8d6580c9605ed4ea20248dfa0439c18eda551de85ccb5
-EBUILD puremagic-1.28.ebuild 633 BLAKE2B b5a157f1fbc51b0d98793a931ff2f6faa22ca8fc12155cbc336ea0345b86eb25572085cd0bcc43aaf0caab75f59c4817d50cf972c1c1d11ab6b9806459f72128 SHA512 72bde404febc8f6ddc0ec667c1a03fa3dc21b896d561d686951fee6fca90ca860a451fbd69ca5fa1f232f95f522a172dbcfcc43c1bdce08fa9df24e9bc29a452
+EBUILD puremagic-1.28.ebuild 632 BLAKE2B a05216707836158ec9988e1c3fb9090e6dfa09760f1d9c244eeb9197246c858b6a3430680486d4a2dd17975159d68cdad5f0fc7a679a2d56544a6937d1d7b7bd SHA512 af9161937efc171ee05b350241bab778f9d9faee5e6645d75b44dc5f92b301b7df1ed4c02527f71b2ff8d6580c9605ed4ea20248dfa0439c18eda551de85ccb5
 MISC metadata.xml 441 BLAKE2B e16e921f5571378e7fe3922ef583aaecf4fdd0160ffe502105f982d05189679395bfb7babc5f3c12ce60af9ddc72ecedd5a7a68e18488cd35174ee1b3eb03c05 SHA512 ddedaeddbca2953c67d6d23414f6dd152823290bc4bd90aee470a16906c4fae9e21043250677faba4873ff50af4ddf88c7208cfd30a040b816ec44782687e3e9
diff --git a/dev-python/puremagic/puremagic-1.27.ebuild b/dev-python/puremagic/puremagic-1.27.ebuild
deleted file mode 100644
index db55407e2eb2..000000000000
--- a/dev-python/puremagic/puremagic-1.27.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/puremagic/puremagic-1.28.ebuild b/dev-python/puremagic/puremagic-1.28.ebuild
index 7a5fd34c2d27..db55407e2eb2 100644
--- a/dev-python/puremagic/puremagic-1.28.ebuild
+++ b/dev-python/puremagic/puremagic-1.28.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( CHANGELOG.md README.rst )
 
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index e5841cce43b1..6a4e57d6d459 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -72,21 +72,27 @@ DIST pydantic_core-2.18.4.tar.gz 385098 BLAKE2B 6bea502397c327f38a000e9ea3b59b7d
 DIST pydantic_core-2.20.1.tar.gz 388371 BLAKE2B d8c66cddd93fe4a56a901e5f06fe86c0c87b11397567e5400bf89e5884e13c98d37bbdc42ccd0bdd67c552370c17ed26d9a7897303544a816022d8a47ee8bc18 SHA512 fb5362a07282a54be9cbcf0773b5492dc1773c71d96979586885d920d794b13860a32a8165e7b5e023f9f0f7a3c85aa5098dc66d6626d5d290d3ab63fa70453f
 DIST pydantic_core-2.23.4.tar.gz 402156 BLAKE2B af899e149693907542296b5b4fa5f982d2dca5c090331703212aabbbce0a8e0badca3947affa9e42998949ebd18b1ffc2ad9904b47e130bbe7e90150c32bc527 SHA512 c7c9a303ff3c751108622f804f812f3793ad93a95e560b0d6b0a866c3bd41ed7bfdbcd87483f37ad3849969c72adde24083d1a9015ebd610847a7fa6d4068e24
 DIST pydantic_core-2.24.0.tar.gz 405714 BLAKE2B 4ce0a27cd35d6fa41adfe34734b73851733ca5f02971efdcc3b22f97736422dcb4c71dd743a79a61cd2b0545aaf23e2868629534728e8019ab4fc5b3033e2a05 SHA512 fef249007a61fc585f6ebeb9cab7922b33770969c1afba70cae4deb406009125664a0b3347b14198f7d0c3611287e68ee4ad41ed70a065ca66c93c90ff5f4787
+DIST pydantic_core-2.24.1.tar.gz 406309 BLAKE2B d87fb47c5e90709cc37dff510ba9f57aa2a6ffd23eb82c9c033cd5fd44304cc93fc0c4059038296b9de342943e7d1ebe002f9760b0c226c4ad2d71feb04e89cd SHA512 e893138e658f8b3363027b34e9089da46747c382dcc5b814a89cd48e1e2fe7a4c68ee0931b51f2d4dc907a4dd6be1cd8da84881db715646a76f3cf20ab49b490
 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
+DIST pyo3-0.22.3.crate 542516 BLAKE2B 26607f4455a58ea704cc2d01dfe3857147e03ff891ab0aadab73c7eef2ecb4445097b369d8986c18bdd5efa3ba767b9f41411d5a8f10d6d06851634d07d42642 SHA512 17940627701b0d3c401ccb4221241e7bc727d2b89cc26bbb231aec597cda1c04f07d4315b617d4e9f85623a6fff0031f83c6b7afcaf442c50e694785b07022ad
 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-build-config-0.22.0.crate 31205 BLAKE2B 6b9a0de5f431bfc123628c67da040e146e39353d7b42d8d083e1911929dc420622f8a1276229d89b7780bccd02a8e653bcb85bfa51281e72ddfacebadef5277a SHA512 50341f4e5134a275610a5b86e833d1963a0726c2ddc14f4742053c60ad336ee209e73441aca46c8670920ee47a81c76bbd3f9e6412d253a5b389692ff8f3c1f3
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
+DIST pyo3-build-config-0.22.3.crate 31297 BLAKE2B dbac8f03e96ba1bfef9b31b3e28e7f81a79f24a9596ae786f602633dc18dbccb583380d324e3e2ccdc2909c57a23d1e488f300ac123c7f8309e052fc97c9fe28 SHA512 42265d570b07b23603783903181c49c4a8bfef1a67055510d9c8c9a504c8e0435b8bae9a352740be791c5562e0abdc48f97ea1d7c03cfc270e821e643dbadea2
 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
 DIST pyo3-ffi-0.22.0.crate 67420 BLAKE2B 65e4ed1a1ce854f37380aa23637a494226b98941b9e3f13eae8f627db0fea248c3cc93c7e594090407ab169cfdb27ab20c47f7004f2b4646103ee34da9a55f31 SHA512 cede32dc8025badcdd6d00b4a1204c6ceb5ad30fa0b637deecca669f2ee2b8961f88d9d867caa8cae59f498dc4e1c15f3b4049c5f47615e215b0f289fc560bce
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
+DIST pyo3-ffi-0.22.3.crate 69099 BLAKE2B c085c9485f585ab8c2a636385dcf90dc70fe854285b223a298283803c98ff21d3c3623a2cc8a00b61950ac07c123efa7c244d4c924eb0945b4a6c6023cd7e4d5 SHA512 f964b6b0ed17f968a06106f5396a23c5162f66bcf36e897ecf7b37cbd059f28093400c602b51d9a28dfdcfc8af6ff21c4fd68c6627b049a319c85096bf6024cd
 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-0.22.0.crate 7889 BLAKE2B 0b61caaed415023341dfd675c578e39cc3e5b2a08eb8c439857c81cf6cb895837f5df28decd7c08a3aa365411ff33a97eb5fe2f20e18427bda133f7df53349ba SHA512 ed9e9d6322fb8d3fd11114899c3ad84ebbc5b5eba58e5aabfc7f9691f02ec053f1c2804cea93d21f2ac9332f5b719b7fee9878faa95f21eb2a2d86f9050c7339
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
+DIST pyo3-macros-0.22.3.crate 8183 BLAKE2B 5ef8297c67f2910580caa349951580b4d962329f1324eb3a53ef946cc5f41ffe10f4af1d7184904621cd0f318a94618af43cf785f3a3ef57fc4747c47db02820 SHA512 c0ad8480ef7f7ac5287a3bbd363136c63668b2cb77f475d5a6cd5921aa9dcf0336baf6a464b4d2a0068fb21724184785faa79d75b588f90359e8aa250a17e85f
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST pyo3-macros-backend-0.22.0.crate 64837 BLAKE2B 4961b8c8720bfc2bbd11089a658d64cb2b1e43e150e622d53490faec3b905344d256b2092238ebb1dd92290583ee7d04a12eb5759bd55276e7042e1c948c71bd SHA512 09496c7285b9faaad820cfea237ef602569de3adeaa3362727182b0cd1c8377ef55c0c28f14eb703ea73a86c94acbdfb1384b44ef32b318a76c730a0430ca233
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
+DIST pyo3-macros-backend-0.22.3.crate 66032 BLAKE2B 33c2e8cae9b44e4a4806833f780e03f553ef0e6dbac733e9232e406fb64757691fbdfb65fd864280e14e8af8a4bb9c485a3c02227e8d1286ce11f1d4dbd61c28 SHA512 7b52977e02aca9bf4754d60957e69d47f9f447fe8bda40f146bbbd31eb7ebf2fc01c600c9b279f97cdf203e2cc66d96c1617c08041bc1215a02a80a90244417c
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
@@ -96,10 +102,13 @@ DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87
 DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
+DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
+DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
+DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST rustversion-1.0.13.crate 17267 BLAKE2B f2cc10a9d998b95bedaecb60298b11637724058634b00844d7e3e77dc321d8c7578bab9a9362b94c6b4b30558df538578fe7a4a05a130fb16795e913b3fda8bf SHA512 4705face9c4e2570c6a7c8bd61ccfe1ce68bcc7bd11dcbb9e7321744de38277d1f66429b59498adad3cbfc25de68dbf194c2d244ab74003830ba5fcda47e621a
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
@@ -107,8 +116,10 @@ DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
+DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
+DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
 DIST serde_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
@@ -174,4 +185,5 @@ EBUILD pydantic-core-2.18.4.ebuild 3289 BLAKE2B b9449f3cb7c97c29db006b02d3d80f7d
 EBUILD pydantic-core-2.20.1.ebuild 2938 BLAKE2B 0970ae5ed65cc8bc9a374edeef9104db8eb2d4cc654a5919a42ca2afe9ef6287abb06b366b1eb0d0aab40a4a645d01ca321a74500170d3e1d5c8414c74d4889d SHA512 71cbc3101fbc9481cc53dafe8ce5e2684a10dcd66eefeb4acdedda197d75df8494db0bd8eff00a291c6d6112a8192e1d17f17c15597b3cab5b5b1ebcd1b19b6a
 EBUILD pydantic-core-2.23.4.ebuild 3514 BLAKE2B 0cd744ff1b95060d7ae5048fcb109c32feee764739e3d50e5698b528b2039c069db63e8bcd54b8651c58423b17ed71488fd7d37d6dcacb9a0db0ca2fe31c03dc SHA512 99565b57e0ea316eadb58b6cdd518d8a61e99ae0cd8b839711485cd8148aec96b75ed5f1179ea6734d7a7e30c712eb2eaaff87a2653d31c71cea551a3c010696
 EBUILD pydantic-core-2.24.0.ebuild 3520 BLAKE2B fd17a132956115661bbfbcd4866b9620418d1ad3dc062a8db339e620850a955dfc4e3374bbde28487565b41df1d6502f2d57e0fc70381e00214e6f69c9db8721 SHA512 2f8daf60f7053956b17b40bb668683c2ee0377480761c7d52da2d4f5774519f065807be1094b60fb4bf9a02b2bf3c9dff038b3c1e8d3292389d289401c15911a
+EBUILD pydantic-core-2.24.1.ebuild 3520 BLAKE2B b311cebb009c108c4a5efcd28bd7d559ebea8ac73797ee34f2ae6f4c380401e01cdecd94ea6c0c0742dae3f7623f3a2c521dc851e9c9c2800a3d8598e6187dfa SHA512 cb8f8fc5d23422c54acce3c20ccb62a308100402a92bc55a39b4cd60b52164b721f109d01384a4a0ad5f9c4870fe3aaca0c1859143a49d45c6d8328baf89355a
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild
new file mode 100644
index 000000000000..0dbd7b85e7a4
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+CRATES="
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	autocfg@1.3.0
+	base64@0.22.1
+	bitvec@1.0.1
+	cc@1.0.101
+	cfg-if@1.0.0
+	displaydoc@0.2.5
+	enum_dispatch@0.3.13
+	equivalent@1.0.1
+	form_urlencoded@1.2.1
+	funty@2.0.0
+	getrandom@0.2.15
+	hashbrown@0.14.5
+	heck@0.5.0
+	hex@0.4.3
+	icu_collections@1.5.0
+	icu_locid@1.5.0
+	icu_locid_transform@1.5.0
+	icu_locid_transform_data@1.5.0
+	icu_normalizer@1.5.0
+	icu_normalizer_data@1.5.0
+	icu_properties@1.5.1
+	icu_properties_data@1.5.0
+	icu_provider@1.5.0
+	icu_provider_macros@1.5.0
+	idna@0.5.0
+	idna@1.0.2
+	indexmap@2.2.6
+	indoc@2.0.5
+	itoa@1.0.11
+	jiter@0.5.0
+	lexical-parse-float@0.8.5
+	lexical-parse-integer@0.8.6
+	lexical-util@0.8.5
+	libc@0.2.155
+	litemap@0.7.3
+	memchr@2.7.4
+	memoffset@0.9.1
+	num-bigint@0.4.6
+	num-integer@0.1.46
+	num-traits@0.2.19
+	once_cell@1.19.0
+	percent-encoding@2.3.1
+	portable-atomic@1.6.0
+	proc-macro2@1.0.86
+	pyo3-build-config@0.22.3
+	pyo3-ffi@0.22.3
+	pyo3-macros-backend@0.22.3
+	pyo3-macros@0.22.3
+	pyo3@0.22.3
+	python3-dll-a@0.2.10
+	quote@1.0.36
+	radium@0.7.0
+	regex-automata@0.4.8
+	regex-syntax@0.8.5
+	regex@1.11.0
+	rustversion@1.0.17
+	ryu@1.0.18
+	serde@1.0.210
+	serde_derive@1.0.210
+	serde_json@1.0.128
+	smallvec@1.13.2
+	speedate@0.14.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.68
+	synstructure@0.13.1
+	tap@1.0.1
+	target-lexicon@0.12.14
+	tinystr@0.7.6
+	tinyvec@1.6.1
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unindent@0.2.3
+	url@2.5.2
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	uuid@1.10.0
+	version_check@0.9.5
+	wasi@0.11.0+wasi-snapshot-preview1
+	write16@1.0.0
+	writeable@0.5.5
+	wyz@0.5.1
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	zerocopy-derive@0.7.34
+	zerocopy@0.7.34
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Core validation logic for pydantic written in Rust"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic-core/
+	https://pypi.org/project/pydantic-core/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
+
+src_prepare() {
+	sed -i -e '/--benchmark/d' pyproject.toml || die
+	sed -i -e '/^strip/d' Cargo.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+	local EPYTEST_DESELECT=(
+		# TODO: recursion till segfault
+		tests/serializers/test_functions.py::test_recursive_call
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf pydantic_core || die
+	# tests link to libpython, so they fail to link on pypy3
+	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
+	epytest -p pytest_mock -p timeout -o xfail_strict=False
+}
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 2de1f57fec51..b4ca80e834d4 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,5 +1,3 @@
-DIST pydot-3.0.1.gh.tar.gz 280784 BLAKE2B d87d06bf5f62ae783ecb4ff6a16b0986969de49cbf45e120df5e722620fe614181700f8117b0a6ce24fd4aac4f618d4dc16c631f581ebb19bea73a5a92437585 SHA512 6aca6e91134e481334c12a7669d3f5df1181f9a4e2ab914a6c8ab87f28d0afa9d97cfc0d9b665d9fdedb3c335624d68967d491f79fc669573aa81cf1401316cd
 DIST pydot-3.0.2.gh.tar.gz 295058 BLAKE2B dac56e82520c09f3000f7c6bf04d8d933f22958086675d8c7e26572d039388f7561b3aa7150e49cc1957d44dcdd4828058369ccf2ba5f88a9280f67dcbc18196 SHA512 b24b2073781b6c3256e3d9e76514193493d8a8d9eadc8ef1db3d13b7c4d3ddbdcfcc008b3b70abbe9dcb11d2036b4b3a3dda6ca13277fb5413f699a136a58b80
-EBUILD pydot-3.0.1.ebuild 865 BLAKE2B d51c73fa1c183d12ca8d436e8054ba13f2be9962b1ec58c9d2ee616d380881fbb2f57070ed661f6fa0dd90533c889ce9e685164064c1a00ddb2c32ed9ed6ea6b SHA512 1f0fc5d970da40d10e2bde578e2caea19c0585a3b7d1c1425eebde061c2d966662d543b5e79a62180941423d1290a7e4b7e8ccb44ae9bc3c3756eacfd5514baf
-EBUILD pydot-3.0.2.ebuild 866 BLAKE2B 4106819bce263ed9790c76e26fc66afd0e3732607d3bf946cf6a3aa23fe00ac7900f1b1a89d7d96f2c4e8f4ef91c6c98a65a5f5b3478a01a8c35294e99f841e6 SHA512 d5d4e0c4253f9dd03ef6cff5e8663c41a8fe028ea58847f15c7b3b171aa1c339b3a41051d666c244cd2930bec2d6c3f779aa90b78d16d4eb2f581f89867c146e
+EBUILD pydot-3.0.2.ebuild 865 BLAKE2B d51c73fa1c183d12ca8d436e8054ba13f2be9962b1ec58c9d2ee616d380881fbb2f57070ed661f6fa0dd90533c889ce9e685164064c1a00ddb2c32ed9ed6ea6b SHA512 1f0fc5d970da40d10e2bde578e2caea19c0585a3b7d1c1425eebde061c2d966662d543b5e79a62180941423d1290a7e4b7e8ccb44ae9bc3c3756eacfd5514baf
 MISC metadata.xml 372 BLAKE2B faad24394ef27dedc8b563e505444b414fe95cb6097bd2bebe01232e68c975b77d415c2a05ec1ad19f0ce1218d1c3f057beea6deecef01b940962a287ad8ce46 SHA512 281a6e2097fcf978f7e691640e257a5f60b242570f8a5715e078363c5658b96b50d3c29ccaad448c0b2ac3dd7b898dcae457bafdb08952163de8d1af81954d75
diff --git a/dev-python/pydot/pydot-3.0.1.ebuild b/dev-python/pydot/pydot-3.0.1.ebuild
deleted file mode 100644
index 997491b7ba3b..000000000000
--- a/dev-python/pydot/pydot-3.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="
-	https://github.com/pydot/pydot/
-	https://pypi.org/project/pydot/
-"
-# pypi releases don't include tests
-SRC_URI="
-	https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-3.0.9[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-BDEPEND="
-	test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pydot/pydot-3.0.2.ebuild b/dev-python/pydot/pydot-3.0.2.ebuild
index 849a61311a4e..997491b7ba3b 100644
--- a/dev-python/pydot/pydot-3.0.2.ebuild
+++ b/dev-python/pydot/pydot-3.0.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 3b32d8bdbdba..76c8b0a0572c 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,5 @@
 DIST pygit2-1.15.1.tar.gz 768818 BLAKE2B ca418afc24a680cbfddee00ec9b6c8f4987ad65abd3d61b56cfc1682ce97a3685654f7663857a2a996c2c4f393ef2addfd336c5f5f548f3a1860056ba998bb40 SHA512 4795dbc7b05000955fea86e1b51209a77dfaf99ea806aa8a2be538aed8094638def3e15b0507c61ab57cad2b8e5faee7f1c90ce5c2b20094f972638e7c9bd20f
+DIST pygit2-1.16.0.tar.gz 768597 BLAKE2B 30e8df4c3f992e075117bdcda3d84e2ed0618dd8556ae8574f6238992cacff69ec3c7c22a6ab85f7857156fbb4b3e6e75bc899e71ea59efcb1f8dee61687355f SHA512 297fc46f2e48e77937718e54b3ef2bb41a252348173fc5858ab4225fc3403a4d29efd2d6377508220d8bdf901f6cd9595c31601d8c0f77e9dc9a44f159a1d278
 EBUILD pygit2-1.15.1.ebuild 831 BLAKE2B f21714e69afa6a811a1ff2fd834444fd7183a34b78a8492b17b94abde5c275f9eb26dd8764571d8992ac3cb6734b708ece96f6d34cf2407de9d4eda653404925 SHA512 2710380f031d4e362fd4c733fe52baedd5d63e890529516bce78988810dc640865582419018a623326b80b9798c6fbba5cc4fee7df1efa4fed8f52295d15ddf3
+EBUILD pygit2-1.16.0.ebuild 833 BLAKE2B b0cadecbc1fcded73a8a2bf7e0a186911bcfba2cc69607bd0e897538af7f803733680ab121faf49a100a0aa543d8254f75f8ecc5790dc3894b5178e0232f6cfb SHA512 fdb23ad9f771488841f3ae789e85d5dfc0a6375500552a40fe8d1d9780b30bbaf62a8ce8b1d6314a1c318e68a8f7a54d19aaa5076716b3386d2b7274f2d6a8ab
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.16.0.ebuild b/dev-python/pygit2/pygit2-1.16.0.ebuild
new file mode 100644
index 000000000000..2cefd0c5b7c2
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.16.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	<dev-libs/libgit2-1.9:=
+	>=dev-libs/libgit2-1.8.1:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.17.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 2346f6402180..c3bf87b2326c 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,3 +1,5 @@
 DIST pykka-4.0.2.gh.tar.gz 48536 BLAKE2B 57825e0cbcad0afc33870de000820cfcd400d195715d8c48f133470ab8c9c26d9f8ab1a9cb54e847fe163b240258c789ec70bcf3627dcfbad1d469eee7c2d9c0 SHA512 43d31258f73a6d43c467d108066dd3e852db9e21a04fda030137dbd65052a874e346ed78b79a4929b25d2744a286c95d5d425ae150428ea1594a24f2a6c6a164
+DIST pykka-4.1.0.gh.tar.gz 48569 BLAKE2B 7b97988d543cb6205c698cb91d292aae8312b5e0ccffc8113af0201a97abf01d67e15b2440c2d2473f7005a3e5cb475fa55d333f332f44e0995a4a0e07c9cf95 SHA512 ffb83329f3fc7dc9caa0d63e17138186286975259573540842eb8840e383cabc1959827659de22360fd6542332865f38fb23f75c89a16e224360ef4dbc33ecc4
 EBUILD pykka-4.0.2.ebuild 599 BLAKE2B 50984514b6ba435e2d84d070e1ebcbd1aa860ef70ac4f3d5609e37d52331bc1b9bfb0d6d682167ae0be329ff53e3b12ee57c8c25d2bb79007cb29b4c9c979cba SHA512 dc80740925af1fd0068d8efdbf657d8414ced1ee14262bcd74afa006e4693c39f67d4276b83042e8baf213ee00468e3313c2b89ff4f36b4799a59c54dc52db0e
+EBUILD pykka-4.1.0.ebuild 645 BLAKE2B 57b490a9cada8db46bcc10618bc8948f2b69e0fff397b827710d26f3728e5c0ff324b457be5089a7964e748eef1143073f89af988e85102f0f619d392b24d9b6 SHA512 39e7b49cd5f26fe4c99dcfdaabb5a65c87c44a60c5de51d3a29a78f1e1d8b7fecff5d6a763990732ce68b6c548fba29d8476318885e5897e86df496a1dbcd718
 MISC metadata.xml 360 BLAKE2B 6a3cd04142f75ec9e5c91d91e2d267e618e9824ea8b9b6be452c77b22c7d2f29d41068848f32c4e03e85f90767d4a8c83d2064cd9e20dda4997194fcc1bb9e81 SHA512 1fef48dd8d3bc9397d4bbbc90a8a1a3db7f39a1e6795e9057d6bfcde6ada8f939b2589235b07824c15ee348c42f1ffb372a10d7a49741d7db57b542ce31c11e9
diff --git a/dev-python/pykka/pykka-4.1.0.ebuild b/dev-python/pykka/pykka-4.1.0.ebuild
new file mode 100644
index 000000000000..74fa9c7b7177
--- /dev/null
+++ b/dev-python/pykka/pykka-4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="
+	https://pykka.org/en/latest/
+	https://github.com/jodal/pykka/
+	https://pypi.org/project/pykka/
+"
+SRC_URI="
+	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		>=dev-python/pydantic-2.9[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index b9babd436f0a..bc12398af65f 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,7 +1,3 @@
-DIST pylint-3.2.7.gh.tar.gz 1448329 BLAKE2B 4ec4a0e2a886e7acc4694582e7f7902b6806750a12286986533a4e57c68eeac96bec43bb4cef2de6ec0a7811cde5ec2cc03226b2213d1b2107aafe73db03c32d SHA512 66dbf0f05aa7aac59f43cab6a1f23c29a3a37d9a19f2c54af0e0aa6f2630fc74d7602a6b6a250e1e02a24723d0513c54a7ee704026af16c8acc50b843708fd98
-DIST pylint-3.3.0.gh.tar.gz 1453518 BLAKE2B 407ab1a3db4ae832c8ab7f26c3d3cd02c686305050f0dbd1168fe00e2e267aa169a99eb7e9a3a858a5ad58752a1e8a193692224c39971da93374da72a3d66ea7 SHA512 52bfc54691e5ea323032909c6e2bd8f265c70cc4941cb51ce4eb25e86ebfb22c54fdd9c92a8b5c518cbbcbb48894a9ae7bf2dcd6c2993533acb21ff3f9786f02
 DIST pylint-3.3.1.gh.tar.gz 1453572 BLAKE2B e756d72c0757a8d90491fddaa5a60cccedde043b4dbaf9162ccabd920bbb864bf109f619483474748a606dedb4bf889a57edb447ef77a40c7ee35e2019caf277 SHA512 86cb0019f53477346de44a7cf22b6ee6ec791d2cfc23ec0c1ffcc749752d52f255aa5dcfaaf7b124706ce8a87013d5e592c0896c527e10b8df06c974f440d3c6
-EBUILD pylint-3.2.7.ebuild 2466 BLAKE2B f4fe7a099c040cdade243651084839039420bae8600b7f053797225fe8f18b8682051b40e4128f7a369f2ca1d4454fbcdeaff22a57f6584c150b1582716d98fd SHA512 a95a371e24b4d427fb02f334ddbaf2e0f7989850db2b82aed0d7f41e9dfa0a7a05742355ff3c0867f14b26214e86d588b9fdce03b0c3d65333e08381039a19ca
-EBUILD pylint-3.3.0.ebuild 2416 BLAKE2B ba8e36d32f7f8621eda16968fc1605a8c9be34130fd9b3062f4b20d48a5f823ed1e13f9a71a837a1451560b397ea29a2d1b937cfbe9dffc488802740aeefdd2c SHA512 7b3750a442b961340d04f3e2f1d94c16cfd9e270038ee945b0aaed49363229c933ead500ba57ac9bcd15ac061f623eb8bb3795fba0e9d7a484168b40c9de465d
-EBUILD pylint-3.3.1.ebuild 2416 BLAKE2B 9ceae542e18562dc416a300e6e32047243cf7ecab61b0787896ee3dc723bf3200b49c4594240877d66d4aaff8c35b5a7f5bf8b972b717d884ff40c6f96140fd1 SHA512 a1edf00835122dc0a1282251da1bf478abb5fb412a917030f1833292505e08c7c2c9a6a824de849b1469909960b543f9da433b174f3202e41d7561c0310204f9
+EBUILD pylint-3.3.1.ebuild 2408 BLAKE2B 0889518d0bc1b14b074641965572f3f3ee00fa282849c453970a8999366b63a78dcb23646df80d34d05c746b18948eb9b920612d2128782a8b904b132aba00b5 SHA512 c117c821dc0fb9f81c74ba42f8715fd3e5bd790e456df2ec175d42d5d8c2015cd0f4f0a4daf7177f3f9954528670d74ce4632f440435bdd1dc8ec0e42dcd4f28
 MISC metadata.xml 1105 BLAKE2B aa9d049b732f9198685901a0ec31f4a615da8398ce1741558e7b2c3840890da0c5ac6a2a23e0fd4cd45fb443b92f69b3fe4fb7f9d7570b1a75a0d0784231f392 SHA512 5f5bb3e31554bdc0cdcdaf1d7df9194e32da649784124714783c5d280c7ab4a9f65317b5d5e6de47698b2f30a019051191cb7ef3066902b606e2582a31f01c05
diff --git a/dev-python/pylint/pylint-3.2.7.ebuild b/dev-python/pylint/pylint-3.2.7.ebuild
deleted file mode 100644
index e4130fdfaa58..000000000000
--- a/dev-python/pylint/pylint-3.2.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.3[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.2.4[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[recursion_error_3159]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.3.0.ebuild b/dev-python/pylint/pylint-3.3.0.ebuild
deleted file mode 100644
index 186712e92fd2..000000000000
--- a/dev-python/pylint/pylint-3.3.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.4[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.3.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		>=dev-python/pytest-8.3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.12[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.3.1.ebuild b/dev-python/pylint/pylint-3.3.1.ebuild
index 78ddf6bce504..f71a53d29b76 100644
--- a/dev-python/pylint/pylint-3.3.1.ebuild
+++ b/dev-python/pylint/pylint-3.3.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 314d228b2228..86338b3be5ab 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,11 +1,5 @@
 DIST pymdown_extensions-10.10.2.tar.gz 829801 BLAKE2B 8da4c0afba79a4736621ce8b644a42b4918c04685c1c0312f6a184007c456f92e106fdfd9ae9be64a32bba1d907b6a528fdc49267d1153c0393a8c20c4ded527 SHA512 5885a8f9ea774a5718647a9d546dc5285186d19761441cd1ef39d5f8be40ee13f8fb6cf8791f890001affa6fe051962a45f8cfe8c1d0c549eb4bfeab956494f9
-DIST pymdown_extensions-10.11.1.tar.gz 830215 BLAKE2B b32f11d7c3ee3c680b6a225ec44e7eaab4bd23cc95dd96fff29a037938384ac348ef0405a3fabf9dfb2bccc705e2cc2293d04dec7e323a47612c9a1d2ca7188c SHA512 cb04fef9cf6e2c2371287f0cc914b892a519392bb573b04eb547f96c7167cbd93da5848324c5693fc3e9cbec61c9a6d45b22d12d5164db4a09621d8de1d44999
 DIST pymdown_extensions-10.11.2.tar.gz 830241 BLAKE2B c4048ae6931e7c540b8fd97080daa2290df74be76933874c91db09edac49a272c079d8767b15f28ecee0bf2efa3569179f236d6c4e703dd0d324feabab8da3db SHA512 9636552de1a9ae4519e1c6d7ca7b9c6cd0eb8b4be27a844ea926937cfa00add0b9ca8894f3b8f95e7c95ef0b6012e9a5d0c5b8d0f9aa20d7300fb4878c6f91da
-DIST pymdown_extensions-10.11.tar.gz 829898 BLAKE2B ed0acbfa6ec4b8a61e1a05817aff8abc94545fe9c6da9c43000a696a25c7f3ec7a27b9398079c2cdecad397fff6ddd8716ea07d36c00272ae7ae144a513e39f3 SHA512 a06c00e64635fa6223a7e764e3f5f4604cc7d8ae4c2a8f6e47f6f799e877a213eab5398e67d7bb6586142ad03b2c155897b559bbb66d50e343405d15c53fe7c0
-DIST pymdown_extensions-10.9.tar.gz 812128 BLAKE2B 2427c41b8587e8b0c4d9bedc4e7c413959545f6c1a12b2c9453861bdb349cbd5bb70327384821f6423718296f56efa17aae21db79bdd038f330246555bcd538b SHA512 3642ccf18a85ffe6ac03dcb132f4b64009490e2a6d0cc70c322ef7640de2a5895a321f755f2d6e16f9c9e84b112c12ded2db18ff73d3201f7b9e0a10c8cd78b5
-EBUILD pymdown-extensions-10.10.2.ebuild 719 BLAKE2B ae1ad392f5db068b381c94da4d2f347d5f5e42530e27c7417ac6443a8961c890a5fba8f32fae1ea314d5e036523813791b051721106bc4e76d3abeb770451286 SHA512 0aa712ee104fe3f72d072bdfe49f4544f0549c0f978bfa0cec5388cbb4b05d4fe7dce19f5fa7e6c015ed3795b90f2977c66f03332350b1dd7f3dd8b10b1cf68e
-EBUILD pymdown-extensions-10.11.1.ebuild 719 BLAKE2B ae1ad392f5db068b381c94da4d2f347d5f5e42530e27c7417ac6443a8961c890a5fba8f32fae1ea314d5e036523813791b051721106bc4e76d3abeb770451286 SHA512 0aa712ee104fe3f72d072bdfe49f4544f0549c0f978bfa0cec5388cbb4b05d4fe7dce19f5fa7e6c015ed3795b90f2977c66f03332350b1dd7f3dd8b10b1cf68e
+EBUILD pymdown-extensions-10.10.2.ebuild 716 BLAKE2B 27275e4a6432d8f8c4d682c5ce0bec5ffec05f9768b39d3e74652aa092056fc1e39100799150e4346f5a23a14e8dedd5690041098123dca668987c637764f262 SHA512 3d170cc203987a3d7f2513a96323769f5eca4991706555d8a93cf22d087d6854e357eb885a1e5089c1853a32eb936607e442f2d27a6e83024a682748c477fd0f
 EBUILD pymdown-extensions-10.11.2.ebuild 719 BLAKE2B ae1ad392f5db068b381c94da4d2f347d5f5e42530e27c7417ac6443a8961c890a5fba8f32fae1ea314d5e036523813791b051721106bc4e76d3abeb770451286 SHA512 0aa712ee104fe3f72d072bdfe49f4544f0549c0f978bfa0cec5388cbb4b05d4fe7dce19f5fa7e6c015ed3795b90f2977c66f03332350b1dd7f3dd8b10b1cf68e
-EBUILD pymdown-extensions-10.11.ebuild 719 BLAKE2B ae1ad392f5db068b381c94da4d2f347d5f5e42530e27c7417ac6443a8961c890a5fba8f32fae1ea314d5e036523813791b051721106bc4e76d3abeb770451286 SHA512 0aa712ee104fe3f72d072bdfe49f4544f0549c0f978bfa0cec5388cbb4b05d4fe7dce19f5fa7e6c015ed3795b90f2977c66f03332350b1dd7f3dd8b10b1cf68e
-EBUILD pymdown-extensions-10.9.ebuild 716 BLAKE2B 27275e4a6432d8f8c4d682c5ce0bec5ffec05f9768b39d3e74652aa092056fc1e39100799150e4346f5a23a14e8dedd5690041098123dca668987c637764f262 SHA512 3d170cc203987a3d7f2513a96323769f5eca4991706555d8a93cf22d087d6854e357eb885a1e5089c1853a32eb936607e442f2d27a6e83024a682748c477fd0f
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
index 8447dcb9ba40..acf98580e863 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild
deleted file mode 100644
index 8447dcb9ba40..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild
deleted file mode 100644
index 8447dcb9ba40..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild
deleted file mode 100644
index acf98580e863..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index ef4f74aa1e89..c44298904415 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -6,6 +6,6 @@ DIST pyproject_fmt-2.3.0.tar.gz 9151 BLAKE2B 37ebb5617bd5384e4d43d9378e92c4e1b12
 EBUILD pyproject-fmt-2.1.3.ebuild 818 BLAKE2B 8f0c6b65487bdf064145af0347c1c3fd4cb62ea510cf0775d181d016ba7b99c923c09c3495ae95a12c877f38db8e82633ff4a06487126b75a883472aae048cf2 SHA512 1e04c5d3bfc79f4d8b87162658abdcdcfb767822389b1f114663a75019f4fd69dfae404ac3a268abad530936e7ba16b2c967385dd3d6ce618c49bf3bebf0d8db
 EBUILD pyproject-fmt-2.2.1.ebuild 819 BLAKE2B dd57658b6ac99fc9a69443aaab611f43339795b4a5d70983636110d7fbfd23fa3a01313377cda371126c55453f25baf5b8268aaf5bf49d756329e55b75ee235b SHA512 7d2a939cd03fb76271d7dcc560723f7595a29ee73d01938b19d033395d113d0d50824c1df1053e937811ea53241dfde4cd62011cd17395e64255121ceea5421f
 EBUILD pyproject-fmt-2.2.3.ebuild 820 BLAKE2B 665d0fbaf16b72f612e54f15bd14886b89d748ac1b759ed3a6e1bcea060969a329cf5e82fd5d87f891269a1effa4029457a6303411dde066e8b98401ec85defb SHA512 9e9185019ee4960c1951deb0b40a0d44a62613ee23ef7818744eede2da73c924102795fadffed09413a7fcc2be3c811929b7226c6c974709e427471d4fbea3ec
-EBUILD pyproject-fmt-2.2.4.ebuild 820 BLAKE2B 665d0fbaf16b72f612e54f15bd14886b89d748ac1b759ed3a6e1bcea060969a329cf5e82fd5d87f891269a1effa4029457a6303411dde066e8b98401ec85defb SHA512 9e9185019ee4960c1951deb0b40a0d44a62613ee23ef7818744eede2da73c924102795fadffed09413a7fcc2be3c811929b7226c6c974709e427471d4fbea3ec
+EBUILD pyproject-fmt-2.2.4.ebuild 819 BLAKE2B dd57658b6ac99fc9a69443aaab611f43339795b4a5d70983636110d7fbfd23fa3a01313377cda371126c55453f25baf5b8268aaf5bf49d756329e55b75ee235b SHA512 7d2a939cd03fb76271d7dcc560723f7595a29ee73d01938b19d033395d113d0d50824c1df1053e937811ea53241dfde4cd62011cd17395e64255121ceea5421f
 EBUILD pyproject-fmt-2.3.0.ebuild 825 BLAKE2B 0e1fd3b5bac1b3241ccfdf82f8bc38efeedbd8e82af0208ffebef587b1daf6d78809769c4cbbc7253bdd87af00dd5ac3dc9f342c6ccfe0f022a8e1146c9c3ec3 SHA512 644e5924a3581088b844259dd4eaa82398018112f600b105098f25283bd7611868017a1fc099ea4f57886cd3dfcaa899c6cf8832aacaa4dee6fb69524a5bdac7
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.2.4.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.2.4.ebuild
index 9bc087b77648..99508eb2bf87 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.2.4.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.2.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	~dev-python/pyproject-fmt-rust-1.1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index b45ad0d81a13..af1bc697ef53 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1,13 +1,5 @@
-DIST pyproject_metadata-0.8.0.tar.gz 14862 BLAKE2B 03c9a7fc9c53c56b27ea5c72789db10aa045d239c81bf30e926c0ed44d6b61028a27c4dbe02a40eb4ae7ce4a93efb24c63dd4b66f2e98f185fc68d96e96c350a SHA512 e3ec79bcb066fd952a7e88b62534775746b20a52b9952a303e80466c465e394264b8984ca30a1461cd8437334ae7b1a299be7d8036e99e3dcf59828d70650442
 DIST pyproject_metadata-0.8.1.tar.gz 15404 BLAKE2B 1f2ab911043b0511b2e13e78d1e208643a3d29d4b7152d305d432827d32402f0ae944e74eadc41faff7d641c642dfbc4482ce3c8aad6dfae385ff6c7df465465 SHA512 a9677d7d8d6004a86c92d3eb44c37494e2a4709c1ffcaad444d0f0e573ae56c753e6ec27efab6def03f89c357db7966f7dc9a819bf2cab02af2ee8718e7b5a39
-DIST pyproject_metadata-0.9.0b4.tar.gz 21975 BLAKE2B c80494dcb30bc40c5b64522a79343151750324907382448fedc449830ef14ea9cd74a2fb4a8ce663a95052b91b04354b736274d7149eb116862bd4757b6b9a09 SHA512 f8e023a88fe60278924fd839c69b3c9def8707c5a619aa24898677b9d1aec79c8b4513dbcbbb80a610dc033621ead8bc23840c921836d1e35d3d0605874be757
-DIST pyproject_metadata-0.9.0b5.tar.gz 26016 BLAKE2B 63586f314884f7b088abe9602582131aa45808a624006d508c234c801ada9eb117d42e29f4e3db4e73cc6fcc69e3f3b9f6469749e4614568e6bc25cbe7b36acb SHA512 5e9603d6b826ad52c2490afa107fd22ab8b78fc5e7f3dc220822df69a34f6845ee35c7cf167029250fedf62dea8162203579bcb879e182183485bfaacdc3bb50
-DIST pyproject_metadata-0.9.0b6.tar.gz 28932 BLAKE2B f82d1df56056f340a46a11a3a7a293a30b78d5067f52c4308f1e011b281e76fa2c8a191009687961acb808ead1248a90bcdee178ddd23c0571342782734d30ae SHA512 a2aa62e01022b018dc94deb72df6636c036f1484d608455a4751c80543ed91bb62c8f49e1121c0da2e11f85d71ffab3f098afb1e7fdf69b5d6fb834cd7a98d15
 DIST pyproject_metadata-0.9.0b7.tar.gz 31008 BLAKE2B 4935b537503b548d17934d2b9addec271e03766401860713382e2acced74a3bf30539bce506ade44e3a622c05104c7efa43058163748fd81e22852c6e47a1f3b SHA512 ef16c5662d8bb927760ea0a33b52fa2ea2fb60cb35a5a45854fa1f2596c4cdd4dec458dc2aa90b0edbf5f745989774528ad57b41fef0e271a097ddc21622405c
-EBUILD pyproject-metadata-0.8.0.ebuild 685 BLAKE2B 0116014fe31a9a7bd8a6b80d67be72395ae6841980498a1a25483f601667ddda4577f124ae6c6aa831620a263f8b5bc214fbc89a7599d088877d04dc6708a61a SHA512 f6e76b6b50d36cc3b86c5dba76b769a694ea5c258dc2b539c90acf3da8b16ed250373187e3600c48f5cf35e0fc7a1fb06432ff004dfcba78e0877573a03928c0
-EBUILD pyproject-metadata-0.8.1.ebuild 693 BLAKE2B 7c4fde8e1a9ac3455c1281e8595feef403da8c1dffa7a89bbe78e5fb57b08ec535a320fcaecd8f44060837fa5e8d4ea9e7b0bea90a559c55e5dde666db4f65ff SHA512 57ee8f7d7dc7a809f199b8ad0fefece7fcf59c7bda84206688a57b12a57e0615a24be7be2a3c9554504b9194d963f45b167895425f88aa5d1f3a96a84a88a6e2
-EBUILD pyproject-metadata-0.9.0_beta4.ebuild 693 BLAKE2B 7c4fde8e1a9ac3455c1281e8595feef403da8c1dffa7a89bbe78e5fb57b08ec535a320fcaecd8f44060837fa5e8d4ea9e7b0bea90a559c55e5dde666db4f65ff SHA512 57ee8f7d7dc7a809f199b8ad0fefece7fcf59c7bda84206688a57b12a57e0615a24be7be2a3c9554504b9194d963f45b167895425f88aa5d1f3a96a84a88a6e2
-EBUILD pyproject-metadata-0.9.0_beta5.ebuild 693 BLAKE2B 7c4fde8e1a9ac3455c1281e8595feef403da8c1dffa7a89bbe78e5fb57b08ec535a320fcaecd8f44060837fa5e8d4ea9e7b0bea90a559c55e5dde666db4f65ff SHA512 57ee8f7d7dc7a809f199b8ad0fefece7fcf59c7bda84206688a57b12a57e0615a24be7be2a3c9554504b9194d963f45b167895425f88aa5d1f3a96a84a88a6e2
-EBUILD pyproject-metadata-0.9.0_beta6.ebuild 693 BLAKE2B 7c4fde8e1a9ac3455c1281e8595feef403da8c1dffa7a89bbe78e5fb57b08ec535a320fcaecd8f44060837fa5e8d4ea9e7b0bea90a559c55e5dde666db4f65ff SHA512 57ee8f7d7dc7a809f199b8ad0fefece7fcf59c7bda84206688a57b12a57e0615a24be7be2a3c9554504b9194d963f45b167895425f88aa5d1f3a96a84a88a6e2
+EBUILD pyproject-metadata-0.8.1.ebuild 685 BLAKE2B 0116014fe31a9a7bd8a6b80d67be72395ae6841980498a1a25483f601667ddda4577f124ae6c6aa831620a263f8b5bc214fbc89a7599d088877d04dc6708a61a SHA512 f6e76b6b50d36cc3b86c5dba76b769a694ea5c258dc2b539c90acf3da8b16ed250373187e3600c48f5cf35e0fc7a1fb06432ff004dfcba78e0877573a03928c0
 EBUILD pyproject-metadata-0.9.0_beta7.ebuild 693 BLAKE2B 7c4fde8e1a9ac3455c1281e8595feef403da8c1dffa7a89bbe78e5fb57b08ec535a320fcaecd8f44060837fa5e8d4ea9e7b0bea90a559c55e5dde666db4f65ff SHA512 57ee8f7d7dc7a809f199b8ad0fefece7fcf59c7bda84206688a57b12a57e0615a24be7be2a3c9554504b9194d963f45b167895425f88aa5d1f3a96a84a88a6e2
 MISC metadata.xml 387 BLAKE2B 650cb0e9e08dfe6a53063142f0bb0877de29a0bc9b3684c745432d2c3f68eb8e3f7017f9869855947bb7c20ef1e914e5c6f9e994988045bbbc02c99a9ff01473 SHA512 29695056a6814d3b3238c698170ef4d83d6c8a896885c76356fe914b66e70bfc7c5f9923f8889c9c238417e3f387586700dae6a1bdf20f08af549f9b8663c488
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
deleted file mode 100644
index 2e9e2cbc7f59..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
index d6ad0b0f270f..2e9e2cbc7f59 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/packaging-19[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild
deleted file mode 100644
index d6ad0b0f270f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild
deleted file mode 100644
index d6ad0b0f270f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild
deleted file mode 100644
index d6ad0b0f270f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index ef044571b294..0b051df75e9a 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy-exe-7.3.16-1.amd64-musl.gpkg.tar 12933120 BLAKE2B 4a70fc1b6724a75cd4d162a0a61f43242cf6ca889e8f00bc8ed4813aa2e303cf2ebc90bda48fab5aad06de3ac4654e1fdd48c94ab0be44fcf58879655b8dcb98 SHA512 dc1be0e135669593ad05f94b2696bd7cc41a9f3b0e3e46dec4f3909ff6763463372e2da0d2ebf6d4c04b966b6b78d552593bc4de52cc3a0a9e1c3d9f3d499338
-DIST pypy-exe-7.3.16-1.amd64.gpkg.tar 12943360 BLAKE2B 1991240985234b17410387e08008619aa15bbd56d5af855fe2aa75b6fe7936efeab0e42e10fee11d2a6a4eb26de1ae1a470f9a14b842b00a584c18db82bc4df1 SHA512 e0b4a8ca3d312931a2d1ed08f4a98c513ec4ef03c925d82a270357887e1d83c68aa4b68328106a000e4135c96081395a52fd28eec02bbbff06ebec12d4b815a2
-DIST pypy-exe-7.3.16-1.arm64-musl.gpkg.tar 10915840 BLAKE2B 51ea5c558283fd8da09b1ad410a2287a7512d6f5a5b1cd6882bfb10206a81c025ed08ee99cd05caefa41ddf1e6f17d6935e04e756bae7f2e2a80dd19d4a290e8 SHA512 0835866ad97e1e2aed406d8d346356a2095b3cb18fb22648f510063ff76cd9c29cf09877dda6f6ab2637748b376890143372b2012a322c60ced65be0e1b0d7fb
-DIST pypy-exe-7.3.16-1.arm64.gpkg.tar 10864640 BLAKE2B d33b2e35cbc81ef72ee9c04072664e1481ef8b2291be8d74a4bc2e3a5c177abf9344cc0880cfd5bfc04b684edcb6a12851b72ae77744cd36aae0b9cdaee616aa SHA512 9c49541850d359577ad5057e67fbfde13b7e0bf381305c5a15dec14e818f2ac6fcc59dc1654271b6e2f6a04914c7afa40f0caa8c7904c6eaa6633b80780e9500
-DIST pypy-exe-7.3.16-1.ppc64le-musl.gpkg.tar 6707200 BLAKE2B 3d3a3d0c0fef3a69c6c0e6a16c91abf3c8c3a232883f01c13121ed22d3c608ff62347823342e78892a080b84f52652507b870711452e087cab201d0acb58c7c4 SHA512 c36327ec441875c7ada54e3ae9e95651307f03a3dcd447c1d112527c72ddbdcbc303f5769a837e8b3c528d13aeb35ffe1cd9b11ba0575b0e5859138a67f7a2c6
-DIST pypy-exe-7.3.16-1.ppc64le.gpkg.tar 11038720 BLAKE2B 1a7aa31d9ec59a3aeb57c254d2b9efde9d02aba1663683999f1ebae95b2ad0c68a2fc8e4806420b1ad9f45ce4767f8e048b9607d1f124291770a99b423ae799f SHA512 5659cdb5a4a001d9c878670b0f5e7d06e6aa55d8fab403ab80a98e6b362bb8185b01fe4af092cc9042a1762ca52cc0ce81937c84240d08ebb84071cd860559e2
-DIST pypy-exe-7.3.16-1.x86-musl.gpkg.tar 9912320 BLAKE2B c6a42ce64cfda1a148af49e0876b640fb3ecaa7e70b5d5b22e58b9796c11b0e4d9fb5536927b7b20b05b9eaa2210333cb1b1be81581483a21a7a3699e5721e01 SHA512 8964ece7482218e06ab65b790f8f1fcf15a94c270daa9a2381b35ae335717a02f0b32947578fa03f0905a0783cb5fcf3ef03cb87a7ceaa7110c8593e483a971e
-DIST pypy-exe-7.3.16-1.x86.gpkg.tar 9861120 BLAKE2B b83fa9e3c3bbbd7c49ea2fdceabd7125e0db36ee20c2b71969833512f69070e07a1485ab830261f34e2571dbd48b9b65ffb580e9f8ae4b667626ca81b560c493 SHA512 eb2be6886126c675fc85458d34a0bcdd1da1415c843448e39d413b80d363698cb48b3b68bf8869b5ef898f0543966ab501bd4db545d7659705c279bf4de29ae6
 DIST pypy-exe-7.3.17-1.amd64-musl.gpkg.tar 12974080 BLAKE2B 965c086bb660e50c8c58a2c4ffdb9d762d7d99a4c2bc619af4c7b5916dce263170809f75af24f34f7ea8d60f4c1aea8dace5102493363e0fc4d55bd994234cf5 SHA512 731c5f4f9680466e848ee08e3e459773fef5d36622092b4479852aed3ef069a0a544a7711312b65b2c40e3cb96e56037301d09b51ec775842d67e8416ea0200c
 DIST pypy-exe-7.3.17-1.amd64.gpkg.tar 12881920 BLAKE2B ade52bb94ef78629ca6154b8e149e4cb1af72efae3c1f30217659532b68aac50e083c378d029c25f9ec5c6d7323467fcba91af1c1d1d9f6ba375669b2df9099a SHA512 4d4861858daa9046fb036cd489dd6a13e5490034aadc60bdc49e05a3edee4b95578a41b635bc3b95a7eb5ff59375585a44956914a9003765fab2585750118848
 DIST pypy-exe-7.3.17-1.arm64-musl.gpkg.tar 10977280 BLAKE2B fc56e03dc73a2c1881f6adcfa30eee3069a3ffc7b7efc77e85703bb831f2b183f794104f39934e78b29f4e1fea42f520200e456fe9902fe13efdfcaaba5dba67 SHA512 28af13342a8f0d9c435106b0f7c991ddaecdd995ff1f3c84cdc85ae78d69e6d7088e488776eb10f933aec20b0ce0522a2c4b2ef6efddff6fdab5a5e6c3e80d63
@@ -14,6 +6,5 @@ DIST pypy-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6696960 BLAKE2B 805d8fb087b8123437f
 DIST pypy-exe-7.3.17-1.ppc64le.gpkg.tar 11110400 BLAKE2B b8e3f503f448226c7d59942281cb64fe4bd648a5777ec483de0f549221ddcf71f347f88b9c11070f8875657851e07cfdf4e9ef634e811c0a3dda664cd04543ca SHA512 e4e2f16e2eed8946a1ad07ba3d4ba8677beeda3731b46838a5284e6309b3966ddf8fa9992c4519b19797f633d2288d4f231fc41e992e83683de0ad7b239c5d22
 DIST pypy-exe-7.3.17-1.x86-musl.gpkg.tar 9891840 BLAKE2B 3391ad3558baa88741a38549e12666ee669d5949f234e104e5687001928aaf7836573192ded6342fd690337589da10d4f45389c02d15cf3bc10ebc4a7de2d12c SHA512 cf30b7c8f779317126ced75d84b383644a4d90cc65a9d2e75019dd68bb29079fdb0e96312c26ee3f7185f6c64e3a7a0c21d66fdcf18a5c68ce87936dd49d6043
 DIST pypy-exe-7.3.17-1.x86.gpkg.tar 9850880 BLAKE2B 08487e276cf616c5c9191a0a29cc6a297f9eab5ce8382d591b01e7da3239b4bef482bba1566b17ca85f3729b4d5ae6bef6d13940b5e7b1dcd9a7b03d7eaec2ac SHA512 70f6660321483361a1de6e5ccf2854daf892282858d2a0a00ce3055103d7f90f1788cea4b5b18913f11c17ce0f6c999551ee5374f897717d33eb06e913310960
-EBUILD pypy-exe-bin-7.3.16.ebuild 1981 BLAKE2B 9a1fdbb307258d44bb18d872406426ca154e3a029e5e54a06d7b420bec290b08e7d2cc12ecad688b7b67b1c4b62781c91e2eea0af2c716bfcaec698c136f60bf SHA512 74ec12199918322c5b3f14a8ac974e82c2830670cd8c3302d05c247d1a2bd57419be2222216213837937a0c2007af4c99d470b8a29a2df4d3d3f7ad8dc5ab814
 EBUILD pypy-exe-bin-7.3.17.ebuild 1977 BLAKE2B 89689dca15e803f96e85554c8a07fd4fc135419000ec528e29f1996a08feb953aa4a4db0229e288bc984d1319b8c9f0676be3725f0b69dcb179ebd59a70898b6 SHA512 8a1449cb2983b12904abaf238c665ba3bd4180d9ec6e03ead0b2e0b1030a2ec34cc7d828dd58391f1e030ef65b348a06cb6cb88e6af6881a99be7ce429eae545
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.16.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.16.ebuild
deleted file mode 100644
index 900de22d9f93..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy-exe:${SLOT}
-"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}
-"
-
-src_install() {
-	insinto /
-	doins -r */image/usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index bef4e552f3ef..6783d99ae6ab 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.16.tar.xz 5312 BLAKE2B b265dd7afee097ad66bacd9df01514eed6bb30afe19410b2594ee7c2d61ababc67e11c0dd0392a0b1f81e0bc609963cde044834ab24e67d007d101b8aa8052cb SHA512 0d0309f3ed7314f6d310b0e34eedbbfdcc5a75d9bbd59b9071e567968bb10925549435776fab5bc7ec97e2b3422921dc282619427f930d89df6c7bc98ea701c1
 DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
-DIST pypy2.7-v7.3.16-src.tar.bz2 19843601 BLAKE2B 9c37a03561fcdf742eccde760f6cadcbc2e1b140dd6d3e67856cc072e0c3db85759c398f590ed44fb4e4ed2f5f7745d5589cb9a95cefcbec79f3b1be6c4956e1 SHA512 131635433e53d4d86730a3daf1ad81799a7dd1117511618cc2607ac7234ce3aa5c833400df09cbd3376a391e125d6d2ec3471f120f81a6d53700f5c3d087793c
 DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
-EBUILD pypy-exe-7.3.16.ebuild 4149 BLAKE2B bf785cb4c08173ea4f3a69b193b7c7945b6ef24471665c5fc7226c68b73a9083f444acd7511ec2db881980623fc9847126a8de57ff8514bd17b3997787a60929 SHA512 68db0c972d9e62985689186f59a1e1ef46402ed651a518a5438e82683fd189810460c737953ef9b14b76a4ddc7db9e588f6d53ced55e11b551c65ab40153048b
 EBUILD pypy-exe-7.3.17.ebuild 4145 BLAKE2B c9add38786df70b002c33d5d69e48daf23bb1e913b37ba624ec6085ae8b99e1b9ecb7f286168760fe34c0422d16f224003c5dafea47f42ef207feb769fb4d411 SHA512 2115539a8ed944d1a1fe05b20aa0007ad9b884bc909542b06578bf0722af7eadd98a44365f31a2865ba5db4fcfa19c6e0b24803dacf2e338a86fb32fe220ad50
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.16.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.16.ebuild
deleted file mode 100644
index e6d19abc0125..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.16.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-RDEPEND="
-	${DEPEND}
-	!dev-python/pypy-exe-bin:${PYPY_PV}
-"
-# don't enforce the dep on dev-python/pypy with USE=low-memory
-# since it's going to cause circular dep with unhelpful error message
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)
-"
-
-check_env() {
-	if ! has_version -b dev-python/pypy; then
-		if use low-memory; then
-			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
-			eerror "installed."
-		else
-			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
-			ewarn "recommends using (a prior version of) dev-python/pypy instead."
-		fi
-		elog "You can install a prebuilt version of PyPy first using e.g.:"
-		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-
-		if use low-memory; then
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-	fi
-
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp
-	if use low-memory || has_version -b dev-python/pypy; then
-		einfo "Using already-installed PyPy to perform the translation."
-		interp=( pypy )
-		if use low-memory; then
-			local -x PYPY_GC_MAX_DELTA=200MB
-			interp+=( --jit loop_longevity=300 )
-		fi
-	else
-		einfo "Using CPython 2.7 to perform the translation."
-		interp=( python2.7 )
-
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 29774ad5f4a4..6873d4c7b31c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,4 @@
-DIST pypy2.7-gentoo-patches-7.3.16.tar.xz 5312 BLAKE2B b265dd7afee097ad66bacd9df01514eed6bb30afe19410b2594ee7c2d61ababc67e11c0dd0392a0b1f81e0bc609963cde044834ab24e67d007d101b8aa8052cb SHA512 0d0309f3ed7314f6d310b0e34eedbbfdcc5a75d9bbd59b9071e567968bb10925549435776fab5bc7ec97e2b3422921dc282619427f930d89df6c7bc98ea701c1
 DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
-DIST pypy2.7-v7.3.16-src.tar.bz2 19843601 BLAKE2B 9c37a03561fcdf742eccde760f6cadcbc2e1b140dd6d3e67856cc072e0c3db85759c398f590ed44fb4e4ed2f5f7745d5589cb9a95cefcbec79f3b1be6c4956e1 SHA512 131635433e53d4d86730a3daf1ad81799a7dd1117511618cc2607ac7234ce3aa5c833400df09cbd3376a391e125d6d2ec3471f120f81a6d53700f5c3d087793c
 DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
-EBUILD pypy-7.3.16.ebuild 7116 BLAKE2B fe3d6e44dd3f162f7f4bc8ce3365f518db8b83573dfb0755617fdedce637540515e0f759498a1dbfc91b456db5b51461004a4a191f97153b6f2cf58f93257df8 SHA512 8a59e6cd8cf2a6839d9e831541ef49bbac6f8988636a37c2e0a38b42c5f49358114c7fb6f70c88abc2c71d4c1eb6ee42bdb087bd98c47ebd6aca907eacaa24f0
 EBUILD pypy-7.3.17.ebuild 7112 BLAKE2B 82db9a2b01d07def2e3a7ddc8529d0301369cf786b83842afb76526052aeeaa8961c855b58563a4b8f9fa0d80e403719ac6a885d4787827b4a8fe06a243df6ac SHA512 2836ee6924956d3f800c3d36328c0a3301cd1b4a0f7ee36fb4a37b213792919585d4d2a9756bf07537a729b67a66bf20d3a6b4c9b5a9011e508c3fc9a47aebeb
 MISC metadata.xml 622 BLAKE2B 91a78c7c4050edc5e4f42da93c5233fbaeff11133708650ed5c29c1e44eb4b038679f4ab3f87f38f5e61eb89107def4bde09cd5d73e3dd1638b0e9565febde97 SHA512 75bddcaf5fe5c33523a78b5bd9b66a8d97b61d50f11ca8765cf7ecf4e962e88586476d1fdb8b7d33e9562a5cfd4b3fc446ccf07f62d25fe38f04c58485c8654c
diff --git a/dev-python/pypy/pypy-7.3.16.ebuild b/dev-python/pypy/pypy-7.3.16.ebuild
deleted file mode 100644
index 798e07131013..000000000000
--- a/dev-python/pypy/pypy-7.3.16.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
-		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy-c - <<-EOF
-			import sysconfig
-			print sysconfig.get_config_var("SOABI")
-		EOF
-	)
-	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	if use full-stdlib; then
-		# Generate Grammar and PatternGrammar pickles.
-		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-			import lib2to3.pygram
-			import lib2to3.patcomp
-			lib2to3.patcomp.PatternCompiler()
-		EOF
-
-		# Generate cffi modules
-		# Please keep in sync with pypy/tool/build_cffi_imports.py!
-		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
-		use gdbm && cffi_targets+=( gdbm )
-		use ncurses && cffi_targets+=( curses )
-		use sqlite && cffi_targets+=( sqlite3 )
-		use tk && cffi_targets+=( tkinter/tklib )
-
-		local t
-		# all modules except tkinter output to .
-		# tkinter outputs to the correct dir ...
-		cd lib_pypy || die
-		for t in "${cffi_targets[@]}"; do
-			# tkinter doesn't work via -m
-			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-		done
-
-		# Verify that CFFI module list is up-to-date
-		local expected_cksum=-7df4eab0
-		local local_cksum=$(
-			../pypy-c - <<-EOF
-				import binascii
-				import json
-				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-				print("%08x" % (binascii.crc32(json.dumps(x)),))
-			EOF
-		)
-		if [[ ${local_cksum} != ${expected_cksum} ]]; then
-			die "Please verify cffi_targets and update checksum to ${local_cksum}"
-		fi
-
-		# Cleanup temporary objects
-		find -name "_cffi_*.[co]" -delete || die
-		find -type d -empty -delete || die
-	fi
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-
-		# broken by expat-2.4.5
-		--ignore=lib-python/2.7/test/test_minidom.py
-		--ignore=lib-python/2.7/test/test_xml_etree.py
-		--ignore=lib-python/2.7/test/test_xml_etree_c.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	if use full-stdlib; then
-		doins -r include lib_pypy lib-python
-
-		# replace copied headers with symlinks
-		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-		done
-
-		if ! use gdbm; then
-			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-		fi
-		if ! use sqlite; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-				"${ED}${dest}"/lib_pypy/_sqlite3.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-		fi
-		if ! use tk; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-				"${ED}${dest}"/lib_pypy/_tkinter \
-				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-		fi
-	else
-		# install only the absolutely minimal subset of modules needed
-		# for pypy3 build
-		local lib_py_modules=(
-			# base modules needed to even start pypy (and import site)
-			codecs.py
-			copy_reg.py
-			encodings
-			genericpath.py
-			linecache.py
-			os.py
-			pkgutil.py
-			posixpath.py
-			re.py
-			runpy.py
-			site.py
-			sre_compile.py
-			sre_constants.py
-			sre_parse.py
-			stat.py
-			string.py
-			sysconfig.py
-			traceback.py
-			warnings.py
-			UserDict.py
-
-			# needed for python_optimize
-			compileall.py
-			getopt.py
-			py_compile.py
-			struct.py
-
-			# needed for rpython
-			argparse.py
-			atexit.py
-			base64.py
-			bdb.py
-			bisect.py
-			cmd.py
-			code.py
-			codeop.py
-			collections.py
-			colorsys.py
-			contextlib.py
-			copy.py
-			ctypes
-			dis.py
-			fnmatch.py
-			functools.py
-			gettext.py
-			hashlib.py
-			heapq.py
-			inspect.py
-			io.py
-			json
-			keyword.py
-			locale.py
-			logging
-			new.py
-			opcode.py
-			optparse.py
-			pdb.py
-			pickle.py
-			platform.py
-			pprint.py
-			random.py
-			repr.py
-			shlex.py
-			shutil.py
-			StringIO.py
-			subprocess.py
-			tempfile.py
-			textwrap.py
-			threading.py
-			tokenize.py
-			weakref.py
-			zipfile.py
-		)
-
-		local distutils_modules=(
-			# needed by site
-			__init__.py
-			errors.py
-			sysconfig.py
-			sysconfig_cpython.py
-			sysconfig_pypy.py
-		)
-
-		local lib_pypy_modules=(
-			# needed by site
-			_sysconfigdata.py
-
-			# needed by rpython
-			cffi
-			_ctypes
-			_ffi.py
-			_functools.py
-			_sha.py
-			_sha256.py
-			_sha512.py
-
-			# NB: we're deliberately skipping _hashlib to avoid some deps
-		)
-
-		cd lib-python/2.7 || die
-		insinto "${dest}/lib-python/2.7"
-		doins -r "${lib_py_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib-python/2.7/distutils || die
-		insinto "${dest}/lib-python/2.7/distutils"
-		doins -r "${distutils_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib_pypy || die
-		insinto "${dest}/lib_pypy"
-		doins -r "${lib_pypy_modules[@]}"
-		cd - >/dev/null || die
-	fi
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	"${PYTHON}" -m compileall \
-		-x 'bad_coding|badsyntax|make_ssl_data|lib2to3/tests/data' \
-		-q -f -d "${dest}" "${ED}/${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 321040e9d2b0..37e4d8fb5d98 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,5 +1,2 @@
-EBUILD pypy3-7.3.16.ebuild 583 BLAKE2B 5ba38cc1ca041e6f7cbcb152c0673ee3566d4a1eb708d5277b4ffb621c2c082fa6b3bd0f2620b6cfb310584abaafa84c84722bca7a6ec3567a4b8c4d6b8221f9 SHA512 f67c2c9d20329ca2bcd5c3044bf71b4bfac7628f21829ac7c4d9929f44aa1e849b0b418b445e35985d4e28872596971624ddebb9fc2fc16308c421faa38fd5dc
-EBUILD pypy3-7.3.17-r1.ebuild 610 BLAKE2B 819c4c9f0b328bb56b89788b9f8d84820378498a26740ff9d34d82aa5c69c37c9c510345c5413a850fb4ac77d0def3b01e6b3468a59d64f58b3701b6b01c136a SHA512 4ff0bf1889edac592fd5c25a94b786d0c802113f06889eca400b7a7ba52582824ab469b44caf8c0b0f284eb83e264b9ea990121f1da6b6f9f3a2b0a0c738e8f5
-EBUILD pypy3-7.3.17-r2.ebuild 874 BLAKE2B de130bf9e599590828f59c8076074d1d536735042120aaf8579ea3f3b1f7b21dd749dd0a721508b7da735302cad6a22329c0660f13e5a3ce70906e36bb3e1f58 SHA512 e0e1246e41d59ac765397808cee86f51cbb79e5bc8fc194ab77113787f2b6fd360486c755042d58b5997b5242724971f0004c95224fa798c6a25bede89e719af
-EBUILD pypy3-7.3.17.ebuild 581 BLAKE2B 2fedd21c5c8aca099b2b63f4575ef2592a57177d82ec945d8488d292fd38a12c27bd39a305a547c7cb8ab0fbf67580197b6c18e3aba330f9ea25db2d996be703 SHA512 9fa7e2114458ace8ac3f8c8040f8d6f5e45f4fc147c9196cd7565c32a869be7582330e8a3d484ecef5d7c3e3780a8bf4c145ea6922f601ce2bf51f17d44494c6
+EBUILD pypy3-7.3.17-r2.ebuild 872 BLAKE2B a9ac9cf61d9c958548c54bc540de7eaa6c6d1ebc14fafc9a8c875a357aa36e8c98b5517cdd2fe9f412cb574b6d2e4d6b8e1a8087a38e7ffab3487c86a08c1517 SHA512 32bb02c9c0dc2f93137911fcc48f85d3e78df9eab63feef8973bca7af79baee1bd4c181a46d1c3366f241c0d601bf339b8406973c089c1bec975ed33fc92158a
 MISC metadata.xml 472 BLAKE2B 64b7aaec2df3c39ec7193df560cdc665d68eeebadc42d537ab1295d29b0e0e63ad576c8771c24ef65ed8e6ec8011b1b4debdb6af74be7dedf203a24304a96fd7 SHA512 bb3cc9675f2ba4f898f4b8d38b60569379a663269380371539bf299fef3b27796cb55c2e5258aeae7e2f82f683187e7c39256184196e424d50a867f0be46084a
diff --git a/dev-python/pypy3/pypy3-7.3.16.ebuild b/dev-python/pypy3/pypy3-7.3.16.ebuild
deleted file mode 100644
index ba301054faf0..000000000000
--- a/dev-python/pypy3/pypy3-7.3.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYVER=3.10
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+gdbm ncurses sqlite tk"
-
-RDEPEND="
-	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
-"
-
-src_install() {
-	dodir /usr/bin
-	dosym pypy${PYVER} /usr/bin/pypy3
-}
diff --git a/dev-python/pypy3/pypy3-7.3.17-r1.ebuild b/dev-python/pypy3/pypy3-7.3.17-r1.ebuild
deleted file mode 100644
index fec2cbc0aee3..000000000000
--- a/dev-python/pypy3/pypy3-7.3.17-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYVER=3.10
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+gdbm ncurses sqlite +test-install tk"
-
-RDEPEND="
-	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,test-install(+)?,tk?]
-"
-
-src_install() {
-	dodir /usr/bin
-	dosym pypy${PYVER} /usr/bin/pypy3
-}
diff --git a/dev-python/pypy3/pypy3-7.3.17-r2.ebuild b/dev-python/pypy3/pypy3-7.3.17-r2.ebuild
index ffbd004f1259..8830766aa934 100644
--- a/dev-python/pypy3/pypy3-7.3.17-r2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.17-r2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+gdbm ncurses sqlite +test-install tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3/pypy3-7.3.17.ebuild b/dev-python/pypy3/pypy3-7.3.17.ebuild
deleted file mode 100644
index 4aa3928c48c5..000000000000
--- a/dev-python/pypy3/pypy3-7.3.17.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYVER=3.10
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+gdbm ncurses sqlite tk"
-
-RDEPEND="
-	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
-"
-
-src_install() {
-	dodir /usr/bin
-	dosym pypy${PYVER} /usr/bin/pypy3
-}
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index ee6182dc99d0..ddbcd1e9bf61 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy3_10-exe-7.3.16-1.amd64-musl.gpkg.tar 12042240 BLAKE2B a770fce3044ae928c74fcd96be293fef7b87f9f8857ed430d44761eecb28b34879fb86c6c4a032e80fdbf20aede88fcaaf2a53dbe56e0cc150269807cdb28928 SHA512 a9d87be0ef72ac928c35db89321edd713cfff93f93ff2b2c5a04e91febc540859dc4e0a065ec3da2c297cc353f9278ac43d57494d282546c8e4cdc1cbb4a4cec
-DIST pypy3_10-exe-7.3.16-1.amd64.gpkg.tar 12083200 BLAKE2B df6a53532cc10ade867f60d81033ee4ff46e9bb8a3331499acde65866a31ba5e25b6af6df316e4e7187005f6c98609171d5d8908a03ea7088f6306c3680d369b SHA512 89a889ae565e4d2772075eab72246ca5940e905b01f1c91082af583ec28390d018f441f427fa408e84de0b2d24b1deb28602297c653c4aeb25d3ae34e929f9ff
-DIST pypy3_10-exe-7.3.16-1.arm64-musl.gpkg.tar 10219520 BLAKE2B 0fa144cdfd144c881baf71a3ed8d222165571bea07c41079af42846c1a7a633fa146ed128dd7466bff8e7911c7518e6d576bca24326d1248ad96fcb5854eec85 SHA512 dac544bd589c11c52c74ef99216b15ffd3155d764c47f8957c49369e98f2caa8feb0fb278002cb3b1244731f19b5e0c0dd2cf7e59efe49045206325b62daf5e0
-DIST pypy3_10-exe-7.3.16-1.arm64.gpkg.tar 10178560 BLAKE2B 5d9227b35bba2229679e2e103b6c6964ea1a8b88581dbe306e8d03342f6a889dac1127b615a14f85cb9c53fbf496b1f7e1236b7b8f590930dcf4d92d9a87c914 SHA512 1d689bf08fd9a1ec5892e2f81eae1d0f49fb410873e6d2914db698a2a4e0cf1bfdd7725e8d932a20ce69d4ea40f86ae16146dc9fba1c65858ff1f7f5bece4b6b
-DIST pypy3_10-exe-7.3.16-1.ppc64le-musl.gpkg.tar 6819840 BLAKE2B a3ae523a26a187b7af18329483c8129e52df3bb7cc9f611769e48d4fee6ec627e203d7138bec39e4a45c7feca83d5ab913239ba30f52c797f85f2be252ea39b5 SHA512 74cd507c48e639e67beb9e4304237ddce926ff1a07df9e6fe5041305290db1ba3a506fae570b57d2f3c9c732d0deb558c8d0883183434286bc13812098c02a45
-DIST pypy3_10-exe-7.3.16-1.ppc64le.gpkg.tar 10352640 BLAKE2B 53d2804ef1a95de1edf4765261deb4c53accf59b8b2d827b2dec24a279424629322a701bd3942d05e4e13f52e796c119c237d32bf334287daad8664e1e76e67a SHA512 8016ed28f076936e3477d75d47e20af79fb97d138f924c514fcd32a02ad4b9bf3eb0d09a82d08f99843b102b4a048b78a694963e223a936b029ab903a5c60a21
-DIST pypy3_10-exe-7.3.16-1.x86-musl.gpkg.tar 9093120 BLAKE2B 56a349615ce67c3e581da65ac3b52cdc412760aea689d4b8bf6b9f5d2a4285ac67557ee6791363a0faaa1ba10f20b9d761529f278f3737b304e79682353bf1fc SHA512 cf9a8e4475c2d3c8d7c3756c7b4a61fd4effde3010b33f67aa40354658952dcf2ee7d05f6db7912bf8015dd76cf7bb08bfc7d9aea2f168bec23acab9a9068239
-DIST pypy3_10-exe-7.3.16-1.x86.gpkg.tar 9093120 BLAKE2B ef908156f0dd9376495330fe0278aa2565c5428bfe46aaeb9f11dabee2ee998969028296cef3e5b71e6d8963bd7573ddded8583e3410f4c66b7b1f17a9cb52aa SHA512 d65132d4a89f7f0764095fee1a3f10d4b7821ba45745a3576179ff2e74f24f38538fe5df6812e654cecc71fe7feecec4e2b9518c8b51aea9b66d43dca935949e
 DIST pypy3_10-exe-7.3.17-1.amd64-musl.gpkg.tar 12103680 BLAKE2B 4b542d95bf6a3bc214b4e8adcde98d49b717676f7e22f1347b976570cc852fc70a832224fdae8093cb5b2c47b2aa3075c65dc6bba93720fd2146c6670cf97eea SHA512 b0782c86646f24856c9868a493b19fc9af3596bc703504f09c153f1d11938a6dcded68664459d4043b86638b0e30440ac272bf13b85fd91021112dc663b56c9a
 DIST pypy3_10-exe-7.3.17-1.amd64.gpkg.tar 12134400 BLAKE2B e7ddd040e6f7d0b76aeb6dce53e86924e5e72d5ea7928aba103613dd40cd7c8e4d6fb3837437b3ffd2467b117c4851a84db2e4f5eeda36c26a6450d26e7ef20c SHA512 674be340c85e23a18c5b2a7af05093949606a314042fa282b4ea2b8c8c0c99d57a511ea8623a9d2eab23be711db8fdcd3ff5dc71a71b8c59288a861e6e43aae1
 DIST pypy3_10-exe-7.3.17-1.arm64-musl.gpkg.tar 10229760 BLAKE2B c25bd05035b225b09c59ecac3c24e4c770f254b2286be4967a2e7f674c0d524e55fe66fad76ae18d1a8b2297c0d06d9757590e69900028bdbf299037327f83f1 SHA512 0f5be025d421dc822235ff0ad9c317f22671d6b20fb3ea2bdd860ca48306a854e94469f7aeaf4ca395e6ea01e6ef1969b7cae6ae311db1823b4fae1616a8c2c0
@@ -14,6 +6,5 @@ DIST pypy3_10-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6819840 BLAKE2B 1cc0c5c2c82f831
 DIST pypy3_10-exe-7.3.17-1.ppc64le.gpkg.tar 10393600 BLAKE2B da4c97f4d5ee546d776ba937d3736033ded7f5cc0a17e39fd657952b834fe6c002d3c33cfc7b16572f07dd0421040d4bb82e897a101ac129a6082961d0d02c7d SHA512 c49c67eee76f604146aadfcc600312e028bb9f6a24560eefd1dec7e9e0c7304e0a1ce89fdf6229b50b51cd17fb50b89815d937ccac3ef5fcc1ef8ff99af5f237
 DIST pypy3_10-exe-7.3.17-1.x86-musl.gpkg.tar 9103360 BLAKE2B 80202a4f66bec51176c29f2506a28ac296e63dd89102c68f62cfb868f455ac51a1e49557962c271e2a99b41001ad21b56790bb05aead361d59b7bea2c526721f SHA512 d7345e886c0ab4c8de987f5daaaddaa9983864e6343f3f64e85607ed897530f19fae653d412eb076b232ff6e7d52fdda4da0b05b4b4767ac1ac669a512e6fe6c
 DIST pypy3_10-exe-7.3.17-1.x86.gpkg.tar 9154560 BLAKE2B c388c0bed60fafddf5edc2f0bae19e04e643cc1ca44bd99f2b7b84c8b71d1a685faa48886aab3b5b2137b90ae3ebfa7b41fc6f98bcd99203f7997299ec52f274 SHA512 5c2ab169b5ece9c7c8fb9972ac74cf2aa8c5f385fd805800183ed8c0845540185065aff388b2d0ad56d901365454979c9051e70ec5ff2a9f7059b2812555f8ff
-EBUILD pypy3_10-exe-bin-7.3.16.ebuild 2068 BLAKE2B 0332db45eafd5c35c0496dea1b16a1c27c152684de0c9c1597cde5be063edd31c54490563c483aa8bf414784df83d754fe18c1b80dca37136f6b965bad443992 SHA512 0ffe92f81cce9369a52ffe44053dbda0eeed9f3ba7425a9ca85cda5513fc5cc027b8ac5f63727d9dadd5b652cc736bc6f867fda6096f024614fcc093cd1cc2ca
 EBUILD pypy3_10-exe-bin-7.3.17.ebuild 2064 BLAKE2B 8ee1cd2ea2d85a631483a82d522e13afa160fad05bd8e25bb8db6f59dc24eac88905c35bcad7c69b1e919431c279abb1d176c422d320af4f16e4d926235fe55a SHA512 34e36a2496fbe959b845b56c7dadba81d53381727f05a76e442d2ec726505305cdc6a33502786cee87c0a9982418e7a0dd930dc83a4c9a5c357af173c32216b0
 MISC metadata.xml 315 BLAKE2B da5ed341c55250028587ffb479a27b7ec31eb0f8bd0e11b8a98a374e23d989f7d5bcce647ca9c78cd12f64b6b83dd0568c4f3a992a6c8c5089c52cef9de87441 SHA512 ebe1c4d655c49fd20127dd240b603f1b99d67c0a6d21c7eb37bee48f4ec6bba50648816ea2b1b746af58fcf8de576d24fe355ecfa2de07ebaa0265ade2ea38ba
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.16.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.16.ebuild
deleted file mode 100644
index 9849a9ecfd11..000000000000
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-PYVER=3.10
-MY_P=pypy3_10-exe-${PV}-1
-
-DESCRIPTION="PyPy3.10 executable (pre-built version)"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy3_10-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy${PYVER}-c-${PYPY_PV}
-"
-
-src_install() {
-	insinto /
-	doins -r image/usr
-	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index f049adadd872..fe036833eb50 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,7 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.16.tar.xz 4752 BLAKE2B a5cd87f30c0b20bf5d49c3b5c979c12231d6b67750e777d4488093094d5998e6f0d9adba51c04704eb31d621089aeb12ee5a6b0a58dad0ecda0d60d2ecbdab6d SHA512 e2779841a3e56e384134416ce2a10e1e00a11d7c720023506370fb9f54363da6b7300b4019c121aa1874152b62d9679ebcd3dd679fd0dbd2bf524520990b6f38
 DIST pypy3.10-gentoo-patches-7.3.17.tar.xz 10340 BLAKE2B a9d7dc6a578dc50339574b2fcfff19e390293adfc8412592e4683fdd3ff415ed8da3ff809b00037659a6e218dc0b26efead7a2ae3c54b2c3487222144d5d9633 SHA512 b192685cc100cfb723492d29e89a522bb4ff041c78cbdfd170414e19713cf2a21c39ab8d4e1e9ca47da2559b2fed6df14f1122f96bc50dd117550c357046889a
-DIST pypy3.10-v7.3.16-src.tar.bz2 23358556 BLAKE2B 4eddae47dea1005b9450b9d3d23bd90782dffecdc252eff4fd3195a61e0e7ebbdafaf4c4b5d318c88534f152c1110c3bc4f76f43a7e711a859dd4330841a0e0b SHA512 5b941e3b5c7b0c7a50413e16122bad3e167dcc4ee159ce53e9716e9d5af79d600823f3d7442b7562bb568ff027723e22904fc0840dc06bd26e3da38c93cc5b94
 DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
-EBUILD pypy3_10-exe-7.3.16.ebuild 2951 BLAKE2B 753525823db90ddf87c15a11be7ca912142aa595efd627eae56e69f87d460cc2b70b837c1dec3545d6c3573aeae32cfa82f9fdae7291ef4c39bded06ece2960c SHA512 b06ace901bf477a2194fa77a4701f2435ef7315db11e3d94feb8f7eb7a0744dfc67b6fd81d7310746060d51794bce38e21805cbb658e1bcf5f816945db0f44e3
 EBUILD pypy3_10-exe-7.3.17.ebuild 2947 BLAKE2B 270c3a3f21a609c0e9097c060696f929373fc3a68f2cf7d957c77df4e6b318113d6cd536224f8f4064c0e24a8e90bb01dd57c68c67875218bbe33c9dedfba761 SHA512 77252602811c277b72828d07a212b93f826bdec50109728f7e7b28147847b84a6d3829a7becd9cbd73c136137ac19de3d432edb7bcf0398878d7e0450bf403dd
 MISC metadata.xml 572 BLAKE2B cfcd1422ec312338fd876bc4747a962ac3c4bd06e28a3891489b065fba4c7be2daa6955f51e8136d9b8cf7b68bb7eb887b6f419ee9fd626ebd6db204acb7995d SHA512 c79250d47e3d5c99c2c903bfc185449cc41f88e2b923b8eae1401e83c0f23fa1a12ad85f50b6e25844e805e543ae897ccf43185a1bdf9f992dff765249e55bc1
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.16.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.16.ebuild
deleted file mode 100644
index d8e6a582bb10..000000000000
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.16.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
-
-DESCRIPTION="PyPy3.10 executable (build from source)"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libintl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3_10-exe-bin:${SLOT}
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/pypy
-	virtual/pkgconfig
-"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	# Yes, yuck, but it's being worked on upstream (bug #918971).
-	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-		--withmod-bz2
-		$(usex ncurses --with{,out}mod-_minimal_curses)
-	)
-
-	local interp=( pypy )
-	if use low-memory; then
-		local -x PYPY_GC_MAX_DELTA=200MB
-		interp+=( --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	cd "${T}"/usession*-0 || die
-	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
-	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
-	doins *.h
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index 908ddaf13aab..f77f70940cf1 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,14 +1,4 @@
-DIST pypy3.10-gentoo-patches-7.3.16.tar.xz 4752 BLAKE2B a5cd87f30c0b20bf5d49c3b5c979c12231d6b67750e777d4488093094d5998e6f0d9adba51c04704eb31d621089aeb12ee5a6b0a58dad0ecda0d60d2ecbdab6d SHA512 e2779841a3e56e384134416ce2a10e1e00a11d7c720023506370fb9f54363da6b7300b4019c121aa1874152b62d9679ebcd3dd679fd0dbd2bf524520990b6f38
-DIST pypy3.10-gentoo-patches-7.3.16_p1.tar.xz 7696 BLAKE2B d51dd45ec0fd2fd2d8e8f6afb6fdb227268d86ca03885991c085aa3b374bdbe01c909cd9c25981a89955c3fcfaf258f09470b5a5649b9235a74f37dadb9a891e SHA512 b71168518a103cccff4740efb51dfad4eaaf647d81aff727805f5ee9e2fdc6971749b69c17c72e7fd04c97bbf37777180870eb17077fb742f20130b4b00ed712
-DIST pypy3.10-gentoo-patches-7.3.16_p2.tar.xz 10348 BLAKE2B 93b2672e935e4a23e9fff70848f377211b4a0aff55384ffac59ba3b376af9d1ab1d1b3529a5148490dd6e8da55cc038390efa7e4120c60c7ea77d158da88b5bf SHA512 0bff294d8a0ed576204c00ef7befec0c960cef50eaf1130056aaed2a5dac63a8045db977c5fb4ff9c5eb1863e8df2cb9f4d608ab88cd6ffcc8bd4ab13f5d6ab2
-DIST pypy3.10-gentoo-patches-7.3.17.tar.xz 10340 BLAKE2B a9d7dc6a578dc50339574b2fcfff19e390293adfc8412592e4683fdd3ff415ed8da3ff809b00037659a6e218dc0b26efead7a2ae3c54b2c3487222144d5d9633 SHA512 b192685cc100cfb723492d29e89a522bb4ff041c78cbdfd170414e19713cf2a21c39ab8d4e1e9ca47da2559b2fed6df14f1122f96bc50dd117550c357046889a
 DIST pypy3.10-gentoo-patches-7.3.17_p1.tar.xz 18104 BLAKE2B 4b6c8c012d34b7ead8f7499edbe4292f21d2d7437694341de0bfb5f74d0717a11eb1c302a60baeb3ab123851a2436657458dad47c2b86a81218eea12d6aa9344 SHA512 73e0733f07be79f444b2fbf18ca7dcad6a76368cb8c185eb630d82e6886ed909548bc1779bf618588e34a572b5d48be0f9a86fc5758d302cf3ff0e94649b4815
-DIST pypy3.10-v7.3.16-src.tar.bz2 23358556 BLAKE2B 4eddae47dea1005b9450b9d3d23bd90782dffecdc252eff4fd3195a61e0e7ebbdafaf4c4b5d318c88534f152c1110c3bc4f76f43a7e711a859dd4330841a0e0b SHA512 5b941e3b5c7b0c7a50413e16122bad3e167dcc4ee159ce53e9716e9d5af79d600823f3d7442b7562bb568ff027723e22904fc0840dc06bd26e3da38c93cc5b94
 DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
-EBUILD pypy3_10-7.3.16.ebuild 6330 BLAKE2B a1bcc9080b3c0def956587509c10266550bf023963d2aadf812573ea7efdcabe3ce09092701f11753ea45464f29cd9725f50fb9d47332a234ec08b2bc90b6d90 SHA512 5c8010fee5d31f303514bd33a831d1f756543940c76e6dae0ed2b9a43bdda656321ea8b3245e4318ddd9bd33688307e3a17bd4b1a3cf6db5b9e43a1c75924f28
-EBUILD pypy3_10-7.3.16_p1.ebuild 6330 BLAKE2B a1bcc9080b3c0def956587509c10266550bf023963d2aadf812573ea7efdcabe3ce09092701f11753ea45464f29cd9725f50fb9d47332a234ec08b2bc90b6d90 SHA512 5c8010fee5d31f303514bd33a831d1f756543940c76e6dae0ed2b9a43bdda656321ea8b3245e4318ddd9bd33688307e3a17bd4b1a3cf6db5b9e43a1c75924f28
-EBUILD pypy3_10-7.3.16_p2.ebuild 6330 BLAKE2B a1bcc9080b3c0def956587509c10266550bf023963d2aadf812573ea7efdcabe3ce09092701f11753ea45464f29cd9725f50fb9d47332a234ec08b2bc90b6d90 SHA512 5c8010fee5d31f303514bd33a831d1f756543940c76e6dae0ed2b9a43bdda656321ea8b3245e4318ddd9bd33688307e3a17bd4b1a3cf6db5b9e43a1c75924f28
-EBUILD pypy3_10-7.3.17-r1.ebuild 6655 BLAKE2B 7cb3a11447bb304c0d135ef44646e3ca962a50b49e3468c68cf01a4af34093c8c4c307eb8e7ce5423814432d10aa5d7b7d4e8ab7fc698a6148de6aba2f260f87 SHA512 a28ec9530db6e9c21ceeb32cabc7a51cf60c9b34adca71214577d764fd5ae9afea5be05962cae8a08ab9c50b58c21b748996aeb9c67be6b9ec4830df57b3911d
-EBUILD pypy3_10-7.3.17.ebuild 6328 BLAKE2B 9cbd5073fe863d95bd92d86086891f6fd1b1ec6ab9891ce5ca068a2e2a283554cb55931b50efe8f9161c8e266a986c916324cbdd8cf7ff6696ea95bab3c50182 SHA512 b3fbd4e63d90ee288b11e74aa19fee5dc8e248514463631364f0c57b580dfd68974708bbea15106c030aa7fcd72c4b913f44b86cf37501fb425fb02d3ca70cdc
 EBUILD pypy3_10-7.3.17_p1.ebuild 6653 BLAKE2B 3fa000ce70a18aafc1af8d009e384b63bd7663e43c8043f12e2616791a0ca69ac896cf7b71f2f386ce7503f13e4a4e4ecfb90c4081278f82175f433e7b8d2d8a SHA512 500c58625adad8a5b5f3ec347fb624fe80a602621cb9e5b0211424e223781c33131b78dee43b6763cd14c16371bd5a957dd5c554c6a1b0f2baec7990518aadcb
 MISC metadata.xml 669 BLAKE2B 451d043640c7347d9c29d91fcc43ea464a24a3ba0b619784c4c77ab352c4bd6fcd3d59c11e4133a38b2ab47bf26d6d859f8928f2cdb87311bb9724c322164d1c SHA512 fc90f500bf1220b7471cbb1f1debc5c39011f0f29e7ff756ba5880e9f91732cd79ad4b88394099a7bfbdacb35ce2419d32bbb3fa14f5c74ec1caae534583bc9d
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.16.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.16.ebuild
deleted file mode 100644
index 5e7deb31db00..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.16.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.16_p1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.16_p1.ebuild
deleted file mode 100644
index 5e7deb31db00..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.16_p1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild
deleted file mode 100644
index 5e7deb31db00..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.16_p2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://www.pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild
deleted file mode 100644
index 0771425196e7..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.17-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite +test-install tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use test-install; then
-		rm -r "${ED}${dest}"/{ctypes,sqlite3,tkinter,unittest}/test \
-			"${ED}${dest}"/{distutils,lib2to3}/tests \
-			"${ED}${dest}"/idlelib/idle_test || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	# remove test last since we have some file removals above
-	if ! use test-install; then
-		rm -r "${ED}${dest}"/test || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild
deleted file mode 100644
index 8b160362ba6a..000000000000
--- a/dev-python/pypy3_10/pypy3_10-7.3.17.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
-# many tests are failing upstream
-# see https://buildbot.pypy.org/summary?branch=py${PYVER}
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
-		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-lang/python-exec[python_targets_pypy3(-)]
-	dev-libs/openssl:0=
-	dev-python/gentoo-common
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	mkdir bin || die
-	# switch to the layout expected for cffi module builds
-	mkdir include/pypy${PYVER} || die
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
-	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
-	# (not installed by pypy-exe)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
-	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
-	pax-mark m pypy${PYVER}-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy${PYVER}-c - <<-EOF
-			import importlib.util
-			import sysconfig
-			soabi = sysconfig.get_config_var("SOABI")
-			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
-			print(f"{soabi}-{magic}")
-		EOF
-	)
-	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate sysconfig data
-	local host_gnu_type=$(sh pypy/tool/release/config.guess)
-	local overrides=(
-		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
-		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
-		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
-		TZPATH "${EPREFIX}/usr/share/zoneinfo"
-		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
-	)
-	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
-	local outdir
-	outdir=$(<pybuilddir.txt) || die
-	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-		import lib2to3.pygram
-		import lib2to3.patcomp
-		lib2to3.patcomp.PatternCompiler()
-	EOF
-
-	# Generate cffi modules
-	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
-	# (NB: we build CFFI modules first to avoid error log when importing
-	# build_cffi_imports).
-	cffi_targets=(
-		pypy_util blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma posixshmem
-		ctypes_test testmultiphase
-	)
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-	# testcapi does not have a "build" script
-	../pypy${PYVER}-c -c "import _testcapi" || die
-
-	# Verify that CFFI module list is up-to-date
-	local expected_cksum=a4138e48
-	local local_cksum=$(
-		../pypy${PYVER}-c - <<-EOF
-			import binascii
-			import json
-			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
-		EOF
-	)
-	if [[ ${local_cksum} != ${expected_cksum} ]]; then
-		die "Please verify cffi_targets and update checksum to ${local_cksum}"
-	fi
-
-	# Cleanup temporary objects
-	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
-	find -type d -empty -delete || die
-}
-
-src_install() {
-	einfo "Installing PyPy ..."
-	dodir /usr/bin
-	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
-	insinto /usr/lib/pypy${PYVER}
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r lib-python/3/. lib_pypy/.
-	insinto /usr/include
-	doins -r include/pypy${PYVER}
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
-	done
-
-	dodoc README.rst
-
-	local dest=/usr/lib/pypy${PYVER}
-	rm -r "${ED}${dest}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${ED}${dest}"/ensurepip || die
-	fi
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/sqlite3 \
-			"${ED}${dest}"/_sqlite3* \
-			"${ED}${dest}"/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/{idlelib,tkinter} \
-			"${ED}${dest}"/_tkinter \
-			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
-	fi
-	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
-
-	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	# exclude list from CPython Makefile.pre.in
-	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
-		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 2378f44b01ee..4f9f91c71150 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-bdd-7.2.0.gh.tar.gz 81301 BLAKE2B e47ec5873546596e913453f86d7c0654b8212de74b0bfa46022da093fa87191c9303559ec670bd37f94e282973192596c77a1f7293a608ae8dedbd863fc245c2 SHA512 d0991feb446f264f0f114693dccb67682a10a427cb5fda28dccafd67cc37810e00c34e3235bb38d02b7fa1edabf1359c6c119be9cfdce0ccf00235ca3dde337b
 DIST pytest-bdd-7.3.0.gh.tar.gz 81595 BLAKE2B 80c5323ba3c50fae17bb57ec26b968ca7d7b673d2aeb2716dee02e3543916ca8b5752d9af56d3d250f3a4b0a857a3dc760de615f0650eaf379380fb24a5b7c2a SHA512 e7c309552714a77d47e437a825e661dbf201a6945e84f4b611b5c3da3d0b4ceb535bde4809fc9633b82a74e2b52cc69c7e14b27a27032c7e4400727498442e29
-EBUILD pytest-bdd-7.2.0.ebuild 1044 BLAKE2B 134bef00e9c40656709015f7e8ca045b1ff0b79be49c21e3924c36985e85ac10c1b282c9fc9ff85d34a47dfd1caf54e937fe728ff87a5d63a77e34566aff0b6d SHA512 2973d27c6499113e3703d57cd00bc571769ab00a72fc75170f97ac06a8e51c1d803341c072bbfde751fdf39c3cdae1f2a927f3cf4cc8d0c280ff1c7941885e0a
-EBUILD pytest-bdd-7.3.0.ebuild 1046 BLAKE2B 083a9b5e26e92e0048005cc9517f07d8bdeb4e63013cf3e2c277d1eed27b7446577598184f812fcc947d3c50cfcdc641a285180edcc4c31f796640fda53ba9a8 SHA512 eb6df13d66686d1734b83eda4cfb4010a81aecb671030c9a44809fee83536909b569f6d48d50ce96d827fff139c77277ef5826b6c0295ba242793bfeec5fbc45
+EBUILD pytest-bdd-7.3.0.ebuild 1044 BLAKE2B 134bef00e9c40656709015f7e8ca045b1ff0b79be49c21e3924c36985e85ac10c1b282c9fc9ff85d34a47dfd1caf54e937fe728ff87a5d63a77e34566aff0b6d SHA512 2973d27c6499113e3703d57cd00bc571769ab00a72fc75170f97ac06a8e51c1d803341c072bbfde751fdf39c3cdae1f2a927f3cf4cc8d0c280ff1c7941885e0a
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
deleted file mode 100644
index 8123e325faa8..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pytest-bdd.readthedocs.io/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse-type[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
index 121c574146f2..8123e325faa8 100644
--- a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
+++ b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index df4d0e079966..ebce9b328f56 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-django-4.9.0.gh.tar.gz 78407 BLAKE2B 0ab7dd12494fdb5c66ceabc67c793f7d970258a1a1b7cd3f7b31b6ee5087436396936a0a1672d77ab3c7e391f00bc63060e137ee9399a52940ebbc2ba25e253e SHA512 ec4cb8e9220cd21d96b72c1f09cfdd023700831ed583fe79d84a85f8d24eeaf3f111580d672950feecad69455078f0c73879f0d73364e74a4577352a4d8a1d4d
-EBUILD pytest-django-4.9.0.ebuild 1260 BLAKE2B 7cc4220b42e68843a43cd8bb4400a0b86b6be137dcde9836d6bc0db2d0578ac1c03fa45ad3447b205a78003650b45fed0f6924045e6be1e98eeddd550fd0971a SHA512 3c16f66ac5c2db2ba8e9beef12af48e352b1f65db63a483aee4ad35bc38c63d7067101f7ac33b5bf54b96ad9d2ed6d758e91e4c5e1f39a26b00be331eb205633
+EBUILD pytest-django-4.9.0.ebuild 1259 BLAKE2B 26ff6559f760ef1b443a1039d533b73f89249b547fdcf110c544f08e2e71f8a157e29b667371a11cefc6232af5a81f1043c647c88f12d367025c97f837db18c8 SHA512 d6cffc2c15af422c00042e986b1c58cb9704a15d5b080d9a5f14546170d6b1f70566944fb0a8b67fdd7607266ac6cf23fedbe92fb2d038b1ead8e46b58563b55
 MISC metadata.xml 405 BLAKE2B 973e3124eed7a497154d1160e5e1350503b2599a3111968329f0b01496ce1eb6b84b76aeddb427478ffd470aa8aee4102e5598b3406b8d2dbd01703cd9adbef8 SHA512 6d7a6a7e084283cd6564be193a43c80f0599c4aa98ad68a98e656f9f1aa7103cd6164acf040c1e71415e28ebe707b013f92bcf4f2f5139ee873ee20408aed150
diff --git a/dev-python/pytest-django/pytest-django-4.9.0.ebuild b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
index 8ecffef4a793..8e52f7d88eb5 100644
--- a/dev-python/pytest-django/pytest-django-4.9.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 7c5538628a76..98130cfaafb5 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-httpx-0.30.0.tar.gz 36959 BLAKE2B b56f0e51558ffa6eb0c0af61aa3633a8e358f8c78916d101f1de853f683136a68e195bf0af099bbc6766198b4136a560ffd2676d9a49f0b350882896a61d935a SHA512 6aadb544bda5003156bf9c0fa309a166636dc87aea033d9a48ee10e1e8b77e6cb52350930e97cab89cff7c10111d5e26d1d74cd33f0a6c54e34c3fb7ef72ea05
 DIST pytest_httpx-0.31.2.tar.gz 40320 BLAKE2B 3043f407c66fa72f38c39c86a7e85cf4a177b21bbaaeee2002291111ac4345bf6a9095d2c96e15b5966c0d94f5a29fe376d72ae2876ec5a174701d8c81aadb9a SHA512 22612da764f20f6ca2d3883d687b41e36fc7336048c1106a0839c2e2fa408d1ff3b57c9776010c6ee06b05dc470a34f6c9d1fc3fd97fd4b71c810f513bddf6d7
 DIST pytest_httpx-0.32.0.tar.gz 43824 BLAKE2B d373703f5614e7d3d75631bef7c316ae0e5e1963eb1ffdff3fd6a10c65e095e44d1bf09eb81dd9b90492a8e44f19d650875f7302d4843854622df620eb146bde SHA512 fed3b83e4b3162f1500f3a591650aca5a0c09a1a640c5718ae00d4a3e3e9df8b6a90ec4cc1a1e77b6d2be7de80dec8fe69d8fb601de164c7ad84322acc1eb7d0
-EBUILD pytest-httpx-0.30.0.ebuild 708 BLAKE2B bd19d65739a6fcc9ccadc1f7d155eadd57e99750b8fd0d47e7b46e406888f4695f605ed2690faf221778190774fc5e60f3f34f19de1b8cc78532607123b0b647 SHA512 6569e9aaabe08d24dd1752a414b272d79b6eb5f2074f26fb3612967103d7678aecf50649ace25006b22be9ca8a7d9289d19894c477245e4db1e22a1dbd12f176
-EBUILD pytest-httpx-0.31.2.ebuild 692 BLAKE2B 6fd45b0b7055784cd302e6a61e8abe8926f91f0d4eb6d5ede9419220a8734bd9b908058cd28f4fa02de243fba247f5565627366835bddc94c0b9bf988dc40924 SHA512 a4cba1fa18b697b533d948b0511efa03fb00eedfda23f6e02f41f32870e6b5b59dbca8f31827bb1ea13aa6780682fdeec740012d8d6ce504db989cb17848c4fb
+EBUILD pytest-httpx-0.31.2.ebuild 689 BLAKE2B 8c5027ca1c9ced545de7405135e0d60f284ada625c24fb891010dd0bfe9fc7c780fbc995f33f1d95cd0b3438a7cad25a23977039ab921f247f09f7d59458a601 SHA512 8e2b32dfad622a123f67cba065d193fddd19006f6668efa72c82c47ae6c1291e6783216ebf90ee296bca43eaf3e1d1a6dfe08a08959268347eb4b59dcd12a059
 EBUILD pytest-httpx-0.32.0.ebuild 692 BLAKE2B 6fd45b0b7055784cd302e6a61e8abe8926f91f0d4eb6d5ede9419220a8734bd9b908058cd28f4fa02de243fba247f5565627366835bddc94c0b9bf988dc40924 SHA512 a4cba1fa18b697b533d948b0511efa03fb00eedfda23f6e02f41f32870e6b5b59dbca8f31827bb1ea13aa6780682fdeec740012d8d6ce504db989cb17848c4fb
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
deleted file mode 100644
index fac7c6a1f0a9..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
-	<dev-python/pytest-9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
index eab60d4c7025..ebda9a2adf15 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 1e7c54549361..6c70ff147dfa 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,5 +1,3 @@
-DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
 DIST python_bugzilla-3.3.0.tar.gz 120711 BLAKE2B 29b6b52c3907606ea474b2f21276fcc6ee307aec315787fe7910e2df16b8e571cff78e133326520f28574bce8d99fc2331e6341fd8fe09edbc9d61d4dcc72856 SHA512 e8e015575a4d2540e351628099642d586bfeefdc8fca0b1e2de802db4ef91b26952d84b5073ef39a6e3a54b181b1937f169c4477267f777f5a9551a5757cacbf
-EBUILD python-bugzilla-3.2.0-r1.ebuild 724 BLAKE2B 26f171ae0165ac9997ed36faa1e0af566c688f4ff3084d35340f59b67a3e7470ad645a04c382dc490d1ea6e63db951a232f9f12e1ef7578538bbfb630d9b4d87 SHA512 fc57684faf6f0e8507a0b633eb6d75bdd00babaf60b4d59acc0e771945c438c7987cebe8c3e09937be9e2d2969854e10491e18cd15760a2604146d60a5f1cb30
-EBUILD python-bugzilla-3.3.0.ebuild 764 BLAKE2B a5132aca1fe0a5c9659c8a0e9fb2c56399a2a7bb02f19168d18d8900c606b4fb1eb2722aaaad4acec2a9849508e8d0a46718d271f2775b3ad387635811e28798 SHA512 71c036660dd8ab9bbe29978525fcf51e469ba780d4b0a222bf02410520bd835e09c0ea7d715c3541a1c725953036f141ed54620a5d128029763caad0ac7b7f6e
+EBUILD python-bugzilla-3.3.0.ebuild 757 BLAKE2B 3f10172ab33db0508076afc0b848ea8ee3ddd30d0c0dca979eeae8a667c5ef9a0167cd7e84bf0e0b65ec98fe5e7be52f6299b3e9f114419a4e57c485bcc8674a SHA512 9ce45f5cbb038353dcf7dbd0dbcd6c1ea548b0ca286a2f8e67499bacc571a71debd1c5684af6d31a4e156eaac113e831d1dc2adf0d72daae0afca967bca290ef
 MISC metadata.xml 662 BLAKE2B ef0a5692d9d4f3ca0f474eb012ef97cccba5fa9c8737ac85852d9bb3214160d69fc95eca8239de8d08bf6ea04b5004097ce6b192c2276bc574f441766042c7b3 SHA512 e4ce0016e9ab606c8233759992ea2daa8b20df9b60f129c0b3e210536f0697b46469828de321fa7a09e56889747da67cb38242b739aed227d4a60657207e7f8b
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
deleted file mode 100644
index a925a6e040d8..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="
-	https://github.com/python-bugzilla/python-bugzilla/
-	https://pypi.org/project/python-bugzilla/
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
index db39feec1c3d..29f6277e24a6 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 4f37260d7dab..a4e9502fd6c2 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,7 +1,4 @@
-DIST python-gnupg-0.5.2.tar.gz 64531 BLAKE2B c753004e60c16d9c098074b44f1d0b71e35544b478fbd90bfce0e50ab72b8581229d540ea612327b1fde0bcb247782daf4c39c51efe4de3360faeadc13a22f80 SHA512 9ccfb1dad7895cd08b86f9d220a58d67d83a8acead830364d51d49733d442e7d36e8b68541f3f867a4f11c964293b084a316c1caeb45165af2882b8603742846
-DIST python-gnupg-0.5.2.tar.gz.asc 801 BLAKE2B e778867bf354f6b488a2876bd70928642062200388227cae497cd09c934803a57801a2a306b669aa13aeaeb741f69b15c9597df2d19c04fb9137a1e6f20d36e8 SHA512 ea1d017331dcc88bda9bfa5332894a55e9597aabcecf9abdfd1ae8fa9e23478346d3c82d809fc1e34f112ace091c1d4cfb2bc67f33d30bd34dc0127055bb2065
 DIST python-gnupg-0.5.3.tar.gz 65457 BLAKE2B d5b646b2aadfef922d1b3116259b0f02668df373375676e679fd900bf001c91b58dd6fb06c8e3470d4135f4ef6b45fd1c5f63a78d3425e82931f2c190a28b129 SHA512 88a2d754df7265aefac6b9a0651c7e933125ba7f8170bda7e867f5dd8bb54272609c26d0ce17a15afa7710baebe06fa3ab211e2af1d1d84eb1f1c65ba7a1dd6a
 DIST python-gnupg-0.5.3.tar.gz.asc 833 BLAKE2B bbb455c138df56dec489334f1d9c9a13603e60bc88f156977ad09c0a0e8eefa89ceb5fe4dd4d01c4e2d92d193257024decee879457633bcba9ebc3a83fe8f20c SHA512 052022dd90821e3aac3b77e92921dcdcaa0e5d6914d04a533bf3e9af1cd74fbae59a756c37a9ed0a1b6e945a316e5414c4174c51d03bb70a5fc4d6d8e3c5400e
-EBUILD python-gnupg-0.5.2.ebuild 1187 BLAKE2B 7bb7fca9f5b0bd0c19a67a2e82f192366ad39228ee9d3c1add5cd2e09f402b707f36f76ec7777ca32c6030a18ee04f9d18a7aa390512180a380d5e729b984d08 SHA512 4edd160d7f962228454a6d0d97bf87bf266750d3e42c2adfc8598dce5b2193494ac53fa8ac8eef5d85f9764ea2649e081a79d7e5dc4fe3d068f637bec2e2e83e
-EBUILD python-gnupg-0.5.3.ebuild 1195 BLAKE2B 271137b4040dee5eabfd895f07c7842501871286e234eb89b55d4d62ca96b6a05e79dcaad57872add78150d3cb8434373a194a8d237044c41d5900d14cffcb72 SHA512 9eba275c9d557cf89c4a9422d9c57c82e7a8c0415ab1d261a3b68888b149a988020cf4c7a71a37b9f1e3f99a2783deaede7a62de939bca6a69654a14f3a5a1c8
+EBUILD python-gnupg-0.5.3.ebuild 1187 BLAKE2B 7bb7fca9f5b0bd0c19a67a2e82f192366ad39228ee9d3c1add5cd2e09f402b707f36f76ec7777ca32c6030a18ee04f9d18a7aa390512180a380d5e729b984d08 SHA512 4edd160d7f962228454a6d0d97bf87bf266750d3e42c2adfc8598dce5b2193494ac53fa8ac8eef5d85f9764ea2649e081a79d7e5dc4fe3d068f637bec2e2e83e
 MISC metadata.xml 633 BLAKE2B 8f4c4f15c4aeae389c2f13e972248da4d7bb9adc1783a54e3882e677d7ce4f197fde565cf7c68a197a55291ea6a15f99c3b39dcc0bd3d18ff981738e5b4a94ab SHA512 77944c5fa529fb844598005386dd639ae30def95a66087b1e1e5441f21a8ba549d6ef0e28dab88527d11cae2a4a6d6c1871dacc765d2fb12188d53e893bd0df9
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild
deleted file mode 100644
index fe7b7d975d27..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="
-	https://docs.red-dove.com/python-gnupg/
-	https://github.com/vsajip/python-gnupg/
-	https://pypi.org/project/python-gnupg/
-"
-SRC_URI="
-	https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz
-	verify-sig? (
-		https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-
-# Need gnupg[nls] for avoiding decode errors and possible hangs
-# w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
-DEPEND="
-	app-crypt/gnupg[nls]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-vinaysajip )
-"
-
-distutils_enable_tests unittest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vinaysajip.asc
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 eunittest
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
index 0f66623fd7e8..fe7b7d975d27 100644
--- a/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 # Need gnupg[nls] for avoiding decode errors and possible hangs
 # w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 9360df9ba2f7..4a1ef10727d8 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,7 +1,5 @@
-DIST python-socks-2.5.1.gh.tar.gz 32387 BLAKE2B a0f488a146b09433bee39382ace3143a31a55d3fccd2db5e5ca6c2a08f3e17abee5839a266f8dc1b1b3ac6add7584cfba988aacba575ed5d21a464f8a2f1464f SHA512 6f2491272d201abc06a0d0a4fae242899ed28f9caeb7bea42c33946daec3280b48a956319b82a89ebeb8ea61ab9c290f9360d6ea85eb4d654525b95faa3ffce0
 DIST python-socks-2.5.2.gh.tar.gz 32411 BLAKE2B 4070f7e0ff85881cec6252320a250404b1279b707719f41aa1b8bf8e8cd52c653a4a778baa4408977013e0c659f667152b902449bc32e84c4502067e240a901b SHA512 ec342b81d88192817eded048a8d6ed556ddfbb108bb945681cb33c05c4c53e39f01bac7cacb2bd1cecf907c53e49cce18d8bc237b625efa1067dd765bf648933
 DIST python-socks-2.5.3.gh.tar.gz 32399 BLAKE2B 39360537311683cb4ec6d1d9850e51877ab9d5f2319d83eefbee7362af1d0061bf7fba0fea9ebc74d24b9fab3a46ba78722ca4629c783406e935758f393d8183 SHA512 fd6351adf611e019298d2885d97d4ecdf1b9c9160297621d61bc770568eb5e20652507c7590b72de11e1e7505a60326139329d979ae325cba4abc81947ad6189
-EBUILD python-socks-2.5.1.ebuild 1288 BLAKE2B f50610d219bc2633146686cae11fb31b17e3df22c48313656bf1734d6fd9f75b2c0f3be855538b5fb8d4e9247a5cb5f204a5535c986e60df870af93aedace5d1 SHA512 28c25f6e8cb2f8ad459caedc9ae84766306634e130a9f2b7c331c0a9329675eaba8d14cbc186ba1984b3a44306f2ddb10e0e5b02358ec690cb5861768dc5abf4
-EBUILD python-socks-2.5.2.ebuild 1331 BLAKE2B f4f547e77422030323c154371ddedf6e5c29eda2ac9a789d7eabf77711730cdea268909646a617364c7bce4a01922e867f03368e8e540429f5dda21a767d69a5 SHA512 119d0b81ce07881621420b8443c2b94c9e5d404ea8784c8554b861924f2c0f3a4a0fcb16db08d1edf34e0d3daadaee020fe28200d523d249ce0f77fab7fb9283
+EBUILD python-socks-2.5.2.ebuild 1323 BLAKE2B 6b7db57e7a468849f846e00ad59c2a56b415b66aa4ae3b27a6de0ab2f87ca0bbcbd51698b4cc67023da63b702e5f110adf22a51e9632032e8286b78616f0a538 SHA512 6a7bfe7d52e01cad886183f7e79adc57d42157de6c455da9964c1622536514bfccbce129758cc5317356e18e5fe864629d1c747454e708ab4d835a46790d6561
 EBUILD python-socks-2.5.3.ebuild 1331 BLAKE2B f4f547e77422030323c154371ddedf6e5c29eda2ac9a789d7eabf77711730cdea268909646a617364c7bce4a01922e867f03368e8e540429f5dda21a767d69a5 SHA512 119d0b81ce07881621420b8443c2b94c9e5d404ea8784c8554b861924f2c0f3a4a0fcb16db08d1edf34e0d3daadaee020fe28200d523d249ce0f77fab7fb9283
 MISC metadata.xml 380 BLAKE2B 2209abdbafd26baae585840e774843c37e0c6103fa93d75e8c1ddbc8dd1b96f269a3e76f14c39a55294d4d642d7fbe9f87c6b1a0b64152c671590a9e0a6ef959 SHA512 ccbb1a5c9fd05ae1da346f4f92efe156921f7adf9f5544635a407ba4a8154c896bda2e445e05e70a8e46c2829b8d4a38d3bf5d73804a3641c811acd2be62099a
diff --git a/dev-python/python-socks/python-socks-2.5.1.ebuild b/dev-python/python-socks/python-socks-2.5.1.ebuild
deleted file mode 100644
index 5aea49495d20..000000000000
--- a/dev-python/python-socks/python-socks-2.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	dev-python/async-timeout[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.5.2.ebuild b/dev-python/python-socks/python-socks-2.5.2.ebuild
index 2f0cb840c533..fedf95cb5d75 100644
--- a/dev-python/python-socks/python-socks-2.5.2.ebuild
+++ b/dev-python/python-socks/python-socks-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
index a6103457f6fa..07bbb3676933 100644
--- a/dev-python/python-tests/Manifest
+++ b/dev-python/python-tests/Manifest
@@ -8,20 +8,16 @@ DIST Python-3.12.7.tar.xz 20444032 BLAKE2B eed8744261cab3b401963ec5187a8b814adb9
 DIST Python-3.12.7.tar.xz.asc 963 BLAKE2B 8c7db3d1971d93a10c611a2e6dd3679d0b331b48df87b5fe410b089061e48753d98af67084d4f051a31ae803fce3aa3c7af7cba9c692640f50068bd1e46f40e6 SHA512 4d0a7a0da2c81888e93d8ff89ca2ed4bb85a7b0bd00f0d54a14e2c201affac2677ef3984d2b5aea253e624f6465548d9032eefdd9033c1eb3864d82cfd8d3df0
 DIST Python-3.13.0.tar.xz 22532980 BLAKE2B 4a4e397199402de8c9fe8e4d63443ed972cbe8a4f541743908d699c7987127d159d600fd14145b6a946e8671426279d230c9155fdc5863c1e49a945eedcbf21b SHA512 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152
 DIST Python-3.13.0.tar.xz.asc 963 BLAKE2B d05f02692a9fea42b73dbfe5dc42bd6533555e5ecb848510d2b94bb7f0e55d4a0f89bcd20b073ed2c7f7a68be35b12cb6dbff6bc16fc9a4592ded2c339ada7fd SHA512 1b8bb0fe4eb93e31ec1770e90b94d44b5864c0391aad5dcba3a30d8e505d9b17107385414353c0060007f8a536254f49b8e919f36ddf6421a6e4330f817f1a3e
-DIST Python-3.13.0rc3.tar.xz 22527884 BLAKE2B 9c6423e9871b30af70ece10598e798da443b40b3e40cae86ec59d396184df005627a5edeedf34d31c7953f972850e41d1cc708edd8e39c1327d319b0f6973049 SHA512 152e5b6d64048c1779612e66d5999c424ca7c61c8a0f4973f7b3019629d6a7923b422aec0bee30e7bc2d589a807d87e15a19b8fb4446bcf082eb663885a49b36
-DIST Python-3.13.0rc3.tar.xz.asc 963 BLAKE2B e03d902eee320939cb77094e1b64e0101d0172ebdcc502255da1c0fc84476f43fafe900321c78cd78248a751b3a3921572ba4f305ed77ed78f175184b21f667f SHA512 c8f80b12f5e3021a11fc3ef5ce84572db9de7165ce89a03206cb0727b54f90ca2e444a16df064e6423e15b7bf2364db088b0c9315967dd340e735eabf7b892ce
 DIST python-gentoo-patches-3.10.15_p1.tar.xz 24048 BLAKE2B 191c28ad9bc781d6f3077870e8d40ff98a47a64009ecfbbd10fe2b3c5330692181837fd3e9b336fd01f936a39160fc12761b2ef9bc00843248ab978cda2e2767 SHA512 4461e351c991694415e2812e558d6c3d3f79295358623dc955bc0839691a170d95a3efd31c0bf9f0d6191e4184d7b55fdb485b948d591782fef5b060d7660cce
 DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
 DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
 DIST python-gentoo-patches-3.12.6_p4.tar.xz 8764 BLAKE2B a75b9bc3768f1e07272f43d1a8f0fb6858eee7c786bc3141cd152382c287ee984b92ff1301e5894db7c24af994ee52ac7374a3edf692aa4255c1413b73209020 SHA512 237c9e8b50173a757204621d7019f68f230ea3e520ea1f078528acfb509fe7f44c0919a8ac0245e79b1a51c3e3545dd9ded51047451048ca782e35b1c4365363
 DIST python-gentoo-patches-3.12.7_p1.tar.xz 10228 BLAKE2B 71cc6034201198d9483414fa362d68b550bfcbf75ca6f44dd8ab9d90b201098a05cbf4799b1db9359f4dc464acfcee9b0ce59045db27e8e9ce916b5aab010448 SHA512 22f9256c28b96723ad86878cbe44da155e280a8df08c6bcc568dc5296aca1a6fcc41ab823ee9e6d34ce5954bbedb76aea7dba2d9189e0558c536e8b2b9a3c8ce
 DIST python-gentoo-patches-3.13.0.tar.xz 8316 BLAKE2B 8fb8ba8f41f310140ad7066b614952023112d5043e5d82058364125611785144c1843e87eecb7669bcbab51c40d0694069526219f7419a7009517ce0821b74ba SHA512 0eb31ebfa3411020aa70b3b66fd7eec98b4b7a686b0e8f1f7ed76a8186a7c1ee85ccd9565a86a1d7ec13b975855eeb7303036af05e2dfdce3d64e4ad99299df4
-DIST python-gentoo-patches-3.13.0rc3.tar.xz 8004 BLAKE2B e1ec0d1b0d84fd5875111ed9916879bb78fcf764f6d6c12f570083df9215e0585ff4137636756bf3674f991f3bccdd859ec21d37c4b6a8dd738da03ecdedaa75 SHA512 1495f5f68d6ae10ad676b075cf4540dcdc38b254a9f4309d76097bdda427e06b65df173c99cd9c4f74646a4a29f10faa38a5a0342b1a40c1ebb6f92cf5a6f3b4
 EBUILD python-tests-3.10.15_p1.ebuild 1605 BLAKE2B db4c562031e602638107c76bfafcc97771ffa56b54a3d65028d06562e73fe8c1b037bdf0697da465cf07417fcecd179501121d95dce054e1fd75442273014f53 SHA512 e00999be4c1fe1dcf54868a60f9143766809738be5171ef82a525be7f41214cfcf8a1906df347975fdb05b49c7023bac5075b8eed838b110b69b29ef7c56b956
 EBUILD python-tests-3.11.10_p1.ebuild 1591 BLAKE2B 41988aa6074078cd26dc08004cd74c78becc96894847b2e873529bcf1f1742bbf2547aad0da1ebc53f79fe422d60c46fb075da9824413c0f38353f0c5cb4f0dd SHA512 41580e92e1d167eeb0896bf271ddfc3b06d5979cc620e66f7f36a5102481a94a92efab6b40ea1dafdb29a35c031a3a2f3680f52a699484815962f0e7b364f964
 EBUILD python-tests-3.12.6_p2.ebuild 1502 BLAKE2B bce969e4a5147fdfe4cfd0f8c5f6bebc9ed452bb53e658dd6c71c2bd75d01ad1962bf4365e9e36b44726a17d08b767f24e240048be4234f5a8c5d2ea66cdcec4 SHA512 882090e5cdf1cd7eb43a363b000b11a45e4f3ca4f5c94130c238ec7961037b29d30477b267ec5230be60cd1dceb240247b24fe43f789cde326829ff25c06db7c
 EBUILD python-tests-3.12.6_p4.ebuild 1504 BLAKE2B 711a2ab62015c8113dfca9a02a57301add78b0fabefc09b629096f2fc0e1bd68157e517ceeb807fc04cabb81910eed3e5546e5f3adcd9a12b59c49718fafd6bc SHA512 69677a1276b7b746b10e268cc573a8ac62aa108288d810a18ceae4aa0f797ffe228903cd2d1e53aab4e45b42872fd15432f93226b19f2d9bf726cbec5d480ee4
 EBUILD python-tests-3.12.7_p1.ebuild 1510 BLAKE2B b3e2dc00626f5e66479205dcd616100c7015d6d171db418b09b2d2e8327f03d5aaadffc416bfd2ac075db049ea12880de4d402da85296f1c0b805931f2fd5987 SHA512 995b665085bf7dc6c63208cfdecf4a6b3044a50a8793db3a9eda49e9c6129abe4e934dc85032f18d37bca46bf578571ebc4465cc0740173f5e0b0ae109bf3268
 EBUILD python-tests-3.13.0.ebuild 1516 BLAKE2B ef7ae9677e2d4d56e2f6dfcd57d7f3cc35882a53bddb994a80ae294de92c206a96599e15e558f7dfe304a3e50138625d9212a2b185935f8dc774b775120cc770 SHA512 e420d4e082fa6e907bf01d38710f256621865ea331781733760a43a04b9714c5a2460767586dfed1fb034f55931fbbb87bdb3439d9b47cc1b455b016395f0bff
-EBUILD python-tests-3.13.0_rc3.ebuild 1516 BLAKE2B ef7ae9677e2d4d56e2f6dfcd57d7f3cc35882a53bddb994a80ae294de92c206a96599e15e558f7dfe304a3e50138625d9212a2b185935f8dc774b775120cc770 SHA512 e420d4e082fa6e907bf01d38710f256621865ea331781733760a43a04b9714c5a2460767586dfed1fb034f55931fbbb87bdb3439d9b47cc1b455b016395f0bff
 MISC metadata.xml 320 BLAKE2B 4a0e2e1a1885c485f99da97298accb9b35bf3bfa9b5e442ad0a92ed13e9e5b5d754bd10fff44e90862e7277aa11ebff8e41354cff1d63307258ed25ba9336d2f SHA512 5c78ec7965ba88dc488b4fa2a39f19f27e34c1ed770d03d13bb9f8b5b39257288957ede00ec85b46fff42f24e052960f0cfe94b48e2269465e0afe44adcdac99
diff --git a/dev-python/python-tests/python-tests-3.13.0_rc3.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc3.ebuild
deleted file mode 100644
index 34d84eddd7b6..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0_rc3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_13 )
-
-inherit python-r1 verify-sig
-
-MY_PV=${PV/_}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="Test modules from dev-lang/python"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}/Lib"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-lang/python-${PV}:${PYVER}
-	!<dev-lang/python-3.13.0_rc1_p3-r1:${PYVER}
-"
-BDEPEND="
-	${RDEPEND}
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	cd .. || die
-	default
-}
-
-src_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	python_moduleinto "/usr/lib/python${PYVER}"
-	python_domodule test
-	python_moduleinto "/usr/lib/python${PYVER}/idlelib"
-	python_domodule idlelib/idle_test
-}
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 1a75ea28786e..c28068678e84 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,5 +1,3 @@
-DIST python-utils-3.8.2.tar.gz 30431 BLAKE2B 3c53c02729f601b30e68a26cd4b61e49c29f036a1327c43124e326dae173d1b528035bb0952c349ec43f3cd6e159c2e0d5e82c8c46efd12c95f445dbb20751c0 SHA512 e0de794abe95f3e205fcbde0fd52615f44128ffb702a406ff0d3f7ce2640ff60ac3cc508829245bce750ed191c9d3ae563b8f0619af4c2c43cacde6a1aa0fde4
 DIST python_utils-3.9.0.tar.gz 35352 BLAKE2B 8d247d28a1ed797d1058f6bf45469230f5fcf3f8d305e195a49229deef5d41552e07b5c2e7543223f2df608feffa6df2f57828863acc437ff9c3c2a11e797703 SHA512 fe6313b18f53a56d71a9ca9b40f7bfe61629f7c5cf0b9088adf81ed8aa78b1c5a593c59ec178ec6c87424ae0730c9cb15d6eaa1a129d871f75b67d1d4f6938bf
-EBUILD python-utils-3.8.2.ebuild 893 BLAKE2B 0a746f454c52f363ec7210c388fc702c513157c930a6a9421dacd7434e63e930737bdcf5e49238670c45b86f8f0d457324c7473d866675f2ad3a99f2cb314c8f SHA512 ae36f8c4f78040b5e2ed3557204591a7a451279732ac94390a03abc2a6c669db3b5a446449846a3e9e2578f6ba6df5d3499b03e4cfd7cfbee5fa142761143968
-EBUILD python-utils-3.9.0.ebuild 875 BLAKE2B 9e9496b31d1c0ebe285b5491ed96403b3fa2d5ecedf46495e4ca35afc525bf132ca883f11ff71cd018223f86657a2e00d336b1fadb00e99b8de06e56f8cd8533 SHA512 266e1ad7a87ba32e606b727b534c5f1b9b4b013315e9b138b0e022b0ac8574a7a82fa5e5b99fccf029510b6f59e5d85a5d98091090757e19a37800138a3d6cd5
+EBUILD python-utils-3.9.0.ebuild 873 BLAKE2B bcfdb8666b215463d40ba2a80d0d4bb2944f8999f795a65944e972db290485d43aa4901a5763871beb243f00f2f703c7aace56bf3856679e6defde114fc6815c SHA512 e45232565cbf9b4f32739cf92b8caf2d150be843779c7695976a4cc7d1b83987b61e9f478eeb9f0cbf9d407e7ec7779893b744c65316719c9ff702c3e55f805f
 MISC metadata.xml 398 BLAKE2B 40018dd39311868fe5b37b6e03d6f6115427b84ca4cf4643b227dec910a193b547384c6cac4a97ed0f06a81c453c12ae57612e279e44a8a671b7f36a3ebc3128 SHA512 aaed2dfc1a9802d6d6d2d28d13fd478e0cee7c422992cde7994c4408690baba6c9e99ed77a55b0d3c5d966bb18cbc76c579b50f9d388a84ae204137b33c81a92
diff --git a/dev-python/python-utils/python-utils-3.8.2.ebuild b/dev-python/python-utils/python-utils-3.8.2.ebuild
deleted file mode 100644
index 21dab8c4ee1d..000000000000
--- a/dev-python/python-utils/python-utils-3.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-EPYTEST_DESELECT=(
-	# fragile
-	_python_utils_tests/test_time.py::test_timeout_generator
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.9.0.ebuild b/dev-python/python-utils/python-utils-3.9.0.ebuild
index aa5d56d259e4..e983b4c62171 100644
--- a/dev-python/python-utils/python-utils-3.9.0.ebuild
+++ b/dev-python/python-utils/python-utils-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 752723ab474e..6484fa26fab5 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,5 +1,7 @@
 DIST pyupgrade-3.16.0.gh.tar.gz 65582 BLAKE2B 99c04e528d6bc8d802595ee320843561b317cdf57c87fe2f095b29dfa99b23d00c87951b48f437a72a2602a5bc7bd237abc98cdf9b802ca8c5faff83fe666396 SHA512 a348fd925418e5ec57777360f77aa814eb1b95e45842b8310ed4edb357e5a3648dfbecf09ab7c5d70a8ba98728f2355ef5e5f51908a8c53faf5762869b74e1da
 DIST pyupgrade-3.17.0.gh.tar.gz 66098 BLAKE2B e55b823e6e393ec7d1268661e527bdad6f17b330edc086387d8234a6da3a4a7da79a5d862c594827643853328a807e7ce39450f0685f3d31fd2e81c9407505ca SHA512 28dc66179edd44ec498ada856b6522b73296783d9ce6519676bc658c0c8038c7916f5f330240571458728d344a5a26de7c7a63d61b0a6496fc658dd57ccd7992
+DIST pyupgrade-3.18.0.gh.tar.gz 66227 BLAKE2B e788e3ce2b7f67fb8af62e430c6702b60729e6d7310085f785db8262e54429b11f25c95f922a3e51b2bcbc5120221ba00ef27a96f03ec4bd76d98c876a45fa43 SHA512 16a13f38ab422cb36eb3ac7546064b7c524bb746a7828c871ed67548dab57f97f22c80e9f89b520a763ae6b87dec78c7b7454dff74db7425157bf30d8e950ba4
 EBUILD pyupgrade-3.16.0.ebuild 649 BLAKE2B 00290428fc2b336442ee0fa9271c8306a2500b8126045121c6d95294d451c91d856ee6a7f1a34e445e905f21ea63af17b0bf8b5f7c86bbdd0d514d4ef9003f50 SHA512 ad0e14f57a96edb4df51b3237c9cabb28a5d2a536da2ae53d52987745f52800c8e2667fe8ba15e243a40cc261b417c3bb6f782a892c5053abf2addea50fdf2ac
 EBUILD pyupgrade-3.17.0.ebuild 649 BLAKE2B 00290428fc2b336442ee0fa9271c8306a2500b8126045121c6d95294d451c91d856ee6a7f1a34e445e905f21ea63af17b0bf8b5f7c86bbdd0d514d4ef9003f50 SHA512 ad0e14f57a96edb4df51b3237c9cabb28a5d2a536da2ae53d52987745f52800c8e2667fe8ba15e243a40cc261b417c3bb6f782a892c5053abf2addea50fdf2ac
+EBUILD pyupgrade-3.18.0.ebuild 649 BLAKE2B 00290428fc2b336442ee0fa9271c8306a2500b8126045121c6d95294d451c91d856ee6a7f1a34e445e905f21ea63af17b0bf8b5f7c86bbdd0d514d4ef9003f50 SHA512 ad0e14f57a96edb4df51b3237c9cabb28a5d2a536da2ae53d52987745f52800c8e2667fe8ba15e243a40cc261b417c3bb6f782a892c5053abf2addea50fdf2ac
 MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild
new file mode 100644
index 000000000000..12bbba4127a7
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
+# no tests in sdist, as of 3.3.2
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/tokenize-rt-5.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 5c8206cad7df..b3e2b51a2e43 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,7 +1,7 @@
 DIST rapidfuzz-3.10.0.tar.gz 57942780 BLAKE2B 3510ef495e9eb2a158eae73526e109809a9487ce48a70189b0c6f25957e46a6a640f1d0f9ef00203ea7730a2ba2b1086db9faf20434c92afb6b7205057aa5c22 SHA512 88e92ac4bfd72288546265c4d3957ce672f314f08f39b11ba21c267b07797eec45315af788f94152a4704e0782df77fbcb40ef6773be7d3a5d3684fd7230e437
 DIST rapidfuzz-3.9.6.tar.gz 1596107 BLAKE2B e108320e05ad3ad194b1ffa05d5fddc5bb6080e73ecb031117a0552d5685734870af4a87503022fceadf3fd38b31e71f85c05483b4aaaf4a9d7358d4566699b4 SHA512 015b947dcfd12ee48c7592ac2fc204833d8aa8e43110dab12dff7650e9f309a9a2017d2faf89b3c154cead23d9dc7fc1658f0ff5d2f8b5b3c73b2c97f021c7d9
 DIST rapidfuzz-3.9.7.tar.gz 1596228 BLAKE2B ba3188748dc408cbe91718e890fd67e9ee47feacfe2b307038d7bfc6ffdb7aebb016b2276b591a1fd3a5c59df29a1b55a9555505f938638907d11deec9575f98 SHA512 b1a50f3ff0af044e0aa57a053bcefb3227dce2ed17b94ed82afe72203c6e858221c5ca955e4f190a0cb7adaeada11fab7fa5958e1c439deec60d96899207269d
-EBUILD rapidfuzz-3.10.0.ebuild 1435 BLAKE2B 9bba52e063b12119075a0f6ec27869b304bbd8b1bd6b85a6e22abb23169fed47e7cd033e3f91f18d5e2988518b0ab7226b13cfe0ba40168d80c37bdfff0bfd8d SHA512 8d912a21487884aa55cfd13120ccf8094e0e778ef256f41670d5946f49ce38bfe3cc79eb73a9d4d9746552e7260151e8e2583b13b300b6b69586a9621309ade0
+EBUILD rapidfuzz-3.10.0.ebuild 1430 BLAKE2B a6d1eb20a6e086cce08e6c78e3f9cc9f30b529e5ac0312261951db54bf7792feef576f305c07669ac8c49333396c5208ae377bfa47f9f373e868b655dd182aaa SHA512 f578071abff32326c288286270f5e92c100a78beb80d2f8ba368230bd9c7f0e35a818f673faf1a2fc426392eec1809cc7f20b8b4e9a7e0e4476f96f5ffa963f0
 EBUILD rapidfuzz-3.9.6.ebuild 1584 BLAKE2B a82d3c988cf3b83f5b1cd9955d3effa17723e49544c7f1b7aced89df52b62a0e0662f96c5b6c338209b60d669b429ac26c3793c700637b4bec23e6b5c71f4d36 SHA512 38b2451743ffb00568ee7fc3113573f74c56a3799a6941342cb8712c844f720ab62e870bb244d2dd5e91fb8f023928f1425ec9e52192df447f40278699a55574
 EBUILD rapidfuzz-3.9.7.ebuild 1586 BLAKE2B 96fd075fd2f43c1b62391d4a545ab6c667fb3ddfc5cdff0056f0ca9eb896aff59d52f3243ba82128f892b21e8daf9026d0660e6bd6efd8194056dc1317508015 SHA512 5956eb6f3a55d392cfbff6c829f6ff45f16c2330ba1d5b430623f1754b84682307290dcf4722a8ff1d2fb0434761bbc2d0bf87932015f44637a33490a7a9cec2
 MISC metadata.xml 372 BLAKE2B 813733515163b827652c103af137a7adb5c126ee46ad654306e35e958bd5e5d5f9711c388ac0731203b29b441f075cf23d5090388aa4bc454f824697d2c8302e SHA512 a3e13245f49647e164df0554168f45861556a931963776457fa64c0f690c76da302b8a32dadd145dc70887bc1b927f71b06db196ec2b15e89e3702208b85fa59
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
index 2da192431e19..3b2af4c1b8bc 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index 2df6032af93f..26a5d32aff90 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,5 +1,3 @@
-DIST scikit_build_core-0.10.6.tar.gz 254624 BLAKE2B da23ecf36e16f2d8f1b4daeb41c3cd7ca5af1cd0a4eff324765920a53410b9a6d5c7456247dd310b67ac0fc9a96547f1aa6f019e7d7527b603184a9199c863d2 SHA512 e3ee9aff752d2531c3bc44f8288a4619637e89d4a0edea3aef012153ba31af9a86929437e9d11b1d1a6d85a60a9a4da34cc347c203b80cca3caee05fb3e832da
 DIST scikit_build_core-0.10.7.tar.gz 255019 BLAKE2B 8cacc08d0ef5e23fb72e93215cbfb68d72cd93c88b2b63149f44dbe307c6fd4ea623955decd67fef5925b135dab2e5d0c66ab683037d98ec8cea926e3655f090 SHA512 dcd9e3170f7fb0251ce2353ecd5080b64c16b914f2afe8380d318388f1d2fdbe9ca989ed2bffa44963b1ce629e7fa1545132d003f60d76b35e8c680418d883da
-EBUILD scikit-build-core-0.10.6.ebuild 1691 BLAKE2B 6fbf01be6c7bdbff87203d75e394b634b38a62d1b9e6f0ae8b958a2e1000be31d0f7b68e90e2581d0e57fce07d9d0190d765b94af8a87d560ed8758ef73248de SHA512 4a9ce7e9e14981b48a8666c769595b014efafa233a629316e556d9b37a228a957cb169382a996dfceaf57a116a26dab22229fd82ecca7b103d1ff5090addc1d2
-EBUILD scikit-build-core-0.10.7.ebuild 1703 BLAKE2B dc8e775c80b9b1d5d13c2eb80b19bb61eec293d628adae36f9f8678f4d3a3f4e0a09365ff4d3e3b1322d86178bff69c43351063406c02457a0c87480f09f5b69 SHA512 b10d01dbec32a808ad519566e8a589189917a70ddd3a7c135ee63a2197ac82e66698f3cc437970c3811fc8afd704b427b1d9c0df3ff2cf7c61ab53a77f2f9494
+EBUILD scikit-build-core-0.10.7.ebuild 1697 BLAKE2B dfae6c50bdbd95c66f2faa7ece9f64dedd074e4a0ff511953f9b0aad0c65fabdb360e18603871512f41f95e70d995412be18c5ffb7ba398fbb72f0ac356cd3e2 SHA512 fdb723919371910e959f831b910dc4f76e14354fac3cd3a74334d48bae0779f68671706313e14c0975d9d135c52c7f2b3730b66f21e9a3f0d7560aa24d0893f5
 MISC metadata.xml 425 BLAKE2B 0cd7850045c375f40159e5515148f3863b2baaed899486a442818d77d059fce9fffa2ad2d046440c441775287aee52caf4636120025e79176e702a3682518a61 SHA512 2ecb5a3e4ae9ad6ae237ef04d0cfb354ae91cfd1ebf28096821cfb070adcdd036b15d86b645850ed5fd367274a092742de65c401f0fac57bd1136221915db207
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
deleted file mode 100644
index b81a230f1d4a..000000000000
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Build backend for CMake based projects"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build-core/
-	https://pypi.org/project/scikit-build-core/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-# we always want [pyproject] extra
-RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local _EPYTEST_DESELECT=(
-		# TODO / we don't package validate_pyproject anyway
-		tests/test_schema.py::test_compare_schemas
-		# setuptools now respects PEP 625
-		tests/test_setuptools_pep517.py::test_pep517_sdist
-	)
-	local EPYTEST_IGNORE=(
-		# needs unpackaged validate_pyproject
-		tests/test_schema.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest-subprocess -m "not isolated and not network"
-}
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
index 2e4aa67c79ef..966a27d21de8 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 1f72844c82ca..1113293267cc 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,5 @@
 DIST scrypt-0.8.24.tar.gz 55636 BLAKE2B 3971979c431cfb621734abc1cadc47f2512502f1c074e5ca41d210cfd0936250534a3c002e6a669239a09158fb8f4ac560a4df405f39935a1a2e9328fbf1856a SHA512 6ed6c4e2ae719523428d2cd2b518d6f4d6137381fb29cadde401e00d23926e6b985683a0ca3d8c5d51b003cc73ecf17e863b265ec297bdcae4067ce8d610a4c7
+DIST scrypt-0.8.27.tar.gz 55650 BLAKE2B 112afaf3a5a9cc08be10f7a220fc4c12a5cf26cc82be4d10669650c6b4dc79ebf4b4117b7ecc5e24c1773f5b64a75571f683765c6f5709895028bb7f4a4c2b6f SHA512 e20bde0e00d9f82872fa957814765f2733feade8cada6a8c02543362bc9abbb2bc2bb203e14cec8793cc0cc374f233bc0aa59c8d5ec672aea13b9e3f0226de71
 EBUILD scrypt-0.8.24.ebuild 603 BLAKE2B 7cd9edb533aa82938ba1d86b4cd1cd372574c2a37ee279f9f6bb2c31504648244b9e00b1d8e456874933de6eadc989248c25ebdfac1a12e5690f9057202f8ae8 SHA512 4c842488fe3caac21d37e90fb844f2e99d7a469bea6dba76a442aa6181705321c1922f15076ae02e38d23541423b30de6fc0ebdbac3a3b6ecb1aaec84b6dfec8
+EBUILD scrypt-0.8.27.ebuild 611 BLAKE2B 70bd870d801e7283e7e8cc9bf4ae3665f4da14d2358304824e440ca8c6a0cc263a0db641d0cabf73c2b61c0354d52035e7802520d30770c2159d360f42ae6515 SHA512 3e73693c700fbf5bda825f29973fb121e676cb9b565db7e218a269d3f5e1d396bcf07910acb692aa5b4dea9f8e0b500754e696145b0806825023f73e7dc03eb3
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.27.ebuild b/dev-python/scrypt/scrypt-0.8.27.ebuild
new file mode 100644
index 000000000000..fbc4accd9c52
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.27.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="
+	https://github.com/holgern/py-scrypt/
+	https://pypi.org/project/scrypt/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+DEPEND="
+	dev-libs/openssl:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/seedir/Manifest b/dev-python/seedir/Manifest
index e7eeae860ab0..16dc62211e18 100644
--- a/dev-python/seedir/Manifest
+++ b/dev-python/seedir/Manifest
@@ -1,3 +1,3 @@
 DIST seedir-0.5.0.gh.tar.gz 3099344 BLAKE2B 27ee50e6dfd91a67bb80452b3065c4183341933ef09de4ec298490264bb66601146a50a0b7550ef37bb332acdee1f2e45c31b8eca6e33f4f7e59b9d8f127f565 SHA512 e6c257787e65c24697e76f75308dc5e8c2f919205a4922aa1bb66673000e2c784959ebe45a7ccd826d3ee1fea03fe0a6a64f6c90321c76d1e36ab68ba3962361
-EBUILD seedir-0.5.0.ebuild 644 BLAKE2B a148e522c01d3a25c63f2e8e22e4b4c2ecaeda0839ca1f561ed4beef99fc35c0b0eec555569899ab03d61da3dd0bf2c1b415bab9944a5e84cd8f43079da7944b SHA512 47b50ddf8a08c6ef62fdf7645c0a3a8d833097341f84a6ab2ccbef5f778920efbe0d043ca6ede53293a507f4fa900d3e2bc8c933cadf4c3a5f5971c71d2e2507
+EBUILD seedir-0.5.0.ebuild 643 BLAKE2B aed2f8d0cc29c8ff76602352281447d03bc24830d887e3b12300982e019bb406480638d4f4409c09d5d49fa54d3f778ea99cd5d355d75f9c8955403318502174 SHA512 35d254aa0f54142ea6c8bf0eee494d52c10ad1e420df324cdd6e6d03d3b3947a6c1ea9dcf4cb080275ed0258fdd2f34175bbfda3f8e0dd444cd12f31c1f41bcc
 MISC metadata.xml 393 BLAKE2B fa479c17b0ecb4807f85e82e871d8f3690c7b0aab9a6c53b3609c84771d3d5a0e8b0769ec35ee51d533764440bffaaa679fda6401a95813ab7c76f81d6f84897 SHA512 913ba255b6ae25b437d99ced1bd8aef70f8dcc17b947be4d1ce10738a88c6ab35cce66dfdc2193d73881011f1e5e976e7b43c1faaedf312a429401e02f0dd9f7
diff --git a/dev-python/seedir/seedir-0.5.0.ebuild b/dev-python/seedir/seedir-0.5.0.ebuild
index 1255ab3d1715..84b728987e7a 100644
--- a/dev-python/seedir/seedir-0.5.0.ebuild
+++ b/dev-python/seedir/seedir-0.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index af08dd1fdea1..9ce53f580ef9 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -7,5 +7,5 @@ DIST selenium-selenium-4.25.0.gh.tar.gz 77158053 BLAKE2B 9978239a874d32e23d98ec9
 EBUILD selenium-4.23.1-r1.ebuild 4198 BLAKE2B a6491668cf8da465c3c221de03915bcfc6f8df88397053b65e69b4de6e682a06e5d4be088bc3c155c34cd2b079a43a57961cbf503d1bf0c082b6b8f4b37bba1b SHA512 b93f162c60fdf8ce7ca996b4bf6b84a9477cc8d9a6329b109f9574152bcb0a61e0ec5cbee80d4db5a9b5270d4e8f9dd52410f5cfb6897546f0cd9f9afd636712
 EBUILD selenium-4.23.1.ebuild 2258 BLAKE2B 9efc8777585aa514202b530c579cca4e79d95fa4062b9fbbe6b3c0549308be0bfe812fd21d5fb182c8690d2194b7f60fac29e478efff3a196588f8e6eba6b7ae SHA512 1d69b5fe837a5be4bb066abc4dbec846b1d09ac40997079fb8915fb4c0629be1f406d3c32222d7eb67a7b2952097be3187029eb7250a0057552c85eefe5dc6dd
 EBUILD selenium-4.24.0.ebuild 4196 BLAKE2B 27c0e4976b1fcbed2f46aa38d3803bd949e23faa83345f741259f166530b5299697838cf7ac3ec908a167c63433293157f49b682f2b5d7633d1ebc612b7e29ef SHA512 9e93d7341882f50dd159d76e996e8fb9c4842a42cac41e08f1ea298c21f5a73eceaec04652d99fcd92d2609cc641289f2f3d4e4753a4c68c041e8207653c0e8a
-EBUILD selenium-4.25.0.ebuild 4201 BLAKE2B b0ed725b0b4b250aa95d2decb5035cee2a35e7f10579b8524f1b7a05b1791b865a6d23891247ee05aac3088794b01b1c6937c6f57f0569317d751aa2d6d8ee87 SHA512 35d3ccd18f33d22336bceb9af0fe90e6011db93e17b8f40f043ab827a6cc34a150ed30d7bbb02e0ccf3f3ed1167af521cca1ef09fbec1feb6414e6f155fa0482
+EBUILD selenium-4.25.0.ebuild 4196 BLAKE2B b191c3298039b05f5a5704fdf87b546d3f3e980b504dcb2ba0269da51a62f32f3cb36836a9899fe2363ee99c15db8ba9dfc77f9421533d38fcb2bf27730b0ef6 SHA512 8697a0e4dcf850d1606726a4e90bdae410621f08d5c3d361e1135b7100e7b976d2274c33d0abe3f9fbb21acc49ce49eea24eb9a4efc2ebd2bb349c0f762dfb47
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.25.0.ebuild b/dev-python/selenium/selenium-4.25.0.ebuild
index 546d13f5cd0c..7fd35f7c043e 100644
--- a/dev-python/selenium/selenium-4.25.0.ebuild
+++ b/dev-python/selenium/selenium-4.25.0.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e94623bca5c9..d35dcf882572 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,6 +3,6 @@ DIST setuptools-73.0.1.tar.gz 2526506 BLAKE2B 766453a7f6f3e34bdc63628b8c0321730c
 DIST setuptools-74.1.3.tar.gz 1356471 BLAKE2B c59476710f10aae77f8b466ce2b072966a889b13c3e2e2a9524497ce43893bcd296412f8e0be8a3ccaa9be46b429680c11fe291095a65a185243701fa667be6c SHA512 7892d1ff0a1cd90f6cd367536392bf2933d354eb61d5177a01218b253bc254b51e74c040601adf35aff1652f1e1c6dbffca3cdce3f4fc32b8bd23c36cd885ddc
 DIST setuptools-75.1.0.tar.gz 1348057 BLAKE2B a749260ee2b3162ce102204d89b00bcb6d69c84a7785dee443467946b4fe275f080917b204e65d8abd9e629e5ebef311825a1a472b3e5a09815373ab172b1ca4 SHA512 5003e81c7988dd522cfba233ac643ade9a1ff074a13182a81da7fe3f40565b97dd2696c96b8a0694fcd3417e527e2cf6d6ea5e21d29ff927c1ab5916a2607239
 EBUILD setuptools-73.0.1.ebuild 4357 BLAKE2B 6976cca405fdeaf7e0bbfbea1dca33b35fe0441eb3c9681ad4dace5f8d2c3393f7bbe2db6e314259c8cf656ddf2bd80b3ab748ff35512e687132480ce0b35db9 SHA512 17262d4d0cc0ba70d2ba283ac14d289365e174d559001c76282316667efb28de937203b81b254a2f23058f5f5e84d361d151e1ee9544c4aa8a54e5573a2d3cd3
-EBUILD setuptools-74.1.3.ebuild 4464 BLAKE2B 184cae1ba51ab3219aa760be4922260923ec144e83a7b8ddf444bdbd7033c527961859680ab11199bbec4c19f608e52477a8d8d0275a1bbb72830f0617d7600d SHA512 493fbe2b2a7b5dca2de344d32aab35439356d719be750899c3dfed26593e390a986965d6f97d2dda05cdf6898d8a48d07658044c6654f3d77f7078cdd7e9d4c5
+EBUILD setuptools-74.1.3.ebuild 4456 BLAKE2B 45aa39814aa819b92d99c51a55e49287fd8c889a71ce254920878b455b9e7df58f9f8f950559aa526248e5e7186762d34bfad2bf233f6d9da09ee05d14a9fd1e SHA512 c819dd12fd55f0b5c81281454e755e211f1d51758ab7e9e41c245c88421e0e0d0a99dec07c25ca21a22b18886a26044e4513e35b2f2233a1095d7a8410e422f5
 EBUILD setuptools-75.1.0.ebuild 4560 BLAKE2B 6b76b1dc92fd0f431535ea549c82d0ec24e92502a09ec95e6d8cc6ce1402d2e39844e4052b0e656140c63ed8768a5e4bb6fd8109cf3749d6b9a2e6a25e6d07c2 SHA512 0754586d9189ee3ff388933bc288a9c63aec4fc4ad25778e5bc947e308e8b930717883be96972dff26719eaa915a20deed9398bae6c4b9d238ce4ce3ab7dde4b
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-74.1.3.ebuild b/dev-python/setuptools/setuptools-74.1.3.ebuild
index 63143677e239..83bdd551d315 100644
--- a/dev-python/setuptools/setuptools-74.1.3.ebuild
+++ b/dev-python/setuptools/setuptools-74.1.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~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/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 6210c20e7cc7..cade0c78d7c1 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-autoapi-3.3.1.gh.tar.gz 71304 BLAKE2B 0570a26bb22d8a2a37484e28e8d0ff6be9673a49cf8a569ea1808a0a04c6b061c740e0562de8ad351d56966c1e942624486e126f9a1adca0b6790eee2363e79e SHA512 322cba62d37d74ee5ed22787fad2959fbac0885b3066f5213fa57985ba062dfb0be7248356aef695beea371d4090bb591bf604fc0df2e3c56e835fcb6937e3dc
 DIST sphinx-autoapi-3.3.2.gh.tar.gz 71874 BLAKE2B ec92e3a4d3a7b2597a7224201e7ea443dbc6408e43933a54a24fdcb4968fe4e5d295374ea310c600ecf0893a3692a5d4645eafec8bf2a12566de057193eef073 SHA512 6532655408bde105377de1d87cb2f392524935499f45b77afefcfe0fb1b04e8251dce71d338e030537469520774fb8155f91fbe747181ea721a4477fcdebfa3a
-EBUILD sphinx-autoapi-3.3.1.ebuild 1200 BLAKE2B 6d592fea773727b4882b9a746b8ccfa698cdaad175f5f5f69c4402033f421e9f11405f705159bf0fb919c344b789a2e1b04b072f10fd6ba015b72b5c998dd56e SHA512 ad99a6e142a665cfa937f9cfbb28ade0a05c769fd21ac4f574e392c59f5e73351e463ce73320809c3c6beaa14831daec3e37615828bbc99628b9dfe2b076be29
-EBUILD sphinx-autoapi-3.3.2.ebuild 1204 BLAKE2B 3f9e2e6a0d06b2c1b4ff703f44335f08cc4ad0680e50b42061be6faf3794180cff23e708546bdca7ab79233b43d1675deaae31e19e621e524d77138d5dae312d SHA512 29b68725683c54a6e3c5a930badcf5269185b3650b7aac19d4b8302de12fb612821d86116224112fc6e1fbc8594c060801cd3a50b0adb6624285c421f426dafb
+EBUILD sphinx-autoapi-3.3.2.ebuild 1200 BLAKE2B 6d592fea773727b4882b9a746b8ccfa698cdaad175f5f5f69c4402033f421e9f11405f705159bf0fb919c344b789a2e1b04b072f10fd6ba015b72b5c998dd56e SHA512 ad99a6e142a665cfa937f9cfbb28ade0a05c769fd21ac4f574e392c59f5e73351e463ce73320809c3c6beaa14831daec3e37615828bbc99628b9dfe2b076be29
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
deleted file mode 100644
index cc53280450a6..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-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/
-"
-# sdist is missing docs, as of 2.1.0
-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-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/python/test_pyintegration.py::TestPEP695::test_integration
-		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
-		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
-	)
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
index 2dfb0a4c4c8b..cc53280450a6 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 0b79b2b22aca..26301e3ca479 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_issues-4.1.0.tar.gz 14148 BLAKE2B 7d28cd650abe8248ed7edafcc64fc71bdaf97499597d034e9d9bf875224735b8445ee8b95fd465d8524345e3c8137570bda3ef1b9e25ffb97aa3a438ecac1b0f SHA512 ef7da6d4b1a46adde216d548d1be48773d653f383981d5ddde56260793d05c5e10a99d9196c4ed04ba1722b6d646eaa0c12a2650206f5582cf85ced448c3a361
+DIST sphinx_issues-5.0.0.tar.gz 14021 BLAKE2B 65d588f43d3aa0c50884bb11862deeac2b381122b4de4714f0bdfbe751749b11042cfbda7aae37412d4033acc8e1c111de7b516c8e59d62d62ea2d48961e23e6 SHA512 359080293f08e7a66f2534459cd27ba3f51de30da411bcdf0cfa744cdc7ce7c114d14333c21619ffa16e9258ddb8523187e3635e30c3ecbb07b276c890263dd7
 EBUILD sphinx-issues-4.1.0.ebuild 730 BLAKE2B 103bdf1091c9414e62ce289e5e02f37b1c504d4e8cef2d164f2f982fcd48dce02b85fee4fe080cc5fb57d6d935fa9f667736b6c47461a47d42a0a293c92fc8ca SHA512 88ca15f4808a44e1f50091b94dee9be917c5a4f7c18aa43ef8a31c10a0be64095a4328a14ffe36bf5207153e6fc7d97d568bdb89f926dc12dee8eb886f816e45
+EBUILD sphinx-issues-5.0.0.ebuild 738 BLAKE2B fa31a57e506b8e83a0ec015a7b3197589d05b5703cc52872f182f9e77b577ebe071c0cd98ef6153e68410ee56324dcaba938affcaab3300adabea28fd73c141e SHA512 a384a87c1bd9464a4e9ddfeae143169103731f1f54c991a65cdadf07744a8f634eb883786f809896d73d357d8bd1a0deccd6f0d7492c99197041fa26a4d0660d
 MISC metadata.xml 484 BLAKE2B 7fad72573c26a9a59e9fea1805e085ad0f1833f4f34a24cb942671b5f30024d816f3f50060c92f3222e88591728f386682a93591a118bfcb74e1c8969a7da50a SHA512 16d56d729665f82a962aa82ea236abd5c98b2e9fa1172390984560680eb39a14758174959aa4ec90806b1b9c286cbb257f8c7c886b9cb52cbfcc30e925be42cf
diff --git a/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild
new file mode 100644
index 000000000000..8d9ea3867db2
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
+HOMEPAGE="
+	https://github.com/sloria/sphinx-issues/
+	https://pypi.org/project/sphinx-issues/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# doesn't work in our pep517 install
+	tests/test_sphinx_issues.py::test_sphinx_build_integration
+)
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index ba7833f99240..550b4f97ec0c 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,7 +3,9 @@ AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c562
 DIST sphinx-7.4.7.gh.tar.gz 8135111 BLAKE2B b5a511355b16edfbcf32f9a20855466251c592a7fbffa33a84d84369f2a9de7767cd9529cce3f350cdf25bfbb53534ddea70d9482c1d6d78e9ab160d2c9821e8 SHA512 bfb48d4dc09f108986c5b7737710c7495fbdd83eb18f2a1c77bc9d324c499bffb5103f65ebf7396260f10c0f89eddb1ae5eb8d037bd33fffd748483f4391a7e1
 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d
 DIST sphinx-8.1.0.gh.tar.gz 8245765 BLAKE2B a1caee3905b233f5401a7660d876befcfe85d5d630d1ce67c7386eb56aebe855684e88ed95899a9c0ad359c6ae02024784dd0388cf46ae6e41e927608514f6b8 SHA512 265d69167c8c8e3eb9ef174a22641b15eff7585026f1cfcaf00ba9966ad8a60ec0bc6128158fcb2b098f63c6444b1392de6413ac5884e7eafe6544c3a9c99443
+DIST sphinx-8.1.1.gh.tar.gz 8246435 BLAKE2B bc1e45b2528ae5e8376965cc923a4103c2ac410022d2991c162f75ab922c361ae696f1317728e4b4e23e7a121c486cf59b44c394211c9cfb249ffed3a4824ba5 SHA512 74cb44d3714a4000f92fe302cdd820be49580554fa3585de85d5d636b413e0eacbbc81cb26286304564bab0fe3eccfb16ab1d37bbe0251c5eab902179e8130d2
 EBUILD sphinx-7.4.7.ebuild 5256 BLAKE2B 72f124ed614fa03b3bfffbf9a0294cf693e0cd0f61e40303efaeb6a964304376470e7a60699db5c9663cbc583c884891a1cd1ab2ba9732376c88a213c07abef6 SHA512 2d093f1b41a424667d1ae0146dca8187d9427baa1fe4a01a641a723041d9a3dc6b1a8d6b69d6a9ec4750c7874acc3793261d4eea7f79955ce842a1a2c4a38548
 EBUILD sphinx-8.0.2.ebuild 5294 BLAKE2B 72c01188cacbdb2b981aa9391e6d048e3dd03c8da85d97739b3ed2f4bf1a9607baf8163ba1893a14591c6141b9d602f219b1a729ff6f1eb8e176b99125e18222 SHA512 ddce068009c8c3cff24f83892a7df0864aa26eb1b9e42785f8c65852c154f46df6082625b4d90816f11c07becf5c4eb313c0a7e6c1dd4c1b0f0451532cf8d1ec
 EBUILD sphinx-8.1.0.ebuild 5334 BLAKE2B 1bc5aa31931a24e494b77593809e80839173e23bd536a68dbf640070af69aa55ae89a212d380062bd70dbd11325a1d82458353eaf481948c675e531b554131b7 SHA512 ec32e2b28f27c4e34ed78c690a39b3fcc2ba33ceafb81c7ea47180bda5db342d48841463b46604c1c8b498f56e6269e4128bc0970ae6e4a3bce027c452039a07
+EBUILD sphinx-8.1.1.ebuild 5334 BLAKE2B 1bc5aa31931a24e494b77593809e80839173e23bd536a68dbf640070af69aa55ae89a212d380062bd70dbd11325a1d82458353eaf481948c675e531b554131b7 SHA512 ec32e2b28f27c4e34ed78c690a39b3fcc2ba33ceafb81c7ea47180bda5db342d48841463b46604c1c8b498f56e6269e4128bc0970ae6e4a3bce027c452039a07
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-8.1.1.ebuild b/dev-python/sphinx/sphinx-8.1.1.ebuild
new file mode 100644
index 000000000000..d9afbaed2b7f
--- /dev/null
+++ b/dev-python/sphinx/sphinx-8.1.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P/_}
+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
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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.7.14[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-applehelp-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-devhelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-jsmath-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-qthelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	' 3.10)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.0[${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() {
+	# we can't use distutils_enable_sphinx because it would
+	# introduce a dep on itself
+	use doc && build_sphinx doc
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# less interesting failures
+		tests/test_builders/test_build_latex.py::test_build_latex_doc
+		tests/test_extensions/test_ext_math.py::test_imgmath_png
+		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
+	)
+	case ${EPYTHON} in
+		python3.13x)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
+				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
+				tests/test_extensions/test_ext_autodoc.py::test_cython
+				tests/test_extensions/test_ext_autodoc.py::test_format_signature
+				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
+				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+				tests/test_util/test_util_inspect.py::test_isattributedescriptor
+				tests/test_util/test_util_inspect.py::test_signature
+				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
+			)
+			;;
+	esac
+
+	# note: pytest-xdist causes random test failures
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p rerunfailures --reruns=5
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 0fb753ddc383..16b22a509387 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,9 +1,5 @@
-DIST starlette-0.38.5.gh.tar.gz 2569392 BLAKE2B 9ad32478b22cc743652eda43ad71e6b43af9a1c9b42614a16b5fbae282cfdf5e1c092717bb35711d256e75249cf8705d3545289236c78382673f87a9706b7599 SHA512 1ad5ddb497eb35c8b0b2569218b7e98cb4bee0fc2497912aa86bc75fd894264f8d30c886313cc4aa6dd02a24197d71dbd0640b7e2f0a472ce1002ee5cba5ae59
 DIST starlette-0.38.6.gh.tar.gz 2569402 BLAKE2B 1d580aa6d5f9782a0f3688f3ebde59ca0a8ec8756b3c05c9d9465af0ead346a566b28e14d068392d6d16a55a22a0c77adc3c99f781003df0b5963cfbb0e01514 SHA512 eeaf3c573e587ce4eec8c10f879b20059e0ca4f14c04865a744a8aefe1b3f51327a291e36db312d119b9df51475584b20d8407332a8817eee5b387255d4826d6
-DIST starlette-0.39.1.gh.tar.gz 2572649 BLAKE2B f8b1fb9c64ae73d6018e9ec2f069b413c14060a076d9b3cdcaa6a56219733b65e73a7b8ed8abc6caf4bb896e88a34e326fd98a6f2859e5c05a200bac94aa16bb SHA512 b019d368b5610d8b865a17ff98bec40dacaf1dc830150da907a01a900b058519a9170c80ed92a5a78c835c833e089234e38f939523923e3e566fb2d59de28bfe
 DIST starlette-0.39.2.gh.tar.gz 2573134 BLAKE2B e6cd3bd3e2c2fac96d8b145ffae3a680d775a7668d9baf4db09ab81036985c8c0f5cdc6505f6db56f51126013118568c75d6f0dd6c28ea330baf575a5ff7c004 SHA512 2e81e61451136802449baafd152bf6db9cdad9a111713efb16ccef419aeb9a99b004167cd890509bad613df12d300cb5531197867c594c2b755220a1dae7bf14
-EBUILD starlette-0.38.5.ebuild 1297 BLAKE2B ed6046602a41c3e596e28bddea2ccce86a4cbee8c5d2cdb835c9f02f5c0b32b41e011bd6c3e767b1b6928adda0f7ec193b27bc10e8058ef02229d08ab044547a SHA512 8e0c5413070285df188d74f0415bed46503d326d99456e0d79f3c25a58991558b38006deaad84936c241cbd4c2cbee7ed0e3cd5836791f4acf4d4afe64916fa3
-EBUILD starlette-0.38.6.ebuild 1305 BLAKE2B ee124904ac49f9af258e1b4b274a7a2b163fdfb7904f43581a802296a943081f2ec9ec03c36a321128659a25daf3ecbbbcfef0ea510954eda16e766b8be4fbbf SHA512 36b25760833f82e60ddde0b7497f9fdeab9b98a11070cdf3e24b640d7433d7ac4f62c0643af80da459c000a9ce98dba0eb00f5cab23697a4dcfbd1214eb781de
-EBUILD starlette-0.39.1.ebuild 1305 BLAKE2B ee124904ac49f9af258e1b4b274a7a2b163fdfb7904f43581a802296a943081f2ec9ec03c36a321128659a25daf3ecbbbcfef0ea510954eda16e766b8be4fbbf SHA512 36b25760833f82e60ddde0b7497f9fdeab9b98a11070cdf3e24b640d7433d7ac4f62c0643af80da459c000a9ce98dba0eb00f5cab23697a4dcfbd1214eb781de
+EBUILD starlette-0.38.6.ebuild 1297 BLAKE2B ed6046602a41c3e596e28bddea2ccce86a4cbee8c5d2cdb835c9f02f5c0b32b41e011bd6c3e767b1b6928adda0f7ec193b27bc10e8058ef02229d08ab044547a SHA512 8e0c5413070285df188d74f0415bed46503d326d99456e0d79f3c25a58991558b38006deaad84936c241cbd4c2cbee7ed0e3cd5836791f4acf4d4afe64916fa3
 EBUILD starlette-0.39.2.ebuild 1305 BLAKE2B ee124904ac49f9af258e1b4b274a7a2b163fdfb7904f43581a802296a943081f2ec9ec03c36a321128659a25daf3ecbbbcfef0ea510954eda16e766b8be4fbbf SHA512 36b25760833f82e60ddde0b7497f9fdeab9b98a11070cdf3e24b640d7433d7ac4f62c0643af80da459c000a9ce98dba0eb00f5cab23697a4dcfbd1214eb781de
 MISC metadata.xml 371 BLAKE2B 0ccaa4659e63162b565359a1cae05764bea66d708a5f4af1a4716ba9ba23faa39ab4f5a806c0a9783f3f42282ee9b98e22a92f2b308b8dfe97bbf9c770a8add1 SHA512 0fc326941861260becd4129c8a351e89ba0f98f9a3ce9b5d50812f0eaf667743ab0d403889aa1b0a2d9fcedbe0212ba879d165ec8edd115686d4768e6b1326ca
diff --git a/dev-python/starlette/starlette-0.38.5.ebuild b/dev-python/starlette/starlette-0.38.5.ebuild
deleted file mode 100644
index 7adf8bf008bf..000000000000
--- a/dev-python/starlette/starlette-0.38.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.7[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.38.6.ebuild b/dev-python/starlette/starlette-0.38.6.ebuild
index 366226d021e8..7adf8bf008bf 100644
--- a/dev-python/starlette/starlette-0.38.6.ebuild
+++ b/dev-python/starlette/starlette-0.38.6.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/starlette-0.39.1.ebuild b/dev-python/starlette/starlette-0.39.1.ebuild
deleted file mode 100644
index 366226d021e8..000000000000
--- a/dev-python/starlette/starlette-0.39.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.7[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index ee1267245a6e..167c41b53c90 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -2,6 +2,6 @@ DIST stripe-10.12.0.tar.gz 1318680 BLAKE2B 0de2d108c6813d4ed0493b0e2b906a5d41f6b
 DIST stripe-11.0.0.tar.gz 1339985 BLAKE2B f41c8f574c598a5d35b9563a21b4bab7cc7164abd27aecd633bab0842b92cb66c7b07879300f36d9470a563ff0d5d9df840a9f740852719337b128af3553dda8 SHA512 3f7493f6aac38b328cbf06f7497f56385ac852dcc8aea9a1f4b7fc7365b296a4d9c92d096689444d3a372c42d0c5c192729a924bd781a66ff81ac9bb1f20aab4
 DIST stripe-11.1.0.tar.gz 1339459 BLAKE2B a2bc85c423fbc5dd03f3cdc56629224823c99f1d7508b7c74d02b7b1d832f194e6d74d37115a6f5f5a2025c387f43632245c862725845e1b0fec9561d5706447 SHA512 d8c030b44760b7d81a2d25129c8720a931bc77adb5bcb4a60b9866086995a5569442fbca5548390c83889a72edd3ca2524be90aa78be6c1ff132959a69bc8f6c
 EBUILD stripe-10.12.0.ebuild 2479 BLAKE2B 8ab9df0009ae15ca658d143fb49e9d9f8507549074fae6f947a00be821a16d859f48c4faef9e5803ebbe64e442bda7bcad76e81999c8d599f6f0944230e18365 SHA512 aa50f6adfca871d93e842005baedbcd538e1a7879d4e794d0a7a71f169095c49410e99b68a29f306ea70854f5e31fdedc9df1f10d78e5d4b1f7a641180ae0f6e
-EBUILD stripe-11.0.0.ebuild 2578 BLAKE2B 66c0ef40ab3b6a0136cfc9c779f077664e56dc61562888e24adc5fac098087db61db14c05767088be3b4e7206a76a5726937d2f663a14e57b636012c0f4c1c63 SHA512 e90a1aaffc951db8dfc1807761c6ba0f8ec99746384f2e85b59c839bd1e7ffff69fe3acf3f6ce120c95a870943f878abafcd752e25cbf92fbfc9cfc596aaa535
-EBUILD stripe-11.1.0.ebuild 2578 BLAKE2B 66c0ef40ab3b6a0136cfc9c779f077664e56dc61562888e24adc5fac098087db61db14c05767088be3b4e7206a76a5726937d2f663a14e57b636012c0f4c1c63 SHA512 e90a1aaffc951db8dfc1807761c6ba0f8ec99746384f2e85b59c839bd1e7ffff69fe3acf3f6ce120c95a870943f878abafcd752e25cbf92fbfc9cfc596aaa535
+EBUILD stripe-11.0.0.ebuild 2578 BLAKE2B 6b91847bdbd364b73ae3fb73f6690066e2f82a28cb01abc615760b3f60d85e4f05eb6d096719ab54213847ee1080c56b9e861def728ad3df819559d8561e458a SHA512 bc05fb9da657eb4f937ddb3696414fae5640ee204b60a2b936fbbaa9d6af75352be1eadb4389ded869294955badeebf3108a420776f1e6196c2cac15301b0830
+EBUILD stripe-11.1.0.ebuild 2578 BLAKE2B 6b91847bdbd364b73ae3fb73f6690066e2f82a28cb01abc615760b3f60d85e4f05eb6d096719ab54213847ee1080c56b9e861def728ad3df819559d8561e458a SHA512 bc05fb9da657eb4f937ddb3696414fae5640ee204b60a2b936fbbaa9d6af75352be1eadb4389ded869294955badeebf3108a420776f1e6196c2cac15301b0830
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-11.0.0.ebuild b/dev-python/stripe/stripe-11.0.0.ebuild
index ef239893882b..6d45d0feff2c 100644
--- a/dev-python/stripe/stripe-11.0.0.ebuild
+++ b/dev-python/stripe/stripe-11.0.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 # please bump dev-util/stripe-mock dep to the latest version on every bump
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.188.0
+		>=dev-util/stripe-mock-0.190.0
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/stripe-11.1.0.ebuild b/dev-python/stripe/stripe-11.1.0.ebuild
index ef239893882b..6d45d0feff2c 100644
--- a/dev-python/stripe/stripe-11.1.0.ebuild
+++ b/dev-python/stripe/stripe-11.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 # please bump dev-util/stripe-mock dep to the latest version on every bump
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.188.0
+		>=dev-util/stripe-mock-0.190.0
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index e2619cdd7b56..1b1cf40afceb 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,3 @@
-DIST sybil-7.1.1.gh.tar.gz 75224 BLAKE2B df6946089aacdcd65ba76466e8bdc22481df9b9a3c2653d61ea5d29d1c323d33eecaf38dc718613d3503b38b2953b0deac7c8408b6e9b3fb37d519468361e7f1 SHA512 9c4ee6a166562a63281e151e6fcff4a274ac77d94180f35492f806d05da72daed4b9ae48b4095a90f6679bac226469e5d2ef5f48767a40f513efd295c9597b2c
 DIST sybil-8.0.0.gh.tar.gz 75118 BLAKE2B f62f15dab48af23423d8ce9e8a49f3b772fad7d029360d0a98f36a8d2386fc2fc76a2510550ada6b2256848364fa0c998ba939f625c00f1628b8d1a07ad298b5 SHA512 00a02c786e29596fadc3f016c97bc492723fdd956b430ddca2a5e66d38cab424410cf3c74b46f5fff84d3bf3d39ba397068562c5bdca3cff142ce42ad0048487
-EBUILD sybil-7.1.1.ebuild 888 BLAKE2B 5346e38831a421eb3551999093a7f2f5e25c3e70ae5b1e4bcd9c45aeb14bed3084303aff118df1f19ed0c71e84ac197e4586e380ad06fa35f7e9c507ed9dbe89 SHA512 555c750736eb7896ae5884bf7773b5c9c56a7adc5c98dbb12fe6a41331b7a062966c08c448f567736a0f46a2a236a0a9fca47927559893b8899c595abae37cdc
-EBUILD sybil-8.0.0.ebuild 894 BLAKE2B a8335b14901435f21363f6d6a60723708620fc70d50572b4844f78eff04a4ed1c9e027dac01158f3b1e8a4b2e5982e5dae4469d7c2e624ffe976daaf82ace9ab SHA512 3e4142c50eddf9e0f133b99503238bb4989f6e61b28b3dae6e1bc376fa23f17b694af26e7d84733ae4009e0810b72d74fcc7e20e05a18cb45932712c5065bb16
+EBUILD sybil-8.0.0.ebuild 887 BLAKE2B de491417aa76861629588c32945868ee348ec5997b4a4b49b1fcd4ec4ed87cb9bd61aba1c34d49ea5ea6cb7247e1235ecab6b655a62610797ff8985df4f66e8b SHA512 0a336e73e870b11cc14aaf55cd1db2106feb3a669912d80dc4b20c233fcf5f43b1b67c67885bd52975079c53244238612ca91891df4a92ab6eeeacf261553a3b
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-7.1.1.ebuild b/dev-python/sybil/sybil-7.1.1.ebuild
deleted file mode 100644
index d02cc33bf5c1..000000000000
--- a/dev-python/sybil/sybil-7.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-# tests are missing in sdist, as of 5.0.1
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sybil/sybil-8.0.0.ebuild b/dev-python/sybil/sybil-8.0.0.ebuild
index 6244e3506d0c..571bf958f1f3 100644
--- a/dev-python/sybil/sybil-8.0.0.ebuild
+++ b/dev-python/sybil/sybil-8.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index 15bafd55c8a1..02d1a7186558 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,3 @@
 DIST tblib-3.0.0.tar.gz 30616 BLAKE2B 4e2ea0e0f09894f1a8dee4d0dbdc61c054964e4ec5a8a1fbb31f3793268ab8607b5b6e547f7771264c9863522b01cdd39ef6aa4a91d757f1c37f9fac37d6cbaf SHA512 9914709846a4a9b0d9fe0f58eb321085f69e11ce364930f67cc5fec008d6ca57963b17699b0a136e2de91ff01004275fc43a38f318b9faab7cb2fac861108297
-EBUILD tblib-3.0.0.ebuild 710 BLAKE2B 6d3ad213f6aa100593ff82a551fd77750802b04ec4ecd7711f53d8c5ce33794907cb5a71a2e584f844d8c2f3ca161a0a4c74c3de9a93ed0914e8efeea8a30122 SHA512 b7241605576a0ca5b223552604e878c3cda6151dbd48b4afbcadc67d3aa66628fec5d134b0b865bd23bc09fc95077c4fea6967c8d298b48e756a3ce443f4c632
+EBUILD tblib-3.0.0.ebuild 709 BLAKE2B 1808c1cae890728c8012f2dd653b1e1f808faf8ced593e5f95c4d9f1b0da1acbed3e78e8fcf3294c9d87b672c40e9136d331a5db839ce8d23c9db8b5b16cf40f SHA512 f19eed1c81dd7b75d680a8f6165ee0c9fe7a3bde112b36e4fde39bde2e96499d0b84009a2741be2be014c453970881616487c1a1691410dc106b3b297dc686d5
 MISC metadata.xml 406 BLAKE2B 196dcfaca9d242ddf68db2f831720a877f9aa1ec0f1d8aefb4d20f03a8399370ac62e5c009b1538c7f20512bc17ca23c5286544081a8f15512a95e1b4c754e9e SHA512 0e82fd782c7532e0f1877aea67c3171847469f7c0669664b8d9b1a22bdeca9daf6f6159f202041d3f1d83c3bd9871ee084564df0e7b64c8c2230d8b5aba2a91f
diff --git a/dev-python/tblib/tblib-3.0.0.ebuild b/dev-python/tblib/tblib-3.0.0.ebuild
index cbce88dd83fd..a16181b168e7 100644
--- a/dev-python/tblib/tblib-3.0.0.ebuild
+++ b/dev-python/tblib/tblib-3.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index ab85e6e9a4f1..7891cda63022 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,3 @@
-DIST tempest-40.0.0.tar.gz 1149624 BLAKE2B e75db763090738032699c35477a5bc5d877c44aed1ed4e9fe7b878af116dc6d53dd7b64cf58be55cd3448f5ebdf8e9a44e3f4deb215f535784a33abfc79fde9d SHA512 12227d4f20045f60e56db7bc1de3e117ddbc3d4b3e30aa26239795675023b23facf15646f1c048b75f43dd9c0ba5e7d475e8ad1c483b2d0e32ef9d8d50e62dfc
 DIST tempest-41.0.0.tar.gz 1151830 BLAKE2B 6c732647f49a07d1ae747a4f286779b21c1c64f046a8542cf3f067f79cc839d99fcc6eced01162f5e0415e803c8a2ee0a0e5e5ec92f1088736cff3b341874b9f SHA512 aa5065dbb7431b5cf5d93075083e74eb6c811c759f109ac9ceee7cc45240b84c091f84542a3455cf686f84e359a17f99154ec417ee7003bb01c7ef191f6dcc27
-EBUILD tempest-40.0.0.ebuild 2210 BLAKE2B baa71579ca4ba21708a6ff0eb29ad077ca911a2a745a8378c84f8c0bd083714646745afb40ce2e945e5096caf71b8f08238c56b9998cb86f0fc4781f6de52a17 SHA512 252e2280be840f5fc74e3835ccbb21f3c380c8c7e842e95dc03a23cbbc38d0de0ab51401c05a585d6ddcc432a122f3a09c556b3106a97ed4e4feb7be0768cbc1
-EBUILD tempest-41.0.0.ebuild 2213 BLAKE2B 6460196a64be7463d7d0286f72cc706a7949d13ccdea684ed2b8147369ee39d905fde4c73402f5b159914fe4314b2979cd940e877579fb0072eb297dc098ffcd SHA512 309d30a6c9747c402d4c34f3d93e1253b67fef5f54bbe87ba12382f4b941008ff6014f151c48134418972d2d6d08dfa4293f20a73fbf4bc70c0a34a08496bca6
+EBUILD tempest-41.0.0.ebuild 2210 BLAKE2B baa71579ca4ba21708a6ff0eb29ad077ca911a2a745a8378c84f8c0bd083714646745afb40ce2e945e5096caf71b8f08238c56b9998cb86f0fc4781f6de52a17 SHA512 252e2280be840f5fc74e3835ccbb21f3c380c8c7e842e95dc03a23cbbc38d0de0ab51401c05a585d6ddcc432a122f3a09c556b3106a97ed4e4feb7be0768cbc1
 MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
diff --git a/dev-python/tempest/tempest-40.0.0.ebuild b/dev-python/tempest/tempest-40.0.0.ebuild
deleted file mode 100644
index 890bbe82daec..000000000000
--- a/dev-python/tempest/tempest-40.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	stestr --test-path ./tempest/tests run --concurrency="$(makeopts_jobs)" ||
-		die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/tempest/tempest-41.0.0.ebuild b/dev-python/tempest/tempest-41.0.0.ebuild
index c8907a75cbcb..890bbe82daec 100644
--- a/dev-python/tempest/tempest-41.0.0.ebuild
+++ b/dev-python/tempest/tempest-41.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index b2ede77ad2f4..42bb4c3607ae 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,3 @@
 DIST testfixtures-8.3.0.tar.gz 137420 BLAKE2B bf0fe6705bbbb33a26dcc98be061c1dafbe331ca6c4ac8c028e146f7e156870ee8abe5118b3182600e8d513530c442a4fa1efa696253b9b0c114733bd40fc6ee SHA512 b2c18a35c44b90bce50cc68ca9bf9909ac8f75287c7188eeddfa855aec1db3bd14f3fccb4c5ef0e44b19c683ad4bd6be4876554ce9127698e8e20cbfa4191800
-EBUILD testfixtures-8.3.0.ebuild 1546 BLAKE2B 8e684fe4ab67b2453c2297372c8530c9db0af992be36d9ca97299a2e05580cadd368e2829f407f7d74007aee7b746a029eaf3e60a3f95c09d3140b2c420d875e SHA512 8fcc573f2840cb6e426eb8105c12d133bef436e62d83ae8b18b646a608152fc7b57c4d3bbb83b59b6e7a670e6cdac3fb227f724c6a276993110b1a40fc3ec7de
+EBUILD testfixtures-8.3.0.ebuild 1545 BLAKE2B d6cb119242abe0a2a711d884667f769a4c261eec3e4cd53770557c2d44e2a3c14885f74c632cd3f42406b2f8a09c9f6aa0d3109576d6b20d6e8b8d9f66cb6449 SHA512 7250957acd8522f358f32f86f49672fbdb307eb8195cddc7bb8999435e39da9d37a4369108a0c4e3ab8c02eb06863b2f4920f7a2da8610589c020b41de03333b
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-8.3.0.ebuild b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
index 419dd6df3685..73b9a96aeb2f 100644
--- a/dev-python/testfixtures/testfixtures-8.3.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/textile/Manifest b/dev-python/textile/Manifest
index e721fb1d46ae..ad08db7bb1bc 100644
--- a/dev-python/textile/Manifest
+++ b/dev-python/textile/Manifest
@@ -1,5 +1,3 @@
-DIST python-textile-4.0.2.gh.tar.gz 49296 BLAKE2B e9ac36b0ecf401a07aea1037c1f4390e440123d7e16f8fef64c257d27f6ef9c6918018ff34e9f8ad367767f3ebc5ce7957be424b2e6dac62fe8a1f7736b8eff7 SHA512 eb59e44b9a8521bcfa98f476e23efd727ffd867277d24f102bbb9511a99a0d636c324e22f8562382074007f304490c4ec6a5fde529f41b15f055a9cf16d49b8e
 DIST python-textile-4.0.3.gh.tar.gz 53228 BLAKE2B f72e3aa58afc3509c4e430a54e6099758655d62dd3274af457c45cd752281e1836aded117496ba6b8d154867f4bf30770156110eabd607d6edcec978ded5e0e4 SHA512 796e8bffe0e5d1d477bb7ea9ef48b5ac19f870d63ea8f895973b2d895475317fec8d888557f586807541601bd97550e5bc2297f5cfefa3031a53ffd3e0bade00
-EBUILD textile-4.0.2-r1.ebuild 887 BLAKE2B 2294a3a4ca1920bb158d03efda9a5a14a75029da3322d9e9df074b98d9e9aa711bce4c063856c764df64b26a20a8d44352d66a525c6de18605eba1bdc98cfb16 SHA512 c0870cb17519b097f5dde8044e11756c81864d97dd04b2f835a5f584380db21981747e940356f51bdfcc0ba8fc4c637325c3a5e3f6dd50634be9fcec37f4d217
-EBUILD textile-4.0.3-r1.ebuild 888 BLAKE2B a477462b5007a130d3ecd27d94865dc57ec10a97fa9963fb104bf616807df79ad709011eaec0203ba2fb78fa547b74297073c951274c3afb7d9d727a297b16ae SHA512 22e9b8c01facd09af7b87003691d9809b4deb013fe490ec808236623595f7222ff503ab8e89468164ad29c6be8f80177e70ca8edc2986ac449d71bdafbccd0f4
+EBUILD textile-4.0.3-r1.ebuild 882 BLAKE2B 92eab12aa55be0233f98d655a738c0814ccd08571155d1034f52cc68a167e6a6b3ab70e6c2d4cb852d875792cefe69867dd0980b076a1d3f7f1d389517b8736b SHA512 bf9516c56b9fd579d56b2c601500d88a5ac117dc85f7ec0f0ef406f37a980c1250f3aa263c9f8faeefcf8bb9f80270faaef345962b07b6a00934b5eeb30b0e74
 MISC metadata.xml 580 BLAKE2B f318193518ce2529a1345249d6b876b6c98cf84f896666650323b94d60969fdded5c438e676c06f854a4050a85d7d27b7e16f74914ff80f12d51f1c66f234544 SHA512 7d9e4a0720730b6b96a2bc3828c21d3a31168f8b7ec4ae2f28a4f26b7632199a14b241dd954a944a42c1e9dffd07a8835720e60e7608d1952759e0627de176f7
diff --git a/dev-python/textile/textile-4.0.2-r1.ebuild b/dev-python/textile/textile-4.0.2-r1.ebuild
deleted file mode 100644
index 3810139c4376..000000000000
--- a/dev-python/textile/textile-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P="python-textile-${PV}"
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="
-	https://github.com/textile/python-textile/
-	https://pypi.org/project/textile/
-"
-SRC_URI="
-	https://github.com/textile/python-textile/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests that need network access
-		tests/test_getimagesize.py
-		tests/test_imagesize.py
-		tests/test_textile.py
-	)
-	epytest -o addopts=
-}
diff --git a/dev-python/textile/textile-4.0.3-r1.ebuild b/dev-python/textile/textile-4.0.3-r1.ebuild
index 274f7d923970..4894d928f301 100644
--- a/dev-python/textile/textile-4.0.3-r1.ebuild
+++ b/dev-python/textile/textile-4.0.3-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/nh3[${PYTHON_USEDEP}]
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index dcfaaafa2537..a5f95378c986 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,5 +1,3 @@
-DIST thrift-0.20.0.tar.gz 4397667 BLAKE2B 23422fdcdf7e0dbce8bc0f8017f54b5848594e2da21de56834152c17c74da7d1c4df23c5b57cf3ba811bb03f1a8588ddf1c2a05222bb726aceda4292a15af21e SHA512 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd
 DIST thrift-0.21.0.tar.gz 4398072 BLAKE2B 1cbbecd0a4ecfe1a14b657d2a87286ad821e821894efde226aa96b23c62250c6bb032e703e0031990328b263593d92024f28b907e8dc27c217d475f6f3b90932 SHA512 0ffca1232305c07f803adb7239b5d22ee5c766a2809703c127b45a80b820c677e05a2d5b82852af5e1e923abe07ff1d9eb2f3fa4f2aa8732c9a81d8b0daa1f35
-EBUILD thrift-0.20.0.ebuild 805 BLAKE2B 3dc168b5a9b5eace00dab6fa52ec890a78c36d6d81449e90166c37b9fb1750369af05290756dddfb8bd718da92407996c2d915aeeb7a1fde873c30c76547e845 SHA512 2c84e4bf96ebdb6865440f7cbd8de85d07ff45054d4d82d5166262cfd69e44857fd3a11929f7c59c6ed1eb134d34ad460b916138761c2a0b1f0611ae4313dfaa
-EBUILD thrift-0.21.0.ebuild 807 BLAKE2B 860a905f00e520bf7b8bc3e1f68bda01dcdf716ecfd1ef66de498cac873eb6b3e5268052e181b45b623a08fee40493db728e987d06ab534bf205cc2c334692a4 SHA512 d4e5e166e0fda3344afe8fb4d56cf0dcd092af6dd6222e15e95801f58b6e4db9d407247004c9201fe1536ee3d4c31be2666370223f4de4684b2d16f605257ece
+EBUILD thrift-0.21.0.ebuild 805 BLAKE2B 3dc168b5a9b5eace00dab6fa52ec890a78c36d6d81449e90166c37b9fb1750369af05290756dddfb8bd718da92407996c2d915aeeb7a1fde873c30c76547e845 SHA512 2c84e4bf96ebdb6865440f7cbd8de85d07ff45054d4d82d5166262cfd69e44857fd3a11929f7c59c6ed1eb134d34ad460b916138761c2a0b1f0611ae4313dfaa
 MISC metadata.xml 297 BLAKE2B 9d609f1b246d9318981195394bdc6304f6593eb03cc4e292186ea97ef8e2fd9883f642fefedb594dbe4682bdc042ee02f00a1e853303bbb8038d7db8b7f96860 SHA512 5ae389822c24ea799ac748a7834157d192b4aa9dc8a4a0433c2f0d7cb04480508b097cba8687557a56b84239665d66efd9a501e11751b715de2f24cef505041f
diff --git a/dev-python/thrift/thrift-0.20.0.ebuild b/dev-python/thrift/thrift-0.20.0.ebuild
deleted file mode 100644
index 261fd69010bc..000000000000
--- a/dev-python/thrift/thrift-0.20.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of Thrift"
-HOMEPAGE="
-	https://pypi.org/project/thrift/
-	https://thrift.apache.org/
-	https://github.com/apache/thrift
-"
-SRC_URI="https://downloads.apache.org/${PN}/${PV}/${P}.tar.gz"
-S="${WORKDIR}/${P}/lib/py"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest test
-}
-
-src_install() {
-	distutils-r1_src_install
-	# avoid file collision with dev-libs/thrift (bug #933272)
-	mv "${D}"/usr/share/doc/${P}/README.md \
-		"${D}"/usr/share/doc/${P}/ReadMe.md || die
-}
diff --git a/dev-python/thrift/thrift-0.21.0.ebuild b/dev-python/thrift/thrift-0.21.0.ebuild
index 34265a0ba6a1..261fd69010bc 100644
--- a/dev-python/thrift/thrift-0.21.0.ebuild
+++ b/dev-python/thrift/thrift-0.21.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}/lib/py"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 2601ab08d4e1..73f6bdb08ee9 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,7 +1,5 @@
-DIST translate-3.13.3.gh.tar.gz 1172858 BLAKE2B e7b2f711faec3876fdc082aae02716beaa45934f2ad308433c20020e69b72850e0a9d32c7cb57e32b4fdc8b39334a358b8f289c83744882728616122f07cf8f7 SHA512 f435306b34a2a200df5b648a1354444ac5fd76872f36062704b2c8abf52b8b1e1d570afbcf4b50cb1d815abfcf85b05630e8bc02f908a83f3fea90188c76c6f7
 DIST translate-3.13.4.gh.tar.gz 1173494 BLAKE2B 878da77378e4ca1a27c3053812b4f70c1decc55523421daa1716f10c4af9cc1d3d1a601bf076f343eaf34c661355af84dc2d173411779942e83eb4d7e64280f9 SHA512 44d0ee7d5e8b177034385bbc323539b8d53ef7a01d2431ea9c58a8df24ccc5f55af15f245b584db225e194b796d0281dec73ed66f50f8749cf949cb0a4c95277
 DIST translate-3.13.5.gh.tar.gz 1173710 BLAKE2B 1b6431cb0ce2643477c352f54dff0b7cbac8a79d3bf1e2a5976cdea649f8bbf3ee23f96ee97db1c5a7e57789ca5b434cddac959aeda92acaa75a0714b04bc507 SHA512 5ae243584f2bc4e3b304c6e0ccba2f4fcd3728964ed8361017241a787124dc24580ec842b3116036cd99f911f066e29559291b56893410f170d59f1e722e81a2
-EBUILD translate-toolkit-3.13.3.ebuild 3179 BLAKE2B 409f83c60bb0088020da43f9d65708b9512b87ecb161ffe87ef323d7dcbe068ff709e7b97fbc628be3335fd983ff5231314716df63a1b0b9b92f4aefe3d1356c SHA512 299ef67dac4dc011cccc9f261b138433f70506240b231b63f8af5582584e1dda0c54acafb0e81ebdeb39de69253fd6c2db0756b7d7972c6eb04db9ea97e109b4
-EBUILD translate-toolkit-3.13.4.ebuild 3182 BLAKE2B 98345bca852df50649e419889b3b65af580ba4919d5be0855057e745b87866b83f308e1eaa5bbe1192dd3b27337fbf7b36dca2cf76c3511b3324bc6ad8ce3394 SHA512 b10c4b4ed23d7a2794bb8ee04078157155e93a717151226fa8aa594a05b2ec7bb5cbf9d7ea45d40fcb8814cc7bbd47ece5fc823184b3946867311496a38aec6d
+EBUILD translate-toolkit-3.13.4.ebuild 3179 BLAKE2B 409f83c60bb0088020da43f9d65708b9512b87ecb161ffe87ef323d7dcbe068ff709e7b97fbc628be3335fd983ff5231314716df63a1b0b9b92f4aefe3d1356c SHA512 299ef67dac4dc011cccc9f261b138433f70506240b231b63f8af5582584e1dda0c54acafb0e81ebdeb39de69253fd6c2db0756b7d7972c6eb04db9ea97e109b4
 EBUILD translate-toolkit-3.13.5.ebuild 3182 BLAKE2B 98345bca852df50649e419889b3b65af580ba4919d5be0855057e745b87866b83f308e1eaa5bbe1192dd3b27337fbf7b36dca2cf76c3511b3324bc6ad8ce3394 SHA512 b10c4b4ed23d7a2794bb8ee04078157155e93a717151226fa8aa594a05b2ec7bb5cbf9d7ea45d40fcb8814cc7bbd47ece5fc823184b3946867311496a38aec6d
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
deleted file mode 100644
index 525771d408ee..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
index 84540c3968c4..525771d408ee 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 18980515d92e..78f5ff2bc4ce 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,3 +1,5 @@
 DIST types-psutil-6.0.0.20240901.tar.gz 15117 BLAKE2B 1cdcdcb2fe5b67c482b479ab470d2b6fceac324bd059fbe856c228b55040a1b3beabc0dfc7c11febecf19f58fb2ea486b11f442ab87529f8475fb8649dd0d3de SHA512 05a686d3c16b356da056be565f7a77bd6c2c5161e75229bcda80b0b22c6c51407ce5b7c39c8d7c2a6684a98decb92cde3d6dee53265778613b46da499524ac03
+DIST types-psutil-6.0.0.20241011.tar.gz 15222 BLAKE2B 1bbe0dc93b61aa67d5730467396dab3eea57007d7a01a38fd339ed7ca0438239865936ad62fcf070e34a45c728382cb1dd840cb61a52cc2cb589d8da1412634c SHA512 b6688918ae07c8cce2a59cbb616f5187dd14d263f57fb9371732bb509c3ec2514b254a1f92a6320a3056477de4d3c8d6de871dceb6f018603316a3325022902f
 EBUILD types-psutil-6.0.0.20240901.ebuild 432 BLAKE2B 352013ed88a611636c008d2fe06236cbe4a0d5b527cff53d2f1da49c295b0df6dfbd70b10cb0972391232a3ae6a4826a2d9adb9b4cdccb41596ebd71157cda9a SHA512 5622909be1c232dc1baccbd7fd1e8b57c5ca5f9a3c7665394e5b386d69665d65d2f36b0a4b250bb04d79d2e813ede5beae3c9907b7d52b586c61238c6f9b0b04
+EBUILD types-psutil-6.0.0.20241011.ebuild 440 BLAKE2B 3e1a495b518c5a8bf5c84221d1fc4398743d8d3ff36b6901c062b7ebe7d9d400dd2515c0a3dfc4005f8eab5ce8b96583067bd20fe84e98780bc5ecf45aa53fa3 SHA512 4f0e50f31ed7d850a375391f28810136b3671f613f9d50237b2dc267b7a1632224d8a87523b7934769d75d8c67101147061016d9cb7be3fdb6457d68461c78e4
 MISC metadata.xml 395 BLAKE2B 58c240c13cad1e6840bfeab26f48efbe07b75fb432da70652802e95b7cace7013f72d6d8f4c17ea15620abde8cd9940a8f74842e72dd5a7831d552c614c37f18 SHA512 58f9782008175a716f07a26e3b24a10904d942cc8dad7bad13cba697da5c6701cc3a6b06823a303f73485d6abb78c245ed2599e8b015c146ba35fb2722191143
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
new file mode 100644
index 000000000000..2074873d0267
--- /dev/null
+++ b/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Typing stubs for psutil"
+HOMEPAGE="https://pypi.org/project/types-psutil/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index d041f193b8ef..f1729bfbc588 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,3 @@
 DIST wcmatch-10.0.gh.tar.gz 118184 BLAKE2B ffc98749b111f472244a35654c8d57144e0f242f33b04e672a3b7d810c5c6c1b2c36172c09437e159c30812916fe15c7690fc3c2a1de14035f04ed801e898dc2 SHA512 db8fcfc7b0bef0256530a86f25491309b0d67f51ec9f60d9e6d2e3f49ae5e94ce432981aa2fb6b1f2086758a4eaa4a53daf9b2f765bd75480230f6064f181e75
-DIST wcmatch-9.0.gh.tar.gz 116090 BLAKE2B 6d33886a9f1f0f53c95dcd8adcebffcd50075c54f8a6398d22e372b811dab33a09152c98d982ed817c9230ae0f200e74dac209da785979365aa38a511b790965 SHA512 638a59b70729eeb39a9bc059d08271b8cfe924a9fce4317718b3cc38e057f1176ec87b033f9f30494fce5c1d24560ef22cd0d9e2a4df12c2b765c3e1358756d6
-EBUILD wcmatch-10.0.ebuild 1293 BLAKE2B 6e039f322ecb83199cbf6ac98a3c454c0d289eb89913333f1a9281caac0c034574b0a4a0bfec4c3b5608ba9458bcb01596df80fbc7464956453fe773fbaacb50 SHA512 e5096ccb23ae208ad20b85e2eaccb02cef6a5ef14a708a7924ff0ecbdb8fa599f1c90f6dde8711d14950a777a6be06bbc0b0501192f228d057ad70ba5d3629cc
-EBUILD wcmatch-9.0.ebuild 1290 BLAKE2B d9ec071df4f7f83765ba105eb30990d9d3df3e9a21a5d757bd25e0bd22a38f619b552d11d338fa69c048f40913c684b91e9c2aa4b03d78c1cfd5134dbfb67c1c SHA512 91bf07d5ccba9ba6d0d03d2316b130f1698bf25fd0cf921728aaccd27eedb0f29360a26186c1d773b0fe5c97ae269cb6ae2fcb0f711593f7e7fd569265f39c7e
+EBUILD wcmatch-10.0.ebuild 1290 BLAKE2B d9ec071df4f7f83765ba105eb30990d9d3df3e9a21a5d757bd25e0bd22a38f619b552d11d338fa69c048f40913c684b91e9c2aa4b03d78c1cfd5134dbfb67c1c SHA512 91bf07d5ccba9ba6d0d03d2316b130f1698bf25fd0cf921728aaccd27eedb0f29360a26186c1d773b0fe5c97ae269cb6ae2fcb0f711593f7e7fd569265f39c7e
 MISC metadata.xml 2701 BLAKE2B f09d6810f516ce43944ef492b90cd8adf15beae1eba1a0deb65a9def3582e674c18a75827166661333e9bd1732e757743b03a3379d6d4bc7bf5e2195434ac5bc SHA512 d8c4a11a7602b559976fb777ce862070b6e273e64e6a22842b22c9917bacfe1aed5dc199c7c01ec4f16e57d30c7fc2bc2d2d3e91379059ea305930aef8fb3189
diff --git a/dev-python/wcmatch/wcmatch-10.0.ebuild b/dev-python/wcmatch/wcmatch-10.0.ebuild
index 31f842037d84..3316e513d847 100644
--- a/dev-python/wcmatch/wcmatch-10.0.ebuild
+++ b/dev-python/wcmatch/wcmatch-10.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wcmatch/wcmatch-9.0.ebuild b/dev-python/wcmatch/wcmatch-9.0.ebuild
deleted file mode 100644
index 3316e513d847..000000000000
--- a/dev-python/wcmatch/wcmatch-9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs-pymdownx-material-extras-2.0
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/
-"
-SRC_URI="
-	https://github.com/facelessuser/wcmatch/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index e4c381d87397..1bba745dda82 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -4,5 +4,5 @@ DIST websockets-13.0.1.gh.tar.gz 400436 BLAKE2B 3387cdc72117d2b1b0d1a5d3bc2444a2
 DIST websockets-13.1.gh.tar.gz 414934 BLAKE2B ac6ec67c360e88a7091c28e582b8a0e58fffb37b91f6cfe2b62fa91e1de10f94ba66b644e22f3ce34db698ec25c1685f682e3557058e30f162e1a6a39c19451e SHA512 f66c25c8c2a327840e424e1db3742f1e303df562fe59e91d44c15731d9e43d3d9b126253f2ffb2efeada63d3fd8b404480506554f263846d8d0d86da02f4d8aa
 EBUILD websockets-12.0.ebuild 1420 BLAKE2B 135e8bb0886d85ceb788f311e821a129a088fbaac7c7b276e43f0f8f8790ce8ec15db3405cfaf04356c9b42410fed2fc38642d58afaa84fc96c9f65a58d94c41 SHA512 105c2d7fcfd835a730c3b43411e60b4d893cb534d7cddd47b2adaa9a90e0cf351d81088561c477659910ea9bd206ce8605da37e424e78ef0b9b750dce4a31d2e
 EBUILD websockets-13.0.1.ebuild 1578 BLAKE2B 3577c3e10765c2ff4f2bfb88d50c9e5359a0954ae9b3f9f3f1c7487ed48a3df7bf2c712945d96ec50bdc24dbc5388a24edfc9d78509b047644b20095899922d0 SHA512 3fbeedacf97fef31d62ce177810ebf30ee2e2636a8e8de561b1f4a3d9c180cf5d697267785a985af59c96e9be38617fb24b654ebaf81dd8b5e5c17cddfea0ee3
-EBUILD websockets-13.1.ebuild 1583 BLAKE2B 1994b1df4d78b04588efd82af14701817220f626c647323a420471657c6abfb4357664d5495fe51af62f8bd490461f51515ec9037e921c83847de28b5b437197 SHA512 e0f183e129758c197643ce4e536330d56afbe9b21702ec15edfd2fa05c4a273d7478bed8eadb5aaf45eb649f9e4fb99466b5a47db8fcd2246ea56602b3a66413
+EBUILD websockets-13.1.ebuild 1581 BLAKE2B 1029bd38ed5df3d711306370a83ad906a1a023900f3328d176da4afa907026624476667567334d8c7581cbb09eb2f0f16d8fabbb50922f1c893856578883d389 SHA512 c9db27f0fc019ce4ad33b4edf5916994d232d61179260de549cf6658aa82d8762d22144d8751025020887e3347ff1216884c580aef466354c5f3913bfcd1d26d
 MISC metadata.xml 580 BLAKE2B 66a318a73b2a9e37f44a28dfc9ed5f1aa7193edb05fa295bde27fd7a1c429cae1d875289ac5bd8ff7b579be2cfc5671d27dfb46ba959c47b2c1074e8e549e9c3 SHA512 c4ba79e5ec539ffb6f0338e6e161132dc8dd0e6c7e7533df1c32731810126b728076703a542bb28abc159842ad71bd42e69e36f4fe17dc3377d054d21ec53dbf
diff --git a/dev-python/websockets/websockets-13.1.ebuild b/dev-python/websockets/websockets-13.1.ebuild
index 93fc44988e99..e4061980471f 100644
--- a/dev-python/websockets/websockets-13.1.ebuild
+++ b/dev-python/websockets/websockets-13.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4293a594ed7b..5e88c61f6661 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,10 +2,12 @@ DIST yarl-1.11.1.tar.gz 162095 BLAKE2B 2fc83033411ec3c1d2a8c4f6b2cbd1fab977a7dd5
 DIST yarl-1.12.1.tar.gz 163223 BLAKE2B 9d295c9e018ef15f3b089327006ea7dda7689b6ad7730caa716265cb5fd433fbc2bfd61f30be3f53a28a77102c4e04d87b2f4684aaaa3979f2e9f5e4dba8da6b SHA512 3e27c9ee9c416b4c8eb68ec425cba5d913cc7193670a0abb454551170c711b50b96bd6e10cee9fa34456e57d6a9d18852082a3789243b123ed22c9838b8e9eac
 DIST yarl-1.13.1.tar.gz 165912 BLAKE2B dfe4f9ac09c66d05b6d072cd6676d1753f97224d556dbd22601e544569d5e852b073c1a89e4ba471177c530ec580fb74700b9e6e21730c548e434ef75933b6bf SHA512 8fccb36dbb019d02fc50f006a3a59decd413abfc6387fd7c1220444f4f79412be1d5119c32fd668b3d553fbaf4de64b9135345e8300c7fa025d892c847955f88
 DIST yarl-1.14.0.tar.gz 166127 BLAKE2B 7974896144ef23309aead8935f18fe717e39b982bc75eb3c828eaf9a1d01b413c2bbb270344160a396927fc32571928c67eae46146920cc6908e2e3f74e90cd8 SHA512 8cc9d1aaa6fcccdfce5ea0a0ac3f89b81c5719568b76e66637e9a7baa0637770523f86495f70e28f94f166579e77d72afd708cef1306dafcd8093c7fb2a1d3f0
+DIST yarl-1.15.0.tar.gz 167065 BLAKE2B 2daae4ee528501cc00e4e967bce32b15585a827463b76ef8c27db3808dc3bfeac93de8eec0e2a9af28d3622d70a40ce66845c69744ad49dda7205e93d047f614 SHA512 25a2b2434204e29f4fc4ef438efda0747aedc3e703a8164f9aa5fee809d8d01895f3b0a9aa4de1d3deaa719d940b2b5e681360e47d8e3704200bffdf5e7151a8
 DIST yarl-1.9.4.tar.gz 141869 BLAKE2B 367eac4674bf1190122f10bb1dc1c4f3d5e4263e1d95ff2b871067d55a894dc19a6bb5a6c673d1bed28b3c5f77c704799568edfe639d50f0ae10313eb847352d SHA512 e4f7917f1625b40125abae9a13d61795f97e8cf489735e15cf58476e97c3bcf840b1452482f1f7a737fbb2bdd1dc7bbcfa882d0a7f76a27dfb3aea72b7a66c82
 EBUILD yarl-1.11.1.ebuild 797 BLAKE2B dfb6ab453a2fa6cdf0b371723ba727ac72615c18cebf2a6f07101a8ae2cc11da416ce1a803d63b40e05b2cf168babe5dbc3225ff965f29f7834eb6434319f685 SHA512 458d640076d235ea7fab6b97d347f806df39632542be59f9ace0c021bb9a567d6eea06e9bcdc4380c0ce7cb2e5b269b84bf655a98aef2d091db367f381e9a4b6
-EBUILD yarl-1.12.1.ebuild 803 BLAKE2B e256f371fec6b9a63550e59c7c4fedc0f4c8c875dfdefc5e5883174b882ac6e14e3180ed5724bf5f83a59775104528b106b0496ec68bf28922479e32d53b528a SHA512 1295f67cf98ad72f60160caa1d884a86b0a09a51b17abd628b9d084e8143560dee8c066b19f94c4611daf5d5c73beca060a92d72c817a6f217c37a662d71aa47
+EBUILD yarl-1.12.1.ebuild 797 BLAKE2B dfb6ab453a2fa6cdf0b371723ba727ac72615c18cebf2a6f07101a8ae2cc11da416ce1a803d63b40e05b2cf168babe5dbc3225ff965f29f7834eb6434319f685 SHA512 458d640076d235ea7fab6b97d347f806df39632542be59f9ace0c021bb9a567d6eea06e9bcdc4380c0ce7cb2e5b269b84bf655a98aef2d091db367f381e9a4b6
 EBUILD yarl-1.13.1.ebuild 803 BLAKE2B e256f371fec6b9a63550e59c7c4fedc0f4c8c875dfdefc5e5883174b882ac6e14e3180ed5724bf5f83a59775104528b106b0496ec68bf28922479e32d53b528a SHA512 1295f67cf98ad72f60160caa1d884a86b0a09a51b17abd628b9d084e8143560dee8c066b19f94c4611daf5d5c73beca060a92d72c817a6f217c37a662d71aa47
 EBUILD yarl-1.14.0.ebuild 1372 BLAKE2B c7f6629c968894e429c6db3f63ddd45b89a212c930c37abdc9f60a972a184b3e74fabeb0c298ee82f22e53daec650e1ac2a4d9ee5a41e3d8d32077cd26c4ff3e SHA512 bad449ecd1356c104be4f1c10c72c7067b6c00b1c45bb62ee23349afdcd086a499f20fc169872612fed2a42280c3479e442a68f0a400e11e423380807d753e45
+EBUILD yarl-1.15.0.ebuild 1372 BLAKE2B c7f6629c968894e429c6db3f63ddd45b89a212c930c37abdc9f60a972a184b3e74fabeb0c298ee82f22e53daec650e1ac2a4d9ee5a41e3d8d32077cd26c4ff3e SHA512 bad449ecd1356c104be4f1c10c72c7067b6c00b1c45bb62ee23349afdcd086a499f20fc169872612fed2a42280c3479e442a68f0a400e11e423380807d753e45
 EBUILD yarl-1.9.4.ebuild 789 BLAKE2B 4461b765d466a6739bb0b4667fd5e9212df330a19bf5542f28b4849c6248a25665e40931b2e7229fe6090e3b8a3ec3c638e196c9941adb49756b461545a24115 SHA512 03b1f95382c35e728842477f97acf1b7db5375117fe7e05e80ff6d6a6f5b67e97ddcb3a0f805a127da9600eebca31e07e4e001078bee72578d7771cabe58dc24
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.12.1.ebuild b/dev-python/yarl/yarl-1.12.1.ebuild
index 4732f61f415a..29a4cec45c72 100644
--- a/dev-python/yarl/yarl-1.12.1.ebuild
+++ b/dev-python/yarl/yarl-1.12.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.15.0.ebuild b/dev-python/yarl/yarl-1.15.0.ebuild
new file mode 100644
index 000000000000..d06c598c12e4
--- /dev/null
+++ b/dev-python/yarl/yarl-1.15.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local -x YARL_NO_EXTENSIONS=0
+	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
+		YARL_NO_EXTENSIONS=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local opts=()
+	# note different boolean logic than for backend (sigh)
+	local -x YARL_NO_EXTENSIONS=
+	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
+		YARL_NO_EXTENSIONS=1
+	fi
+
+	rm -rf yarl || die
+	epytest -o addopts= "${opts[@]}"
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 01aa01842add..7ba1f3ac46f9 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,3 @@
-DIST zeroconf-0.134.0.tar.gz 171689 BLAKE2B feac4312bc418ff8e703afe4248a2639d55c829ad4ff817d2b07da4b5e486ae4e4c09949522f0241831712b1217496155aae5a523797f78d5d9dea6ec784aca7 SHA512 1d0d9f4a55555f3a1c28ae5c446d6a284a29e35e0cae51d0c2ef7d86f9f55c5b175d644a086adbcc9594d2aa9875d41e9601668514f4b91ff251a77926ee25ee
 DIST zeroconf-0.135.0.tar.gz 171896 BLAKE2B 99822f18b98bedf8af03cb3f6483b0884ef92289afd4f71892ce33dc85e1751eea6180de8dac3d8c460bdabea3e096dfac1f26854a5dc52a86ce6ee271514996 SHA512 703d71aa2ffdedfc9a212dac448b9bb5589a839a610d1add8b5324e4ce241680ee1ebd8b5a01533c4c73bc91d22e5f641151c12186aec6b71c3e23607b32c30a
-EBUILD zeroconf-0.134.0.ebuild 1408 BLAKE2B 015a112dd6a16d643d7351e9730e1b7eeb5fb177afb47e008376db45246f0f24afa829cb966e7450315046c3b07d159be487b5a1d4ccbdab79a7a168be1254a9 SHA512 cf1db8dde3188c51b484007d62f3d8a6e8c714046c1e45bf9c4d39c673071689bae4169d896f7f738ec9181061029fc27586474a1957ab08c5d47fba78261e5f
-EBUILD zeroconf-0.135.0.ebuild 1411 BLAKE2B 7166d82c05eb3fe373e6ba396797ec6fb1d4871ce736abf26859bdcfae044c33a5ca689d3db9ed2c927302671fbadede01c38b5df9624657b800ea2911c3fc17 SHA512 b4b8a38a57586f961a4c8a0af275e743abbaf35aa485c49c5826767dadca2e7eb56c9cfe61a2b2c39d88d6e513f9dd08fe617a51035c7cb65956777262c80991
+EBUILD zeroconf-0.135.0.ebuild 1408 BLAKE2B 015a112dd6a16d643d7351e9730e1b7eeb5fb177afb47e008376db45246f0f24afa829cb966e7450315046c3b07d159be487b5a1d4ccbdab79a7a168be1254a9 SHA512 cf1db8dde3188c51b484007d62f3d8a6e8c714046c1e45bf9c4d39c673071689bae4169d896f7f738ec9181061029fc27586474a1957ab08c5d47fba78261e5f
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.134.0.ebuild b/dev-python/zeroconf/zeroconf-0.134.0.ebuild
deleted file mode 100644
index 014d1b6ea1d2..000000000000
--- a/dev-python/zeroconf/zeroconf-0.134.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.135.0.ebuild b/dev-python/zeroconf/zeroconf-0.135.0.ebuild
index 42ef77fc404f..014d1b6ea1d2 100644
--- a/dev-python/zeroconf/zeroconf-0.135.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.135.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]