gentoo auto-resync : 27:04:2024 - 23:59:42

84 files changed, 372 insertions, 1715 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f2cb219c84a1..297971d74b1e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index 4c362611994e..14ba539609c5 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,6 +1,6 @@
 AUX PyQt6-6.6.1-qt670.patch 2528 BLAKE2B 3157c4e4e063747db56e92b011147dfb3a57474b6e80f052372d4b83b91bf36bb18ba256f4e2b4466c140744b075ac47217915ad5d744900754c8f4af7ab8f61 SHA512 5894b371cfa9b22de2300cc75b7ab486944ecd7c8f2aed6bdd03355c9952ebd550ec2383ff057d629b54d91f92ef67cd566a39d7e38696d6ba2b09622b9900e8
 DIST PyQt6-6.6.1.tar.gz 1043203 BLAKE2B dd2b6988ebeabaae47fe57c5c0d17fbe4b62c377262b4bb360adb7fd6724ccb6a67ba5c2bd7498df98db3ce6b00978f936b11a43b464c3c7af169f25b30ee1a6 SHA512 c2ff8c47c9b0e43c009d0c90f565a54344e6f384c67dd30c2d422465d0702c07713acc0095c8b67827d1146675611c07d548ba282a26e41bb60a0a21977a7a64
 DIST PyQt6-6.7.0.tar.gz 1050408 BLAKE2B 30dc8a2762cb5a149c401d497af714bb9209bc46847c0699522ee60080c46f0b1d4da854e70151a508c90820a2aa32da422bfd20c4320bcc9b5d5f92fd9e8677 SHA512 619210d2de3e149b55e2d45cbd8ec2113b3effcaccd25eef6067ea99b82e250f1ce288b38136604536053690071f8c843339b934b5ce5e539a5dfdecc26f44d2
-EBUILD PyQt6-6.6.1.ebuild 5552 BLAKE2B 877be0dfbc0f60169493a805035ee398f2e9d6dd005aa97695e1dc39014f0571fff1802f3a60e028659488c92da6640a265e29a0a64682d0e9b45233b30f236d SHA512 daf3dd77e42f5a5a6d1bf6fa3fdc3ff09c8f153c6fd430b1b6a4fedec707be5606ebd682c9059837f254762859d20c7379f993f6a2808e2c0066cdfe1f7fce8c
-EBUILD PyQt6-6.7.0.ebuild 5498 BLAKE2B e7c3b163e74d4c901faf72852b91d8a53673ce328c43db0cd3d4ea716073bf2f995e964b11f76ba8b2622156fe1c4c5e2838b59044bcdeef7001a1b2b471537f SHA512 7d81ca8f86cb10386ce7d93e3d681c68afc8c9d546550722302342c0b6528698950262198cbe56c1ed326915f73932e5d2ce3f5386143a8d7c1588ab4db8b9a6
+EBUILD PyQt6-6.6.1.ebuild 5589 BLAKE2B eabdfd5f38f4e6a6891d6cd6a231411e449c657a61243c62423cdc47112af400e8329b0e00ef3b502633e1680c867ed29ba6ae5e6e217d748af9b78c5deb8b15 SHA512 61fc05cea708f11a08ec1f0481143348bb05ba679fac2f7b278aa3e959d44aa1cd40f3f9949c9f1e7563559412b5c39db0c97abab061dfcf435c76441c363fc0
+EBUILD PyQt6-6.7.0.ebuild 5535 BLAKE2B 9d500edadefe5cc2906d0161e192616afa29b0ca62c5d42a7104acdca22e7bb8acddbf8898a06df990fb2fc74e6fe79ee2fdfb29c1504a48bff3e4b003cab8e2 SHA512 39d6b0e2bb707bf379f5ad001924b36cc14e71d8e97f6086fa4bb07483a99eb27d4c377a2e645f7e66f0f86932240afd5c06e33811301423d4939b33a442fab4
 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae
diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
index 328355759d54..804dd5543081 100644
--- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -68,7 +68,10 @@ DEPEND="
 	quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
 	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
 	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
+	speech? (
+		>=dev-qt/qtdeclarative-${QT_PV}
+		>=dev-qt/qtspeech-${QT_PV}
+	)
 	svg? ( >=dev-qt/qtsvg-${QT_PV} )
 	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
 	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
diff --git a/dev-python/PyQt6/PyQt6-6.7.0.ebuild b/dev-python/PyQt6/PyQt6-6.7.0.ebuild
index ca972682a7f0..033f550aeafb 100644
--- a/dev-python/PyQt6/PyQt6-6.7.0.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.7.0.ebuild
@@ -68,7 +68,10 @@ DEPEND="
 	quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
 	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
 	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
+	speech? (
+		>=dev-qt/qtdeclarative-${QT_PV}
+		>=dev-qt/qtspeech-${QT_PV}
+	)
 	svg? ( >=dev-qt/qtsvg-${QT_PV} )
 	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
 	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 1a5038e43a2b..0e265e0740ba 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -2,6 +2,6 @@ DIST aiohttp-3.9.3.tar.gz 7499669 BLAKE2B 0712df73af60cc9cbf12f0a4e063b6aa6da1b1
 DIST aiohttp-3.9.4.tar.gz 7500720 BLAKE2B 1f41e481590425c16ef9e797ecc78e08d00fda65b40c38e34226ada969f3114cae3f6953980d23b0e96e284f6e49fd0a84aa93c6b7a666d60690e9a9fd9c41b2 SHA512 e26e7148602d72c77fe46e0596614b448f38a9014834a72c4131d8b315dbbd401ce4e1a403ef35ea7a9ba7fafaddc42031d38b93b45464accdedf26ba99fc960
 DIST aiohttp-3.9.5.tar.gz 7504841 BLAKE2B f051ee88d45952219f72d542f1c6d0cc33c699c6c5fb5dbe3bc054ee4d0e03121b219c8c8524fd1236a8b878329b0997b8afe07d6c66074102d4a2052a8738ff SHA512 da11468a2f131275593395b052700a99cf79055a32d48327dca0f58547ad30add8cd0a375dbd831e2f06fe7a739183251e4ad69c16f3d141799bbed45a8a5dc4
 EBUILD aiohttp-3.9.3.ebuild 3110 BLAKE2B dcd71e7f5efa5bc26ea37d62d53052badd9cf7bef702a7d14bd90311eb771a68c03b8164fa5fb7c655be330b16006d8658a6155428980bb3a540c1536af006dc SHA512 2a9cbd30d313f2a8ee5e4c96b955545047c6838b810e87ea8abba458d28efc0247485311627c05c76b38ad1c9154012ade453a3ce964d747fd18a9a1246e803f
-EBUILD aiohttp-3.9.4.ebuild 2892 BLAKE2B b6067b3c9b71e269203a16a937292d60f8ffdd0205bb2b793ee697d718094c6dca48cb8b98ae5058423e4743f6c59053fc5bf925c1f107af38d8534447a366d4 SHA512 930265edfcd0e6a1ba74a45b83ecf4f2e2e0d3feb1632bb592bcc61656e363d2e06a4384f31e46d7a9bdb1e71fa1892cf9e32c9887b4f2b39abde69b907657b0
+EBUILD aiohttp-3.9.4.ebuild 2885 BLAKE2B d5c0b73b297de12786b89ff1c6ebcd71d0fcd0113aa3da61034fd08850a62027e41b646b589761e5fb18d08c63c8df8200a7c5e689687f73f5544335e9103167 SHA512 f7d6f61a25640bf99bba50bb5e611ebd26bd23a4d2e4dfb43a892c13add9e8778aae8c5da0a5b402974dc49b04021e40407c1e2b180ae6f6460168a5de4b93b9
 EBUILD aiohttp-3.9.5.ebuild 2892 BLAKE2B b6067b3c9b71e269203a16a937292d60f8ffdd0205bb2b793ee697d718094c6dca48cb8b98ae5058423e4743f6c59053fc5bf925c1f107af38d8534447a366d4 SHA512 930265edfcd0e6a1ba74a45b83ecf4f2e2e0d3feb1632bb592bcc61656e363d2e06a4384f31e46d7a9bdb1e71fa1892cf9e32c9887b4f2b39abde69b907657b0
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.9.4.ebuild b/dev-python/aiohttp/aiohttp-3.9.4.ebuild
index a4d57535e7e2..66766e3f32bb 100644
--- a/dev-python/aiohttp/aiohttp-3.9.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.9.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index bd118c9e88ad..d453ad6c4dbb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,15 +1,7 @@
-DIST boto3-1.34.79.gh.tar.gz 792796 BLAKE2B 97a4f8e6fc33bcfe2817ce353df8ff6354bc89c449e5e29833704e12513aa21129863164c51047b17c7f15a47f0ceb90c60a83071464283292089b2535e8fed9 SHA512 15161face918253eac06dfbeb67adb8ef5ed6902b2eed760feb9fdd3aee0e38da3511aa7d829914b6f80addff7feffae7d3645f7567643a37d3659001d7b6a1a
 DIST boto3-1.34.84.gh.tar.gz 796658 BLAKE2B 76ad7997f92167f1ed2f14a0a780a1a58b4a853ea132ca38797a228382ad8f55264dfaee99ebf6f8e2bea1848ec918f7b3b0943d0bb6a81b3b858e729b2e74c4 SHA512 55988d7ba69a46b986ed2cffd46b37a154baaa3a73ce62d9ee5b4b8b6f8987f714034ae4f3e59ed9907920216eaf8b18edea4c0fbac99037979b8b30e3b71133
 DIST boto3-1.34.88.gh.tar.gz 798806 BLAKE2B 2d3e02f0584e138a75acb68593bd88126641d4617c668062685406d3dc1913556bdf8b821ed3deb6cd9abae40e27a5e03fda35f5824c40a8028346868776de67 SHA512 9bbff2c0589cb2dbc5ca52f224f052c2a924117f16903c2ecad32d486a8b2d31fb9253c827c5819a5203c3ac349d1c990be24a413fab7e0b9c558e1b94ed8e9e
-DIST boto3-1.34.89.gh.tar.gz 799495 BLAKE2B 2d719b0c2e09f0387dbe317f76555b36fda7a1f364b02df2ba8387460e98493edec8d57d75bdf9cfd1446e00423ebad1a0ef954e05807102cb980c7321b6909b SHA512 2f9ca1c725f75a8470334449b683f5fbc77477f65e6b0d69f5549c479a2697931e3f4d3350c8f22a8e78b7e9c1401553f04f37746654988c150de9230a34acfa
-DIST boto3-1.34.90.gh.tar.gz 800389 BLAKE2B cd604cf39479af676c46b7fd1e5a8ee24e46ec384d97c50b15f80c2d96a5f46ad1c66a8a34a03ccffdf37cf386e7dcc455dc38543fc9c919f9c2b18be6e402bb SHA512 480824e36f9f118b0813b391818a4214bb1861e322099cfbc2e7f5e20a088799d2e3c1c4e745ead86dde634b2f2b46656dec872025c0d5b3b608859fc8c9d9c8
-DIST boto3-1.34.91.gh.tar.gz 800954 BLAKE2B 40bbc688a006666e85b07d8f40f291ced5d6ffa0a26980bb89e353f7e300960bbff74c46554d8d4805b0cfd6723f8fa8b75f54908a255c9bc0d341ae23000265 SHA512 e8db938b1af6753c65b42f764ec1f4783d33dc889cadc76715f7fd6053a29149163e328593315f2d900a9d5d46fe0ab451bbba597180dbabd654dbac83b75b2c
-DIST boto3-1.34.92.gh.tar.gz 801544 BLAKE2B ec5e6aabcbc51f7fd0ce235b124489e5bf3375d346c9922430114a8e79d56544c90e91eb861393c63b191a1bdaa8eb04d6d59a40095c785741c59acde411d523 SHA512 349fbdc017da180d5f5d53a8d22c49203bbe633e8d98db71c9ec2be7dc8a78deedae7d0e256d827e2b75608374283ec9946b9c43aa9dd80504fd88fc8f8b65a8
-EBUILD boto3-1.34.79.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
-EBUILD boto3-1.34.84.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+DIST boto3-1.34.93.gh.tar.gz 802078 BLAKE2B 43f19efd6ae42bdb20e8dd79b1735df229ec2f231b5fe05006b26fcd5ddf4796a53fba6011c298fb919ee7b205b4ae3f4b563ad3b5325bdbbdebaeab7be59608 SHA512 4da1d9d7d8648e895f23763e5055a868d05bbfd8eb28d56e716975b3b8349bd1825d703f6fd11c316174004c39e1fca5ddcd8a4ad27a000e1a52f08a36eb4780
+EBUILD boto3-1.34.84.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
 EBUILD boto3-1.34.88.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
