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

222 files changed, 1495 insertions, 4196 deletions

diff --git a/dev-python/Faker/Faker-28.4.1.ebuild b/dev-python/Faker/Faker-28.4.1.ebuild
deleted file mode 100644
index 1ed745f46151..000000000000
--- a/dev-python/Faker/Faker-28.4.1.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-29.0.0.ebuild b/dev-python/Faker/Faker-29.0.0.ebuild
index 7dd2e7763f07..1ed745f46151 100644
--- a/dev-python/Faker/Faker-29.0.0.ebuild
+++ b/dev-python/Faker/Faker-29.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 580e677f1abf..ddbc2855e918 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,9 +1,7 @@
-DIST faker-28.4.1.tar.gz 1794640 BLAKE2B 96a2f16b1d1906c1ae5263f8a2e782417fa6fb8062881d3700bf31b25892f27c612ebb64be925548c848e75e2e90d5761cc20a7b7bdb74119c95dfe3e5b871e5 SHA512 376b8e97ef654477ba549f0de50ef02979bf2595051f1a41b353a44bb734aa75171afa633ea76d3f02cf72f84dd12d268e28a4baba55fcb728fb4cd988b57e6a
 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
-EBUILD Faker-28.4.1.ebuild 945 BLAKE2B ff465988fb90fef2a5c5332ea40d3df26077ca0ef937a00392609a212d303a9292afdb38684e66d7043e3f1c855b34b7a4d7aac58b4216c542c9a6bcdc9e2e4e SHA512 379311c4d16fcbf97a2a621b90d4fc5ba359c249059f0c3e11c1f0e60a3c7d25b8c8223c8d65c54f5fd534c76806c296e225e948545e8d05c1ff054f3d5b7625
-EBUILD Faker-29.0.0.ebuild 952 BLAKE2B d916f38dead48afe6a35c9055acdd8a4061901973f8b4bb587d2b6403ecae168880479fa7232cf6140909952b647ca6b298663f84a8f11ab4a52f6c857a1425b SHA512 edeac7681eed700656317e357ebb2f44a4671ef1d523dc101be73c96bdb6978d7656e40fe61ae6a085b584fe55a03d38a41fbef9f63aeec766233e7a4845c324
+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.1.0.ebuild 1000 BLAKE2B 910b6c3d4b14ded04e82086e398bddff73202f984bb76ff01f8c99ab255840abc8ba94f0914fc0d7076c0d901ad63364afc03b438884a7b911c957ebf611774d SHA512 f4f4c7f35f518342a00afda816f30a81a9d9b9c1977f45bb2f2e32b698dbbbdb0eacdf5bfe846755d273299410f508e4bb7a898ececf4b2b16ecf2a53fb1c4dc
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild b/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild
index 20b556469ade..5e646dfb8f27 100644
--- a/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	<dev-cpp/rapidfuzz-cpp-4
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 07cc1024804a..e811ed753820 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,5 @@
 DIST Levenshtein-0.25.1.gh.tar.gz 39060 BLAKE2B 9d058d910be7c6c3e668cca631a7da5bed678e219c96e4255dbf69c46cb3c55002928fcd90f39916b6c1a57845e9cf1a2327701ae21c662b81f909b9ea1f4bff SHA512 936dab36b15df6f2ee5425efb1fdb1490fb8f618ba453f464a6dd615bcc427e55ceee7474f06b34392871d9f38470b853602a11d8f9776eee66ec34156511ca4
 DIST Levenshtein-0.26.0.gh.tar.gz 38404 BLAKE2B c78a53ba9d5c10968f000264cd20e9d5bc155135765088d4cb7f3f937c6cb5c30f01c09c977e9c8a50d4d0bafab0ad89848102d6f28c57cd471b5901f652d175 SHA512 cf48aa9e81a90c6a9a4cc7033f5035dc89f45db9c7e35929c4b11e2b9af180a018d455a56b8c1f5c748db263401155950e1985a195613a5bb914050f5d68e998
 EBUILD Levenshtein-0.25.1.ebuild 1128 BLAKE2B 7605ff16bb4ec666e69b1925452693f331133ad359ec1843849ade7f19dbae5666aae822d5e42c7fb6a49d1bdbadda987ba28fb7f7bbd7b909f7d55f0fc87e6f SHA512 31ff71e7ccd0230396fcca3de7104527de508558a6a458b59f29edd65779ac51817d525f19eb42e0fa5616a484886649071f0a468891b1120bf19f39f461970d
-EBUILD Levenshtein-0.26.0.ebuild 1017 BLAKE2B 223aeccfb9a9a3297a1fcffbf7e226678d16d0e2ed3547ad320be5f413fd9d1e5cf8445d63dea507591527dd5c53a05c50924c4a689dc71352371443edcea332 SHA512 b3da37caee02843fd47928fb066ced113a7dc291e368db5d4e80f7a7108d3dcfdc8a069001a3bfbb7b492fab7d2a0b5cb0f965877c9b7086ad4c840a353f2404
+EBUILD Levenshtein-0.26.0.ebuild 1014 BLAKE2B 6cb9bc1ec90ee8f5ea8f38ca7753920f41af45ef61d011e3dffd2f97724123889efc90aedb478e1f2b7503c02be70be34288950f0f6a91154486cb8fb177ec4e SHA512 d6689a12486bef394531f5a942da5565ea0e9604bc48d12ffca91a267c7efd2c9f20b50f561028c8cc1371d0d2de54bddc7dd4a623945c9402b38db4f3351e13
 MISC metadata.xml 376 BLAKE2B def9cd056f31bd8ef5f0903f302a00ed361fef19a7df2494fc0ebb34f61c098e50288d98d30a292b0614ae2930082bf919fc37612cdc1bef9f5c5d07cdc080d3 SHA512 4b4766b2894b28a2d199a4d98d4accffe4a5197b41b08443d7d57d9363f96ae42400dd717e516aded73197233d779f5cbdf58670244ef162ebf4177f47cffa4c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1846367f1999..292ea9307abd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7d9fbe615953..1087e97b4700 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -3,11 +3,13 @@ DIST aiohttp-3.10.6.tar.gz 7538429 BLAKE2B 55df48ae6321aa9d18ecf02ea16a34a328ad3
 DIST aiohttp-3.10.6rc2.tar.gz 7538723 BLAKE2B 3de1cb0bfa9fea7ec8bcdab5a7850de700cb73b7a066ab269743e2bdbf84066e4555515dc81aea7c84be10ed9fc9487610577b44db164e49e61f19155c4dda35 SHA512 311f9ba7cafc7f1211c5c1859e235e0fd6941c32c77bfd0b74472dcf4b599b145fcc9e8496cb00300ae45c994d7b53082f39bc42a2a1cec304b92f9ce8109822
 DIST aiohttp-3.10.7.tar.gz 7538967 BLAKE2B c022b01ec3b2bb6549b00c43231692b643be9cda4af3c82748f55c813f12a0f16963c086fa99746e0f9bd8f95f5c1570b647ab0ca9f30aed501b563a6de773f6 SHA512 bfef47dfe14a7cc23f2962abfede36105b5061d3c537b4309b09d83ced545ff9f2e0a2f3713cac30ac5ce31ca951dbc6d1beafa571254a0a84b1f1f8d6ed6831
 DIST aiohttp-3.10.8.tar.gz 7540022 BLAKE2B 8407815a0f65035032c9c59174642784a9ad5845d6655c32f29369d3a7ffdd63d52310ec61ed3a106122a4aeb22ed0db5264a353b7e483bb63021cdd9526b5b6 SHA512 f19a58e698908faf164592037d57f1d133e064616b5552df26639a9a7248e90a960cb1b070dbbb90c058579cbdcc4edb72b2846bd20ab2867b4b0c670ddd177f
+DIST aiohttp-3.10.9.tar.gz 7541983 BLAKE2B 3bcfcd09c537fbd2a976f95b5c8387280ec0256bbc231b2bc5a07a1524e6926bfdebd182b1365d950b5a1465f44c4db004a645af7490c57cd4637978595fa6d4 SHA512 0b52ba3ff2c78113117f56818ab177791f2764b2e5ce6531ce5b0481ab9d22b4fe621d70c1c2067eab8cfdd423a2cf0fdaefd8b13231aecf0491326bdf12d1a0
 DIST aiohttp-3.9.5.tar.gz 7504841 BLAKE2B f051ee88d45952219f72d542f1c6d0cc33c699c6c5fb5dbe3bc054ee4d0e03121b219c8c8524fd1236a8b878329b0997b8afe07d6c66074102d4a2052a8738ff SHA512 da11468a2f131275593395b052700a99cf79055a32d48327dca0f58547ad30add8cd0a375dbd831e2f06fe7a739183251e4ad69c16f3d141799bbed45a8a5dc4
 EBUILD aiohttp-3.10.5.ebuild 2928 BLAKE2B 7b8063b7acf46065cbc1c4fad8be320d30867338f46467ffe90145456cda0c5ea6aa06eb9f294f914f10fac5b4ec7724606b5560ae21a0920378404e53bd6b60 SHA512 56b2ce15463781250f059a2d938e8ed0a0fd8ebf7edbe9b8795dff36d3511e86271c778100053312b196905f9447d89c76f8620aace64af7278c47bd005ffd7f
 EBUILD aiohttp-3.10.6.ebuild 2938 BLAKE2B f5ab1487ecf4b0e2bf6179877229556a4765c8da18a4b9668e7da7b23609e10d2c7fe6861e314f13e93032c64fbee7f4262dfb2faf68599c79775807aac89f0d SHA512 d3ac2316f618fa8f037725d02b3b91d68fab42774dec5768c0d93d2469c6fa81f2b0c56388fa58fa73b47351dd208c947305bd9ec9bbb1333a8ca9eacfcb177d
 EBUILD aiohttp-3.10.6_rc2.ebuild 2938 BLAKE2B f5ab1487ecf4b0e2bf6179877229556a4765c8da18a4b9668e7da7b23609e10d2c7fe6861e314f13e93032c64fbee7f4262dfb2faf68599c79775807aac89f0d SHA512 d3ac2316f618fa8f037725d02b3b91d68fab42774dec5768c0d93d2469c6fa81f2b0c56388fa58fa73b47351dd208c947305bd9ec9bbb1333a8ca9eacfcb177d
 EBUILD aiohttp-3.10.7.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
 EBUILD aiohttp-3.10.8.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
+EBUILD aiohttp-3.10.9.ebuild 3236 BLAKE2B e5d9a8592472994fbc06eed4c17a41ed2c1b0d849021af184c371d88b31f7fcfcac5508c4420269a0eae7904cb61bcade485f4c9f78201cc1e6041e3b82ece54 SHA512 113bbfc2b890208a577749cfa3edd77a17c8be90915e4211341bba3d2eb01d06be450e30073584b0475f2c5f52114888cc227316552f2ec774cf5b04cedd6450
 EBUILD aiohttp-3.9.5.ebuild 2878 BLAKE2B bcb50c31260a08bec59c323524c9ee80e1c0944548ff12ded5b9c73671dd763b7510c97d4f61cbbf5b7715282e8373df1182a9c5dedd2170bdd8d1d2c124b4bc SHA512 632ae92a3370e41c2d434ae953020a1216fdf211d4754ff28fd8fa9070159d57daa53f07cd11c035598a1e491f4ee5d1139fb36b86100b7a57b679597e4e3fc0
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.10.9.ebuild b/dev-python/aiohttp/aiohttp-3.10.9.ebuild
new file mode 100644
index 000000000000..8e3148eba2f4
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.10.9.ebuild
@@ -0,0 +1,123 @@
+# 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="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions test-rust"
+
+RDEPEND="
+	>=dev-python/aiodns-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohappyeyeballs-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.12.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -d tools && ${EPYTHON} != pypy3 ]] && use native-extensions
+	then
+		# workaround missing files
+		mkdir tools || die
+		> requirements/cython.txt || die
+		> tools/gen.py || die
+		chmod +x tools/gen.py || die
+		# force rehashing first
+		emake requirements/.hash/cython.txt.hash
+		> .update-pip || die
+		> .install-cython || die
+		emake cythonize
+	fi
+}
+
+python_compile() {
+	# implicitly disabled for pypy3
+	if ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+	)
+
+	# upstream unconditionally blocks building C extensions
+	# on PyPy3 but the test suite needs an explicit switch
+	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
+		local -x AIOHTTP_NO_EXTENSIONS=1
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin
+	rm -rf aiohttp || die
+	epytest -m "not internal and not dev_mode" \
+		-p rerunfailures --reruns=5
+}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 0eed45f91e7b..f90896266865 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,3 @@
-DIST ansible-compat-24.9.0.gh.tar.gz 75290 BLAKE2B 0482d9eba967d4d846e35f3a2754410e1f42d34e451b2cf42bcbb88155fdf90859b9fbf6ead28a6e8c252d3a37522c1d1c903a38d4e47ba427678bc39d3c8e9c SHA512 e6803e598fabb1097bf0f10a7b9592af97152d108bc89a29547546de0eaa87ebba9232e78aeababb3ffd94c58af8b93499de9c059a6c42d04179d02b50d92a0f
 DIST ansible-compat-24.9.1.gh.tar.gz 76018 BLAKE2B 581199ab65ccc884a3eeef246a8dbe527cac91fc3b588edaf1ad45e7aa83a2e77d44eab8e9dc5d7f2598b02a22fb724ccf235d25592ff8c9de0b7718b9ad5507 SHA512 d5da3cbd29bfb49b9ac68f004eb957edbfdfa303ce204e230117e9964df36c6bcbf3b47ef343d6a77b4f24c390266aebd649a8036cf9e7f29dc350d207ab7409
-EBUILD ansible-compat-24.9.0.ebuild 1818 BLAKE2B ace93c01b61d04a32c33ccc7450cb9ceb2be8009cc5e7baa4117af835bd4bcc1aed460bd25b8e077a65ecc6a90214f00fc97aa2aaed5b8a218f273454bcb7fad SHA512 84d1934eb613ead748591fe870356122258fc328e1b5fabda2472697e3ca72655e07f31738c8e7ade5d0738ae6b8ad6c8e65d00b9822f6740bcbc188481d72e2
-EBUILD ansible-compat-24.9.1.ebuild 1819 BLAKE2B 45f593be905c5424d724e507998528cf9b194372c497270a3dfd0fa8fe3404a6c6d01fa7c928b1aeabdc08e0ac2d4053657ec2c7e46b3b7632300d80f74dab6b SHA512 0cf744412ffcd8ac2e7446cff02f00ca5a3c91194b2e601456b2a5941391dc36a7903224cd35a9ba1580012ad04f72764bb56375fbe30e061a42bd0396f28add
+EBUILD ansible-compat-24.9.1.ebuild 1818 BLAKE2B ace93c01b61d04a32c33ccc7450cb9ceb2be8009cc5e7baa4117af835bd4bcc1aed460bd25b8e077a65ecc6a90214f00fc97aa2aaed5b8a218f273454bcb7fad SHA512 84d1934eb613ead748591fe870356122258fc328e1b5fabda2472697e3ca72655e07f31738c8e7ade5d0738ae6b8ad6c8e65d00b9822f6740bcbc188481d72e2
 MISC metadata.xml 404 BLAKE2B cd6a8ae349cbfd750d8e439a93902221cce72c0c03280ef1e99514981f6a1079bf9e16a9eaf58ad1758e83a82625b508ccf461ff487ddf8c378cdf7fd46260f8 SHA512 15330e4ae03c21f1db7a42cd9efca50a2fe60b828caef1dbb29901f39f4089d6b3a3c593ca2bd01c7873c8ff12b15227d0c8ae09450271d733cc36ff979b3365
diff --git a/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild b/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild
deleted file mode 100644
index 46709b728469..000000000000
--- a/dev-python/ansible-compat/ansible-compat-24.9.0.ebuild
+++ /dev/null
@@ -1,57 +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..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-# We normally use PyPI here but 4.1.12 has never been uploaded there for some reason
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.14[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-	# pip, failing due to internets
-	test/test_runtime_scan_path.py::test_scan_sys_path
-	# internets?
-	test/test_runtime.py::test_runtime_has_playbook
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-24.9.1.ebuild b/dev-python/ansible-compat/ansible-compat-24.9.1.ebuild
index 18c39cfc27c2..46709b728469 100644
--- a/dev-python/ansible-compat/ansible-compat-24.9.1.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-24.9.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.14[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index c4090251ca35..581bddadda27 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -3,6 +3,6 @@ DIST anyio-4.4.0.tar.gz 163930 BLAKE2B a37b8bc05e43cf1a4bc3f15ab399c78c7a7623594
 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 2127 BLAKE2B 975acdb2b688cd60c79d633864a0b3df7af0f364145a46c6af397f37c983d0f7b91bdd1cdb813ec6e6ef776094f6b71ca38a995bea94e828bd69388c93c5eeea SHA512 bd5ebbc66b589cdb8685f96b8dc9e947001d95a9b1cd40174a6990611e032ad591b8b5a5496bd5edaa5fa594ed222d282d8174db2f4f8a82690b3446ca5e4fa3
+EBUILD anyio-4.5.0.ebuild 2123 BLAKE2B c51cef6cce0980ffaa6bd5acd11a2ab03951269a8719d603816fc38a2ddc1e2002f20558489899eacfca604cacfab3adad08c6ce621b7aaf9d5431e58bbafe74 SHA512 44a111f7baaf9cd63369c3ee90c01fd3147452afe5787144ee03933fc7c81e86be305e0afabaa54c5246e41b476df4e19054991571725dca54afec37f32bb07a
 EBUILD anyio-4.6.0.ebuild 2127 BLAKE2B 975acdb2b688cd60c79d633864a0b3df7af0f364145a46c6af397f37c983d0f7b91bdd1cdb813ec6e6ef776094f6b71ca38a995bea94e828bd69388c93c5eeea SHA512 bd5ebbc66b589cdb8685f96b8dc9e947001d95a9b1cd40174a6990611e032ad591b8b5a5496bd5edaa5fa594ed222d282d8174db2f4f8a82690b3446ca5e4fa3
 MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
diff --git a/dev-python/anyio/anyio-4.5.0.ebuild b/dev-python/anyio/anyio-4.5.0.ebuild
index 15e58ff7d1b4..a93247e6c45b 100644
--- a/dev-python/anyio/anyio-4.5.0.ebuild
+++ b/dev-python/anyio/anyio-4.5.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/astroid/Manifest b/dev-python/astroid/Manifest
index 3511bc5b5046..eec7a2f90b63 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -3,8 +3,10 @@ DIST astroid-3.2.4.gh.tar.gz 465788 BLAKE2B 745a860b7bacb45cb86e9b232fe3a37cdac4
 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.5.ebuild 3034 BLAKE2B 2e12e035ac338558dbcb06bfde557a2586a9c4c3ae477e2367ab8b9ba16b61fdc6a79fc57dafdc1abb315dbae0f0cc889970bd798477747d504dad0dd162053c SHA512 f9cf6786341175137551b2da820b1decbd0105dedab6be6108ab7fe584f5b33cd09379abad3f0ea0260646e95dcc0e8c7d05910dd1af81e009df98996051e1d4
 MISC metadata.xml 1148 BLAKE2B 29a6cfc0c292117920be154d37ed4770f1fb1679186576fe6151cc02d1d6be766045e0231e2fceb87cbd250dbed3888c99b7ca7dc0182cc700a11961d9cd6d9e SHA512 6821d13f5e82bd73ee4fd165c0b4c94f40cd6af536dee1658cccb4175e67da2611c4d1478cdef1607535f23224116ad482197e0b0eef8f0a94d596bf250b3074
diff --git a/dev-python/astroid/astroid-3.3.5.ebuild b/dev-python/astroid/astroid-3.3.5.ebuild
new file mode 100644
index 000000000000..adfa5e854419
--- /dev/null
+++ b/dev-python/astroid/astroid-3.3.5.ebuild
@@ -0,0 +1,89 @@
+# 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/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 58671f11ee71..cd8a0f958fc7 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX bcrypt-4.2.0-patch-pyo3-subinterp.patch 1013 BLAKE2B d5ddee059e0e9d853dfd21b619dbdbe7c95e41907dae02c842d4b7c38b142e84105b6d5e5cca801b792e1a4e14cf582e4a652cc3766747ebd9bf361383388b15 SHA512 116cf225de7de09a231b6386db2df3b7b1a7c9685c89c04b4e370255c45a6f3d09da19e02b62df506751a9644aa368309be297952751a5c6a93d680eb27f9945
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST base64-0.22.1.crate 81597 BLAKE2B 6f216a560bd36e6e6b74e908344b457594cc768d9763070e269b56a14b150cbfc4b7f599d4c2a0a5f783638170ee132f0796fefb14fcac7fd73c58db0791007a SHA512 91cf2e4e7fc8815f9b8a86a7fa722a20eee3dc1dd57111b29e420de87ce7836bcdb1db01d3cafb9a977710ef63e7cc41b7772762323e68e0e832156858aace20
 DIST bcrypt-0.15.1.crate 11628 BLAKE2B 71072e92ac88393d5e7676f5afeb16ef8588232f390f02ad15b5ad31ca3a96daa431f867aa6cd52aff81be0cea43c46dbcf53edbf7db571556ea746a5b1713dc SHA512 40d4bec4a7a52a54b3be16e9fe52b8f2734c0f1e36bfa76059d5edb75339b125d70416919ad1c47df569f4abe6723470731bded3b7335c77b4967ea024cc7217
@@ -38,5 +39,6 @@ DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
+EBUILD bcrypt-4.2.0-r2.ebuild 2006 BLAKE2B d9a598c72b4fbfb62cc132c08ce2a8a0bb34544af1dff653a3f04e354ef259b5771209f314f04878d70687aed4dc269b9fffa6ede3257cd6e1db6fdeb91dea63 SHA512 2cbcae1d5c698755b6014a0cca5f634186c4775f0ee0840005211bb9c6932d92cf7030ac2a9e24f75d682efefe85269eda87cc792ee51db54d163969aba9259b
 EBUILD bcrypt-4.2.0.ebuild 1613 BLAKE2B a515247a1d4963e3d9e9db1ca866afb58e6bb0fbc9941cea739be7cb71ba032a70a9de0c7759a737af7e4e51b57bab38bda93a5a7831d0e870c7e80ea5f3591d SHA512 95f5e9c19ceadfff11d037d4fbf0178d431091c4df4eb1dce09a4640f7b9e9f5c00a4cc3bfd11c083706bf73fffbe838afd1380f349957f95375883e6fc79d0f
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild b/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..7399455166ac
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild
@@ -0,0 +1,97 @@
+# 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 )
+
+CRATES="
+	autocfg@1.3.0
+	base64@0.22.1
+	bcrypt-pbkdf@0.10.0
+	bcrypt@0.15.1
+	block-buffer@0.10.4
+	blowfish@0.9.1
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	cipher@0.4.4
+	cpufeatures@0.2.12
+	crypto-common@0.1.6
+	digest@0.10.7
+	generic-array@0.14.7
+	getrandom@0.2.15
+	heck@0.5.0
+	indoc@2.0.5
+	inout@0.1.3
+	libc@0.2.155
+	memoffset@0.9.1
+	once_cell@1.19.0
+	pbkdf2@0.12.2
+	portable-atomic@1.7.0
+	proc-macro2@1.0.86
+	pyo3-build-config@0.22.2
+	pyo3-ffi@0.22.2
+	pyo3-macros-backend@0.22.2
+	pyo3-macros@0.22.2
+	pyo3@0.22.2
+	quote@1.0.36
+	sha2@0.10.8
+	subtle@2.6.1
+	syn@2.0.72
+	target-lexicon@0.12.15
+	typenum@1.17.0
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	zeroize@1.8.1
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="
+	https://github.com/pyca/bcrypt/
+	https://pypi.org/project/bcrypt/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
+"
+
+# Rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/bcrypt/_bcrypt.*.so"
+
+distutils_enable_tests pytest
+
+export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	cd "${ECARGO_VENDOR}"/pyo3-0*/ || die
+	eapply "${FILESDIR}/bcrypt-4.2.0-patch-pyo3-subinterp.patch"
+}
+
+python_configure_all() {
+	# Workaround for sys-cluster/ceph (bug #920906)
+	# https://github.com/pyca/bcrypt/issues/694
+	# https://github.com/PyO3/pyo3/issues/3451
+	export RUSTFLAGS="${RUSTFLAGS} --cfg pyo3_unsafe_allow_subinterpreters"
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests
+}
diff --git a/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch b/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch
new file mode 100644
index 000000000000..964dd964fa93
--- /dev/null
+++ b/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/920906
+https://github.com/pyca/bcrypt/issues/694
+https://github.com/PyO3/pyo3/issues/3451
+https://src.fedoraproject.org/rpms/rust-pyo3/raw/rawhide/f/0001-Make-unsafe-subinterpreter-support-available-via-cfg.patch
+
+From d59176bc05aa37838fd4a8dd253f47c962f61118 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Tue, 23 Jul 2024 14:41:04 +0200
+Subject: [PATCH] Make unsafe subinterpreter support available via cfg flag
+
+--- a/src/impl_/pymodule.rs
++++ b/src/impl_/pymodule.rs
+@@ -107,7 +107,7 @@ impl ModuleDef {
+         // that static data is not reused across interpreters.
+         //
+         // PyPy does not have subinterpreters, so no need to check interpreter ID.
+-        #[cfg(not(any(PyPy, GraalPy)))]
++        #[cfg(not(any(PyPy, GraalPy, pyo3_unsafe_allow_subinterpreters)))]
+         {
+             // PyInterpreterState_Get is only available on 3.9 and later, but is missing
+             // from python3.dll for Windows stable API on 3.9
+-- 
+2.45.2
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1579a6fbad2f..25f2073ed6fa 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,10 +4,12 @@ DIST boto3-1.35.29.gh.tar.gz 867438 BLAKE2B 7a47e8156bd438e94fe2abf9fa978aa243bf
 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
 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
+EBUILD boto3-1.35.34.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.35.34.ebuild b/dev-python/boto3/boto3-1.35.34.ebuild
new file mode 100644
index 000000000000..8cba6d95740e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.34.ebuild
@@ -0,0 +1,53 @@
+# 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/botocore/Manifest b/dev-python/botocore/Manifest
index 8988856d49ff..42325b2b8989 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,10 +4,12 @@ DIST botocore-1.35.29.gh.tar.gz 13404400 BLAKE2B 41dab50dbed91c55df3c74cc3c57bd0
 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
 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
+EBUILD botocore-1.35.34.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.35.34.ebuild b/dev-python/botocore/botocore-1.35.34.ebuild
new file mode 100644
index 000000000000..4f1ad852bdc1
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.34.ebuild
@@ -0,0 +1,76 @@
+# 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/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index bc0f521613a7..5f76cfe38790 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,11 +1,7 @@
-DIST cfn_lint-1.13.0.tar.gz 2378100 BLAKE2B a1fa12fe13df1f3f8c5e533c138036df7e2eae325641e7fd66a050a3bb81718caf353d867bf7bbc765942a93bb9025a97bd9691a5759f59118296c23daf7466e SHA512 eeec69657907cc145e533c390987f25374e9019a4c493d3a8ad98123f8db9445bac4890cbaef59b15af752d5a3437f75ea1687bc167198aec81ebb0a3c1ab097
 DIST cfn_lint-1.14.2.tar.gz 2426350 BLAKE2B 65000d9201e66159d66e374a48cee6bfb330503ecdd72ecf325a3254a31f7fd9d78714b75b69b2e3a763eb4a2cf7eabad1e459dbb2ed4a46a3a21ba8551830b6 SHA512 ea7e558b4cd6ff844f25c88cfa46daefaee34ab10a209f4adc8ccc079bc4c361d917227aa60f747e9e821336ad21a9cdde114a0ce900fdf4f4c49eb7b83635c8
-DIST cfn_lint-1.15.1.tar.gz 2341705 BLAKE2B b294be688b45c1c3b8bba3d0c1e706330b9f29a55f8c1f5b146c0c7a964c10d01af1082bace390115298dd327a33e23d1e859ab8dcbb95479496073102efcc14 SHA512 76b6a5a2e5d7088ad55a67e13915b7f3deb7ebd9594c9fe3489368f8c0bad7d86bfc05e7eb76942669d8839f8b3bb2b45bb83d8e6c466f184509d8409c12f4aa
 DIST cfn_lint-1.15.2.tar.gz 2444882 BLAKE2B bb1e47da23087a667cfc3a1a36af962ad0db35332209651a0cf3d235630995ba35d46ababa1aba66587827cf913dfc347418b14c47f797ccf895143ffa8aea80 SHA512 077c1384a49d59bb0379c6ee8e09b8c0fdbb78a3c2c0e47d8b72e078ee4d40715b6ea4bbf7fdd053a6bb0d822a099a190554399d73eb0a31490f475af2ac1dae
 DIST cfn_lint-1.16.0.tar.gz 2428959 BLAKE2B 3bfd381d0f39fbbb33e37ad59dd8714d706ecb552d90011483b2e61135168d7f3faca46a34a612522159a7615843fb75a6fbcc416049e137be2057a80285ae13 SHA512 6b35110bdbbc86509ec455e950d5cb941daa4a4c5fbf9d50f472cf8e263632cf0af7456125017bbf0639983daa4e8d21ac56c2d849e90ba49bd152c21f4fdff1
-EBUILD cfn-lint-1.13.0.ebuild 2173 BLAKE2B 5e4c47efdb2519007e70bb5a736e25ef396631a967b23f6057e450a31358b2bf16fc3d85a30259dd2414e85a185784504b6d330a6568edccb8880d230fb81327 SHA512 da3c99f559c87c3b50c75a2055b1ca0fecc2eaf12f9601460efb853a31569aa081668ae2f300b4f0f1bb551dccba1c1b65bed2aa1cb60bbfbc09295d75cec3fb
-EBUILD cfn-lint-1.14.2.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
-EBUILD cfn-lint-1.15.1.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
+EBUILD cfn-lint-1.14.2.ebuild 2173 BLAKE2B 5e4c47efdb2519007e70bb5a736e25ef396631a967b23f6057e450a31358b2bf16fc3d85a30259dd2414e85a185784504b6d330a6568edccb8880d230fb81327 SHA512 da3c99f559c87c3b50c75a2055b1ca0fecc2eaf12f9601460efb853a31569aa081668ae2f300b4f0f1bb551dccba1c1b65bed2aa1cb60bbfbc09295d75cec3fb
 EBUILD cfn-lint-1.15.2.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
 EBUILD cfn-lint-1.16.0.ebuild 2176 BLAKE2B 0204895222e1591f9f275af74dcdac3435fa5a6cdf34c46242e63829e40b9f2fcd493db355f11454df539555da529321ebbfff2a7326c9f0a0f40beb8cbf6c43 SHA512 b82cada00e1b5238ed40b0ea35fc3a1f84f3deced456412abcd668b46aa99e29c3a88091cd0252188afdb6cf0fed38846124bf073ba3c794d934dce3a14ce46a
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-1.13.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.13.0.ebuild
deleted file mode 100644
index b020827d82b1..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.13.0.ebuild
+++ /dev/null
@@ -1,70 +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="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.14.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.14.2.ebuild
index 086f03ea08df..b020827d82b1 100644
--- a/dev-python/cfn-lint/cfn-lint-1.14.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.14.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.15.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.15.1.ebuild
deleted file mode 100644
index 086f03ea08df..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.15.1.ebuild
+++ /dev/null
@@ -1,70 +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="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/crispy-bootstrap4/Manifest b/dev-python/crispy-bootstrap4/Manifest
index d3a4fb0fe44d..1dcdd76a5357 100644
--- a/dev-python/crispy-bootstrap4/Manifest
+++ b/dev-python/crispy-bootstrap4/Manifest
@@ -1,3 +1,5 @@
 DIST crispy-bootstrap4-2024.1.gh.tar.gz 31818 BLAKE2B 5778544067c7c23971a410bb52556a267fed9109bee4b5a4cd7e72c9bde0888e6744c2e12aa079c92217c0b6bc0ef2709de2eae127fe92ccc92ca1acb5015aa6 SHA512 c4c4e02117a2b3cf24c9111579c20f1454c5feb8c485c954e48436354e82d0a26e34b54212fb642d010a7c370236028119e5193fdb43ff2053cabae56a01a7c2
+DIST crispy-bootstrap4-2024.10.gh.tar.gz 32278 BLAKE2B 8104bc4964fa11df05a6b6e244e4c58cc678225afdedf4a72749cc74986d8b763c6fe32aba9376d2a4077ac765c06df4582fa796caee885e82156c81369dcf16 SHA512 4cd7cde7d987baa5f6806076fe7f991e450544427deee9b0e64a45acd94b2987352369a6d277b90e6c9ff19e35225a3b5bc219336725b67e4aa0c8280cd6ac12
 EBUILD crispy-bootstrap4-2024.1.ebuild 753 BLAKE2B 600db51acac4b86c9cb6e822f9cf499d50ae7cf43a2d061438badd2c6ac3d398dabab05c4db35ff7c05e43ebb2896ec65cc319ad1b618e7f5e434a983f6127b5 SHA512 96a5e78b47bf6c05853d6630d35c88316844632863ebc9c1957de809ee4fc101366b2d70d123c1637ec7e2ef9a100ba66d1c6ee2bf2f357a4e6997288ad5dafc
+EBUILD crispy-bootstrap4-2024.10.ebuild 753 BLAKE2B 600db51acac4b86c9cb6e822f9cf499d50ae7cf43a2d061438badd2c6ac3d398dabab05c4db35ff7c05e43ebb2896ec65cc319ad1b618e7f5e434a983f6127b5 SHA512 96a5e78b47bf6c05853d6630d35c88316844632863ebc9c1957de809ee4fc101366b2d70d123c1637ec7e2ef9a100ba66d1c6ee2bf2f357a4e6997288ad5dafc
 MISC metadata.xml 405 BLAKE2B ec5d0537b699db8dd80bde37a759e754e8bc9c96c514cc8e24b43534c68dfcc44e44e219eec4912d8bd42184c92b866c19eb68da24e4ef780f821a2d855c3c79 SHA512 0398280620b4f7fe239e3ded58d04a14ae7a7c3b6597c496277d923d52ae7ce3600c0509e1c9a8187aeb0f2c012a4f7088308fe15eef6649406c09e893b66da0
diff --git a/dev-python/crispy-bootstrap4/crispy-bootstrap4-2024.10.ebuild b/dev-python/crispy-bootstrap4/crispy-bootstrap4-2024.10.ebuild
new file mode 100644
index 000000000000..a566d2401f56
--- /dev/null
+++ b/dev-python/crispy-bootstrap4/crispy-bootstrap4-2024.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2023-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="Bootstrap4 template pack for django-crispy-forms"
+HOMEPAGE="
+	https://github.com/django-crispy-forms/crispy-bootstrap4/
+	https://pypi.org/project/crispy-bootstrap4/
+"
+SRC_URI="
+	https://github.com/django-crispy-forms/crispy-bootstrap4/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/django-4.2[${PYTHON_USEDEP}]
+	>=dev-python/django-crispy-forms-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 96a8861f8ca2..2dfa4846592b 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,5 @@
 DIST dnspython-2.6.1.gh.tar.gz 373684 BLAKE2B 63ac506d528a9e3684daf4888b51d732d9a12c3439ff1c353250a7bad78781f9f12bb13509e69093d5585a4a04bf2fbb1b8eb690a39f27e5d58e8f0f3b3b36a8 SHA512 77e9c69ac70e9e31a11188b968d28b8f2890b053b2cce0e608eefad7fd2c2b0f30c074222b2e5e85c0b4b8705f2e45acfa8b016a7808cc421df1d77f2561d978
+DIST dnspython-2.7.0.gh.tar.gz 386890 BLAKE2B 209bbb761cff2e39f86fb94458976766f3cac93e47f2c25294c359c98126aa4670b8157fad6c2bbf67ef250150310b31068690cec43ef148bbaf541873c37f38 SHA512 d73b90a06fa4c731393f719a79ec1339c3f8010b0ef4e58d8aa1aa5e0f2804dff8a79e20d9c9175b41b66bc9cf1712c33f4e2ed14820afc74d988096a42488b5
 EBUILD dnspython-2.6.1.ebuild 1013 BLAKE2B ec0105458b31e427b06fb53f8e8828deb131157dbda2f0d32284e3b02d5cec229e73e94155719af837e2705b46e45c6d2232257f1606180912058158cef1e2d4 SHA512 fd2de434116f13d93e5549fd502b10c89f33b2d6e2eee6a88cae50784313a93cdccad00811673467ad380815c2c92c432a80a44022d1d7bb255209f65db267e7
+EBUILD dnspython-2.7.0.ebuild 1235 BLAKE2B e05b25a6c6f2764733761dd1ff744e5758e7c72f355a1599adf16ec78d4b3a2760ef9254e9b19159926290bda08cccd6fd42e14b7ec268ee1d07dbc798b4532f SHA512 7bde48cfd78ad902290c4f9f7bd6b969418858e02844ea42ae6365975270dc9b223f7a66a12fba216e50b4d82308d29cfbfaabbde1feeae45d711533b9d5be51
 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8
diff --git a/dev-python/dnspython/dnspython-2.7.0.ebuild b/dev-python/dnspython/dnspython-2.7.0.ebuild
new file mode 100644
index 000000000000..24a34d0cb853
--- /dev/null
+++ b/dev-python/dnspython/dnspython-2.7.0.ebuild
@@ -0,0 +1,55 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="
+	https://www.dnspython.org/
+	https://github.com/rthalley/dnspython/
+	https://pypi.org/project/dnspython/
+"
+SRC_URI="
+	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+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"
+IUSE="dnssec examples"
+
+RDEPEND="
+	dnssec? (
+		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
+	)
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+"
+# note: skipping DoH test deps because they require Internet anyway
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
+		>=dev-python/quart-trio-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x NO_INTERNET=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 77acedab9cb6..a9354a4ce25c 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,7 @@
 DIST emoji-2.12.1.gh.tar.gz 503707 BLAKE2B 75d81d99cbb5c89b3f63ccee57f20e13cae4b3d1bda5257c2f5382a6595d62c1159ecd51862b96ff6a5d9c920dfece6346d1ed36c2a6567d7c50eed69c5ac373 SHA512 98c1ecf986c7623122c9d101c82f7667d30b58b6e45c834f2644bae1659c67755dd9a4f025111b74508267861ad155131d4aefb8f951566f6950e64e7d3a3d24
-DIST emoji-2.13.0.gh.tar.gz 630971 BLAKE2B b657c4ffd1a71ce7f278d000ab273d25149822959529036aadca67d19f4ebbcc4941ee7c0f973981b7ab7bd569e34a02867f016d1e7106a4f5f042b30afe4be7 SHA512 2eb41f157af1ea2bd98fcae2c3914dd5dde158ca5c2f3c5fb1353abcca51071e6ce29867921506e0c48d359056b38bf33988206e950361b83b9c92079d78e6bd
 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.0.ebuild 573 BLAKE2B 58f3575e897bac6b269ae73d7faaf4b1c5c8245d059458313d2addc7d275415559f81964a8c48013c6bd77b137967810b81666740dda09f6a8ab5d6e3897ad42 SHA512 66f1907f73e3bbc28bbeb8d75865bba0eeb5ab69a604f0ccb42d771d73d8db0b8ffdda5b4e0a400ddf162d80dd3ec5f5e5219115cc951d8aa1eac21c68ddc32d
 EBUILD emoji-2.13.2.ebuild 504 BLAKE2B 155147625240b917471929bfd4184d73fd35e7ed92cc9930e8c1ca9fec7781fae7c7bd728d54c99ad8f9336b304c3b44ac8b6a8c091a4f04b5224ad2ee5ab2cf SHA512 1c9ccb5855952eff9462e559092aa4df473adf2ca473163fc80a98b14b748ded27363cab4ff3deca54e5feb2de776e8dffed785378de6bcc4c7840f134db1940
+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.13.0.ebuild b/dev-python/emoji/emoji-2.14.0.ebuild
index fd9717dd678f..64f8c79c701c 100644
--- a/dev-python/emoji/emoji-2.13.0.ebuild
+++ b/dev-python/emoji/emoji-2.14.0.ebuild
@@ -22,8 +22,4 @@ 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/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 978ebed1ef4a..7ad9b7ca2df6 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,11 +1,7 @@
 DIST setuptools-73.0.1-py3-none-any.whl 2346588 BLAKE2B 74c84539d1c3592aca5678ecf3c7c71c57fffa877fc5dcc42701c7b2f58613d3767ca10b190c37b30dc24ca9a6b67b76e1e70f63b188d9228f1b73b17f4a3198 SHA512 cef43928c8eebc673ca1befb1df1dc230eab8cf10fc66b06f02a0d459e78701457b8024bdc4ac33082e85e07dd5a63e031fcbf13e0b94d6bc9ccc90931060841
-DIST setuptools-74.1.2-py3-none-any.whl 1262071 BLAKE2B 4cee06ae5a71241deda83ecdd3a6ee806d67dddac56cc3f19cf58e6b7e9e5c9e441187a82d17674fa91d172496291ad9482e1b458e1f0968cb62ece3f62278bd SHA512 90eaf02616d82b22a69310d772f6737f4ba807ad7d53e371235fcf4f21c4034ea78d4a5ff0e2e93fd0623b0adc43208f427df91551d4a9bb3c94e08d1ae8394f
 DIST setuptools-74.1.3-py3-none-any.whl 1262070 BLAKE2B 967e581556dee96b068a762605e340a7dbdb7eedb62fc2224fa3cbff8c29c6dd8966831bf4d2c4714401c8beca6ff81ba64823ec55ce592ff3bf10ddee370975 SHA512 8dd7f782ccbfcef04462904f3211569a2ca0be7f370a75cd1d77b77c1f38fcfbea8fd401646bbf436c093ad4573e32f0a0eef030644df48817fde43ae59ce0aa
-DIST setuptools-75.0.0-py3-none-any.whl 1248237 BLAKE2B 379ad1a71a93bd4f8eb11fa590d64ab33b2f779facf803ac7ef385ad6730e464702a437bcb9abcf57948ab6f9285faf57f7e3776478030888c0380e54ebcff7a SHA512 088ac23b7da60859cc518bb625e5dc92df233e2d5c2b9e7b7ae961a01cede7e0c3cd5289868242e1b8026b1644e6149bb9efece108bdea61dfbf2c64258c7884
 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.2.ebuild 612 BLAKE2B 1cc5e3edaf72885561b47a30db86d88fb25f0a0dc11d0461e346841fb2de9ded656c54003f8867da984a035556595015dea95eee6b2e6dd0e2bbd604ce0c81f2 SHA512 fdb3240d48a5642517ced7a777dd023643ca559568559347870e78db49e8fde54e61cffb8124980ab935f3f7358bf9f576d109c150f1e0eefce758dd85772c75
 EBUILD ensurepip-setuptools-74.1.3.ebuild 612 BLAKE2B 1cc5e3edaf72885561b47a30db86d88fb25f0a0dc11d0461e346841fb2de9ded656c54003f8867da984a035556595015dea95eee6b2e6dd0e2bbd604ce0c81f2 SHA512 fdb3240d48a5642517ced7a777dd023643ca559568559347870e78db49e8fde54e61cffb8124980ab935f3f7358bf9f576d109c150f1e0eefce758dd85772c75
-EBUILD ensurepip-setuptools-75.0.0.ebuild 612 BLAKE2B 1cc5e3edaf72885561b47a30db86d88fb25f0a0dc11d0461e346841fb2de9ded656c54003f8867da984a035556595015dea95eee6b2e6dd0e2bbd604ce0c81f2 SHA512 fdb3240d48a5642517ced7a777dd023643ca559568559347870e78db49e8fde54e61cffb8124980ab935f3f7358bf9f576d109c150f1e0eefce758dd85772c75
 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.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.2.ebuild
deleted file mode 100644
index c48c6a133f1f..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.0.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.0.0.ebuild
deleted file mode 100644
index c48c6a133f1f..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-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"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index a015f93744fd..085107fb4e8c 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,3 @@
-DIST filelock-3.15.4.tar.gz 18007 BLAKE2B bf64d43b189453c8c1fcf258edefb2df340d20578d942d147197423c433cd6629d5e73615201d7ef84857450d7a4cf1375d0dfc69a422c4319a76f2dc157442f SHA512 d809df84f321ab9d99f46609cc664af2d9b73161906308e1a9f949c745694577901def228c40a860c606d652f9ecefe9014159eeea92266f94e981eecc4fe103
 DIST filelock-3.16.1.tar.gz 18037 BLAKE2B 29340ea0b5ade185a0d402a5cae304a2b3588d03ae543be26ed70b79bd1d0af67a30368ba43d87e16ac42d01b83ed1852316aaff87c11fe115ac35393a258231 SHA512 d935a01de58d219968795fa97a3ed9330285786fced2fde4474b3426cfc3da97c5b7a44a21c1f41185c1ce6a2a71514d259e990dce255be6b53e644449d575eb
-EBUILD filelock-3.15.4.ebuild 763 BLAKE2B 0fffa2c3500f8b2fee00cdf881771038470b379dc0e3a56a1e5877b26907c0acdbbae86843bc7e21a9961c6d95abfe782db307c95098d4fbb56926eb0331fa0c SHA512 048ec60a4691ad442cd54a71952662a89487f2dfe0ab1e63a5ce6355e4247685f691749cd69f1bc780d2eafb336ec72c4a3c33e4eaf3bd14c372c8f1776cf68e
-EBUILD filelock-3.16.1.ebuild 771 BLAKE2B 177b1eb09edbdf9559eb684e1805ed2f2b27a887447ae852619f4aedd76f643e5fc91adc1bb49bf61c2b60be2fc9f72d9d13cee642d3974d2d596b3ba826ba11 SHA512 f2b9070298b4713cfdd4bd2d03908061de04d30d36e434b21fcd889a12f0e62d84ab5fe553be72eafe304dfb25865baf1020db9568e6828e241c44ce01646920
+EBUILD filelock-3.16.1.ebuild 763 BLAKE2B 0fffa2c3500f8b2fee00cdf881771038470b379dc0e3a56a1e5877b26907c0acdbbae86843bc7e21a9961c6d95abfe782db307c95098d4fbb56926eb0331fa0c SHA512 048ec60a4691ad442cd54a71952662a89487f2dfe0ab1e63a5ce6355e4247685f691749cd69f1bc780d2eafb336ec72c4a3c33e4eaf3bd14c372c8f1776cf68e
 MISC metadata.xml 370 BLAKE2B 91fee1713e0ae7d6ad39c05769e769b05d0ddbdc514b9ea19ec9144e0452ce411ed08f45d4b3123dd8accb67077fe1113809512c8a3ec460fd70a2126b841899 SHA512 62afbe350d894dc05533ff9e532f24f351315a9fba3f2cb8a580fc056cc868592140ffa04ea08fde3ca594e6d398962343e18a0c4614d9e6d2211e07a1152117
diff --git a/dev-python/filelock/filelock-3.15.4.ebuild b/dev-python/filelock/filelock-3.15.4.ebuild
deleted file mode 100644
index 852a5b7e0632..000000000000
--- a/dev-python/filelock/filelock-3.15.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2018-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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.16.1.ebuild b/dev-python/filelock/filelock-3.16.1.ebuild
index 8312a00e020a..852a5b7e0632 100644
--- a/dev-python/filelock/filelock-3.16.1.ebuild
+++ b/dev-python/filelock/filelock-3.16.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 1dee1650da3b..45f32f470690 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,3 @@
-DIST python-api-core-2.19.2.gh.tar.gz 212969 BLAKE2B 6ecb63085b9108cb0755dc3bdd31d328de948ede85e2f1e62dae92bd9c12d6d90d4ef24f57a7a953567e6f9e8d105ffbde8bd99d8a42081190f95f2a48b6504c SHA512 76a890ebaaecfd4d913e4e1d3d370e81e655eb5e8192a10292a7a792f6a9287dde7dea43f27a70edcc7430f71346e52f2719393b54cfd7c4223eeba3c28d37e4
 DIST python-api-core-2.20.0.gh.tar.gz 216778 BLAKE2B a6873f5bb07928933ab5dc04bd3e02ffab06c38c70661ff2da7e6ca183e49a0a4995b4b672f188ede14e416a953d3385ac564dd02ef643bd9cc63d0c16063e23 SHA512 4dd369da408acc15e54a1b7fd13cc2747d5a3ae3812cf42a3c0ec4a93245cc0f7c7cbef456ff19655e8d2d22955aec7369a295faef81cc4ea268c419ca62ef03
-EBUILD google-api-core-2.19.2.ebuild 1946 BLAKE2B 2bc9751de68c1072642a7c834b7707d8456af3bb3f957eee8932576781202b49c089a5cb6902c42db23ad56680b850531fd341128bee19a71548d7c5f3754d19 SHA512 bfe5b327f67db8541b36c1ff60850654217559fee0704714dfc677e9c637e365e9c46fee8b20ed6ee034b4fbdadc6a1302c8b479b1cd44ff7b1cbe653158ad89
-EBUILD google-api-core-2.20.0.ebuild 1949 BLAKE2B 8bc8670d0f21412c241bfa0a73339f6d64f83f31c6e8bf2947d5726ab4a35b4af97c59e5e4de670c4d19b0bd5e0df3ac0b01e98fc38bc7564845bfc08d7ddec8 SHA512 bd8df0045557275174189a991cde0cd2f1d6bc5f5f041858e4131fee25cc5ff2051c4ac769437cefbc2a2caf846e3e13c0204a1849d119672dc8b2fdcd4e9cd9
+EBUILD google-api-core-2.20.0.ebuild 1946 BLAKE2B 2bc9751de68c1072642a7c834b7707d8456af3bb3f957eee8932576781202b49c089a5cb6902c42db23ad56680b850531fd341128bee19a71548d7c5f3754d19 SHA512 bfe5b327f67db8541b36c1ff60850654217559fee0704714dfc677e9c637e365e9c46fee8b20ed6ee034b4fbdadc6a1302c8b479b1cd44ff7b1cbe653158ad89
 MISC metadata.xml 519 BLAKE2B bf6ee9b3f0f7fe5fbfa5461aabf7872c803bd0483938da629ed6468017d82ac5b8736a52ef325374d7948a752ff1cfa6006aca2e833721f5a4a47f4adc5d8630 SHA512 d56b0312f5e5b5ba909c84af358bbfea98ea4098fbdd0ab562e0669a87a492facc05644d13fc38a196e1300f4cc1638b28cdcd10f412d753d71f8cf20a7fec62
diff --git a/dev-python/google-api-core/google-api-core-2.19.2.ebuild b/dev-python/google-api-core/google-api-core-2.19.2.ebuild
deleted file mode 100644
index ddc45dbfe2d6..000000000000
--- a/dev-python/google-api-core/google-api-core-2.19.2.ebuild
+++ /dev/null
@@ -1,64 +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} )
-
-inherit distutils-r1
-
-MY_P=python-api-core-${PV}
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-core/
-	https://pypi.org/project/google-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html
-"
-SRC_URI="
-	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/proto-plus-1.22.3[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-)
-
-python_test() {
-	rm -rf google || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.20.0.ebuild b/dev-python/google-api-core/google-api-core-2.20.0.ebuild
index 61fa5cb4fa0b..ddc45dbfe2d6 100644
--- a/dev-python/google-api-core/google-api-core-2.20.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.20.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 81aaa3cb3c48..f3d69884b039 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,5 @@
-DIST google_api_python_client-2.145.0.tar.gz 11714260 BLAKE2B eb672bdf74519f7dfd984412348ee0c62aa6a942acbb3182648bce2018af72ba6737924cb82c754a94c02f5b749c1bfdd07edb66bb2294b98e2b636cac7c2107 SHA512 33452e866798cd82f79e4d9a8708b4ca32a1e3118e37fbfe5b6e8b8b431167560c4175a5155499bca864fbdb59623368663e0025f71e8bd64b44e365ac889ad8
 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
-EBUILD google-api-python-client-2.145.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
-EBUILD google-api-python-client-2.146.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
+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
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.145.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.145.0.ebuild
deleted file mode 100644
index 56cf84636d29..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.145.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.146.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild
index 58a0eb467bad..56cf84636d29 100644
--- 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
@@ -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/hishel/Manifest b/dev-python/hishel/Manifest
index 9745ada18163..6b6981ce7e92 100644
--- a/dev-python/hishel/Manifest
+++ b/dev-python/hishel/Manifest
@@ -1,5 +1,5 @@
-DIST hishel-0.0.31.gh.tar.gz 833160 BLAKE2B 417cd61a88ca2dd29661f00bf7ce743b38a3d50f4eb111c69a42f6c59fdb8e9774f00e1802fb87cc8156975ffb3fabddc17cdc8f217cc62fce161ce780bea315 SHA512 88a459f4898af0d10718e7a90ec4502bb323f41a26c03ea36bf03ea0e88fe0984778094fafe9c4f8fea21a6e051a4c424a137faa239812d407c3468d231c12ab
 DIST hishel-0.0.32.gh.tar.gz 833271 BLAKE2B 3c75271b2fc304f09737d25f60783a5a5a5d72200851273ceb4afefa7cf67ce96337f7ed05f83ccbaa3241ed1745bc0a60a9351877229638e266920f3afc4c0a SHA512 a7f66057793835d2c46068308b1835fc11729a8c84d906cc720f2c4a7644e87349a7260cff84c4a400f4e6fdd0b9ded92ccc9805aac21676c0e7dbc3191682fa
-EBUILD hishel-0.0.31.ebuild 1673 BLAKE2B 2a77c164dc91b43c6c91fcbd3a28e5ee2c5631cab2e87c4f7686410cd8a057bdb109b6cbc6de9092e377e1febe574429ec400cbf03c3ee8a69f05bd14b022209 SHA512 bccffd94791ab6a99a9e79af2cf67ca556ee2ad4f133f417192c57cdafd1ed4f918bcabb98d82c6c90386670f9f6f1c96bfb4120f7f85fdc8fe9a78395c19fd6
+DIST hishel-0.0.33.gh.tar.gz 836608 BLAKE2B f2db821b66ab0387756c503f2c844704bfbce7d98399b2454ed1b0f5e65ed946e9d857412ac7f9bbb5532e8cc8546fe7e8480f29d87e61d287690a82879d5773 SHA512 c69261b0f3af45c57f9d95114bfe03c64c7f6490429f9c00dbad41935da16a3125c08d4aaf613686a29c54b5a13b1884dd0c298b718158b25ee28422f3c236be
 EBUILD hishel-0.0.32.ebuild 1673 BLAKE2B 2a77c164dc91b43c6c91fcbd3a28e5ee2c5631cab2e87c4f7686410cd8a057bdb109b6cbc6de9092e377e1febe574429ec400cbf03c3ee8a69f05bd14b022209 SHA512 bccffd94791ab6a99a9e79af2cf67ca556ee2ad4f133f417192c57cdafd1ed4f918bcabb98d82c6c90386670f9f6f1c96bfb4120f7f85fdc8fe9a78395c19fd6
+EBUILD hishel-0.0.33.ebuild 1673 BLAKE2B 2a77c164dc91b43c6c91fcbd3a28e5ee2c5631cab2e87c4f7686410cd8a057bdb109b6cbc6de9092e377e1febe574429ec400cbf03c3ee8a69f05bd14b022209 SHA512 bccffd94791ab6a99a9e79af2cf67ca556ee2ad4f133f417192c57cdafd1ed4f918bcabb98d82c6c90386670f9f6f1c96bfb4120f7f85fdc8fe9a78395c19fd6
 MISC metadata.xml 378 BLAKE2B 24bb3b6d47931488021a625ac5f4eca9575efaebabc4af29fcd42ea8468a0a8da077d88b98c6f348c7528d7b338fbf553475894fe0726f11ca48c6c5d4720f61 SHA512 ae67451815773cffe43a0e16ae42020f1c29fb83ad711633666b065be586a08e4da5ebcee8e35d7f0c0084c018713760a1f20b4b9a7f2a5d43691589be357b42
diff --git a/dev-python/hishel/hishel-0.0.31.ebuild b/dev-python/hishel/hishel-0.0.33.ebuild
index 046e93ae7033..046e93ae7033 100644
--- a/dev-python/hishel/hishel-0.0.31.ebuild
+++ b/dev-python/hishel/hishel-0.0.33.ebuild
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 6a09b7a8344c..d051da9238c1 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-4.10.0.tar.gz 79192 BLAKE2B 398fe1eb3b39cfc93096f7e12f057959f3e336721fe05be4bfe0bf16d3470a04a33b978c6e4ffb73c58bfb1032f9ec48b29397ef51073aa881b036427e73eb10 SHA512 973fe7aecffcc7c9b56426b5a143402a97833122e63362115ae50318c909188bbe872fbfdfaa3015298ecd44c6ebc4223d9abd202c47622066b730908a6dda44
+DIST humanize-4.11.0.tar.gz 80374 BLAKE2B 880ebf6f14c04c323528ee95c4c32c775bd2662b0d47eb6761c84024199066e69e1d571f7edc2235d81261693f1fbd3c166ec24afeb4dab28f39dd4256d37fcf SHA512 0f872b86643276bd58543d47b72719763b52ea9a434076b99d0db72d89642c2bd77e240bf506cdd04fad049fe1575919b006376d99c037936e9b9e1beb25e1a9
 EBUILD humanize-4.10.0.ebuild 632 BLAKE2B 65c208930939cc2621b1f07205a5b44a2040aa5f4c9f5c028d3dd8d1d5db479b3a086ca5f02e2bf45be0fc766c49e2edb249b2888e46fef4ab751ceab7387dab SHA512 e33744cfeed787bdeff02194fb7992d8eab9c5d53e383ba5320821d794c18c6a75790f48150803e1f9678666832afd84c77b643d50824b0ddc7fc9135edf45da
+EBUILD humanize-4.11.0.ebuild 635 BLAKE2B a4938f8e24826a8469dd21c91a83f6624763c978ea5acd21dd1bd6ae3ce7354d88807c8cdafe3c0179c6381729a266c77f1ea50d7214cda6a71643d67ada6f68 SHA512 262ac5eca5df2eb542c9bd6482b5e3d589155311560ae2ac84c413a2a854ec403f2835a4439b5b865e2b9024d55073285b2bcb7d838860f1b1e433be67a50ec8
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.11.0.ebuild b/dev-python/humanize/humanize-4.11.0.ebuild
new file mode 100644
index 000000000000..5d18d9873a5a
--- /dev/null
+++ b/dev-python/humanize/humanize-4.11.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=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/coverage/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2b9945c8468c..91483b501c25 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,7 @@
 DIST hypothesis-6.112.1.gh.tar.gz 9476397 BLAKE2B adee46d6a4cf56bbbd8e5a91afc8236b9d311aa18efeaf6b367fc32d5ff3d679e08c5a8c500cedb50ff2cda2bab567a56f5ed564067972bc2f63bd6f5f0b88e1 SHA512 60b68f50a5d8d7ec23b2632a1a3c7d412ecedef6e58ec9e2f0450b07add9ddaa25963cd08cfa1d60741ff54cc47996da02dab1176ab25b8e7ecd3154f1b0446d
 DIST hypothesis-6.112.2.gh.tar.gz 9476114 BLAKE2B 50b4dd0e7599732b78fea672738c20b3b20bd51ede08816c63e2adb841e1b441994be68b203bd4cf826d2f258f81b91510668b0b141658938ec31fc14bb464cb SHA512 e4544feb0e12e4bfa380a3e31f33b3898e365fd6063586c1831ee39c21c0447e17d2f10066d59e1c576e6135ae6987ea2b49dfb09a1eeaa379893748b7caa4bd
+DIST hypothesis-6.112.3.gh.tar.gz 9476186 BLAKE2B bd11e2b09c192943363a917b327c0d5d85dcb1e4161bbbaf63754353e784e4e909279084b6efd622144e97a88ad8ab64002264f2b512185f6af687303e5b19e5 SHA512 1a0a982dd3d006b6143479e7b6f4ee70c3a196eddd06ade54c53342f40cba5537d09f5da806604673096b17bf29515d93b325f306d8fbf4d7802b0fda1acd922
 EBUILD hypothesis-6.112.1.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
 EBUILD hypothesis-6.112.2.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
+EBUILD hypothesis-6.112.3.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.112.3.ebuild b/dev-python/hypothesis/hypothesis-6.112.3.ebuild
new file mode 100644
index 000000000000..f3d89f9d71ea
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.112.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 4ad78ffc8d8a..774ddee0fc03 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,3 @@
-DIST identify-2.6.0.gh.tar.gz 101732 BLAKE2B 0c6cdd8801861ac2b33c812766008d3e1a689ea09ee698441439aa2c02207f9f05983f7cbbdf1e999cdf4b34a6994a60c12249cf6722b690ae05126bc3178273 SHA512 0e7b27783fc9133d76247811e1bbd92b1c2f54c2feef6a603e725f92af44b8f595a5b39162db3b9f4cebdf2fe58587bb10f9d93a745d5cb6b507892d67c32899
 DIST identify-2.6.1.gh.tar.gz 101751 BLAKE2B 5f957409a4a819ba0922065484c824282255174619630896cd5b708912097bec1662e55eafcf4f6cadf832bb988c824623d9fc1879e76665c096cbcf01ff4097 SHA512 3d7ee7e0e75d24626b4c322eeafaf624dac87692dcb0eef082be6eb413b3dcc8566e356b83c2cd1eea95e98d55258ee5aebd06ac0c85ee385629e819a549d155
-EBUILD identify-2.6.0.ebuild 595 BLAKE2B b3a1cdd27d99a9ebcac7d8b05ac2522c59c57084408b836fda3d2640f7f6a035769de83ec231edbac148b0dadec5247a029dfe13316902f0374ecdb9d29a1518 SHA512 ffb61e68fc1cb6ac823449f8fc0ff6d5ed0f8c29cbde1d7f144670631f9ced5252f380387a0b63fd6ec70ffac37972fd7014a7c097f2fb01bca84a2df0001873
-EBUILD identify-2.6.1.ebuild 598 BLAKE2B 849a1a7bec7f25ba65accd5bc9fa8520a280d69fc9e091ebc6cac5949f7bbfe14ec25fb9ea586cc1aa0f184338a271c41fcfe7212f0a04c4838bb88e8c914081 SHA512 c09e831f9280de0d81e7e2f6f21b874ea5380ae1c7a65d59be70b5f1b19beb249f0b213357c94abbbcfd9bcb898f528c7114eb89ed709e6e0c20f90ce750bbdf
+EBUILD identify-2.6.1.ebuild 595 BLAKE2B b3a1cdd27d99a9ebcac7d8b05ac2522c59c57084408b836fda3d2640f7f6a035769de83ec231edbac148b0dadec5247a029dfe13316902f0374ecdb9d29a1518 SHA512 ffb61e68fc1cb6ac823449f8fc0ff6d5ed0f8c29cbde1d7f144670631f9ced5252f380387a0b63fd6ec70ffac37972fd7014a7c097f2fb01bca84a2df0001873
 MISC metadata.xml 395 BLAKE2B 01314d222b5ab4f906d3a0b8ba56d9ffaeb1cdb4513147a675df16f4ce1dbb6f45d8e63d36a42344c3e2278737956467abd8f71c74db232c5da7889810ee80fb SHA512 14280c2065b6f69836cbb493342c8e50c900f218a019cd074688913879e5f515388902cefcd618e8bb552af8145ae33c92a9b7caad867d66e457369fe74a187f
diff --git a/dev-python/identify/identify-2.6.0.ebuild b/dev-python/identify/identify-2.6.0.ebuild
deleted file mode 100644
index 90e00b762c78..000000000000
--- a/dev-python/identify/identify-2.6.0.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="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.6.1.ebuild b/dev-python/identify/identify-2.6.1.ebuild
index 6294eec35289..90e00b762c78 100644
--- a/dev-python/identify/identify-2.6.1.ebuild
+++ b/dev-python/identify/identify-2.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index c8901bf5295f..a46c2b9c421a 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,5 +1,3 @@
 DIST idna-3.10.tar.gz 190490 BLAKE2B 887d92fd54b2f55b33856fcb9af3d6541a8cb28b9d49d1ee621dac7e1597ad5d2370000d6bfd895d5e515b4b6837949b5085fb391f283c375ffe4529072a8dd6 SHA512 bdc00fb42c48a34ec3df91b0592fe41785061f891a252ce82f168d99089a52e8e5bc7a823794f61e7915c0f691d911ed8b3bf7aecf3e2aeb3fc85da4ef35f47e
-DIST idna-3.8.tar.gz 189467 BLAKE2B e70c754f3a76807d2df9df09b19ec9ea8e98de19f81741dfbb2f828ebd0ac6385e2c0d2fab83206b4c592b40f0b785ed0078eafc0d0339cd9ff53440051c511d SHA512 5ea57a0e21621722375b8b3b90831c1e367f738d7d96d27143990d25ef26d374bcd306956a785ebe6283445642c39b8f655ab4de4b407055e350d11012acdb62
-EBUILD idna-3.10.ebuild 639 BLAKE2B 3d4b176d63816fc60f64cf4f1e0c3bc7a58fe99d8c55e19f7172fffa44ee9f269f9cf273f87dee1e7bf03733bde3105c3dae5251212e1110d3f75b471cdfe9c1 SHA512 ed302dcead97efb8ad7317cebf9aaa3657812673dee30cef66981c48332e5a1c536d2ef1e7b6ed046dfcca5dc0c9515113f76f47171807db20164c6cedc7e118
-EBUILD idna-3.8.ebuild 631 BLAKE2B 4c2b5d5d198cb8887e52df800f3c031a58da10e02ee9feff0f9b5bf65c362d2a1f578e568d55b5153ab5d7915365c7824777b6182626869caac7b378dfdc6634 SHA512 f2375f47bb705d148a95463ab6e94d8574d9fea51a97d40e03a91a3f9aef62402bec5c94228d2eac0c9909eea1a834cfe7237abd930c736ef318171e7dc93891
+EBUILD idna-3.10.ebuild 631 BLAKE2B 4c2b5d5d198cb8887e52df800f3c031a58da10e02ee9feff0f9b5bf65c362d2a1f578e568d55b5153ab5d7915365c7824777b6182626869caac7b378dfdc6634 SHA512 f2375f47bb705d148a95463ab6e94d8574d9fea51a97d40e03a91a3f9aef62402bec5c94228d2eac0c9909eea1a834cfe7237abd930c736ef318171e7dc93891
 MISC metadata.xml 393 BLAKE2B b3d4476896bbd50dbf61021bb6ffd653b72ca62b58c034aeba5119189fce3ee331cd44aa95ef8e680a4ef5f82206cf8b0ca1b902d73b56931b509c10c2a18685 SHA512 bf8a9a9b4e0a7cb67b6d541291e5de201a8ba9e32addcc6be0b60fd2035485775a7862f0def6bca3ec0e24155170fbeb08f3d24f9c517fbb9bd2223d25904a3a
diff --git a/dev-python/idna/idna-3.10.ebuild b/dev-python/idna/idna-3.10.ebuild
index 2e79cc472163..4fbcb33e749f 100644
--- a/dev-python/idna/idna-3.10.ebuild
+++ b/dev-python/idna/idna-3.10.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 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 ~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"
 
 distutils_enable_tests unittest
diff --git a/dev-python/idna/idna-3.8.ebuild b/dev-python/idna/idna-3.8.ebuild
deleted file mode 100644
index 4fbcb33e749f..000000000000
--- a/dev-python/idna/idna-3.8.ebuild
+++ /dev/null
@@ -1,22 +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
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="
-	https://github.com/kjd/idna/
-	https://pypi.org/project/idna/
-"
-
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jaraco-test/Manifest b/dev-python/jaraco-test/Manifest
index df971cd30a86..d04517020ff0 100644
--- a/dev-python/jaraco-test/Manifest
+++ b/dev-python/jaraco-test/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.test-5.4.0.tar.gz 8838 BLAKE2B 3abdff298a61015363bda3e52d3b5226993169128386dbb620487dcf8b29926c9be0415a2a263ad311db04a591d446b9e6efaece2ab2bfbe7b2781ee2e6dcdd6 SHA512 ab260c3c5ef16e83e8be0821cb735941764c06bb414c3f913bf337b62267b177f3102f7a87241b182ef20760fdcce98f4f9c705335b0744b69f9a296d5215b1b
 DIST jaraco_test-5.5.1.tar.gz 10018 BLAKE2B 09562269a1fd14e099e8bca484f4def00986aa3999134f51f875a026fd5b2832979533e91fcff651d938cbe5c302377152e8bf2288b0afd61ef0a52644c65c92 SHA512 09b3303657ccd6882835e3c0c8e27a03f7c5cfc923318e7c4736eded0a0aa3461f043ab595af82a0bb0de33381924415fd382706ab0af6cea80554ca74873ee1
-EBUILD jaraco-test-5.4.0-r1.ebuild 1210 BLAKE2B fe9ab05e00a8f3d125bc816a66b75933d799f81dfa2ff6204fde87712c1810255b35c7f00d54f00fe4ef7e54b2b44966132acef06ed3b0cef677e0f579ea6c10 SHA512 10dd26bcef2c6342c85cafc9a2430da162826eee45c077259af02891a272e191d3277ad5a6d841a4656c46dd9646def3a811bfea5bfa95d6b1165f02a4b2ea25
-EBUILD jaraco-test-5.5.1.ebuild 1198 BLAKE2B aff95f2384b06bc6f84294ebeff879bd93b642e2a77b87a8f3f6a3719e2e8e8a8ed91149babbb61b3780db1e1a47a7e1532aedb719f5632091944170f2b75712 SHA512 ab2f5d6d79a91228d21907472f0e9bee90634015ed32f76093352e1779a0d08220e999ce63d7ed9abc418ad7d5bd08a883b704da39e36a0f5f69728e5350dc02
+EBUILD jaraco-test-5.5.1.ebuild 1190 BLAKE2B 901caf9a6d1526ca4d5dba98fbeead4afefa09f09368f71495abd9ff8f0b5331a96d9bdec2d0962cda24d80061a7ec28b2ea623a54a70929e739f1cd2b3bff4c SHA512 cdf3e247e658c882de73ef11452dd333b7bc0e68750d3c70b306ffbc2f6ca223b8fba2fa1a8d28af918e7e7a8ffb2e9f43d3ea2ee27a7c447b4d0e5802d0aec5
 MISC metadata.xml 397 BLAKE2B 24c07f0efc966e9d4445968ba639a5476a24a0885051e4eab17075ea9b7b6369fe9ed919ccdc0b51a1e667c8d327428caac2196c2a3e087d8b36176e7b4b2c81 SHA512 4fce74bc524dc018611c219b86b87b7643fe5d133309a00dd5ade217895165f85cfbe26b686c79fc4dd8b1e016b07c83c25afa1c015fc240ffa0ac75e4c17159
diff --git a/dev-python/jaraco-test/jaraco-test-5.4.0-r1.ebuild b/dev-python/jaraco-test/jaraco-test-5.4.0-r1.ebuild
deleted file mode 100644
index c1db194bf047..000000000000
--- a/dev-python/jaraco-test/jaraco-test-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,48 +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
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Testing support by jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.test/
-	https://pypi.org/project/jaraco.test/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/test[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround namespaces blocking test.support import (sigh!)
-	mv jaraco/test jaraco_test || die
-	rmdir jaraco || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# while technically these tests are skipped when Internet is
-	# not available (they test whether auto-skipping works), we don't
-	# want any Internet access whenever possible
-	local EPYTEST_DESELECT=(
-		tests/test_http.py::test_needs_internet
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network"
-}
diff --git a/dev-python/jaraco-test/jaraco-test-5.5.1.ebuild b/dev-python/jaraco-test/jaraco-test-5.5.1.ebuild
index d1ca70fa02ec..89ad82d299ed 100644
--- a/dev-python/jaraco-test/jaraco-test-5.5.1.ebuild
+++ b/dev-python/jaraco-test/jaraco-test-5.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	dev-python/jaraco-collections[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index 3b59b89d19e5..263dfbb5d8ad 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_client-8.6.2.tar.gz 341102 BLAKE2B d9d04b6b965aa34f6b1dd228d1389a36509415e57cb66b4aede37963b6a48f5133c48e8343bbb54bd775b3faa59db8b248f515caca9dbbe594a9d4ba93a668d7 SHA512 ce0ae60b083ce0a37ddd0249d3caef0581ece61927ae685ee80b55d9431557352f1dce6cf81894d39343087b15cc6ac3449abe88cb4119a0d03824b3642f84ff
 DIST jupyter_client-8.6.3.tar.gz 342019 BLAKE2B 5a478b62d64533e334f3a01ed820f9c41ffd3a8c6d9231d4822614b32c0898af32bf67fcafb5f26a62ab7fa172880bafdf2ff1169f06e1c483e8c3fe7d3f47e6 SHA512 10d7307335d07f383acbed30e44fe92284a6eab1dccdfe9107e5390c14350c2604a11ffd4a18ff811a5a93d9ce0492ac9a2fdc0402bd324c35ca12ad22405713
-EBUILD jupyter-client-8.6.2.ebuild 1555 BLAKE2B a567e9d6662ad8dfb2500d30d06cf3e39921af6283c61e36b19547e89c26bbb444f5da67ba213fa7807dd1c897afba2dda59f4fa6a9e65346b00cfe16352a6bd SHA512 dedced9b8f5b39e66c6463ab95f64c1ccf2c66154d3c6b0dd5fbb0d14b85a09ae1d05a0db276f39beeb1144da6d117e213da0c5e52b63e430780b046ca733b3b
-EBUILD jupyter-client-8.6.3.ebuild 1563 BLAKE2B 1ae8adfaa6a751eaf275a6f1e2bae46f3bea509deb7283716f1161fc1920c78ebacd1758bb1a911374a5a7838ed6c099e1a71100f74710438d1ec026f8862baa SHA512 4b843fa5626af966f0b4d09cc69e628be766df09dd33c7aa055cb3f4a2da06eb7e65f8ed18eddc2d0f87d3dc61e6245b3868623f9006e3c50f63def7648eb13f
+EBUILD jupyter-client-8.6.3.ebuild 1555 BLAKE2B a567e9d6662ad8dfb2500d30d06cf3e39921af6283c61e36b19547e89c26bbb444f5da67ba213fa7807dd1c897afba2dda59f4fa6a9e65346b00cfe16352a6bd SHA512 dedced9b8f5b39e66c6463ab95f64c1ccf2c66154d3c6b0dd5fbb0d14b85a09ae1d05a0db276f39beeb1144da6d117e213da0c5e52b63e430780b046ca733b3b
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild b/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild
deleted file mode 100644
index ef4355759fa5..000000000000
--- a/dev-python/jupyter-client/jupyter-client-8.6.2.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.{8,9})
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: times out
-		tests/test_client.py::TestAsyncKernelClient::test_input_request
-		# TODO
-		tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o tmp_path_retention_policy=all \
-		-p asyncio -p rerunfailures --reruns=3 -p timeout
-}
diff --git a/dev-python/jupyter-client/jupyter-client-8.6.3.ebuild b/dev-python/jupyter-client/jupyter-client-8.6.3.ebuild
index 1307e8cb8f8d..ef4355759fa5 100644
--- a/dev-python/jupyter-client/jupyter-client-8.6.3.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.6.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index f9be1517c796..f846e719f882 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,12 +1,10 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-9.5.34.gh.tar.gz 14766308 BLAKE2B 62371c082fe6d1d42d01cc315f2e0e5a0de24ee3faff173d940b797ca7f43f20985e4025e90ba385dbf38ef7ff2b76bbae0831558d07dcafd5a5493597e223ed SHA512 ac6e2fcf96a0591513222a81046d66547cdf3a9b64acf29e7482aa93be3d7a2ceeb8ad779e9bcbd12ae9fc527414ae11cd70f07ae85b4c2b0104cade29ebe646
 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
-EBUILD mkdocs-material-9.5.34.ebuild 1794 BLAKE2B 982474c0246f3a60db2c86bd493db20aa8d9ffaf16eb2ee93ea34ded0bf9459a7caf3ba8b420ffdc45629731d8ce99eb2b8934918762a35eae6d26f0be3169db SHA512 459700ca251fceff5be81e2e6a9ccd24ab68612d0bbcabf9e033054adfaf99b6f24b80113067fe63e50c4c24752b1af44c3a2bcb2ca49c826431afc3bbda9b73
-EBUILD mkdocs-material-9.5.35.ebuild 1797 BLAKE2B fa861d360d346729982c800cdcc403f0b07d0d3c7efbb1045b4d9b7407f2c7cef8b8286852235ccbc94dab1232efdf4292afca6b49a4ae26dd59f61571b57272 SHA512 10ac8d052814441231b0ef46bdd65101f5260a7f1d5c341126f2226301facf4fc90936123b33bccbfde60042ff2a7f2e225fa44fd841782fea49d1f2fc8bc5db
+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
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
deleted file mode 100644
index d79902da91b8..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.34.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.35.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
index 0aabdac3ae43..d79902da91b8 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.35.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/nanobind/Manifest b/dev-python/nanobind/Manifest
index 2518ed6a6c0d..51ec2949cf59 100644
--- a/dev-python/nanobind/Manifest
+++ b/dev-python/nanobind/Manifest
@@ -1,8 +1,3 @@
-AUX nanobind-2.0.0-parallel-build.patch 256 BLAKE2B fc1f66b4cdc4c6f61ac6053cbd5150936c9e23adc18e655779f4a884e7a22be5b217dfc25272b58ffd7566c7cad28a5a8092727ffd8bc2eb42c4c4fc8741d1de SHA512 e975b62595143f5ae31e5a159ab3fe13c03de48fda92d7c39339b1641278ae86e36bf682a9108ee3434a0a9a490d4b7f779c7fef783119da60909c0c25385dc5
-DIST nanobind-2.0.0.gh.tar.gz 842956 BLAKE2B 82a2b44d904a2bfc88538d3bac6d5d96b473bcca2ff98647f9edd656a1d20fae324fcf334b848f861723aae666690b6b17ee626dede89bac6b140e9ef8cd01fe SHA512 1bafbf6b18c9b65b5ecb3bbf23a164b17ee52ef4f053a00de986a35e17e662422b54cea1c145f83ee8a3973bba383a949b3c305dcfecfbf139ab90006d42935e
-DIST nanobind-2.1.0.gh.tar.gz 850714 BLAKE2B 5686c0b204904d22e306338f0cf62f0ac306165510f94bfe94d6a36f8294ea108f2f195c67b5314476e9bc3083292c69974c52889015e2ac6cb996a0fbcfbaff SHA512 1aaca50f8253b1b831e1d7092cfb238a020f72b7ae9830b04ecaff519a38dbe1396f79aac3098d942f30e7bb372862a2473459adbab898f17683ee488a0dad87
 DIST nanobind-2.2.0.gh.tar.gz 881024 BLAKE2B 06b76c6cd53351ead32532b9013c3e0b4485173c70d12fac903c42b57a4309e49743bb2957c1310ac6d957230336b0c587f64a9d15a9c39b229b839531e1ac5d SHA512 e47c2eab39fc507f5cb1b73f76a2eb9a6d475b56b3628e8372296ed7381844aed56ba7b59fb765651e660688be2762d094ec9368beb70201091f01d27a549a3a
-EBUILD nanobind-2.0.0-r1.ebuild 1728 BLAKE2B 0bc365c7fd52e7de359ea1b151f507ac9a3cbf306188d8b789d79cbd14b008fd9fd17a2c2595bac2c55b70938a24b858195e0852eb48f711b491b32b4c199d14 SHA512 63e5292eaf2e90f4399616b86408a97b543dd4c8d349cf25785010bb09733debfb76662941dac3d75b32c3ac1fef35fa692757bf79b8d9f79073d496a861e66d
-EBUILD nanobind-2.1.0.ebuild 1510 BLAKE2B a86bf1a79868947b1a8e25bda3096206a4d9614851ebcbb41093fa7a1bf311accafd5b5c66da530bac0a0f0e2e7dd30c809bdc48b62aba74f7acb0fc83fa78de SHA512 cc0ef43b5dfa7ee776214e6b28eadd397fece6d1f34cf2995b967374e4653cef47c8c005fbd75f1ae4a80166d1e58dab547a0337063361a6ffb7d12569c1f9df
-EBUILD nanobind-2.2.0.ebuild 1490 BLAKE2B f96d33e8096df5f916715befb6f8254f1fa5974925d89c01847c51ac4e6157fb3f113f104af0cf2a5a2eb86b0359a743ef5c94b45063013af9cec83fface514e SHA512 a06fc452a3ba0a42e48f01bd6f30515ba3beb61932554846bb08126774799f7324464be17cc59c019fb008604e6de5ee4deba3c5a377f08f1439d572065e8aa2
+EBUILD nanobind-2.2.0.ebuild 1489 BLAKE2B 06bab4155f8482765e7fa4f9ff02dd50ae9e91f2ecc4039f6e683f04327ee6170e9f8aef1642d83a1298babc127f273bc720c3c57820bb8ed0b983d039f10d26 SHA512 567afd5a5aa638d138227318a933083383a0a678f5be440d37e8a73f50024a32b04914b418eef63a7d0d98959a7b9f8c1d9fec90be4dcb52abe4c9dd473f1aa9
 MISC metadata.xml 367 BLAKE2B 915d33ed8f2b0e38faec001e256fc86d393b23b94bae31f2648948339be7c3d6a2b1b2a18063193c9d190cabfdc4c744d6b664c63534b88dc7afc2a2f1ccc688 SHA512 b60a701257bad827d63af141fbc9b4cadadbb397bca054db97c63eba9e174a902afc7785c3f868b6e86ec62f007f7e822d3c5b6dacb107083559b31202cef7a2
diff --git a/dev-python/nanobind/files/nanobind-2.0.0-parallel-build.patch b/dev-python/nanobind/files/nanobind-2.0.0-parallel-build.patch
deleted file mode 100644
index d64c7383b976..000000000000
--- a/dev-python/nanobind/files/nanobind-2.0.0-parallel-build.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 62f2bdb..e932cca 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -75 +75 @@ nanobind_add_stub(
--  DEPENDS py_stub_test.py
-+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/py_stub_test.py
diff --git a/dev-python/nanobind/nanobind-2.0.0-r1.ebuild b/dev-python/nanobind/nanobind-2.0.0-r1.ebuild
deleted file mode 100644
index 45dce8c57782..000000000000
--- a/dev-python/nanobind/nanobind-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,77 +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 cmake distutils-r1
-
-DESCRIPTION="Tiny and efficient C++/Python bindings"
-HOMEPAGE="
-	https://github.com/wjakob/nanobind
-	https://pypi.org/project/nanobind/
-"
-SRC_URI="
-	https://github.com/wjakob/nanobind/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
-
-RDEPEND=">=dev-cpp/robin-map-1.3.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# simplified version of https://github.com/wjakob/nanobind/pull/718
-		"${FILESDIR}/${PN}-2.0.0-parallel-build.patch"
-	)
-
-	# This test assumes in-source build for the .pyi stubs.
-	# (Hack because EPYTEST_IGNORE doesn't work with the paths it collects(?))
-	echo > tests/test_stubs.py || die
-
-	cmake_src_prepare
-	PATCHES=()
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	# XXX: nanobind installs a CMake config file which by default passes -Os
-	# We currently patch around it in dev-python/pyopencl. In future, we
-	# may want to add some override with Gentoo specific environment vars.
-	local mycmakeargs=(
-		-DNB_CREATE_INSTALL_RULES=ON
-		-DNB_USE_SUBMODULE_DEPS=OFF
-		-DNB_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	cmake_src_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/tests" || die
-	epytest "${S}/tests"
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/nanobind/nanobind-2.1.0.ebuild b/dev-python/nanobind/nanobind-2.1.0.ebuild
deleted file mode 100644
index 6a01b59dbefb..000000000000
--- a/dev-python/nanobind/nanobind-2.1.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=scikit-build-core
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Tiny and efficient C++/Python bindings"
-HOMEPAGE="
-	https://github.com/wjakob/nanobind
-	https://pypi.org/project/nanobind/
-"
-SRC_URI="
-	https://github.com/wjakob/nanobind/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
-
-DEPEND="
-	>=dev-cpp/robin-map-1.3.0
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# simplified version of https://github.com/wjakob/nanobind/pull/718
-		"${FILESDIR}/${PN}-2.0.0-parallel-build.patch"
-	)
-
-	cmake_src_prepare
-	PATCHES=()
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	# XXX: nanobind installs a CMake config file which by default passes -Os
-	# We currently patch around it in dev-python/pyopencl. In future, we
-	# may want to add some override with Gentoo specific environment vars.
-	DISTUTILS_ARGS=(
-		-DNB_CREATE_INSTALL_RULES=ON
-		-DNB_USE_SUBMODULE_DEPS=OFF
-		-DNB_TEST=OFF
-	)
-}
-
-python_test() {
-	local mycmakeargs=(
-		-DNB_CREATE_INSTALL_RULES=OFF
-		-DNB_USE_SUBMODULE_DEPS=OFF
-		-DNB_TEST=ON
-	)
-	cmake_src_configure
-	cmake_src_compile
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cd "${BUILD_DIR}/tests" || die
-	epytest
-}
diff --git a/dev-python/nanobind/nanobind-2.2.0.ebuild b/dev-python/nanobind/nanobind-2.2.0.ebuild
index b03c0efda603..241a83e2cd29 100644
--- a/dev-python/nanobind/nanobind-2.2.0.ebuild
+++ b/dev-python/nanobind/nanobind-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 
 DEPEND="
 	>=dev-cpp/robin-map-1.3.0
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index 27cef80b5ab1..124bb1677cc6 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,7 +1,5 @@
 DIST python-nbxmpp-4.5.4.tar.bz2 138170 BLAKE2B 00a4919032dd29828dc735695afe9c0814a8fe2ec765a534257768896d9f27bc3a395275d546ad717bdd16c97161e8f0a8acaf43cdb7bd9404e40bc72f2c3da5 SHA512 fcaedae519d8cd2d52cc65721ab1e743569ba1cf7c29f2db41ed5671ba0f2c5b47f1f6d9521e1614e89e21512a4575c6788316cdb86936f0c4886d54c3831bb3
-DIST python-nbxmpp-5.0.3.tar.bz2 142891 BLAKE2B 5a73660357e0ce5056f34290e6b1148a4e36af82c88ace89a562b0a5675422d364047d16604856c5ac81a87a3f262651b65c97cff79fd95dad508a4a2977c15f SHA512 ae433fe943dcc996bf10cb5c0cda70bd15b825fa40d7cb49a16e86476074dffa3b0f6a2286a03ef9bde11f572be447fc615ca157895de0dcba598ab74262b48a
 DIST python-nbxmpp-5.0.4.tar.bz2 143198 BLAKE2B ac27204205ded7e0d20237ee7f70e5f84f8f4ada54951e209a30c59390fe166ef296875e45dd74216a04ba78d35968667d4f126967d97c57dd1533ce4d9edd0e SHA512 a6672b4046c2de596ca92129782574528d14ee75a7982bb32db398628e3901c8e780b8a33fac2710d13367a0990ba21ef148c255fa77dee219c6bbd0c453d935
 EBUILD nbxmpp-4.5.4.ebuild 860 BLAKE2B 66011d80e092e0791d4d429de037a6cdddc1a5bafb93f46569a0229de24429cfd5167bc08f5ce03a25681a2cf0629a35e9be10fc763adc4c3dd43e5810fc06c8 SHA512 483cc19f8f725dc18b07440c33ae8086623ec4549b1b8a6fc4f27cea4b9578f42f117359a92ff23619908192eb698189ce87ddd4e4e06e29847ff8702811f2e5
-EBUILD nbxmpp-5.0.3.ebuild 860 BLAKE2B e7e3e29137399fe23f9f7e5aed956808f257690c3187dc6e310bd7082dc672b3f29a566dc684984017a5a04822785f8ae5d6296acc23191622677fd448b03c9b SHA512 21eb6cf49f93e707151162fdb07daeb6e798f7b6f6b1d5bc8372f704e765d225a4e5fbdfc081b86399066c5040098a7b8215a4fd637b3512ecf18b419a4bdd54
-EBUILD nbxmpp-5.0.4.ebuild 863 BLAKE2B e20967a16416de2b0de57a45736e19661fa62c47ecc283d85c5b7cf8b2eb298ec31130ba33d86216fc987e500d03d940c5c3ab7a371d453b0438ea9b4f9965f8 SHA512 1e00966d9557a23dc08c118f17f1e564db56d1954b0a4c7712ffbedeb40fd36e0d3ce65e1f621f2d241228793251a8f0ff532e1e17c51444dd4b9f0987ab7f58
+EBUILD nbxmpp-5.0.4.ebuild 860 BLAKE2B e7e3e29137399fe23f9f7e5aed956808f257690c3187dc6e310bd7082dc672b3f29a566dc684984017a5a04822785f8ae5d6296acc23191622677fd448b03c9b SHA512 21eb6cf49f93e707151162fdb07daeb6e798f7b6f6b1d5bc8372f704e765d225a4e5fbdfc081b86399066c5040098a7b8215a4fd637b3512ecf18b419a4bdd54
 MISC metadata.xml 345 BLAKE2B 05dc6872e0de2ce54b1c3c32bd2252f082de10b6947d106714e7d34d8c4ce532b96d4480427798cbe01e8771623813b475a0e27df65389ddd98a9a28eb1682b4 SHA512 531aae88d0de86eb9f81918292aaa4570f28db09408506464d7710daf434b4be1a6a4b3b04a3cdf2a2c01596baddc93622c127ee1e4b371cd3c126a4093a3bd2
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.3.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.3.ebuild
deleted file mode 100644
index b5d256e868ef..000000000000
--- a/dev-python/nbxmpp/nbxmpp-5.0.3.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=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.4.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.4.ebuild
index 0299ed984918..b5d256e868ef 100644
--- a/dev-python/nbxmpp/nbxmpp-5.0.4.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-5.0.4.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index afe1a4b05fc7..dcbcf7e94ddb 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,8 +2,10 @@ DIST numpy-1.26.4.tar.gz 15786129 BLAKE2B ee759d3a857111bc494d5e989a7b005375d942
 DIST numpy-2.0.0.tar.gz 18326228 BLAKE2B e3d1084b79e0e55cd9087bb34dc116e6c9d6ab14a416a07f727b9f5d5a9db236ecf74a53b7e758d078781c5e565e5557912962f2ddbfff7251ec5b231fabe01d SHA512 cd5612ce2db4be87afa8479c508c256c9ff7f1b15a6b010eb06ba962759cc26552b512ec82711680bab1ebedeb06dfc8d7bff9cec63c94efacaadd719448b287
 DIST numpy-2.0.2.tar.gz 18902015 BLAKE2B 63f993e3429bff1dac1ff79fad23a36a2493fd2c8a825ef96b6b87d82b0e68393d2829c5ecd9065df345c8bfbb1f8f385077f154264f7d2810d311d1d6672bd7 SHA512 d769fd4f07e082fae1661c6856d6d726e189f6931f3028c6819f9806aa9dfd15ab2b49c48b94bfd925eb3f74fddb6f044c9ba93bbb785b5476440dd1cf0b4999
 DIST numpy-2.1.1.tar.gz 18874860 BLAKE2B c828f2106e32429831aa8c64b3b94dfda1b097bcb7f3475b33306bed0b03c2aeb0af4e43ea47c6b3d5e6387b37e3f9ecdf6ae2a3fd4f526da5d121931b9521f1 SHA512 94843f88a32cc1df3e572ac13f294e49201a1f50fbd28707a500839cdff61958823c5b8748a7a54cd866a1acc9bd11efde53042141a81cca44393ee7cee78cdc
+DIST numpy-2.1.2.tar.gz 18878063 BLAKE2B b976b72bb113fc9c5e5a17c9d89038b6a11f2a09521ef46a610dd1fd04b0b11f08491728b2397ca5e3e9613aab3ad8c63b2b15a6378c535cf0e735226d517617 SHA512 3d69f6583e093e8fd0f441ec7dc4658c88fb714bb29574cd9510091ba059553f79c52492037353caf50b6cff1f7bd1e2501e445c7adde41bd9e08bab363e06e9
 EBUILD numpy-1.26.4.ebuild 5085 BLAKE2B caa67f93894764546baf4f5864a5a2de86649c0c49743b829fb0eeb05e271e30f0d03c4e5d9862f5f8b5ae6bbdd8d8a642a46093cab8c146a820333e54e616d9 SHA512 b4dabd61cd4ba801b3aaf49419e322094f142aa90d24b2d8065eb34810aff2955ddaf00bad39e9ebc1c75a3b07f3002549649bf3d0af8556b2cda10d3c92b065
 EBUILD numpy-2.0.0.ebuild 3290 BLAKE2B 793eaafe08f85df96a3909f16ef3390de127d4d402a2e4076a9b1450c20b6f0d3c9c8c36e34e76407d9d68eab3607c7de3845b673259b24c9fab9e405e9590e6 SHA512 2d07c83fdd80ed2113dea9f44a7a064683b975eb704964c141c39a41864345fe23f647a5ddc7a68d41a9e14e739ca24f40b7d6db0914bffd2922526a2908c79d
 EBUILD numpy-2.0.2.ebuild 3294 BLAKE2B 86fea7250c55d306b0cfdaa96d45fce84f6fd57e5f8a3ba8d5b887329b09cb7056b1fa792a76b68e617eb041278cb32906073e6334d29cd0a460dae786fd6c48 SHA512 5d9edd451edf15832b131436c5bbcf4e69c0e0f4c48d964414380644f977f2501246c9c400b07f4f95ae3b174673b31da60f72002d3c72f7a9fc79b8e69221e9
-EBUILD numpy-2.1.1.ebuild 3783 BLAKE2B be92bf80ae67acd08568798331cbe63c6b0ea5d8e3e99d8fb7082739b26122b52708659d74cde76c63396904ec5518ebbe943d54553112db7990c76cf33b0e1b SHA512 2870c1033d7a8255aa5cc47ef5d399bf89fb2e9d59f0926c5a7b96a559a8008f4b356b5ccb3a749eaaced7d85252e34fa99058c6ec5bc8cbfc6b92c060c3a423
+EBUILD numpy-2.1.1.ebuild 3782 BLAKE2B 42bab402c12d477e881542f6dcf81e3cffa8352a95903ca0ae9ce4dd862a70fc754ace7ed8edca65896efbf32d4d0f7de5e64d61694fd2325c2ae86128dd2288 SHA512 24b334b24fba57dfe2beb794dbea4bacf31ed2d4e39e994873ec3cf16568909a80dbb3a8df2cebe25cedef93c8679b8eab9b04ff80c6afc90f45acad5321c2b5
+EBUILD numpy-2.1.2.ebuild 3783 BLAKE2B be92bf80ae67acd08568798331cbe63c6b0ea5d8e3e99d8fb7082739b26122b52708659d74cde76c63396904ec5518ebbe943d54553112db7990c76cf33b0e1b SHA512 2870c1033d7a8255aa5cc47ef5d399bf89fb2e9d59f0926c5a7b96a559a8008f4b356b5ccb3a749eaaced7d85252e34fa99058c6ec5bc8cbfc6b92c060c3a423
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-2.1.1.ebuild b/dev-python/numpy/numpy-2.1.1.ebuild
index 1cab76b3b2db..c90d9636868d 100644
--- a/dev-python/numpy/numpy-2.1.1.ebuild
+++ b/dev-python/numpy/numpy-2.1.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-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"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
diff --git a/dev-python/numpy/numpy-2.1.2.ebuild b/dev-python/numpy/numpy-2.1.2.ebuild
new file mode 100644
index 000000000000..1cab76b3b2db
--- /dev/null
+++ b/dev-python/numpy/numpy-2.1.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 pypi
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# +lapack because the internal fallbacks are pretty slow. Building without blas
+# is barely supported anyway, see bug #914358.
+IUSE="+lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-build/meson-1.1.0
+	>=dev-python/cython-3.0.6[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# bug #922457
+	filter-lto
+	# https://github.com/numpy/numpy/issues/25004
+	append-flags -fno-strict-aliasing
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dallow-noblas=$(usex !lapack true false)
+		-Dblas=$(usev lapack cblas)
+		-Dlapack=$(usev lapack lapack)
+		# TODO: cpu-* options
+	)
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Very disk-and-memory-hungry
+		numpy/lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		numpy/lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
+
+		# Precision problems
+		numpy/_core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# Runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		numpy/typing/tests/test_typing.py
+		# Uses huge amount of memory
+		numpy/core/tests/test_mem_overlap.py
+		'numpy/core/tests/test_multiarray.py::TestDot::test_huge_vectordot[complex128]'
+	)
+
+	if [[ $(uname -m) == armv8l ]]; then
+		# Degenerate case of arm32 chroot on arm64, bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				numpy/_core/tests/test_nditer.py::test_iter_refcount
+				numpy/_core/tests/test_limited_api.py::test_limited_api
+				numpy/f2py/tests/test_f2py2e.py::test_gh22819_cli
+			)
+			;&
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# flaky
+				numpy/f2py/tests/test_crackfortran.py
+				numpy/f2py/tests/test_data.py::TestData::test_crackedlines
+				numpy/f2py/tests/test_data.py::TestDataF77::test_crackedlines
+				numpy/f2py/tests/test_f2py2e.py::test_gen_pyf
+			)
+			;;
+	esac
+
+	if ! has_version -b "~${CATEGORY}/${P}[${PYTHON_USEDEP}]" ; then
+		# depends on importing numpy.random from system namespace
+		EPYTEST_DESELECT+=(
+			'numpy/random/tests/test_extending.py::test_cython'
+		)
+	fi
+
+	if has_version ">=dev-python/setuptools-74[${PYTHON_USEDEP}]"; then
+		# msvccompiler removal
+		EPYTEST_DESELECT+=(
+			numpy/tests/test_public_api.py::test_all_modules_are_expected_2
+			numpy/tests/test_public_api.py::test_api_importable
+		)
+		EPYTEST_IGNORE+=(
+			numpy/distutils/tests/test_mingw32ccompiler.py
+			numpy/distutils/tests/test_system_info.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 4b71bee8b519..d0395620edab 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,7 +1,5 @@
 AUX paramiko-3.2.0-disable-server.patch 1771 BLAKE2B 3cab494873956d6f36b8ea85903141a49eb515fd92851f041f91418dc58acc77cdaf00a215c8e681d037d78eabfc7718a5670f2ca6af02fe357daece9a48819e SHA512 9f2f85518dec8668d096fa1db77ec5219f14fb6127c29bbdc2ba47f55e3526e9f1dbca421adb18033a8358c0efac7db723536b26bd8f45c8583503fb4ae58d76
 AUX paramiko-3.2.0-nih-test-deps.patch 4289 BLAKE2B 4a77852f0ae3cda52eca8844f4bf2571c17a0935088973f48c46abf250081845a870fb52d8ebafb108f634dbe86fbe784eefd49d9240c50f911d56173d1e3d71 SHA512 4e0bed394e4c8be19108cc0a7253d6306a698a3cc09b40c18459c8e16591ff42c41cb4f385fc05dcf902161fa23ce2b7d00c665784b9106344a5ca42e4f2a788
-DIST paramiko-3.4.1.gh.tar.gz 375155 BLAKE2B 576cc5b23010eaf46eec7dc98e5930c134948038b5588a2cf198289f11a9ab33978e582f273e39d3154fa5fa48109a9bb493745c658e2a2082af055a8f0bc80e SHA512 99026c1045a7f9f4aa7484d089a94dfff141c5d8c565d0bfb3f5c9b1387d963b8f8b3718a79668b1cfe1ec581ab3cb76af787f8011d254aa14c00a5496a805eb
 DIST paramiko-3.5.0.gh.tar.gz 376242 BLAKE2B 3080669e8b0d60e5b2e5aea390dc4f5f8d19ff32441d13b4e319892d1566f3fc76df714c0a063932e5077de08cd66ccf1140ac96bcb6e1c8e801c1377923aece SHA512 933a63c511fcd0a5a159faf2a9dfddbb44368ba923ea892aa1bf8dbe296777f3caedff27560113cfb15576812b994a59007caac8f297b24e70c79505f88c7d9f
-EBUILD paramiko-3.4.1.ebuild 1520 BLAKE2B ca1787431a18c4895b12b3e30e567299c5b80b1b34e6965c38ae059c21556a79f71a7c2fee7c8a68a4319aefb7887dfcceeea595208774fdcee45da9cb1050c6 SHA512 0b74eadbe15e39139ea168e47f1a2e089038b84cd74717648d7321930c9442c8bfa870f51c3be3f301a13a1cd286c29f054f5220fa3fccdc53ce90e09506ecba
-EBUILD paramiko-3.5.0.ebuild 1527 BLAKE2B bf1e7b29d47356488013be45855e37826df5123501629fba79d8f8c743d182d5453cba283cd65b920acfc503e94c64d5f6e9e8198c234ccaa07822f886380fa0 SHA512 298afe9e1833d1916740292c911ee8ba76adf6a4d5c02b0d74c8fd184f96c046b04caba0f1fba6e809598001934f9cde6ba8416dd053fb29b701e043e1c4bcc9
+EBUILD paramiko-3.5.0.ebuild 1520 BLAKE2B ca1787431a18c4895b12b3e30e567299c5b80b1b34e6965c38ae059c21556a79f71a7c2fee7c8a68a4319aefb7887dfcceeea595208774fdcee45da9cb1050c6 SHA512 0b74eadbe15e39139ea168e47f1a2e089038b84cd74717648d7321930c9442c8bfa870f51c3be3f301a13a1cd286c29f054f5220fa3fccdc53ce90e09506ecba
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/paramiko-3.4.1.ebuild b/dev-python/paramiko/paramiko-3.4.1.ebuild
deleted file mode 100644
index 931d3f3c9215..000000000000
--- a/dev-python/paramiko/paramiko-3.4.1.ebuild
+++ /dev/null
@@ -1,72 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="
-	https://www.paramiko.org/
-	https://github.com/paramiko/paramiko/
-	https://pypi.org/project/paramiko/
-"
-SRC_URI="
-	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples server"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# upstream doesn't really maintain the gssapi support
-	tests/test_gssapi.py
-	tests/test_kex_gss.py
-	tests/test_ssh_gss.py
-)
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-3.2.0-nih-test-deps.patch"
-	)
-
-	if ! use server; then
-		PATCHES+=( "${FILESDIR}/${PN}-3.2.0-disable-server.patch" )
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=5
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-3.5.0.ebuild b/dev-python/paramiko/paramiko-3.5.0.ebuild
index a007b925a2af..931d3f3c9215 100644
--- a/dev-python/paramiko/paramiko-3.5.0.ebuild
+++ b/dev-python/paramiko/paramiko-3.5.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index aba8e96c3d69..56cfe058e7af 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 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
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
new file mode 100644
index 000000000000..43eeff396e3d
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.47.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=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/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index c6d5ea887d6d..c927e3be8eb8 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -1,18 +1,7 @@
 AUX pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch 1170 BLAKE2B e214c79ba1183222d00525e0e795d2ba1f10a3abb1ff6e5c986ba3aa036251326d8244787f549d698ab6a015f79eb2397212060365b8c774e2d1218531f8704d SHA512 a2055d9c828352aa1d2d5ec844acf00bc202a579c2dcf7f27997ac29261680ebee0f674b42eca77c3e039ccbc482eac62adfbb82190e157e65b01755d4972f62
 AUX pipdeptree-2.18.1-fix-pypy-7.3.14.patch 1009 BLAKE2B b887e6e3234bd07a1df87b087907d5658a5e5fe3408defd172ded784362c12081f9cf52b41d471b2c28fc09b7398539d3cfdb2d872435bdb304a8d9a42a6336d SHA512 04a128b51a5bac5b58e30a8b521b4bd596f48a25faf5cd32db164cb95f3d9ddfb876d5afa77353cbb2e0029b8eb893da25d8dbf81133fdf95e0f1911cf456cc4
-AUX pipdeptree-2.21.0-pypy.patch 5682 BLAKE2B f545f7dae932b98e472ec3d4d47cf2538cff50be34257c8c97761096c6e1b3e8664759d5a40a275951591b30b1546d34ccb71afb5f4006951508bfe6707bca6d SHA512 23896b56e93faa64943ebccece52ea5145236ed3670dd962e5f0c74dde4d091c41695fe4300c8f4529bfd2d669d1ce154c01c079dd5708ba8c21de0ee28098e9
 DIST pipdeptree-2.18.1.tar.gz 35101 BLAKE2B e0a9bf6d85d0ab91049b557cd0c8a0a58e93e2342eb0a495ba5978ca734ec329ff363499ecf3182bdab8f01f0fe23653c0b683ec7a288b88b28d2120f0ad8a36 SHA512 ef0b3abb0fa591c92d7dca90ac449651a562adc4a87614dc6a18212274d10ca21fd09fd7e8989454eef2e265d7a1d89801b4a864892359c39bd9eca40885c2d2
-DIST pipdeptree-2.21.0.tar.gz 39119 BLAKE2B 15f37f997b89477a9e1815a2bf120ce5251e9cf2e4df9195dc76bd7414c0cf7f58c4b8e787649492c9826bda5d3f8df60577b5242af7354ad0e1583eabbf0589 SHA512 3d416683c70861de7b768a69fe59a31173e712ecb752c7948329f787c8e13bc54be544fa4a7d3bfdbf6b164202fa8b07898c6e993a53fe244a5f3d9fa9a00573
-DIST pipdeptree-2.22.0.tar.gz 39555 BLAKE2B 6aae7c6a22176dbfcc5184086c37b0237629f48702e1e2484457a6b3eca9442732279c85c3d806cff14edbbea9180d0ed3005c9744780016ee9949a0b530e3aa SHA512 9775d19cc353eae79e6fbe779471998a8368a932f380f34587950a6f4ef62d9185e77764c12cd122029c8690931a5a5939d57a9b1801db9556708676096c2efe
-DIST pipdeptree-2.23.0.tar.gz 39737 BLAKE2B 79fe45880f2942b2ded1d16e2767c4005aca52e0768a5723f37f764c7a60a8104a237ffe2a559f631bf760310143814b0e4afbaf1e5f3ef927828036c320da43 SHA512 9c5fdf7c6d3e519357d4aeb40f4aa2807dfec8fb387114cf40d99469becc68c5042af09f2cdebcca868dd78f3a3c1602b349dfe6cb581758c5c73efc3f6e52c6
-DIST pipdeptree-2.23.1.tar.gz 39883 BLAKE2B 63b578cc466871dda284f66bacc7e262b18157e5fb98e3a884c5e3eddd6945ad3d41a95e2e24fc23d0917e902f0e9ead152259d5ddc919e77e2940c2e2933119 SHA512 bc62c9cf6ee01bb8167477a21c70a7dd4ae1141c1c0690a1e95aea49cd4cb7d7e18bf076a532b00b79014a23c069df8aa09ac1bfd2d328b57e444192f1b10e5d
-DIST pipdeptree-2.23.3.tar.gz 39804 BLAKE2B deabb55937cca02bad8040c6625cbe2e1688af9fa349d7e74923d73c484022818a28074921d5811f0d8e9189184185829ea4dc4e3004ed5456fcc9ed340de2f5 SHA512 26b5d08a24e297d6f30f3a479ae7f93a71b12cf4bc5ae25ff907f96bf7bef8e5403654b359d79e81aed79fec7961e2b8c4db984e5222f677a33839a125e59343
 DIST pipdeptree-2.23.4.tar.gz 39945 BLAKE2B 6f1aaf4652b872a28712cf23fb06c26c9e36baf2c5c734b542d418d78081c19f567c730944fba33b43cf6ad612ecd54f37f625a81e88fc8bb68e3e56d76d9088 SHA512 3beeeceb11f842e5f337167b724354b43b01f972f83b0bac5168504483a079e15758206a8e141dc88e4810954630bff1b1cdec3e69aa2f981b9ec2896e40428d
 EBUILD pipdeptree-2.18.1-r1.ebuild 1354 BLAKE2B e038a5cb399fdce8ec9e4d228d76fdcce1de2e6395f62f91a90031bffd2da4c77de0cc2de3d433f9410c9b8f999b40bbf5dd53fea33d07e13b332f691223f68a SHA512 ef430841814440421200d052ddcee3fc94b0b303c1657d49277928382fe5846e3d6969c5423ed11f90b132360304c879cb9bdc0e063889a2b26873bd7e27ffa3
-EBUILD pipdeptree-2.21.0-r1.ebuild 1267 BLAKE2B 55cf353976e06689c49d90397a64095f0b9631cad2855f8cd9f9422955bd992ff7ad4ccbd3ca7ed254083381a0218f44713f150f2b8e9e66b6f632c5112fabac SHA512 0d9a554ec7946910a13b28c7ece6fec5eab2b5acb7191ffb53111dabb02e79b222a528103fe0f48534ce1cc5e699b48a826469a449ad7ba4ac1f8aba3ae2761b
-EBUILD pipdeptree-2.22.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
-EBUILD pipdeptree-2.23.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
-EBUILD pipdeptree-2.23.1.ebuild 1172 BLAKE2B 93280046eb71dc4f2b419c1c7df7fd3b0386f46be636f9c19ee3f03ed448db273dad0196c1bc14c7f5575166b3306561e8d36f98373e1e46d0fdd6426ec0ac04 SHA512 977d83ddff71183ff625253b4cecf1db87d3e70341e5d5db3eca635a129e177efa428262dedb8b0f5e1612566a082d2dde896525852de4f4182b3effc7a7569b
-EBUILD pipdeptree-2.23.3.ebuild 1263 BLAKE2B ca34c39d8979be957e43e2620b39739b284235e2462be1dfe493c82771bbc722aa8c1e6a6ca2b071e0efe3d80b96667edf6d5fecf0dd3e33bee4e545e2a844cd SHA512 d0bf7508a7926b684c83eb5dcc2bcde10e5cbc20e64de93c838fda49762d1671a689d1ae68a442d210d8a382b3a26f9264ba8f437fe954e1ee2041448dfa7dc0
-EBUILD pipdeptree-2.23.4.ebuild 1264 BLAKE2B 765a172d6bd53c904d1e85a2f952cb2c19c4b82fc833e2372e7517c009290e10e9adae86d9acd44a57dbaa4505cc5040465df4ba4bb2ee91557fa73a993ec5c5 SHA512 581f8711c177141fec16db38f9608ae576f9b6da22afdd0e05a075f74899ccfaaf06e0fca058ccb368f18db002cdf4c4ca194690c759c8adfd9ef437b1411876
+EBUILD pipdeptree-2.23.4.ebuild 1263 BLAKE2B ca34c39d8979be957e43e2620b39739b284235e2462be1dfe493c82771bbc722aa8c1e6a6ca2b071e0efe3d80b96667edf6d5fecf0dd3e33bee4e545e2a844cd SHA512 d0bf7508a7926b684c83eb5dcc2bcde10e5cbc20e64de93c838fda49762d1671a689d1ae68a442d210d8a382b3a26f9264ba8f437fe954e1ee2041448dfa7dc0
 MISC metadata.xml 545 BLAKE2B cf435473fd95ac0a5bafe2b52ddd78e09c16eb190e3a979924525607fc7ab152e249419e3a21d246cd1354a714116c6c0953ed55d1efceafae441ee282c2b1eb SHA512 ad2e8d4e7bac53b26ea0bb5c2f65e0c9dc8d30afc8c569d73bac820b2dda6a343b96e52abd0353e3f50269fb431e46bd3b51b3768d9c24f658fd2eca6cc1ce97
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch b/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch
deleted file mode 100644
index bbc8ea9d0b9c..000000000000
--- a/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/tests/test_non_host.py b/tests/test_non_host.py
-index 7049b0c..54ba7fb 100644
---- a/tests/test_non_host.py
-+++ b/tests/test_non_host.py
-@@ -16,6 +16,21 @@
-     from pytest_mock import MockerFixture
- 
- 
-+@pytest.fixture(scope="session")
-+def expected_venv_pkgs() -> frozenset[str]:
-+    implementation = python_implementation()
-+    if implementation == "CPython":  # pragma: cpython cover
-+        expected = {"pip", "setuptools", "wheel"}
-+    elif implementation == "PyPy":  # pragma: pypy cover
-+        expected = {"cffi", "greenlet", "pip", "readline", "hpy", "setuptools", "wheel"}
-+    else:  # pragma: no cover
-+        raise ValueError(implementation)
-+    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
-+        expected -= {"setuptools", "wheel"}
-+
-+    return frozenset(expected)
-+
-+
- @pytest.mark.parametrize("args_joined", [True, False])
- def test_custom_interpreter(
-     tmp_path: Path,
-@@ -23,6 +38,7 @@ def test_custom_interpreter(
-     monkeypatch: pytest.MonkeyPatch,
-     capfd: pytest.CaptureFixture[str],
-     args_joined: bool,
-+    expected_venv_pkgs: frozenset[str],
- ) -> None:
-     # Delete $PYTHONPATH so that it cannot be passed to the custom interpreter process (since we don't know what
-     # distribution metadata to expect when it's used).
-@@ -32,20 +48,13 @@ def test_custom_interpreter(
-     result = virtualenv.cli_run([str(tmp_path / "venv"), "--activators", ""])
-     py = str(result.creator.exe.relative_to(tmp_path))
-     cmd = ["", f"--python={result.creator.exe}"] if args_joined else ["", "--python", py]
-+    cmd += ["--all", "--depth", "0"]
-     mocker.patch("pipdeptree._discovery.sys.argv", cmd)
-     main()
-     out, _ = capfd.readouterr()
-     found = {i.split("==")[0] for i in out.splitlines()}
--    implementation = python_implementation()
--    if implementation == "CPython":
--        expected = {"pip", "setuptools", "wheel"}
--    elif implementation == "PyPy":
--        expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}  # pragma: no cover
--    else:
--        raise ValueError(implementation)
--    if sys.version_info >= (3, 12):
--        expected -= {"setuptools", "wheel"}
--    assert found == expected, out
-+
-+    assert expected_venv_pkgs == found, out
- 
- 
- def test_custom_interpreter_with_local_only(
-@@ -54,7 +63,6 @@ def test_custom_interpreter_with_local_only(
-     capfd: pytest.CaptureFixture[str],
- ) -> None:
-     venv_path = str(tmp_path / "venv")
--
-     result = virtualenv.cli_run([venv_path, "--system-site-packages", "--activators", ""])
- 
-     cmd = ["", f"--python={result.creator.exe}", "--local-only"]
-@@ -63,16 +71,10 @@ def test_custom_interpreter_with_local_only(
-     main()
-     out, _ = capfd.readouterr()
-     found = {i.split("==")[0] for i in out.splitlines()}
--    implementation = python_implementation()
--    if implementation == "CPython":
--        expected = {"pip", "setuptools", "wheel"}
--    elif implementation == "PyPy":  # pragma: no cover
--        expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}  # pragma: no cover
--    else:
--        raise ValueError(implementation)  # pragma: no cover
--    if sys.version_info >= (3, 12):
--        expected -= {"setuptools", "wheel"}  # pragma: no cover
--    assert found == expected, out
-+    expected = {"pip", "setuptools", "wheel"}
-+    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
-+        expected -= {"setuptools", "wheel"}
-+    assert expected == found, out
- 
- 
- def test_custom_interpreter_with_user_only(
-@@ -81,7 +83,6 @@ def test_custom_interpreter_with_user_only(
-     # ensures there is no output when --user-only and --python are passed
- 
-     venv_path = str(tmp_path / "venv")
--
-     result = virtualenv.cli_run([venv_path, "--activators", ""])
- 
-     cmd = ["", f"--python={result.creator.exe}", "--user-only"]
-@@ -127,7 +128,7 @@ def test_custom_interpreter_with_user_only_and_system_site_pkgs_enabled(
-     found = {i.split("==")[0] for i in out.splitlines()}
-     expected = {"bar"}
- 
--    assert found == expected
-+    assert expected == found
- 
- 
- def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
-@@ -135,6 +136,7 @@ def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
-     mocker: MockerFixture,
-     monkeypatch: pytest.MonkeyPatch,
-     capfd: pytest.CaptureFixture[str],
-+    expected_venv_pkgs: frozenset[str],
- ) -> None:
-     # ensures that we honor $PYTHONPATH when passing it to the custom interpreter process
-     venv_path = str(tmp_path / "venv")
-@@ -146,19 +148,10 @@ def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
-     fake_metadata = fake_dist / "METADATA"
-     with fake_metadata.open("w") as f:
-         f.write("Metadata-Version: 2.3\n" "Name: foo\n" "Version: 1.2.3\n")
--    cmd = ["", f"--python={result.creator.exe}"]
-+    cmd = ["", f"--python={result.creator.exe}", "--all", "--depth", "0"]
-     mocker.patch("pipdeptree._discovery.sys.argv", cmd)
-     monkeypatch.setenv("PYTHONPATH", str(another_path))
-     main()
-     out, _ = capfd.readouterr()
-     found = {i.split("==")[0] for i in out.splitlines()}
--    implementation = python_implementation()
--    if implementation == "CPython":
--        expected = {"foo", "pip", "setuptools", "wheel"}
--    elif implementation == "PyPy":  # pragma: cpython no cover
--        expected = {"foo", "cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
--    else:  # pragma: no cover
--        raise ValueError(implementation)
--    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
--        expected -= {"setuptools", "wheel"}
--    assert found == expected, out
-+    assert {*expected_venv_pkgs, "foo"} == found, out
diff --git a/dev-python/pipdeptree/pipdeptree-2.21.0-r1.ebuild b/dev-python/pipdeptree/pipdeptree-2.21.0-r1.ebuild
deleted file mode 100644
index 2e77548af84f..000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.21.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022-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 optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/tox-dev/pipdeptree/pull/369
-	"${FILESDIR}/${P}-pypy.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.22.0-r1.ebuild b/dev-python/pipdeptree/pipdeptree-2.22.0-r1.ebuild
deleted file mode 100644
index 0f2bc0747e89..000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.22.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022-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 optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.0-r1.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.0-r1.ebuild
deleted file mode 100644
index 0f2bc0747e89..000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.23.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022-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 optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild
deleted file mode 100644
index 3f8d7d77877a..000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022-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 optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild
deleted file mode 100644
index 21df3b3c44a7..000000000000
--- a/dev-python/pipdeptree/pipdeptree-2.23.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-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 optfeature
-
-DESCRIPTION="Utility for displaying installed packages in a dependency tree"
-HOMEPAGE="
-	https://github.com/tox-dev/pipdeptree/
-	https://pypi.org/project/pipdeptree/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/graphviz[${PYTHON_USEDEP}]
-		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-
-	find -name '*.py' -exec \
-		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock -p console-scripts
-}
-
-pkg_postinst() {
-	optfeature \
-		"visualising the dependency graph with --graph-output" \
-		dev-python/graphviz
-}
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.4.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.4.ebuild
index 108d23b345f5..21df3b3c44a7 100644
--- a/dev-python/pipdeptree/pipdeptree-2.23.4.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.23.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 6240631a5637..f2ef947cf1bc 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,3 @@
-DIST platformdirs-4.3.3.tar.gz 21304 BLAKE2B 94248b49ab0b0ea7c43231c15c3f479c1ea0a82242a9d274b6e6b71559710f1d3bbd8ad89083c89f7627956a983ad2902cbf33b8b99a12a1481214a969fcc292 SHA512 0dc8b8585c4130660a779a1846a4d468a182dfcc0f03700001242f1eb78ba2bd9799777f6ac29367034ed23c66f1af4eda4f294201197d6444d6fdd92e7f93a1
 DIST platformdirs-4.3.6.tar.gz 21302 BLAKE2B 3488d33c70c420a7234fa773a7b61eaabc85e7aabfa75c9de308074ef653b534823a133038eb8098d41f987596d7fa6c70abd6cdde28234590261ecd6c8a9f56 SHA512 8a14126346f5472798074bd9ef73b39cd0c6517951556f7ab839d2c1993d8001a3359101fe3a7a00e803d8a5540cf33057d99e1a2e93b1bd5e20a948c89e4e44
-EBUILD platformdirs-4.3.3.ebuild 1401 BLAKE2B c1d35f7554f7b96223d9fb47ce05339bb0848df3c9798658c8b43f3244f286d68cd267fb6a44e29bc1f4978daab7d230d096d05eda1dfe3de2872dce1fc2d72d SHA512 304cb014b4c99716e6047c249ee23607181f1902c85f1af141e1c829872d26d3284089e188f052d4f001c541edf849e3fc3b1335089acb0848b447d845cd03df
-EBUILD platformdirs-4.3.6.ebuild 1409 BLAKE2B 919cda0c9f57d4328b037afa1676664f11b8c215d2da933aef1562ab6d9c3b6d88a5625a1a710f2d2824791b955eb87505917f61770114b86665e4f641d864c1 SHA512 a0795d589e0459fdbdc9abd04b1c2b0b9c426097c018cfedb22c4b01c51483f0af935af7832b2603a448851e3943b54652acaf8711ee8cd9f529510ee36da0ed
+EBUILD platformdirs-4.3.6.ebuild 1401 BLAKE2B c1d35f7554f7b96223d9fb47ce05339bb0848df3c9798658c8b43f3244f286d68cd267fb6a44e29bc1f4978daab7d230d096d05eda1dfe3de2872dce1fc2d72d SHA512 304cb014b4c99716e6047c249ee23607181f1902c85f1af141e1c829872d26d3284089e188f052d4f001c541edf849e3fc3b1335089acb0848b447d845cd03df
 MISC metadata.xml 378 BLAKE2B 6dfade0f5452263f37028e8fa0e40a7a3199cb064abefd3b17b27f98c2a02305ae951b719d9466eca1bb73b38779a27071f861c24b692c3290efac77f4604955 SHA512 5953428380207486f118b2a78b89639f7ffb81396fbf0bdc6a6cb5b75a73f5c6ed5e4e772ae6776fab51fe794730838e9b30cfd898d9c12114824a09d93a2782
diff --git a/dev-python/platformdirs/platformdirs-4.3.3.ebuild b/dev-python/platformdirs/platformdirs-4.3.3.ebuild
deleted file mode 100644
index a67ec460cbe7..000000000000
--- a/dev-python/platformdirs/platformdirs-4.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021-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="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/tox-dev/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' 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 = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/platformdirs/platformdirs-4.3.6.ebuild b/dev-python/platformdirs/platformdirs-4.3.6.ebuild
index 7b2b77a80661..a67ec460cbe7 100644
--- a/dev-python/platformdirs/platformdirs-4.3.6.ebuild
+++ b/dev-python/platformdirs/platformdirs-4.3.6.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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 4ef75867e7a3..22a04a892f27 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,3 +1,5 @@
 DIST plumbum-1.8.3.tar.gz 318895 BLAKE2B 7c3df70e5bcaf5dfd9c6898f0d2044c647f08a4eaa0eb6bcb616c9971edfc20aa7651dc70a193e06c1d1f97b155a86a6d93d14622ff40da1328b1aa0e6534e6b SHA512 e59dd98939739636c3f1541e24f3c5a4b0c9bbe54b77d378875a57f167ca1916adbca6b33c7779d37e5daebd949c9a9d77bfffc404e55d319027658b5a504088
+DIST plumbum-1.9.0.tar.gz 319083 BLAKE2B eb155511c3726b7b7e564da05ab58294ffdbe9806599d8adbd0a05ffc9cf096a6c551f5d1ef0b9a781a13435e47a6598c90c04d90c852f8536c665d2bfbb58d9 SHA512 afa0436e19ddea192ac7d33a3cdede6a86c801288d6678c9d9daa110ea049b14bc388fe4eb27e172d66595de282648b966043bed8f4c282350753afdf38e14de
 EBUILD plumbum-1.8.3.ebuild 1437 BLAKE2B 842741f52540518c66a176d24caf3a8704cff3b4ef884ff4d6a616fc81304943375982f06038f09be3aaa8f55285c2701287e5e20d1498ccfe887a74ce0e3fcb SHA512 db72e00b77c700a344d2b2fc27f1027f207d36e08f06f261e455ddfebf3c16f8929cb42aa507ffdd377bd8227dd41016636ddc1d782158bed8475fccf6d9e120
+EBUILD plumbum-1.9.0.ebuild 1440 BLAKE2B 6c0a354b158af3546dd3eac740eec5c6c0bcf30310e5d6fb26a14ba7c1a4fa2bbeed2baaa746ebeddbc05cf9be14a9ab60a6a8ac7ac02df3fc7217f78ed034da SHA512 a81ab749801aa1862162235e79c69ca5c0a7ea299f630200f2e60a575a975eb143ab8be7bc3730132eff7a5202762a46e7edbfd862f25df05b7335a9dda96b71
 MISC metadata.xml 754 BLAKE2B b6d00fe0747da15445953a29abdd6f14112d02f2162746992f2fca80a321cd10f3cad40294e4bdbcf3f04d432b4d81902667296a0a5b8f99da2df2a5c58b18c1 SHA512 fbadbb7e5edd1573994cfc843e4a254ae5d12be5a3372f4fb061647983e360c2b0ea4a9e41ea8c9ff26028db75ad9cd5de881b8fdd9bf35864442e215aa42175
diff --git a/dev-python/plumbum/plumbum-1.9.0.ebuild b/dev-python/plumbum/plumbum-1.9.0.ebuild
new file mode 100644
index 000000000000..feaba73825a3
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.9.0.ebuild
@@ -0,0 +1,57 @@
+# 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} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="
+	https://plumbum.readthedocs.io/en/latest/
+	https://github.com/tomerfiliba/plumbum/
+	https://pypi.org/project/plumbum/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Need sshd running
+		tests/test_remote.py
+		tests/test_utils.py
+		# Windows specific
+		tests/test_putty.py
+		# Needs sudo without password
+		tests/test_sudo.py
+		# Wrong assumptions about env handling
+		tests/test_env.py::TestEnv::test_change_env
+		tests/test_env.py::TestEnv::test_dictlike
+		tests/test_local.py::TestLocalPath::test_iterdir
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= -p pytest_mock -p timeout
+}
+
+pkg_postinst() {
+	optfeature "remote commands via ssh" dev-python/paramiko
+	optfeature "progress bars in jupyter" dev-python/ipywidgets
+	optfeature "colored output in jupyter" dev-python/ipython
+	optfeature "images on the command line" dev-python/pillow
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index df55af6565fe..01c29d6ae687 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -11,6 +11,6 @@ EBUILD psycopg-2.9.9.ebuild 1284 BLAKE2B 25ae05c820ef631517e15270e599fecb35334ef
 EBUILD psycopg-3.1.19.ebuild 2699 BLAKE2B 4811b1892ad611f109358ebb9ba5f0d2bac2353ba2ae4634215d4c7792206f56eaeacd22d8480fa05216994c2cf61ebfefc6c11f930509c3ebf62c88adad98bd SHA512 79f11c4d49244693912a3492671932de81a944f47ff81e3b558f045bf751581a3eb2d136b955f1dc02b5e5ca9e517c0d1493266ce3481ae4fa91dcd8a7576fd0
 EBUILD psycopg-3.2.0.ebuild 2755 BLAKE2B cdeff6c0e4c1e2f43a091d524e81ca0d657cb76aa5f4e1db0c1f4814c5499ebb3a680eefb1b962e0e317dd46c8b9e3041f55ca96b06f3bc14fdb908d24edebe4 SHA512 acb9954deb2464913fa0a664c4ae3d7fb0f27af05c884f16c2ff013ff40d4867cec259b17644c245fb56ee162643d98d5e70b7716b063ed86e555e3786ed3d1c
 EBUILD psycopg-3.2.1.ebuild 2751 BLAKE2B 01f7cd273a98a18c5ae2ce3d20a1a1eda9a58f10490181095382e4135d3f10981c4b0e44e6298d5e08c1ea3bd73e4dff1823794f43fe6cc0e7e3231808fa7569 SHA512 43cccf04b4e282393981e3ca86c4fa3778b2ae84f49cff282372cca6d0a6ee8da895de6b88ddc037174e1331f2e84ae74e04c3ff02269851e8f08f3e640dd0e9
-EBUILD psycopg-3.2.2.ebuild 2755 BLAKE2B cdeff6c0e4c1e2f43a091d524e81ca0d657cb76aa5f4e1db0c1f4814c5499ebb3a680eefb1b962e0e317dd46c8b9e3041f55ca96b06f3bc14fdb908d24edebe4 SHA512 acb9954deb2464913fa0a664c4ae3d7fb0f27af05c884f16c2ff013ff40d4867cec259b17644c245fb56ee162643d98d5e70b7716b063ed86e555e3786ed3d1c
+EBUILD psycopg-3.2.2.ebuild 2754 BLAKE2B e11c69018cf199c9bc62f539cfc1fb3e297035bf15db68d7cd06c11284b3e270e36cb30b11fcd61a6da73f021407cd5db25525e1cbb84e4705fb413fc28e0f29 SHA512 6cc2e08e0680caf7e720328537023e1ccac2f4f5cced3bee0d0aa1e6d0a423d9f3984230d8bf20d528df682b6738276b3fa46c742e497f32dfe499c57d7ab46b
 EBUILD psycopg-3.2.3.ebuild 2755 BLAKE2B cdeff6c0e4c1e2f43a091d524e81ca0d657cb76aa5f4e1db0c1f4814c5499ebb3a680eefb1b962e0e317dd46c8b9e3041f55ca96b06f3bc14fdb908d24edebe4 SHA512 acb9954deb2464913fa0a664c4ae3d7fb0f27af05c884f16c2ff013ff40d4867cec259b17644c245fb56ee162643d98d5e70b7716b063ed86e555e3786ed3d1c
 MISC metadata.xml 426 BLAKE2B a573dbbef89ba2c3c7e7aa11e87005879fa823daa8d7e2080ce82dab7196429769b5e2ed0c4ffb363443469dfa47524d900fae75c4d7c8c9da901389e746838f SHA512 e3059428d8c00113696bfd232b2ad3fd4efccc304a31ff45801f30bb07c03acd58aafcab187fd85e4d89eff4db6c18a1395744eb1fd5cf8f11e43aca0f4e60cc
diff --git a/dev-python/psycopg/psycopg-3.2.2.ebuild b/dev-python/psycopg/psycopg-3.2.2.ebuild
index 7b5d1e032245..147730e0de9e 100644
--- a/dev-python/psycopg/psycopg-3.2.2.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 34e256b83655..a0c1f7b7be7e 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -172,6 +172,6 @@ DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd
 DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
 EBUILD pydantic-core-2.18.4.ebuild 3289 BLAKE2B b9449f3cb7c97c29db006b02d3d80f7dde78bc4907d9296ab524cf2052fed4e5139af9c0430552eb9ea586e670a7c4dba31d328e7b51fe1870deb47e2dfd58be SHA512 7d125b78b32cec6ce33932013b338107f8afe85e73b07f262bcd06fabe7bf34c388393d27d8c1c645dc372b8f5d65dc3fabe28827a61419435a47f2ab5c34a80
 EBUILD pydantic-core-2.20.1.ebuild 2938 BLAKE2B 0970ae5ed65cc8bc9a374edeef9104db8eb2d4cc654a5919a42ca2afe9ef6287abb06b366b1eb0d0aab40a4a645d01ca321a74500170d3e1d5c8414c74d4889d SHA512 71cbc3101fbc9481cc53dafe8ce5e2684a10dcd66eefeb4acdedda197d75df8494db0bd8eff00a291c6d6112a8192e1d17f17c15597b3cab5b5b1ebcd1b19b6a
-EBUILD pydantic-core-2.23.4.ebuild 3520 BLAKE2B fd17a132956115661bbfbcd4866b9620418d1ad3dc062a8db339e620850a955dfc4e3374bbde28487565b41df1d6502f2d57e0fc70381e00214e6f69c9db8721 SHA512 2f8daf60f7053956b17b40bb668683c2ee0377480761c7d52da2d4f5774519f065807be1094b60fb4bf9a02b2bf3c9dff038b3c1e8d3292389d289401c15911a
+EBUILD pydantic-core-2.23.4.ebuild 3516 BLAKE2B 619e02cdfc00c1c97add7d1f2f128caadb9cfa43b71395036881e844ea5a864035f4db9e906d0324761694091be8b87744e461cd4c0f47130c89b70e46b5cbf4 SHA512 ace791ce86265b177d73f09b6f3b60a1ada6d5376338b697b7b882cd9cfb4d9727d3530c2ef8f42c14031878d5efc82f5cdccb3bd762ad68d1ef8306d4f69da5
 EBUILD pydantic-core-2.24.0.ebuild 3520 BLAKE2B fd17a132956115661bbfbcd4866b9620418d1ad3dc062a8db339e620850a955dfc4e3374bbde28487565b41df1d6502f2d57e0fc70381e00214e6f69c9db8721 SHA512 2f8daf60f7053956b17b40bb668683c2ee0377480761c7d52da2d4f5774519f065807be1094b60fb4bf9a02b2bf3c9dff038b3c1e8d3292389d289401c15911a
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild
index a641f653d21d..71dfcf018662 100644
--- a/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild
@@ -124,7 +124,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 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/typing-extensions-4.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 2eb60f83c85a..c0c1db247976 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -3,5 +3,5 @@ DIST pydantic-2.8.2.tar.gz 739834 BLAKE2B d0168db26e02ac9fcf01fe85cd70c982e74f18
 DIST pydantic-2.9.2.tar.gz 769917 BLAKE2B 4e34fda6a9e8e8331278d0b7d0c2dfd61bde637c126fa6dabf78a09c6ef993f84dc8df6af421c8fb6d69c8e1c387a40e4bcd38cbe02f5ac521c6c70821735763 SHA512 2aace9e79a98bd94e5dc626736a245051912a11fdce36013d2ad2f96b266052386a3e12b259dca30ddc38b63c6b00b5bcc9cd5e80f7805de4d8701064f0982aa
 EBUILD pydantic-2.7.4.ebuild 1300 BLAKE2B f9e8c50194cd43dcf1303f42ac88733e016c2dc0a57dbc3ba1a61de39dc3a7bd86c13bdcc70305712e982118f73bea84e798a1abd3960644ee68c6f0341d2a01 SHA512 ac3c61d6d7f9d4013fc53444da4b71eeadf615cdcb6443cc66924cac8ef2cfe23722ed23499039b05fc467c149bc05e87478f9fd6ade7857b799ed09de09c6ee
 EBUILD pydantic-2.8.2.ebuild 1425 BLAKE2B eba3766f414c827aa71d187ff5ebc4c8a165ec19e67d1a6a439c331e17b08d038712fcf8a72a12703ce5b50cd11051a3f5291170bd3c9a1af0bf351e39a6dc27 SHA512 40ee1b451c4ba794603b910f21067c9a48dffe4d312c130ad156ebcb253131255d607d89612dc53da913b8707a1272ddcfd193f78a4312f7a56f54f6853b1e92
-EBUILD pydantic-2.9.2.ebuild 1558 BLAKE2B 6cfd9ec0d600af88e8f910d9f2dd2fdf604df05b7b1f76693765e3235007cd295241fdab0aa459dbe4414974914816ff5aff5b31235446762d5221173b4ca460 SHA512 9717982b5a3cfa76919dd1582cfdbb3b90558d5cf130b1b23590b772dbceebc81f3d33d9947476a672894f0c03d8a55841e15f4754d440b6e440c53d664890b0
+EBUILD pydantic-2.9.2.ebuild 1554 BLAKE2B bc88cddce27ab6edab17cc47449fae0c7c270cfec1a9e7aab959cccaba320b6936073826a2822d450de0898281ec1382e7daf1f1416b7912089b61bf5cd5dcab SHA512 0bdd43ba769e8abb3406cc6d87dca5c5eb972f46fd8e49d1e58087ed01c6a83bb97280fe05c90aacaa7b770a7a9bcc7bd7dadffb0b6ed8a3a5916e0b9ed21116
 MISC metadata.xml 550 BLAKE2B ca3a62e01a928ac12964e9a8f291073465c66951082b68cb408a8dec48eeab226c1955782fbb6c82d95c495a790b7d5b84b8f69ab7d3b0acfd2883d3ad2d8e5e SHA512 247144ea1634fd80f8ec461fcb2f8e7383b65185426d0df283ec5345d7612abc3ceee7b6d0df7a3ba858ba8483884507fb443b75cd812bab8d0e6a8293cbb855
diff --git a/dev-python/pydantic/pydantic-2.9.2.ebuild b/dev-python/pydantic/pydantic-2.9.2.ebuild
index 55fae02778fc..8a4bc72a2f5a 100644
--- a/dev-python/pydantic/pydantic-2.9.2.ebuild
+++ b/dev-python/pydantic/pydantic-2.9.2.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/annotated-types-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index a477b8fbf2cb..97698f63d432 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,3 @@
-DIST pyftpdlib-1.5.10.tar.gz 204487 BLAKE2B 7c611498dc2d11f752bf6a0ada01d906fca5c28e93b21bbcaaa76fafc88dcfe7afe616eb06f102123e614e061db2b6b62766f5036d749f8bd2b6d5cc35fc52e8 SHA512 c8c28d7aab13f2aab222ae038bde96f17abefd461830813ca00b621a6ee3e809c59ed135149ba735e7e92a6722aecfaf7095ccbacd7b3e17a16ee69fe1668766
 DIST pyftpdlib-2.0.0.tar.gz 196108 BLAKE2B bec261eac70a93092055413fca67dd4a480e492481f027b32508dcee8b479dbc0ec84c56d972dca63f2fbf4e3240e02b1c2877105cf77130bf75b64c9785993e SHA512 c154127771b949854c05f87a7b77f1cf144e2756cb0709c44cd0921c2ac415e7c6336c6dca1982b762087a42fc1408e26fbb2ebecbf9255d6f2d6019af14ccfe
-EBUILD pyftpdlib-1.5.10.ebuild 1461 BLAKE2B c5c21ffc0560378da5bdb5eb6e1b9919dd167f74e0b16f0fcafd1d0ea8cc22286a54b69c10b40cacf02dc7b6a218274fd860657bd7b1dfa430a160b505ec4300 SHA512 fe1285be1d9805b5111e0c64c85ea6e34101eda4219547c20285898e57c465753072aa9573d8c2229b6b1ae5d78f981b80e6d39a67f9e0ab044706940c5f5f5e
-EBUILD pyftpdlib-2.0.0.ebuild 1591 BLAKE2B 76471d463b60e1df91c975051cd3af8e3e86814e7ba69f1351a075a1d244558f7050d0f4bf9006bf05f2dd4d9da5367eb999cebfaea601f1a3653e18f3f0b9e9 SHA512 1e974526d415a5d6f89375537ba893e15d4507ff7930540282965d68f96df4219a24a433c270dd97fdfd228cfae7f22dcc9fc05afb2e35e3046a9323da8a88e6
+EBUILD pyftpdlib-2.0.0.ebuild 1584 BLAKE2B 5d6ffe50682f9604d5763e10c83ac13574a4c91ff336cde5c6ed59447adde1cfe6780b5618b055132b113c4624095d4047c81ec27cd43eced99ce89a63a450ef SHA512 e828437b31dd53707ef69ed99720e90516e988ffe0f7bd9640faf7f219aecd76636bb1f3620e87a285d17dfa28071bd25118ce42f38b1cfe4c8787f99dad6562
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild
deleted file mode 100644
index 2f00fca06628..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.10.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="
-	https://github.com/giampaolo/pyftpdlib/
-	https://pypi.org/project/pyftpdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs pyftpdlib
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
index f28406bf5316..b70682c72589 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index cda093ba21d4..793add6e2b2e 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,6 +1,4 @@
 AUX pyopencl-2024.2.7-nanobind-flags.patch 478 BLAKE2B 2e928f54d7275ea04ca5635f281f06e26690155299024939dc398a37858c6cb07193ab81f90a7a33602e69b0912ab4268349428ed7748e720d1033a18bdbae48 SHA512 6a71b6bcea720e1ce0b0c08682c1301176ba0286fc90bcb16757c2acef955b3fb2cea04f25193ff18583067e6640d8a35ae5980bd19995d9947ec83936a519ef
-DIST pyopencl-2024.1.tar.gz 473860 BLAKE2B 803c92418a609f3ad9249c81e93af0bd2e9125ee56dc88af8ee6ae9c4a275c7ab37befddd575914eb9f0b295aaef4f135358669e384a55c04b3938b02572724d SHA512 abf27d67f8c3633c71e662938a919c88a34b0b66cc3c213644f92a8733aed3c9b7593542dd9b45a080941976dadeb4f49a23a986482110824b554e3a0d317176
 DIST pyopencl-2024.2.7.tar.gz 470964 BLAKE2B 6c61d91735667dd63fec0375defe98fb681eb448780f86b0129769d30714adb51832955d8c2e838970f17187e5027f794cd21affc870910d23ec46126049d4ed SHA512 5c9982f5dcaeb3faeb6ac6b88940b5baff43b7580fc5d466a596d9c180e45725cbf9971ba6ae4981202900b06cee3be7fa88fdf7227befee874a8f203a3a3267
-EBUILD pyopencl-2024.1.ebuild 2023 BLAKE2B 6088a13394451d8ce78f521fb3dfde49ae96df2be6444c60d176203a252e5220b9d23b855adbd552606c1f6a612541eb49f1d85b313baa96814b202e74ec6c60 SHA512 84fa66010684576ea2c62f2d72f85d64a9ca561b90aa3ed9c51fce39e605bbf71d9532d45b3c6dfbc199ad9e245c4a14223947aff3235608511c83d1ccdde27a
-EBUILD pyopencl-2024.2.7.ebuild 2042 BLAKE2B 8e41d17762265f0b6e5a920e2bf69cc2b7263c2b6331dc2a8daf45e2ded98abf55790bd8945362b715d861d4eee93644fa7c827a5baa7a0b27ab0283668ff6c5 SHA512 5d0a71ead91699f534cd251488b07a34eb9934d9d3b2574a45c9af7fe00d685c7517fc7831f9277c25c6df57920ff713bae0a2ffec166080d8da2e653f98f9b2
+EBUILD pyopencl-2024.2.7.ebuild 2041 BLAKE2B e00de4d9433717f228cdbed919cf1a1ff8b20408b65aeab6e0baaf76eaa9a5166ed3e5445211dfbed4937d6c2a8d4151f384f25ded7625045715728bc9f251b3 SHA512 6a18e04cc2914c6d192a71ba2a6afafe6c4827ce11808eadf5b5ec948e6e5e60dac5b799e0dab6d2262651760001b68946ef03c2509df443816b10ef1d6de62e
 MISC metadata.xml 295 BLAKE2B ebe147867a9ecd3559e288e4fda56c04def2b224d87d6561d9065b13b251182f871b510acfd5034e63fc034d507837c241a6d1c639deda94faba05d3d020a285 SHA512 28117a5f3351192d7d3a58cdf47e8403155e027fd85ccbf5af32e5df9df59909d89ea94b18351354c312c323aa5e217da3b4a99e17cfbf59f307ddb4a38bc707
diff --git a/dev-python/pyopencl/pyopencl-2024.1.ebuild b/dev-python/pyopencl/pyopencl-2024.1.ebuild
deleted file mode 100644
index 0cb03a72953a..000000000000
--- a/dev-python/pyopencl/pyopencl-2024.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="
-	https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2024.2.7.ebuild b/dev-python/pyopencl/pyopencl-2024.2.7.ebuild
index 4d3f3850dd76..82cb6ec3f4f4 100644
--- a/dev-python/pyopencl/pyopencl-2024.2.7.ebuild
+++ b/dev-python/pyopencl/pyopencl-2024.2.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pyopengl-accelerate/Manifest b/dev-python/pyopengl-accelerate/Manifest
new file mode 100644
index 000000000000..5bf35e44a8b3
--- /dev/null
+++ b/dev-python/pyopengl-accelerate/Manifest
@@ -0,0 +1,3 @@
+DIST pyopengl-release-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
+EBUILD pyopengl-accelerate-3.1.8.ebuild 1165 BLAKE2B e1439fc90fb74f421f6d37e0c55255ae365e4607ca7623cd7515b74e33396ad73e992f307016499b628ec44bd6bcf52d83626a15128834e8b529b55d5326e254 SHA512 368d13e0194307287159e4663138d746c403ab4c88fddc5f6d607f4f6e9bbdd208524a83c665262787de0d24b14538becabe311b71c87f7d9519af7ad1bef7aa
+MISC metadata.xml 515 BLAKE2B 4a8dfbbf2250df73d9880ed75c4bfd63596e7f276dfd5dc15aff9177ad0b005256237e827bf4a0ce10f823ee1a17651248c1b47961bbd09af0a41b6281214228 SHA512 4f1a5ea9b42ba29e78fc15d2ad40623c63a2f351cc0a5f27eb7f8173155278bf214d5ac0f2d348c04967a99b2bb1f2c4b596ab8741a17cd891b2c34065ef0e35
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl-accelerate/metadata.xml
index daac0a05e972..daac0a05e972 100644
--- a/dev-python/pyopengl_accelerate/metadata.xml
+++ b/dev-python/pyopengl-accelerate/metadata.xml
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.8.ebuild b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.8.ebuild
index ae2f3ee96966..3b324795fb9c 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.8.ebuild
+++ b/dev-python/pyopengl-accelerate/pyopengl-accelerate-3.1.8.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/accelerate
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="numpy"
 
 DEPEND="
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 20dbb6d5acef..289317cb403b 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -4,5 +4,5 @@ AUX pyopengl-3.1.8-fix-version.patch 613 BLAKE2B 6f86f24d991629b63e04178be8baa45
 DIST PyOpenGL-3.1.7.tar.gz 1896446 BLAKE2B 3fd4c84bb59157b4a6ee09c2a5ecd0e4f548bf03a84d735acfd92453eafb92102677a2b9c98831a92be33e873630c815dee453745d630a4d6b044771a13c945c SHA512 add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
 DIST pyopengl-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
 EBUILD pyopengl-3.1.7-r1.ebuild 1542 BLAKE2B 35ad54837b4efcba3aefba54f5fa0e56ebb87dd8e3bb7fbe0838a9280d4aafe8043296d5725312c56d33d167d1f87672ceae9e921ebf7048d37cc0eeca1f1094 SHA512 3bb3acfdd24be80a229e85b7a607b2598ffa8b5f2fd5456fd84fbbb99169a04a3a9f3d7780bdee40412f237239df7b32993896b7d812a9a499b3d96e397d10d0
-EBUILD pyopengl-3.1.8.ebuild 1736 BLAKE2B 944dd73b189f695efc612bf00cd52e100ca4d36972f176665e88ef9ac43748c3d8bab8e7b7603685fbc76092e5e13c77dd694b2f9a7b30b26f6ef7053f400f3c SHA512 892139b37b12a9332279c5ced7c3bb512402b59892c62d995d4647f50b32d2985dd715b2e3412c166d85ff6ba78a25d227ad350be975128d039e6893cc8ffe24
+EBUILD pyopengl-3.1.8.ebuild 1732 BLAKE2B f69bf16b955085ef3fe6ebdb7efd4c89f313ed76e3eec58533338d3431b1c79f93e57f17c2cd507816975f6a0a3fb634d8c74992c0acbadd6b98a09c81da12ce SHA512 47f6a7ba64572cff3f3301f8ce589b5704d29a9641d377a0444c8551c981083619573b86683a6535981c30069d6f2da4415775b19c82da9ff764e8d227af2835
 MISC metadata.xml 422 BLAKE2B c9ee324fb408e8d0856193fde1324109e77c97f28fff0dc83d9c903cf3e2385c3401d8f949d50fc2e2a9c41b79c421298e04fc79639b79352138f41aeafb7018 SHA512 bedbbc7fcafc2c625f79241e75faeafd0d3c37b4186b5ef8842e8612d9527a4991f208b1878b1f1e28f4056eab2104e7acb57814e39ee82c0208d6f93fbb7b85
diff --git a/dev-python/pyopengl/pyopengl-3.1.8.ebuild b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
index 955bd7218309..041d398d59ad 100644
--- a/dev-python/pyopengl/pyopengl-3.1.8.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-release-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
deleted file mode 100644
index 66b16f375461..000000000000
--- a/dev-python/pyopengl_accelerate/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST pyopengl-release-3.1.7.gh.tar.gz 3310131 BLAKE2B 37d64a0e0f3ced1965a7285ac7a0afb774b1e5ef630e42d86e40bb65176af7f0aa44accee50d3b32eb87a13c76535a3239359ea2c5bea385e20f1b1ec1a8b636 SHA512 a6cd28b15964e55e8a808477138ad03eb212501d9f4723603c405932963aedca83b91ff19e510ca181cc9800f2a22968b2913b70a975b7797f3bcad112c6c0b4
-DIST pyopengl-release-3.1.8.gh.tar.gz 3599436 BLAKE2B 7f33345d68d66d3cc81278eaa5f54298694f41f40583ee08a1f9f677705fb4414b6b2afbcd7b9345199b5f573478bfeba050e185b6534cbb19b45cb25c241b47 SHA512 d95014a36bd889fa014043e4640ba7f319bb996cb56e5f7086ee05d39c53d3928512d52b0ce181d7c144775a4da7eff7403cada0f91f23f56a699a1b023e00e6
-EBUILD pyopengl_accelerate-3.1.7.ebuild 1164 BLAKE2B 964a9aeb630dc66281f57b29fc501b77fab6f4fc5c2348016b582528c51b3b2517053fd485238f3323e26ccb70cb72369933350aed1508ee6347e0731e98148f SHA512 5e69dd920f8169c42db375fcbd4c9e042fa9007759e7366e341ea1c066aea9adeab36e69bd2ee0b94c8e73e1d2eee6df34fbb243cac2374f7af1eb1dbecca868
-EBUILD pyopengl_accelerate-3.1.8.ebuild 1167 BLAKE2B 2daba87dcd530051137a1d4846f8588b867bfa0bcd00b12073603386f51d5ce11608421bd7a9cee9dbb96cedee7f493770c0da108edf28574243b8222a8703cf SHA512 c4291a34607f4cc017f15b490cb2f783d22687a7b97ae73564cff8e4d7f3a4b9cde8d4efe83ba4ef8c5630df3954e74bbd8ab2f502fa302430e69d5aa0abe71d
-MISC metadata.xml 515 BLAKE2B 4a8dfbbf2250df73d9880ed75c4bfd63596e7f276dfd5dc15aff9177ad0b005256237e827bf4a0ce10f823ee1a17651248c1b47961bbd09af0a41b6281214228 SHA512 4f1a5ea9b42ba29e78fc15d2ad40623c63a2f351cc0a5f27eb7f8173155278bf214d5ac0f2d348c04967a99b2bb1f2c4b596ab8741a17cd891b2c34065ef0e35
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
deleted file mode 100644
index 343c45b8fc31..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.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
-
-MY_P=pyopengl-release-${PV}
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="
-	https://pyopengl.sourceforge.net/
-	https://github.com/mcfletch/pyopengl/
-	https://pypi.org/project/PyOpenGL-accelerate/"
-SRC_URI="
-	https://github.com/mcfletch/pyopengl/archive/release-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/accelerate
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="numpy"
-
-DEPEND="
-	numpy? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	rm src/*.c || die
-
-	if ! use numpy; then
-		cat > "${T}"/numpy.py <<-EOF || die
-			raise ImportError("building numpy extension disabled")
-		EOF
-	fi
-}
-
-python_compile() {
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index cd139dbb1f2a..f962bcafe9df 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,7 +1,7 @@
 DIST pyparsing-3.1.4.tar.gz 900231 BLAKE2B 121092316528a69f79a8fac5e903de513c4193bd00d5ef7e98dfcb09f3a48eb3384217ede39b0f954f58bdade8644931ce8cef41729539fc1be3dfb910b90be7 SHA512 b475e5571510cd7b07fecbc8ae583b1e75a6308b64018d2884570dfa461e0529b96d02d11403cecac41f92b5d802a5dd4bbf9f8321d58ffa2d24cb89b86652e1
-DIST pyparsing-3.2.0b2.tar.gz 913100 BLAKE2B 50cb171b9fec23d04ea30b649f98dba605c317ea50a07a94f4391a63fac9f177421a910b3d52010238692ebae4dce0d236f9f32676db1402514dc5d873a4fae1 SHA512 401d80d7ffffb5407d26a80d1638c0c9516bf242d8b3ac0d0947914105a6b42cce355cc52002921103aee7b668042179be43ea3929b2cda9cf21da99aa0f971e
 DIST pyparsing-3.2.0b3.tar.gz 914295 BLAKE2B d542366991972641d5bda7b2d7c1df7de9239d4f8cfdae5ce68d6e763cbc8d5fe87d0bfea18d2b13a6b53d15fa1e97f0d0a9f73735fcb7599f1514f4e1c0e4a6 SHA512 8d743d79f5b099330c186a8a5671d284254db314648ce4f59ce28795122561489d1015419a8ad14dae46d62d1c0c7ffd72b366320ea1e84d4a13655bc8d62e95
+DIST pyparsing-3.2.0rc1.tar.gz 915074 BLAKE2B fd610f3bbbe4a7e775b028a66fea60457629d9a8e518cf03ad26efe77cd9dcae71a3e8d9406d23d1185c13777298ae42ea84b8f41ab238d30904c84e9a07806b SHA512 9832190566327684390e485d1ce2392e39bcc31f72ab31f0868b9a17c53b5ccafdb6195e985db32180f8e14be18644f5dfb139aea1b23cc4f0ced09168245e4c
 EBUILD pyparsing-3.1.4.ebuild 1556 BLAKE2B c3d4c88a15e649fb1bd22194f172d30d9ff5ee6405e9f5ebdb9f0e26366fd68bd945c1ffe784d7975e9794e0f398e1eeb186a658d67f4c5ecee7ab0b9fdb6ce3 SHA512 9a0a5d53ae39e7a3cdab44f87dfdb584abe3907b73836c78823e4801cf33639c127256b02513e7fabfb829b95c14a7e14ffbcba1861a9df5e898cb6e15fc6cbf
-EBUILD pyparsing-3.2.0_beta2.ebuild 1846 BLAKE2B 9a714261a850546e271297be99e44867ffb0e4d7431772a682a4ebfc7cb5b7e6f2c4fea40f3eaa9610ba602eeacf8282e63c0633ca24a96b073bd7bae4abf8ea SHA512 4eab8fc2f09a9d4afa34563afe85e7aadc53409e705cce4fab9bea3526066f02ea75ffb6edbf23056cbd14c688fbd10ad618ee0cc9eb580b6c799014b7cafca1
 EBUILD pyparsing-3.2.0_beta3.ebuild 1846 BLAKE2B 9a714261a850546e271297be99e44867ffb0e4d7431772a682a4ebfc7cb5b7e6f2c4fea40f3eaa9610ba602eeacf8282e63c0633ca24a96b073bd7bae4abf8ea SHA512 4eab8fc2f09a9d4afa34563afe85e7aadc53409e705cce4fab9bea3526066f02ea75ffb6edbf23056cbd14c688fbd10ad618ee0cc9eb580b6c799014b7cafca1
+EBUILD pyparsing-3.2.0_rc1.ebuild 1846 BLAKE2B 9a714261a850546e271297be99e44867ffb0e4d7431772a682a4ebfc7cb5b7e6f2c4fea40f3eaa9610ba602eeacf8282e63c0633ca24a96b073bd7bae4abf8ea SHA512 4eab8fc2f09a9d4afa34563afe85e7aadc53409e705cce4fab9bea3526066f02ea75ffb6edbf23056cbd14c688fbd10ad618ee0cc9eb580b6c799014b7cafca1
 MISC metadata.xml 797 BLAKE2B 9707adcde7106fb0726de82da965fc3aaf7a23b34f4b71cfea4e09bd03cb44c069ccd4d16e6a6f37eca4720ff8c52d0bc11c864bd7dd9e6995d0d25cb92c5cc2 SHA512 0f791598d2b4a37797e7f917be22093f01020cde34876d7d0db3d1b2bf5da8a18d5399d70f381d98ea569f8c3abf7f1cff8b3cc92fbab39bb00f329a58e96229
diff --git a/dev-python/pyparsing/pyparsing-3.2.0_beta2.ebuild b/dev-python/pyparsing/pyparsing-3.2.0_rc1.ebuild
index bd3fdd7b49b7..bd3fdd7b49b7 100644
--- a/dev-python/pyparsing/pyparsing-3.2.0_beta2.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.0_rc1.ebuild
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index c6ba67672545..d4f7e606cc28 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,7 +1,4 @@
 AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
-AUX pypiserver-2.1.1-test-offline.patch 1431 BLAKE2B 0a96f83ab0d2850128abf92fbb6ba8e34fa97340a28f901c1579c1f06d8030d9011c25639aa6c57044dc838286e4aa02dcfe3f2448ab10e4a2b5a1521b7a52d8 SHA512 2e273ecd662a4471bff2bf1245ac94a5e610b0619ae1534dcd503132456c0f86c761103aac2bbf095e2ddbcdf8c287ae72fd180f37d22eb5ef336e5a79f1feb8
-DIST pypiserver-2.1.1.gh.tar.gz 157393 BLAKE2B e80c73b2422dc87bba09d8c9c2e1ffc72017ec58c5530d3debb95560b50a776e1603cb5641c7e4af1ed87d64750843ae025a6a47ab4cc28ce0de1051dd5b214f SHA512 d85afb0d2c85c76a62e393d7d7824e91ff052a04e985278db48010b6f71d12c7749139245e69932b78aefbf3152ba8a8b463bfcd21d1772d047d64f0b164681a
 DIST pypiserver-2.2.0.gh.tar.gz 158107 BLAKE2B 8c5e68201a4d376bc04ca8a5dc243c8c176f6a1bfd362fd5b0eb2875ca071cd124d15814312c2c14ded57c8476f72d41ccf1057eced2247d17f1cc6b7b12e86c SHA512 e1c313b52c852b90ee3efe07b754d91ac842483718fe30f0c59951aad9aa84bc36c9264956fd931a98aaad5ee151089a06472f19e4ae5e9eb1d20c72cc98f436
-EBUILD pypiserver-2.1.1.ebuild 1932 BLAKE2B b519465879cd65bc8a73dfd903e0ea1954934413dde8e3db54c2d5d2b71c4eb50010c237df7dd0223936b54657df5ed3592920cd274f4e80993a0fc6315b8434 SHA512 5e6b32555b731072f2e8d3032f445c5d73c913c157716396a3ed52b146ac8875b6dbceb5ea59bff93f0db85ca1ba074fc0bb316c58e9f695a8a22916c20d0a55
-EBUILD pypiserver-2.2.0.ebuild 1854 BLAKE2B 697e02ff88b6de77425dd88e0d1c430d948913cdaca1be69d0eec5c6cae22ba40d0e64d9e11ada545baa4cc0861798a5d5805c5eb4ea1922d4338a9de605688e SHA512 de8737969d69102b1421f41366bda224def2f9a8720ab7f54c1d788e8bc0bb4df9b741de16f134eda408379341ac8dbed7f6728f1dfab17fe4c843f955e773dd
+EBUILD pypiserver-2.2.0.ebuild 1846 BLAKE2B 4dbdfdca43ca943601998e8f72b425666d03d3c5bbafbef18d09c050d4f5160e740f4655a3326b3a1efddd6351effafc8a4912f321a0ecc9191bf0fb32512889 SHA512 6d68c2224557fb15dfdcdf0e3f4e1693917acb296789c2d9e886e5093b13116ccdbd3d9b66f25c4f07c981f75925ff92d3d008b2dd519509c71faef57052a7f9
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch b/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch
deleted file mode 100644
index 121677beb1b8..000000000000
--- a/dev-python/pypiserver/files/pypiserver-2.1.1-test-offline.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 749ad0f641ac14cc6e8485ed0b4fdf6aacb6f015 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 25 Apr 2024 14:44:16 +0200
-Subject: [PATCH] test: Fix running `build` in offline test environment
-
-Fix the `build` calls to use `--no-isolation`, in order to fix
-regression in running tests in an offline environment.
-
-Unlike the previous `setup.py` calls, `build` defaults to creating a new
-virtual environment to perform the build.  This, in turn, requires
-fetching the build dependencies from the Internet, effectively making
-the tests error out in an offline environment.  Passing `--no-isolation`
-makes `build` use the already-installed host dependencies instead.
----
- tests/test_server.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_server.py b/tests/test_server.py
-index 92ecdda3..99da611c 100644
---- a/tests/test_server.py
-+++ b/tests/test_server.py
-@@ -148,7 +148,10 @@ def wheel_file(project, tmp_path_factory):
-     if re.match("^3\.7", sys.version):
-         assert run_setup_py(project, f"bdist_wheel -d {distdir}") == 0
-     else:
--        assert run_py_build(project, f"--wheel --outdir {distdir}") == 0
-+        assert (
-+            run_py_build(project, f"--wheel --no-isolation --outdir {distdir}")
-+            == 0
-+        )
-     wheels = list(distdir.glob("centodeps*.whl"))
-     assert len(wheels) > 0
-     return wheels[0]
diff --git a/dev-python/pypiserver/pypiserver-2.1.1.ebuild b/dev-python/pypiserver/pypiserver-2.1.1.ebuild
deleted file mode 100644
index 9683d7a48f57..000000000000
--- a/dev-python/pypiserver/pypiserver-2.1.1.ebuild
+++ /dev/null
@@ -1,79 +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
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="
-	https://github.com/pypiserver/pypiserver/
-	https://pypi.org/project/pypiserver/
-"
-SRC_URI="
-	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/bottle[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
-	>=dev-python/pip-7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib-resources[${PYTHON_USEDEP}]
-	' 3.{10..11})
-"
-# NB: many test deps are optional/specific to tests we skip
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-unbundle-bottle.patch"
-	# https://github.com/pypiserver/pypiserver/pull/571
-	"${FILESDIR}/${P}-test-offline.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove bundled bottle (sic!)
-	rm pypiserver/bottle.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pip_install_open_succeeds
-		tests/test_server.py::test_pip_install_authed_succeeds
-		# seems to rely on internal bottle details
-		tests/test_main.py::test_auto_servers
-	)
-
-	if ! has_version "dev-python/twine[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_server.py::test_twine_upload
-			tests/test_server.py::test_twine_register
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/pypiserver/pypiserver-2.2.0.ebuild b/dev-python/pypiserver/pypiserver-2.2.0.ebuild
index f44e272eb10a..d48c2e03b2c3 100644
--- a/dev-python/pypiserver/pypiserver-2.2.0.ebuild
+++ b/dev-python/pypiserver/pypiserver-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 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/bottle-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-api/Manifest b/dev-python/pyproject-api/Manifest
index 9da31e87d44c..902b0a09f60c 100644
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@@ -1,7 +1,3 @@
-DIST pyproject_api-1.7.1.tar.gz 22271 BLAKE2B 833001e4638594e61ba8dd97e2e62dffd25650cc30cbcdb9367f09605e128733d7c8945afeadc5ba16d15e932da0cc60eee2715eeef21290c04a73f74165e748 SHA512 e016d612578f46dbb5ab9d406d01513d8e1528524dcb58c4ebe76c5d7518289da187bed0e500d382b37aaac0e38236d54a88e7cc1f3a2a6876088b26d17337a8
-DIST pyproject_api-1.7.2.tar.gz 22353 BLAKE2B 483400bd8c79da5e3eb54ee42bcb74e6507824f3f7bfcbf5a9172c942af7488dd9896e55eba8b4153e250ddc549df8e0f56576e63b6ce472c1bbc2e0ea8ae344 SHA512 4e331249e0a6e38bcf0baa4143c0fef455e91e3b1c422233b813aa3fcbe81a7f67ce3c6f969a313e636ae19dbc4192e59add946fb57dc43907d27538116573d8
 DIST pyproject_api-1.8.0.tar.gz 22340 BLAKE2B 7087b04045870ab6ec62dbd93ca59fbab6a9200f1eb20140ac28355b6f88a719961949f06c1cb888b4ef2d9ad61c2f533cf4e361c64e34c04faf6d0db7762090 SHA512 9a598179cb31694c862a91040c453d767ecbddd7aed4156f044d6684316294e962bdaaff646cd8c9cf15af204efc9a03dbc781058610c334c7ea2f2df54f1883
-EBUILD pyproject-api-1.7.1.ebuild 1049 BLAKE2B c90c0616375fcb653c76ea01796d9f4f7be5ead8611748c3b29c853c14725032a8a969d494d9c894a1a02f07bd5008ffb7e5a9cc522284111280f926276d3639 SHA512 a0ff339f469d59565e1a4e501de37fa672384a017e33df66f247c5e1f92ba7266c9064842e86d3337b0fd1040885291ee395fb03360801fd80d0b9b72993f312
-EBUILD pyproject-api-1.7.2.ebuild 1176 BLAKE2B e3bf487362a33d681dd874360d7cfe8553b58624f0907f4686b28cedc5f1e8bc530f5a9e15dbcd587c6b772ee9cce2e8cca11298e7e70bbc922caa8f92e47a3b SHA512 0825117463901ecdbb943255c1acc79e7f5cd26922a923892378b2782f86cffdbee124fd8ddfefb7bbf1e6ba2dcbcd340e03ba81116bbd2cc455182cf11738fc
-EBUILD pyproject-api-1.8.0.ebuild 1176 BLAKE2B e3bf487362a33d681dd874360d7cfe8553b58624f0907f4686b28cedc5f1e8bc530f5a9e15dbcd587c6b772ee9cce2e8cca11298e7e70bbc922caa8f92e47a3b SHA512 0825117463901ecdbb943255c1acc79e7f5cd26922a923892378b2782f86cffdbee124fd8ddfefb7bbf1e6ba2dcbcd340e03ba81116bbd2cc455182cf11738fc
+EBUILD pyproject-api-1.8.0.ebuild 1168 BLAKE2B ef31fc7265c8239ba959b345860233455d2b8f136b53466992272da85b86cc7b0a8c6db3cc1dae4ec2374b89daa2b6ee952347f90dd9b4343d36dcaf2546bb4f SHA512 e0f4ea9f720388cbeaf3664639ebce89daa17867d052d938bb2a76053052e3c571a0204076bb945fc10c91c42f57f6ddbbf6a526c04a0e5a4533dfd109daa02d
 MISC metadata.xml 402 BLAKE2B 97a109aafbedae6881b392c32a4b92d84e48561721750c2c0ab27742411d8615262aca179ca3cbe8a7bbd9e11bfa4369bc57497c143790a1911151af72245431 SHA512 52d9c21cbefa6e49acfb04bbf94e61e6a211dbdd369da1cf8893569964edef5862df18d7180023da9b56ced091c6baa597c5d6d07ba905a04ebc5c2a481e6178
diff --git a/dev-python/pyproject-api/pyproject-api-1.7.1.ebuild b/dev-python/pyproject-api/pyproject-api-1.7.1.ebuild
deleted file mode 100644
index 6725ddf71091..000000000000
--- a/dev-python/pyproject-api/pyproject-api-1.7.1.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=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="API to interact with the python pyproject.toml based projects"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-api/
-	https://pypi.org/project/pyproject-api/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.11.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-68.1.2[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.40.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# hardcodes assumptions specific to setuptools-70.1.0
-	tests/test_frontend_setuptools.py::test_setuptools_get_requires_for_build_wheel
-)
diff --git a/dev-python/pyproject-api/pyproject-api-1.7.2.ebuild b/dev-python/pyproject-api/pyproject-api-1.7.2.ebuild
deleted file mode 100644
index 7ebc016f7130..000000000000
--- a/dev-python/pyproject-api/pyproject-api-1.7.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-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="API to interact with the python pyproject.toml based projects"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-api/
-	https://pypi.org/project/pyproject-api/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.11.1[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-68.1.2[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.40.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# hardcodes assumptions specific to setuptools-70.1.0
-	tests/test_frontend_setuptools.py::test_setuptools_get_requires_for_build_wheel
-	# some minor formatting mismatch
-	tests/test_frontend_setuptools.py::test_setuptools_prepare_metadata_for_build_wheel
-)
diff --git a/dev-python/pyproject-api/pyproject-api-1.8.0.ebuild b/dev-python/pyproject-api/pyproject-api-1.8.0.ebuild
index 7ebc016f7130..ac45a470b9b3 100644
--- a/dev-python/pyproject-api/pyproject-api-1.8.0.ebuild
+++ b/dev-python/pyproject-api/pyproject-api-1.8.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/packaging-24.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index a9680ffaf3b2..840b6b7fd922 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -5,5 +5,5 @@ DIST pyproject_fmt-2.2.4.tar.gz 9140 BLAKE2B 19397db0f7e2a51391f99824645c73361ea
 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 825 BLAKE2B 663b63a459376f2e7a85cb721a0827d92230fef8e9924f556659841045b5ce1dca4a9e089cc37c159be7f9dd7e5837d209f33cf76f02a86f65327ff04e780580 SHA512 cfc628332a07500a8fc02e248fa10dafc848113b22f8a62b8ece22cd79783ee7318a7efdac3fcc5d5d228e9a150d6bd70cbfedff6dbd568d3e1cfbbaed3c32c5
+EBUILD pyproject-fmt-2.2.4.ebuild 821 BLAKE2B 4232cc2893892cc28f463f363d4104a54e80895a2aa8ddea6fb43c30d5af8446f6cf353547146ca18fc5131ea4a1e62faf6a5e794094dedf953b5266cfc2a845 SHA512 cfc929eef6920b7f3fbe962b38965361c817031d848323deff209698739ba47f9f95e80b18043a9ff7e144f5d3577591fb9b1a3bb928e395d8053b407668a2c6
 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 6596694032a6..d2caf7694ad8 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 b3ff5db934bc..c1687edfd2c2 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -2,8 +2,10 @@ DIST pyproject_metadata-0.8.0.tar.gz 14862 BLAKE2B 03c9a7fc9c53c56b27ea5c72789db
 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.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.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.9.0_beta7.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta7.ebuild
new file mode 100644
index 000000000000..d6ad0b0f270f
--- /dev/null
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta7.ebuild
@@ -0,0 +1,32 @@
+# 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/pysol-cards/Manifest b/dev-python/pysol-cards/Manifest
index 79b51dc29307..fa1259c6e04c 100644
--- a/dev-python/pysol-cards/Manifest
+++ b/dev-python/pysol-cards/Manifest
@@ -1,5 +1,3 @@
-DIST pysol_cards-0.16.0.tar.gz 18987 BLAKE2B 5f4174462aaadd75b325a6c3e7e16bcc8e9694bb2e9a45eab3caa325959b1870531b71332728851bcbffba8f5a2022ae0a5b2fd81b75212a77e3fce8177d128f SHA512 728e76017cab27b5e67ed234951bff0608285caf1a79ab5f60a72d58530f4107fdb28749c4a2b4744830ecabaade1f413ad657149afa6aee8cb792b5dbcc8bce
 DIST pysol_cards-0.18.0.tar.gz 18103 BLAKE2B a74af33d566255f40234f3f22f8232c3bc60438a27fbd8144d85da7984d660616ac19474036a29ddc361afd4b61b2ca8835331729fdd0cb8fb312ae3e990dbf5 SHA512 baf2a5db425d1e687a336f8dd7b15b25be82e8dbb4c02f00f882fdb915fcf81c03ad1f39d22d5177b1429cc709baa47463cab39c55576df135534f5f87f31665
-EBUILD pysol-cards-0.16.0.ebuild 535 BLAKE2B 2d3d0e6f757533e57489baf17bd8d69733453e6cd634aa66672b6713e79cbec85c3b81d66b663e604cb89dadb7fc4531e7dfd353db49ce6616e869f2ea45e813 SHA512 d48f405bee4e45080a1ed55aa9f27e91df677b9124f1bc1943ed8cd4e67029635cf7e9b01c11d1066adea8444bcd1ac4940fff8b12ff310a67186fd386f22579
-EBUILD pysol-cards-0.18.0.ebuild 492 BLAKE2B e7de0a6def9d209bf762cc28f1d43f42b583da7a077bd0a5189f35431f9e8891c30a88fe7371267ffc0f0e99f517afde0366b8620b728a31f77870f3a0967c13 SHA512 8b31faac86614c68f6ab67ac79ad3e8125b550b9e7ab11c9e40b3e8d66c18b27fce11ada687980f6909accd306472d946245dbd8006c1951ce4006fa73c9f02a
+EBUILD pysol-cards-0.18.0.ebuild 489 BLAKE2B 8987169d82ecfccd93f1727af2fa7fbd527a86fb68248eb9c4a9ba37136e4c563f5a57c1ed25a78bcafe0b06628c6cb3e21273df81373ef258189cfcff5982ad SHA512 162d86bd2b270603f9d6212df9c5d8e8dac17482026960677fdebdf351fd65981f16d7f31f319fb3ad7dc64b74bc008a4018be7d31e6fcb31c5cf9230eeba7d3
 MISC metadata.xml 474 BLAKE2B 47398a90962b1059e1d2725f7b20dbc10586cee53ab27eff6a9d0c8d93cde1b103580494a38aad77a3ae04c7f7a95bcbe52722ce18476a77994e49cb64076e58 SHA512 b8cba71875a546d130fbc94e3a76a3e0dd27552ce14de46a8b6bd79f12584b59ea8e9354fadd272c4e21ac9df7f43e9c1db9087338acfbed3dc680a6d812ffa6
diff --git a/dev-python/pysol-cards/pysol-cards-0.16.0.ebuild b/dev-python/pysol-cards/pysol-cards-0.16.0.ebuild
deleted file mode 100644
index 91b3b33053c8..000000000000
--- a/dev-python/pysol-cards/pysol-cards-0.16.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="
-	https://github.com/shlomif/pysol_cards/
-	https://pypi.org/project/pysol-cards/
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pysol-cards/pysol-cards-0.18.0.ebuild b/dev-python/pysol-cards/pysol-cards-0.18.0.ebuild
index a987f50080a1..504a50105223 100644
--- a/dev-python/pysol-cards/pysol-cards-0.18.0.ebuild
+++ b/dev-python/pysol-cards/pysol-cards-0.18.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/pysubs2/Manifest b/dev-python/pysubs2/Manifest
index 5cc4a108e88a..e6a555db4ea7 100644
--- a/dev-python/pysubs2/Manifest
+++ b/dev-python/pysubs2/Manifest
@@ -1,5 +1,3 @@
-DIST pysubs2-1.7.2.tar.gz 1123677 BLAKE2B 771e05b41eb9da3f18ce932988b7cdd60d461e49cb9a9f03129dd5104a7e1161c8fae898169d737652c7dd596fe3f92d93ba3a6ed082090b9a8d8825cc033f06 SHA512 5732cbd5bfdaeb1c680b4107304d4b94e1e0c7cc43483a71581da03b7be840fcf95bae8d2b5691b8c88ee59f34e6f587033266e24014778f71393b4c78bb08bf
 DIST pysubs2-1.7.3.tar.gz 1123849 BLAKE2B fd630ca7e4bf2d84d65a2ed2f143c6c1cc333ae6994f7c89a86db2f92c5736e70e488115ccd17cea84dedaa057b8d808bf2fcfdedbb3de0781341ac632a12235 SHA512 5ba9675121490628b0df86e0fd46f67c783d7494e59d37e52be49593b292104756d03368cea19d238c503ee8c05ccf5c257723dd5f570af0bcae5cd53243f62a
-EBUILD pysubs2-1.7.2.ebuild 440 BLAKE2B 80978925423851c3a394b13a655e922eb188b7538b9c26f3f88d9b3c4fb9788ad99138907e594049aeafcd9b39da242e655f53a1eaeb224b489f6cc7746b720b SHA512 dd3ec7621fe71b2ce73bf06f3cb592ec9ea960440af5d63f7ceec9ea560d7fb8bbf3bba608d529f43e4712db37a029ed221cf5a303513e54361be0ccca17279c
-EBUILD pysubs2-1.7.3.ebuild 441 BLAKE2B 89cb7180d62ece5690c76231299a9f13e14d5a57876ce78e6329f7a08186fe277323fcf0eb609b46d0ca77f3689ae80c513cfe32ee75a240e893228378ee53ca SHA512 5e893754b6b4a213693ce2404f3d27f9342c3704cee54287475852bb42c38d3c341869beb2ba9260d70d4aae9382613bf3d935719594fb69737d5b5d86a9a991
+EBUILD pysubs2-1.7.3.ebuild 440 BLAKE2B 80978925423851c3a394b13a655e922eb188b7538b9c26f3f88d9b3c4fb9788ad99138907e594049aeafcd9b39da242e655f53a1eaeb224b489f6cc7746b720b SHA512 dd3ec7621fe71b2ce73bf06f3cb592ec9ea960440af5d63f7ceec9ea560d7fb8bbf3bba608d529f43e4712db37a029ed221cf5a303513e54361be0ccca17279c
 MISC metadata.xml 492 BLAKE2B eea04acc0f0f245001a7d239195a5c425f46823b0caaaa7cea3cea0264d661db91592a33a7666bb9c63b5cbb944d9fe8d55d147d0f90c65cc0f7b9770620c8c8 SHA512 2a669779c4ddb7548cf4c9ebfb72c17c08ff6f0b75530486d0f88bb22b36c01265499dc0e779df73f6386c49ff174f3fa769239eeb93ce6f8adbbd0c886133e6
diff --git a/dev-python/pysubs2/pysubs2-1.7.2.ebuild b/dev-python/pysubs2/pysubs2-1.7.2.ebuild
deleted file mode 100644
index 7ddb7e4dcc43..000000000000
--- a/dev-python/pysubs2/pysubs2-1.7.2.ebuild
+++ /dev/null
@@ -1,21 +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 library for editing subtitle files"
-HOMEPAGE="
-	https://github.com/tkarabela/pysubs2
-	https://pypi.org/project/pysubs2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pysubs2/pysubs2-1.7.3.ebuild b/dev-python/pysubs2/pysubs2-1.7.3.ebuild
index 7e320c75c063..7ddb7e4dcc43 100644
--- a/dev-python/pysubs2/pysubs2-1.7.3.ebuild
+++ b/dev-python/pysubs2/pysubs2-1.7.3.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index ab34fe9d3f04..c4f36167bbaf 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,5 +1,3 @@
-DIST pytest_env-1.1.4.tar.gz 8898 BLAKE2B 8e6d9af2de86af47b5429e64112f7bbd4824fa54a7ffd2a7deb63da2032f6104587594a9efcddfc56a4dd7ef969b1a6cb4150906c029437c960ad02b0e215513 SHA512 9cde819b4f68f1a19de58c86651427c608b160bdfb6b6e12c6f4b90f195a759573e442d92df08f70b807282d4b47a7c078fa0b4674433d8778a9b8fb5552209e
 DIST pytest_env-1.1.5.tar.gz 8911 BLAKE2B 77195479f0a7bfe7b82b164f30c73e37f05002b33b19b605a056f476d02dedf8ed7eb0e116fe88c00dff2732f31d271539389eb790bcd4602c62f93e732530e9 SHA512 8f7df6d823067f55b3e761acee76744dc64e2e0f0c1e19ef5ab4db3215e92843279742782e654e652af025126f6c31ba86a54e3ef9e2223ca6057fbdc136ddd1
-EBUILD pytest-env-1.1.4.ebuild 940 BLAKE2B f85b29c33eed24bf8e8126ac6a973573836845e16c0ad93008fdcf9be25f7d531ed599aadf9e4bfa10261adb0e76eedb7402ad67d1adbfd35917135ce30e3dca SHA512 6cb7c707e0f68f5050235452b656c8f202163ce848a064093bb920fe782bb552fe22a90ace3692b60620a55d5d86719f0c129655ffbb5e34eef91db6d4e610b1
-EBUILD pytest-env-1.1.5.ebuild 943 BLAKE2B 8135dcab5bd7a76146fcb591da1ee97349869b7779e2203fe3e97dbdb2f52653a75163454d221a82230d688412970d46a86ab44f744f167e63ccb07f49f94814 SHA512 7a66b2f55ef647ca5658e42905953ef547ec4d0d3631d85444941b3700e9d0b4ee36a7391af2c44b3f44c771c3336a6629368dd5e92254ffe3191b9f5a5e865a
+EBUILD pytest-env-1.1.5.ebuild 940 BLAKE2B f85b29c33eed24bf8e8126ac6a973573836845e16c0ad93008fdcf9be25f7d531ed599aadf9e4bfa10261adb0e76eedb7402ad67d1adbfd35917135ce30e3dca SHA512 6cb7c707e0f68f5050235452b656c8f202163ce848a064093bb920fe782bb552fe22a90ace3692b60620a55d5d86719f0c129655ffbb5e34eef91db6d4e610b1
 MISC metadata.xml 399 BLAKE2B 15d67070d9ef65f186a5f67370347ed3a8eff0cbb81f292c3beb78ae34b336227de60d9fbd18ee30ead66a7d11a14910c166b961efde1e52a8aa24051f7f1ecc SHA512 a0271a2d9ae0ff90f3f1356ece7c0a95232a75b9dff094caad01758e837301152f8d7b10d8d8e228e0bd8daeece779b9d07294334e0e2067884c0b3cf09c9106
diff --git a/dev-python/pytest-env/pytest-env-1.1.4.ebuild b/dev-python/pytest-env/pytest-env-1.1.4.ebuild
deleted file mode 100644
index fa54db79d65b..000000000000
--- a/dev-python/pytest-env/pytest-env-1.1.4.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=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin that allows you to add environment variables"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-env/
-	https://pypi.org/project/pytest-env/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pytest-env/pytest-env-1.1.5.ebuild b/dev-python/pytest-env/pytest-env-1.1.5.ebuild
index bfda9aab1b32..fa54db79d65b 100644
--- a/dev-python/pytest-env/pytest-env-1.1.5.ebuild
+++ b/dev-python/pytest-env/pytest-env-1.1.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 43a163cb324d..99133472cfc9 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,6 +1,3 @@
-AUX pytest-httpbin-2.0.0-certs.patch 3725 BLAKE2B 4460298caf15ee802a350cb9525942523a89812ea74482fe38a232f05dd4da440faf326ae1cf9ab6e2ff61fc17b46a5ee79b7c55640d1950a13360ec8ead15a5 SHA512 1beb28d59e520737cd13c0735c350969fd8705c2641af7fca458d9011c674a3e3e3b063035262b0ad1fcc30a09101f23bdf4badc58618d5f5bb488b13b11e3a3
-DIST pytest-httpbin-2.0.0.gh.tar.gz 19799 BLAKE2B 7725bc958417c076ee920abce83bdad8295bc4c9551500040867650d54c306e79a1ea92b013124b793058103fc9685dbb2202be5f1b2da935509f68457d63d68 SHA512 62876590bacae6601739f5cc2eccb087024e16731afc9613b5e6928c2a2f64b73418ddcb3c4f13a4bfe1f074510f922d85411d05ebf66f123a4a09d535771b64
 DIST pytest-httpbin-2.1.0.gh.tar.gz 13140 BLAKE2B d1108b8464dbc1075007b4695810afe46fed17b51a785f12dfa184ba27efcfe88818ab8073c050334398eecfd647cd9169ef2d053e3fb424a02ece8a8d8c1518 SHA512 849985f170318ea3ad1d2af8811f3e3fef0e62bd6bdc611f061a8cd7d84a2d85d0ba9caf8c97298e1c99b979b08f1a28476927fa7abc1fa57334732ecfbdf2db
-EBUILD pytest-httpbin-2.0.0-r1.ebuild 1282 BLAKE2B 5884fab595e91281aeab2101cf6a76a491beb4cf01a8694db609c23efa9a5ff94b797ae9cd2df61fe07c2cf1f3fffa4037a2cf925fd22e5293379992adf9e12a SHA512 91eab00fece133d0ee95b7215fe63c7d02a502caf388fc673e7ad112b69c7e54172296f16d7c9ebf94817e61ef4ed775cba07a3b17aca1a75ac9095f9c19b6bb
-EBUILD pytest-httpbin-2.1.0.ebuild 783 BLAKE2B 3174aa1cbfb122262603dc7ed4aa18a0e7be88e13b9fbc57cbf73473c0c6acdbabe77f9d821779b28cd009debeab1033fc9559cb97607f313a271c9775c5b66a SHA512 489dc7aef06317ab9411320adaadf9e9bcbf22f75712aa2ab41d857a49ffbc832bd3c58bb94eda4659df61eaac584f577658241879672951e6f1b6974e6b0ac5
+EBUILD pytest-httpbin-2.1.0.ebuild 775 BLAKE2B 5959990a43abae9366f3e361f55187ad85c1eb0aba5b88af5110a7634d59066a2f5492fe5667e623f00b2b6da7d3352e26a83b8128b0259d1148d43695e4d509 SHA512 384ac0f63bbe42a024210aaf659ae7aea6ed523d85e5551aa93a3a0ec192df453693106d7f2c0f67ba4c84e38f4546ae374c77fa717581fbfe676da02f94f879
 MISC metadata.xml 547 BLAKE2B d60e6b3e6c7d0c37dcc42dcffeed9e08fb7ad3dec5e4f5fdc0ffd1f7a2c46d89ef57a9576028457ee433d0ecbd100ae200ef507b22bb326838732751a7c644fc SHA512 4629dfe7e4cf27d5d52e7ce3e646f590b4d80a490c638cb035352416a587b494328d3f23e088d13ae1677c415080a7249301d9830be0cfbce7a44023302bf582
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
deleted file mode 100644
index fbf8814ea63e..000000000000
--- a/dev-python/pytest-httpbin/files/pytest-httpbin-2.0.0-certs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 7bf62b4e8848ce0990cb8d09b8b630dc4140f41b Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 30 Jul 2024 11:52:27 +0100
-Subject: [PATCH] generate certs with trustme 586f775
-
-diff --git a/pytest_httpbin/certs.py b/pytest_httpbin/certs.py
-index 75444d5..230f41b 100644
---- a/pytest_httpbin/certs.py
-+++ b/pytest_httpbin/certs.py
-@@ -15,7 +15,7 @@
- def where():
-     """Return the preferred certificate bundle."""
-     # vendored bundle inside Requests
--    return os.path.join(os.path.dirname(__file__), "certs", "cacert.pem")
-+    return os.path.join(os.path.dirname(__file__), "certs", "client.pem")
- 
- 
- if __name__ == "__main__":
-diff --git a/pytest_httpbin/certs/client.pem b/pytest_httpbin/certs/client.pem
-new file mode 100644
-index 0000000..7946137
---- /dev/null
-+++ b/pytest_httpbin/certs/client.pem
-@@ -0,0 +1,12 @@
-+-----BEGIN CERTIFICATE-----
-+MIIB0TCCAXegAwIBAgIUScnyyX1CI+ywC6GdKol8IIwuGnkwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBEMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJTAjBgNVBAsM
-+HFRlc3RpbmcgQ0EgI0F1c1VxYlo0bzV3emNvS0IwWTATBgcqhkjOPQIBBggqhkjO
-+PQMBBwNCAARhrRi78wmZY28t3/y8MTDDCsi7Lzir4WaQm96gf4/9kSolBTFVDUvB
-+MkSC7Yged+2bWEzTRERZQLf88uiorUnAo0UwQzAdBgNVHQ4EFgQUHymIBJV4gCrA
-+qv+6Q9pSJFtd7PYwEgYDVR0TAQH/BAgwBgEB/wIBCTAOBgNVHQ8BAf8EBAMCAYYw
-+CgYIKoZIzj0EAwIDSAAwRQIgLf0sybmdbJoTIgZWrU1k11oecQbdkzh+3jFtNEFn
-+zYUCIQCRXjIBDZXtyaywk3DgIggByCQxrrB5vjlnyYTd9vNUSw==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/certs/server.key b/pytest_httpbin/certs/server.key
-new file mode 100644
-index 0000000..fd9fd82
---- /dev/null
-+++ b/pytest_httpbin/certs/server.key
-@@ -0,0 +1,5 @@
-+-----BEGIN EC PRIVATE KEY-----
-+MHcCAQEEIPNMu1H1DN9x0VLZNzO3BFp5boEGyc80XFaR1ML18uFRoAoGCCqGSM49
-+AwEHoUQDQgAEiNIfYxmsmjemcRRpcd4qP+x1yONFBZZli7CEKxg9j3x5j1OJPeyC
-+BQ83kogrxJYLbRjdHUx4VOCEXjffmYhnMA==
-+-----END EC PRIVATE KEY-----
-diff --git a/pytest_httpbin/certs/server.pem b/pytest_httpbin/certs/server.pem
-new file mode 100644
-index 0000000..7c70f64
---- /dev/null
-+++ b/pytest_httpbin/certs/server.pem
-@@ -0,0 +1,15 @@
-+-----BEGIN CERTIFICATE-----
-+MIICTDCCAfOgAwIBAgIUZ9rBQX/YRZFcqXCIzOSAd1D0IUcwCgYIKoZIzj0EAwIw
-+RDEbMBkGA1UECgwSdHJ1c3RtZSB2MS4xLjArZGV2MSUwIwYDVQQLDBxUZXN0aW5n
-+IENBICNBdXNVcWJaNG81d3pjb0tCMCAXDTAwMDEwMTAwMDAwMFoYDzMwMDAwMTAx
-+MDAwMDAwWjBGMRswGQYDVQQKDBJ0cnVzdG1lIHYxLjEuMCtkZXYxJzAlBgNVBAsM
-+HlRlc3RpbmcgY2VydCAjLVdQNWpjLTllQ0U0S0JxMjBZMBMGByqGSM49AgEGCCqG
-+SM49AwEHA0IABIjSH2MZrJo3pnEUaXHeKj/sdcjjRQWWZYuwhCsYPY98eY9TiT3s
-+ggUPN5KIK8SWC20Y3R1MeFTghF4335mIZzCjgb4wgbswHQYDVR0OBBYEFCO99Ega
-+h7pEyFEJVwe09DZzNHDtMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUHymIBJV4
-+gCrAqv+6Q9pSJFtd7PYwLwYDVR0RAQH/BCUwI4IJbG9jYWxob3N0hwR/AAABhxAA
-+AAAAAAAAAAAAAAAAAAABMA4GA1UdDwEB/wQEAwIFoDAqBgNVHSUBAf8EIDAeBggr
-+BgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMDMAoGCCqGSM49BAMCA0cAMEQCIHB0
-+imdD2aQuq4DipTvnFJjmT+w8i3D/Pz8X6bPdkJW/AiATl+m4TW4BE5v1ID3ftDhz
-+ja8s574nAjDAqcSL7otVpQ==
-+-----END CERTIFICATE-----
-diff --git a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
-index c15c227..8310140 100644
---- a/pytest_httpbin/serve.py
-+++ b/pytest_httpbin/serve.py
-@@ -60,8 +60,8 @@ def finish_request(self, request, client_address):
-         try:
-             context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-             context.load_cert_chain(
--                os.path.join(CERT_DIR, "cert.pem"),
--                os.path.join(CERT_DIR, "key.pem"),
-+                os.path.join(CERT_DIR, "server.pem"),
-+                os.path.join(CERT_DIR, "server.key"),
-             )
-             with context.wrap_socket(
-                 request, server_side=True, suppress_ragged_eofs=False
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
deleted file mode 100644
index 638ad7ac691a..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,54 +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
-
-DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="
-	https://github.com/kevin1024/pytest-httpbin/
-	https://pypi.org/project/pytest-httpbin/
-"
-SRC_URI="
-	https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/httpbin[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	tests/test_server.py::test_redirect_location_is_https_for_secure_server
-	# minor exception message mismatch on pypy3
-	# https://github.com/kevin1024/pytest-httpbin/issues/77
-	tests/test_server.py::test_dont_crash_on_handshake_timeout
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/kevin1024/vcrpy/issues/848
-	# https://github.com/kevin1024/pytest-httpbin/pull/90
-	"${FILESDIR}/${P}-certs.patch"
-)
-
-src_prepare() {
-	# remove old certs
-	rm -r pytest_httpbin/certs || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
index 302d6d0a6faf..3fd5fe093592 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-2.1.0.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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
index badf88bf073b..48a998a19b20 100644
--- a/dev-python/python-tests/Manifest
+++ b/dev-python/python-tests/Manifest
@@ -1,55 +1,23 @@
-DIST Python-3.10.14.tar.xz 19600188 BLAKE2B a9e65fff590d56848f55f2d93d8a1c631bb8135617112997fbaea9fc45db1d5e2ce39f00cb29c9428542e523fdf48064bdb9aea144acb7aa7cfe71990b8e949e SHA512 adee638aeca898743da4b8245c0fa1e9b94b516f22e716e60c99038f0bb3dcbf726317aa86656404be1719b5a7c58eb09533720ebc0badbb04bd9a534dd48fef
-DIST Python-3.10.14.tar.xz.asc 833 BLAKE2B 945ada655532d578beba9fdd882cc9cc247e24f7efd68ce172766a8adcb3c8d76bc1f229402405e607004ae0f9bb8e55e4b01867ca712700106d8ec42212cb2c SHA512 450f910a91dd0fb66f99245828983a9234c4a67ea7e653404efa06ce5da1c6667a46329a2d1e276c5a956d2c32d8ae6d8c497a1892102f4a360dae33b135c372
 DIST Python-3.10.15.tar.xz 19596540 BLAKE2B fe62f7c7377136576e73a59b5f0b3c9729f9c958da5c8dd1771e88121fdd1928686166066351fc8ae98c9f97295a85feb7ec44c39317f93ae414244aed8a8f66 SHA512 3c0396b2dae1521315a9b5ce9ad4ab6ede385447922fceb00ea3df75bfd79cb547b9380e936d83c9c1b964e38e16d70e34aec39f4c292853a032407bb6a58063
 DIST Python-3.10.15.tar.xz.asc 833 BLAKE2B 31858fe2d3c8d868417eea66de1cf0b2fc7880e73ea7770b50191b8088bbd1c78485c64d94f6f005d18cef559d7e8e0906cb2a30aa1472d90f5af4cca045970b SHA512 0cac9b78649330a2a35a835d45e4a8a111db45943cc0ae0d24f5d9e03a058b4b739fe43d6cd1aee481dcd415a57820bf875996fa60b81d4d5911588db5adad70
 DIST Python-3.11.10.tar.xz 20067656 BLAKE2B aba211a09e4c083d71574c7537ba98474476ebf7092ddda815f8d355d01605456868a89f0bcc6a9e747f71f914fa0129547de2ae70d8b579c6458fdeeafd23f0 SHA512 6ce77cced1ce90bb5eea38504dfc1bc19c872149a5a63fdd8353ac8c772c54ab7a42176e141c7f6f898d31761bf93e1739b238920fbeefbedd6016ad033c1de0
 DIST Python-3.11.10.tar.xz.asc 833 BLAKE2B a1cbe57e568367fbc5817c983696619f515263a9b37662ca536c4d1132ad336959285bbe3076a251778016966f030d1e259f48accdb0df67c116af0e335acb8f SHA512 3a9efe1dd39fd6883ae3fc8dd7f6e25af7e06c6e6049cf9a31a1a82e6d7c84f85ac838d2a71127977d93ce77233a8bbff86a10a80d24fcee85a4e70fcbd1db19
-DIST Python-3.11.9.tar.xz 20175816 BLAKE2B 4e7cd2c42ee39b5ef9624ebd1798320957e948cb4f23f17fd1530814c60126dbf988846928d4d7d4b9d2174029ab8d4dbaf19e6203da237da4c3212ddebd5803 SHA512 2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a
-DIST Python-3.11.9.tar.xz.asc 833 BLAKE2B fa29f632bae0bee7db946038ee3529bc3bfbe1b2e755b21394f67a3c80911ce8079aaab43a16d88e614a8bfc01fb5105ce3f61c59a5ca44470b0f59787c707b3 SHA512 b18b50e7168b2ca5376a1fa75e50e8baae2026d4f11d4cf613d758f3f17df4610fe4653fb2ac0c5c4ec0f6e630dc6490ad1ff32a2fd0ebd60f9f3bd136207ffc
-DIST Python-3.12.5.tar.xz 20422396 BLAKE2B f127d1e12d12be84d5837282757787be8a0cf702adce29b93622f91f45ba2d8cc0f5db2e8277c86b098623951b302015febd28bdabaff66b30cb06a5ef2b4a24 SHA512 7a1c30d798434fe24697bc253f6010d75145e7650f66803328425c8525331b9fa6b63d12a652687582db205f8d4c8279c8f73c338168592481517b063351c921
-DIST Python-3.12.5.tar.xz.asc 963 BLAKE2B 238167f6b4012136bc4274eee0dd4d958c4ee02d2505f9f64e5bcad15e84a9e9e12a9fc907651083543f1fce93579b752d4ccdf60c8cc421cb43e9034877bf1c SHA512 65ce92272a38cc6bf8bf56fa2a99a830cf5b33b811b1788508e7b6f8b5d3e93e0b143412f829271be40cbb4e7c154f84499239b3e8ab63b2ccf0a5a22d2f84ee
 DIST Python-3.12.6.tar.xz 20434028 BLAKE2B 527fafdbfd0c1784ff72a93cdeb3f49666bae7d9343b6d1e4ef773fc52bd397081b41bec3ee9ed5b7652f28f09f29a1b553424cef26aebfa6c2e13499870bf2b SHA512 e658b0d59b5cfdc591d626e8282b9945759f27ee6fbc8bcb8670737db32ffc11fb832dfed9b0e80188fb5f7f3f39fe6dd6191ab7736376453c9e248321e9b063
 DIST Python-3.12.6.tar.xz.asc 963 BLAKE2B d5f9e4c5053610a1a53769278e69d8a25e2fb047afb2a55dfee67917d8d200ebc159e614327ac87f34a4a9718cb3436b55190322ee231116b26074a78bb72642 SHA512 91a15bb7e8dd26616a2cdabe69c3ee81668cc67cb55a88b2be20433d24c9f8ae41c8f93f67aff2fa5858cd5b94600409cd472bd437a2fd33153483734ecd863f
 DIST Python-3.12.7.tar.xz 20444032 BLAKE2B eed8744261cab3b401963ec5187a8b814adb9a18f8d0a6a3d59c027a83cf8408524af9b20204b0a0861d173cc33c45ae37bb1542a1ace3344dc59c649087ff1f SHA512 4a363d3f852ad8f4fd1484aa4cec35494a3811be48ef67fadb2bdf2e2489ed07dc78fad6ab475257db503ddd64d39f9800f23a1c94b6bbd15b7f632cff0c90ae
 DIST Python-3.12.7.tar.xz.asc 963 BLAKE2B 8c7db3d1971d93a10c611a2e6dd3679d0b331b48df87b5fe410b089061e48753d98af67084d4f051a31ae803fce3aa3c7af7cba9c692640f50068bd1e46f40e6 SHA512 4d0a7a0da2c81888e93d8ff89ca2ed4bb85a7b0bd00f0d54a14e2c201affac2677ef3984d2b5aea253e624f6465548d9032eefdd9033c1eb3864d82cfd8d3df0
-DIST Python-3.13.0rc1.tar.xz 20881016 BLAKE2B 3971a233e9c3c782973e0276740f00f8f2072eeda914663cdf7fa6c5de2437c60c441184344a64e25cab5c71a02c47cf4602dd08f127f310c885386cd887fec4 SHA512 fce7664f3298cfd191a7dc20b7b47acafdc50d058a2814312c94c30b65291395957d701e4661b9bb760417942acb5d27e5b8bb479bcda9a82cf29f53772a2daf
-DIST Python-3.13.0rc1.tar.xz.asc 963 BLAKE2B 1c292362cd133dbbb1df1e0cf440e8adde2bc8db9174e550d5b76a09e80d0dbc11a0250e6f041e54fe58f25dc05f071c7af1aa910ae56ece5eb430502a2ba67c SHA512 3613829d9631f46b1b1ce11bfe5bb7fbfa49d97b639bb883c86737ea6ae8d15c24c526083cafb916011bd6d0b3b5fab2b17afd367edbdce99b32e0b4b845fd22
-DIST Python-3.13.0rc2.tar.xz 21055084 BLAKE2B 017ac82c1938d1fea0a501efb9d1848115648f0472b7cbaa4eac65cf085c3c6410ea83aab2e935952ca1b415d603f4c5680fec7a15ce5b40794b2fdcef662666 SHA512 85e6e6e80970ca38119e4f95880fb12e2d1548e6d60235cfcd7f6aaf08588c483469e43dda0f004b95455c2fb88ca736c313b22ae37eb0d4e6460ef521855c8d
-DIST Python-3.13.0rc2.tar.xz.asc 963 BLAKE2B bb75db12c424b7a05c8c0082f79c1ab6e2ad04440a27d2c964edc073fbdc1c0ac442b0b2a0719a33f8058bc7bc9097eb22e031299f8de5b6d88b74e4e5ece8a8 SHA512 6d80d089b55910628744d21b0382b6441d0550c139dbee71d68a7cd9e494bff1c8235a2a894f3c7a52f9af312480a4001f333e04c9054f32db7eefd2a7d39263
 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.14_p3.tar.xz 22080 BLAKE2B f45ebe4df3dc39a842c93d741ef66fd0f9f7d1c6453d499d59b62eda41f01bc17e109205fedc506963d1f21eb3fbf9478564ff5e1a11c10336f855069a642ceb SHA512 db268f1482e5c46a71ce3aef2c2ab6d458cc5263aec360e61c6aff97f119f4f100becefbb575156b1b0239e591a496cb62a136597fadae8a5b630c7233c0040a
-DIST python-gentoo-patches-3.10.15.tar.xz 15896 BLAKE2B f908b409dbcedeb4e2fa7255d9dedfb8f86f39b9b12612d45662d2305012692753874befa5377e1bcb2e8fc04b54bf206948e12eb7bc357a764c1b1e496e5997 SHA512 a647882ede8d7b97e301e472e91f4573dce9f8bf4e408449444625fdf79859a54fd828daa60c7960721f34c3d6d82e2e45db2c55f2fc093097a0db42f7363b8c
 DIST python-gentoo-patches-3.10.15_p1.tar.xz 24048 BLAKE2B 191c28ad9bc781d6f3077870e8d40ff98a47a64009ecfbbd10fe2b3c5330692181837fd3e9b336fd01f936a39160fc12761b2ef9bc00843248ab978cda2e2767 SHA512 4461e351c991694415e2812e558d6c3d3f79295358623dc955bc0839691a170d95a3efd31c0bf9f0d6191e4184d7b55fdb485b948d591782fef5b060d7660cce
-DIST python-gentoo-patches-3.11.10.tar.xz 8484 BLAKE2B 844aa7a855e3ab5a6307c6bfac9d58faad249ce550d21e8526125dc56b9665dc6fa00530a60efe8f851397d368057400851906e59fec10f6325bd83a51e39317 SHA512 bb602b80eed62ca8477b05665267ec3729fd9a85d9b709f844ad729f496d008a529d05d2ebfe8acb5db5ccb99005260bfe458f6ce0d9d358530670e0970e415e
 DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
-DIST python-gentoo-patches-3.11.9_p2.tar.xz 14916 BLAKE2B a910eae412fc1ce3657272c3c2ea9ef95b8d5711ed4c85b93a35f4ab757b1134bff0f8c8a0071e8e06aac784d0b51e36cd9271f892098cba272da4a4e73317d1 SHA512 5c055186b3a8376f4f602ec5d1f8e7bf0f067bc67295c1cdaa68ce1fb6fb21cda75e22705b8a5a2a6525af67f3b36a82fde5ba6ae9b097a5914ab79a2f1a0fad
-DIST python-gentoo-patches-3.12.5_p1.tar.xz 8632 BLAKE2B 13570bb465002cea3590b06d055b936ac0fcc68f6f258aca99a67f02f0b1cd28396424b686c5e080f593a74a744ff449e7220f51f167a858b2313be4c8b64b19 SHA512 eb9fb2d48236a9f7941fb8938310cc32d216eb01e19277175223b8b1fe1bfd606bde9a3c8bc66ad2e494fb87ce23b0d1acd359c375e4a11a5caae25450c11360
-DIST python-gentoo-patches-3.12.6.tar.xz 6048 BLAKE2B 577032d7aa4bab423781bffad8e64f56b492dc31fbd20acd91f3d28356bd697603dfd47a3a9051538dde2af942ae513727ecea415d82f5082a992bd22b8cb2dd SHA512 6f1037e97bb362a3d04c3ec080dc062c5de6e4b779cda0d88f684422d757acd6fc6f971c7004a3f50bbc0161dd28c3146672f74e0e598066f9a8ba4e0eb2627e
 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.tar.xz 8752 BLAKE2B 79fd69eba63bb6aafe05aaf95a3733a3b66d0e2b86eae8498a4f4b98bd492029f1c197a9f70738d4d17283653921b13fc7aba854223e498cb0093a93228f7f0b SHA512 513deafc50f2af13c88b01f2651899ce1bb5bd52a8035ca3edb469095c910e473b66d9dc120a61b78310a406147436feee1f77dcba32ce85db00979a01431e61
 DIST python-gentoo-patches-3.12.7_p1.tar.xz 10228 BLAKE2B 71cc6034201198d9483414fa362d68b550bfcbf75ca6f44dd8ab9d90b201098a05cbf4799b1db9359f4dc464acfcee9b0ce59045db27e8e9ce916b5aab010448 SHA512 22f9256c28b96723ad86878cbe44da155e280a8df08c6bcc568dc5296aca1a6fcc41ab823ee9e6d34ce5954bbedb76aea7dba2d9189e0558c536e8b2b9a3c8ce
-DIST python-gentoo-patches-3.13.0rc1_p3.tar.xz 15148 BLAKE2B 668060644372e8ddf2d9686796ec304ae7689f5c10ecbc6862f054f96504c418b0e4df28675e4fbb610889f9a665a7a54f23633036b0df35f19f40ef8e6bab32 SHA512 c0cbdf9e0fe2ad29175302e548ebfda1d2af42af0ffeb363eb8b0dc53e1059f5abd7dcd02fd8e9eb9ba7bef2b34b7693633f0a62dc1ab933f43077feacf00fbc
-DIST python-gentoo-patches-3.13.0rc2.tar.xz 5696 BLAKE2B 4e716d1d6225e811b598d029ef1dbdc413df614ef00ab8051ea697e633477a0114a3660cae037bdf4142f76c9f2efdefc25b604af11c31eb77d6d98d8f932cff SHA512 c20b53772bd7d305562657722aec70de78fffbf8ab7939f59d496e06c21b31fcd7b4a92573b1000d3bee4d90fd8b7422543f9cfdad15d60bc9a7ecf2a2259599
-DIST python-gentoo-patches-3.13.0rc2_p1.tar.xz 7360 BLAKE2B be41dfc96c333ca19a4a21f0931287503094676d1eba1e9e5ae86bf07be571fb7ddaf75eab87dc2ce9364ea1861ca5307ae1b8cdbe2c6f9a1a0e351f42f0fb97 SHA512 38b8b5f5ec21d3cf02a4db43929f4dd870200bde655b9b3acd0f398ed0468f9e43996821510cebb5e01b5633afc7e6fc254b0c80062bb577a044d85e25d28ff2
-DIST python-gentoo-patches-3.13.0rc2_p2.tar.xz 8004 BLAKE2B a6d13ad3e306dbe67d21e5242610b824f714ac76e347d5537e891fe9b07016261ec82cfdd849409e5ff0b16dbd52b52c6a586a506b22baddc94621bc7a2b30ac SHA512 78fc8ba72b6b4260f73df02130222d9369feff99846ed94f091ee34418bfd168870089f2b8c58e526a58acf0e59080e7a3c45a7fe5121eab09ca350cb5aa5761
 DIST python-gentoo-patches-3.13.0rc3.tar.xz 8004 BLAKE2B e1ec0d1b0d84fd5875111ed9916879bb78fcf764f6d6c12f570083df9215e0585ff4137636756bf3674f991f3bccdd859ec21d37c4b6a8dd738da03ecdedaa75 SHA512 1495f5f68d6ae10ad676b075cf4540dcdc38b254a9f4309d76097bdda427e06b65df173c99cd9c4f74646a4a29f10faa38a5a0342b1a40c1ebb6f92cf5a6f3b4
-EBUILD python-tests-3.10.14_p3.ebuild 1523 BLAKE2B a64635f4a2e078134c5d216b258e058d1af2af55e8817cb0eadcee7325e31df5e59208eb4158db4a6e99244fbfed6c9ae72fbd4836e7b4891092d131f09f4af0 SHA512 acb8dfd3c41f97fdaaa3cfa24c5f6a63ee44f9c19d2ee140c87d1e63643bb20c9daecd921a127425f2b33482df01a4060ec7ac49b8f49f18f883abe86cb67f84
-EBUILD python-tests-3.10.15.ebuild 1606 BLAKE2B 43c9d3680c815644df042b4a88559651476517f2016dd7fd0f9f14c4fda26d3d676b1d727bd6e5c95347944cd43598e21361cf7cf81d3c0d155c09f6de61cfb8 SHA512 a14d52af3f19c787a160773bba0466cefcad88abd3b241e305a7b1fcb655ce4934d21b619d1cf65003a3a4042654c714300e307a9ec41ac6af358de28b33f97c
-EBUILD python-tests-3.10.15_p1.ebuild 1607 BLAKE2B d5ac322bad70ae7df45029025046ed764831b8e1fac2ea964c7748ba8bab8dcbcbdab96c5700255e8dffe9f45bfbc9a39b38a1798e1dcbc6eadb4172ebfc2c87 SHA512 b81aa0c3f40dbef105f776ed1c9d9bb16e39b44d49772ee90ff6cde29570db0c1d3076f1087783b0d49cc8d2653fd87a90585424fd63fbec7dc3be947b373aca
-EBUILD python-tests-3.11.10.ebuild 1592 BLAKE2B 5e53f35d642471c181cc8ac86bb2016ace0ed6483e30e9a01212fcb1cd4512d5a05aa3bdb2592b2be87826b691edda3a4ea4d75f0bd348a0718feb7637b884ec SHA512 337f5be995d5576c2be5b3ff5c7a757df5166eb8a8d5b75abf0a8b10c7ad915f2f2add3b78a390776ca8f54d6922fd0a8817a4d6ab58e9155df70fee9b580a31
-EBUILD python-tests-3.11.10_p1.ebuild 1594 BLAKE2B 98a4bdaa5acb39f40a299455cc211679251070fbeb5e97e0b1da5cd73033ee1420bd5b3f3b68945fa284dd4cf24b4a2cb668703998a673a7568aa7853bdb7178 SHA512 c20cf134f2be69360fd6e7e8ac585fd56f0641074676d859db65d923e9db6814a664160711e9121cf17c4d921300dec73bfed48570382e5e322fed37b6c42969
-EBUILD python-tests-3.11.9_p2.ebuild 1509 BLAKE2B ac4167b1c09ce7ad912359ada649fb21a6a2c0c03142d339a93cb4626f9c12013d2b010458f25a4b92367d2c33b5baf004cb83cfa0935ae7769cb5cab7c2d9ec SHA512 41ae12386d9c6bd4a7bffcc6738319d3a390fbe1921c45746a5fc6ab25c43498f4df588d4c5a1258cb8725158ea78298fa2d2d7a1b6f5e0e492592f41279d64a
-EBUILD python-tests-3.12.5_p1.ebuild 1420 BLAKE2B 92704f1963320d757fd1e753cc85069cdef4b504fc4e5a275ebd055a1da559470d12fe14645aa41cca03f89a7efc6f67a8fe1b39f9e53f0229c324f0d8582ee2 SHA512 92c37c9053cf161001f26501454888d6b608a6a47e1a5f0a1f1c6fd4e4f7bf88594e712bef7fbc30999df852741a4dcec9fca5cbbb584c71d32fecdf5792dfea
-EBUILD python-tests-3.12.6.ebuild 1504 BLAKE2B d8f1cec8212407b33a927d704c0a8f20eaa6534ce8030f63b7249f90a5be4e805f3234cd9e61272119fd80f20a63f04568ef6b4977cecf02796e6412019aab35 SHA512 9cf7db4388ee4d2f0cb65585dd650a702c990fcc9d1ffbd4fe029b0d26e39d4adab03b4c49508e5d406aefa981af94d38bc8c767ead0825e267494714c150482
-EBUILD python-tests-3.12.6_p2.ebuild 1505 BLAKE2B 1663242777e3f433b315e8e47025a8430f88f689d75d93d70cf91852f3200b1cd98225c8bcde7ffe403d2843c0ec812e54fa757e7e5e24c0b8bee057bee003f4 SHA512 eefc970f7ccebe40fde130e830f9ace079924d40e4343b75b38457bd26745e1ed837f576e3fddf41d4338e8e0772891c92462c18f21eec8c9d466934344309a6
-EBUILD python-tests-3.12.6_p4.ebuild 1510 BLAKE2B b3e2dc00626f5e66479205dcd616100c7015d6d171db418b09b2d2e8327f03d5aaadffc416bfd2ac075db049ea12880de4d402da85296f1c0b805931f2fd5987 SHA512 995b665085bf7dc6c63208cfdecf4a6b3044a50a8793db3a9eda49e9c6129abe4e934dc85032f18d37bca46bf578571ebc4465cc0740173f5e0b0ae109bf3268
-EBUILD python-tests-3.12.7.ebuild 1510 BLAKE2B b3e2dc00626f5e66479205dcd616100c7015d6d171db418b09b2d2e8327f03d5aaadffc416bfd2ac075db049ea12880de4d402da85296f1c0b805931f2fd5987 SHA512 995b665085bf7dc6c63208cfdecf4a6b3044a50a8793db3a9eda49e9c6129abe4e934dc85032f18d37bca46bf578571ebc4465cc0740173f5e0b0ae109bf3268
+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 1505 BLAKE2B e2e43e6648370706f8b35f9ff62401831ce1270f8879dde51f8a240eef2e0737418d89e2a5d119051a49ee437de54d05e328d9102c7d381c6c08b4f66ef72726 SHA512 c0f7c416029d89537a8e88391333c66f6b3e463f6c1dcf42e60aa97ec0bcfda16d205f43cd0d1f11bc083f63bc52d42ed3791072cb125cc85b114cc6893b2117
 EBUILD python-tests-3.12.7_p1.ebuild 1510 BLAKE2B b3e2dc00626f5e66479205dcd616100c7015d6d171db418b09b2d2e8327f03d5aaadffc416bfd2ac075db049ea12880de4d402da85296f1c0b805931f2fd5987 SHA512 995b665085bf7dc6c63208cfdecf4a6b3044a50a8793db3a9eda49e9c6129abe4e934dc85032f18d37bca46bf578571ebc4465cc0740173f5e0b0ae109bf3268
-EBUILD python-tests-3.13.0_rc1_p3.ebuild 1426 BLAKE2B c30aea2c2cd004f6fac36aff8cb6a328c37565f0125c1034b8050189764f26201238651d4cc9af3dec8716084cceff0014ebe72b4a22d7a5a26bb252c4b7b2de SHA512 6f7f79d82f030459a75bbaeb92ec5d1b55e7b6617450b02db1ef6f51fb7468a9a9bb449d8e70f8efc6cb5a4f34d4aabd4d1191030adf67e4478341a0307ca632
-EBUILD python-tests-3.13.0_rc2.ebuild 1516 BLAKE2B ef7ae9677e2d4d56e2f6dfcd57d7f3cc35882a53bddb994a80ae294de92c206a96599e15e558f7dfe304a3e50138625d9212a2b185935f8dc774b775120cc770 SHA512 e420d4e082fa6e907bf01d38710f256621865ea331781733760a43a04b9714c5a2460767586dfed1fb034f55931fbbb87bdb3439d9b47cc1b455b016395f0bff
-EBUILD python-tests-3.13.0_rc2_p1.ebuild 1516 BLAKE2B ef7ae9677e2d4d56e2f6dfcd57d7f3cc35882a53bddb994a80ae294de92c206a96599e15e558f7dfe304a3e50138625d9212a2b185935f8dc774b775120cc770 SHA512 e420d4e082fa6e907bf01d38710f256621865ea331781733760a43a04b9714c5a2460767586dfed1fb034f55931fbbb87bdb3439d9b47cc1b455b016395f0bff
-EBUILD python-tests-3.13.0_rc2_p2.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.10.14_p3.ebuild b/dev-python/python-tests/python-tests-3.10.14_p3.ebuild
deleted file mode 100644
index 08c7cd48acb9..000000000000
--- a/dev-python/python-tests/python-tests-3.10.14_p3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-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.10.14_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_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		sqlite3/test ./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.10.15.ebuild b/dev-python/python-tests/python-tests-3.10.15.ebuild
deleted file mode 100644
index 872701cc1c5e..000000000000
--- a/dev-python/python-tests/python-tests-3.10.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-
-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.10.14_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
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		sqlite3/test ./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.10.15_p1.ebuild b/dev-python/python-tests/python-tests-3.10.15_p1.ebuild
index c71dae4a9501..4cc74f86a5e4 100644
--- a/dev-python/python-tests/python-tests-3.10.15_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.10.15_p1.ebuild
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.11.10.ebuild b/dev-python/python-tests/python-tests-3.11.10.ebuild
deleted file mode 100644
index 3964bebb1ba7..000000000000
--- a/dev-python/python-tests/python-tests-3.11.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_11 )
-
-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.11.9_p2-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
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild b/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
index 8e133af3e4e9..359f16eb8f42 100644
--- a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.11.9_p2.ebuild b/dev-python/python-tests/python-tests-3.11.9_p2.ebuild
deleted file mode 100644
index f7ec8c2f31f6..000000000000
--- a/dev-python/python-tests/python-tests-3.11.9_p2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_11 )
-
-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.11.9_p2-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_install() {
-	python_setup
-	# keep in sync with TESTSUBDIRS in Makefile.pre.in
-	local dirs=(
-		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
-		./test tkinter/test unittest/test
-	)
-	local dir
-	for dir in "${dirs[@]}"; do
-		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
-		python_domodule "${dir}"
-	done
-}
diff --git a/dev-python/python-tests/python-tests-3.12.5_p1.ebuild b/dev-python/python-tests/python-tests-3.12.5_p1.ebuild
deleted file mode 100644
index 74213d0a2cce..000000000000
--- a/dev-python/python-tests/python-tests-3.12.5_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_12 )
-
-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.12.5_p1-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_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-tests/python-tests-3.12.6.ebuild b/dev-python/python-tests/python-tests-3.12.6.ebuild
deleted file mode 100644
index 6a4faf7effff..000000000000
--- a/dev-python/python-tests/python-tests-3.12.6.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_12 )
-
-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.12.5_p1-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-tests/python-tests-3.12.6_p2.ebuild b/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
index 5ee253c7e0a7..5f2ce86f6117 100644
--- a/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.6_p4.ebuild b/dev-python/python-tests/python-tests-3.12.6_p4.ebuild
index b2a3254a3e50..1abfb67e0938 100644
--- a/dev-python/python-tests/python-tests-3.12.6_p4.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.6_p4.ebuild
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.7.ebuild b/dev-python/python-tests/python-tests-3.12.7.ebuild
deleted file mode 100644
index b2a3254a3e50..000000000000
--- a/dev-python/python-tests/python-tests-3.12.7.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_12 )
-
-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.12.5_p1-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-tests/python-tests-3.13.0_rc1_p3.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc1_p3.ebuild
deleted file mode 100644
index b52e11aa0206..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0_rc1_p3.ebuild
+++ /dev/null
@@ -1,60 +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_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-tests/python-tests-3.13.0_rc2.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc2.ebuild
deleted file mode 100644
index 34d84eddd7b6..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0_rc2.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-tests/python-tests-3.13.0_rc2_p1.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc2_p1.ebuild
deleted file mode 100644
index 34d84eddd7b6..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0_rc2_p1.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-tests/python-tests-3.13.0_rc2_p2.ebuild b/dev-python/python-tests/python-tests-3.13.0_rc2_p2.ebuild
deleted file mode 100644
index 34d84eddd7b6..000000000000
--- a/dev-python/python-tests/python-tests-3.13.0_rc2_p2.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/redis/Manifest b/dev-python/redis/Manifest
index 13f6b4a8aca6..bfcbb624de79 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-py-5.0.8.gh.tar.gz 4796278 BLAKE2B 43649156956d5f92598d9191ff3138af4981d957fadbaefa3c2759f8286b12cfcd393fde7c70b7d46600251c8083216d368b9946a0af8915f85e75b4ce736c60 SHA512 cd02a0632156fe134d3425ce41be1f907f8602d5b51e3f1565f158ecd70ba72cd33919508b5d87ca279ad264641504a6981b5bfe615d29db3c4204765c61803e
 DIST redis-py-5.1.0.gh.tar.gz 4829762 BLAKE2B fe2653efdb6479ceae5d7c2d139da23d58106e91de663541e2235b2c82b40cdadc2c12310d9781edb04cb0ff00f0a52f60ac657738bd1b85192f4dc0e2a86289 SHA512 e6209052cd55652fadcc2db2f5bde8d20ad269e132abfb16e0d4184d36fd5573ea728298c999a41cf41ede8b2fe43faeec7392299cb75daddc70fb3fac8a9d68
+DIST redis-py-5.1.1.gh.tar.gz 4829819 BLAKE2B 2cf104142c70cb7b082178d26dfd84c9970488613551c2f87052e2f56f2bd1e816f4760dc2070dc8520098768263f810a524278ca6d24e0a97340d94434f97bb SHA512 2dbc5ba3138ca6b00c89185fa7b0280958eb66e3640c30ffe88bb77ef0cc88ae82f11e1d3d2cf94a2e8ef35ce30df3e5dd46ccb02d663a6acdb45085f3f1bc95
 EBUILD redis-5.0.8.ebuild 3041 BLAKE2B dea0539c85ab788f5e97acb9e41fea0610e491c425ca23dca07670b1303a10c3d2aecb35a1ea1464ed6a4004051ab3f157de338343e08bf75460b8131ac80608 SHA512 7eab3332bd2a12795761d7e25b9af9dcaa6e62e23f83405b2455b98d3421b0e4daa948be16c94d89af1a443f537a510f5f8ecdfdc7773541819f5dfe842fb31e
 EBUILD redis-5.1.0.ebuild 3047 BLAKE2B 7fcb7d959fa13cb7417eeaa46a81ae1a784efe2d59a31ad50271b98b7821e998c78458fdf1480155741d99c4a699520fea98db4e1515e6db5e8fb80cbb852a7a SHA512 3a7472b2d4c91b25242b2ee1a64fd577e7c16289b5f894734d5f9fd8918b900f035039a8177b9616281754a73abe12792c58b2e2c2617523f065092974249fc3
+EBUILD redis-5.1.1.ebuild 3047 BLAKE2B 7fcb7d959fa13cb7417eeaa46a81ae1a784efe2d59a31ad50271b98b7821e998c78458fdf1480155741d99c4a699520fea98db4e1515e6db5e8fb80cbb852a7a SHA512 3a7472b2d4c91b25242b2ee1a64fd577e7c16289b5f894734d5f9fd8918b900f035039a8177b9616281754a73abe12792c58b2e2c2617523f065092974249fc3
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis/redis-5.1.1.ebuild b/dev-python/redis/redis-5.1.1.ebuild
new file mode 100644
index 000000000000..f0029e3d0af7
--- /dev/null
+++ b/dev-python/redis/redis-5.1.1.ebuild
@@ -0,0 +1,107 @@
+# 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
+
+MY_P=redis-py-${PV}
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# https://github.com/redis/redis-py/issues/3339
+	sed -i 's:(forbid_global_loop=True)::' tests/test_asyncio/*.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# require extra redis modules that apparently aren't packaged
+		# on Gentoo
+		tests/{,test_asyncio/}test_bloom.py
+		tests/{,test_asyncio/}test_graph.py
+		tests/{,test_asyncio/}test_json.py
+		tests/{,test_asyncio/}test_timeseries.py
+		# apparently available only in "Redis Stack 7.2 RC3 or later"
+		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
+		tests/test_commands.py::TestRedisCommands::test_tfunction_list
+		tests/test_commands.py::TestRedisCommands::test_tfcall
+		# TODO
+		tests/test_commands.py::TestRedisCommands::test_module
+		tests/test_commands.py::TestRedisCommands::test_module_loadex
+		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index ce6fb3a84277..a7026aeebfd1 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,7 @@
 DIST rich-13.8.1.gh.tar.gz 15062921 BLAKE2B 6df186dee1eccabbb28ef4bcd3bbceac335fbe39cf1ff6318726146f3eead9033fe362ca3c363c057c9b898ebb824d55f13454d68cb917dfc82e07e1e0038fa4 SHA512 d84d05fcc657fbcbcca09c22856c36fb945fde481111565292b13a9c5472cc1cf7e6266069f80b48821f7307a1479edc65a48d3b8a96334922b151d93b402daa
 DIST rich-13.9.1.gh.tar.gz 15063679 BLAKE2B ce08c00e9d1754c75485ebc025a2479bd2dd851f38d87a40c38ef17118c626a9f1ca17219578b7a0e7ad758d626465f467850ccf2d37d8d29501951eca516eec SHA512 c45406ad33f86d0f310a6ae229b0e9eea39313bf21fb7d44bc2e40993c4928814db26f6b9740477dc6418c4eb1974fe2bf782b98288dac12b109673ee783a62c
+DIST rich-13.9.2.gh.tar.gz 15063908 BLAKE2B c83f736630a7bfbccda7d790476e7a9f518f2fa4e6bb3d4f5190bdeae784571875066c94bd8f4e01117b45a7eee83e9072bb7bb64ab5d5d8675aac5a63d5b0b5 SHA512 468e8f758c374264a77be154dde8908e04502cf8dfdc442dacfaebaaf9f1fbf634ae8dcbcefe42f7562183532a372aebebcdcb03c90031f619a8c5f2cd78f653
 EBUILD rich-13.8.1.ebuild 2007 BLAKE2B 68341542a05c6b1face0a9d90f07411b78bd018bd97d96eeb97fd0cc34ee76524e1d22fd5ed9ada7e116b725289b19b71e8d5af420d43b8ad00a5114caabb885 SHA512 a9eddebc103117511b12dc4939fae762555aa64ee9c393b1975cf429ae328c56dc14af4a4f4ac31a89d6bca44fac745060149669776da7cc932a47286cfbb984
 EBUILD rich-13.9.1.ebuild 2106 BLAKE2B 033790ff2ef5358730b05f09c385b3073bec6637fd1375caf97c6b2727cda5abd8dd1408923bcd7751102a2d1b187ec59167fa248d78b012d35d985197d77231 SHA512 35b4dd0743e3a30a7eda2f4d0e340f0b1b99210f3249146b107649f02485d6681eb38f224513ed65cc233635bc729ee0501b2c4c1a3e82fa7fc0c8eaae1d97e1
+EBUILD rich-13.9.2.ebuild 2106 BLAKE2B 033790ff2ef5358730b05f09c385b3073bec6637fd1375caf97c6b2727cda5abd8dd1408923bcd7751102a2d1b187ec59167fa248d78b012d35d985197d77231 SHA512 35b4dd0743e3a30a7eda2f4d0e340f0b1b99210f3249146b107649f02485d6681eb38f224513ed65cc233635bc729ee0501b2c4c1a3e82fa7fc0c8eaae1d97e1
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.9.2.ebuild b/dev-python/rich/rich-13.9.2.ebuild
new file mode 100644
index 000000000000..de21ed690f8d
--- /dev/null
+++ b/dev-python/rich/rich-13.9.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022-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} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-21.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		# TODO: segfault in recursion (PyQt6 interfering?)
+		tests/test_traceback.py::test_recursive
+	)
+	# version-specific output -- the usual deal
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# pypy3.10, to be more precise
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+			)
+			;;
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/test_inspect.py::test_inspect_builtin_function_except_python311
+				tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
+				tests/test_inspect.py::test_inspect_integer_with_methods_python311
+				tests/test_pretty.py::test_pretty_dataclass
+				tests/test_pretty.py::test_reference_cycle_dataclass
+				tests/test_pretty.py::test_max_depth_dataclass
+				tests/test_pretty.py::test_attrs_broken
+			)
+			;;
+	esac
+
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 6e68a8f4667b..0b945350d3ae 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,3 +1,5 @@
 DIST simpleeval-0.9.13.tar.gz 24535 BLAKE2B 1cf644cac8e334725eb2a6c0d058b50646b3b405b1cf91a426b2c1701525b4b11f154c5990e267434537657850d29a760f30612834ec5d4c5870580767404cf7 SHA512 e8d518e16f68a2e5f28bc4fe056851b8e1507a147539820afb52e606a8815d5962fe9144c106e361213b4af7903e93e1d2db9a7e759b5ac488e8614de90a8ae7
+DIST simpleeval-1.0.0.tar.gz 25714 BLAKE2B 3527c3109fd77226c1103ebaac6fb5d03b9439b7e79b2b8386bd9ac9631bc0c1843d06e7a12843801294b84517bd2fc32ce607cc6f99dacf6c827e57d1717e6e SHA512 b5310dfac1ba231e47e86ff6dc8b3c814210f3f14724a0da12f429133354a46f60f980fd29ef66c675c52cd668f2f18c74a6b805192972e821d8331817f44c83
 EBUILD simpleeval-0.9.13.ebuild 453 BLAKE2B 21005a273f577d8cd5ab80150666b4fe18fcb4c1760a7247c0306419e663b52d63b1a289096a0b6b2d037e9a644e08223bf05b2aac44f0fad17202518c45807f SHA512 5fd1836577b6c7dd7127ec58b3e98e6777c6b4f140221a5ac96836f3a91c23466372837df186c3f0ee489b212be4eae387e51dd7c829e09773e8add1781b16bc
+EBUILD simpleeval-1.0.0.ebuild 456 BLAKE2B cef98cbc2b750c66c343c06a072e8ee569bfda3d1f0859593fbdb2224225241e33302a614c2efebf90dc132535c4534a1fa26b815c9947eaebaedbc8138d1e89 SHA512 a0c9807a95162bd7ca63cf09e4d48bb0fc936651a21ec60dc9bb67cb25052e0e18c2639d655ba30fd57cdd551a1979158e2e12b3846af0fa131535338bbafb37
 MISC metadata.xml 506 BLAKE2B 697e9acab14f80458e539abe119b70a47f4b97ff3e8e88cfc5b071a4403d80ed637976a2428512bcd6570ee37aad12cbf853b87988262548c09670c31dd7c970 SHA512 be74df1cba2c5c7684d767a229eed2f641747abee58f421ad437c33d40ebd55b360e7bee162a9464ea4443afc4de03c7dbc9c7db35c832f6cd531dcd151aa796
diff --git a/dev-python/simpleeval/simpleeval-1.0.0.ebuild b/dev-python/simpleeval/simpleeval-1.0.0.ebuild
new file mode 100644
index 000000000000..96136a1accd6
--- /dev/null
+++ b/dev-python/simpleeval/simpleeval-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# 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 simple, safe single expression evaluator library"
+HOMEPAGE="
+	https://github.com/danthedeckie/simpleeval/
+	https://pypi.org/project/simpleeval/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/simsimd/Manifest b/dev-python/simsimd/Manifest
index 862f9922f4f0..f1d994b6b55a 100644
--- a/dev-python/simsimd/Manifest
+++ b/dev-python/simsimd/Manifest
@@ -1,9 +1,5 @@
-DIST SimSIMD-5.3.0.gh.tar.gz 158052 BLAKE2B 31ef8c66812a53ddeac612dc990ae2181a339369522eb459c9e792641aef3484521352c514fa90795608595ce73b3f7bfe160cf86f318d6910e9544b75d94df4 SHA512 2e8e3e3f00897b3866bc9ee649c060ac3c891365a76be22d6f4c2a9e40755f37be93d713598d18019acf0f5129fab6dadfa68b7b1cbef90c77a9cd60ec18ec4d
-DIST SimSIMD-5.4.2.gh.tar.gz 161136 BLAKE2B b5ab3d91fe9361a9982064beded37ccfad806eb9df68f1156ed7530cb40622951cf9b457a8cbb46e5fd21844f60877b4dde7e9627384e8ac75fdf1452383b3f2 SHA512 6b293e530a54b7c59a1e49c3e02dd0306affed762e40838bf3a9e51ea1062d9713d89064dc6f9f9e7e17cd13ad01a48f5d4e59f9615a502dcfa1696275972cec
-DIST SimSIMD-5.4.3.gh.tar.gz 161217 BLAKE2B 4f3f6d5d1dcdeef24c9bdb96c35fa8260eb1d32a83dc62f83f6b82f7fa38744d3ea6e94b8ca202a54f80cf6a9d40720cf3efcbe528d70f8d3102fee11ff93688 SHA512 49ed2c6e9566088a9c8a7fc6cd5cf72251cf1f7099677451c194f96e4539a919293000a936ee3b8024e994be3028defa9c2496c69d5eaa57457a9ee8541ab847
 DIST SimSIMD-5.4.4.gh.tar.gz 160825 BLAKE2B b5c82ad45cb5400802d264df407584cc971e6617ab2cd77f503671ae57ee0fd0656e4ac9c881bd9d975591127512222e1fe9d67dda55ca557a32cc3559c28ce0 SHA512 abddc3522f28602c0bfbdcdf3f045b3ffbb88cc9182741333df7a7e6d8fcf523dbd876b30381cdc741b712c42665f65796477ec3c458cdd9ef4ac4e4038b9052
-EBUILD simsimd-5.3.0.ebuild 1263 BLAKE2B 2de5583814fbddc5e4837b331ca03296e0d960b997ef03c63cd99174db3863642384fd7c0f1dcd32036c292026bf51947c2de186f67b2775986168e094565d89 SHA512 3da85a757c8e542dbdbae0d46f6aea998a975be97b510849226dfe7004282b7391487178827a941ad24cb3d22499539fc88eae4324a95df0dd69be19a3cf12e9
-EBUILD simsimd-5.4.2.ebuild 1263 BLAKE2B 2de5583814fbddc5e4837b331ca03296e0d960b997ef03c63cd99174db3863642384fd7c0f1dcd32036c292026bf51947c2de186f67b2775986168e094565d89 SHA512 3da85a757c8e542dbdbae0d46f6aea998a975be97b510849226dfe7004282b7391487178827a941ad24cb3d22499539fc88eae4324a95df0dd69be19a3cf12e9
-EBUILD simsimd-5.4.3.ebuild 1263 BLAKE2B 2de5583814fbddc5e4837b331ca03296e0d960b997ef03c63cd99174db3863642384fd7c0f1dcd32036c292026bf51947c2de186f67b2775986168e094565d89 SHA512 3da85a757c8e542dbdbae0d46f6aea998a975be97b510849226dfe7004282b7391487178827a941ad24cb3d22499539fc88eae4324a95df0dd69be19a3cf12e9
+DIST SimSIMD-5.5.0.gh.tar.gz 161540 BLAKE2B 413f8c4f1a16f3658b553281f381ec736d998618197e5ce76cccb289a7ba73ffc0dafc28472b71c248677cb3a4c55d18c08b2261325b63afe1a8976eb172aafc SHA512 156a2d43f89d9add0f1dab431b028986ace197bb8bc468441cf549ebd7a473515bb14b3969a520709f12fc272f0001a411cf7952fce8c8580c37d5a9be0fcf94
 EBUILD simsimd-5.4.4.ebuild 1263 BLAKE2B 2de5583814fbddc5e4837b331ca03296e0d960b997ef03c63cd99174db3863642384fd7c0f1dcd32036c292026bf51947c2de186f67b2775986168e094565d89 SHA512 3da85a757c8e542dbdbae0d46f6aea998a975be97b510849226dfe7004282b7391487178827a941ad24cb3d22499539fc88eae4324a95df0dd69be19a3cf12e9
+EBUILD simsimd-5.5.0.ebuild 1263 BLAKE2B 2de5583814fbddc5e4837b331ca03296e0d960b997ef03c63cd99174db3863642384fd7c0f1dcd32036c292026bf51947c2de186f67b2775986168e094565d89 SHA512 3da85a757c8e542dbdbae0d46f6aea998a975be97b510849226dfe7004282b7391487178827a941ad24cb3d22499539fc88eae4324a95df0dd69be19a3cf12e9
 MISC metadata.xml 349 BLAKE2B 363881beeefbf65de7e0ab30fe5da642deefc0bbe2aeef0b4c3395a3c570f1043cb3d5e08927536a48597a44d447ff4853a5b15fffa65bbea5533377b0d6e413 SHA512 75756bd2cfb9adbdc59a2f4e3ed29c7d5daf53f427da661a9dbe6b3746ccb8ca031f650a7e505ef817b13c231cb725ca1e6eeb490be39b29e2883ca7d52f0368
diff --git a/dev-python/simsimd/simsimd-5.4.2.ebuild b/dev-python/simsimd/simsimd-5.4.2.ebuild
deleted file mode 100644
index 633192d3f2c5..000000000000
--- a/dev-python/simsimd/simsimd-5.4.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P=SimSIMD-${PV}
-DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
-HOMEPAGE="
-	https://github.com/ashvardanian/SimSIMD/
-	https://pypi.org/project/simsimd/
-"
-# no sdist, as of 4.3.1
-# https://github.com/ashvardanian/SimSIMD/issues/113
-SRC_URI="
-	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openmp"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-repeat[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/-O3/d' setup.py || die
-	if ! use openmp; then
-		sed -i -e '/-fopenmp/d' setup.py || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p repeat python/test.py
-}
diff --git a/dev-python/simsimd/simsimd-5.4.3.ebuild b/dev-python/simsimd/simsimd-5.4.3.ebuild
deleted file mode 100644
index 633192d3f2c5..000000000000
--- a/dev-python/simsimd/simsimd-5.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 toolchain-funcs
-
-MY_P=SimSIMD-${PV}
-DESCRIPTION="Fastest SIMD-Accelerated Vector Similarity Functions for x86 and Arm"
-HOMEPAGE="
-	https://github.com/ashvardanian/SimSIMD/
-	https://pypi.org/project/simsimd/
-"
-# no sdist, as of 4.3.1
-# https://github.com/ashvardanian/SimSIMD/issues/113
-SRC_URI="
-	https://github.com/ashvardanian/SimSIMD/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openmp"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-repeat[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/-O3/d' setup.py || die
-	if ! use openmp; then
-		sed -i -e '/-fopenmp/d' setup.py || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p repeat python/test.py
-}
diff --git a/dev-python/simsimd/simsimd-5.3.0.ebuild b/dev-python/simsimd/simsimd-5.5.0.ebuild
index 633192d3f2c5..633192d3f2c5 100644
--- a/dev-python/simsimd/simsimd-5.3.0.ebuild
+++ b/dev-python/simsimd/simsimd-5.5.0.ebuild
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 451ba7827141..6d819ad53e52 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx_autodoc_typehints-2.3.0.tar.gz 40709 BLAKE2B ef1b606cf6a643f87271fb033bac4d06f83b2be9f73b765064757ff0c1dceb2124841b2f6bb674deb20e39a4d19386fea8c85f0cdb417eeb3d84da19e2bf609e SHA512 f4ee3e0eb51fd63d4cf31f2eed9b9d06cc2dc48a3f3427763e86dba8910ea02c9e31bd8d30e8d0b3494e71fb104d51904400ce96d71270e1e422f44a317de80a
 DIST sphinx_autodoc_typehints-2.4.4.tar.gz 40572 BLAKE2B 2981d3adb45c7c0bc8ec81d67e26aca302ed5e6a142c36a49fe73197a4aadb91c901f185102757953a1f95ca523cf3a44d7d1a4be2c79651e8f6f8b7a882d0fa SHA512 770145187db71775833a403ebff1ed05e9db81ac0af0c0507f40fdbde5b8d5a4bd298b882ba7c8f45c083d270e82d4a6a3e27c70514dbbd3d2045ec9ba0d20fb
-EBUILD sphinx-autodoc-typehints-2.3.0.ebuild 1061 BLAKE2B aa139bcac70757c434c4dcb4ea2a6d8c6781f6a3bd20730aac4711688d0f60be879279746a09752a76c3c51177d9dfff5d43cf12a1b9a251c6e7abfe1dafb566 SHA512 32e67d9acc5520fbebc8cede2db9dbe932b3f78aff5ab5d56180b6242729c015a11fb504f381ec1bfc8acf0dacbffae83d889a5ce59b31543b1707d4e6c536a0
-EBUILD sphinx-autodoc-typehints-2.4.4.ebuild 1068 BLAKE2B 7f79466ae45f875d5dcbd64fd7e19201f59a36d0a006dc6d46508ae7d2311ec2cdae126a31246acc8ea3cbc0f7129706662e9ce1ef34c0bef10ca255f3be6051 SHA512 fdebf2dc1f566324c455169f7a888a37a1745cc0f749261d228f3fcc82148e200fad957debfdbfaf9cf89782004cf694b1cd90c988126824f8352351b5083f49
+EBUILD sphinx-autodoc-typehints-2.4.4.ebuild 1061 BLAKE2B aa139bcac70757c434c4dcb4ea2a6d8c6781f6a3bd20730aac4711688d0f60be879279746a09752a76c3c51177d9dfff5d43cf12a1b9a251c6e7abfe1dafb566 SHA512 32e67d9acc5520fbebc8cede2db9dbe932b3f78aff5ab5d56180b6242729c015a11fb504f381ec1bfc8acf0dacbffae83d889a5ce59b31543b1707d4e6c536a0
 MISC metadata.xml 682 BLAKE2B f8b48894f28411a17c73956bb75d43906c893b33d3dc611dfcc46e7a71ac43824aa54f660ab4f49c9870248b2b9ff405a2a3229f92975337e69201868eed3378 SHA512 87a0ea2b2e4cb2b5f0d1593b2c4bd96b46dabb8baae71a6ba18cfd83dedb2a1d5f0ae0f8711144967a5d44015e9ae7ca013dc0aa54e20604633ae062d95649ef
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.ebuild
deleted file mode 100644
index bb7303f59606..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.3.0.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=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Type hints support for the Sphinx autodoc extension"
-HOMEPAGE="
-	https://github.com/tox-dev/sphinx-autodoc-typehints/
-	https://pypi.org/project/sphinx-autodoc-typehints/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
-"
-# skipping optional test dep on dev-python/nptyping as that package
-# is horribly broken and on its way out
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this package is addicted to Internet
-		tests/test_sphinx_autodoc_typehints.py::test_format_annotation
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.4.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.4.ebuild
index e938bae4f916..bb7303f59606 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.4.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-2.4.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-7.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 874a17fc281e..bcf7745ff987 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -9,5 +9,5 @@ EBUILD sqlalchemy-1.4.54.ebuild 3349 BLAKE2B b72fce5a53d2ec9b674dc86011868d3d658
 EBUILD sqlalchemy-2.0.32.ebuild 4097 BLAKE2B 072b958f12d6114a872fc5e49b4ff45acdab38f87b18433e76d566253a75b55dbd3d7f45f9f44bdca99393b85e9542b6d0e8cda711984ae53a84deeebc9593bb SHA512 05b9fed906a1316e4693130f6ebc2a966cc8895fd2d40d2468c13703baeaca7566d12654c2b81e18ff3c2750375a8ea23d98d11478f6d556d5c84dd81dc70229
 EBUILD sqlalchemy-2.0.33.ebuild 3882 BLAKE2B 0ba4d79020f5dbb18ac4f2ef5d299995f093a9e5e421b8f848d8bee9e16f60d8590226220a4679c38a74ebb0c6c573b011da3fe4c26b28311f06ce570e6ed8ed SHA512 3effb67b3c4bae2a8260807bd10b09dc52974232ab2ea7c9b6e1c94583394d6f47fb9288bb36b325cb930dc3a1c2091fc568cbcf33f87c90c621b7024378909c
 EBUILD sqlalchemy-2.0.34.ebuild 3877 BLAKE2B 15dc6aa4d278c012b8382b7be0a8f39ec3f46d64a4918184771cbfd61e1f84481408cc1c7dbd40f7d26459e79cf646e2806880336227b8843ddf3d2cf5128850 SHA512 338ae518b23cae6d75999446f5aebf42613d15b58ab4944af09859863cdadd5931985c0d09c99a59cc280fd862c5e3e55677bc345dfab4f0a0b71619ef2c2369
-EBUILD sqlalchemy-2.0.35.ebuild 3882 BLAKE2B 0ba4d79020f5dbb18ac4f2ef5d299995f093a9e5e421b8f848d8bee9e16f60d8590226220a4679c38a74ebb0c6c573b011da3fe4c26b28311f06ce570e6ed8ed SHA512 3effb67b3c4bae2a8260807bd10b09dc52974232ab2ea7c9b6e1c94583394d6f47fb9288bb36b325cb930dc3a1c2091fc568cbcf33f87c90c621b7024378909c
+EBUILD sqlalchemy-2.0.35.ebuild 3878 BLAKE2B 6e302ab254992994d5446b47b91039e9b6a1a503c55920e0dc1280b26d2d256dd92ed5ae4149412450288644742dc7b60296ef6903efa004b6291f2973c07a39 SHA512 3cc3c05b1471d4117ee11dd19604a7d24f8dd292e4259410a678f2d6315c81be5ce34fe5f96c2993a0a54b34d4037bfce1bc97fac6106806960faea7fedf10d1
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.35.ebuild
index 18e25ffd129d..4f9754909124 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.35.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.35.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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"
+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="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 5a73a8605074..85f565217c64 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -20,10 +20,8 @@ DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea7
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
 DIST sqlglot-25.23.2.tar.gz 19470352 BLAKE2B 6dd198a1de9d5c240cb6040a55f7afa08abd12021c6768242d955ef959db7a04f5de180b675b4f719a00488784e43a49834f9031a7adbfbed1f58cf607e1051a SHA512 b15e08a894458bb8e423f1d6c4c994eda548f8d2248ea4a46873e709bf0ec7830a5bb8fea9d2a7952c6f4522ef1ddff223b8592ee24e00653e52a121bd821d77
-DIST sqlglot-25.24.0.tar.gz 19471462 BLAKE2B 3a173667d307830c79a87723697081bf108285ae7c724f8103f373e95efd9c2c68c98603fc8cc92b4a6ef337d741d88ce94daa9ec749cfb820acf0639c932b02 SHA512 dff3253479665a2b887ff5f7514536f8be0f490142c610821145cc5dc80bddcffa3a9daac0e33802b4057d7f1d624bbfb105645f5006458d7e90bc7b72511ec7
-DIST sqlglot-25.24.1.tar.gz 19476850 BLAKE2B 69b7f960a06202f4e926eab3bb088fff949a761389d1c43365c3347763bf657ad9f81e6a4767266bc1cb6523dbc9c9acc4395b6e4af60d924dec14534bff7894 SHA512 f5422cd3f01ea77d2c65115a91a2c2e179253cc054a539443122357347d6ecb445f8300bfa8210cea030c9aa6934057966efed9b84499bff1aaef94ee04d40ef
-DIST sqlglot-25.24.2.tar.gz 19479736 BLAKE2B 3f5caa087ddf72090a5aa9a1b8812d05a97dbfacff8b1895580b713dbd6848ba97058a47c0bf28cd216146ec68006b506d68f5084cc0a4ad6b02b8d977d295f9 SHA512 ca053a9db85bf54888f42666c2cd76e5f7de3087534feadf79f18ad9a089a861a98f6bfd3ec84a896d6c08e8ef33ad6aab88d7a331fbdcd60127531b89ca8d24
 DIST sqlglot-25.24.3.tar.gz 19488110 BLAKE2B 627b05ea4d980257ef96e3a64fe399ad112cd5e9a0b406d3a70c9d1aa7b70947bc21f2a2755a40d994b6a2103e43f6355bc62e2c2d206bea47e006163ddcf567 SHA512 6be2c293a38c4957dad89c39895848c7d6a695c32d5f74f21a7811064fe72a940943a8dbf08d628b3f237ac6020dd30deef38f211989d1bdaac0368f7db342a1
+DIST sqlglot-25.24.4.tar.gz 19506066 BLAKE2B 5ca734b3c14443659c69917eb89153111cdb9d3b8df2c8e23f07b06e6e1fbeba6f34a9e926ef618f1569b95731fa7c4916582d321429ac2841adaad35ca1fdc7 SHA512 66e30c32cb519983e1268b810157c5556f7c7b6490d7ac48a2c4d76458ae8a4d88e6ab36a32608ebbcc14bcb0b28242ca778d6d807a243eb9e7643325baf5824
 DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
 DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
@@ -37,8 +35,6 @@ DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9
 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 EBUILD sqlglot-25.23.2.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
-EBUILD sqlglot-25.24.0.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
-EBUILD sqlglot-25.24.1.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
-EBUILD sqlglot-25.24.2.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
 EBUILD sqlglot-25.24.3.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
+EBUILD sqlglot-25.24.4.ebuild 2817 BLAKE2B cf3d2e32dc5f98fbba79487c4d6c8d31ea7f611b3226c0f3ef4cd415b6e0d425ac9cd7e6b92df12f9640b8983bb419f399b1f766a90a15183659a5a572517a04 SHA512 1ba127adea3b9d677c02fbc559dab225a8f6d37f065d61420bc89fbc74a163603360c5198f0fdc3ee319ced2bb878e7ecd24b442169f3a14cd95921475201342
 MISC metadata.xml 611 BLAKE2B 10bf684677182565c9932d51ed9b3b9c80d376d6db945bd7b0dd0d9a19a85dc0d10cb169ff2048ae5f7f73d0f438d259b6231c13c525b5374ec99377f4ffdd10 SHA512 2b26d0f77962807052b94ad78addcfdce9859042af3be34df267dc6e70b6231dd779563935fd21955cd8646fd0cce3fee8c939387ac8056194a0b777743dd2ae
diff --git a/dev-python/sqlglot/sqlglot-25.24.1.ebuild b/dev-python/sqlglot/sqlglot-25.24.1.ebuild
deleted file mode 100644
index 456b6e98cfce..000000000000
--- a/dev-python/sqlglot/sqlglot-25.24.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2023-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} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# timing, sigh
-		# https://github.com/tobymao/sqlglot/issues/3961
-		tests/test_generator.py::TestGenerator::test_generate_nested_binary
-	)
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.24.2.ebuild b/dev-python/sqlglot/sqlglot-25.24.2.ebuild
deleted file mode 100644
index 456b6e98cfce..000000000000
--- a/dev-python/sqlglot/sqlglot-25.24.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2023-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} )
-
-CARGO_OPTIONAL=1
-CRATES="
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	heck@0.4.1
-	indoc@2.0.4
-	libc@0.2.150
-	lock_api@0.4.11
-	memoffset@0.9.0
-	once_cell@1.19.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.70
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	scopeguard@1.2.0
-	smallvec@1.11.2
-	syn@2.0.41
-	target-lexicon@0.12.12
-	unicode-ident@1.0.12
-	unindent@0.2.3
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-"
-
-inherit cargo distutils-r1 pypi optfeature
-
-DESCRIPTION="An easily customizable SQL parser and transpiler"
-HOMEPAGE="
-	https://sqlglot.com/
-	https://github.com/tobymao/sqlglot/
-	https://pypi.org/project/sqlglot/
-"
-SRC_URI+="
-	native-extensions? (
-		${CARGO_CRATE_URIS}
-	)
-"
-
-LICENSE="MIT"
-LICENSE+=" native-extensions? ("
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-LICENSE+=" )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	native-extensions? (
-		${RUST_DEPEND}
-		dev-util/maturin[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	# remove fragile timing check
-	sed -i -e '/assertLessEqual(time\.time/d' tests/test_parser.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if use native-extensions; then
-		local DISTUTILS_USE_PEP517=maturin
-		cd sqlglotrs || die
-		distutils-r1_python_compile
-		cd - >/dev/null || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# timing, sigh
-		# https://github.com/tobymao/sqlglot/issues/3961
-		tests/test_generator.py::TestGenerator::test_generate_nested_binary
-	)
-	local EPYTEST_IGNORE=(
-		# Tests require pyspark or duckdb which aren't in the tree.
-		# Pandas would be a requirement normally, but it gets ignored by proxy.
-		"tests/dataframe/integration/test_dataframe.py"
-		"tests/dataframe/integration/test_grouped_data.py"
-		"tests/dataframe/integration/test_session.py"
-		"tests/test_executor.py"
-		"tests/test_optimizer.py"
-	)
-
-	# make sure not to use an earlier installed version
-	local -x SQLGLOTRS_TOKENIZER=$(usex native-extensions 1 0)
-	rm -rf sqlglotrs || die
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
-}
diff --git a/dev-python/sqlglot/sqlglot-25.24.0.ebuild b/dev-python/sqlglot/sqlglot-25.24.4.ebuild
index 456b6e98cfce..456b6e98cfce 100644
--- a/dev-python/sqlglot/sqlglot-25.24.0.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.24.4.ebuild
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 06bd5f5c68d8..6fe8632b4c01 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,6 +2,6 @@ DIST statsmodels-0.14.2.tar.gz 20352531 BLAKE2B 65053842ab979b6c2541baddc09f9ade
 DIST statsmodels-0.14.3.tar.gz 20354488 BLAKE2B 113e90f7091197a5561e311bc033dfc3d9d28732fbcbae4fce13ec58f16db63ec1e25c54e411a8ff04d059f3f2df7c45dc484918235653df4d1f809cc40260af SHA512 c7b8684be83b179edcdbed7703005d054a1f16b9731add69b5079a62e5e858bef87c34e00575580fd48ef80cc9108d405edec9e6a2cf3eb3e5e8f7fed53f8fca
 DIST statsmodels-0.14.4.tar.gz 20354802 BLAKE2B c721c5b2e7b22ad1be10099627230f7344f966a335f37757dc6bb622fedcb1e84a7d708ee25bfdde64357394e059567e41dad19fc5b1daeb3d5ee29e52a3b2af SHA512 db3bd19b8b47af453ad6fbd24449a621895e4237bbc8b7813810306748c32a3fbf005387a0e1e8db550c9c4a59666bdd50aeb49e24f0ecb86619bc90f166f5f9
 EBUILD statsmodels-0.14.2.ebuild 2088 BLAKE2B b764919d239a7855d042c89d926aa3dcaf6a79b130ca982d6bc55a91361d5b81427bfc30554a39454b882f9e669c4feb165a0a9b49a6bc685f97ec58b7dc2b8d SHA512 bc9914039d685ceb26daa3dd08b86855a4c5174615e8da060822f65853040dc756a345e893732e0fbc04599e3adae47d46eacbdce22c8a1d56433b10f89d6032
-EBUILD statsmodels-0.14.3.ebuild 1895 BLAKE2B 414dc0b876c3cfaba6ab4b21d9ada27e355f6e47a5726a39348a383337d9e94f231af51532fc89e47f682e22cfca03980aa51fea69a3b8462491344052919811 SHA512 b2fc84054435d818caea7150d0000f146ab31fbec28c51c216ab7ac7325071d5c60495da03005a35879ebfa29ef8df2f6fd714d6abad65888eb6fc6db1a1e6c5
+EBUILD statsmodels-0.14.3.ebuild 1894 BLAKE2B 5d36eed5d604bcbc0bd2f1604caf0901669bcb844a33c8d214c1978f3192f4510738c8dc50e3369a7173dc8551712c723799d161e9a1910e52e322b5de768dd6 SHA512 c5051a384e708a3270470572623ce72dc92b00c7e1f9bbfc0e2d52ae26b67e8debbd96c234d82a056809190803ceaa6502eb690543bf73a1da2ed6fe658346c6
 EBUILD statsmodels-0.14.4.ebuild 1895 BLAKE2B 414dc0b876c3cfaba6ab4b21d9ada27e355f6e47a5726a39348a383337d9e94f231af51532fc89e47f682e22cfca03980aa51fea69a3b8462491344052919811 SHA512 b2fc84054435d818caea7150d0000f146ab31fbec28c51c216ab7ac7325071d5c60495da03005a35879ebfa29ef8df2f6fd714d6abad65888eb6fc6db1a1e6c5
 MISC metadata.xml 1088 BLAKE2B 285d326203e509fd04364777ffe96f085951fdb7be661e6773f329392c0fa0fc16b1527239586b3abb80458359d15ab00d5eb402b739f947b78dca612ede94ca SHA512 35192e332c6d2aecd1ac611a96ebb13cded9a8f8bdfdd7f0c10b50654d1dda411015444511a69643ee8450742c8f02f5e0bfc5e4ab4ef4da81ffce9231658f4f
diff --git a/dev-python/statsmodels/statsmodels-0.14.3.ebuild b/dev-python/statsmodels/statsmodels-0.14.3.ebuild
index 3b129f1595f7..8c5888dadb78 100644
--- a/dev-python/statsmodels/statsmodels-0.14.3.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~amd64-linux"
 IUSE="examples"
 
 # NB: upstream requires building with numpy-2 but supports 1.x
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 2ceccd32e7be..ee1267245a6e 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
-DIST stripe-10.11.0.tar.gz 1317883 BLAKE2B fa533f6a3ab66a844ff16513ad8cb8b6a8d87677fa01ea93c406cb229577456ccc567b63196c3616878a1cb78c5b91e56ac9fff8d53e0b961702cbd65ab9024f SHA512 64b6adaf3eabe77ab863fe3ef2e0d20d6cfa0e266bb58cde0b0d2edd87dd240a0a8fedf11c35252f3cc6cd517cc767b2c4714facc29475597270e7a143e091dc
 DIST stripe-10.12.0.tar.gz 1318680 BLAKE2B 0de2d108c6813d4ed0493b0e2b906a5d41f6b39b0f60fb2730fc3737b9f641d732e22c5ddf5e4e856b6bc5a1b312c10c9304467f29b5474bf8d6a9ca219f876d SHA512 0843cae0e1dd9a54604938a3ae5a28bb681e5166c2e800478c543b22b103626ac138ee999e468e909e3b5865754ed131af5a01287044603082f1f05329da45d3
 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.11.0.ebuild 2479 BLAKE2B 8ab9df0009ae15ca658d143fb49e9d9f8507549074fae6f947a00be821a16d859f48c4faef9e5803ebbe64e442bda7bcad76e81999c8d599f6f0944230e18365 SHA512 aa50f6adfca871d93e842005baedbcd538e1a7879d4e794d0a7a71f169095c49410e99b68a29f306ea70854f5e31fdedc9df1f10d78e5d4b1f7a641180ae0f6e
-EBUILD stripe-10.12.0.ebuild 2482 BLAKE2B d41cf1130ba524c02435e623798554a866081bd5b1932ad5bac674b789ae68df6cb444b3a968ab13cefd73da7205c69860939f4cebdc28ad62680cea45dd53a9 SHA512 ece77ea1c315f239297549734c61b1e9645ba881bc2eb487ebf50cfe213f847e3fbc5551a148e8ad2d43db5ddb66e1d05d49732192204ee94881b1cca7d2b7e7
+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
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-10.11.0.ebuild b/dev-python/stripe/stripe-10.11.0.ebuild
deleted file mode 100644
index ffd0cdf1d337..000000000000
--- a/dev-python/stripe/stripe-10.11.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 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.188.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-10.12.0.ebuild b/dev-python/stripe/stripe-10.12.0.ebuild
index dce53ce91aee..ffd0cdf1d337 100644
--- a/dev-python/stripe/stripe-10.12.0.ebuild
+++ b/dev-python/stripe/stripe-10.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 6f26a0e4febf..e2619cdd7b56 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,7 +1,5 @@
-DIST sybil-7.0.0.gh.tar.gz 74678 BLAKE2B 17ff70054211437c1b1d2053c6f3cea78ba6e401310853ce1b8397caf992267338a7f868b33174d5bbba1c54c1709bade7f4474a0bcb2e8a59e6e9a93e308574 SHA512 ebc0300d0d36abf6307f9104887eb5f9daa78fa9a86bb985b3fbeb05ffbf1ed8a682c681a207dcd1ee0cb37b8448567a50c19ca3657f391a58655253798665d4
 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.0.0.ebuild 835 BLAKE2B 439b13513fffa6b0ccf502c6cf058eee330e643e066d958766855e9255e69bdbe7542599dddbe1c4e53ff529180cdf0c6a0c984cb90a33ae5e7faf6a3d327c0a SHA512 313d334b0db7cbe4b68ee5d0efc9861859c3c26f7b707d18f22674c454e223617eef7541e02039f661ff4ae0f1a4a7370d804ac9fa60d20fece991a99460e9ea
-EBUILD sybil-7.1.1.ebuild 894 BLAKE2B a8335b14901435f21363f6d6a60723708620fc70d50572b4844f78eff04a4ed1c9e027dac01158f3b1e8a4b2e5982e5dae4469d7c2e624ffe976daaf82ace9ab SHA512 3e4142c50eddf9e0f133b99503238bb4989f6e61b28b3dae6e1bc376fa23f17b694af26e7d84733ae4009e0810b72d74fcc7e20e05a18cb45932712c5065bb16
+EBUILD sybil-7.1.1.ebuild 888 BLAKE2B 5346e38831a421eb3551999093a7f2f5e25c3e70ae5b1e4bcd9c45aeb14bed3084303aff118df1f19ed0c71e84ac197e4586e380ad06fa35f7e9c507ed9dbe89 SHA512 555c750736eb7896ae5884bf7773b5c9c56a7adc5c98dbb12fe6a41331b7a062966c08c448f567736a0f46a2a236a0a9fca47927559893b8899c595abae37cdc
 EBUILD sybil-8.0.0.ebuild 894 BLAKE2B a8335b14901435f21363f6d6a60723708620fc70d50572b4844f78eff04a4ed1c9e027dac01158f3b1e8a4b2e5982e5dae4469d7c2e624ffe976daaf82ace9ab SHA512 3e4142c50eddf9e0f133b99503238bb4989f6e61b28b3dae6e1bc376fa23f17b694af26e7d84733ae4009e0810b72d74fcc7e20e05a18cb45932712c5065bb16
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-7.0.0.ebuild b/dev-python/sybil/sybil-7.0.0.ebuild
deleted file mode 100644
index dc21f4fc3b22..000000000000
--- a/dev-python/sybil/sybil-7.0.0.ebuild
+++ /dev/null
@@ -1,39 +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"
-
-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-7.1.1.ebuild b/dev-python/sybil/sybil-7.1.1.ebuild
index 6244e3506d0c..d02cc33bf5c1 100644
--- a/dev-python/sybil/sybil-7.1.1.ebuild
+++ b/dev-python/sybil/sybil-7.1.1.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/sympy/Manifest b/dev-python/sympy/Manifest
index 50a8a8014cda..b864854e10ff 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,3 @@
-DIST sympy-1.13.2.gh.tar.gz 8141028 BLAKE2B 7a51fa75f1733364d467b79174b71ba866751399d311212144fdc3abdc8cea99618baf0b0fe3f2fe4cb9ab7153ecae4fe4bf00716e97ea4466637633f5618089 SHA512 87f7da425ed577e78392671cb635c99a11f3d6431b8c49a41611f4d2be5da1cadd8d07e0e684f2674792a2ee750b4031baec53156e7192d4c47714d4537c3222
 DIST sympy-1.13.3.gh.tar.gz 7919933 BLAKE2B 94c601e79caf87eb0f08e15ca4cb79e16bcd97d347e1fd948b6ea98b044133ea99f52032f09e290668e4485393425254ff4062ccfd3a3ac0b8afba080da6ba19 SHA512 2ae7a400d4a2d9c826cfaa165e3e1f5d9ba210c25647984d997775d4ec3d7c8f3ad3c5468d9adf141a1dceec864ca988b4f3a01fd934b923c4486ddd458670a3
-EBUILD sympy-1.13.2.ebuild 3047 BLAKE2B 22529829e33b29fe99541f4e69d3376d308bf8f899bd87172c3b56fce3fa46bcb46797f9a4b7887ca3bf73ea971365d9b8e215ab1d87b585939fb7cc28f8e2c3 SHA512 9c35247bbae7f1a22116e66df20e51384b8dd24d413ae295647d96f92afbbdc39aabe71d2f6a56a74d7fa19bf34e5a4be7fbbf0bab1a060fc0626f80b96c8813
-EBUILD sympy-1.13.3.ebuild 2947 BLAKE2B 4c6a17444c54988d35e52fa26433ffd1bff105d7a41ca973c847ef43e7d4bf9898a06094ba33dfa769ba0e723d59efc4b848836183132f5f5c956f13e6737008 SHA512 8f4d05ae6689966215aff9caf97f550c5d1649892b39250b750cc78d1db403b16197379fd95d22c9c5c22f455c2132da2e486ef8263ca60c3fd637e6d297a5df
+EBUILD sympy-1.13.3.ebuild 2944 BLAKE2B 1416d35fcda4660adff786e8c10de7337ee9df97fc1b642fcd7c0a05aabc19940cc559ea87b8704a4be79a37d0f8475a9d6bf6a56a2f4b6cc9f5a7fc3b29fd66 SHA512 5608b0db9acd557a81092de13829dc5e34c86223de2e75ef15bca193058dd16fd49142c55ff00f52c4efa4d6ae468857c03c1b3ad0480bfdd9784f1395493036
 MISC metadata.xml 1639 BLAKE2B b539888e4658c640442db1cb6bd6561664ee6c50109926d69572f4e2cfcdbef230a56909e799b09b860a8688ce66455ae5c5ac86099893ba667feb0198f65abe SHA512 9ba4c310c759e9e7fa3a726850b342e79ed07e4ab369ad126a35b1741fd4d343ba75af457cfcd76c5539b3259e0eb198fb58ae965c231bb38a94c83c00f52e48
diff --git a/dev-python/sympy/sympy-1.13.2.ebuild b/dev-python/sympy/sympy-1.13.2.ebuild
deleted file mode 100644
index fa04751c3c68..000000000000
--- a/dev-python/sympy/sympy-1.13.2.ebuild
+++ /dev/null
@@ -1,110 +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 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="
-	https://www.sympy.org/
-	https://github.com/sympy/sympy/
-	https://pypi.org/project/sympy/
-"
-# pypi sdist misses some files, notably top-level conftest.py, as of 1.12.1_rc1
-SRC_URI="
-	https://github.com/sympy/sympy/archive/${PV/_/}.tar.gz
-		-> ${P/_/}.gh.tar.gz
-"
-S=${WORKDIR}/${P/_/}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine texmacs"
-
-RDEPEND="
-	>=dev-python/mpmath-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-	)
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# TODO; virtx?
-		sympy/plotting/pygletplot
-	)
-	local EPYTEST_DESELECT=(
-		# require old version of antlr4
-		sympy/parsing/tests/test_autolev.py
-		sympy/parsing/tests/test_latex.py
-		# crash due to assertions in sys-devel/llvm[debug]
-		sympy/parsing/tests/test_c_parser.py
-
-		# TODO: pytest?
-		sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_check
-		sympy/solvers/ode/tests/test_systems.py::test_linear_3eq_order1_type4_long_dsolve_dotprodsimp
-
-		# either very slow or hanging
-		sympy/solvers/ode/tests/test_systems.py::test_linear_new_order1_type2_de_lorentz_slow_check
-		sympy/integrals/tests/test_failing_integrals.py::test_issue_15227
-		sympy/matrices/tests/test_matrices.py::test_pinv_rank_deficient_when_diagonalization_fails
-		sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type1
-		sympy/solvers/ode/tests/test_systems.py::test_nonlinear_3eq_order1_type3
-
-		# known broken
-		# https://github.com/sympy/sympy/issues/26321
-		sympy/solvers/tests/test_simplex.py::test_lp
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --veryquickcheck ||
-		die -n "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.13.3.ebuild b/dev-python/sympy/sympy-1.13.3.ebuild
index b86ea4f35e26..16b39de6be2b 100644
--- a/dev-python/sympy/sympy-1.13.3.ebuild
+++ b/dev-python/sympy/sympy-1.13.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="imaging ipython latex mathml opengl pdf png pyglet symengine texmacs"
 
 RDEPEND="
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index b9238bb91799..8d77d99ffa6f 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,4 +1,6 @@
 AUX toolz-0.12.1-test.patch 3505 BLAKE2B 6d106d2f6b92ef19ee11df45959be6cdda0944cc586c66a1439a7a054834b4efed884f91f8693c2481868b7c936fe7397d982e31c134efa3b280adc28b4f43f0 SHA512 dbd5d5ce23ce530ee32b4cdb409e6f7f9217ed2f9dfbe5b8a8d9c9164c5ef8e92df219e18629bfd430147ee25a337b16563d150a1c6d08a99bfd556cd1314075
 DIST toolz-0.12.1.tar.gz 66550 BLAKE2B 41b2002147cd453c2a8300c7ec247e06dfc8fba69a772df4a8f5c35349e991453bbbd0d7ed0162391d9314873bf0e169d20c86b875e4d4eca01aaadc76edea61 SHA512 c514934d1a8069cd70e4d8b9ca32cd2c96e85b1dabb45bbbe4b0644581eb7e7f9f6a6d9230483f1872695edf25ff77ad7643cffb3041a012ed64424097a23e9e
+DIST toolz-1.0.0.tar.gz 66790 BLAKE2B c5e6d8bb96561f7ca97ac7b3a8233eb1002892974c7dd4127732a89117608dfa964ec9d8ab1f8f679e487885b76d4eaed33be275a90afa4beb4a21e1ce4f29ab SHA512 90ba917ff06b7c4a4bbeb1d2c64bcb34bbe41607c7cea402f9d96f352c20c53edc53333ba06da9193bc714a2a836e68acd55e581b9f590fe1d962fc4ae8847d9
 EBUILD toolz-0.12.1.ebuild 676 BLAKE2B 3894c99eefd22b2e0ae3a64b563f0465a6b974c89b42a8a4ebca330bab476de33787cff408854196bf24e0f36097f6778af100bd208cdd33373eecfdd60829ae SHA512 c5fbde1cfb643e52596f65dd1d39c5d0dbc577499c46699e1f8b5ebdca6fddd654309b661cb0164388a1431de86511b314083302ca1e300ec26dce2cbf60e48f
+EBUILD toolz-1.0.0.ebuild 593 BLAKE2B 200e61e633840865c4b6634d00b6465378304b588c05df7a354ef23af518e27de81af0059d593ab6855ecf3559bf8d409eb0532ad1a30d9508a952d8ed0ab287 SHA512 ccaeecca29a350dc5f8b06b86e9d30a28721775b8428d214589d45b4e6a0b86cf25b7226f4b210a8f01c1d512a14d4f016c7f4e2efe936a2960b1b2b54413de5
 MISC metadata.xml 386 BLAKE2B ab0f60ec7b44fdb9789d3ef420d5e99cacea66159be7f4736f6502e595a00d740b6cdc3668304ecade1e994e5b2837a986bfff1ad49e884ba936bd039f80b880 SHA512 835c6ac2bc4af983d1b5a77bf4f48e322ec84e79000f0316d694f92800925e521f3b9d742465ba44f96b973ad30dbb37e46bb40589307edd0b8b0f01ceabda31
diff --git a/dev-python/toolz/toolz-1.0.0.ebuild b/dev-python/toolz/toolz-1.0.0.ebuild
new file mode 100644
index 000000000000..1c27fbb22d95
--- /dev/null
+++ b/dev-python/toolz/toolz-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# 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="List processing tools and functional utilities"
+HOMEPAGE="
+	https://github.com/pytoolz/toolz/
+	https://pypi.org/project/toolz/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index f3ebc1e2ffc5..aed4e9f048f1 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,11 +1,5 @@
-DIST tox-4.18.1.tar.gz 181159 BLAKE2B db9b2233363b6214b1c0bae2c0319b72a7ef4a7f833628833fecb7a8d04eef0594f1a93e17f8273d45873c2130e96b7adad8afe69662cb8fe37251028ba1581f SHA512 289ee3e8b7c941dbeb94adea24442169b33cfe3ae2c4d6eadd12974ee01488325d05beb92cc3b3d5aa1f795f9d3ffe65ed3da81bc62b0527edf56f5ddb9ceb32
-DIST tox-4.19.0.tar.gz 181219 BLAKE2B fd20fcce2b0cf59b572feb1c206b1d8188dcd8eafcb2c31b6c48d982badddb20bd4afa7eb0647e2dc4f2fec47da95e27b1cd870ec14e12e513da0202755ae722 SHA512 46b34524c48ac4e1d906633c8f1fb6da81d26a110638b24e95b97973ef7a17a0412dad584f4e8e9dbd01c5fde3ebd48053caad9bdbc07c1a5a4d17a0c16a34be
 DIST tox-4.20.0.tar.gz 181364 BLAKE2B 2651bb2a7eff09764b7288c0640d44031f2074f8c1c41aaf18989cdc3b8828d6b91f90b131a11b31ed01c4819524aedd4acedb56da2716eb5e3e607a8d5f1bf2 SHA512 c4b9a03a62c7d1993a8b027cd2f8f22fc033fa802176f20b0daeda84d528c5e8618ae9781f04c3d8820d9f49c5786d56b96dd596e95e489ac372631d61425616
-DIST tox-4.21.0.tar.gz 187638 BLAKE2B 0c8667cb2456f11e19fb975a6801f4002e0116bb5fbe2670a056a34e0b602da65a50c1fbd9f27ebb7d17e91c03e53e3a591da717fa584e1058792e0d385a5d08 SHA512 e4a5d56ea2b2865a5a114cb77bf0e25d0504f9b652cf086d803170ba3ef46731a55ec0a4c591e562cd31b13d408d97618dcf21f60da28faf1d7ce6a955e1fc71
 DIST tox-4.21.2.tar.gz 188539 BLAKE2B f729857e18a34a21b3963bc0089891a2e52c03411d79a20838322540f01efa17d6fa8ac0ebf5612ad425d3ce565975cc266ba2820d0f2d0d76017801c221de4c SHA512 a2a363ecaa88ac459e147471c1dca7152e21f77f38253b484a15fa908ea8b0e758761e8c2c475bb6bd374a636cb10004c7c2fb6c61fe3718b2b1c09569d0f08d
-EBUILD tox-4.18.1.ebuild 3011 BLAKE2B f291424f9c1e8963f127abc830d7fb316f3c785f85c0e08faf784c40e98f84e1a73712ed90a8847e698d916cc4fe872069bc12492b1ea36bb68c6080de0c9b07 SHA512 daa45e28c520a0b9bccedb1f86f642169042911a68e47ed1f8c835121932c68f159aacd768a11df4da0783d348162b848d5949f433942250548d79730468c87f
-EBUILD tox-4.19.0.ebuild 3019 BLAKE2B 2ddcfa08fce2dcaa4a3473a159d1d509be5589a2ddd79bdd6a330c820c959019728d7845e0ca46dcc89c0e3dcb96f5ec4791ef27f541f82ee27e747034dc4815 SHA512 c9294e85a911f25222863fbd240839780222b77e0442bb29be977fd35c4685d3e086151cae339df55a967812609e63fa2d86d241d15c8dbb885e83221d8c9998
-EBUILD tox-4.20.0.ebuild 3019 BLAKE2B 2ddcfa08fce2dcaa4a3473a159d1d509be5589a2ddd79bdd6a330c820c959019728d7845e0ca46dcc89c0e3dcb96f5ec4791ef27f541f82ee27e747034dc4815 SHA512 c9294e85a911f25222863fbd240839780222b77e0442bb29be977fd35c4685d3e086151cae339df55a967812609e63fa2d86d241d15c8dbb885e83221d8c9998
-EBUILD tox-4.21.0.ebuild 3063 BLAKE2B 0ed57b8b5b97fee66df8a22d8574b6513b77d30e07c832d9bc79fba690e872ed8d664a847ad2f27bd568e6a67a6f0a0486f6a23c85e01123ba42533febc0fecc SHA512 55edd7cbc352c49d057026e401f041dddbd9a1aa7364dd110416754d1378a87e077c756bc11edb7e33b03a204dde901213955a6930e314118b6296d265eb16dc
+EBUILD tox-4.20.0.ebuild 3011 BLAKE2B f291424f9c1e8963f127abc830d7fb316f3c785f85c0e08faf784c40e98f84e1a73712ed90a8847e698d916cc4fe872069bc12492b1ea36bb68c6080de0c9b07 SHA512 daa45e28c520a0b9bccedb1f86f642169042911a68e47ed1f8c835121932c68f159aacd768a11df4da0783d348162b848d5949f433942250548d79730468c87f
 EBUILD tox-4.21.2.ebuild 3063 BLAKE2B 0ed57b8b5b97fee66df8a22d8574b6513b77d30e07c832d9bc79fba690e872ed8d664a847ad2f27bd568e6a67a6f0a0486f6a23c85e01123ba42533febc0fecc SHA512 55edd7cbc352c49d057026e401f041dddbd9a1aa7364dd110416754d1378a87e077c756bc11edb7e33b03a204dde901213955a6930e314118b6296d265eb16dc
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.18.1.ebuild b/dev-python/tox/tox-4.18.1.ebuild
deleted file mode 100644
index 0c7352f29fae..000000000000
--- a/dev-python/tox/tox-4.18.1.ebuild
+++ /dev/null
@@ -1,97 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.19.0.ebuild b/dev-python/tox/tox-4.19.0.ebuild
deleted file mode 100644
index 9c69f24759e4..000000000000
--- a/dev-python/tox/tox-4.19.0.ebuild
+++ /dev/null
@@ -1,97 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.20.0.ebuild b/dev-python/tox/tox-4.20.0.ebuild
index 9c69f24759e4..0c7352f29fae 100644
--- a/dev-python/tox/tox-4.20.0.ebuild
+++ b/dev-python/tox/tox-4.20.0.ebuild
@@ -17,7 +17,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/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/tox-4.21.0.ebuild b/dev-python/tox/tox-4.21.0.ebuild
deleted file mode 100644
index 35198cd27b99..000000000000
--- a/dev-python/tox/tox-4.21.0.ebuild
+++ /dev/null
@@ -1,98 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 944075609220..2601ab08d4e1 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,7 @@
 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.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.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.5.ebuild
new file mode 100644
index 000000000000..84540c3968c4
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.13.5.ebuild
@@ -0,0 +1,119 @@
+# 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/treq/Manifest b/dev-python/treq/Manifest
index 829711a34561..810f09f94c57 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,5 +1,3 @@
-DIST treq-23.11.0.tar.gz 74450 BLAKE2B 0e10b070e1623b1aaaaf8ce53c98d29a44e9e5e76a84d6004e21cac74564cbb4b22c4015b4d999967ee519f6356016d3cb3fd8304df68967ec46dd2c1005d3ee SHA512 bf62373f51a0552e040a628c86fe0f8d136ab5dfefaa2fa46d9ab173a58c20c0211f94370561e07fafb7da87140e88c10cf336ff7a61e5b3fc1a47fd1193cc27
 DIST treq-24.9.1.tar.gz 85614 BLAKE2B cce700ae1f18b7e97953c45cb835786655caf47a0e425944e58f94c76a33c5948920c38f89283f50b51624f365326045d6ebb163c86644069f5bf548e137b9c0 SHA512 b8ed6ed5262073559babe8d0413a1f5369215a41ac7459441172a9086c654cf1dc7e51a0497d4c714726ae02d2163760cddde7008e360f37ebb4586b82409bb8
-EBUILD treq-23.11.0.ebuild 1148 BLAKE2B 8b727594996a9b8763077710425b0a4a0912d7ee5b292a0ee47a54541ec3e927e048542af441f6e749b60c6679a8951689ef3c86a02a35b2157fc614937d8a7a SHA512 7f4f2704db2ce33388859b8779ccb52db47273dd56e5e80321532381c9d6a7b44e3a04f8f174311031b7db326a6e64dfd86f63e0a43e70dee64577d97afbd3c2
-EBUILD treq-24.9.1.ebuild 1130 BLAKE2B ca60ffa360032e2a93f64c21cc9fc6fea7ba953f19b6d212429cd78faa5447737707616658b33fdb3cf4f0f4eea3fb8627f285a6a7b5397360b4728292ace085 SHA512 36f54ea499a4ee79a0d1bae7b34178073151f9f8c77a92ee291318618f840b809041da3ec06541dc731181c1e762a00aa16f076c7bd09c54c29d71eda6424269
+EBUILD treq-24.9.1.ebuild 1129 BLAKE2B 16a4a17c4d8d24798a1def4dcb205e89483a1b829d1188f00533536e9cf9030943fc979d55633c33c3e0bf8286271e9285346302fd2a5deba7566e54f892197d SHA512 ba61d86364ca58de1938fedc41efbc4b86e708c3532ba9e39d4cf0acb0809afb72bde132b5587889c0c0ae2aba7a958a25431530de66578bf89796911691af76
 MISC metadata.xml 675 BLAKE2B 503b618157c565652f3fcd2a4fc7b2a6fe7e4208e965b956ee166f3d682f0b7e2865f88f7b9c3227a55cb67ca4f21d61b11e6194d4f1e336abc8a9e6471e99c2 SHA512 a09304f23b2934c596ba809a93146be20f493d3326b9ac54c846654f7439218caa04f7b138efc8002061611336aac8be3747e3407ef67d1af640a64e07ebeb4f
diff --git a/dev-python/treq/treq-23.11.0.ebuild b/dev-python/treq/treq-23.11.0.ebuild
deleted file mode 100644
index 559374dd37dd..000000000000
--- a/dev-python/treq/treq-23.11.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="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="
-	https://github.com/twisted/treq/
-	https://pypi.org/project/treq/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[ssl(-),${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/legacy-cgi[${PYTHON_USEDEP}]
-	' 3.13)
-"
-BDEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	test? (
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# fix relative path for docs generation
-	sed -e 's@("..")@("../src")@' -i docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial treq || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/treq/treq-24.9.1.ebuild b/dev-python/treq/treq-24.9.1.ebuild
index 2d0bf675d2cf..8d380daa71ac 100644
--- a/dev-python/treq/treq-24.9.1.ebuild
+++ b/dev-python/treq/treq-24.9.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/types-docutils/Manifest b/dev-python/types-docutils/Manifest
index 7cd84234d802..688c305f22ff 100644
--- a/dev-python/types-docutils/Manifest
+++ b/dev-python/types-docutils/Manifest
@@ -1,5 +1,5 @@
-DIST types-docutils-0.21.0.20240724.tar.gz 20175 BLAKE2B a21715a3f24c120e58b4d542e97de8f0a580ad40fe9f7d451b9e2b2072f4eb552d750662d198d8afcd8a6f7e0be3605b727ac014f229214849d9ba3757feb7d8 SHA512 5fc881f945a0755d38cc36ed2134303e421f4f19016517ffb88f39a7f29d2075eaf4d5691c1280a90597fa87478c9eed747ad7a40df210ce0ab3af7ed36e6281
 DIST types-docutils-0.21.0.20240907.tar.gz 20273 BLAKE2B 8f90b7362a0b7a5d6b7e8d83b24e7fc03254425bb49e8f9bebc376ea85baf826f9da1ef0f03dfce0b54ef5de3d939e9209f3cbd7f947e1b5de3aa0b72cd417b4 SHA512 fa668508108411b00d46a5c4f781c42b0e245fc375ff4090a1441afad972f6b57147f04eae5b1713d0f51b74c1d8939cd064fa3a956a956cff9c3b06bc09eb1e
-EBUILD types-docutils-0.21.0.20240724.ebuild 374 BLAKE2B ff26b0f1f08c03c86016c46ca7c26db193243ac9ba80bdde0ce727b766359257991998b2af8ab7efc64f5926b420e51c5a20cf4004ac88c408664c7ee4e55af7 SHA512 c3c5d306b8730f8324ca8f50bf503b38f05a2f65b62a908f90fcaaad30989ca5aad56e5ba4f2d96d8df59e57f9e555300e89ef9a5a77f43ec1e9af7451e5010d
+DIST types-docutils-0.21.0.20241005.tar.gz 20701 BLAKE2B c1aa7debb6f5da6f9ca4fa365ea3de25d6cc2dbb8303affa9ea484c55ecd984baa46190277902c60de9e5f8f17e771a0ce09e8959bcb5508bfb3123e19fd28da SHA512 d95436ba63514792a6239c78322494fbd655d2f7b6c06ac6aac2dff0a10e941f020583c5bb4fa88eda39632686ccdd8bde77c242bbb520044082482484a45cb1
 EBUILD types-docutils-0.21.0.20240907.ebuild 374 BLAKE2B ff26b0f1f08c03c86016c46ca7c26db193243ac9ba80bdde0ce727b766359257991998b2af8ab7efc64f5926b420e51c5a20cf4004ac88c408664c7ee4e55af7 SHA512 c3c5d306b8730f8324ca8f50bf503b38f05a2f65b62a908f90fcaaad30989ca5aad56e5ba4f2d96d8df59e57f9e555300e89ef9a5a77f43ec1e9af7451e5010d
+EBUILD types-docutils-0.21.0.20241005.ebuild 374 BLAKE2B ff26b0f1f08c03c86016c46ca7c26db193243ac9ba80bdde0ce727b766359257991998b2af8ab7efc64f5926b420e51c5a20cf4004ac88c408664c7ee4e55af7 SHA512 c3c5d306b8730f8324ca8f50bf503b38f05a2f65b62a908f90fcaaad30989ca5aad56e5ba4f2d96d8df59e57f9e555300e89ef9a5a77f43ec1e9af7451e5010d
 MISC metadata.xml 325 BLAKE2B 399aab1e8779e48d84998d6fdd595638aaf674b9a7076573aad7ade16855c4fc785dd45b1eff833c8ec7accda2a08cf561dfa14237e4edf6292fc7961ad76f7e SHA512 fb2768e73dd948c79654ab22c24d868a418576f2008153e45e4d0b42e2750872884bd35451ee3917203469d72d1c76f84d849e9d3534dc1006eb4d80b3ef04d7
diff --git a/dev-python/types-docutils/types-docutils-0.21.0.20240724.ebuild b/dev-python/types-docutils/types-docutils-0.21.0.20241005.ebuild
index f42134c19384..f42134c19384 100644
--- a/dev-python/types-docutils/types-docutils-0.21.0.20240724.ebuild
+++ b/dev-python/types-docutils/types-docutils-0.21.0.20241005.ebuild
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index c90c76dd0227..3521c90e867b 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,5 +1,5 @@
 DIST types-setuptools-74.1.0.20240907.tar.gz 42970 BLAKE2B 06ceaba13ee061d231a0c02196fc97b3e64a7a13d9a728ab0cb5cab728d8944b2ebbb73d77b6c5d805f7fe1cc5f2b34dcae2bf62a12e27d265cd03507092d31e SHA512 623e5904e3d102a603feaa88ac7a4558a06cfc8e25888c013352d3016efdc296fd7dd343466cd646ccc41d9d6c65e789467eb309a5946b282110550589d1126f
 DIST types-setuptools-75.1.0.20240917.tar.gz 42585 BLAKE2B 7c38b2249c0f297e81f0fb7e19222ba6c5c103833a51c410a560c52669537f511f950e2f5777319c43fd07b821de6d6ce7ddd77c4fd19bcc6e046ccbe4f82172 SHA512 8861e31317f23496dcddc9f7fa3eacdf7fda1a097a4e257b41755b97de3571f698e3ec3bb6260ccc6168a5b7ad309c4399f7806727e185b6d3d9bff332e7942f
 EBUILD types-setuptools-74.1.0.20240907.ebuild 440 BLAKE2B c734df29e57433a7e8e2325687fb52987edd825cc42e801f8fb8fd77f870f1de03e3d776df8ca52530423e298af5bf4fd1b3b5edec322c5e8556c4ef7fa9c90d SHA512 292081f2e1d3e3c8fa152a361d7c1ecfac6222dafced339663b7a5a40a5bb40e4fca30a18a3028cd9189c2c63797e2c6cafc3110d06478cb33382ae853d7f72a
-EBUILD types-setuptools-75.1.0.20240917.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
+EBUILD types-setuptools-75.1.0.20240917.ebuild 440 BLAKE2B c734df29e57433a7e8e2325687fb52987edd825cc42e801f8fb8fd77f870f1de03e3d776df8ca52530423e298af5bf4fd1b3b5edec322c5e8556c4ef7fa9c90d SHA512 292081f2e1d3e3c8fa152a361d7c1ecfac6222dafced339663b7a5a40a5bb40e4fca30a18a3028cd9189c2c63797e2c6cafc3110d06478cb33382ae853d7f72a
 MISC metadata.xml 399 BLAKE2B 6e130dc38e0e0e0e6e02567d750d37c6f28ea40c4742a9247f347f29e1700fc420015e7ff951f4a11c156c2df88d7e3b7f03be7759d05872a7783a2d25e35b1e SHA512 bbc9cb552e652e7644d4d635cfd74fdfffcf6426160025411843d53d37b02fdd65f7e1fb435fee7b628033cef517e3f5a902466b5786b842592ccfad068edc15
diff --git a/dev-python/types-setuptools/types-setuptools-75.1.0.20240917.ebuild b/dev-python/types-setuptools/types-setuptools-75.1.0.20240917.ebuild
index 50edc0c91a3c..7868f39fe54a 100644
--- a/dev-python/types-setuptools/types-setuptools-75.1.0.20240917.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-75.1.0.20240917.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 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"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 0ead19923c2e..dbaa8f5a306c 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -2,5 +2,5 @@ DIST uvloop-0.19.0-cython3.patch.xz 6352 BLAKE2B 4a7056299d3d430ce5b6986d43ba4f2
 DIST uvloop-0.20.0.tar.gz 2329938 BLAKE2B c9f230b16227bc98c071e060c98b4920d919c732f20237aedb3af9eb0b21d224bcdd6bd10c77ad45d24c64c70fb7e0d3ccde6d1eb90c67c33c1671bacad2a3b0 SHA512 9597f66e735b039b3eb6ad9ae3a1e58e710e6ba38b9131384befde15795f2a5fde7d5724af0e6f4e6c335fa14605dde5d28256f05b1e36c706e851fbe3ccb46c
 DIST uvloop-0.21.0b1.tar.gz 2492824 BLAKE2B aa9b07ca6f95020e22384e848abc137e1b7fd95092b01e41471a620c4614a48f64fb1031b6f6842a62dcdf2c727c1849421bbfc862e1eb0bbb84173668cd2f07 SHA512 ae0caf4c79102ad12d0b1bedf4ec64929ad15a281908fbb336f806fa35194838ce14993e49d569b53e4aa8824e51a5a5a7156f938111ec4d2e0f1319db72b415
 EBUILD uvloop-0.20.0.ebuild 2033 BLAKE2B 81c7a8df786a90ce2916de815784c30d39cc5f048efd339a76684a0e554034eb17bbb31e767a6ebc1d9ef1e3cda00986581bc32745624140e76b5eafb41072d8 SHA512 95318d636b597ea33f86f231239de13f44cf763e8260fdbfcc7a2486f08d35a3f9606e3f9e11e7d502ea89194c4368fa68fb210f714a1d7127f58a001b6a471c
-EBUILD uvloop-0.21.0_beta1.ebuild 1923 BLAKE2B 431c4591622138fad11b3c8763e9c883d6b8497a1bc8b0fc1e7f01b531d0d1934c7854584e8017907d43a9c11b8a27553f12694729dd20f9bc12cb6ad8d6c373 SHA512 44fc25b2bf36f30eccddc05998ae70368a6220ed5b90f493823e0cd79c43a4f3fcdde90f12035b273636105f1aa73becf73841dea0e2fa4ed8ba6ffa3c2d5e42
+EBUILD uvloop-0.21.0_beta1.ebuild 1919 BLAKE2B 36e99da295608e0a094fd388e006401b5f8eb35b89f255c3e9162bc6c0ad663bb5c31c1b7619b4a029afa4438473dfe03f1fa05f988130488ecc59253b937be1 SHA512 306c9bd598bce668afbfa71f262a11fd5541b7c8a50d6bfe9135d54f63a79c12701c8e664da5361ace549838c6e03eb96c8dcd44475ee2de1e42aba55193a2c0
 MISC metadata.xml 527 BLAKE2B 2db44bdfb681fcce35ef35f13155293ac3fdffa12a695b654ed8acc608cf1f769243136e66b6b2c1afd57caa7e59a66a60d34631c37a4b98a474bd0635fcbaa3 SHA512 02540835a23405c467293395fa7984741e02ca1aca75f527edd3b988d307b41db0f729d5cc0b3a826a652fb7104dec7be86a9a57f4d5646d2af87255cc2d90de
diff --git a/dev-python/uvloop/uvloop-0.21.0_beta1.ebuild b/dev-python/uvloop/uvloop-0.21.0_beta1.ebuild
index 125f4a5d40c3..48c597ef851c 100644
--- a/dev-python/uvloop/uvloop-0.21.0_beta1.ebuild
+++ b/dev-python/uvloop/uvloop-0.21.0_beta1.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.19.0-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 -riscv ~sparc x86"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 803da121c85d..2024de7e9189 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,5 +1,3 @@
-DIST validators-0.33.0.tar.gz 70741 BLAKE2B e999d1ea14e2240523537804931fc91f5eb02d4ff35b22e8a292ff8785493ce48cd14ccf0d87ce945739c3e65a79b3a7654a66412bcc41e4e37e0fd87eefad72 SHA512 611844e182319209a2f6305daf3fcfc1801d9ad32179eaa9651844df37bd3d1d42bfd1e69be1e2c4fcd811a231228bc748a12dd6583248d5b572394cb9c9d858
 DIST validators-0.34.0.tar.gz 70955 BLAKE2B 5c757c3b2a0e3557663a0eee5a08fbc43087362f492629cd9fba6f7ea7d5e99544de1a82159338d02af40f434345c3170e9b19873a890690fb0d94526e495892 SHA512 d49df68ef60734d8462c37aea7b7d274ebe4b31d768761c3da6d219d59574bb6efc444e5501073fcddffcdb3752766d19d231a63da682bf02f82739526de884a
-EBUILD validators-0.33.0.ebuild 572 BLAKE2B cda3bf03284b20d4cefa1c309643bc1a1542873d404c8226a7affb8d9b9ce0802f990e9ef2ee57f7c377cd1efb42b12281df0e0d3671e5a037f5e0620b5f5ce6 SHA512 c39e181362f952449bb86edb67c29015e4d98f0281cf7489d8ccf891adf44e0452d93fd36bb39e8fe9b9c570afb0f8154a2c33305e7340b2b0595339128f3e55
-EBUILD validators-0.34.0.ebuild 585 BLAKE2B 95a57b43bbb48d85267ddfbccd83bb9b8d8e90b3115483d1710bce781c10b838fd51596ad0a209ad917652f5e2d37efd7693ad8e867da0c15e7d53c498e90646 SHA512 c96e74be9efa78d9a25ed5d55a3e4f654c7d5c4198876e6444b2f667e1fffb38e5bae86f7e033b37753ad9f3249a574e644624bf9b41a048d7517643dd1c7b6d
+EBUILD validators-0.34.0.ebuild 578 BLAKE2B 174ec413447313e5e9a90634c5d23c218497bc68da5e49c92b2fec80b3e9ba3688ab6f52d128ddf01c19de59ebfebeca9c311324443c3f300b3043645e99ecd2 SHA512 11a372e1f2c9a96333f4553a323941b93858623106e69451afb7714fa81bc9c820a240ab6180bd93e2375c0893d6622fe60cfb322c97777b3454314b21533c29
 MISC metadata.xml 519 BLAKE2B a590f05cb14e02149ea83eaa045973624f5b0185a828d97ba5c6d071518718dbb664b5b207a1409fac0f7e9831b8555c4ceab6b7bfc105a96ff790291e5b5482 SHA512 40473bdc0cac23032dded1a4e9cbf52659f6f1480f431fda9221cfdb5b7c5b61ae74d3621eb081c39c19771fff32eaf703462e9466985170b084d524a8cfaf0c
diff --git a/dev-python/validators/validators-0.33.0.ebuild b/dev-python/validators/validators-0.33.0.ebuild
deleted file mode 100644
index ddcc3a3b905b..000000000000
--- a/dev-python/validators/validators-0.33.0.ebuild
+++ /dev/null
@@ -1,26 +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=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="
-	https://github.com/python-validators/validators/
-	https://pypi.org/project/validators/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires eth-hash
-	tests/crypto_addresses/test_eth_address.py
-)
diff --git a/dev-python/validators/validators-0.34.0.ebuild b/dev-python/validators/validators-0.34.0.ebuild
index 1bc639b1e833..72e04edc56c5 100644
--- a/dev-python/validators/validators-0.34.0.ebuild
+++ b/dev-python/validators/validators-0.34.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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b499ec2d2cdd..a4b2eaff7e04 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,8 +1,6 @@
 AUX virtualenv-20.26.3-ensurepip.patch 1231 BLAKE2B e70cb1a5f8dc8ccf6e08fce67aa3485c0f584937d8e7b693f0d0859d6ec9d9b16bf1492b9abe96d4c8c8eb12814eaa54f76ed8e318f3871ee956189ce08b3dff SHA512 86c98d7ce4a9ea073c72cd103cbce66ed720794fa4fa2b68ac19382e3c4f53303613aed80a6984a68cab513cb198d648c5c6f103308eacb3c7306b72e4321129
-DIST virtualenv-20.26.4.tar.gz 9385017 BLAKE2B a9b7f2dd105e6d7e5c85456351fc85fd6b4daa697574b6c1c8d51139d0b64f06fff024d721c4182cadb7c207c03b5f8877917dc79eb6102373503479a9f70215 SHA512 afce31d4bea624c98893d2ab5d7ea02e87e1ea18ae25195864b32c8d127d44fe7e1d07c24949138496f571b71d745d2f571c0b2a895d2282bef04dfe496fcd93
 DIST virtualenv-20.26.5.tar.gz 9371932 BLAKE2B 3b85da76f00e44b4e9fd33ef159e06cad06e4b0663aff9433712db8dcc0abb0bad7b94f260e374687f81b09a12bb3438f533267035370efbdeef20e8f9371461 SHA512 616d6565731d8b1f4ddf90eea9c7018eb1bc553c9ad6feee5f9e6669a996205afbedd900bf8d74cbcca7113fddc985ae279454274a7ec8902ac068e5e4b1b5ba
 DIST virtualenv-20.26.6.tar.gz 9372482 BLAKE2B 7e91c8beb59c3c3f4d538af425916abe94151efedae3f643c573f6c0dd05a37cfc42b5e61cbdb73e02fcc5adbfd34a0ffa5096790975890fe9d17f626ea5687c SHA512 9d403a835c66f9b7f733d3720f459b9450dddd5cd9a76358332da20dddd309918177d3d7782304e11f56f48755d901feb4eb9b708c3719241bf389f29bf0ba04
-EBUILD virtualenv-20.26.4.ebuild 3420 BLAKE2B f14f7f0d059ee5d5c4b1a18b4068d41ad6bbce2ee2bcd49b1cac89d896398f1a72a4a41caf041b1539a5b7c85fee4ec6fb5e92882ea52d184e70dc11e3e351c6 SHA512 5daf437d02672dfd5381844336edb86e3c83a07ca521d72a9f16fe467620a1abd454e4f85f0ca9c6a9db910d30b343dc52bd2737d5cb872e580947d71e63e670
-EBUILD virtualenv-20.26.5.ebuild 3428 BLAKE2B 357c6a685e462336f5aa62e316143111454b7c32d75d56f080074099d81aa86705a58638b35db827d2c69642618959ee80a138700948695a051ae4f7f9513be4 SHA512 43f379b79040c4acb4e2e26a868b7ad8ce35b39dd11cfa7082728231e90cc14eb94b33427050c375418eac9aae24f05d3e6f4cf7440c71eae01bcd2dd3a3be94
+EBUILD virtualenv-20.26.5.ebuild 3420 BLAKE2B f14f7f0d059ee5d5c4b1a18b4068d41ad6bbce2ee2bcd49b1cac89d896398f1a72a4a41caf041b1539a5b7c85fee4ec6fb5e92882ea52d184e70dc11e3e351c6 SHA512 5daf437d02672dfd5381844336edb86e3c83a07ca521d72a9f16fe467620a1abd454e4f85f0ca9c6a9db910d30b343dc52bd2737d5cb872e580947d71e63e670
 EBUILD virtualenv-20.26.6.ebuild 3428 BLAKE2B 357c6a685e462336f5aa62e316143111454b7c32d75d56f080074099d81aa86705a58638b35db827d2c69642618959ee80a138700948695a051ae4f7f9513be4 SHA512 43f379b79040c4acb4e2e26a868b7ad8ce35b39dd11cfa7082728231e90cc14eb94b33427050c375418eac9aae24f05d3e6f4cf7440c71eae01bcd2dd3a3be94
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.26.4.ebuild b/dev-python/virtualenv/virtualenv-20.26.4.ebuild
deleted file mode 100644
index 9523d6898950..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.4.ebuild
+++ /dev/null
@@ -1,118 +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} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-
-	dev-python/ensurepip-pip
-	dev-python/ensurepip-setuptools
-	dev-python/ensurepip-wheel
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# use wheels from ensurepip bundle
-		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	# remove bundled wheels
-	rm src/virtualenv/seed/wheels/embed/*.whl || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		# tests for old wheels with py3.7 support
-		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
-		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
-		# broken by different wheel versions in ensurepip
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
-		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
-		# hangs on a busy system, sigh
-		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
-	)
-	case ${EPYTHON} in
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# remove bundled wheels, we're using ensurepip bundle instead
-	find "${ED}" -name '*.whl' -delete || die
-}
diff --git a/dev-python/virtualenv/virtualenv-20.26.5.ebuild b/dev-python/virtualenv/virtualenv-20.26.5.ebuild
index acc7255ef749..9523d6898950 100644
--- a/dev-python/virtualenv/virtualenv-20.26.5.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.26.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 1424e79754a4..5676ac552ea2 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -3,6 +3,6 @@ DIST websockets-12.0.gh.tar.gz 352120 BLAKE2B cab704e0ee44a7012ee58d515a5ea7380a
 DIST websockets-13.0.1.gh.tar.gz 400436 BLAKE2B 3387cdc72117d2b1b0d1a5d3bc2444a243de2536b3937459221095b539172fab60972f4b1d0371c9c88222f8dcdf604a0371de1519728b40889a51ad6dd32029 SHA512 b187e7c443b9c6abbc7993f9c45dbd4fe83784d3ceb339b6e7d104cfa4da03450c25a8bf9dfa9c8626c3c91f2fe44c0dec6579ba830e0e20116a3e1e01be3bf1
 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 1583 BLAKE2B 1994b1df4d78b04588efd82af14701817220f626c647323a420471657c6abfb4357664d5495fe51af62f8bd490461f51515ec9037e921c83847de28b5b437197 SHA512 e0f183e129758c197643ce4e536330d56afbe9b21702ec15edfd2fa05c4a273d7478bed8eadb5aaf45eb649f9e4fb99466b5a47db8fcd2246ea56602b3a66413
+EBUILD websockets-13.0.1.ebuild 1581 BLAKE2B 1029bd38ed5df3d711306370a83ad906a1a023900f3328d176da4afa907026624476667567334d8c7581cbb09eb2f0f16d8fabbb50922f1c893856578883d389 SHA512 c9db27f0fc019ce4ad33b4edf5916994d232d61179260de549cf6658aa82d8762d22144d8751025020887e3347ff1216884c580aef466354c5f3913bfcd1d26d
 EBUILD websockets-13.1.ebuild 1583 BLAKE2B 1994b1df4d78b04588efd82af14701817220f626c647323a420471657c6abfb4357664d5495fe51af62f8bd490461f51515ec9037e921c83847de28b5b437197 SHA512 e0f183e129758c197643ce4e536330d56afbe9b21702ec15edfd2fa05c4a273d7478bed8eadb5aaf45eb649f9e4fb99466b5a47db8fcd2246ea56602b3a66413
 MISC metadata.xml 580 BLAKE2B 66a318a73b2a9e37f44a28dfc9ed5f1aa7193edb05fa295bde27fd7a1c429cae1d875289ac5bd8ff7b579be2cfc5671d27dfb46ba959c47b2c1074e8e549e9c3 SHA512 c4ba79e5ec539ffb6f0338e6e161132dc8dd0e6c7e7533df1c32731810126b728076703a542bb28abc159842ad71bd42e69e36f4fe17dc3377d054d21ec53dbf
diff --git a/dev-python/websockets/websockets-13.0.1.ebuild b/dev-python/websockets/websockets-13.0.1.ebuild
index 93fc44988e99..e4061980471f 100644
--- a/dev-python/websockets/websockets-13.0.1.ebuild
+++ b/dev-python/websockets/websockets-13.0.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/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 00974815f8c3..60370f0c7356 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,3 @@
-DIST xmlschema-3.3.2.tar.gz 575004 BLAKE2B 4d92be6ec8933201198b38f741e06354c98ef9b2d02ecd20fefbf502d29ab82e705038ef966ad1e90e3fcfe6aae01e3c757b61e9d9acb506a0ab36074fbcc6c6 SHA512 6216373f8d8ebc2244267f2659a887b937fb5c529909b5afeb99dc7d0aed22080870b5d35543e32f16dc8e8c6fc1e0859a99fd9364c03e01aa69e71dd18078e6
 DIST xmlschema-3.4.2.tar.gz 584249 BLAKE2B 82c01c295932e0e0a503d89b878cd7972550b531edc2aa162b9e6139cf3657890d3b5fe15a8bd667e5adc24ab29b6458f095ad55f9a88b7cd9bca93eed200200 SHA512 fd8c3df89f1768a8670e8bfdb34eaf93b80e191afe6ee15904269f0e3ab728aaeca5c56e046893708aba0c7763421a50b085bd03ec8aba1326f6608b39871b03
-EBUILD xmlschema-3.3.2.ebuild 830 BLAKE2B 92de18666c0d4e244dcd19605b401ec936b3a52fa9a79504bb2868e06a49ed4bce29051abd4722619cd766d85e381dfd05e5688afd5e50db1a7b5b1192560879 SHA512 6df68ddd025be02909d3d02353c7d85b8c408fa106d533abcd8911d440ab976b5242c0bda34903353f485fa4c665a6b516a158dd3c43deb9981bf3a76548df96
-EBUILD xmlschema-3.4.2.ebuild 838 BLAKE2B 2529b948ae53e4db100efb6899e8d791045e960fc37a2d5966904e277ca791c45a826e67cbe2e041ffdd293bbd6c07bc39e01b6a14a9e2742797a38fe177a9a3 SHA512 af167dba4af40638b59eb9276af8619351481a6d059c610e84e4eb667a6cee710636f6726cab3d53325e573c5c9d23f90a8a979c1f81b72fc96afc2053577129
+EBUILD xmlschema-3.4.2.ebuild 830 BLAKE2B 92de18666c0d4e244dcd19605b401ec936b3a52fa9a79504bb2868e06a49ed4bce29051abd4722619cd766d85e381dfd05e5688afd5e50db1a7b5b1192560879 SHA512 6df68ddd025be02909d3d02353c7d85b8c408fa106d533abcd8911d440ab976b5242c0bda34903353f485fa4c665a6b516a158dd3c43deb9981bf3a76548df96
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-3.3.2.ebuild b/dev-python/xmlschema/xmlschema-3.3.2.ebuild
deleted file mode 100644
index b88838aeb210..000000000000
--- a/dev-python/xmlschema/xmlschema-3.3.2.ebuild
+++ /dev/null
@@ -1,37 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="
-	https://github.com/sissaschool/xmlschema/
-	https://pypi.org/project/xmlschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-python/elementpath-5[${PYTHON_USEDEP}]
-	>=dev-python/elementpath-4.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-3.4.2.ebuild b/dev-python/xmlschema/xmlschema-3.4.2.ebuild
index ffac0df6b109..b88838aeb210 100644
--- a/dev-python/xmlschema/xmlschema-3.4.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-3.4.2.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlsec/Manifest b/dev-python/xmlsec/Manifest
index 6780782a41cb..169562939bd2 100644
--- a/dev-python/xmlsec/Manifest
+++ b/dev-python/xmlsec/Manifest
@@ -1,3 +1,4 @@
+AUX xmlsec-1.3.14-c99.patch 987 BLAKE2B 7e46eb064620ffd21dc85ac202d609e3fdecb1a29949faf52194f9b0206a5d4086685c6abfd149f07d295e9bcdf7e4f0a35c14e64c3555defc8c911e719517db SHA512 40f70c8816cbb3db7ce08939d6adfc1f095e75aff6415182d4796003e87a37bdf57cb96eb9e93c0b0417615d99a7b10b4852278800e423a2cf8870172b68a033
 DIST python-xmlsec-1.3.14.gh.tar.gz 80643 BLAKE2B b256ad1aa18b5a746148ff4b2e8b3136a31105e1bb64d2dd686d5e62c16c183187432ee06f0f8b9da0bdba3b96c3c1e7fb6f51148bb5d5d60e54083841973399 SHA512 7a28695bf122a9c04ed20e4a6a09f9428372c908857b1dd983251a7b890cc50e92a6fbaa7f062cd58d86dda14257720e9c9554b2b54d840f9180110d93145335
-EBUILD xmlsec-1.3.14.ebuild 1287 BLAKE2B d56cb5169d8dfcade455ea0e34f7f3879d5a2d03a7a9887d8c7bbf3b8ee5cabe66e8a0b986a8e820c42ccdcd4bf319ef23f17164f67928e67081c02431c7f32a SHA512 90c9535c2a8662d723a47fb964c60c1f4bfa8a955f1bbdfb9f47c8e9420d6f45d62de3740e9116e93edad67a0034b006647b68d65c46d2c553776a2b4734d52f
+EBUILD xmlsec-1.3.14.ebuild 1330 BLAKE2B 6834de24d2c47148b988e350e31e1c34a6f54ac01b6abaff6efd897b60c46b2f87c92ff14ffe75c22d4ca8385e8c6cbea9e94333e95fdd89e14d5a4b5269c3aa SHA512 81d040e2183008e3f0a2ecd5ce00d9bd513c3f88a19903f9402e1c10113a45e2461e1dd41457e042f302e04cef382c05b594482a63eee9700d84a24f6a18a4f8
 MISC metadata.xml 480 BLAKE2B 17abd324963ad808438f7c04a5785ab72e280a5ba8b132737d89c06fd17fc20e96478b4684ae84864bd03690bda6e865200a8eacf3bd0c23ceca4f0230bef1a5 SHA512 82d2b54886ba9d2eeba17aa04e2946c9dda8d30a5bea9a9ba7a5041b559971466c33ceb67ed35c9f865c052df09fb9fd057b46efd4d3d4314f456c8b1c0aaac7
diff --git a/dev-python/xmlsec/files/xmlsec-1.3.14-c99.patch b/dev-python/xmlsec/files/xmlsec-1.3.14-c99.patch
new file mode 100644
index 000000000000..1cbdb717d9e9
--- /dev/null
+++ b/dev-python/xmlsec/files/xmlsec-1.3.14-c99.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/920769
+https://github.com/xmlsec/python-xmlsec/issues/311
+https://github.com/xmlsec/python-xmlsec/pull/325
+https://github.com/xmlsec/python-xmlsec/commit/67cd4ac73e4fceac4b4eb6a320067cad33f79213
+
+From 67cd4ac73e4fceac4b4eb6a320067cad33f79213 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 19 Jun 2024 17:43:07 +0200
+Subject: [PATCH] Explicitly cast the pointer type in
+ PyXmlSec_ClearReplacedNodes
+
+Fixes https://github.com/xmlsec/python-xmlsec/issues/323
+--- a/src/enc.c
++++ b/src/enc.c
+@@ -204,7 +204,7 @@ static void PyXmlSec_ClearReplacedNodes(xmlSecEncCtxPtr ctx, PyXmlSec_LxmlDocume
+         PYXMLSEC_DEBUGF("clear replaced node %p", n);
+         nn = n->next;
+         // if n has references, it will not be deleted
+-        elem = PyXmlSec_elementFactory(doc, n);
++        elem = (PyXmlSec_LxmlElementPtr*)PyXmlSec_elementFactory(doc, n);
+         if (NULL == elem)
+             xmlFreeNode(n);
+         else
+
diff --git a/dev-python/xmlsec/xmlsec-1.3.14.ebuild b/dev-python/xmlsec/xmlsec-1.3.14.ebuild
index c478fef45bc2..2c874200e845 100644
--- a/dev-python/xmlsec/xmlsec-1.3.14.ebuild
+++ b/dev-python/xmlsec/xmlsec-1.3.14.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-c99.patch
+)
+
 EPYTEST_DESELECT=(
 	# Fragile based on black version?
 	tests/test_type_stubs.py::test_xmlsec_constants_stub
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 68be190b9aa7..1fccb1d36931 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,5 +1,5 @@
 DIST zope.hookable-6.0.tar.gz 24013 BLAKE2B 808005d0993e22967bc7a73a7b8a26f2263dfc9f3f33d840495a233ea8686a5e700ee46cf0dad8e37aeebb0383ec51b15a4f98323daf4d6bb606fc1ab149f39e SHA512 33d1200a24fc664ed9c7942f71b003704fda21ac42f5acc24611838aa4e8096a27a5da01956ec824105d454a0580480ce8a262c8f5c4f24782ab11416d9fdafd
 DIST zope_hookable-7.0.tar.gz 21392 BLAKE2B e6b2921f68be1f5156fede45db2a71e6394785bd5e0a4aff86a5cf943b790e0d26163391bd448739ad074e8b792b37334e48c05086268509d980035bac260066 SHA512 f927a0e15aef9adca72f25c21f2c374d6235d8e3abca9d5d9832e9c8d9b70accebfec2cac339ae360d142e69f69f920c7b2bdbbf230c975fe2c362887380a34d
 EBUILD zope-hookable-6.0.ebuild 918 BLAKE2B 274508ea9f8f435af96d897f2190769924d1cd3cc86af21d3f646bc433dcaa6a8c239d1abfc5fde8b62c8928a68376215e4ee191a5e00f93f7b386e595da4bfd SHA512 f4ddb9f566edaec47a77335ce34862d07d4da3fdecc97cee3d9af11056e2793caf3d73f4289d9a66fa5f920e001ed631b53a9cde8139a6b3fc1bbc2563baa7dd
-EBUILD zope-hookable-7.0.ebuild 901 BLAKE2B 638f2aab577b42256f7a76426c27a2771742bca8c027fa613997854c577b2cb6e100a94dc08a0b4376776d26ab737a7397e0eadbcd79ac05fce9865f823593c2 SHA512 0660bfa8e9216ef1fa20f1300b350532e860537501aa9eb8c833a2ca6ce9ae88298571d7452f99ec25bd9428781167b7d0b3cb3796ba0dc400470a5b1f2e3c44
+EBUILD zope-hookable-7.0.ebuild 899 BLAKE2B 41ff499cb1e725a5530a8a8cd3d4a4c342016e6475ea20242080d876f409ead7054985fae0f4fdbb85fdc1265a0aa5de245d36472a3ddd2f8527542c2ca1a24a SHA512 3c3854158c1150b5338c89c405f71e87a719009b55b93c1c64bdf36c69a5898e3c7cfb6802c424b0a37b0a72a7bf168731e26ccdf8beed168bb30c283f2956ce
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-7.0.ebuild b/dev-python/zope-hookable/zope-hookable-7.0.ebuild
index 3704c02ccd78..856b2b7e1ca0 100644
--- a/dev-python/zope-hookable/zope-hookable-7.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index 21478def8db8..e5451c67dc5d 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,5 +1,5 @@
 DIST zope.i18nmessageid-6.1.0.tar.gz 31187 BLAKE2B 1e616fe67d42e686928af298507afd1c5e962b4fcf89269fc69c00726814e51dd49c5a602d9da2153d3c11cb8e80fd4a9dfea354ee413d69a2022fb5479858c3 SHA512 13ca8d6c145ac48217d0f4fae4ae7fa2129a8d37ceeea640dcedca8815587cc9507935f0cc070bf37307cc21269b1a9decd2d18ae1bc79fdb0128f59f7e4b43b
 DIST zope_i18nmessageid-7.0.tar.gz 27929 BLAKE2B fbe19aec71001b4779a390cf0fc596e86667e149900cf04eebb4d2b50a3cdad8f1bbd0f81c88e8841534540dacf4fed3ef91a1519d3364b32132c7c5f833f8c1 SHA512 91256e68fab4db59b6220f67ef42e09896f3643bea472218fbeefdea248a52fa018a7e6bef4777b5a02aa878195cc3e51d0408e96fcaef02747de4cb0fc0add6
 EBUILD zope-i18nmessageid-6.1.0.ebuild 950 BLAKE2B ecb480ea3093f44606ae11119f6dfb0c51a0386e1484871fdbc5b954996aab5ccd379baf6c8cd56553177a7bd9371f5f4e832ca7d6a51aeb114232104fea01b5 SHA512 0117e729f06ab6a07922b59145cc9fb0283d9329548b830ac6ec2c1eedae85ca45411b156d1cfc572c229fcbebc5d9122fe33d41a03d0c59c52ec4ab21407e50
-EBUILD zope-i18nmessageid-7.0.ebuild 933 BLAKE2B 2d956fa871acc48d6156275764660c58daaa0704d9b7ea1244fc76e2a97f49c1dd7572ffe520fc4e1b6f392d6046b0bd4f26aaa20c96f3226e488bbf2d57620c SHA512 131c89e173e3782d8bc7f106697606422413a87ff420460d1ab5f3ca954d7aeefc53d66134791e922b2aefa2246e9db0ef214affc56b3c085e6552f48d766e11
+EBUILD zope-i18nmessageid-7.0.ebuild 931 BLAKE2B 87762e30ac9ea8836e033b6a5d6f9f11c21a9e93b4e8b15a9b8ccd004c9e3f1f9ec0b4616ca43a2ab8567601887d145435a177d8c345ed853b171db361624150 SHA512 0ba84a95effdcc81388ed62163511372b69bb0e83cd5dbc3ceadc74ca66545b5df742a140dd77c94b895087d975d3cdcf27825a41d16c02cb2c549323300159e
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-7.0.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-7.0.ebuild
index 8660dd75daec..d80d1592c63a 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-7.0.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	!dev-python/namespace-zope