-EBUILD boto3-1.34.89.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
-EBUILD boto3-1.34.90.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
-EBUILD boto3-1.34.91.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
-EBUILD boto3-1.34.92.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
+EBUILD boto3-1.34.93.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.79.ebuild b/dev-python/boto3/boto3-1.34.79.ebuild
deleted file mode 100644
index 51f4c7f3ec96..000000000000
--- a/dev-python/boto3/boto3-1.34.79.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.84.ebuild b/dev-python/boto3/boto3-1.34.84.ebuild
index 2c733040b7a3..51f4c7f3ec96 100644
--- a/dev-python/boto3/boto3-1.34.84.ebuild
+++ b/dev-python/boto3/boto3-1.34.84.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.34.90.ebuild b/dev-python/boto3/boto3-1.34.90.ebuild
deleted file mode 100644
index 2c733040b7a3..000000000000
--- a/dev-python/boto3/boto3-1.34.90.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.91.ebuild b/dev-python/boto3/boto3-1.34.91.ebuild
deleted file mode 100644
index 2c733040b7a3..000000000000
--- a/dev-python/boto3/boto3-1.34.91.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.92.ebuild b/dev-python/boto3/boto3-1.34.92.ebuild
deleted file mode 100644
index 2c733040b7a3..000000000000
--- a/dev-python/boto3/boto3-1.34.92.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.89.ebuild b/dev-python/boto3/boto3-1.34.93.ebuild
index 2c733040b7a3..2c733040b7a3 100644
--- a/dev-python/boto3/boto3-1.34.89.ebuild
+++ b/dev-python/boto3/boto3-1.34.93.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 237037390a9d..0dde9f4e4e29 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,15 +1,7 @@
-DIST botocore-1.34.79.gh.tar.gz 12882231 BLAKE2B 56d7d2a1046a164f4f64f375f608b8646e0f7c266b1c7ab37ff7141fd8d8d843ce2890b0a947f051956f61fb2cfc75c2eb3b3cf70305de4ba9ce2e18d8569ded SHA512 00717ad582e23e1c4f4d803eea2069224fc69c6e701d6b4a55d0d99806cebfb1e2c45c7eb65464b84e0cc63399a7b6235b90ba9245e27fe435eca6079b5c29aa
 DIST botocore-1.34.84.gh.tar.gz 12910232 BLAKE2B 3a9f9073e34d203f05ae44f9dc437f4d325084dbe858e59008a7b0c826c53d6e9a1911f6e9203aa476787878de88a1d8a9c1e26cedc3c34bebf6739c9bb10fce SHA512 247578e628e5ea57cfb956a10c0975d7a2caa24617e8572f90ca2a0286c75077a732328cb2dde34c937113d288c4a8a346adc074aae14dcebfa16c309d801a31
 DIST botocore-1.34.88.gh.tar.gz 12931548 BLAKE2B b3cc4c44ec0fa93798e842226487f293f0206b27a1fad834ecd3d4b02319da7d6ee67fad3a3a168f6dcdf8a822cd778c742d9c975738ef3bf4d9661963a83624 SHA512 bba25daa8c93ad5454e25089c062363b97a80c1004d670be6694b898b6d7735cbb92ec816b138093c48a89fe2bf5972a6d2dcf3da2a617141a460e265e506806
-DIST botocore-1.34.89.gh.tar.gz 12942425 BLAKE2B f2df9f8e1c90a55ec9c4a1695dd9d9eb4851d77d9f8a56f34df0ef34aaf580c655be726f3fb4ae3f63c7d69d73a4b3af5329f742229422712f191ddf6f028cf7 SHA512 35bdb67111d811a3b61ec23605fdca9607029102ab4873575c2901cc1075d441a27d72131365c3bc1b6fccf75336c99911f7dbe3def46a1ff4d3839fbe3f24f6
-DIST botocore-1.34.90.gh.tar.gz 12959004 BLAKE2B e80aa5ec0727db538ccbdac357431a3015494aa10da2d4a0e9ff6fb5080eaab38494933c3d3678fbf9d1266007a5edfc742b5a65a6be8e26edb8e3e11de255b5 SHA512 a6eb45e36ff189edf7915667719112279a07133ce7ef9bfe94c18c8e5ab6df4b734a00d973986f9f74ed7e475fa72461457a7633464973e720f38cf828f2ecc8
-DIST botocore-1.34.91.gh.tar.gz 12975028 BLAKE2B 0a4d4ca5530411148e7df7be4f937741457e44b3cf7774ded834db58ce9d6fd05f0fed6aaac1283ee410b6914d4825387c36545b17b1e78cf89175d560445071 SHA512 aad3f747ca49f58eed1116c303202e29bb0cec0a9816c5436bf75881d46b4c363e9aebbc039b3f6c6faedaf81cbea03d635b744fffb9f740cdb4c1d3ff21724f
-DIST botocore-1.34.92.gh.tar.gz 12978936 BLAKE2B 64fda2f4b1cbaa31c3d9148039c0db44e54811245186abf014ce1f3a635cb52f5bcef1180f082fed27300314ebd3b79887f364698b4df131f6534dc3bd694444 SHA512 4923a04ac00d325f7d8b3dd69b11d82130abf642afd5a7abb22620062ff9f8859940d9dea1ff15bc3ace546e7b85ddb0e56a30e472ee8adf4406124c9587fe09
-EBUILD botocore-1.34.79.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
-EBUILD botocore-1.34.84.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+DIST botocore-1.34.93.gh.tar.gz 12982900 BLAKE2B 3225279b85101e04da3be11f01ac3f4ca74cf77235fcb8878bc12d7aca61472155c8319329beb54ffe335f9da9023fb3ccce99256f3a31c6588389dfa1746de9 SHA512 505e8c9b3915b1c2da3863b62c85c392a58c12376c3e71493025445b7b672ba320474087b446fda876ffee5d6260909bc1d1442ff6dbfeb49fd6661d3d7840a1
+EBUILD botocore-1.34.84.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.88.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.89.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.90.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.91.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
-EBUILD botocore-1.34.92.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
+EBUILD botocore-1.34.93.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.79.ebuild b/dev-python/botocore/botocore-1.34.79.ebuild
deleted file mode 100644
index 7a44b043295f..000000000000
--- a/dev-python/botocore/botocore-1.34.79.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.84.ebuild b/dev-python/botocore/botocore-1.34.84.ebuild
index ba6cd2a5d2a2..7a44b043295f 100644
--- a/dev-python/botocore/botocore-1.34.84.ebuild
+++ b/dev-python/botocore/botocore-1.34.84.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.90.ebuild b/dev-python/botocore/botocore-1.34.90.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.90.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.91.ebuild b/dev-python/botocore/botocore-1.34.91.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.91.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.92.ebuild b/dev-python/botocore/botocore-1.34.92.ebuild
deleted file mode 100644
index ba6cd2a5d2a2..000000000000
--- a/dev-python/botocore/botocore-1.34.92.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.89.ebuild b/dev-python/botocore/botocore-1.34.93.ebuild
index ba6cd2a5d2a2..ba6cd2a5d2a2 100644
--- a/dev-python/botocore/botocore-1.34.89.ebuild
+++ b/dev-python/botocore/botocore-1.34.93.ebuild
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 2b0b254991f6..0fd07ee035d4 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,7 +1,5 @@
 DIST build-1.1.1.gh.tar.gz 44605 BLAKE2B aa1d554d55007e8cb715981938bb8765230ae5ddc6c5bc29efeb52c0e18b6337a13c27f3389772a83cc0ecc9b7d3e889fbc305e91f1290424d7031a1782f683f SHA512 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da
-DIST build-1.2.0.gh.tar.gz 47350 BLAKE2B 874f4871d5b8c22ce1d93a840fd00315cfa3a93b01a44e3c8c3270d2dcb66455e2c44e757d0ae15a58a35ea4ee8679a797191523254c914150d801cf3c0a5fa8 SHA512 aaa4677f8eb04c2872dc0f64287e00cd0aa47b10d3bfd67a63c22db42caef8baae9996c3a6ced3a07cce4a54d6fd52a3f15d167f804f7f518d258aa5da68419c
 DIST build-1.2.1.gh.tar.gz 47394 BLAKE2B d38a138dee5065ff0faee453bdc608fc519bc4b4a3cec8b60cf4f745288f8238dd7e9334f75bdd67765037a62b220079ce924c6581f745eb3750e732b2184d48 SHA512 77003e16d3776c3a4be920251bf14650eea112b92d94116cb1893195b8e16aae57321206ae63267119247f2794f220c891b7d913e07a8258b313d34c07d54fe9
 EBUILD build-1.1.1.ebuild 1684 BLAKE2B 0dfc43a98f0edb7693d533cd3b75570191e716e87ce00e1255f2d1a3d40fa06bc028f1895535e8eac7f38b0d3c95da057ae9e93cef1eb763043a471441bea5e7 SHA512 b65bacfcde9bc791b724a9e3d461a1398b206117bea5f3aabbfc5ea96c174ba56979903adde1d10734939685b45c2bf91b832036c21e7220186c38173fded8c1
-EBUILD build-1.2.0.ebuild 2148 BLAKE2B 5175758b124efc8e6533f47522e00dc72aaf2e10277d4b2c214fea018185fb8e0b7ceeeb2e9efb6963c04bd490df9d7e97715c1a6457dc96cf5ba3367f08075d SHA512 996ff891f39b4d0ce799b378b8639e54db071216ea046fe780d552683e90b5482165fea575509dbc5e1cc651af32d2bdb0f8a7962b3412c362bddcc239a7c5f2
-EBUILD build-1.2.1.ebuild 2196 BLAKE2B 31c7eec1ef995cf9f8066f0c0076e15f38fcd47d4386ef5503f1f933a2de24398e6ed7cca720d2c0456ab7492c3348c43e61baf3dc3192a6a57ca7be36eeb4e9 SHA512 211b16b3f3dd44cb78d96ecd17527a086a6d524cd5bd9608d544fc05de3f32c08f3653426b76b8b8f1c78d85662a9d1ec524f1c71e1969f9166427e1ccd53a93
+EBUILD build-1.2.1.ebuild 2193 BLAKE2B b577100182374febc3848a879809360430bb42f1bd7c02836d396b2a7a8ffc22a3e0192103c001846c3d5226e89b9d0be4b46745dbbe4b78d1bbc66e8c1af4a7 SHA512 95e430986fa786086c690683e81815d17937568b774f3221752124f40286c3b55cd600511e5bb0d986cfc4149f7ea03ff15359b221f3fb89dde37f67eb46a0f0
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-1.2.0.ebuild b/dev-python/build/build-1.2.0.ebuild
deleted file mode 100644
index 92cc73481513..000000000000
--- a/dev-python/build/build-1.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, correct PEP517 package builder"
-HOMEPAGE="
-	https://pypi.org/project/build/
-	https://github.com/pypa/build/
-"
-SRC_URI="
-	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc64 ~sparc"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/packaging-19.1[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/filelock-3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.34[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-		test-rust? (
-			!sparc? ( dev-python/uv )
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by the presence of flit_core
-		tests/test_util.py::test_wheel_metadata_isolation
-		# broken by the presence of virtualenv (it changes the error
-		# messages, sic!)
-		'tests/test_main.py::test_output[via-sdist-isolation]'
-		'tests/test_main.py::test_output[wheel-direct-isolation]'
-		# broken when built in not normal tty on coloring
-		tests/test_main.py::test_colors
-		'tests/test_main.py::test_output_env_subprocess_error[color]'
-		# Internet
-		'tests/test_main.py::test_verbose_output[False-0]'
-		'tests/test_main.py::test_verbose_output[False-1]'
-	)
-
-	if ! has_version ">=dev-python/uv-0.1.18"; then
-		EPYTEST_DESELECT+=(
-			tests/test_env.py::test_external_uv_detection_success
-			tests/test_env.py::test_uv_impl_install_cmd_well_formed
-			'tests/test_env.py::test_venv_creation[uv-venv+uv-None]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network" -p pytest_mock -p rerunfailures
-}
diff --git a/dev-python/build/build-1.2.1.ebuild b/dev-python/build/build-1.2.1.ebuild
index dc10d3d3d4a2..dd19590ccfba 100644
--- a/dev-python/build/build-1.2.1.ebuild
+++ b/dev-python/build/build-1.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 7f48669239ad..0ea92e8d9043 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,3 @@
-DIST cbor2-5.6.2.tar.gz 100016 BLAKE2B a0a71f40f39ba86c545e5f8462af74e17b6851d350f0c9831be2ac414216437021150d0d7ddb481d62454d5ff73b99ccda7ae0676fd6d53b7e3228616fa0042d SHA512 da98aaf17b17b50bdfc4dbecc1e88e70ed6e99f26e9eb4124de0e92ea2d63f827cee3da83c9aeba1af386cf5a7e95d76be30c79b0a8fde7d53ee8c203b2119b9
 DIST cbor2-5.6.3.tar.gz 100224 BLAKE2B bccdca4fb2659c201663897a27801b7ae040fecc1c734356d4e4859df94eb65ef122bdda68384670102ee40476135d0c781c9f966b7c2845babb2bbd9729bc78 SHA512 1ab6a88a95cde178b21a75275fb286038f15d2fbd752059f9fc6fdb64e23eca90f65f7e443cae4bdbb7f451378711b20963909136c06b3bb4f054d52a7a95207
-EBUILD cbor2-5.6.2.ebuild 1062 BLAKE2B f51df7b3cd4423e11a3d241cffcabf9d746d743eabf95f988a2f0dfb5734e6e0882a7218568f45490d5def020f6a7c6cea6f25256cd8627e1d5ebe12e191554a SHA512 3b582afaaeae41d444435087431535d2d1f14c33b9e6fd435e90ece13d87534f544d35bb240f8d54cf42cf8d698308850c2281f682c9fc5bbf24d6a8f2dfa5cc
-EBUILD cbor2-5.6.3.ebuild 1067 BLAKE2B 586c29cf11f431785c107ebf4497e1620634584839d134b335822656d5af78601631f3f78881092789933c55899fdccbe55d3c8086c07dc779de1f1a2897bfb3 SHA512 d8aaa4c7ea558bb6ca33d61a32b73d3cb662309163a0a0cc477493c4ca2371e70c15f7bf7f6a107ef468aa76baac03fe83dd6598b407945edfab06fa5e75d72d
+EBUILD cbor2-5.6.3.ebuild 1062 BLAKE2B f51df7b3cd4423e11a3d241cffcabf9d746d743eabf95f988a2f0dfb5734e6e0882a7218568f45490d5def020f6a7c6cea6f25256cd8627e1d5ebe12e191554a SHA512 3b582afaaeae41d444435087431535d2d1f14c33b9e6fd435e90ece13d87534f544d35bb240f8d54cf42cf8d698308850c2281f682c9fc5bbf24d6a8f2dfa5cc
 MISC metadata.xml 1036 BLAKE2B cae01cfe0040332893e0ca9e4c5da81bf13d9a76f83a3cc24a63b0309bea83ba2ada3aeea7980837316d92a5cc176a7925cff5c4468500f68d561dd14131dd55 SHA512 1f42c1ec255c7687e66fd350e3353cf2168f654075b710dab89f71e284691beba52def321ab471accc5eaef2df1bd3561150faee1f1dc3c739843e64c49f7f21
diff --git a/dev-python/cbor2/cbor2-5.6.2.ebuild b/dev-python/cbor2/cbor2-5.6.2.ebuild
deleted file mode 100644
index 33573d3fc1ed..000000000000
--- a/dev-python/cbor2/cbor2-5.6.2.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x CBOR2_BUILD_C_EXTENSION=1
-	# pypy3 not supported upstream
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		CBOR2_BUILD_C_EXTENSION=0
-	fi
-	distutils-r1_python_compile
-}
diff --git a/dev-python/cbor2/cbor2-5.6.3.ebuild b/dev-python/cbor2/cbor2-5.6.3.ebuild
index 4d83e1c675b4..33573d3fc1ed 100644
--- a/dev-python/cbor2/cbor2-5.6.3.ebuild
+++ b/dev-python/cbor2/cbor2-5.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 27947a458e70..5bfaa463b88b 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.4.src.tar.xz 132054668 BLAKE2B 94bbad3b185fd07cbace4eff79aba80fbdd5e072739250e3927fe1848bcf3f8d355eb1f384e57306707eb702acc7ab01b732590735be7950221607664d04b0a6 SHA512 b1b214ae91f3705d8ea345547ad53f1e5d7d884c1eb6958bc41c14ac4b3e407771ccc2b693686ff103c8232c2c3942731d6db9a9cb4f735e6c6a0674739d0b29
 DIST llvm-project-18.1.4.src.tar.xz.sig 566 BLAKE2B b74fd219d7bcdf197b4e711cfbb25c40e9d8d2c7341de0215d8c31f330f396e9c166ff63513829cdc9cef349f08238f66a4dc949fa97958a7af496abae369eaa SHA512 4f456edf4fb454815acaef6855b1a0991f229810a32e9369af83388e37f0ef8964308e1e93bd6216024cdd67e86caaadc8d5794467857cc6fe561c9fa6ca7386
+DIST llvm-project-338561657685c1831a53563b1bc36ffc7470239e.tar.gz 209715501 BLAKE2B 49152479d4f2cae430e783784d0cfcc129134f5cc0bf12c72701cd15e59cb3e1be2f61385ba9baa93d1d1193e89374ac8877b909650c163b681d1fcd26732cdc SHA512 d34bbe82e85c5b9d493029ad7b46e802f06f7e7a8a48515d0043c58c3251271f8f3e1e11c47eb91bd3db2477f819d33b43ddebb276eb9601c5ad141e463c9682
 DIST llvm-project-ee284d2da0720dc21191d6f545504cbfcf5dcbcf.tar.gz 208883034 BLAKE2B e37c9f1a6a4d0caa9a3091f979dd09f509d458f8b7b30286c77dd2385aea748b7aac6dd488c79573f82feb655aa321717bd2fb46bba4a12b388b52064f6e13bf SHA512 1335ade87cd2accc47ac47ed2ab302999e375808b158b6c9d31fac9059cbb992d2bdaaadf1fd9a1b37268c1123d43346ea4d150894d6d2e6f80ba790b65b93b1
 DIST llvm-project-f03cd2db91956456f1c5e2da86d3c50183eebd28.tar.gz 209375254 BLAKE2B 1d7e043d04323edb64b2ef2309fbcb4f82a959f45391e815133cc0891d5a497bbb81101aab460e9bf67e75aa906e13ad1877c3850829dcad397ed626dc8f2792 SHA512 6775e03a44b2133bd4a4b473ab007599321daa19dc7f3cc47f95cf9d110e83e982bf48a6b1d43038b0f0a2c0fef2f689aefd20132b25a90ef19342683e2d2e50
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
@@ -15,4 +16,5 @@ EBUILD clang-python-18.1.4.ebuild 1205 BLAKE2B 78a006e8a28866a217ccf4a13e3dadd8d
 EBUILD clang-python-19.0.0.9999.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-19.0.0_pre20240410.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 EBUILD clang-python-19.0.0_pre20240420.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
+EBUILD clang-python-19.0.0_pre20240427.ebuild 1170 BLAKE2B 53502d381a39fb64fcf0d05c9c322c1441b85ab8de93107141e0eb99a10289164b7a96f4b41d4d265cfb52dd3ff7a11eb96bbcc25458c0794b3fbb941ee3ed6a SHA512 0a6ca73087cbe4bd7378796920a3c8ecca7a66f821fcf78bdf06ea70a9b4a36448b717c83b132cf29c21500c55f3c7627b07bb8b4dde325c8ae1a5e2e10a1ee6
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240427.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240427.ebuild
new file mode 100644
index 000000000000..bef9bf6fddbd
--- /dev/null
+++ b/dev-python/clang-python/clang-python-19.0.0_pre20240427.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 0ff059c24642..45d42f58ae97 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,6 +1,4 @@
 DIST h5py-3.10.0-cython3.patch.xz 3868 BLAKE2B 3c0d952bdca5307ebf0bf878c26b94d0593bb89ac538a51017fb94e1e488bffc1583dcf4e713005b87d1b5e20d7b73043b24d65404faf60fb69515e598ca2133 SHA512 a0a0e3d1a9bccad1c89aa7efe3ba1e080eb70cae1f42f8de1021c212817970eaaa7070131e8e39859eea3c18d6c1243a17e7f53f2179f34ff6c406b315bab8fa
-DIST h5py-3.10.0.tar.gz 403716 BLAKE2B a8e4351a15aee5fe9d23f9c5f9b6ff44e688a391ba17e27338675bde60415c73e3cd97a4a0c05490df849f649d626450d3dbecc9ae6ea3d24d784a0a4aaa1850 SHA512 840d7f2b9b9d5e22e8edae21c84884abec64acdd6c36437a4921ce9dc1b343c55f66f72b699146d71fe55688f6f948787b62335a24906288e9565b2b19b24b01
 DIST h5py-3.11.0.tar.gz 406519 BLAKE2B a5568c96290eee1f6da965174b6fa398f94e2e1825ec4ec50efd856b37ccf2bf634cfeb32101c7c53712fe9c68b0617774e9339a3f0d9373d3df24e6763a20cf SHA512 05d99093d5e7c280779b4167bd3594488dfc348b800da95c2275ddc8d77b4208fd1353942bf8863c4859d0208e8aa8bf84e628b3c5942eb947ecdcf0a7d19e88
-EBUILD h5py-3.10.0-r1.ebuild 1428 BLAKE2B 07e45cb6735aa016b03ea5c316a9f149fae0f148d891b4c1bc6767934685cb3f2013798a876a6faef87c49e01f3fe4bc91ff8d3b1b04b814ed35f9bcba3a7063 SHA512 8fb707bd130d128b6df2ceb9b65f6be83f9042260e1495c5e1d17f1fb4b1e9902f55a5e6f4a270dd36fc306e46516b1ad5c3d5df5458ff12e7a5230668f142c3
-EBUILD h5py-3.11.0.ebuild 1386 BLAKE2B 30fb0fabd6bf7d3bf35ac29a2f72df62951bed48bb0d520b5c922f7edee3a1522e29a01b10966585c56e100149b693bacd18b3a54ec03c3d7f23d536b0f3a7e6 SHA512 ece2ea22bf586f4981ffefabd3ade0194d44b0120fba866518c4cfd8b633d29e88021cba35a1ea21d834d100a1b65ae0a26fbafa2f2231069bd846f8d8136a2b
+EBUILD h5py-3.11.0.ebuild 1383 BLAKE2B 1061565c3f050996739f1b73c9a1448719c3acb49f856046b09e715c23e059d9b3967886950ce4194235efb1023d6beb4c9f301ea2c47fc1567b27efc409b9e1 SHA512 8ed6a2fc1838be40538075b1c3d3393d46165f8869d0ec5a3fb180febe59a069b640591f43b30e759d5da14b1d2eb1fbbc25601ee2cb692e4d3715b4d7a7a9de
 MISC metadata.xml 1069 BLAKE2B 0f3ef8e7af7f4bb493824427a238588c019c04c28fe8a4b9c0b9af1c986158eb3dae3b7d7937713cc4c87374ef80686603ccdbae2baff5b1150d814ab108d973 SHA512 47a6074e383cc922234ebb9f67aaa5863421eaeb2003444587bb8499b3bf845da93ac8d8d267717bea01300691df10f67c9389248fbe228afe07c17fba3a64f3
diff --git a/dev-python/h5py/h5py-3.10.0-r1.ebuild b/dev-python/h5py/h5py-3.10.0-r1.ebuild
deleted file mode 100644
index 0f1d899e8504..000000000000
--- a/dev-python/h5py/h5py-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-cython3.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	>=sci-libs/hdf5-1.10.4:=[hl(+)]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	>=dev-python/cython-0.29.31[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-3.10.0-cython3.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -m "not mpi"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.11.0.ebuild b/dev-python/h5py/h5py-3.11.0.ebuild
index 5d79819a2fd2..961ca41db084 100644
--- a/dev-python/h5py/h5py-3.11.0.ebuild
+++ b/dev-python/h5py/h5py-3.11.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 89f44e20c969..92a34bb85836 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.collections-5.0.0.tar.gz 17852 BLAKE2B 2ba362417835faea2f3ebfb24c8eeac2b302c64d2f653cf820f16218b5ae92aff270a14680ecee82847f65338d1dafbf9951e92f5874e7df79fd27918d9a2456 SHA512 bc4bf9159c3f2878fb3ed57e311c894986fa106af96423a612f25dbefb51f8dfc77fa1468612a224fbe26c64270745ff1c1db7d05d7c3f5d51040a8773298a73
 DIST jaraco.collections-5.0.1.tar.gz 17990 BLAKE2B a78de1a3222492dde34271edd8032dc5b8737dc428c1aa6b55ebda799ef4ff986cb0cf495bdbc35f9c776e1d576c2970ae6736ba8d8aa7f2fcc2e6766aefbbc3 SHA512 88b0f261acd91d585e643b810818762af7165eaf505099701b99ee3be6955eebcfd1c95690faa3ecb56b25f6982a8cee242e687e50ead56a557a5b2b72ec6dfe
-EBUILD jaraco-collections-5.0.0.ebuild 767 BLAKE2B 56da6d6abd55a35e252f9f0799a1214577a1b3d2170f7518bc37db4246db5a14048b0609b218e8ba7c5c9a2d89f858c4e1d374f896355320dc70b5d36c14692e SHA512 1e0a8e4066a09957ffba72ddb0ec226d51280eaa78e19fd1aa15c29407be5c43070515a537aced4d2d3e7248a3816550fc3d9b22fe4ff74174104dd4a5918aef
-EBUILD jaraco-collections-5.0.1.ebuild 775 BLAKE2B ed281e8f66fa6c335cf73ae228ea5b3961161d2444956c22b3ce9711ab3f89401c9fe9a045850e492b1ca8234f05491331b591bec383e76fb4fb7c1c0650092a SHA512 eab22418d797ac720546d41e062b715a351115e88da4b07966d08ea251aa15d4960532b39800ddb69653df35bed313fe0085aae7f39abefbd926c481ae3b76b8
+EBUILD jaraco-collections-5.0.1.ebuild 767 BLAKE2B 56da6d6abd55a35e252f9f0799a1214577a1b3d2170f7518bc37db4246db5a14048b0609b218e8ba7c5c9a2d89f858c4e1d374f896355320dc70b5d36c14692e SHA512 1e0a8e4066a09957ffba72ddb0ec226d51280eaa78e19fd1aa15c29407be5c43070515a537aced4d2d3e7248a3816550fc3d9b22fe4ff74174104dd4a5918aef
 MISC metadata.xml 484 BLAKE2B 4914c8b3242714bea9e288990484336d645e7a20c7cdc3d6f8018c5bf4771e29a1dadc96e08cb4df6e421273ddd24111c0eaf367209d6dec504589ccb6da0bfd SHA512 f4b097fd1d2d25f31d102c38894ac0e083af00bfcaae986bfc5c93cf634229bcf8015a556b6eb8401b0c1e7f5e0cac619f0b75ef19195cbbf3b8d2128743202f
diff --git a/dev-python/jaraco-collections/jaraco-collections-5.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-5.0.0.ebuild
deleted file mode 100644
index 0a799c220252..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-5.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.collections/
-	https://pypi.org/project/jaraco.collections/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-5.0.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-5.0.1.ebuild
index c57882621616..0a799c220252 100644
--- a/dev-python/jaraco-collections/jaraco-collections-5.0.1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-5.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index 3c9af2bbee04..7bd945da0c1d 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,5 +1,3 @@
-DIST json5-0.9.24.tar.gz 40085 BLAKE2B 6e2823eb9aa982837111d587fc775fe6da11a5071a677d50ede6124cac7133faf99f8c73eeb61820eda2efe798d8ed8b30d3fb4601728a66cde294adcadd1b21 SHA512 ccc9fdc129a8857ca507601a7e52c119648550ecd9d256caf5bf558c7338998712b0e1d9294eb0fc62f630f53897f6993a56a352a5b7bcb49e21c4b989ac4ef3
 DIST json5-0.9.25.tar.gz 40332 BLAKE2B 4b24a2f3047c04ce80b0415340ce2d957d319bd45e804147710eb7c1eb0da97b083220839a6e11b852d8c9df5036e2a401060cdec93442245e220fc816d7811f SHA512 0ce3943af45e22415b30a3d43497236a1437adb67b739b97db7bb25b156bb254d0daf613f1f0ba5fafc5904708db81c8a786237ade757267f767afa88d5aa2f2
-EBUILD json5-0.9.24.ebuild 473 BLAKE2B 3892af1d1f83f3990e33eed84b71d4ca6c2f28726715e67d936f38a73e06460d99da56cafccb9280b3110ccec513b1fd1b8f535004d809c2b1a28a0169a50dbc SHA512 cf98aed488668ff968bc35fae371b1afcb2b3375ff56dcfb9edb225c6d04d383eb6bbe7be95288d821d108de0673d18187844a61b95a492f11e1073fad175f90
-EBUILD json5-0.9.25.ebuild 478 BLAKE2B 60606d434999e1a743ac86a0bc02f85983a6b989c14ec72382869a9512d6288568b15778b6e7dc594ffb0136c6a1aafd016c56f50b409fb90a8fa6459b7834ef SHA512 99750feb92a9c602dc7ffe2ff4e5231f6bc04496ca159f5b3c916e2c669a2179f18c00483acd9288ac33c26a2b735af52acdb0daca481da458d2e64b385ba35a
+EBUILD json5-0.9.25.ebuild 473 BLAKE2B 3892af1d1f83f3990e33eed84b71d4ca6c2f28726715e67d936f38a73e06460d99da56cafccb9280b3110ccec513b1fd1b8f535004d809c2b1a28a0169a50dbc SHA512 cf98aed488668ff968bc35fae371b1afcb2b3375ff56dcfb9edb225c6d04d383eb6bbe7be95288d821d108de0673d18187844a61b95a492f11e1073fad175f90
 MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
diff --git a/dev-python/json5/json5-0.9.24.ebuild b/dev-python/json5/json5-0.9.24.ebuild
deleted file mode 100644
index 90c8fcac19c6..000000000000
--- a/dev-python/json5/json5-0.9.24.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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python implementation of the JSON5 data format"
-HOMEPAGE="
-	https://github.com/dpranke/pyjson5/
-	https://pypi.org/project/json5/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.25.ebuild b/dev-python/json5/json5-0.9.25.ebuild
index ef679f5690a7..90c8fcac19c6 100644
--- a/dev-python/json5/json5-0.9.25.ebuild
+++ b/dev-python/json5/json5-0.9.25.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 2bebacfb2285..e756edb8b267 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_server-2.13.0.tar.gz 718244 BLAKE2B 578e67c6f3cc94c167c27b59e6ef3a5c7dc69048731da9480b2a4021fa52a16cce02d97d4986f5cb739cafd4041b183ccff1a4fa5b22e0cca6e46cdb9d101e86 SHA512 114387c34bf759bc9d27eedf2cb2ab12c07ddaec33d0d37c3bcaa776058c028220dc148fd7bc270644192a693b613b54d0195b5b809c2732c1e04d551b4d060c
 DIST jupyter_server-2.14.0.tar.gz 719491 BLAKE2B 6a742c2b4a269a23af7c54e72d551045cc17b017efe88e0cb5848aff9d9a9d0855c74ed066b316bb87d15f49984cc5787250b6191f036c8ae8bd0af7a6b53695 SHA512 57258afae5e64af6b499795795c469fd08fb2562da770ba06b78716dccee12f6662b0d6465739857aa5f3fea084eb2d8553c7205edc7b6813e4f5d61815917b3
-EBUILD jupyter-server-2.13.0.ebuild 2377 BLAKE2B 8222bd9b15ef0eff34468371968462f5170a66fcecde66645ac5219b1a70d9b5506af4110c6150de9a9d193fc5bf0e9e1fb221e4fc71fe449d68b307bd95cd1a SHA512 ff0cad73102d4f01be60ac2b9868f70538e695e7d08a350e9edbb95c710caf91c5eb00ac9d703f2a7bbbbf2bdbf99e54744f682f5baf3a6bdda1278bab54f595
-EBUILD jupyter-server-2.14.0.ebuild 2431 BLAKE2B fa75b8c843942d7523c93a752585b1776c9afce30b807ff8974c2009dcd5d2f3c5714490b0253cb701a6b9c81666b252a43a65a0930c092bfe27d522d4b30832 SHA512 3565c409a66eeba128a8f43ab9c62e4ef9760b8da5e1e216753a1c726fbdb224e6c532a65cd4ab361ac4d126f886d413ccc3788002e2cfc8c87c09adfcdb7400
+EBUILD jupyter-server-2.14.0.ebuild 2424 BLAKE2B 97b61889c2057706d81c8100fa8369be0dbf06c41da2cd75691a50d6f06116e84e238ee89138443d127a6c9f3e640061930cfaf8aefeef79c29d3b3f1b467509 SHA512 16839eee76d4af727c07288f59c747bf72824cbfae12347931e9fb65be7e843723162742f1700ea4d8dd074d6232430d7ed38ec192b049771466ad18337b90a3
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.13.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.13.0.ebuild
deleted file mode 100644
index 9392a70bc6b3..000000000000
--- a/dev-python/jupyter-server/jupyter-server-2.13.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/jupyter_server/
-	https://pypi.org/project/jupyter-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
-	dev-python/overrides[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-
-"
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.7[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# This fails if your terminal is zsh (and maybe other non-bash as well?)
-		tests/test_terminal.py
-		# Fails because above is ignored
-		tests/auth/test_authorizer.py
-		# Fails with additional extensions installed
-		tests/extension/test_app.py::test_stop_extension
-	)
-
-	# FIXME: tests seem to be affected by previously installed version
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest \
-		-p pytest_tornasync.plugin \
-		-p jupyter_server.pytest_plugin \
-		-p pytest_console_scripts \
-		-p pytest_timeout \
-		-o tmp_path_retention_policy=all
-}
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild
index 51d0d35e0e59..29564bc55704 100644
--- a/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.14.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index ca62f1f39c22..bd3c5e44c773 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab-4.1.6.tar.gz 21773628 BLAKE2B b2855ecc4fa0cc892fab9bb79c19a3cec0ea577c9c490571ad4028e9fe35bca87fc61d0035cc889bee14313475825344e1cea69f34af4a908c5d2a304250d983 SHA512 b895aac68c6df3affb47eaebc243ecf7d778228a5adec8b8a047783e341008ab4beb0fe50b92138f765e7a72acfbe906f63f41aebe1a72544fe3030105d52716
 DIST jupyterlab-4.1.7.tar.gz 21773423 BLAKE2B 6456011cd841b0c61b09ecd647443cd68abc4a48151ddeab6b5834f22fd99616470a70fc68897a8b46cb32873a49c3f950006eff80facd6e109d337be5d95569 SHA512 01c8b1a496c621d387a8b03c8705c1807f9f18d09be30aa3327a9beac1fa97b23df02f518490d984ac022f1265a55104d7db69ca69a79941c526b50946c8d20b
+DIST jupyterlab-4.1.8.tar.gz 21774267 BLAKE2B d707257b2f7c53c023fa0e2741ff1ddbb83116c1b8cc8136b550c94120737161c519c4a2e67211fff275267ab31c58e58b17ea6041e9ba00d44baa1919876f1e SHA512 376b9a9b154b70716ca8450126b9623932b44c88b1a83e42fadc4b98f5a3dd3982d77ae9fc807f483fbd84615c184dd8c170297002c9f609b81755aec21e1ff4
 EBUILD jupyterlab-4.1.6.ebuild 2708 BLAKE2B 547a7dab63086e024ef88cbbbfd36a6010439a35a6373def8fa8fdcd47319c50b285035c3c55dc11a0dae4a26a942918a7f24cc41cd33b175595dbf57f7a1dfc SHA512 8190341f95ed38b654a53cc7fb22b24ce7ab1194509000b26525465566eb45ca40fedd05102a95cb9914db0f4aa840492c5ab45fecce83de8e1c79b0390fa9a1
 EBUILD jupyterlab-4.1.7.ebuild 2715 BLAKE2B b39a39ab369b5c4d9c315b7c2b219877d42de365badc49ee9c3f24adb6b9d35185540c1eff5a0187f160d33d1fcaa6d29d4897306a45b3db72f9cb3a88c4655e SHA512 ce1ae7035f29395c83a0ac5e2c2a5f96734898e50890e6a956c284efab56997cde2ad5eba8aa445a02659faea9ba413367318d2153f6697476223417e76a87a8
+EBUILD jupyterlab-4.1.8.ebuild 2715 BLAKE2B b39a39ab369b5c4d9c315b7c2b219877d42de365badc49ee9c3f24adb6b9d35185540c1eff5a0187f160d33d1fcaa6d29d4897306a45b3db72f9cb3a88c4655e SHA512 ce1ae7035f29395c83a0ac5e2c2a5f96734898e50890e6a956c284efab56997cde2ad5eba8aa445a02659faea9ba413367318d2153f6697476223417e76a87a8
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.1.8.ebuild b/dev-python/jupyterlab/jupyterlab-4.1.8.ebuild
new file mode 100644
index 000000000000..b655c8c83338
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.1.8.ebuild
@@ -0,0 +1,80 @@
+# 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..12} )
+
+inherit distutils-r1 pypi xdg
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 733c78ba75ce..bb2a9363cc35 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.4.src.tar.xz 132054668 BLAKE2B 94bbad3b185fd07cbace4eff79aba80fbdd5e072739250e3927fe1848bcf3f8d355eb1f384e57306707eb702acc7ab01b732590735be7950221607664d04b0a6 SHA512 b1b214ae91f3705d8ea345547ad53f1e5d7d884c1eb6958bc41c14ac4b3e407771ccc2b693686ff103c8232c2c3942731d6db9a9cb4f735e6c6a0674739d0b29
 DIST llvm-project-18.1.4.src.tar.xz.sig 566 BLAKE2B b74fd219d7bcdf197b4e711cfbb25c40e9d8d2c7341de0215d8c31f330f396e9c166ff63513829cdc9cef349f08238f66a4dc949fa97958a7af496abae369eaa SHA512 4f456edf4fb454815acaef6855b1a0991f229810a32e9369af83388e37f0ef8964308e1e93bd6216024cdd67e86caaadc8d5794467857cc6fe561c9fa6ca7386
+DIST llvm-project-338561657685c1831a53563b1bc36ffc7470239e.tar.gz 209715501 BLAKE2B 49152479d4f2cae430e783784d0cfcc129134f5cc0bf12c72701cd15e59cb3e1be2f61385ba9baa93d1d1193e89374ac8877b909650c163b681d1fcd26732cdc SHA512 d34bbe82e85c5b9d493029ad7b46e802f06f7e7a8a48515d0043c58c3251271f8f3e1e11c47eb91bd3db2477f819d33b43ddebb276eb9601c5ad141e463c9682
 DIST llvm-project-ee284d2da0720dc21191d6f545504cbfcf5dcbcf.tar.gz 208883034 BLAKE2B e37c9f1a6a4d0caa9a3091f979dd09f509d458f8b7b30286c77dd2385aea748b7aac6dd488c79573f82feb655aa321717bd2fb46bba4a12b388b52064f6e13bf SHA512 1335ade87cd2accc47ac47ed2ab302999e375808b158b6c9d31fac9059cbb992d2bdaaadf1fd9a1b37268c1123d43346ea4d150894d6d2e6f80ba790b65b93b1
 DIST llvm-project-f03cd2db91956456f1c5e2da86d3c50183eebd28.tar.gz 209375254 BLAKE2B 1d7e043d04323edb64b2ef2309fbcb4f82a959f45391e815133cc0891d5a497bbb81101aab460e9bf67e75aa906e13ad1877c3850829dcad397ed626dc8f2792 SHA512 6775e03a44b2133bd4a4b473ab007599321daa19dc7f3cc47f95cf9d110e83e982bf48a6b1d43038b0f0a2c0fef2f689aefd20132b25a90ef19342683e2d2e50
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
@@ -15,4 +16,5 @@ EBUILD lit-18.1.4.ebuild 1029 BLAKE2B 867dbe4c176cf5e3e1221e42b02bbafcb2c937b5e4
 EBUILD lit-19.0.0.9999.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-19.0.0_pre20240410.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 EBUILD lit-19.0.0_pre20240420.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
+EBUILD lit-19.0.0_pre20240427.ebuild 961 BLAKE2B 0f4ca6b62575d436f2c8bec0dc8eae1f48f0d2a556dd9a36673ad5f5ef79c16665f285e459b6cf8aa926db4a2f337d0486be674bd73bb264ae9aa6d3b4968ee5 SHA512 229c1c3f97bc006bcd759c2aeb2eb94d7b0ea4d021b36ff06886d92916309c2d8e6907a527cb3a0adcca28a5d370d07162ee7119980cf86b9636bc94dc720c9a
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-19.0.0_pre20240427.ebuild b/dev-python/lit/lit-19.0.0_pre20240427.ebuild
new file mode 100644
index 000000000000..3d0315962098
--- /dev/null
+++ b/dev-python/lit/lit-19.0.0_pre20240427.ebuild
@@ -0,0 +1,45 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 37f3fab4a1ee..c9aad44cb9d5 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.3.2.tar.gz 390659 BLAKE2B 930b74a19c8b582781b05d7042f8c27636989614df62328f5c3548d427c1e3e2366edb8a7ad3ecbd123ef5344c9cf2ba1bdc00e8540b9624d7bcecfecb8329a5 SHA512 acde7b4be929fdd97f2a3fc133966ffc44b5706dbdd3f1af0fee16620b3c82d12b1a67b7292a229084ebb4f0c392e8db1b2844112baa3c6a5fd2be8777b04897
 DIST Mako-1.3.3.tar.gz 389980 BLAKE2B 1c890f159e808a7026e46a489d49ec19a346ce0a8be8d2ea1ef870435830a9021b0877a3d395c9273609be9dc4b11d1e5359d89a9b571a73f05de11152988800 SHA512 fa8bf3997f7a3edc18057f53e8450d72d5c86019229fef91eaa141f0b65a081ca9425c14245227b35aedcccc7dbe52e90bc7dfee34598b490e93cd01fc4a8321
-EBUILD mako-1.3.2.ebuild 1028 BLAKE2B 4ce72963aa2ec80fbfec918e835b05c0aea6194d630fae31a47e2974dfa32dd2195860c63bb0b83c9c747469107a374759584b9c720c87ebe1d457e56b0638ab SHA512 e937c031f01b49874ad7c6bb10bc561da3b6fb4d9b912ad37474660fb8150e3ba77ed4bdacc56c9bfa306000079eb4c5dfb7d4c33eb487b8c52d24e6c5be7cf9
-EBUILD mako-1.3.3.ebuild 1036 BLAKE2B 1bd9407268dd997479e751a24cc83e0a537dc7572594d89f63921379215d1528d2250d6132587ce9a071addcb6aabe0dc7b3e738cf7e035027722402a31bb9d6 SHA512 ff824a3a36010f0047e5f5de2bf866a563314797fcc80841f6f44519d7a8a69fbc36124bf78ea1f7efc959e5f5cb587119a66ab86c2624418f827c9f6ed9002f
+EBUILD mako-1.3.3.ebuild 1028 BLAKE2B 4ce72963aa2ec80fbfec918e835b05c0aea6194d630fae31a47e2974dfa32dd2195860c63bb0b83c9c747469107a374759584b9c720c87ebe1d457e56b0638ab SHA512 e937c031f01b49874ad7c6bb10bc561da3b6fb4d9b912ad37474660fb8150e3ba77ed4bdacc56c9bfa306000079eb4c5dfb7d4c33eb487b8c52d24e6c5be7cf9
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.3.2.ebuild b/dev-python/mako/mako-1.3.2.ebuild
deleted file mode 100644
index cfeb5449315c..000000000000
--- a/dev-python/mako/mako-1.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.3.3.ebuild b/dev-python/mako/mako-1.3.3.ebuild
index 2069ece40b7a..cfeb5449315c 100644
--- a/dev-python/mako/mako-1.3.3.ebuild
+++ b/dev-python/mako/mako-1.3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 02b31d46b932..c9a32c8649dc 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,8 +1,5 @@
-AUX openapi-core-0.19.0-pytest-8.patch 3669 BLAKE2B ee901d00716092d28bd4ceb501a8bb30330a72c49c5a6eb24def681a16eb1d689a785c176fe6bbff690a2927b8d4d55b086c3de180d719bfb78deda9a3dd7aea SHA512 2a266608dc446205f20d46ffc69339d1ceb3bb399cad3983518491e1cc7c77321f8c83692efa7f51abb69b15a583880cb2ab0dca828b2844ac500d3479edd2f6
 DIST openapi_core-0.18.2.tar.gz 84444 BLAKE2B bb05ba86eff3c70c780f1919a29b93f2137983318834c51204d7ad1094fc645d2dbcef93d92d03096826688fdfe1811c551eee68995fd46739314c2e4bc77cfc SHA512 552109c095c840a46759a54e247a3ac2d8cc36707ba89815740eef4b7fb421bd489929543892341fd89a578bff4043c8c81302fddaa1efe125238e050f152c27
-DIST openapi_core-0.19.0.tar.gz 105815 BLAKE2B 25036e98dbf4d572e77eb5dcc00909df1cd2d7b7c37bb691c403df2a48273cc2dd4150c99c526eacc709785f4ec9c525de53e7f613f10b15177fc1ff90ce76fe SHA512 3a94170f8ab6a47188c693545be9d2cd965d2479c838a8644d6218f9f46b54fdb94e0550ea5626e5ba58920419b7c700d26b2e6dd6a55afeb73778f582a645e0
 DIST openapi_core-0.19.1.tar.gz 107802 BLAKE2B c8cd318ab6a88272e45fbff16df7e0cef7d8bab6c7cef8d965443fa0ad7439182bd9639f8a912ad913eb3d7727c4aeb49d576a8721aac1d0ba9423dd344da44d SHA512 861e3793303ec89265be3a0846ad702e321ebc8536497d146ef10a4c9ab54900ad35ee9e90ef42e1f0856da8c0e746471e9820b0ac3e149adaa0b951a66b382f
 EBUILD openapi-core-0.18.2.ebuild 2036 BLAKE2B 627470243f19362c2ea72a8c8b7c9ba8a74a7bc57f0e850342717ed4ca922b36f445ee6c7e8ae5d5304059cb48a0eaf294b8f3b0e196771e35304b3d52446ea3 SHA512 ca93952e8867a4531df97a14da727ff4d1285361f418a32c0710c23718a39778343dd5f14ab0a4746cac06c12afa5df0dfd03de7ba503980c7b2a94adfc7b90c
-EBUILD openapi-core-0.19.0.ebuild 2242 BLAKE2B cdb7bd3cf67149f38dfa756e174042920d96c59d365c6f7457b0db310c7c0a066f10b4510fc62496a2b788f88265a1750a64398d7a31ba5f2e8ba3f7780fe023 SHA512 ecc787d870c5a748e3cebcdfc66792c8376507de09356ba54e253ab6e3075001586fc250e068547211e5bce49cc555c97475c418913aed10a6bd889d476fbee2
-EBUILD openapi-core-0.19.1.ebuild 2130 BLAKE2B 325ea4f183408ab2e692f6321eeee791d97a1880e38cc5979f9b3d5ad94f346d690ef80aeac1db74c597f4e7c34005cc827ac93fc6beea30f676b5660eb2af3b SHA512 fa254793d5cba193e9b778af1b908940c99a03e417d8c82a864fbd1ce0d3cc04d770912bc6b6ca3620f5248fd5d068ce574bcf0469c76297a85c99299db1b206
+EBUILD openapi-core-0.19.1.ebuild 2125 BLAKE2B f97295e6ba1247b3ed41cba22a74798f5ff4d48146165e818f927e4486394291e2836457dc971ae1d5e78abbc644e3c73243e3b3cd4b01eb2147c772dd932f6b SHA512 febd277e42f16e48d1fdc5a84174efd0bed4c9f990491d4eff64de39eb11d7e308efc487387ab15e8653ef9deb11a0cdc77cecc21728508de896dd556d08681e
 MISC metadata.xml 385 BLAKE2B a19f5b70529b6f0575e1196f3ffe0a7f38595fe7b01b43119f0f89c41a9ab5d6992f424a10f345a7407d279736a6091918b9ba1ead0daa92c9d244e4b27e4a18 SHA512 a8a39c8958ad11de5eb6896a74b3bfcb27e95c74a984a362032e4703d86f2831b6559a96a8eef80a7ef89f4687da325b3748f36b1df649cd29c2acb1ea0c9969
diff --git a/dev-python/openapi-core/files/openapi-core-0.19.0-pytest-8.patch b/dev-python/openapi-core/files/openapi-core-0.19.0-pytest-8.patch
deleted file mode 100644
index 78fb19897560..000000000000
--- a/dev-python/openapi-core/files/openapi-core-0.19.0-pytest-8.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 36da765cfc27cd6bda5c2773e3b3664a6473cd3b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 15 Feb 2024 15:53:50 +0100
-Subject: [PATCH] Remove spurious `pytest.warns()` to fix pytest-8
- compatibility
-
-Remove the spurious `pytest.warns()` contexts within `pytest.raises()`
-in `test_shortcuts`, in order to fix compatibility with pytest-8.0.0.
-Prior to this version, the exception raised caused these assertions
-to be ignored entirely.  This is fixed in pytest-8.0.0, and the tests
-start failing because the warning is never raised prior
-to the exception.
-
-Fixes #789
----
- tests/unit/test_shortcuts.py | 21 +++++++--------------
- 1 file changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/tests/unit/test_shortcuts.py b/tests/unit/test_shortcuts.py
-index 0dd1865..9a3f36c 100644
---- a/tests/unit/test_shortcuts.py
-+++ b/tests/unit/test_shortcuts.py
-@@ -423,8 +423,7 @@ class TestUnmarshalResponse:
-         mock_unmarshal.return_value = ResultMock(error_to_raise=ValueError)
- 
-         with pytest.raises(ValueError):
--            with pytest.warns(DeprecationWarning):
--                unmarshal_response(request, response, spec=spec_v31)
-+            unmarshal_response(request, response, spec=spec_v31)
- 
-         mock_unmarshal.assert_called_once_with(request, response)
- 
-@@ -597,15 +596,13 @@ class TestValidateRequest:
-         request = mock.Mock(spec=Request)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_request(request, spec=spec_invalid)
-+            validate_request(request, spec=spec_invalid)
- 
-     def test_spec_not_detected(self, spec_v20):
-         request = mock.Mock(spec=Request)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_request(request, spec=spec_v20)
-+            validate_request(request, spec=spec_v20)
- 
-     def test_request_type_invalid(self, spec_v31):
-         request = mock.sentinel.request
-@@ -733,8 +730,7 @@ class TestValidateRequest:
-         request = mock.Mock(spec=WebhookRequest)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_request(request, spec=spec_v30)
-+            validate_request(request, spec=spec_v30)
- 
-     @mock.patch(
-         "openapi_core.validation.request.validators.V31WebhookRequestValidator."
-@@ -889,16 +885,14 @@ class TestValidateResponse:
-         response = mock.Mock(spec=Response)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_response(request, response, spec=spec_invalid)
-+            validate_response(request, response, spec=spec_invalid)
- 
-     def test_spec_not_supported(self, spec_v20):
-         request = mock.Mock(spec=Request)
-         response = mock.Mock(spec=Response)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_response(request, response, spec=spec_v20)
-+            validate_response(request, response, spec=spec_v20)
- 
-     def test_request_type_invalid(self, spec_v31):
-         request = mock.sentinel.request
-@@ -965,8 +959,7 @@ class TestValidateResponse:
-         response = mock.Mock(spec=Response)
- 
-         with pytest.raises(SpecError):
--            with pytest.warns(DeprecationWarning):
--                validate_response(request, response, spec=spec_v30)
-+            validate_response(request, response, spec=spec_v30)
- 
-     @mock.patch(
-         "openapi_core.validation.response.validators.V31WebhookResponseValidator."
--- 
-2.43.1
-
diff --git a/dev-python/openapi-core/openapi-core-0.19.0.ebuild b/dev-python/openapi-core/openapi-core-0.19.0.ebuild
deleted file mode 100644
index 005dd84f4714..000000000000
--- a/dev-python/openapi-core/openapi-core-0.19.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-path-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-path-0.3.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.8[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.7.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		>=dev-python/aioitertools-0.11.0[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# missing dependendencies
-	tests/integration/contrib/falcon
-	tests/integration/contrib/fastapi
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/python-openapi/openapi-core/pull/790
-		"${FILESDIR}/${P}-pytest-8.patch"
-	)
-
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.19.1.ebuild b/dev-python/openapi-core/openapi-core-0.19.1.ebuild
index d1b3663e0af8..6779d832c696 100644
--- a/dev-python/openapi-core/openapi-core-0.19.1.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.19.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/asgiref-4[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index d339d09c9079..11ea4864bd84 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,5 +3,5 @@ DIST pandas-2.2.2.tar.gz 4398391 BLAKE2B 6b723d85c500abaca4d833e4fb329d9a495e3e8
 EBUILD pandas-2.2.1-r1.ebuild 9146 BLAKE2B da78b2cf5dc66dd8a9178c3d2a3b1d1d45bdf14f7ee317c5171add626a45200d2506e11e667bd7b1d70d87cb63353af7e7fb322e8747373ca17732bba5e31095 SHA512 b729fdacc12baf37706fc16c74b215dc300446d25396948f8c779dac95493ede6313bf63432e23f92c34e40fd183bfd864ca1febbdfae378340fd7c8f3f4142a
 EBUILD pandas-2.2.1.ebuild 9283 BLAKE2B 89607829279470bdd222744a9eb1298a72a48c6e9c70a14821f21e3f95fc1b8e155dda2a4c40fa73b3734697955920a3e712dd749f00570a146a59e0da37ea5d SHA512 335154ab97c1963959145b6b44ab252cb13c40e1b9158e138f769efd3a8471a379166279805957a243d1f7db4aacf82359abb5540b4ee8b20e00e2a8ce1f51c8
 EBUILD pandas-2.2.2-r1.ebuild 9109 BLAKE2B 8b7589490c911e250467ed1eba9af42d02646738c6d498d3cf81fd0b38b06929b40f8ad4c6c60c807945f28fd16bb075c726add5482aea7dd0b027ba3b4925f4 SHA512 c11db51f3d0126f8a3bcaba99ad6cdf46a2f689a8b6b579357f4a549aa6b39866d498bc15735bf608e013e6dc7a254753088acb46bb94f1ec0d0fe57ef11db53
-EBUILD pandas-2.2.2.ebuild 9225 BLAKE2B 2a4cc60b0f6391c6b362cb59679eb7354b4218333a92ef3acfd60deeb68bea11a337244c3cd375bab70efdfd99e452d69fc83e731423299ea25da589c83dd2ac SHA512 8ea4f9c5083762331f1b9a6e18721c0fe64ddb9522c158256ff9b1b281999dbbaf1a0cf84ccbb5469e8b84dc58827f3d1d1d713a7a893f7b995e8ca774f38dc9
+EBUILD pandas-2.2.2.ebuild 9223 BLAKE2B b9af5d5910d6fa88bc1b2aef0cdfc349ba3ba1bf6f1fcf52f4d0a56bdf4c36562468198bae3fc9c4b679a5c3f8d18821774c8f1cf4b5f45dbf6aa306bf855032 SHA512 343831a976f00c9662e2825baa4a07b688289164a97cb821d1d72c529122ce827576365f7d5e3ef27052db1a6e1f08cfb9a6d30496de39c9b398a12212c5930e
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-2.2.2.ebuild b/dev-python/pandas/pandas-2.2.2.ebuild
index cadc42ab07aa..03fd67dd8c6b 100644
--- a/dev-python/pandas/pandas-2.2.2.ebuild
+++ b/dev-python/pandas/pandas-2.2.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~s390 x86"
 IUSE="full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 78afee80ac70..3f22058c67d9 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,7 +1,3 @@
-DIST pyfakefs-5.3.5.gh.tar.gz 227359 BLAKE2B 635e41cb9892e1707555559769c01d5b575e44c5f1dd412acc05c3bed3b2dad2724ba32341b59cdecdfb658c94008e09396970349d8c1ffdcb90bf89ea82aca0 SHA512 342dc9cc0378af8cd8a9b0783fb6a1415207505ec8d4992f8fdd7e8d2bc4aada26d0803ed3b74d30b42a50dffb793c70acdeb3f28f199c0918783e1ea0a5e0d8
-DIST pyfakefs-5.4.0.gh.tar.gz 237951 BLAKE2B c71354c00f9e33248796cf02a0fc85ec53904900deebfd40e5755e23a0fc43012ce0128a8145ec2e9d6b8724f5733634810dc2018aeaaeea9301e91cee71dbf1 SHA512 e8d6bf79cd5381c0b7157741b8b0de068ea19148f48ce0841cff48e05d48dd01090ae73c5c1e633797a479631d2072a6c16350eabe6edcf0590e8e98f2b187a0
 DIST pyfakefs-5.4.1.gh.tar.gz 237928 BLAKE2B 8abea2d884d69717ab754c38666633f86230e981ddb099f8f9493d4d82ff0ff73e644ec793ea5e68edc662fee72dfd833fcab068b73fd5285555d2e5d8445823 SHA512 f27ce662a443623717a91e3fe1895cbbf7a64d009b7846b61c890ebabb0c3bb978b12bb83b68460fc026f4a0cfe846afb6057b72306e822dc8ba75d6e2f1b555
-EBUILD pyfakefs-5.3.5.ebuild 977 BLAKE2B ce5257e32cbed948aad610c1c26a5e9554626975c9a0be2f54118b76624ac55a8ed78e5706a7bface3225a17dd0155b9a92f3cf0b39751997b27d1b39ff1508c SHA512 4d3d8af92cce2563ad38f2f82083335e3fbc23d253e3033e490f9978fb67d5d089d74e049c8daf419a8844ad3e02b4b345ccaa1de18cc2480d3663460bc1bab3
-EBUILD pyfakefs-5.4.0.ebuild 1130 BLAKE2B 89db069a1d24a89e080d1d466f7cd3820c9198f39ef456b7d13ae1e3e29f146087fcaa01297325a3d2061df75f462286af9bb407c2148ea2090f8505afa1276a SHA512 1424b9759629fff4846193c889f85d25f114c8dff2cbe4515e00bbbe87afd06be3bde4d76a3e5224c258e0d79a005ba33ef0bdbb9bcaef82bece529a02192be5
-EBUILD pyfakefs-5.4.1.ebuild 1130 BLAKE2B 89db069a1d24a89e080d1d466f7cd3820c9198f39ef456b7d13ae1e3e29f146087fcaa01297325a3d2061df75f462286af9bb407c2148ea2090f8505afa1276a SHA512 1424b9759629fff4846193c889f85d25f114c8dff2cbe4515e00bbbe87afd06be3bde4d76a3e5224c258e0d79a005ba33ef0bdbb9bcaef82bece529a02192be5
+EBUILD pyfakefs-5.4.1.ebuild 1122 BLAKE2B 6aed8c356657877632fe1d9c425458374d37a8ed2e008b658b2376129a5e1bc0064da687d693abb13a68737b99dd35aeb677f77adc30520a6b1dc54993d93214 SHA512 b667dbb8c0e49e56532e3abf90133aec043e64e29db73d772c5e33b0c15981d93abfd7581bd327f4bb3f19d9ed3633d2428d1ccbe9ef58e097e2c506e4286d92
 MISC metadata.xml 395 BLAKE2B add696dab9f93cad522087325d7cea08bb0d6905a093c0dd721b8ee0cc5f06a97e8b29663920e5131fd1cfaf38a1fb1c22908daa155025713ffbf18d87a2d5ec SHA512 454f9cf42ae315bb9d4b7c9a2a8b9a690163befc8f738b1fe4a145f1f3a9a5f59693e4cd1ebd4c501005cac1ab81c8b57b2316ac50739dfa96919b6de4850b9a
diff --git a/dev-python/pyfakefs/pyfakefs-5.3.5.ebuild b/dev-python/pyfakefs/pyfakefs-5.3.5.ebuild
deleted file mode 100644
index 0f4599b8a6e3..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.3.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-5.4.0.ebuild
deleted file mode 100644
index 85eb97cbee97..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.4.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=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild
index 85eb97cbee97..ebe04cf6f2f1 100644
--- a/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
deleted file mode 100644
index 06a501a9e112..000000000000
--- a/dev-python/simplegeneric/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r2.ebuild 568 BLAKE2B d50c18dd18fd682052e4a40d699939f2ee9ecf2ddcfd67491dcb7fb1ab5948814da932486e19a8e17bd9560b8d75054edab66e3fe201ac5f50a48f5ae0ad0569 SHA512 5ae1249f75aca9e117127afea7289a82892ca5d15a696cb5d286487c2e78111647c2a693529e3573af82a47f8f8e1f77aeef1f2f84af6e67fd05b57602b59b57
-MISC metadata.xml 757 BLAKE2B 413fa1c6ce55944c3f0b66f4bfc496c88eb1499603529050580f3df48bf7674c9a590aeea27c9533e709e33c61716e7f54e052c00261e81879069b91ff2928b6 SHA512 158c130fdfef00b5c2bf953f4d1811e5802438e2c4d6467f53b97879fff6aa93793f04d50de8ba65f41131fe7ece42327afdb667cd03c2021975fb11a6cf2267
diff --git a/dev-python/simplegeneric/metadata.xml b/dev-python/simplegeneric/metadata.xml
deleted file mode 100644
index d25c0a26f03b..000000000000
--- a/dev-python/simplegeneric/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-		The simplegeneric module lets you define simple single-dispatch
-		generic functions, akin to Python's built-in generic functions like len(),
-		iter() and so on. However, instead of using specially-named methods, these
-		generic functions use simple lookup tables, akin to those used by
-		e.g. pickle.dump() and other generic functions found in the Python
-		standard library.
-	</longdescription>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">simplegeneric</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
deleted file mode 100644
index b08472dd32da..000000000000
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple generic functions for Python"
-HOMEPAGE="https://pypi.org/project/simplegeneric/"
-SRC_URI="$(pypi_sdist_url "${PN}" "${PV}" .zip)"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/sumtypes/Manifest b/dev-python/sumtypes/Manifest
deleted file mode 100644
index 435e36612e32..000000000000
--- a/dev-python/sumtypes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sumtypes-0.1a6.gh.tar.gz 6535 BLAKE2B 5441b2c89515e9c24b0ca8e5ee6294272290bc452391ca6ce5adbd5befcf2f1879859e84d011b0a5be5a3690a138e9f2e30c38c15171160556eb863d6465b4ab SHA512 1e2fbcb6fe42db4aeeadb3e45d1629027eb99786fffaed03c61056c24a760e6bcb75001e700e4a40b67647f09d0c83d200ee381f62a1483874553f59121f866a
-EBUILD sumtypes-0.1_alpha6.ebuild 679 BLAKE2B 803acb1c7a50d7c1f198f665f924030f185c1c6123f93793df0362ef2211579a1d7636ee5649eff4c0122d579b875ed254c1ec66df87b02147f8cd2421807a9d SHA512 399d3aa994f4894d88d0d087d9bcf3393ccdd7898ec7fbbf02f75a385c9a9d60845b87580c051bf741e7b86b74a9562ba8b0ad044fa11804d835590b93a01bc7
-MISC metadata.xml 368 BLAKE2B 674fbf5cd16e64e40d059b99b4fc909a68f571b55437e2bb0333124ca053fbc09934c018d4048d3b764a2bbe60065b9bbd66fcdd98d7f347d769e82d792461d0 SHA512 4babad4180f506d3181d62b6454f46e5d116e58b93aa4f5b3747f5cac614a9b441be9648e25d0c11d7b581ce9a6ae1ac9b4a265bb5ab1ff96f2ab240b0de8d0d
diff --git a/dev-python/sumtypes/metadata.xml b/dev-python/sumtypes/metadata.xml
deleted file mode 100644
index 98c7a6352e36..000000000000
--- a/dev-python/sumtypes/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">radix/sumtypes</remote-id>
-		<remote-id type="pypi">sumtypes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild b/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
deleted file mode 100644
index d19843050e69..000000000000
--- a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P=${P/_alpha/a}
-DESCRIPTION="Sum Types, aka Tagged Unions, for Python"
-HOMEPAGE="
-	https://github.com/radix/sumtypes/
-	https://pypi.org/project/sumtypes/
-"
-SRC_URI="
-	https://github.com/radix/sumtypes/archive/${PV/_alpha/a}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tables/Manifest b/dev-python/tables/Manifest
index 62bb038ae6a0..b27a1ab3f525 100644
--- a/dev-python/tables/Manifest
+++ b/dev-python/tables/Manifest
@@ -8,5 +8,5 @@ DIST tables-3.9.2.tar.gz 4683437 BLAKE2B 7044aede85d9eca67260a309d19b5c80944b80b
 EBUILD tables-3.8.0-r3.ebuild 1909 BLAKE2B 975bc068d3662a9ea39cf4fd6446fb69a159fd2414695ed518251a174c59ffd71f2969d053d97152e31cf9933dcbf4159e45f4fc49e4588a18b050b5b70c5c1a SHA512 52c6c84534807ef1d98ec8d1afed1eb100ad4f90e122278444c98e70480a6b6ed6e5cfd0f270f417192a9c81c07da21f8bc30ed19d476e14380dc3a56a7897c3
 EBUILD tables-3.9.0.ebuild 1736 BLAKE2B ba9f80b737c239755874b841664f8646fcacff94e7e7a4ee7cce24e6ead30ab8626163e2850f9c91ba8ef7af496458ad4687a6eb0d273504d5a6de08f38414aa SHA512 0a612ca1a28e42d7764281c04a94dbf7105df0c258008c416d9f89a0f85923fc42c5dd5b0156e57eb4c9a425c743cc7bf9b90ca4657151d8af79a760873e10a8
 EBUILD tables-3.9.1-r1.ebuild 1738 BLAKE2B 9be5a16e8558f6d41d0c16eebe94ac68d8381568d9f02a9d0ecf4d95959eadb264d4be0864665946f266be9687340f99efc714bef52e30f5884061cd7861048e SHA512 35866707ea3d3a1435ad96ac2014837ca1d9b9d21ad9ff630060705a9c54984ea6a9da7be3d0854c4b0265b30429682a0c421812fd7482d2a67638be6b33dbf3
-EBUILD tables-3.9.2.ebuild 1752 BLAKE2B deaca94849689e12abc9521aff97ee2b0a922a20063613bd2a256acc7d64ed3cd75f3bf9e0ed0e92d8f9e21f222494e8dee9ef67a6b59735151d7b4287b88c3a SHA512 1cbeb25e30ccf17f8009c1e0c0055232a446f5b84c0527fa34551b7b8a40e8441d9dd5c14a7e93f7d9a180610c70a769c31487f97841ae0d2e93a2e2e17b1c6b
+EBUILD tables-3.9.2.ebuild 1751 BLAKE2B 21214014c3f362ee096c77013acbc63ed5613f75c6918b6d486011e1135bcc4e7e741628e25c3301fb6b4478404b0eb48173d2894955b4716fedca4cfb9beaa5 SHA512 22035786cc3e2f8042ce3a1d71cdefbc1e76f547e4f6bad0f6bd497e4b338a2b00dc4b38f7b78210053ad926c6abae7145d1e32f69381888986da48dc882fa42
 MISC metadata.xml 1090 BLAKE2B cc213079beb7f2888b5eab4886711fe8a4b7a4bc3cf13ff4d2247bd04edc05fdaed19c464ae28beac27de511ea997bcc873866bf9d544d6efe8cacd095e8640a SHA512 bd322eade443a3b1b610d262a0a6a30088246b3f772624fdfbf6eac85f240deb3f9001be1e2e20e334e65701c24e1d57100c67864d14067b1ae16e99f2136e8a
diff --git a/dev-python/tables/tables-3.9.2.ebuild b/dev-python/tables/tables-3.9.2.ebuild
index 145317fcd5ac..774972532129 100644
--- a/dev-python/tables/tables-3.9.2.ebuild
+++ b/dev-python/tables/tables-3.9.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cpudetection examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 0894b7b60ad9..958adc9d6f83 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,5 @@
 DIST tox-4.14.2.tar.gz 178515 BLAKE2B 812a4e0ffe218c5799a5bdf76cc5f1f99f60c7de464953349283e3951c91aded247941cb173bfdff670c9c079b9efb3645220ff7126b7e0cf341071d561a375b SHA512 45bbd3f8d00eee05158452295230321947ec16a8bfff43e84ea9825d514976526f3889709255ed042cfb7a7ebfed020707cfc2d25b69ce90c148f4472092350d
+DIST tox-4.15.0.tar.gz 179243 BLAKE2B ba126d2dbe9598667570e1798567cf2301a60ca4859947b0b5cd15603b6f1b9c1b557bc090973a3c99960c29242edbb684d9ab81b90ecca3ac020b129a033850 SHA512 a113d8e921301dc4bc39e03103f8857604b28beedc49c764315cf99694e8a351b965e0e1b7d91555ce437a1cbb2bce0e1dd645b7c92c36e8e0e1dedcf610d1af
 EBUILD tox-4.14.2.ebuild 2799 BLAKE2B ad0a398168b082140f4d427b00440d4035fd6cfee4cebb862ca5c04fa4828a46b81580dbab259332c03a555a16a521cd143cc72fd6064074143d98fc5374dd40 SHA512 b305b5c5d41811ec6fb7040f51fec39fd9bf3aceb63b723fd09c4ab0fc1305db2fa5301812c4076968bc83876a48a8ecffbab01b6c970f25678b525a486f1fff
+EBUILD tox-4.15.0.ebuild 2807 BLAKE2B 4414565dedce0995d86e380eb8750ab2605dbe1caedc9d79e3a1909f49e5ebbcce4658dfb70adff4c92f829f6f5c1980d4f8c9ac9090856349532baea06095f7 SHA512 24e201053d9ddd01c6b08ba954bbf158bd66f2e115bb7aff2909b7f84b01be129d806e5138670d27f2bc9d36046b583bdd29449cc17d5dd0a76a922a80f3e657
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.15.0.ebuild b/dev-python/tox/tox-4.15.0.ebuild
new file mode 100644
index 000000000000..e80094cd0dd9
--- /dev/null
+++ b/dev-python/tox/tox-4.15.0.ebuild
@@ -0,0 +1,87 @@
+# 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..12} 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 ~ia64 ~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
+	)
+
+	[[ ${EPYTHON} == 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]'
+	)
+
+	epytest
+}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index e1e32154f41a..e9c2c07a9a92 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,5 +1,3 @@
-DIST trove-classifiers-2024.3.25.tar.gz 16040 BLAKE2B 001a307d041e76213f3d2d115a10467b8434afecb0dc268ed9a1943aa7961c9021b49794a593102372c41b6776f3e513db44f680dda700c9897f65ef593ec860 SHA512 3b1d0c08d9a90bfe2314b092270677397d5150f0b641dfaf6ffda7a3447b898ea2c1d2dceab0f61ddceeb6b42945aec19e7a1028bf72ac3a119454f66945db7c
 DIST trove-classifiers-2024.4.10.tar.gz 16036 BLAKE2B bfd0ae5e3e1dc2dab67e66dc9cdf90b3ff789d00fff5f13ddf8974736adf3e37c505488d4aea32b0c4b43a6d77617e9a0672def2e66baf813734b1e3bebb8bd3 SHA512 2705ea82869bb3092dd37c817d5263955249b44ad64c0fcedc523ecc78eaeb2a327500adbafe70c5d08b5961bf8095748e34a0daa1a2ba8db3fa27e1a35a645b
-EBUILD trove-classifiers-2024.3.25.ebuild 1142 BLAKE2B e5642e65771464cd3cd1c89e6b66f99aa46daae2d695cd64e4b4949c86c4554f82a323e5fb2321fc3acc0862ece82acc351cefae30c42c867161ad674b21ffcd SHA512 cc61fe3cd7599e5f8a12e42fc63bc22e0f50a58027845b71f179503c7bc7d497d2f26fc8f41eff9b1cd5f5f0c072140ecb270dbbab016fa64b811e94a677f006
-EBUILD trove-classifiers-2024.4.10.ebuild 1150 BLAKE2B 0e70586246456bb6664decb5e668d0fc9753d0498fdeb7299b4b83142d2f6fc79b4037cc3ef2e25dc11e36a4462453ae9dfea4d93daf64cf03a74c78c3732475 SHA512 de49ad590035b61d40e1265baf607379b6bfbf671b31cd1921e6ba70253fc53fc860d140d0bc6ef3e721469377a81bb4937d53ee5bd41083172cd8dc7e7a9f38
+EBUILD trove-classifiers-2024.4.10.ebuild 1142 BLAKE2B e5642e65771464cd3cd1c89e6b66f99aa46daae2d695cd64e4b4949c86c4554f82a323e5fb2321fc3acc0862ece82acc351cefae30c42c867161ad674b21ffcd SHA512 cc61fe3cd7599e5f8a12e42fc63bc22e0f50a58027845b71f179503c7bc7d497d2f26fc8f41eff9b1cd5f5f0c072140ecb270dbbab016fa64b811e94a677f006
 MISC metadata.xml 385 BLAKE2B 0d679ace6575dab100af9918e8b6dbde2f70cbf556c23ee667d68f69c6dd07887e43a513a73e60849a7a4b88cb26d4cd85b4cb905b926ee3832161c663adc9c0 SHA512 977bc86d4fb2dfcc887fd8d4038b8ac76cb0f4783424d3ab0857256afaf5dacf4e45c0d2a9166daa854be1dc8faba4a10c4718c557b983a1c7bb0a33fcd61f41
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.3.25.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.3.25.ebuild
deleted file mode 100644
index 35832d4c838e..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2024.3.25.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=flit
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.4.10.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.4.10.ebuild
index 3172a692bdd9..35832d4c838e 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2024.4.10.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2024.4.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 356a79cbb7c7..d2d711bf352f 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,3 +1,4 @@
+AUX tokio-tar-0.3.1-ppc.patch 794 BLAKE2B 2c1188d96310710fabe8d248be01ab5e4d30aa02fe2b4f812a79a6c9440052178227534485122643bf4ed7f32ce3bfea289d78398c53229dd825eef44de6e164 SHA512 869d98ddd3eef7f8d9a7643ec5f93c73fed7bd4f1fb73b54a9e640293e831d24ca59bdd63377b07656ae706b5bf9833dd731b0537b43e8476d8cae0f3b8ab439
 AUX uv-0.1.24-skip-tests.patch 6070 BLAKE2B 10c111a2782bc0de45317dc4b6d7f7d66474aec38d61992a63686678a70685aa030acc2b96cb5cced70cf2b290e6f69cdb3e5c42464e04b937a9ef9cb2d7f9f7 SHA512 84fa60b254b3d14fbae337aceba1f34e9f4cd35e0d8da7e90c4ef75c81ccc5268dbfe3e46967ba05899af7862331cade50dcd4a364acd51fcb04a0923cbf7688
 AUX uv-0.1.37-test.patch 869 BLAKE2B ed0dbcc9e2aac2a66974cfa408aa6b714d3fc0cf72c94d2d84bcfe203da4b5428b51e7d2016fdca552db80a4eb260b5c10a69b798354cd7d2887647086e3aae7 SHA512 3d919a23a126a5c8612fb5ce5931bdf8953ed113ee748241c5b6526874957a7503b06bf64afa9828f5ccfd3646d9f6d4ed00fadcd6afa87875bdb09e58f0d03e
 DIST pubgrub-c26e485213e39582c6f2e4d45c0328422670e7a7.gh.tar.gz 86123 BLAKE2B 743bb61460903d276f467b23bb001313598b50cb54fd1a56bcadbc732dd606bafd48a2d9960add3424bd03222450b455f9f1bc8716a80933e5ed0cfb76dcc50a SHA512 9f9c8b58dd2ddeb3ed89abcd790641bd9b7b2cf4fc66dcc4d964a1b69d879adcdaf2775545631ca20f06a8ab5d6bc1df6b2eb272207d2642584c269b358f4d76
@@ -6,14 +7,8 @@ DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE
 DIST rs-async-zip-d76801da0943de985254fc6255c0e476b57c5836.gh.tar.gz 95906 BLAKE2B a5a0e4d20926d637cbfa25cb486580de6682365c588a9653c873622424ec28ac8c7380d1c99ec260cd342b214aacd5124b51fc5e5646f15f76db4148aada2f41 SHA512 dd5b61bfc913a94822d74f1dac3b30f7a3979a641c3b08ccb5fa84cfbb2bfd8c0f807a30cc4ae0abfe5df7079011c20e1f8a642fd439ce6ba2c404ddee06baf5
 DIST uv-0.1.24-crates.tar.xz 64420840 BLAKE2B 7324461092a07c86aadaddf051aaa7454ec08085940f34d07d8a8dc7171abcbf94409df5cd8afd71f1022adb2e76c0aeb1eabe9190598cad4d06e390ccd612f4 SHA512 6701a768a8a1d48ac43038e5161b578b684abed1c2055cc4b7fb5656ec40118287893ee2674b7161292ce7c3e4c062c32ff0038f1548c8f79f4df473d8d26f30
 DIST uv-0.1.24.gh.tar.gz 899637 BLAKE2B fab26ba9934fc5f586505b5ac1fa386c11f07e51ca2bb2a79f46d5dec9475ba8d75ad8587223d5149df5f2a225146d020a49b7ff81ed26b949cff55892738c2d SHA512 520b47a096b50fce9e7b7af5bca203df9bf4c2d0aafbe28a3dcfe0592d8ddcaa7b58d52300c67454f6aeecfd196f1592be18e45c95b7c67257361917cdb0154d
-DIST uv-0.1.36-crates.tar.xz 65852268 BLAKE2B f9dac75dc992d37c54554c25e0ce0895aa017753a6688754acee5b6a99822e0f55923a539fcd67a8d30332abf1d2b2ed333b8b1125eef5061da2d8f57307004b SHA512 c0dd2171416333f8267592c75699fd35f686d04b3b81241e51cbf4b9f8d1e0def54ab9336b2e62e1fb5e40d3ad73146eba7dd6c0093fa23230d23c4fa73d8f74
-DIST uv-0.1.36.gh.tar.gz 1018114 BLAKE2B c57a3362940803df34f45c0dd2bcc176fb4928d1b0c168adc89d150ffb59a39d0fb57b41c063485a7c324a2101b9f4334cf29e175f910122842f893c6be9970a SHA512 39a4ec3b17803a13a53f331185bfb4fa321f9ee2c158828ad9f88aa7214ee72a58a87dcef74eaeac7a1e3a989909f0d50a457431ce22a72703db0e8c3fc4a6c2
-DIST uv-0.1.37-crates.tar.xz 65881140 BLAKE2B c1a640c44d73d5607c8d07468cefc66c150135b0f0249362148bd2b8f8c99a43c9031a642c0f76140631177df947be7637b49e99e247afbd7efbebb2ad79bcb1 SHA512 99bf6f341f9e6cf8eb0834c436b81453615725cabd3ddc4cca34edb307200bdbb71e913e8ff52a2a1d11e5f1a4abfb4dbdfe40a9c4f114079a7d9fdace0bcaab
-DIST uv-0.1.37.gh.tar.gz 1020667 BLAKE2B 4aa459b15dc06d57d5cad66ebeb5925ec833870dea17f72ef54889f8e8699719cba59bd0600263c1647f17402c002000114d603a474dbcf873ac2f2c37301fb8 SHA512 88d9233bd05e8003b75759e39bc22c469a0094a5ca5b6bd6f2bd8b266b376c44ecfa442f3cd5fff1c099234b660a871153423bacbf785863deb79df321b05574
 DIST uv-0.1.38-crates.tar.xz 65881140 BLAKE2B c1a640c44d73d5607c8d07468cefc66c150135b0f0249362148bd2b8f8c99a43c9031a642c0f76140631177df947be7637b49e99e247afbd7efbebb2ad79bcb1 SHA512 99bf6f341f9e6cf8eb0834c436b81453615725cabd3ddc4cca34edb307200bdbb71e913e8ff52a2a1d11e5f1a4abfb4dbdfe40a9c4f114079a7d9fdace0bcaab
 DIST uv-0.1.38.gh.tar.gz 1023332 BLAKE2B e62259084fc9122d311bbcac754796b9e0ac28f4865755e03729eb6ad5adab4f9e3f77c41af1dbdbdc3a55d5a4736875aa26ddc7b78b745c8d6fb4d6b8bbd959 SHA512 7dad22d038aad03ad72ee0c5fdb77ccfbf56fc94a38613373a037eb26c2f228bc6c883d542621b45f2a55c8d51b7345fdd919dc1db45aa4d598e368311c72fdd
 EBUILD uv-0.1.24.ebuild 2164 BLAKE2B 3caf382115984e87a0f44b5e8f619f38b3a7503ac12738519d0edff253eafbc7474924aa1997e332738ffe316da40dd199b906b1c560f1a00a53c805a39edc75 SHA512 c0c83640c43d073a1447228993e8384eee6a4adf73760d651456899ba285d25cc83f0611f6196123125f94fa9fa5d85710308ccf603e7261a699efc2f927dad7
-EBUILD uv-0.1.36.ebuild 2094 BLAKE2B 37e23e4dc916b7dbdbc6a749601a3d363fe6b4d4f3f83cff1dfc8ba9c7444c3798fdde8422136f62e02629de599aefc5118aa51cfae819cb756eda525ce54daf SHA512 3e1094213e116c2de3bd650c8fe05b0b9b0b4d12b6db19c22378677965e6659b5c50d46260136406bf04a3c3bf422f66687fb9f829030bdfb6af38cc293a3a44
-EBUILD uv-0.1.37.ebuild 2248 BLAKE2B ee8e52748ea5060ee7c9cd34c4048b561d03316f6281878071d333e795354ee6cb6358174c22e80b7aef9b57b881e1df789a71316cfaf62c95e60ecde64459a9 SHA512 0e597f311016c604687a16a2869c13e8fcc238fdd0051a44138ad91aba683803170752016c8dacc09f90f26856968782b7573e70c6be81bfe03a7b7acb288c82
-EBUILD uv-0.1.38.ebuild 2094 BLAKE2B 37e23e4dc916b7dbdbc6a749601a3d363fe6b4d4f3f83cff1dfc8ba9c7444c3798fdde8422136f62e02629de599aefc5118aa51cfae819cb756eda525ce54daf SHA512 3e1094213e116c2de3bd650c8fe05b0b9b0b4d12b6db19c22378677965e6659b5c50d46260136406bf04a3c3bf422f66687fb9f829030bdfb6af38cc293a3a44
+EBUILD uv-0.1.38.ebuild 2378 BLAKE2B 4da9aaebed3ed245f2153c2ad99476f511f823374b1d0fc07a62234b99c887d43ad189ea75a033c215e71b4353010d92ad395a13fd9a275c2e85a4f4bbe0e6a0 SHA512 62694fce6a481ff261a878846ae24adea2b38b8a9a8288bd4292402bf9dc1b579257783afcb698cd5a79004ada2f1218b95395d84e5ea8de82848b989394228b
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch b/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch
new file mode 100644
index 000000000000..cb3c2f93cf57
--- /dev/null
+++ b/dev-python/uv/files/tokio-tar-0.3.1-ppc.patch
@@ -0,0 +1,35 @@
+diff --git a/src/archive.rs b/src/archive.rs
+index 63f4293..986a146 100644
+--- a/src/archive.rs
++++ b/src/archive.rs
+@@ -3,12 +3,13 @@ use std::{
+     collections::VecDeque,
+     path::Path,
+     pin::Pin,
+-    sync::{
+-        atomic::{AtomicU64, Ordering},
+-        Arc,
+-    },
++    sync::Arc,
+     task::{Context, Poll},
+ };
++use portable_atomic::{
++    AtomicU64,
++    Ordering,
++};
+ use tokio::{
+     io::{self, AsyncRead as Read, AsyncReadExt},
+     sync::Mutex,
+diff -dup a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml	2024-04-27 10:39:21.186708179 +0200
++++ b/Cargo.toml	2024-04-27 10:39:37.940402613 +0200
+@@ -43,6 +43,9 @@ version = "0.2"
+ [dependencies.futures-core]
+ version = "0.3"
+ 
++[dependencies.portable-atomic]
++version = "1"
++
+ [dependencies.tokio]
+ version = "1"
+ features = [
diff --git a/dev-python/uv/uv-0.1.36.ebuild b/dev-python/uv/uv-0.1.36.ebuild
deleted file mode 100644
index 793b60d2c541..000000000000
--- a/dev-python/uv/uv-0.1.36.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
-)
-
-inherit cargo check-reqs
-
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	CRATE_P=${P}
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	dev-libs/libgit2:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_configure() {
-	local myfeatures=(
-		# from upstream defaults
-		flate2/zlib-ng
-		python
-		pypi
-		git
-		maturin
-		# skip tests that require specific patch version of the interpreter:
-		# python-patch
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.1.37.ebuild b/dev-python/uv/uv-0.1.37.ebuild
deleted file mode 100644
index 38bbfee404a1..000000000000
--- a/dev-python/uv/uv-0.1.37.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;c26e485213e39582c6f2e4d45c0328422670e7a7;pubgrub-%commit%'
-)
-
-inherit cargo check-reqs
-
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	CRATE_P=${P}
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	dev-libs/libgit2:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=virtual/rust-1.77
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-PATCHES=(
-	# tests are running on live pip index, and need to be updated
-	# whenever upstreams release new packages x_x
-	"${FILESDIR}/${P}-test.patch"
-)
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_configure() {
-	local myfeatures=(
-		# from upstream defaults
-		flate2/zlib-ng
-		python
-		pypi
-		git
-		maturin
-		# skip tests that require specific patch version of the interpreter:
-		# python-patch
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.1.38.ebuild b/dev-python/uv/uv-0.1.38.ebuild
index 793b60d2c541..7bfc616ced7f 100644
--- a/dev-python/uv/uv-0.1.38.ebuild
+++ b/dev-python/uv/uv-0.1.38.ebuild
@@ -42,7 +42,7 @@ LICENSE+="
 # ring crate
 LICENSE+=" openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="test"
 PROPERTIES="test_network"
@@ -80,6 +80,16 @@ pkg_setup() {
 	check_space
 }
 
+src_prepare() {
+	default
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
 src_configure() {
 	local myfeatures=(
 		# from upstream defaults
diff --git a/dev-python/xkbcommon/Manifest b/dev-python/xkbcommon/Manifest
index 9d95a02d8e1b..1aec4a2498c1 100644
--- a/dev-python/xkbcommon/Manifest
+++ b/dev-python/xkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST python-xkbcommon-0.8.gh.tar.gz 26951 BLAKE2B 0d2a649e3fee8baa9345ddca97dc7c77b5d9e10d7ca90cbb29bcc3531f4bba3deee39e610e147054e956310506fb79ebb43c85955b787e55046d67c12b851026 SHA512 ae2640ef89e7ace0468e970762c7be4d3f608701f1abea10174f274c622db28a6e6323cdc5bbbbaaa1065d4c4ddf9f67b75d4c34bb2e9a0bb6260778b15a330a
 DIST python-xkbcommon-1.0.gh.tar.gz 27258 BLAKE2B 3106877f8e87f50453a358eec4e6431642b00a6a2bc23d3088ef22379984869ec84cd042a1ac53dd72783f3005dad1efddf3f87410204b88bfde4f9da0044c97 SHA512 c7793d6f5517771006ff5a9c01deb9a37717157d7171af49ff459dc96b3b16a1d2d4c0f1272b5a8f683390de1e8e6a6ff92472f18828c7e38e0f2a1ee6f34f07
-EBUILD xkbcommon-0.8.ebuild 851 BLAKE2B cf745a664f1e2d5014756a4ab73543b6794f1213604fdb42bbda19e89b25238824e45c30f0c9cc5051374d89945c8d21bee60abba4367d42ff24cd69b67b4b36 SHA512 f323e00d95332806214b370feb075dc40a6471b757a6902e977e32b44cb3e58700de6be52b191163bef0e74750424cf69dc4639fd25cd8f25689f72e6f5ebcfd
-EBUILD xkbcommon-1.0.ebuild 857 BLAKE2B f643dd6f7e458dc8b3bd2c86bd2121b9f742fa22dbdc3a97453e8441b4c98b27f1d7155d353e5830b7eacedd5560b4367c43e643bf32034f36cf13acaf9b1f7d SHA512 e884e729ebf9c66fd512052efd8386ddc002f53ce7fcbc7b5447fd067bf3aa20235c10a4ba4f3f366412553d62d655dea52f5c02d7aed3c289c993d4473e5171
+EBUILD xkbcommon-1.0.ebuild 856 BLAKE2B 4b1d8900d745aff74b0eb0021ab07f8b87b47236b2a2b3cb645921446d54a7f58b575f8ab5b73266f7362e8bb2f13289cd595ce967fbe1d11d33dc79788d4b5f SHA512 449bd647696eddb5008e924f557cf8f718efd07ce4280c18e69744b1d3ffb4e4a0effdc4435661a65675ef1d2400bfe7d4641b8e29790ed18465fbd00e5b8857
 MISC metadata.xml 355 BLAKE2B fef5c9392775c817ce5754bc6c70a30048e0aa252593229667b515d27421e95377f2199c121f43b112ef957a4172440417221fecf30ce9d068b23278bc2e2e4a SHA512 21fd7e00d1b727d6b281977fa4659c620259577dc346213437af17742ee4ceff367e0ccd45c8bb03f15afe6c0a1c885e1b3f9ebbd47b50518ec2953580b17df4
diff --git a/dev-python/xkbcommon/xkbcommon-0.8.ebuild b/dev-python/xkbcommon/xkbcommon-0.8.ebuild
deleted file mode 100644
index 1ca6444edeeb..000000000000
--- a/dev-python/xkbcommon/xkbcommon-0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2023 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} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-xkbcommon-${PV}
-DESCRIPTION="Python bindings for libxkbcommon using cffi"
-HOMEPAGE="
-	https://github.com/sde1000/python-xkbcommon/
-	https://pypi.org/project/xkbcommon/
-"
-SRC_URI="
-	https://github.com/sde1000/python-xkbcommon/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-# x11-libs/libxkbcommon dep per README
-RDEPEND="
-	>=x11-libs/libxkbcommon-${PV}
-	$(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf xkbcommon || die
-
-	epytest
-}
diff --git a/dev-python/xkbcommon/xkbcommon-1.0.ebuild b/dev-python/xkbcommon/xkbcommon-1.0.ebuild
index be6fb2d9ee7f..5b1afed2756f 100644
--- a/dev-python/xkbcommon/xkbcommon-1.0.ebuild
+++ b/dev-python/xkbcommon/xkbcommon-1.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 # x11-libs/libxkbcommon dep per README
 RDEPEND="
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index a0f907c80460..66b8f9d44b71 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,3 @@
-DIST zeroconf-0.131.0.tar.gz 169253 BLAKE2B 64247bdca5f8a226e73078b0395fa273649d3baea54fe52c350bf5117527e4290974843385f5b23568a6350bb41fa0af13a6999ef4e880fc42952dde21126296 SHA512 7b7f5494a589306c458dc4fedd940aab86918e9979d5b9f0a466d28b74795c83351f82fdf501a983e9df3e32a8be9a88af3486e79ade23ab73d889610331d89a
-DIST zeroconf-0.132.0.tar.gz 170270 BLAKE2B 2ef40ab7d3aafb21f3b82b2e47598034ab821218f80082f26be3e41ac1197ea52a57657e45f38b41a8113164fbde2a8839264c9284c82b64327c443afad1726e SHA512 b8ccbb6f196db9404361e4ec85bc2a9f9801335a188ba6e4f1090afe1f042d82b69545f5db9b8c5d99720f1a7fbc77029ff0f624b8d17837b3dc8b41029e56a7
 DIST zeroconf-0.132.2.tar.gz 170698 BLAKE2B 7c76e2a00571a19b23f288dc1183da6ce274ebdf3f64f323e282f444011f7cbf90a63e02a991936a2cfa2d227568b31444b8f61f1110588638d4e888dd8749a6 SHA512 686cdfd2f32c6bad03fb5fd287b1e22f2f0b5099a8971dcff1d9fca7e63bc8069b195feb97be710c20fae8c524ab92143e395cdfec26ede103295d1aa4d32a8f
-EBUILD zeroconf-0.131.0.ebuild 1408 BLAKE2B 31839fb4a65f66224139e4e95bae68302a47ff197837bffb4af0a8c0d5c439fe75a6a09bd425dfe66606298f3efd61de00f28790ab83b8fb160d03128b3ebfb2 SHA512 98fa9986bd7d7a9b6bcfd29a867a3b74041b52c259e423f09ae9be69da295ae937e5339929744b0bc25246e8493935c78c7f9249a7efd704173392ffad269ae2
-EBUILD zeroconf-0.132.0.ebuild 1411 BLAKE2B 34c47d518aec82f8164c92058e5f1bcc3e8fbf80b3541e75db702e92e6d0c64c476a43a9df93f814698f8b2db8323b3d03e6994464463573d721f731c0ef6e7d SHA512 09c072050d2465ada90e51dd53097c6581d8d41e82b5263c259b622de2f875769ad24706ca2321c3b2472b0cbf0d5864cdf5262b0c615638a6d4a87c99e6e9cc
-EBUILD zeroconf-0.132.2.ebuild 1411 BLAKE2B 34c47d518aec82f8164c92058e5f1bcc3e8fbf80b3541e75db702e92e6d0c64c476a43a9df93f814698f8b2db8323b3d03e6994464463573d721f731c0ef6e7d SHA512 09c072050d2465ada90e51dd53097c6581d8d41e82b5263c259b622de2f875769ad24706ca2321c3b2472b0cbf0d5864cdf5262b0c615638a6d4a87c99e6e9cc
+EBUILD zeroconf-0.132.2.ebuild 1408 BLAKE2B 0b2ef41fe5393b8f001248dd4256a9e1fd255ca49228a16bfc01e0a511bf92f0816eb79998f9f9dd7a32fccda93778866ba39f0513ede8679388b9f13ceb5008 SHA512 1266cc4c89c4554bb3f0d68cd9b2f51b754b9678838d8cd0f03458b7fea6bd8f802bb4bfeef7a3e832ec02c4d555a08b4f68e20905adb1920f29071989606333
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.131.0.ebuild b/dev-python/zeroconf/zeroconf-0.131.0.ebuild
deleted file mode 100644
index e2943de8e0d9..000000000000
--- a/dev-python/zeroconf/zeroconf-0.131.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-3.0.5[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.132.0.ebuild b/dev-python/zeroconf/zeroconf-0.132.0.ebuild
deleted file mode 100644
index be589608aa7b..000000000000
--- a/dev-python/zeroconf/zeroconf-0.132.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/python-zeroconf/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# the build system uses custom build script that uses distutils to build
-# C extensions, sigh
-BDEPEND="
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export REQUIRE_CYTHON=1
-
-python_test() {
-	local -x SKIP_IPV6=1
-	local EPYTEST_DESELECT=(
-		# network
-		tests/test_core.py::Framework::test_close_multiple_times
-		tests/test_core.py::Framework::test_launch_and_close
-		tests/test_core.py::Framework::test_launch_and_close_context_manager
-
-		# fragile to timeouts (?)
-		tests/services/test_browser.py::test_service_browser_expire_callbacks
-		tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	)
-
-	epytest -o addopts=
-}
diff --git a/dev-python/zeroconf/zeroconf-0.132.2.ebuild b/dev-python/zeroconf/zeroconf-0.132.2.ebuild
index be589608aa7b..53d810e82f90 100644
--- a/dev-python/zeroconf/zeroconf-0.132.2.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.132.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 16aed1962d47..4560b0ef2e68 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,5 +1,5 @@
 DIST zope.interface-6.2.tar.gz 247528 BLAKE2B 4112579da95e763bb5feca7fc8845896178afd5e3fb181a5945de80cf579d0c66373e9ee9cbff97964f79750908b5e4650316b3df1cef16a267c3625268cec46 SHA512 42c169ba88e0e4fe7895f0956250ddb5f3e9aef3e73a801ef71b0e94f906e9f597008de16955a7a8a5ca59551b800e6f000c70ffb3f486a7cbb7bf9caa00059d
 DIST zope.interface-6.3.tar.gz 294679 BLAKE2B e70c0581213776a685ff8e208a418f82adc5df2d53cc00316e38621dfa05559836416a897366cf7df76784405490c3cb137ff48d35287812f503a4685e2e75be SHA512 fcc318fd098ca91a4617f2a15123cb727c4ebcdeb56b4e0c59475a55d67afdfeb2f2e2d0fdef462e22236c8733ba2c5982ba72c8e75648be6bf55116f5d39139
 EBUILD zope-interface-6.2.ebuild 1119 BLAKE2B e7f3f303c3f95961a5dd3668ed9bbfcc433cdf26a593b39c6c95049aa048b7e51d3ddf493cd57b4660224106e237f8d7276a73cb9d9e2c208447331ad732f270 SHA512 1752f8a3d91dbf8b0889af41e5b34167d2ea3475c4aa52e85c8b97e2243a2cae9a2aea5c6ec26d81a5145e07475c7e8913d8b35d51d74928ba06c4b5fb79e327
-EBUILD zope-interface-6.3.ebuild 1127 BLAKE2B 36c745595c5628e211e43d2d35362a50736d2391cfb5c12ef68e047482e1e4f5fc2bc0f578220abee657ce9732d45ba75ea48db808e649380744bd920824250b SHA512 f27047ffe3c78c7990e37ce846d2c771f6bbaee38e489dd9a308fdaa9d6b0c4ee0a7cbc49eeb7b052d0b0de985e7a7d179ba27246e3f0a27a1fc9a8596256564
+EBUILD zope-interface-6.3.ebuild 1120 BLAKE2B 535a4ab528fe96c8ab2e131388fed6460709fdfb9c5a6b3e7c833056f4f26279f5df3ce31708ea164446da67aee71e239fd3d773fbb7f5320f58c15ca8fbb018 SHA512 12f60c8f97c00835fd76e746fcb1f2a8aed33112047885ea0f6b2a14688b43761094f11cac71086a975670d45366eb3892cde31151b666688b267063e8f08421
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-6.3.ebuild b/dev-python/zope-interface/zope-interface-6.3.ebuild
index f53d77341852..2b9282843339 100644
--- a/dev-python/zope-interface/zope-interface-6.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-6.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope