Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2025-03-15 18:55:58 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2025-03-15 18:55:58 +0000
commit: 58cb2b2362108a7f1f9906079c86e9fb28e88e3a (patch)
tree: a578463cfa782b6dbe5dbe88ef8641fada5002dd /dev-python
parent: 2a91a97565fe6cce21a172c72f23935a18adf4eb (diff)
download: baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.tar.gz
baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.tar.xz
baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.zip
190 files changed, 1207 insertions, 3867 deletions
diff --git a/dev-python/aiounittest/Manifest b/dev-python/aiounittest/Manifest
index d9ca13fa5bcf..6e3d0d132617 100644
--- a/dev-python/aiounittest/Manifest
+++ b/dev-python/aiounittest/Manifest
@@ -1,3 +1,2 @@
-DIST aiounittest-1.4.2.gh.tar.gz 15791 BLAKE2B 7784bbf94de2b8520baef66a0b4929267942d233cc782f35677ea05b02e3d48901ba90cf9630b76bd300708ebbe59dd9d78c299422182c06940749bc2b378b45 SHA512 358b7c412f90eb7afc7ed7058e8e2d4426a6c57379d341d997658859ba6054a9a1337d0b05e63a825e28023f02550bd72d65bdb3feab4503c763c98f8c0d19c6
 DIST aiounittest-1.4.3.gh.tar.gz 15828 BLAKE2B f3abd87d77f27f3a29b392e3e5518ad5062c930e1884522c40aa8b4c54d27feddd86a50df6272b5a47a4edf0b7f3bc503fd4f67aaef92d885670fc20c74f32da SHA512 398fcf071660bfc38cb68dc01bed83c6d2320a8a1b8e8ade921a7616f7fe70534203b28630532a287da98cbbefcc8b6cf8c97d5a35fe5c63e7e143f8c619c1bb
 DIST aiounittest-1.5.0.gh.tar.gz 15848 BLAKE2B 4ef88fa7f05694e9d5f9ec7f34043213b490056f5854c9b911195637d14251fe4fc72ce2d6fe94098a590fe6d9e33b9fff08a5b095644e603d8e561af8da5e65 SHA512 e17c5f939cff863de54a73c3aec3e5c80c037a53ee033ec8528665a6fe39bf004a2ce26a509c31e7bf6ba3e4abadb0ead908274147f010bbcd17b27c250f4ebf
diff --git a/dev-python/aiounittest/aiounittest-1.4.2.ebuild b/dev-python/aiounittest/aiounittest-1.4.2.ebuild
deleted file mode 100644
index 7fd5da82f92f..000000000000
--- a/dev-python/aiounittest/aiounittest-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Test asyncio code more easily"
-HOMEPAGE="
-	https://github.com/kwarunek/aiounittest/
-	https://pypi.org/project/aiounittest/
-"
-SRC_URI="
-	https://github.com/kwarunek/aiounittest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wrapt[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiounittest/aiounittest-1.4.3.ebuild b/dev-python/aiounittest/aiounittest-1.4.3.ebuild
index 6843abed6d01..0c4463037659 100644
--- a/dev-python/aiounittest/aiounittest-1.4.3.ebuild
+++ b/dev-python/aiounittest/aiounittest-1.4.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wrapt[${PYTHON_USEDEP}]
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index f556a3cb39be..6e379a262f04 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,2 +1 @@
-DIST backrefs-5.7.post1.tar.gz 6582270 BLAKE2B 348c94a3386fce51cdbe03c9f8dda52d0c642409edacd10b708ce7090f676888fd934a681e02bb0d01893c2a81cd69b114c8fc72e28a4137bb30f2843fe04f4f SHA512 85c9043091c3a48746252e92a82c69b7238e53329b06148aeafecc67f2750b5a2fb726d706e194313d0b3d685ba728a39ea38f2e009ce02208e332e68fba6c74
 DIST backrefs-5.8.tar.gz 6773994 BLAKE2B e0d1c0c7acb379f2b151ed4e86ac6d574495ada1f96dd3173daafdbf15c769beb9b13a87b1aa23462b292b7df293dbf050a70c4f00a625f168065acce718ee39 SHA512 d0a704179678cf90c3dea080ccca4ab05338393af3ae6a56c108d7aa6ea8797ccea590177f137b552265b63d17528f93bbd1726819199bd3405d1b9dff99cd12
diff --git a/dev-python/backrefs/backrefs-5.7_p1.ebuild b/dev-python/backrefs/backrefs-5.7_p1.ebuild
deleted file mode 100644
index cf28780a98fe..000000000000
--- a/dev-python/backrefs/backrefs-5.7_p1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backrefs/backrefs-5.8.ebuild b/dev-python/backrefs/backrefs-5.8.ebuild
index 5ecf87a4e4a6..41c6e9c90087 100644
--- a/dev-python/backrefs/backrefs-5.8.ebuild
+++ b/dev-python/backrefs/backrefs-5.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bcrypt/bcrypt-4.3.0.ebuild b/dev-python/bcrypt/bcrypt-4.3.0.ebuild
index c61e5d0c7071..d33a55dea789 100644
--- a/dev-python/bcrypt/bcrypt-4.3.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.3.0.ebuild
@@ -75,7 +75,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 653453fc45cc..9d9cccacde84 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,3 @@
-DIST boto3-1.36.26.gh.tar.gz 903988 BLAKE2B f9bb945e9132a7af7bd92ff48e5a99cc89488283c30e2d7d0cbb22d9002bd41c5d5f8a449494d2aa4758648aca3c2e88dad8bebda640af4bba7df64e72ffd2bc SHA512 77a545fd94ed50114db72d7b763e232356e78cda7a2780c12c26b602ed85101218339adf6247ba45e3a8b16c33fb11f5fb34572a37dfeac43dd9322823372cc1
-DIST boto3-1.37.10.gh.tar.gz 912397 BLAKE2B fbd9fa118a936901c9cef6739bd114d69464d7f7d8211a42370ed7235637bd09c966c12a36c4faee2d4c3b8b58a179f6b20ee88723a881de8e03daed687ca76e SHA512 1788b0e75b93e6a8c56e8f63cdcb39b5075d2746fcebc04f1842915d849b7976cb1ad537f913ee78405982d2527b49dd17a1781f51a75d9c731ba78d249e1eb6
-DIST boto3-1.37.11.gh.tar.gz 912680 BLAKE2B 4ca885f51bb27e143d82202955a2df3177affd8fbcc2b66d2db3abd63330729f20e1846f03cfa5aa9f741d25ef954c52536655484f0b28a1d2f8be75ff5d5407 SHA512 5521938257057b6000759242c7aff586bb09a2439339c2ae7cb1e49869eae3d4e075694eb10eaf0d82832f73f1479b4979eb16feb730ad9f910f9b84865de292
-DIST boto3-1.37.12.gh.tar.gz 913451 BLAKE2B 783d24f6dfcdce9cc69c8f6902c478866b5cd22a9a6e8ba10845807314a082a7933f17083b76ae8e9ccca478aee01da932423035c4b7d3bbbcb70cb74e07cbe2 SHA512 a28244d0b58846aa1af72a62bff524cd4f2f1ecae24d0eda773bbc49cdda99e2a801e08d6a042af695540bc4acb7799ff40be9cb10105c9556b2bf52f5277b70
+DIST boto3-1.37.13.gh.tar.gz 913692 BLAKE2B cc8b3dbe1f30d5969b8d0abb64b0ff6b7b6c72596c23dee90ad3ca08a0ac09b0b509dfb038ca4434461dd7375f155e5afaf541ed4224610f14793d5cf9a15ed6 SHA512 25fc69799cbabf7e834ddfda5e1a1dadaab42731721a64a09020a58b2c12ddae489eef5a28c687a7f04d39a3fb3ef007739acb3c59882f7d1cc04d64f6211e67
 DIST boto3-1.37.4.gh.tar.gz 908620 BLAKE2B ed63365ccd6da9b97715e4110be2b562285a123139a90ddb10c1411d5bd5ba0de9c110177a31f03ecb7e257fd79a0de89a8be97493a83f3207050676f7022e04 SHA512 dbf40cb809ee1d3ef352b97f62c111d113293211226a63298979d8ea14833c83ac2e321714dac349bfe095f75120c2752d08a01c19e51d9b0fc947e27a910005
 DIST boto3-1.37.9.gh.tar.gz 911836 BLAKE2B d190525b9c5e39b445042aba6d8e57da5e49165775901ceebe44b76fd2780ec85a2f5a8a08d3a9a5e451d42bbae19b679e565a7a9acc663258ea0b7909a9a798 SHA512 12cba48d5f2c158b372eaf4e44903e22ca963e5712c3c463fbfd20626a771efe30530852b6c9ab70132a26472ff1b4656095675a5de37524f6b489c25175f8fe
diff --git a/dev-python/boto3/boto3-1.36.26.ebuild b/dev-python/boto3/boto3-1.36.26.ebuild
deleted file mode 100644
index 6787304b870f..000000000000
--- a/dev-python/boto3/boto3-1.36.26.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong 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.11.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.37.11.ebuild b/dev-python/boto3/boto3-1.37.11.ebuild
deleted file mode 100644
index dfe05b3d9a81..000000000000
--- a/dev-python/boto3/boto3-1.37.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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.11.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.37.12.ebuild b/dev-python/boto3/boto3-1.37.12.ebuild
deleted file mode 100644
index dfe05b3d9a81..000000000000
--- a/dev-python/boto3/boto3-1.37.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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.11.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.37.10.ebuild b/dev-python/boto3/boto3-1.37.13.ebuild
index dfe05b3d9a81..dfe05b3d9a81 100644
--- a/dev-python/boto3/boto3-1.37.10.ebuild
+++ b/dev-python/boto3/boto3-1.37.13.ebuild
diff --git a/dev-python/boto3/boto3-1.37.4.ebuild b/dev-python/boto3/boto3-1.37.4.ebuild
index dfe05b3d9a81..6787304b870f 100644
--- a/dev-python/boto3/boto3-1.37.4.ebuild
+++ b/dev-python/boto3/boto3-1.37.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7009ba915dcf..1441437621c2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,6 +1,3 @@
-DIST botocore-1.36.26.gh.tar.gz 14281837 BLAKE2B 925ebbca3e415ea7e3388c52e53a6d0a9a1aec001bd579293bfbbba5d756503371a137399d679926d5894f8f4e0fe498a37570dc4c19af99dfa67b4e3d374c3c SHA512 2f2d960a6519efae499acdb704d66a1f329927b30a53900ed035909847ca9a6c1a3b57291e0a0aa153b4bc49a959935b1840ad0d81244f8c2577fd4ba910fcf6
-DIST botocore-1.37.10.gh.tar.gz 14351248 BLAKE2B eccd8c6e7b994dcfee49ea322bfee7503e5fb89eded7dc78757a1d2e6627afdf7ac3c73e16d9ef6f9e3ccfe2f9a4f8f917eab80ff6d010fb6db277bac6b4dc99 SHA512 7c3fa7f4f13fd6c7e04b42d0dcf7232a5f73255dead103713cf8b5883b5827f7881eeaa3260156971d0a1120bbb1352fd83d33ab8349a1b45646cf265e116e76
-DIST botocore-1.37.11.gh.tar.gz 14353281 BLAKE2B 0f104e3daeb96accfff390cdd7ffe689a26e249bcddbac3b3934be7147d4ea067905510da0a90f9a7c18231de5aea7db15e2d246f272c53f26c1219c39325a5c SHA512 7737b976fab5622ec976b72ddbe4318632a365683a804077ba9ddf2ed5585734c680bee0b90a73f464e1cc78130c66e59ccda283c349685bbe9d31f18b20596d
-DIST botocore-1.37.12.gh.tar.gz 14364012 BLAKE2B 935624a6b655e99534a9bd46eaafb025173bfd95bb3dc3205f295415ea8fcc310c255756808020f76e9bb41d34997a43b1f1e8918add8293fba0167e284b0766 SHA512 724ca9ac21c66c1ea0dfcdfe097b19534e2523b2bf0b54ee92d9426e0748727f0c3d77e00201fb28d2b40c9d371b8e026fb3233ddd0ca3dd55db28f12c56ae88
+DIST botocore-1.37.13.gh.tar.gz 14365580 BLAKE2B 5dac1351dde66b7a2591faedd6ff9f0a05b02d7fa5f2d9f212a25e979f8b6f2a177c23843ee9d5949e83ce9cb44cdb1c9b75a9ee3e9e21ad69fa99458d733fcf SHA512 6635b42a6c29e6fc8293535f939463a77bcfb9abd7211a3043d9da60ecf291fc7bd8704902bfca0667be37448b1d5230393afaf1d32ef5be821d8d60a8578144
 DIST botocore-1.37.4.gh.tar.gz 14291786 BLAKE2B ab55a62f2291e623e61a0ec6712241815279ae6d8f25e678adbf6cf167265d216f44b0eae78f2b66a454253dc4ef977b90c38f1aa329c855b38fa844eaa478b7 SHA512 07921ca8d51ff2afd8a4dafa77b40b5c24afa0351d71dbf68cef716573ba1f695a331634734fb6d9822eee55c91829128dbf215920e3da92ea2b40b727d0a0f6
 DIST botocore-1.37.9.gh.tar.gz 14346488 BLAKE2B 29ac550ad462ab7c83bad7989588ec62fb57959586a8ec91be9756d90712ad86e3dfd813a347e619b7cac3fd7afb56affcd81926e15d91b8d0ceae2cd4436a8d SHA512 e191c9485e95188049c02020fcb32c4429de6cfd78f237a2026200b7240890d5759f5cdd96166cd2aec035dac82d32db155fe00d9ec6be482c655cfdb44265f9
diff --git a/dev-python/botocore/botocore-1.36.26.ebuild b/dev-python/botocore/botocore-1.36.26.ebuild
deleted file mode 100644
index 09e3985b6065..000000000000
--- a/dev-python/botocore/botocore-1.36.26.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong 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.37.11.ebuild b/dev-python/botocore/botocore-1.37.11.ebuild
deleted file mode 100644
index df85ee0d220c..000000000000
--- a/dev-python/botocore/botocore-1.37.11.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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.37.12.ebuild b/dev-python/botocore/botocore-1.37.12.ebuild
deleted file mode 100644
index df85ee0d220c..000000000000
--- a/dev-python/botocore/botocore-1.37.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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.37.10.ebuild b/dev-python/botocore/botocore-1.37.13.ebuild
index df85ee0d220c..df85ee0d220c 100644
--- a/dev-python/botocore/botocore-1.37.10.ebuild
+++ b/dev-python/botocore/botocore-1.37.13.ebuild
diff --git a/dev-python/botocore/botocore-1.37.4.ebuild b/dev-python/botocore/botocore-1.37.4.ebuild
index df85ee0d220c..09e3985b6065 100644
--- a/dev-python/botocore/botocore-1.37.4.ebuild
+++ b/dev-python/botocore/botocore-1.37.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 8e844038562c..925bcf01af88 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,2 +1 @@
-DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
 DIST breathe-4.36.0.gh.tar.gz 219346 BLAKE2B 26e18a7cbe34762579bff965e48772b54438a2ed1235dad52fc63533afe47f78cb921683c201a281e732f4e67d5a5edbe850a369f57d7eca83f0a54f43cb68a5 SHA512 fd640ed75680134a5a0e8860764bb430bb971f49ad2f88392de7ba97d633e377079eaf1c7e35a72db135e4c4d3b066c6c9744ccc151ad18d865bb37c9de833d7
diff --git a/dev-python/breathe/breathe-4.35.0-r1.ebuild b/dev-python/breathe/breathe-4.35.0-r1.ebuild
deleted file mode 100644
index b30b1c347c21..000000000000
--- a/dev-python/breathe/breathe-4.35.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/breathe-doc/breathe/
-	https://pypi.org/project/breathe/
-"
-SRC_URI="
-	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/breathe-doc/breathe/pull/956
-	"${FILESDIR}/${P}-sphinx-7.2.patch"
-)
diff --git a/dev-python/breathe/breathe-4.36.0.ebuild b/dev-python/breathe/breathe-4.36.0.ebuild
index 3a962dc4b28b..870154be7811 100644
--- a/dev-python/breathe/breathe-4.36.0.ebuild
+++ b/dev-python/breathe/breathe-4.36.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/doxygen
diff --git a/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch b/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
deleted file mode 100644
index b81eddc6a6e3..000000000000
--- a/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 46abd77157a2a57e81586e4f8765ae8f1a09d167 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Mark=C3=A9ta?= <meggy.calabkova@gmail.com>
-Date: Wed, 4 Oct 2023 15:53:59 +0200
-Subject: [PATCH] support Sphinx 7.2
-
----
- breathe/project.py     | 2 +-
- tests/test_renderer.py | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/breathe/project.py b/breathe/project.py
-index 865236e8..9716cb59 100644
---- a/breathe/project.py
-+++ b/breathe/project.py
-@@ -113,7 +113,7 @@ def __init__(self, app: Sphinx):
-         # Assume general build directory is the doctree directory without the last component.
-         # We strip off any trailing slashes so that dirname correctly drops the last part.
-         # This can be overridden with the breathe_build_directory config variable
--        self._default_build_dir = os.path.dirname(app.doctreedir.rstrip(os.sep))
-+        self._default_build_dir = app.doctreedir.parent
-         self.project_count = 0
-         self.project_info_store: Dict[str, ProjectInfo] = {}
-         self.project_info_for_auto_store: Dict[str, AutoProjectInfo] = {}
-diff --git a/tests/test_renderer.py b/tests/test_renderer.py
-index a858c65d..73a29e4e 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -35,7 +35,11 @@ def app(test_params, app_params, make_app, shared_result):
-     """
-     args, kwargs = app_params
-     assert "srcdir" in kwargs
--    kwargs["srcdir"].makedirs(exist_ok=True)
-+    try:
-+        kwargs["srcdir"].mkdir(parents=True, exist_ok=True)
-+    except AttributeError:
-+        # old version of Sphinx
-+        kwargs["srcdir"].makedirs(exist_ok=True)
-     (kwargs["srcdir"] / "conf.py").write_text("")
-     app_ = make_app(*args, **kwargs)
-     yield app_
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 59eead35aeb4..e72d1c526512 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,2 +1 @@
-DIST cachetools-5.5.1.tar.gz 28044 BLAKE2B a670460a89af39f636b7dd9b0e963edff930440c9104474c169504a7cb22de1757b7739e9e8d349a96657d3531c56694cfb91d8c8b33880aef17485a8098c37e SHA512 2709dfb1e937c7b1a232466856817ae74623940219e00ec6ddf2450c70f5fc0597faa0b1f0e10387b3668e939d6e3afa3b983879b51111904ff06f4fb9a693fc
 DIST cachetools-5.5.2.tar.gz 28380 BLAKE2B ff0f838bdcf3ff29a466829a34e80c83a0d15763039bc9d81e254daf150bbd39a42a04b4541be06d7beaa938561a1d35646a83eb22474baccd33479d5a56b53e SHA512 9969eb5ca092174975a79e664594842b4ae4f671bc17ae3e3d2d286b164eb408af254d6b40358dcbe5e4341fc6a0ef928e192eb1432696ed7654729062555a29
diff --git a/dev-python/cachetools/cachetools-5.5.1.ebuild b/dev-python/cachetools/cachetools-5.5.1.ebuild
deleted file mode 100644
index 55a939a649bd..000000000000
--- a/dev-python/cachetools/cachetools-5.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.5.2.ebuild b/dev-python/cachetools/cachetools-5.5.2.ebuild
index 6227509adae7..55a939a649bd 100644
--- a/dev-python/cachetools/cachetools-5.5.2.ebuild
+++ b/dev-python/cachetools/cachetools-5.5.2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 962900b99de8..4b385efac730 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1 @@
-DIST cliff-4.8.0.tar.gz 84206 BLAKE2B 91cee5b9b7233cf6d3df3dd07aee6f2aaf75f31a40d47ca8e3a15de713c82ed46344e5d5b05e304035fe418db99eadea54f535b6da8f56d4823c23e7db6cf422 SHA512 226b1f29adbe941b5c281db4bd37d0e2b195f1126b2944dd79c8766cb85deec79eaeb1b511d0964b7426fa02ef952e65e1e48c16d7566e24e4aaa8509f6e5cfd
-DIST cliff-4.9.0.tar.gz 86247 BLAKE2B d9a53198f6a2357be889163fab742f79f8646626817a4c2d73b3845776125af03a756b37965ab47004716deb140da3d6fb1745ad15154704fe790fb69f4b1d69 SHA512 e146822cb99cd5dba91d7e5b553ff7b39f56b1f652a20fe36e5c8eadf79321695653ff9a51d87131a2ea923e113d22387f1b72bd9ed36ae7c95f4a68e42a03a8
 DIST cliff-4.9.1.tar.gz 86597 BLAKE2B e9051087f8a73468a129f983a3afa318567251480aa4f4c058dda62f08c6195bd7ecc03001816dd1601729c1baf0b499d9ffdd904369947706d02b90aacecf11 SHA512 edec276c43ccba67c1fa51e1f4898f47fb019bc1a5ef1fd5d04a73416f4cae0e2f217a7006aba8dd969d9ce3c0dfd9875cad6e67f4e38dfc5532acbc79147d90
diff --git a/dev-python/cliff/cliff-4.8.0.ebuild b/dev-python/cliff/cliff-4.8.0.ebuild
deleted file mode 100644
index d3c97ef3a517..000000000000
--- a/dev-python/cliff/cliff-4.8.0.ebuild
+++ /dev/null
@@ -1,40 +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_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="
-	https://opendev.org/openstack/cliff/
-	https://github.com/openstack/cliff/
-	https://pypi.org/project/cliff/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-4.9.0.ebuild b/dev-python/cliff/cliff-4.9.0.ebuild
deleted file mode 100644
index 2dee048cc219..000000000000
--- a/dev-python/cliff/cliff-4.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="
-	https://opendev.org/openstack/cliff/
-	https://github.com/openstack/cliff/
-	https://pypi.org/project/cliff/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-4.9.1.ebuild b/dev-python/cliff/cliff-4.9.1.ebuild
index 2dee048cc219..b2b25152f3cb 100644
--- a/dev-python/cliff/cliff-4.9.1.ebuild
+++ b/dev-python/cliff/cliff-4.9.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 04510033b2f7..62fab6d93d74 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1 @@
-DIST decorator-5.1.1.tar.gz 35016 BLAKE2B 0e38ee2dea6793d489f5c50692549022f1b252ab3a7b75da5b785f856b7f18faaf5570dde2c68f6936c11460599839063e9eb8a133789a00f683761393a5103d SHA512 584857ffb0c3e52344b473ceb9e28adfd7d789d480a528471f8ab37be055ebe5feb170f41077010e25350e1c311189d45b90773cf12f0043de98ea8ebcde20ab
-DIST decorator-5.2.0.gh.tar.gz 54313 BLAKE2B bab7a0dc6b8431893cdf72258a6b6f8f45e2352cd4bf55fc63571e8d7acaa97f3fdc120a996df278b3eee40c3b0f7c4e9914a8a498feef79145a6d4b9ee772b0 SHA512 b50d645acd924b1c0a35ebe6d52f638fe771910e55a925a2cb642aca694d99c9886b7a580b631ee7c8760d485a0924051235d24d0ccc393638ed305694e14e17
 DIST decorator-5.2.1.tar.gz 56711 BLAKE2B bb08e43f6d3480a5c769fe8a433304a7959155430d576e8c6fbb6c6aaf27ef47d3af2bd4c349f9aa91f70bea0d694f7cd48bfe8a3135f782ada7a943a5cccd4e SHA512 c834a3536e429aaff38d34a56b574344551c160e25676ca5febb5dcf521d71f284ebb8294d3264f65a801219860352377e5a4be89927217cb5da9cb6c6aa45ec
diff --git a/dev-python/decorator/decorator-5.1.1-r1.ebuild b/dev-python/decorator/decorator-5.1.1-r1.ebuild
deleted file mode 100644
index d8ce457ac3c4..000000000000
--- a/dev-python/decorator/decorator-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="
-	https://github.com/micheles/decorator/
-	https://pypi.org/project/decorator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.2.0.ebuild b/dev-python/decorator/decorator-5.2.0.ebuild
deleted file mode 100644
index 05c00f9b7606..000000000000
--- a/dev-python/decorator/decorator-5.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="
-	https://github.com/micheles/decorator/
-	https://pypi.org/project/decorator/
-"
-# https://github.com/micheles/decorator/issues/167
-SRC_URI="
-	https://github.com/micheles/decorator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-python_test() {
-	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.2.1.ebuild b/dev-python/decorator/decorator-5.2.1.ebuild
index 92a169633c2b..489a614dd2a3 100644
--- a/dev-python/decorator/decorator-5.2.1.ebuild
+++ b/dev-python/decorator/decorator-5.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index e8b03385cbae..890aeaed57bf 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,2 +1,2 @@
-DIST django-allauth-65.4.0.gh.tar.gz 1335119 BLAKE2B 21b9c0b9434662fcde5aaf2465caa09e46b27ae69ac8bcf7416d162d3b7192f7663f9624d7d5688911c3f260f0db01c2f48cc020b886d4e3bde086b927cd8744 SHA512 2b792565f31109035140de34b71809081341db11dd5eac4f70c2f8585473d1ea1dec31ae0279782c61270a6323d1c958fb481910f0ee3916256f6ea2dc68c4b2
 DIST django-allauth-65.4.1.gh.tar.gz 1335239 BLAKE2B 6b1380e0bb87872b6e1da861f115248542ca15e0373282105e4d83c909e48448a9247791ef7335f53a1e2c64853df8745810c7bafac93e5bbb2879acb779331c SHA512 5b954e8a5ce10a066d6bb3e392843fb46334378d0138c391c26f894999f8a043e8b4587e9e5ed83d1e80d76b787eebba04168a7e501f379fbe68747eda971911
+DIST django-allauth-65.5.0.gh.tar.gz 1383275 BLAKE2B f4d5468dc2188ebb36827ca28dacfade9a8645569c019a6cac857ae54969f0d0199a91decf705240d88303d2fe9c819a73adf9831a33075b221e0fc9f3a74b1d SHA512 cf9d7dc26bd07609b34102a02fe344d245709c2b2934f788b9dff2cb8010815dcd13e18ae47c1c79f6a3f7b07863e12d0ca8798fa960147194ca665eae1750be
diff --git a/dev-python/django-allauth/django-allauth-65.4.0.ebuild b/dev-python/django-allauth/django-allauth-65.5.0.ebuild
index 107063d2408a..107063d2408a 100644
--- a/dev-python/django-allauth/django-allauth-65.4.0.ebuild
+++ b/dev-python/django-allauth/django-allauth-65.5.0.ebuild
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index a5ffe761d6cb..5e1ee319596a 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,6 +1,2 @@
-DIST setuptools-75.8.0-py3-none-any.whl 1228782 BLAKE2B 0e53d2e2d3666bce8072b23556c77a013a6db704eaa1b582a37defcd5691bb6cc66533bc9edc164911e5e5839c0c418571052a696c5c9a98b289ea232d045a38 SHA512 02760ed1215eefe7ad4beae24243fa6372d47b975a060dd69d5c521c6c53fe9ba1a6e73f39448ed9471b89371d19273824becbc8471da40cf43d3c799f0b50cf
-DIST setuptools-75.8.1-py3-none-any.whl 1228867 BLAKE2B ec0fada24a666a0a32dc4bae456e40b35c0d6f87cc389a6ad917ae330e7e509a4f1a21a5c0a38cd4a5e74890c3e8e6c6be23450cd7658803f6f037b900e11b17 SHA512 ca68002ae0fabceae31d46f5e9453582bc60fc137b6e1c58d30f834a5233eeb58c60385be4a71b0feb2f3059cec5197bf4cb50f2bb94a728ebfb80f08ece8dd3
 DIST setuptools-75.8.2-py3-none-any.whl 1229385 BLAKE2B e2890604e9acbf23aefc94ee99927bafdc189e45c84b0e4e0b48737d120ba60590438603195e180988b26e3e8fb378812507e2a0b513bf886c3b1eb673853da5 SHA512 083447a6bd375ca99e017ec4c5e3083ee4eee32b65d911b4d5ccadfa587ec213d43562d21d0f238753cc5c54354027b8425880d7248fbbd170b0c006613f4327
-DIST setuptools-75.9.0-py3-none-any.whl 1231623 BLAKE2B a482f534ed3209db392bec33a39ba56ce0dd213cdd704ba903999b318cdb3c025e3d62fe697a9d6565667f87e3442b9a2a0edf4d57ae793b93c5fc6993c77a49 SHA512 8b67de3aecf4f37582d460d5aad6f8d140c877b1f7163375b027ce6e47f8a1afcc78327f02723f9afb2b30c1f03f5cfe9df9333ea07a263926e4d57475175b7a
-DIST setuptools-75.9.1-py3-none-any.whl 1231632 BLAKE2B c557597ac5b4dbad75957641ccd4cba812e2c84b0c8ca0f2a0fedf4a139a364aec3cf9657c02ea76b878595e0d8b3831a322b2a82af28eefa656eab9e657b1b2 SHA512 5ccda91109ed72f941c6b7994b7e73bb2d10567f7dc9b08bbbab58a576a25ac6cb87376e461415ca33ff992fb69407a1535cde462df801d74823a37f582fb537
 DIST setuptools-76.0.0-py3-none-any.whl 1236106 BLAKE2B 783411ca7c3ee2f2aaaba2d40abb010f7014eb640e6ebee125e0d80afd863634eb01a10343c086b46a7b928db14d5edc6270c92129d2b20bbf0ce36229de932a SHA512 6b2af35acbd3c73f19a5eac91cc13329ef6b0c9b9dbad18fdcfabb0625215a661d320d164a08018a08a3578c5bc3aedfd9ed9ecdaaf62ef08e30fcae34a3eefb
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild
deleted file mode 100644
index 473fddfd3ccc..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.1.ebuild
deleted file mode 100644
index b76c3f6972d8..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild
index b76c3f6972d8..473fddfd3ccc 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.0.ebuild
deleted file mode 100644
index b76c3f6972d8..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.1.ebuild
deleted file mode 100644
index b76c3f6972d8..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index ec782eb01af5..e26dcd0a8799 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1 +1,2 @@
 DIST filelock-3.17.0.tar.gz 18027 BLAKE2B 21c1d03acaca1acbb3fbf4a7d6db2f4d0bda48c29f32f69a170ba9fc121f2555eb5c4e92135a83aa15de6c2d2973ce32392420bf933f7e242406d0524544c128 SHA512 f225742392ffa2fe4dff3014865e5b3080ea827f3ba0997099bd0a73f42259e59d065d821fc86ff46f3eb8cbd445de770e6e437c0de2885f1935c84f5d96fbf0
+DIST filelock-3.18.0.tar.gz 18075 BLAKE2B ce7c29397e56c527721378f9c2c5005b94c4b3a1978c4969e01c690d4efe59f6a8a0de3f8e13543c2fae09beb52fc80de6214c2799a366714330ba0b29140ed7 SHA512 c74684754eb2ac2b36839c12907f6a9ba7c6cb7049f991638ec910fd20cd41caafbbc67d59460e38012161d52b1a9b5966e9fa85665f9e028fef86cecd9358e0
diff --git a/dev-python/filelock/filelock-3.18.0.ebuild b/dev-python/filelock/filelock-3.18.0.ebuild
new file mode 100644
index 000000000000..9f7d20de955d
--- /dev/null
+++ b/dev-python/filelock/filelock-3.18.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2018-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask-caching/Manifest b/dev-python/flask-caching/Manifest
index 4c9b3090d13b..cc9c3ca08c90 100644
--- a/dev-python/flask-caching/Manifest
+++ b/dev-python/flask-caching/Manifest
@@ -1,2 +1 @@
-DIST flask_caching-2.3.0.tar.gz 67668 BLAKE2B 13517a0741959ca72072e2baf71f3d87b61a678052f0c3ba657d247fb82ab8457f45d453e9730fdfcac1cb665822d78a9c69aef83c0c62d2b808021f42f9881b SHA512 40ed857cf0822267af7e2c138b3136ff6312b3b2ea627a97738792ea4f7649db20f2df31a7414c42cc245a66d34248b3a54681824cf23d800bdb0d453c02df49
 DIST flask_caching-2.3.1.tar.gz 67560 BLAKE2B e4bd5121b4a43a81a359fb839c886e499028f4144c8a529a56ec8700db3b4819ddf59680131bc277d001ece976a9623f462be22f5aacd9668019e85e4d13d380 SHA512 ec591131746ee15f6e451b38af93194eeede1ff191b78042eafdf4fc9ab91eec6347372312cd9be8a92880679446af0c98be546b23845a12ef602e9593d48955
diff --git a/dev-python/flask-caching/flask-caching-2.3.0.ebuild b/dev-python/flask-caching/flask-caching-2.3.0.ebuild
deleted file mode 100644
index 81e59143b7f6..000000000000
--- a/dev-python/flask-caching/flask-caching-2.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=Flask-Caching
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Adds caching support to Flask applications"
-HOMEPAGE="
-	https://github.com/pallets-eco/flask-caching/
-	https://pypi.org/project/Flask-Caching/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/cachelib-0.9.0[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asgiref[${PYTHON_USEDEP}]
-		dev-python/pylibmc[sasl(-),${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# fix check for obsolete package name
-	sed -i -e '/pytest_xprocess/d' tests/conftest.py || die
-	# remove pinned deps
-	sed -i -e '/install_requires/d' setup.py || die
-}
diff --git a/dev-python/flask-caching/flask-caching-2.3.1.ebuild b/dev-python/flask-caching/flask-caching-2.3.1.ebuild
index 18ce9904c07b..a5c402fce44e 100644
--- a/dev-python/flask-caching/flask-caching-2.3.1.ebuild
+++ b/dev-python/flask-caching/flask-caching-2.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachelib-0.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 281d4ad9680f..892738285a12 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-DIST google_api_python_client-2.161.0.tar.gz 12358839 BLAKE2B b7537f29c078adc2a2a0b89da52acc9fe53db4ecae742f367019ef780951d668f8ff7e6390fd417644bdae2ab97f472b99f3472d642382b3341f5894de477cad SHA512 19fd8cf49d96fba19381a9ca891ee53cf521ff9fb3103c6f1f22207ab6e7d0dd0de445d5f96d9d6a7d464139a9c38052bdaf4878fbacf9d64fa97006f1ea6da5
 DIST google_api_python_client-2.162.0.tar.gz 12562719 BLAKE2B b011064f127a6d8f131121b3776b554551e39aadea780e3357194cf90877b5b1711d91b6cdf56fa0118b96f371216d443b66a284c04a9cda8af7d9bf3687932c SHA512 15febe68247e1cb6722c4c509b9f31f879cb058110b46297d4db6df8533fca4bc095ac8f3e7faddff2a32749e44e356179e7f99085592dd5e218b41981364f6a
 DIST google_api_python_client-2.163.0.tar.gz 12588615 BLAKE2B bb586205a1567e6792dcf336c69c4c357bd22b06ebe172bc5e07a96ca1c8246483d44201546ebbf1fec4239210759e20eed332f44be5e842bc6b9b050d4190a0 SHA512 993f173fd6366b03b57944b44fdf5ef74815789ced2585211dba06c8ca41c37e5bbfa1582e4ed4944a3cc5bc65cce2f043eeae68a0e6832460f3f7f6941639f9
 DIST google_api_python_client-2.164.0.tar.gz 12595711 BLAKE2B deea81a5cca626ab775daf381583d36cc7c2d58775db4e0741b812ce63cdbb4930f20320d84fd715925767ef0555ca93554578052d295df408e3620b998ae567 SHA512 43524613d65d6ebf60d6bf65654b66e7173faf1026a0f6c0ffea36d55c4e33fa5da595d2e3eb7ee7c00353ac963b5a51c958c83206809bcdc6a5a6bc13340d26
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.161.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.161.0.ebuild
deleted file mode 100644
index 75fc31e16901..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.161.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.162.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.162.0.ebuild
index b2220fafe3ef..75fc31e16901 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.162.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.162.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index f425e09fb9a3..d8d6a95e2a37 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1,2 @@
-DIST grpcio-1.69.0.tar.gz 12738244 BLAKE2B b7849f57591407c6882da4596b31c974c6bd493eaea2e629e32cc757799dbdca618959db7140c0b985e9ee107a377c3fa82f6b71f705feba4a6ecbd344666daa SHA512 c2cc418c01d5c9550c6b5468f3ff6cc0417cf6dae7ab3d0cab62804ca1ce86b5c305b2fda3af2b66c9ae1e05ead41962b02c171b121ca8e75a434ecc47b16761
 DIST grpcio-1.70.0.tar.gz 12788932 BLAKE2B 890c066cd5f9cc6d92eaeee00b639f5c0c8ac5e7f113fb5f3cc0232d1861f002594179fcaac6fa350254f9aeb27cd049290bcd05c17704caf7bb05df7e4bbca6 SHA512 0e01b8042352d8f6be28b30be64f9bf17d29d19f2d8889e21e6bdd56c6f78cea39a4bd4534afb2e3ded48c119a6ad9a863912088642f306088a5a319c8bfd784
+DIST grpcio-1.71.0.tar.gz 12549828 BLAKE2B c533654643d4c67edbf9b7416f4bda82e5c910e44c2ed08427b9fecace6aeca01e427f4ad2d235309e740d3039600c21eff15d80dea61b3b6d3fcda931446d2a SHA512 07df111b787ac84a2d8ff824ed62603ea9040c8d522e689bc4901243b582c120ec0a71ed2037f7d5f7833b19453c6bf891c7c5611a6c64641651d01c53c4c3ec
diff --git a/dev-python/grpcio/grpcio-1.69.0.ebuild b/dev-python/grpcio/grpcio-1.71.0.ebuild
index c752c57ec39a..c752c57ec39a 100644
--- a/dev-python/grpcio/grpcio-1.69.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.71.0.ebuild
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 100c4cc0b0ca..db96fdcb034f 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1 @@
-DIST humanize-4.11.0.tar.gz 80374 BLAKE2B 880ebf6f14c04c323528ee95c4c32c775bd2662b0d47eb6761c84024199066e69e1d571f7edc2235d81261693f1fbd3c166ec24afeb4dab28f39dd4256d37fcf SHA512 0f872b86643276bd58543d47b72719763b52ea9a434076b99d0db72d89642c2bd77e240bf506cdd04fad049fe1575919b006376d99c037936e9b9e1beb25e1a9
-DIST humanize-4.12.0.tar.gz 80785 BLAKE2B 014a748eb5345c78f4922a982ae302688ee4dd86b3a8e4041939fcdabe45bbd19064ed8197ea33140d2d358705a93866feb2f269abe678930423f08daa44e46a SHA512 6ebb11c2595ee9b1dfb7a3f0a5225ea82b1ab2ebeaf8505ed09ff93c6ba2338a3ef23c6d784ca8b501eac152a637989a46fd1bfbbd8d3750ce372cd1a4df9b26
 DIST humanize-4.12.1.tar.gz 80827 BLAKE2B db2c65c74eaa0d7c201b7cc620417c5ce4d95cafcfac94160bf7e8b61f787e26dae346616bc2117275622e14c43720f6ac55e759dc711a35452352b19efa78e9 SHA512 373f9fde324924089019934e712aab94dc50b72da9b2932461dec6700a01a49a132693a29a37f6a65fe60636c9b300aab8053a21afe3f496b3f24dd10ada7fe7
diff --git a/dev-python/humanize/humanize-4.11.0.ebuild b/dev-python/humanize/humanize-4.11.0.ebuild
deleted file mode 100644
index bc0216245f6d..000000000000
--- a/dev-python/humanize/humanize-4.11.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/humanize/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/coverage/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/humanize/humanize-4.12.0.ebuild b/dev-python/humanize/humanize-4.12.0.ebuild
deleted file mode 100644
index c262c6b3dcb8..000000000000
--- a/dev-python/humanize/humanize-4.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="
-	https://github.com/python-humanize/humanize/
-	https://pypi.org/project/humanize/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/coverage/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/humanize/humanize-4.12.1.ebuild b/dev-python/humanize/humanize-4.12.1.ebuild
index c262c6b3dcb8..963cf7394d85 100644
--- a/dev-python/humanize/humanize-4.12.1.ebuild
+++ b/dev-python/humanize/humanize-4.12.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d8a29152cd81..01cd042c77fd 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-6.127.9.gh.tar.gz 9519367 BLAKE2B 721494bf5f594811486436f839e9d2
 DIST hypothesis-6.128.2.gh.tar.gz 9522813 BLAKE2B cc466d24bf45b5a0916f47d6a7ed124cd4e2532b9e79d8c879597fa6fb5fccfed7b410890318689b2cae6fce0357df19b97784725a38ef1408c06fe3696771b5 SHA512 c16a518d1bf59808ba7d95e863ad50fca68a7a58ab761f7b66f43c200ed5841f8ca2753dbb1af66bd7bc2b6210bef697412101812ae069c1ad21f6ac23b40ebd
 DIST hypothesis-6.129.0.gh.tar.gz 9526187 BLAKE2B 632fa6dfa60725caab11e12682389d48cd54b0bbe093a86a8cbda8a251d4b969e394afe32a6d439266a0b226c474879afcbda565f9cfbf81d3b3871c2a06e2f4 SHA512 e0d0e79631d26c4f9813f750185568fc8c19d37cb5cbcd6ebac69a4da73338a28cd54408753d2c3a200855e710142582f7057b24331d7233aea221740db66d6e
 DIST hypothesis-6.129.1.gh.tar.gz 9526811 BLAKE2B fe69773a70d8c6615f586dda7acacfbc2f9309659faedcecfd12317124c5c868f53987f9e56670f09a44de96d9baec08a43823d15ad7dc847f4260ed8deb0486 SHA512 3745d590dcfc968a96eb62a6f159214b5741f2de1e03bd57bb22663237801f7d4d5df98c0da9f798d1b127e7c43039527f903994e3b9a884d1f654d2a842fea8
+DIST hypothesis-6.129.2.gh.tar.gz 9527087 BLAKE2B 675261d8ed0c77ead1555e0ae26b6a199886b3189cb46f193af492313428c171d129b5aefd6f52e3f6ecd634302c4356643b0324547aa19cd4bb190114887354 SHA512 c71342ea5f53ca7374b0311a8185b7ab40802cc68c76225d87db7a8f2911942768bca37a6f229b22c6f2c53fcf531d4d5a7a72de69d4172db598a298d4aa8681
diff --git a/dev-python/hypothesis/hypothesis-6.129.2.ebuild b/dev-python/hypothesis/hypothesis-6.129.2.ebuild
new file mode 100644
index 000000000000..08befcf116e3
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.129.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# TODO
+				'hypothesis-python/tests/cover/test_reflection.py::test_clean_source[case-5]'
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/inline-snapshot/Manifest b/dev-python/inline-snapshot/Manifest
index 5d03d7c9936b..95a95b1ebc84 100644
--- a/dev-python/inline-snapshot/Manifest
+++ b/dev-python/inline-snapshot/Manifest
@@ -1,5 +1,3 @@
-DIST inline_snapshot-0.20.2.tar.gz 91060 BLAKE2B dc5dd87a809727f48a2bb376ffb602517c2acfad8ce8738d443f2dcf863b268b9ef1408771bdbfee6ccbb6d25ea3e8afdf2d690df021de196f30514a57ea0fb2 SHA512 e749efea54bdca1f399aa81335e65ab0e48887de6d4a9aa9905086886bdd44ef31eaf95c75edd5ee1e6ee011e31c450fb077d09f49415653e5c8e19a3ad4a944
 DIST inline_snapshot-0.20.3.tar.gz 92067 BLAKE2B 594a6a5cda233f960492b5d076189111095a08b4653271713115b6a44cb84aa4a8f0d160ba1de60a0e6fa6f7b1dadcbef34d93d4c4b7e0ad6139552985637b9f SHA512 62484c27b0c08b10f2ce3648e975bab1b0563aa0bb1c471b7052cf94db266877ad21320f963003db9abdfc26a3987f0578052e129ef7448bdecbb3745247247e
-DIST inline_snapshot-0.20.4.tar.gz 92164 BLAKE2B 5c4b105e94304b4bd508ef3d714b84ce4d1b43eb79193551b17c09291c6f86dedcccd75167a5440e972fe4a656f114ea06e584a5a4690d73349ec5625df10414 SHA512 6296336ab569a3e9022ea32c1d8fafa61319f41fd17cb1ce0f9ce6e319998f58a57f423d31579b269bf06e414cb60f388dd06427e4f9b2037af241c68f3c7262
 DIST inline_snapshot-0.20.5.tar.gz 92215 BLAKE2B a366a61f84d07481e1d9bf7033c691873d000f7e4dad100571481360134522db478453928fa9bce681f34d1951c75f9300bb61ce25bf950204fe168d6ed7a2fa SHA512 145dad40507ba7d457a74e63d920d2edcb24f4e7d263956912f5ec964210cae126f7e94771f1e64f5e47eca2e6124c6b87b36af5fb06d3e37242328be4daba8e
-DIST inline_snapshot-0.20.6.tar.gz 92536 BLAKE2B 0af82afe1607522ba472d35d17553306eb8cecea990afe39c03696f551447298911b8934e0b6af543896d6f55dc2bb439509f5a1608c2b6f797be6efb7bf934a SHA512 c420c7a2761aaf8aac61d3837a25dc2356abfd2e9d0c3d1eaf09f1f9ea81fa8d51672b6e4f2f463a1fe01b078399895722561aacceaabd340f73b6dfac7957c5
+DIST inline_snapshot-0.20.7.tar.gz 92643 BLAKE2B 1e41a6e5bee94c2d99a9f6ae4c8d3d7f89ac06b132c10e9419d566a8b502a72f4c3164e40aeafa3951cbf5418d256857ed60add6ca0f715e037b35d36ef6464e SHA512 fd21574a65ff0339315b2b64eda92b8233353c8d12f81c3df9802219435fe055e62cc33b88f590cf2cc73dcf4797b4b7294c8cd4d274d50b3229cd3c5b93d52f
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.20.2.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.20.2.ebuild
deleted file mode 100644
index 432c8585152e..000000000000
--- a/dev-python/inline-snapshot/inline-snapshot-0.20.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Create and update inline snapshots in your Python tests"
-HOMEPAGE="
-	https://15r10nk.github.io/inline-snapshot/
-	https://github.com/15r10nk/inline-snapshot/
-	https://pypi.org/project/inline-snapshot/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/executing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
-		>=dev-python/click-8.1.4[${PYTHON_USEDEP}]
-		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_USEDEP}]
-		' 'python*')
-		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires pyright
-		'tests/test_typing.py::test_typing[pyright]'
-		# TODO
-		tests/test_formating.py::test_format_command_fail
-	)
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
-	local -x PYTHONPATH=${S}/src
-	epytest -p pytest_mock
-}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.20.3.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.20.3.ebuild
index fb85b4885ecd..728fc5c3e6aa 100644
--- a/dev-python/inline-snapshot/inline-snapshot-0.20.3.ebuild
+++ b/dev-python/inline-snapshot/inline-snapshot-0.20.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.20.6.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.20.6.ebuild
deleted file mode 100644
index fb85b4885ecd..000000000000
--- a/dev-python/inline-snapshot/inline-snapshot-0.20.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Create and update inline snapshots in your Python tests"
-HOMEPAGE="
-	https://15r10nk.github.io/inline-snapshot/
-	https://github.com/15r10nk/inline-snapshot/
-	https://pypi.org/project/inline-snapshot/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/executing-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/black-23.3.0[${PYTHON_USEDEP}]
-		>=dev-python/dirty-equals-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.75.5[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mypy[${PYTHON_USEDEP}]
-		' 'python*')
-		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezer-0.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.14.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subtests-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires pyright
-		'tests/test_typing.py::test_typing[pyright]'
-		# TODO
-		tests/test_formating.py::test_format_command_fail
-	)
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=inline_snapshot.pytest_plugin,pytest_freezer,pytest_subtests.plugin,xdist.plugin
-	local -x PYTHONPATH=${S}/src
-	epytest -p pytest_mock
-}
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.20.4.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.20.7.ebuild
index fb85b4885ecd..fb85b4885ecd 100644
--- a/dev-python/inline-snapshot/inline-snapshot-0.20.4.ebuild
+++ b/dev-python/inline-snapshot/inline-snapshot-0.20.7.ebuild
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index b5067938819f..5c391cfea5b3 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,2 +1 @@
-DIST isort-6.0.0.gh.tar.gz 831344 BLAKE2B 6fa039b902638e6fae2a64022ad0a2127d1efbd7cba5bcea94ae692bb1de134c0dfd8c89f2091302dd079749cee3f850d1252cbfac5a1105c38cec988912c439 SHA512 2dc5215182b74419d020214c32dc182c4c0893959aef3f7900a53e793982c535530d9c869a60b4eba439e7a4516e71ff366a9f6ad898936ecd7cd06fda4b6ced
 DIST isort-6.0.1.gh.tar.gz 827044 BLAKE2B bdde4a0bcc84dd444e86988c1d477c1701534d7b52db3ce8cf3d162b06ee9db2a1a705e7af3c149d2a6eac77363ce365e64895a931c3202c16cb6d31480974cb SHA512 0ca2d28b706e97c8e0bc22de58c737d551bef03326ff6aaa36f90ebc08a40d7e1d18a6068de2b2090b901231be2e6622ce5947bceb58803671dd30defe5a5ec8
diff --git a/dev-python/isort/isort-6.0.0.ebuild b/dev-python/isort/isort-6.0.0.ebuild
deleted file mode 100644
index 85af924f21fb..000000000000
--- a/dev-python/isort/isort-6.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_DESELECT=(
-		# relies on black 23.* output
-		tests/unit/profiles/test_black.py::test_black_pyi_file
-		# pytest-8
-		tests/unit/test_ticketed_features.py::test_isort_should_warn_on_empty_custom_config_issue_1433
-	)
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-
-	if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/unit/test_importable.py
-			tests/unit/test_pylama_isort.py
-		)
-	fi
-
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-6.0.1.ebuild b/dev-python/isort/isort-6.0.1.ebuild
index 136101826297..85af924f21fb 100644
--- a/dev-python/isort/isort-6.0.1.ebuild
+++ b/dev-python/isort/isort-6.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 34c298f646b3..3b3cff7cf239 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,2 +1 @@
-DIST jeepney-0.8.0.tar.gz 106005 BLAKE2B 23dbd876915ca364202b6e1888d5b6892c56020a492f9dbdd22c1e04f40c2627bfb90ce209c69be000e176cc6b144b6c2232a21ce1ab089971911ffa2c22cd2c SHA512 823675f262c2c9778ccf9c1083601d936cca534fc0d2d9309b52aa6beeb7f73d225a37c5f18f6b0683c4829a93b1299a2cb4f8f341e55b92bedf58c8dce0aa75
 DIST jeepney-0.9.0.tar.gz 106758 BLAKE2B 40a19ffaacbb286e645292592573e04098f0604914e796272720bb6af3f927f048d624f34a3443a2b8ae6de8d92dba2d631f1e4bcdd004ea3cb7affcb2f1b504 SHA512 2d47ba3f8b652abe5b5b5cde5cb66600c2914207a45973e3ca28a0561e61d98827751ff32c6019ef9e2507ee5c2879ef1ef0d732870d208b500f7b52f3c6229c
diff --git a/dev-python/jeepney/jeepney-0.8.0.ebuild b/dev-python/jeepney/jeepney-0.8.0.ebuild
deleted file mode 100644
index 0857c779c029..000000000000
--- a/dev-python/jeepney/jeepney-0.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Low-level, pure Python DBus protocol wrapper"
-HOMEPAGE="
-	https://gitlab.com/takluyver/jeepney/
-	https://pypi.org/project/jeepney/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.7.1[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		sys-apps/dbus
-	)
-"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-src_test() {
-	local dbus_params=(
-		$(dbus-daemon --session --print-address --fork --print-pid)
-	)
-	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
-
-	distutils-r1_src_test
-
-	kill "${dbus_params[1]}" || die
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pytest-trio[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jeepney/io/tests/test_trio.py )
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jeepney/jeepney-0.9.0.ebuild b/dev-python/jeepney/jeepney-0.9.0.ebuild
index 833814296de0..8901979b5a85 100644
--- a/dev-python/jeepney/jeepney-0.9.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 783a99842d3e..b4f8f2b1e3da 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1 +1,2 @@
 DIST jupyterlab-4.3.5.tar.gz 21800023 BLAKE2B 3afd452569ba2eceb4de9d3b23ed0b4db634c7084b6fba321af1515cf21e70ec67ff2e43c655f0ff4e667eb41a35569e3313f23134782eab918c472008f26304 SHA512 03f38c3c2b68edee8558b7e4a936d44c76154920adc05fe86257c92d8b1e7c8657e2a9c1fc26507ce7f791d289006febefdbfe61d25afa3336a7dd06f597aebe
+DIST jupyterlab-4.3.6.tar.gz 21827019 BLAKE2B e2d57309d13034625482b13c13bfef707b8c14f35087233edbf8267d2b7047b3614971fee03d31310c74324bfcb90c13b6bf9169b38a6d46b78088e95b5d30b1 SHA512 bec63f3ba4d93c056b5f1c5bef6dee63832075e26d52fd30c42b6ba67283d8eceb29ab54f3fcbba49f5bdb17f2bb1ba083c73d6209e29bc5d9ec5b24282808bd
diff --git a/dev-python/jupyterlab/jupyterlab-4.3.6.ebuild b/dev-python/jupyterlab/jupyterlab-4.3.6.ebuild
new file mode 100644
index 000000000000..945203648400
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.3.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+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-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-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}]
+	>=dev-python/setuptools-40.8.0[${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[npm]
+"
+
+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/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 0922822df8aa..6142b5dbc8f0 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1 +1,2 @@
 DIST python-libarchive-c-5.1.gh.tar.gz 48816 BLAKE2B 5b727c88eca866f69eda701ca8898d4bd3b68adefb8234a501cb280fae2be98f1314bb64ff94bcc5e1c0cae9ffc6866ee70aa4fbc4353eac1f16d59f9a789ebc SHA512 a2026aba3ef325f10e981e15e50de0435d7371642b0e6df8cd5ab64e76186b2a72297b32f429547e091fb799c9d0fa41be5a6824408c08f6c71585d59175d7a0
+DIST python-libarchive-c-5.2.gh.tar.gz 48933 BLAKE2B b0654a2bed59f123714c93f84e7903fa13c4cb72a99066846766a998eb96c9dce19f2ffcb0e703ad833cbfc99ca3e3140f84156f3f1952999f6605639b222ba9 SHA512 c0e7f169e088f5ecd8de22109e8bef83e5669ca4d7fdbd069a9d23a62a0aee38d3d861199e593883f83ac0a9d00b656ba1b5cd2fe20311cddb75a6032b3cead7
diff --git a/dev-python/libarchive-c/libarchive-c-5.2.ebuild b/dev-python/libarchive-c/libarchive-c-5.2.ebuild
new file mode 100644
index 000000000000..0b3d3e789d14
--- /dev/null
+++ b/dev-python/libarchive-c/libarchive-c-5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+MY_P=python-libarchive-c-${PV}
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="
+	https://github.com/Changaco/python-libarchive-c/
+	https://pypi.org/project/libarchive-c/
+"
+SRC_URI="
+	https://github.com/Changaco/python-libarchive-c/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	app-arch/libarchive
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/matplotlib-3.10.1.ebuild b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
index 68a864fdb246..610a46559736 100644
--- a/dev-python/matplotlib/matplotlib-3.10.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
 DEPEND="
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 4b7ce7fcca22..55021dce5381 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-git-authors-plugin-0.9.2.gh.tar.gz 32983 BLAKE2B 3f709a180ee80b4553038a459b46684a367ef6c2f62bde4cb551d23aadb7ca701402e4b645d9b75c4d735346d4cd6f825821c23a391dca5264b750f2c2c544c8 SHA512 8933bbf828c239427b40a1a99ea014c1947400b46bb9a88beed6074420fb3b85d60083476c5daf88fe9e10e1f6a6cb5899dfd768ff6f12ead8d70f4bd3951b51
+DIST mkdocs-git-authors-plugin-0.9.4.gh.tar.gz 92571 BLAKE2B c9b0cab92b179157bf5af93c1c1df714df17b959bb3a18ea3bc0fa0d113323b37fad1b5406ce2bbb1b3eb1ed0ac213525e1129e0b96b7abcca57fc48397dd283 SHA512 8036752ae314a9eb87567a6b8a55d5fd1fc7d6beca9e8a2f6d6d3c51f77bc11c880cb747a28b6dacfc78959a56944ab7c86b523b3909fcf33ddd1611da594c2b
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild
new file mode 100644
index 000000000000..16a593b2d0d5
--- /dev/null
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+# Requires self to be installed to build docs
+# TODO: Do this a bit better
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/regex
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+"
+DOCS_INITIALIZE_GIT=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Mkdocs plugin to display git authors of a page"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-authors-plugin/
+	https://pypi.org/project/mkdocs-git-authors-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+# Tests are broken outside of upstream git repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/gitpython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-authors tests need git repo
+	use test && initialize_git_repo
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index d4c7bcfa8633..ff1f43078fe9 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-git-revision-date-localized-plugin-1.3.0.gh.tar.gz 378511 BLAKE2B e922d0ce5dd37f92c11a37d7c02a59fc776a1a4245823a2275c600c6348cc7f97a2a8b43919a5cdbe03e8b23623f0c7d22cf92eb728d6f11d7472db5b78e98a1 SHA512 6e6c085ae861382a932817264c00de55f94b8b09349c18206c1644487a7476d4494f0b451b31510de4ba3a5d4934514923521c8c4c5aca84a8183f5cd574177d
 DIST mkdocs-git-revision-date-localized-plugin-1.4.2.gh.tar.gz 443259 BLAKE2B d174c9e7ca7edd9b8e7da798da910d4733f4c917a932f7c5040794f073ddd0c1f315f8bf5d5a6f00764c75e614c113ab047b4f01affe59068e313cc1a47449c1 SHA512 39c54938e4b3ffefa1ee302be0e9461e84b798841a4cfa5f054ec20021f9a87b47b909dab6ea5abf98c028693805057df5883bbc7aee3eef5275538b0ddd009b
 DIST mkdocs-git-revision-date-localized-plugin-1.4.4.gh.tar.gz 443468 BLAKE2B 5d7c8d2b5182fd9a3cf9bd01f23d9da99e1e4c9acfaf149828562d36d90188dcb25000ce8db65caa2b2177d05e46f5d108d8cbbdeeadeca667f61ed2544da22d SHA512 915ef91fb5a72b27e721c28e6e171ead9b6a4b201f4aeea3175519ca329bc2bd11fabf93bc3811336f57bd417fe9bcfc840e9d43b8abd2546316d9033122db8f
+DIST mkdocs-git-revision-date-localized-plugin-1.4.5.gh.tar.gz 443988 BLAKE2B 582f13ea5ed7dfc7fd5e8e6040ae25bad6f4a1e424f77a016a930030a16ae0970315e0d9618c982fd7131a0e448380ceccd9c8b55613b779c21936a8bb54024d SHA512 c96d179bceb3f26164bf730e6a3b590a16e8d09ca9210dc499caa71effa71a6cc814004fa88f2a6d0316ebf4bca3280ffbc40fddd8331797c7209a2a8cda8d92
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.4.5.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.4.5.ebuild
new file mode 100644
index 000000000000..ad006ade812b
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.4.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/regex
+	dev-python/mkdocs-static-i18n
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+	dev-python/mkdocs-git-revision-date-localized-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="
+	https://github.com/timvink/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/gitpython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-gen-files[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-monorepo-plugin[${PYTHON_USEDEP}]
+		dev-python/mkdocs-static-i18n[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+EPYTEST_DESELECT=(
+	# requires techdocs-core
+	"tests/test_builds.py::test_tags_are_replaced[mkdocs file: techdocs-core/mkdocs.yml]"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "larry@gentoo.org" || die
+		git config --global user.name "Larry the Cow" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/nh3/nh3-0.2.21.ebuild b/dev-python/nh3/nh3-0.2.21.ebuild
index 2f66047d8f67..9c78ecee8c2a 100644
--- a/dev-python/nh3/nh3-0.2.21.ebuild
+++ b/dev-python/nh3/nh3-0.2.21.ebuild
@@ -115,7 +115,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index a7953dffa782..67f62c1237e1 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-7.3.2.tar.gz 12781804 BLAKE2B 708d9d2bf43db2de71b4a9b5b1bf664b5922cde036171e7792238e10b6ac05a2ae93dcf478dc7d9d262ab8bbf8ad916695f46eeddd32ea763b53bd8c53009f73 SHA512 71c81e745488985ecb75b37e70d5c3937a824366270e3ee8d45c6bc535614d1e5c0f0f06b5e2b7bc0a8d5f47fa99679d1fe6de86659f494be9ba4d99e9bfe34e
+DIST notebook-7.3.3.tar.gz 12758099 BLAKE2B e5e988a166b5124f95cc050a4d9402778108c084325024c8ed3829780665d7149a06cccd4ab80d33e572b0b98d9088751d2a9313f10a940e8d82b5eb14db25f3 SHA512 e0f476c5a91edba48dc43b25417946983c46d5b4beaac6531ebf7af02bc4a9f2bae09b7d7524d7ad6e33c262769c1dc40c36f4593cfc70b8c98f41f40a75f8a2
diff --git a/dev-python/notebook/notebook-7.3.3.ebuild b/dev-python/notebook/notebook-7.3.3.ebuild
new file mode 100644
index 000000000000..ea4df85f448a
--- /dev/null
+++ b/dev-python/notebook/notebook-7.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/notebook/
+	https://pypi.org/project/notebook/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.3.6[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.4[${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/notebook-shim-0.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.3.4[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.4[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/nbval[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index ccefaa6c4f88..7fb4e004af25 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
-DIST openstacksdk-4.3.0.tar.gz 1244210 BLAKE2B 54f408c7993d84d48a2cf1a3539102ab20c3491c678b13e5ec7ef523cddacbbe3e624b237802910482a0e3d316cb56d4a2b01cc62fd680f98acfd70646768f03 SHA512 b6bcd38519ff83de55e737c5d22bc585632a44414e2f247892649452f9d707c2a814068f1cc4d5b519c689796570c65d7e43b2ab889f1e672418bcf3beec417d
 DIST openstacksdk-4.4.0.tar.gz 1266578 BLAKE2B 003247645b4a386a8d998e8b003f41fe45e1160c1fa4223a61285cc17aba1e385d50ac0eded2c91ee948569c5b3277c35ebf22c08f6775a9fbef728b9cb94e40 SHA512 2a6935442533c35c070933b0bc238cdcf8a29d86719002b81e568353a47e0d566df18ca9138956d470535c9c2dca9f99f8d6112790eef37a6bfdf058c96246fe
diff --git a/dev-python/openstacksdk/openstacksdk-4.3.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.3.0.ebuild
deleted file mode 100644
index eff84cf7943b..000000000000
--- a/dev-python/openstacksdk/openstacksdk-4.3.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-	sed -e 's:test_servers:_&:' \
-		-i openstack/tests/unit/test_stats.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	# fragile warning-based tests
-	sed -e 's:test_unsupported_version_override:_&:' \
-		-i openstack/tests/unit/test_missing_version.py || die
-	sed -e 's:test_create_unknown_proxy:_&:' \
-		-i openstack/tests/unit/test_connection.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-4.4.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.4.0.ebuild
index 310f7454cf85..b7a672907f57 100644
--- a/dev-python/openstacksdk/openstacksdk-4.4.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-4.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 5efbcd889d53..c33dbb77ee2d 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST python-phonenumbers-8.13.55.gh.tar.gz 4916409 BLAKE2B 4562e04b04b34f58d1fe128709e4867b9dbe4f9f05bbfdfb505d2fc42a0a4f7cc2277e8bd79e0df23ae6f447de7f7eb6a9622b276034d4187941c9f3335c821a SHA512 d3e81afd9867f5b0ef81ae033dc42211601737b31fa4c7e2ca9c404d5c5c06dbc85506d7b58fffade05c563b2c1b28b516ec95ee9b95d3fd2ba57be9e6c01dd5
 DIST python-phonenumbers-9.0.0.gh.tar.gz 4916419 BLAKE2B a6bf613d2c0f5275ab0a3628029523c244088acedb733beb78753547c088d35aa7a59818e27a8041ea119399508a9d9232d9e20475983993b5f8e8b144b8e6f5 SHA512 3341c3e03b9b4fc0a5117c632954f0635dae7f2bf2d7d824e3b198ff8fd4571331c506236560e5281dfdea1b4bedf6241441f2725897ebbcb825622fc952d2dc
+DIST python-phonenumbers-9.0.1.gh.tar.gz 4916504 BLAKE2B 838bc9a91820b92b4e96641b0c1a7fb8a801d67ca2d8f6b1072d55dbf1b22548540d5e7f89e8d64a00645da7457decc3deca6e7ca652dd2a8cc1a110c0f1e54c SHA512 891cde8694f8a8f10cba7b10e505257608c6374aca646b18065aee6b952ed7781305428eab9416156d8b1ff6492b4bb8f6a5789c6a1edfe6c21a1b9bab2fc2e1
diff --git a/dev-python/phonenumbers/phonenumbers-9.0.1.ebuild b/dev-python/phonenumbers/phonenumbers-9.0.1.ebuild
new file mode 100644
index 000000000000..85e8daf426e4
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-9.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 0ca74f44bd0c..f30d2c56d5e4 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,2 +1 @@
-DIST prettytable-3.14.0.tar.gz 61747 BLAKE2B 94bb7faa84f174c57b9bb6ddbed2438d00544ed3dabda5a88bf52205e37b646489a425e4b30cf254bd454b94a2ce6906d332ab6a9ea6d4f3c2960f46e9fd214f SHA512 9e3b5cc819b25e3731ad4b8a0809c631879c903733906177fe5b1668ea85ed025192ae0f1e0c8616a7eec51dfd9e15732a7e83c80e30549aad6a3fe768feae19
 DIST prettytable-3.15.1.tar.gz 65907 BLAKE2B 0a65013540dbd4a38a947adaa2f9432e9e06682ab434145fb568ee0f9f80371e90f776d56d1d0aa2b81c7dbe09f936c62c9fbd2d6927ee9e24b3d456e9190d19 SHA512 550f1794b3da55cc14b252817fdb17e5f380978be0d5b3a055646d769f4276498bdda5dbc9df88c6bf29069becb572ffe9bb8eb30781e1c975a6ddcbca4c2380
diff --git a/dev-python/prettytable/prettytable-3.14.0.ebuild b/dev-python/prettytable/prettytable-3.14.0.ebuild
deleted file mode 100644
index 7037a1f4d100..000000000000
--- a/dev-python/prettytable/prettytable-3.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/prettytable/prettytable/
-	https://pypi.org/project/prettytable/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# remove the implicit dep on coverage
-	sed -i -e '/coverage/d' pyproject.toml || die
-}
diff --git a/dev-python/prettytable/prettytable-3.15.1.ebuild b/dev-python/prettytable/prettytable-3.15.1.ebuild
index 6e1e31652a46..7037a1f4d100 100644
--- a/dev-python/prettytable/prettytable-3.15.1.ebuild
+++ b/dev-python/prettytable/prettytable-3.15.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index c1771ba922cd..058e645d3657 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,9 +1,5 @@
-DIST psycopg-3.1.19.gh.tar.gz 507073 BLAKE2B c10e2ba83f4a3bb0646d86c0f1311ae43e3fafbf9eb8ae91f8a77941dd2ef21d22c5fdeca724399bbcf5f7f010f5a3b0f78979720efec8f25613abbe568dabc9 SHA512 a7d02570632a28080ffd99fa492c2f1af623e7ca55e57e8c5d4664aff4d033ae85fc21cfbb1f85a90c48e01944ed1be68e857b5cb34c0547b51ca465bac0a361
-DIST psycopg-3.2.2.gh.tar.gz 550226 BLAKE2B 2731190da5b044f16eb0f90fb5417244e46fc0906dde6ee9bd1ee4d91613f59ef1943da6662ad1f3db1487b8cc2b4ccb4e0a79ecc056a8f72c7e2b7b70e39abd SHA512 48686101c9d568003ffbf90cf07bc4496fb161f599b60a2b2df41ac120f338bee7edbeae3786071969d6bbb9acdbe868fa568b9cfa3b7a17dec2d47e5d54f002
 DIST psycopg-3.2.3.gh.tar.gz 550802 BLAKE2B 1f748fc2dc915fd82b2bc557ae4263ecf1070d5ba08681cb6ae21570acf601b03a2bde7e4324cd506e0146c86db976b003c57e99cd1948a930c074f0674d6ba8 SHA512 cf543652cfd27cf1cad3b1e3b8b50802562cc49f8fbd9ae5bd85ffdf26e30dc470f1f3380261c8cad418945ade8dc4f199ebcba08968cb87fd0b6c241fd8040d
 DIST psycopg-3.2.4.gh.tar.gz 555758 BLAKE2B 1b74f8a6ee91266fb6c6a13ee51fd7d18514b4ce662f911f83baba652bb9198cae21636f6f1dad6eae916cc2c22f2322629dea346e61ce94a1d94a80c8e8b5be SHA512 026f4a74011c37e594903931da629fa0150834db0916bc02a45aa31eb79fbbcd9a0b6b59809d4db389e298101646409097d99c4950981ddb43413a7488e4f1ff
 DIST psycopg-3.2.5.gh.tar.gz 558069 BLAKE2B 1913db4e399d9e44e392019471d3b7a5fbbff1da67a87961b084ca2fa34ddf2af3c862093077bfe04503d16187abff4ab62e33b1a3505b7a8cafa836bcf33ba3 SHA512 f4c62e462f6fba04f7b07bf500cbf5ee3e0ffa570c682f507aae0fc5ee88a1eec3f98da05c9a2c957d018f12f53a9567565f8b81914eb36ca92992fa2ccd8156
 DIST psycopg-3.2.6.gh.tar.gz 558574 BLAKE2B a994f6fb3ee85c42371b848d0947858897a9a1f7256486aa964c8c7634b198b9229a53626c526cb85218a8468308dd9e7e605c1fc1058a08c7fb7183aed83b8d SHA512 99472813c9b6542611b15f0dd52d418a7e3f01cf0447a9a58c1d4135249fb526ca25f7569cc5d7d8a2a99184dccca52f485ee9cc9514e6ada1ebd526f8d62305
 DIST psycopg2-2.9.10.tar.gz 385672 BLAKE2B 4a3ad64f406c427b785ffeb85f6520aa67ed04de2d1749eb22d8275146b71ba451f7c04c9ead401d6f7a273781492cd6a5a36beba68b36b1e5203ee75f7df503 SHA512 d0916f6a645b5e87f89f2463dc22fad78340a85fbff320d099bf429a42557f40d3a4eebdc670768469aef1e9fcee60123767bfe49e1186e8574f95bfd6f46900
-DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
-DIST psycopg2-2.9.9.tar.gz 384926 BLAKE2B 8418fca1329703cedfc86be74d85cae5133a0604bb8a21fa43e5359a46626d38ef227d0cd8fbbeb497e2db517a469d7f3e86b74ef9163617a547e999073a6b4c SHA512 a691fd09762221e854861dedce37b05e5354e0701feea470a6d5046960056ef02a8c9ecfa751adeba485271ea7d5834643b7d3a3c3f3270087f5ed9c68509f5f
diff --git a/dev-python/psycopg/psycopg-2.9.4.ebuild b/dev-python/psycopg/psycopg-2.9.4.ebuild
deleted file mode 100644
index c734fcc861c5..000000000000
--- a/dev-python/psycopg/psycopg-2.9.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="psycopg2"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
-"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-2.9.9.ebuild b/dev-python/psycopg/psycopg-2.9.9.ebuild
deleted file mode 100644
index ece6159132f5..000000000000
--- a/dev-python/psycopg/psycopg-2.9.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="psycopg2"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/
-	https://pypi.org/project/psycopg2/
-	https://pypi.org/project/psycopg2/
-"
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/postgresql-8.1:*"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
-"
-
-python_prepare_all() {
-	if use debug; then
-		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" psycopg2_test || die
-
-	local -x PSYCOPG2_TESTDB_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" -c "
-import tests
-tests.unittest.main(defaultTest='tests.test_suite')
-" --verbose || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/psycopg/psycopg-3.1.19.ebuild b/dev-python/psycopg/psycopg-3.1.19.ebuild
deleted file mode 100644
index 1f0a2235be03..000000000000
--- a/dev-python/psycopg/psycopg-3.1.19.ebuild
+++ /dev/null
@@ -1,117 +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_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DEPEND="
-	native-extensions? (
-		>=dev-db/postgresql-8.1:=
-	)
-	!native-extensions? (
-		>=dev-db/postgresql-8.1:*
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/935401
-	# https://github.com/psycopg/psycopg/issues/867
-	#
-	# Do not trust with LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Python code + ctypes backend
-	cd psycopg || die
-	distutils-r1_python_compile
-
-	# optional C backend
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		local DISTUTILS_USE_PEP517=standalone
-		cd ../psycopg_c || die
-		distutils-r1_python_compile
-	fi
-	cd .. || die
-}
-
-src_test() {
-	rm -r psycopg{,_c} || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests for the psycopg_pool package
-		tests/pool
-		# some broken mypy magic
-		tests/test_module.py::test_version
-		tests/test_module.py::test_version_c
-		tests/test_typing.py
-		tests/crdb/test_typing.py
-		# TODO, relying on undefined ordering in Python?
-		tests/test_dns_srv.py::test_srv
-	)
-
-	local impls=( python )
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		impls+=( c )
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PSYCOPG_IMPL
-	for PSYCOPG_IMPL in "${impls[@]}"; do
-		einfo "Testing with ${PSYCOPG_IMPL} implementation ..."
-		# leak and timing tests are fragile whereas slow tests are slow
-		epytest -p anyio -k "not leak" \
-			-m "not timing and not slow and not flakey"
-	done
-}
diff --git a/dev-python/psycopg/psycopg-3.2.2.ebuild b/dev-python/psycopg/psycopg-3.2.2.ebuild
deleted file mode 100644
index 467a0e87ba32..000000000000
--- a/dev-python/psycopg/psycopg-3.2.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="PostgreSQL database adapter for Python"
-HOMEPAGE="
-	https://www.psycopg.org/psycopg3/
-	https://github.com/psycopg/psycopg/
-	https://pypi.org/project/psycopg/
-"
-SRC_URI="
-	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DEPEND="
-	native-extensions? (
-		>=dev-db/postgresql-8.1:=
-	)
-	!native-extensions? (
-		>=dev-db/postgresql-8.1:*
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-	test? (
-		>=dev-db/postgresql-8.1[server]
-		>=dev-python/anyio-4.0[${PYTHON_USEDEP}]
-		>=dev-python/dnspython-2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/935401
-	# https://github.com/psycopg/psycopg/issues/867
-	#
-	# Do not trust with LTO either.
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Python code + ctypes backend
-	cd psycopg || die
-	distutils-r1_python_compile
-
-	# optional C backend
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		local DISTUTILS_USE_PEP517=standalone
-		cd ../psycopg_c || die
-		distutils-r1_python_compile
-	fi
-	cd .. || die
-}
-
-src_test() {
-	rm -r psycopg{,_c} || die
-
-	initdb -D "${T}"/pgsql || die
-	# TODO: random port
-	pg_ctl -w -D "${T}"/pgsql start \
-		-o "-h '' -k '${T}'" || die
-	createdb -h "${T}" test || die
-
-	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests for the psycopg_pool package
-		tests/pool
-		# some broken mypy magic
-		tests/test_module.py::test_version
-		tests/test_module.py::test_version_c
-		tests/test_typing.py
-		tests/crdb/test_typing.py
-		# TODO, relying on undefined ordering in Python?
-		tests/test_dns_srv.py::test_srv
-	)
-
-	local impls=( python )
-	if use native-extensions && [[ ${EPYTHON} != pypy3 ]]; then
-		impls+=( c )
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PSYCOPG_IMPL
-	for PSYCOPG_IMPL in "${impls[@]}"; do
-		einfo "Testing with ${PSYCOPG_IMPL} implementation ..."
-		# leak and timing tests are fragile whereas slow tests are slow
-		epytest -p anyio -k "not leak" \
-			-m "not timing and not slow and not flakey"
-	done
-}
diff --git a/dev-python/psycopg/psycopg-3.2.5.ebuild b/dev-python/psycopg/psycopg-3.2.5.ebuild
index a7b3f48ff593..f76f9e159ad6 100644
--- a/dev-python/psycopg/psycopg-3.2.5.ebuild
+++ b/dev-python/psycopg/psycopg-3.2.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest
index 668077954e43..31ecfdb481e0 100644
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,2 +1 @@
-DIST pycpio-1.4.2.gh.tar.gz 22690 BLAKE2B 244145dabdee1fa50e54f98327608b96afef354d53e1405e2e54c47d9cc8a71c80e4adfe8f1c7a079a9acdd30751f125e7b5db61cd34baf375433248c7370757 SHA512 7fe6b7e6597a8733d740348888b5c41aa37f08e2ecd5843ab32751e8a5cd6ce9390201ba5a47c3febd2f61562db4ce6724404f9359238de91f94f4bc12b9c41b
 DIST pycpio-1.5.2.gh.tar.gz 23297 BLAKE2B 23f66aafa7215f6cece1b64f99fc7d720a0f6e98a96bf56f83b11ec4e5f75cd4f37315852ef57ecedac62520daa7c676f59489ee9d42b7ad9ccf695679fa79b1 SHA512 938f4a4d17ef414a0849c3104f0dcc4f9291bf4f4c0f76fd33e53b30e369408d7de8595ab79ea9740a5e7746527e22ab702dc3271cf1490980713ff0dc595847
diff --git a/dev-python/pycpio/pycpio-1.4.2.ebuild b/dev-python/pycpio/pycpio-1.4.2.ebuild
deleted file mode 100644
index 31dec107b3ce..000000000000
--- a/dev-python/pycpio/pycpio-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio/"
-SRC_URI="
-	https://github.com/desultory/pycpio/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-RDEPEND="
-	>=dev-python/zenlib-3.0.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/pycpio/pycpio-1.5.2.ebuild b/dev-python/pycpio/pycpio-1.5.2.ebuild
index dec476902434..eef5e97f2bc1 100644
--- a/dev-python/pycpio/pycpio-1.5.2.ebuild
+++ b/dev-python/pycpio/pycpio-1.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-python/zenlib-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
index acd73b7d3f29..73cd7d4a628e 100644
--- a/dev-python/pygccxml/Manifest
+++ b/dev-python/pygccxml/Manifest
@@ -1 +1,2 @@
 DIST pygccxml-2.6.1.gh.tar.gz 3154561 BLAKE2B 95fb9df63f4175eab707211cb14d178437928ddad76eeb416d8cf4a48b29c211d80ba55533deb0a12e6bad4435df9bf82a1321b37cdc8db39d217f2995d1215e SHA512 b0ccd12b50d93287189fa86be6e11f44e28869045e6d7f6f84f34220cea642fc267eee150fe544bb54839b7f467f64af4a6025c84b94df7793645f2d444ae60d
+DIST pygccxml-3.0.0.gh.tar.gz 3155557 BLAKE2B a485f5b25d724c0c67a4a6108b298ecf5da9bd3fd365f513ce424239d3e94d76a88cdc1b7839fd69b5dc897a3e7e4f86721a8411ca9c6faa37da9edae509d387 SHA512 061150cabbe3eb8853dcd48be91d741f7af405f6682bd6a6000e83bf5c5da8ed572467131f98234158f86deac6c8881736fa47b6a89149edbe10c00729e863b5
diff --git a/dev-python/pygccxml/pygccxml-3.0.0.ebuild b/dev-python/pygccxml/pygccxml-3.0.0.ebuild
new file mode 100644
index 000000000000..46d668b6f074
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-3.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A specialized XML reader to navigate C++ declarations"
+HOMEPAGE="
+	https://github.com/CastXML/pygccxml/
+	https://pypi.org/project/pygccxml/
+"
+SRC_URI="
+	https://github.com/CastXML/pygccxml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/castxml
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+
+EPYTEST_DESELECT=(
+	tests/test_smart_pointer.py
+)
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.4.0-doc.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyglet/pyglet-2.1.3.ebuild b/dev-python/pyglet/pyglet-2.1.3.ebuild
index 21d1ab26d6c5..90d40f47baa9 100644
--- a/dev-python/pyglet/pyglet-2.1.3.ebuild
+++ b/dev-python/pyglet/pyglet-2.1.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index b49e9111428e..a4cd12c29d43 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,2 @@
-DIST pylast-5.3.0.tar.gz 41552 BLAKE2B 0d6fd60e02f6106cbbfe2027614d8d403c54ee1f749ea697dba7d863e7a1fc647f95d2ea341e1d0ecfa2900a1ae117920466bb8f8a0728c5a9dea6be8d1009f0 SHA512 b8d015d9d1452a650a6fc05019a145c2c5104c1acd0e296d7a9b536fd91710b4efe3dab2646b4b373ca13278fbdc385a64472829dfd1cf8980a22a5f2314afe9
 DIST pylast-5.4.0.tar.gz 44746 BLAKE2B c3c5ad87079c95e40120fae8a5f8cbf24ff4878e1880c1cd7e612978bbc41b34612fc2a75509e9029296f559d1a562e2b59899335c052d6dd8a731af56dc3388 SHA512 2d4b4cd19c9d1a8726ce95565e3943d6c7f2fb4420f8ba1a81c81eb6c358d044f8577e63c3ccca8dc397fdaf072dd269103c0e940a758cd0f3ba7a49fc5e05cb
 DIST pylast-5.5.0.tar.gz 45569 BLAKE2B 397efaf358f58eee91cc1c047496a43259b54f645ce8de01ac14589e4a1098887f9d48099d3373da3e68e1c9c04adc31edf5869e539e9dbe67290f8e8a70a956 SHA512 c4776bf1f430ab8f819dceadbf3efd79ce61bce4780588cd82f12ff99c2cdb96f08871b14693e81183bafe03afd5dda242eebd083e60cc5d035b5ca0f42cc289
diff --git a/dev-python/pylast/pylast-5.3.0.ebuild b/dev-python/pylast/pylast-5.3.0.ebuild
deleted file mode 100644
index f69e0b33bafc..000000000000
--- a/dev-python/pylast/pylast-5.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="
-	https://pypi.org/project/pylast/
-	https://github.com/pylast/pylast/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pylast/pylast-5.4.0.ebuild b/dev-python/pylast/pylast-5.4.0.ebuild
index cb4d988317bb..3fa7284714ee 100644
--- a/dev-python/pylast/pylast-5.4.0.ebuild
+++ b/dev-python/pylast/pylast-5.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibacl/pylibacl-0.7.2.ebuild b/dev-python/pylibacl/pylibacl-0.7.2.ebuild
index a6387e4f9704..32f7b4d3b515 100644
--- a/dev-python/pylibacl/pylibacl-0.7.2.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.7.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ppc64 sparc x86"
 
 DEPEND="
 	sys-apps/acl
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 1cb47bdabec4..e27529c7c197 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy-exe-7.3.17-1.amd64-musl.gpkg.tar 12974080 BLAKE2B 965c086bb660e50c8c58a2c4ffdb9d762d7d99a4c2bc619af4c7b5916dce263170809f75af24f34f7ea8d60f4c1aea8dace5102493363e0fc4d55bd994234cf5 SHA512 731c5f4f9680466e848ee08e3e459773fef5d36622092b4479852aed3ef069a0a544a7711312b65b2c40e3cb96e56037301d09b51ec775842d67e8416ea0200c
-DIST pypy-exe-7.3.17-1.amd64.gpkg.tar 12881920 BLAKE2B ade52bb94ef78629ca6154b8e149e4cb1af72efae3c1f30217659532b68aac50e083c378d029c25f9ec5c6d7323467fcba91af1c1d1d9f6ba375669b2df9099a SHA512 4d4861858daa9046fb036cd489dd6a13e5490034aadc60bdc49e05a3edee4b95578a41b635bc3b95a7eb5ff59375585a44956914a9003765fab2585750118848
-DIST pypy-exe-7.3.17-1.arm64-musl.gpkg.tar 10977280 BLAKE2B fc56e03dc73a2c1881f6adcfa30eee3069a3ffc7b7efc77e85703bb831f2b183f794104f39934e78b29f4e1fea42f520200e456fe9902fe13efdfcaaba5dba67 SHA512 28af13342a8f0d9c435106b0f7c991ddaecdd995ff1f3c84cdc85ae78d69e6d7088e488776eb10f933aec20b0ce0522a2c4b2ef6efddff6fdab5a5e6c3e80d63
-DIST pypy-exe-7.3.17-1.arm64.gpkg.tar 10905600 BLAKE2B f6eafea6599d466f7acf8296ef59b3b2e8ca55b9dee69088dcd13067b3b0ceeca7baeff9ebf1b316b8db8f041046f9989c37b3ce26b194cce76e702fd4957872 SHA512 e44012949a4ac94b5d5b70577de531e0c52faed280c5c4666d2fb398f24458241117fa4844b323446e4df3801e2fa16fa252f729d25e5cd4ca5adc32a995dd21
-DIST pypy-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6696960 BLAKE2B 805d8fb087b8123437fc1bda16c6686d36cf51a574e3a5dd2d245a42f5bc3574315875f84bf4cb88c9c388d1cd8879332d76913228619900643b4beb592efe87 SHA512 cb886d1f14cd01f53deb5a6f80d7ee0f0298722fd43c897970179165c8aecede86526f77ad185558e9bb2fe8384d88f16d1a75d45e50f1a4f35448c545fb4dac
-DIST pypy-exe-7.3.17-1.ppc64le.gpkg.tar 11110400 BLAKE2B b8e3f503f448226c7d59942281cb64fe4bd648a5777ec483de0f549221ddcf71f347f88b9c11070f8875657851e07cfdf4e9ef634e811c0a3dda664cd04543ca SHA512 e4e2f16e2eed8946a1ad07ba3d4ba8677beeda3731b46838a5284e6309b3966ddf8fa9992c4519b19797f633d2288d4f231fc41e992e83683de0ad7b239c5d22
-DIST pypy-exe-7.3.17-1.x86-musl.gpkg.tar 9891840 BLAKE2B 3391ad3558baa88741a38549e12666ee669d5949f234e104e5687001928aaf7836573192ded6342fd690337589da10d4f45389c02d15cf3bc10ebc4a7de2d12c SHA512 cf30b7c8f779317126ced75d84b383644a4d90cc65a9d2e75019dd68bb29079fdb0e96312c26ee3f7185f6c64e3a7a0c21d66fdcf18a5c68ce87936dd49d6043
-DIST pypy-exe-7.3.17-1.x86.gpkg.tar 9850880 BLAKE2B 08487e276cf616c5c9191a0a29cc6a297f9eab5ce8382d591b01e7da3239b4bef482bba1566b17ca85f3729b4d5ae6bef6d13940b5e7b1dcd9a7b03d7eaec2ac SHA512 70f6660321483361a1de6e5ccf2854daf892282858d2a0a00ce3055103d7f90f1788cea4b5b18913f11c17ce0f6c999551ee5374f897717d33eb06e913310960
 DIST pypy-exe-7.3.19-1.amd64-musl.gpkg.tar 13056000 BLAKE2B fcc7de500e157a3c9f64f96014aea8221649d9ae360556a67420dc4c33f0d9379a956ba227532321a2b7acc72d29a9f8b8c3b8842b6d521ceadfa435fa23e44a SHA512 e21517062daa435ae5fb7faa7bfe4a65af7a14953de50c2cca156c529f0c4ae86234c6d6ad84bc9d8cc2df33022daf219a38b3d8ccdfcbb32fca49c2f1dfec1b
 DIST pypy-exe-7.3.19-1.amd64.gpkg.tar 13015040 BLAKE2B d7665bc405df19f1eb1a14688f342af2696fa1a6268dd34de669d45ee0135d05f6a2d5405327fd814f4a0377f49d972018fc373d71dd3b0e3d8e0167b20ec62b SHA512 3c7067c1c2c98cf70dbf6f75a293e4a9faccb973a083258a47d908b8cd5f3a785fc816f563166aa372d5b83686305efdeb22073b89f63377548a1448f060d0f1
 DIST pypy-exe-7.3.19-1.arm64-musl.gpkg.tar 11048960 BLAKE2B d48a45b936728b01f11adb15530b5d68faa49a398014f5508a15d5fb776bf2e4657b3fff0040e8d2649c7db4c5b70e92fa666c7d80e5e7eacd6191367e990735 SHA512 8c6bf2e4482d962e627e932a8d2bd3b7d298cae115cf2d9f1fbc312b2fe4fd41f27f1f072e49f510b77a82c8b6a089f49082bdb1801a0b7457e65a1e8e44f4d2
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild
deleted file mode 100644
index 247331a1a360..000000000000
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.17.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-MY_P=pypy-exe-${PV}-1
-DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy-exe:${SLOT}
-"
-
-QA_PREBUILT="
-	usr/lib/pypy2.7/pypy-c-${SLOT}
-"
-
-src_install() {
-	insinto /
-	doins -r */image/usr
-	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
-	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
-}
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.19.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.19.ebuild
index c68b78a12bd4..eb6b61c182a7 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.19.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.19.ebuild
@@ -53,7 +53,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 55c933c64b0f..7c1e6963a481 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1,2 @@
-DIST pypy2.7-gentoo-patches-7.3.17.tar.xz 5324 BLAKE2B 866f172a6df6f0e94a98c611b37ae58635623e33a47619a5e44658d3908337a3f9029ff7de6997f760c3f1679fc83bfc6ddfb66852c492a581b3336b5eec3ed2 SHA512 6ce5266d0748f3c18a5546aa2bd8479ecb45923eb7df8a140a195e7f7b44999b9167ffdd44f7fd789ddd3a62cd77cb917863b0144180a1127befce1f290e650a
 DIST pypy2.7-gentoo-patches-7.3.19.tar.xz 5328 BLAKE2B c997c0e7f39a4a6a9ec34811b38fc8f9b90ccae8c958ca420074013d63a4f1b453b6331be79a2df299efe177cc99d91038ae56156d37b5f9b9f8715ccd2cb75d SHA512 7bac5331fa868c60b376e405df212a29d406f117035fbc1ad8bd6d81212ab2ea4ce5b6b40e8dbbb6303fe941152e37aae17608a2eca9efd16767c8844f6f5fdb
-DIST pypy2.7-v7.3.17-src.tar.bz2 19907140 BLAKE2B de62ebc4e8102867effdecddca64c19c40458b112a6a56ac0c95247047b9f5437a5da68dffb51c14c21bce463c2ca489c6e6a4f86e8cc597b57df2eca707081e SHA512 82b2b9dbf0ea32c405ddc53d98a3a7a153f494d286e8719a0c40960168aadc0f49c3b313416488338f7f51c8fdb58120de41b1d47a8c8eda7db6d4ec4273b4eb
 DIST pypy2.7-v7.3.19-src.tar.bz2 21011665 BLAKE2B b8e205927c829753dd3e5aba0868923efff73f62e5338d6200aab2470857fff9cf38763ab8b63a74a39299d4956d4794eedf5d474d083875bbb9cee9ea757e64 SHA512 8ab8d9c0fa94ec96ebfae30b7f97eb8dff6ad4ee17fa688df123927c45f3ffea2c7f5dbb98bd2f8a49f7db6baf0ba3e98fd230df0bdc8602e407fb2bc33144e3
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild
deleted file mode 100644
index 98ab46702abd..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.17.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
-
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-RDEPEND="
-	${DEPEND}
-	!dev-python/pypy-exe-bin:${PYPY_PV}
-"
-# don't enforce the dep on dev-python/pypy with USE=low-memory
-# since it's going to cause circular dep with unhelpful error message
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-lang/pypy:2.7
-			dev-python/pypy
-			dev-lang/python:2.7
-		)
-	)
-"
-
-check_env() {
-	if ! has_version -b dev-lang/pypy:2.7 &&
-		! has_version -b dev-python/pypy
-	then
-		if use low-memory; then
-			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
-			eerror "installed."
-		else
-			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
-			ewarn "recommends using (a prior version of) dev-python/pypy instead."
-		fi
-		elog "You can install a prebuilt version of PyPy first using e.g.:"
-		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-
-		if use low-memory; then
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-	fi
-
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp
-	if use low-memory ||
-		has_version -b dev-lang/pypy:2.7 ||
-		has_version -b dev-python/pypy
-	then
-		einfo "Using already-installed PyPy to perform the translation."
-		interp=( pypy )
-		if use low-memory; then
-			local -x PYPY_GC_MAX_DELTA=200MB
-			interp+=( --jit loop_longevity=300 )
-		fi
-	else
-		einfo "Using CPython 2.7 to perform the translation."
-		interp=( python2.7 )
-
-		# reuse bundled pycparser to avoid external dep
-		mkdir -p "${T}"/pymod/cffi || die
-		: > "${T}"/pymod/cffi/__init__.py || die
-		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
-		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.19.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.19.ebuild
index 09f9c50bd2e6..ecfd6467581d 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.19.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.19.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/pypy3/pypy3-7.3.17-r100.ebuild b/dev-python/pypy3/pypy3-7.3.17-r100.ebuild
deleted file mode 100644
index d11c4dd3b3f6..000000000000
--- a/dev-python/pypy3/pypy3-7.3.17-r100.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A backwards compatibility package for dev-lang/pypy:3.10"
-HOMEPAGE="
-	https://pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-
-LICENSE="metapackage"
-SLOT="0/pypy310-pp73-384"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+gdbm ncurses sqlite +test-install tk"
-
-RDEPEND="
-	=dev-lang/pypy-3.10.${PV}*:3.10/${SLOT#*/}[gdbm?,ncurses?,sqlite?,symlink,test-install?,tk?]
-"
diff --git a/dev-python/pypy3/pypy3-7.3.19.ebuild b/dev-python/pypy3/pypy3-7.3.19.ebuild
index 29a856f0396d..5010569dcd47 100644
--- a/dev-python/pypy3/pypy3-7.3.19.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.19.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 
 LICENSE="metapackage"
 SLOT="0/pypy310-pp73-384"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+gdbm ncurses sqlite +test-install tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index dd0ae221f6d4..4596c4a56e4b 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy3_10-exe-7.3.17-1.amd64-musl.gpkg.tar 12103680 BLAKE2B 4b542d95bf6a3bc214b4e8adcde98d49b717676f7e22f1347b976570cc852fc70a832224fdae8093cb5b2c47b2aa3075c65dc6bba93720fd2146c6670cf97eea SHA512 b0782c86646f24856c9868a493b19fc9af3596bc703504f09c153f1d11938a6dcded68664459d4043b86638b0e30440ac272bf13b85fd91021112dc663b56c9a
-DIST pypy3_10-exe-7.3.17-1.amd64.gpkg.tar 12134400 BLAKE2B e7ddd040e6f7d0b76aeb6dce53e86924e5e72d5ea7928aba103613dd40cd7c8e4d6fb3837437b3ffd2467b117c4851a84db2e4f5eeda36c26a6450d26e7ef20c SHA512 674be340c85e23a18c5b2a7af05093949606a314042fa282b4ea2b8c8c0c99d57a511ea8623a9d2eab23be711db8fdcd3ff5dc71a71b8c59288a861e6e43aae1
-DIST pypy3_10-exe-7.3.17-1.arm64-musl.gpkg.tar 10229760 BLAKE2B c25bd05035b225b09c59ecac3c24e4c770f254b2286be4967a2e7f674c0d524e55fe66fad76ae18d1a8b2297c0d06d9757590e69900028bdbf299037327f83f1 SHA512 0f5be025d421dc822235ff0ad9c317f22671d6b20fb3ea2bdd860ca48306a854e94469f7aeaf4ca395e6ea01e6ef1969b7cae6ae311db1823b4fae1616a8c2c0
-DIST pypy3_10-exe-7.3.17-1.arm64.gpkg.tar 10229760 BLAKE2B a670d2328d248fe3c897c59af4f5b5b4e2ab86966332232053bba1585377a824a1b69b7f4608e4ac96effb17edffe00c54d00a4aada74301cb720cde7cf9ce51 SHA512 590bae38189f42a708573a6194bd074d54f2b8794d5ba0fb9139130e285528e1cf922e4f3969b17d5aff7e4f5b56809622ea145a8eb32d6fa6e1740deb00dc99
-DIST pypy3_10-exe-7.3.17-1.ppc64le-musl.gpkg.tar 6819840 BLAKE2B 1cc0c5c2c82f831526480b78dc8230305b531908c7ddb7590e07769de602b8aaa3448bc221fa8b824e6dd6a0af7d2d0be5583451004150476f71730d42462251 SHA512 65d85f8c2c4c3997dc15723b7c857fb9f781e6fb992ab18f53e49f812dea63b7e70695364abda7a866d3304e84a5c59797881b9ec5159eb86acb7e44ad31bf9a
-DIST pypy3_10-exe-7.3.17-1.ppc64le.gpkg.tar 10393600 BLAKE2B da4c97f4d5ee546d776ba937d3736033ded7f5cc0a17e39fd657952b834fe6c002d3c33cfc7b16572f07dd0421040d4bb82e897a101ac129a6082961d0d02c7d SHA512 c49c67eee76f604146aadfcc600312e028bb9f6a24560eefd1dec7e9e0c7304e0a1ce89fdf6229b50b51cd17fb50b89815d937ccac3ef5fcc1ef8ff99af5f237
-DIST pypy3_10-exe-7.3.17-1.x86-musl.gpkg.tar 9103360 BLAKE2B 80202a4f66bec51176c29f2506a28ac296e63dd89102c68f62cfb868f455ac51a1e49557962c271e2a99b41001ad21b56790bb05aead361d59b7bea2c526721f SHA512 d7345e886c0ab4c8de987f5daaaddaa9983864e6343f3f64e85607ed897530f19fae653d412eb076b232ff6e7d52fdda4da0b05b4b4767ac1ac669a512e6fe6c
-DIST pypy3_10-exe-7.3.17-1.x86.gpkg.tar 9154560 BLAKE2B c388c0bed60fafddf5edc2f0bae19e04e643cc1ca44bd99f2b7b84c8b71d1a685faa48886aab3b5b2137b90ae3ebfa7b41fc6f98bcd99203f7997299ec52f274 SHA512 5c2ab169b5ece9c7c8fb9972ac74cf2aa8c5f385fd805800183ed8c0845540185065aff388b2d0ad56d901365454979c9051e70ec5ff2a9f7059b2812555f8ff
 DIST pypy3_10-exe-7.3.19-1.amd64-musl.gpkg.tar 12247040 BLAKE2B c9fe627ed844111fe1e2799464f9dcec4436da6be6cc94ac48d338dd21188a06f6a4329861ae9c212cf728955e59643ca2593be276ce4e6f91ac4d2c6eaffb24 SHA512 fd58ac58477df4f57d082d305559184541e36473a38a9ab8b140584c645d25d6269397bd7c86f7ea43176bf2c7295793d6cafc1abf699f530b6cbd1b06b8f13c
 DIST pypy3_10-exe-7.3.19-1.amd64.gpkg.tar 12236800 BLAKE2B bb008e95da6f7681093fc10e2bc958523105687882a5fa711a569a7e11389fcb589996393d787b5463ccb82448e8280e086b9128757a007583b07515c2358605 SHA512 0685e7908e348b3262c830879a08bb4fc0d388eb30675e83863813da4099371962581d89ad588cb6cf1697d5e5ca6a9139cabf97fdd1fc1bd7476e92e660a069
 DIST pypy3_10-exe-7.3.19-1.arm64-musl.gpkg.tar 10383360 BLAKE2B f95531a6771087a4a3d9669115ee78184ab407f5728c35adf4acbf780d4100675925d071321f34ea3b3c547d7fc69ffe6b8903172cc7c59c2f4b3b7436625b4f SHA512 1ee8c4015122724510cd1cef4272d1960dd857f32f0d57aa31fc0efa8d8db480baff9bf0ab6968b6fbb58ff2ce9a129e5a22dca6a1322b41963bafe33e421d3c
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild
deleted file mode 100644
index 492344f7dbba..000000000000
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.17.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils unpacker
-
-PYVER=3.10
-MY_P=pypy3_10-exe-${PV}-1
-
-DESCRIPTION="PyPy3.10 executable (pre-built version)"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86.gpkg.tar
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.amd64-musl.gpkg.tar
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.arm64-musl.gpkg.tar
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.ppc64le-musl.gpkg.tar
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
-				-> ${MY_P}.x86-musl.gpkg.tar
-		)
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? (
-		sys-devel/gcc
-		>=sys-libs/glibc-2.35
-	)
-	!dev-python/pypy3_10-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy${PYVER}-c-${PYPY_PV}
-"
-
-src_install() {
-	insinto /
-	doins -r image/usr
-	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.19.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.19.ebuild
index ea32cf360252..fc6106227db7 100644
--- a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.19.ebuild
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.19.ebuild
@@ -55,7 +55,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index c732b0b2c8fb..423b7481225a 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,4 +1,2 @@
-DIST pypy3.10-gentoo-patches-7.3.17.tar.xz 10340 BLAKE2B a9d7dc6a578dc50339574b2fcfff19e390293adfc8412592e4683fdd3ff415ed8da3ff809b00037659a6e218dc0b26efead7a2ae3c54b2c3487222144d5d9633 SHA512 b192685cc100cfb723492d29e89a522bb4ff041c78cbdfd170414e19713cf2a21c39ab8d4e1e9ca47da2559b2fed6df14f1122f96bc50dd117550c357046889a
 DIST pypy3.10-gentoo-patches-7.3.19.tar.xz 4764 BLAKE2B 3b82fd2d4c9c9e5f8058cd8c312bb370aba792731b39d62bcbc41fb8a2dc55b04f79580936270f1143dec7f7f28e56526cd4f43f6f489f9d2b9b05df538df1e9 SHA512 1dca980c404254ecf09bf3faf1ec36faacf5d095613748999f183dd53c2d9b1ca78297f7ddb1355e34b1cea13608af6419c9be500e722897a6c3c5bfc5a72290
-DIST pypy3.10-v7.3.17-src.tar.bz2 23350562 BLAKE2B 0a7a091976b352de61057f238fa386f767dd4d2fbcdcc0b4376066c20c2ad35d3818fa6e9e163ab5fd341856802e8ad1e2891decf5948c13cdb26726cd42019e SHA512 46e30845bbc73cf56f5033a24d3583253ce198522f3a28ae4e789884063ba167d401fc08ae7fc8c7769feed9cd942a8ab38961c8b8794d7fae8f9955479faa96
 DIST pypy3.10-v7.3.19-src.tar.bz2 24547353 BLAKE2B 975de34c7e01117c74e184693b6659ba0e3d8d488d724c03737dbd64533452c954e045e45058e1e77b9bee68e01060e74e30d7898d29f1adce417ce4b46579b8 SHA512 8fa24d3556bcf9cd0e2facd697827a5001fcfae9bf7874957843e4751b259f85a8b36166921282d71f39bb468d1706bb669373aebbc52486b683fcc824fb30ad
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild
deleted file mode 100644
index 63d7fce8fe52..000000000000
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.17.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit check-reqs flag-o-matic pax-utils toolchain-funcs
-
-PYPY_PV=${PV%_p*}
-PYVER=3.10
-MY_P="pypy${PYVER}-v${PYPY_PV/_}"
-PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
-
-DESCRIPTION="PyPy3.10 executable (build from source)"
-HOMEPAGE="
-	https://pypy.org/
-	https://github.com/pypy/pypy/
-"
-SRC_URI="
-	https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PYPY_PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	>=sys-libs/zlib-1.1.3:0=
-	virtual/libintl:0=
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3_10-exe-bin:${SLOT}
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	|| (
-		dev-lang/pypy:2.7
-		dev-python/pypy
-	)
-	virtual/pkgconfig
-"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_configure() {
-	tc-export CC
-
-	# Yes, yuck, but it's being worked on upstream (bug #918971).
-	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
-	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-		--withmod-bz2
-		$(usex ncurses --with{,out}mod-_minimal_curses)
-	)
-
-	local interp=( pypy )
-	if use low-memory; then
-		local -x PYPY_GC_MAX_DELTA=200MB
-		interp+=( --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to build them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	cd "${T}"/usession*-0 || die
-	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
-	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
-	doins *.h
-	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.19.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.19.ebuild
index 7cb87b34931f..9801bfb7061d 100644
--- a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.19.ebuild
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.19.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="
diff --git a/dev-python/pyqt-builder/Manifest b/dev-python/pyqt-builder/Manifest
index 0b37cc577780..85ec24840eb4 100644
--- a/dev-python/pyqt-builder/Manifest
+++ b/dev-python/pyqt-builder/Manifest
@@ -1,2 +1 @@
-DIST pyqt_builder-1.18.0.tar.gz 3671854 BLAKE2B 37d7ab667368ce962c1ec3fa34c1e25838abdb5a50bd574d0a96cb8c94a272f3d78e4dbaf5113205451f0c9ba746080fca7debfb55ee6bed756b6d3cb8338dbf SHA512 a7b0717b0ff2b8f8cebec1ec6e4c63597153d7fdfd2e3cb2036c07e17b5eca28657010babd3d331874f9f5c1d130a0d75ff6a1255465bb381bc4d007a0316ef8
 DIST pyqt_builder-1.18.1.tar.gz 3671990 BLAKE2B bb0fc3fb7a35bbd7374c57085378c0e50150164f1f9128bc808c5ea6f4ba72987003e3e91864a851969aa892c145b284962b36cf975c71a20e6294a4f3a6645b SHA512 9af2a977854b6a1f6cf7c3c31b18c4104e8cb46cf9066700a62151ed5dfe7d82645065b747dc68a3588e855a96c40102e0e47a972ab752f751825e6fd4c91332
diff --git a/dev-python/pyqt-builder/pyqt-builder-1.18.0.ebuild b/dev-python/pyqt-builder/pyqt-builder-1.18.0.ebuild
deleted file mode 100644
index 581eeeb25c4b..000000000000
--- a/dev-python/pyqt-builder/pyqt-builder-1.18.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=PyQt-builder
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://github.com/Python-PyQt/PyQt-builder/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# skip installing DLLs
-	rm -r pyqtbuild/bundle/dlls || die
-}
diff --git a/dev-python/pyqt-builder/pyqt-builder-1.18.1.ebuild b/dev-python/pyqt-builder/pyqt-builder-1.18.1.ebuild
index c385ccb4985b..581eeeb25c4b 100644
--- a/dev-python/pyqt-builder/pyqt-builder-1.18.1.ebuild
+++ b/dev-python/pyqt-builder/pyqt-builder-1.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/Python-PyQt/PyQt-builder/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index f6413c561cff..2550574650b2 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,2 +1 @@
-DIST pytest_httpserver-1.1.1.tar.gz 68190 BLAKE2B 80fec2aaa84f5625e6a67400153efc002f4586e0878745980fbb2f2c6bd82f5d6230284483a8ce7e501f51a5bd732dfd777d96183cfb83c793c347761e5eddb6 SHA512 3d212cb230ee5be5b1fb450944a9fa56396b692c8fd8a63fca71045640865657fd110a657ec0eb2e24c4d2fb43bfc5997fd056a107b7a6ce573dad4e914b7004
 DIST pytest_httpserver-1.1.2.tar.gz 68602 BLAKE2B e828c4beb2d3b100d2d5e30ad9947a1376be6372d4b9663e9d7d0885aab133baea66d2be9d4549a0c738973e9e809674ebfa6544e059da8772a69428f07cac88 SHA512 18c02bec035c6ac01830c0450b0729f1cc6fe27741cb56c792094887183dc088328465bce8bf118661803b1f27154cc85d847abbecac67e41f8d11e44caf4a5b
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.1.1.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.1.1.ebuild
deleted file mode 100644
index 3afe80995b1a..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="
-	https://github.com/csernazs/pytest-httpserver/
-	https://pypi.org/project/pytest_httpserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests from building release artifacts
-		tests/test_release.py
-	)
-
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.1.2.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.1.2.ebuild
index 89f444d8aa62..3afe80995b1a 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.1.2.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.1.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 92cae7a30487..f03d15d37503 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1 @@
-DIST python_dbusmock-0.34.2.tar.gz 111535 BLAKE2B 8f3f125bcfbf0d1674e0dea3d87d6f776e85fb818c5fd3f814ca139f4f6936e06eabe7c60c467114918609e1897b0c770a5765eb356fc1843eb781e264fd93ac SHA512 3a4a46afa0ca54004a6891c639c0e1bfd879e575189bdd1bbe031f12333d2358af77456e8b6cb32681010b7c19fb8171f819f67ec8960494408100118b19881d
 DIST python_dbusmock-0.34.3.tar.gz 111656 BLAKE2B 5ec1ed245f5ac3bb68464a18b6bdbb45781c17ea500068d5dc26132cd30712731ef9a33a8ab9e6c17af1d21dc879f5913b9251a9d3ca6fe2a737af7c2f6752f2 SHA512 96b5ef9b0c41afaa703b608bbc1ec27704359a61b83d633bd10718a314f84b91208961e9e4b5d96718a2ac70b5b96b0e00039b7d6bfd4436470dafd34d28f0e4
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
deleted file mode 100644
index 69a7470204d0..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-power/upower
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# tests are fragile to long socket paths
-	local -x TMPDIR=/tmp
-	# Tests break if XDG_DATA_DIRS is modified by flatpak install
-	unset XDG_DATA_DIRS
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.3.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.3.ebuild
index 089fa6b88444..69a7470204d0 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.3.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.34.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index cb5906cf7e8e..ca5ee8a5ab3e 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,2 +1 @@
-DIST python-glanceclient-4.7.0.tar.gz 208314 BLAKE2B 97a157781efc0fc67d67f25119edea2a3f85344447e4614f41c73a3f9abda1c9ba646ca7f8d7b2b315b4572997ec730e6eef1782852590e7021f69c61b02920b SHA512 5fff50d499b7fe439cb43c7d396a7dd28439f45cfc157e4fdefb029e7db4cc9955911aae9c4d748fc19bd10ad66d299e26a1178a63a866fef7fb60164467c79d
 DIST python_glanceclient-4.8.0.tar.gz 208444 BLAKE2B e880bb7eded96b933c40981d408d772e7486971ab243cec0ea8b09ff82f69f20dfe96bb0765eb5102996a16f052ab21bad220539b2903bbcc5f80a4f82659abe SHA512 2948ca3b215c3f3b32cfd7f60c8fd40aecceb96fcc005519b3c21e98f3045ad24a77aa1700962eae5ef707eb35b8afb58f6bf96911ce4146ced05219b1e4b58f
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild
deleted file mode 100644
index 6fa4ca8bf349..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-4.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-glanceclient/
-	https://github.com/openstack/python-glanceclient/
-	https://pypi.org/project/python-glanceclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	# combined patch for urllib3-2 and py3.12 test failures
-	# https://bugs.launchpad.net/python-glanceclient/+bug/2069684
-	# https://bugs.launchpad.net/python-glanceclient/+bug/2069682
-	"${FILESDIR}/${PN}-4.6.0-test.patch"
-
-	# py3.13 added close() to mock_open calls
-	# https://review.opendev.org/c/openstack/python-glanceclient/+/923628
-	"${FILESDIR}/${PN}-4.6.0-test-py3.13.patch"
-)
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.8.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.8.0.ebuild
index 500aa6ae62f3..5af49bfca181 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.8.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index c4dbc85e216b..d47cb44816f0 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,2 +1 @@
-DIST python-keystoneclient-5.5.0.tar.gz 324070 BLAKE2B e901a44285b6962ff7cfa499460bc93ad58263c9f033c39eee3a6f241592e46b3078bf180b3581f2a6ecf126fe052bce862b45c84a169370c11847720f6299f1 SHA512 f9e6300af0fcae0a1eef6b964a81ab16cc164afc51c5b6f2dcb2d391f7934b2a937554af20985311f7e74d6794e69059dce4ba0e2cf972b6f47a76272a274ed8
 DIST python_keystoneclient-5.6.0.tar.gz 322179 BLAKE2B be57c26f4a4d7a295e7b6ce8a2f566f9a4815952c7f551fcda90f0f3517a296ea950c7e071aa052b7e34cabf6f6eff3ce626fef5ec3ab9b7a8a7dc1fb67e2238 SHA512 2f6843c46351e385eb5b0ca739222ce9787f36cf8eaf0b6f62a9db4f9c70adf9269acae2b294fefbf741caaada92b02da4c135972e845575d45f5d69262a4217
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.5.0.ebuild
deleted file mode 100644
index 458d0b52346d..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.5.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_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1,
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="
-	https://opendev.org/openstack/python-keystoneclient/
-	https://github.com/openstack/python-keystoneclient/
-	https://pypi.org/project/python-keystoneclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.6.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.6.0.ebuild
index 2a43acfa2559..1ffbe0165d5b 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.6.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index bea9c13ec5fe..b6f19828ddbd 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,2 +1 @@
-DIST python-novaclient-18.8.0.tar.gz 340549 BLAKE2B 2c443379573027bdddb66f9365ded3050cf9b206c2b073001408e23d7c16d945ab836f920c513081c128afa543bff0de0acf38c8e875ee9815f0616b206a64b6 SHA512 d97157fbeee76bb937efc355b9f25c2e3f53d30f3acc566919ab1434adc104d8e9c3d43ae4ea7ae37c75a6b9a0622512a49970dc6f4f6db58c7ca2e48c89d6a5
 DIST python_novaclient-18.9.0.tar.gz 340629 BLAKE2B d98e9a755c27dd83344bc4545fac370b9e6a344ab213c3bd9aeca0c8d3ba94f9b92eb7fb45ebd1aca93fc85e2c35202ac8806c35bda4af0e5629ac026c8cf832 SHA512 bbccde847290faebd7dab7bf7f99c70ac8b24789d867b277b5f91c2a465b8f35a1435103df0915108340af8f881a57aa2b60a7c7be4b3a6fdb9f5e29396b2593
diff --git a/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild
deleted file mode 100644
index 5e98165ffd5d..000000000000
--- a/dev-python/python-novaclient/python-novaclient-18.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-novaclient/
-	https://github.com/openstack/python-novaclient/
-	https://pypi.org/project/python-novaclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-18.9.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.9.0.ebuild
index c207c8cad771..eed6efb69ede 100644
--- a/dev-python/python-novaclient/python-novaclient-18.9.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index a9105671cca5..ea18d375921e 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,2 +1 @@
-DIST python_openstackclient-7.3.1.tar.gz 952512 BLAKE2B f6eb71e44dd559fc36fafdd96bec6fa9c3580c47067e9aed4cbc34a5130b17bfa69b8c86569b3b11e0016220e7c3c08046c2d2b62ac4856c0ed2a4584eb3bd5a SHA512 c1abf327ec8414bdfaa5f3e0fff8b66ecdbf5552278f161ae61e2a69fbb8f5df705fe60fb52e9bf09ed48610f046e255268a51b5d3bc9e536262b0acdcbe2fb7
 DIST python_openstackclient-7.4.0.tar.gz 952845 BLAKE2B e8d736bcb520386913e9ce342bb2d27c34d379e3c182ea794bb44d4589971cbe1970c3ea0768508e8a338039a534558eac25cec458b8016004f61d4af6e2ddf6 SHA512 50382e4bc763448e1cfabd691cd758b85b1d35ea1cf21850a8476e2b44d7b4838130d2d083c0e2ff0594665e20825ac08408d97ffbaeac27bb968bd11384dba9
diff --git a/dev-python/python-openstackclient/python-openstackclient-7.3.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-7.3.1.ebuild
deleted file mode 100644
index 609eeabe00b2..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-7.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack APIs"
-HOMEPAGE="
-	https://opendev.org/openstack/python-openstackclient/
-	https://github.com/openstack/python-openstackclient/
-	https://pypi.org/project/python-openstackclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.27.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on a specific runner
-	sed -e 's/test_command_has_logger/_&/' \
-		-i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-7.4.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-7.4.0.ebuild
index b99dfb50ac0f..609eeabe00b2 100644
--- a/dev-python/python-openstackclient/python-openstackclient-7.4.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-7.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index d214733c7d6c..6f6177f306b3 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,2 +1 @@
-DIST python-swiftclient-4.6.0.tar.gz 209473 BLAKE2B e35516c4e05c889af5e9e794179b2c5a5fe364bcc85492639dd58c45ffc756d86942038d683e685c9f33d876043c0953c6b0cf69db16abdf57c057cf24ab97ed SHA512 19883c2640cf6071752e09261c7d8499e01b749100e6d79cc3a83e08bffc7392ee852351b11d549001d23898d4c34e8309fdadb8e0241e301bf03300db80eef7
 DIST python_swiftclient-4.7.0.tar.gz 209719 BLAKE2B aa4155b1299fbd740e94509b13ba4c295375dbe45bf50c727ddc31e464fb1d25925fc6aa6c2aea8dffc97ecd435dfcf24ef36cfaecaa661555c34088c353626d SHA512 07ab49421260f4537d5a3093557e76cce05db1f4caa99cb54fd5f7fdd8129b73473566005d9f28e7b4fc86348f642f207b3f28cbab10da36f3c656001e86a61a
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild
deleted file mode 100644
index 5964c3ccfb93..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-swiftclient/
-	https://github.com/openstack/python-swiftclient/
-	https://pypi.org/project/python-swiftclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.7.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.7.0.ebuild
index 0044b014e3ea..11d02ad526a3 100644
--- a/dev-python/python-swiftclient/python-swiftclient-4.7.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-4.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-tests/python-tests-3.10.16_p2.ebuild b/dev-python/python-tests/python-tests-3.10.16_p2.ebuild
index c423a21e03ab..1cbff3b0961a 100644
--- a/dev-python/python-tests/python-tests-3.10.16_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.10.16_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.11.11_p2.ebuild b/dev-python/python-tests/python-tests-3.11.11_p2.ebuild
index d3487fcbbcbf..551846da333f 100644
--- a/dev-python/python-tests/python-tests-3.11.11_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.11.11_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/qiskit/Manifest b/dev-python/qiskit/Manifest
index 6db0c10cbc85..28960c829a3d 100644
--- a/dev-python/qiskit/Manifest
+++ b/dev-python/qiskit/Manifest
@@ -111,8 +111,11 @@ DIST pyo3-ffi-0.22.6.crate 69352 BLAKE2B 99eea6ed87001b23fdeb263937bc14be0fadadc
 DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184cabf6391761f850d23508cebcf8d496ce12f747ea241523bb3899886eb20494b076a0651151744bb81d52901a1b4 SHA512 63f7a7b42e099742518c8a3bbc7647e98debb5500d08c39e11e8140fc146e790ab06e005d8d14c89aba79ebc5bf04fe1c92c0e9c5b13421307d3a4682d044179
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST qiskit-1.4.0.gh.tar.gz 8508849 BLAKE2B 8f7cf0992d6623ae441719339aac48dcbb6f969276da4d76c0e317865f75b9bb0ca76e0feccea8ef297b2306320de47aab05bb07fc6e2cc40ae6f1c6c04bf37f SHA512 c1a74ff98474add76a24a962a39c43a0a7ae44cf5421f846c43a4c39d89e61552cc51ed2769f0badf1c4eb4ee8d6f2be9715041583ad3b359bab9778a309455c
+DIST qiskit-1.4.2.gh.tar.gz 8513418 BLAKE2B 99afd2b678d9aa7cc81c36adb10c54f51340a40a5bbf996905473fdae61adcdc9c110b511c96435ab4695b8198030fee4b79eaddfd8aff793e1f8801902cdc07 SHA512 11225da1654cf576a9d3cc953a59dbc11d5db1b67d8ee024dca7837251393bf76042ce0b490528d8db64a1c87eda064c566fba37d4e7f8597edeab405123f72a
 DIST qiskit-2.0.0rc1-crates.tar.xz 14966052 BLAKE2B a7c0a83ebc2c03e856b4634e8c2f300d6aa953926e33af3884ab7419f2784b13db70134d1d26d2e20afe597e4acbf84135107842794a0e460389698d8dd9dc6d SHA512 e74a00c53600247a194e80633157c5ad050e6b41b254e8e238f9852272e51d6b2a9f65a1cc4aec89939b1319e32885a35e6fa39d9cde715a29ee68f461807943
 DIST qiskit-2.0.0rc1.gh.tar.gz 7874905 BLAKE2B ab21ce2c190006fe3ee698d39800e03272252a2065dcb8f3b9aebcc2da8b2ee355ea4f4e6440cd0c74bf58691299d7dcebb2f8e2ba4a6406a12e00001404b262 SHA512 cb13db2823de6fd270c5ce565ebdce4afa15c6004bdc7866c3cce5348a48efeac5d27769a1bc780738bb84c0dfead696a3665cfb04e9dd17e3bf82befc3e5862
+DIST qiskit-2.0.0rc2-crates.tar.xz 14966052 BLAKE2B a7c0a83ebc2c03e856b4634e8c2f300d6aa953926e33af3884ab7419f2784b13db70134d1d26d2e20afe597e4acbf84135107842794a0e460389698d8dd9dc6d SHA512 e74a00c53600247a194e80633157c5ad050e6b41b254e8e238f9852272e51d6b2a9f65a1cc4aec89939b1319e32885a35e6fa39d9cde715a29ee68f461807943
+DIST qiskit-2.0.0rc2.gh.tar.gz 7876821 BLAKE2B e11bd6c3f41e0a8481b8d70d4dbfcbcb9930706aa5ec70a65bb7dac0aa124573bb9bd6004d97d00d5fb285e507f2b590c3d03634b43ab0f60662212466f4fd78 SHA512 d3b5789d91a905ed79b4af216c8175d4bd362902137c2d96e448079690b6dbd2e1c3cdb811855815f44b710bc883d8f4e0b3518f9d4ba4d976a17c0fe8747ec4
 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
 DIST ra_ap_limit-0.0.188.crate 1283 BLAKE2B 265a70d088ed76500cdbefa04d1b2778d54985aa978b806e9ebb016348556559799b8ac889c00aeff51d4ff08f3fa86cd3be3742f5896916edbbda49bca1946e SHA512 01d56844fb4437959e93fc3394d674848eaae3365d271c01ba5ff12fc05d4a1d11eb4145ee89a65eb5ba12db4075e8102ee31df55c569c8ee5ad6d383f9f451a
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
diff --git a/dev-python/qiskit/qiskit-1.4.2.ebuild b/dev-python/qiskit/qiskit-1.4.2.ebuild
new file mode 100644
index 000000000000..f198714152b5
--- /dev/null
+++ b/dev-python/qiskit/qiskit-1.4.2.ebuild
@@ -0,0 +1,310 @@
+# Copyright 2022-2025 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_{9,10,11,12,13} )
+
+CRATES="
+	ahash@0.7.8
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	allocator-api2@0.2.20
+	approx@0.4.0
+	approx@0.5.1
+	ariadne@0.3.0
+	autocfg@1.4.0
+	bitflags@1.3.2
+	bitflags@2.6.0
+	block-buffer@0.10.4
+	boolenum@0.1.0
+	bytemuck@1.19.0
+	bytemuck_derive@1.8.0
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	coe-rs@0.1.2
+	concolor-query@0.3.3
+	concolor@0.1.1
+	countme@3.0.1
+	cov-mark@2.0.0
+	cpufeatures@0.2.15
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.20
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	dbgf@0.1.2
+	digest@0.10.7
+	drop_bomb@0.1.5
+	dyn-stack@0.10.0
+	either@1.13.0
+	enum-as-inner@0.6.1
+	equator-macro@0.2.1
+	equator-macro@0.4.1
+	equator@0.2.2
+	equator@0.4.1
+	equivalent@1.0.1
+	faer-entity@0.19.2
+	faer-ext@0.2.0
+	faer@0.19.4
+	fixedbitset@0.4.2
+	gemm-c32@0.18.0
+	gemm-c64@0.18.0
+	gemm-common@0.18.0
+	gemm-f16@0.18.0
+	gemm-f32@0.18.0
+	gemm-f64@0.18.0
+	gemm@0.18.0
+	generic-array@0.14.7
+	getrandom@0.2.15
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	hashbrown@0.15.1
+	heck@0.5.0
+	hermit-abi@0.4.0
+	indexmap@2.6.0
+	indoc@2.0.5
+	is-terminal@0.4.13
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.13.0
+	lazy_static@1.5.0
+	libc@0.2.162
+	libm@0.2.11
+	matrixcompare-core@0.1.0
+	matrixcompare@0.3.0
+	matrixmultiply@0.3.9
+	memchr@2.7.4
+	memoffset@0.9.1
+	nano-gemm-c32@0.1.0
+	nano-gemm-c64@0.1.0
+	nano-gemm-codegen@0.1.0
+	nano-gemm-core@0.1.0
+	nano-gemm-f32@0.1.0
+	nano-gemm-f64@0.1.0
+	nano-gemm@0.1.2
+	ndarray@0.15.6
+	ndarray_einsum_beta@0.7.0
+	npyz@0.8.3
+	num-bigint@0.4.6
+	num-complex@0.4.6
+	num-integer@0.1.46
+	num-traits@0.2.19
+	numpy@0.22.1
+	once_cell@1.20.2
+	oq3_lexer@0.7.0
+	oq3_parser@0.7.0
+	oq3_semantics@0.7.0
+	oq3_source_file@0.7.0
+	oq3_syntax@0.7.0
+	paste@1.0.15
+	pest@2.7.14
+	pest_derive@2.7.14
+	pest_generator@2.7.14
+	pest_meta@2.7.14
+	petgraph@0.6.5
+	portable-atomic@1.9.0
+	ppv-lite86@0.2.20
+	priority-queue@2.1.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.89
+	pulp-macro@0.1.1
+	pulp@0.18.22
+	py_literal@0.4.0
+	pyo3-build-config@0.22.6
+	pyo3-ffi@0.22.6
+	pyo3-macros-backend@0.22.6
+	pyo3-macros@0.22.6
+	pyo3@0.22.6
+	quote@1.0.37
+	ra_ap_limit@0.0.188
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_pcg@0.3.1
+	raw-cpuid@10.7.0
+	rawpointer@0.2.1
+	rayon-cond@0.3.0
+	rayon-core@1.12.1
+	rayon@1.10.0
+	reborrow@0.5.5
+	regex-automata@0.4.9
+	regex-syntax@0.8.5
+	regex@1.11.1
+	rowan@0.15.15
+	rustc-hash@1.1.0
+	rustiq-core@0.0.10
+	rustversion@1.0.18
+	rustworkx-core@0.15.1
+	same-file@1.0.6
+	seq-macro@0.3.5
+	serde@1.0.215
+	serde_derive@1.0.215
+	sha2@0.10.8
+	smallvec@1.13.2
+	smol_str@0.2.2
+	syn@1.0.109
+	syn@2.0.87
+	sysctl@0.5.5
+	target-lexicon@0.12.16
+	text-size@1.1.1
+	thiserror-impl@1.0.69
+	thiserror@1.0.69
+	triomphe@0.1.11
+	typenum@1.17.0
+	ucd-trie@0.1.7
+	unicode-ident@1.0.13
+	unicode-properties@0.1.3
+	unicode-width@0.1.14
+	unicode-xid@0.2.6
+	unindent@0.2.3
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-util@0.1.9
+	windows-sys@0.45.0
+	windows-sys@0.52.0
+	windows-sys@0.59.0
+	windows-targets@0.42.2
+	windows-targets@0.52.6
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.52.6
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.52.6
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.52.6
+	windows_i686_gnullvm@0.52.6
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.52.6
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.52.6
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.52.6
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.52.6
+	xshell-macros@0.2.6
+	xshell@0.2.6
+	yansi@0.5.1
+	zerocopy-derive@0.7.35
+	zerocopy@0.7.35
+"
+
+inherit cargo distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3+ MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/symengine-0.14[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_fail_to_assemble_circuits_with_unbounded_parameters
+		test/python/circuit/test_scheduled_circuit.py::TestScheduledCircuit::test_schedule_circuit_in_sec_when_no_one_tells_dt
+		test/python/compiler/test_assembler.py::TestCircuitAssembler::test_circuit_with_global_phase
+		test/python/compiler/test_assembler.py::TestPulseAssembler::test_assemble_user_rep_time_delay
+		# tiny image differences, sigh
+		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+		test/python/transpiler/test_preset_passmanagers.py
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# docstring mismatches
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
+			)
+			;;
+	esac
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
diff --git a/dev-python/qiskit/qiskit-2.0.0_rc2.ebuild b/dev-python/qiskit/qiskit-2.0.0_rc2.ebuild
new file mode 100644
index 000000000000..ce2ef120e09c
--- /dev/null
+++ b/dev-python/qiskit/qiskit-2.0.0_rc2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2022-2025 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_{9,10,11,12,13} )
+
+CRATES="
+"
+
+inherit cargo distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+	https://github.com/gentoo-crate-dist/qiskit/releases/download/${PV/_}/${MY_P}-crates.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT MPL-2.0
+	Unicode-3.0 ZLIB
+"
+SLOT="0"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/symengine-0.14[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+		# tiny image differences, sigh
+		test/python/visualization/test_gate_map.py::TestGateMap::test_plot_error_map_over_100_qubit
+		# TODO: failures from dill
+		test/python/circuit/test_parameters.py::TestParameters::test_transpiling_multiple_parameterized_circuits
+		test/python/compiler/test_transpiler.py::TestTranspile::test_delay_converts_expr_to_dt
+		test/python/compiler/test_transpiler.py::TestTranspile::test_transpile_two
+		test/python/transpiler/test_naming_transpiled_circuits.py::TestNamingTranspiledCircuits::test_multiple_circuits_name_list
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+		test/python/transpiler/test_preset_passmanagers.py
+	)
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
diff --git a/dev-python/qtawesome/qtawesome-1.4.0.ebuild b/dev-python/qtawesome/qtawesome-1.4.0.ebuild
index f6fddd8d625a..efe7db449b18 100644
--- a/dev-python/qtawesome/qtawesome-1.4.0.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.4.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="MIT"
 # Codicons: CC-BY-4.0
 LICENSE+=" Apache-2.0 CC-BY-4.0 MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	media-fonts/fontawesome
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 3f0bc95c6362..f567f1bc8d0a 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1 @@
 DIST regex-2024.11.6.tar.gz 399494 BLAKE2B 5b805e71d505516f1b1454d5198591c902eadf56887529bff988e301af639e891b25196467d4b7e2a55144e223ae731e878e2237c1b1ac7852f282aad1d34e13 SHA512 e04c611c22c07cf649ca01517c2508ea5ffbc0c729c43e6f9e0274a7ede68ace88a452987b50345928317869f710c9c75e0c5a0280e2410fc760bcbac7482dd6
-DIST regex-2024.7.24.tar.gz 393485 BLAKE2B d2a46fe2039f78fc3f1e8cda1b7b1808b160018d8e0c1b880bb1a573b36a3e1e7c7ccfa238f99719b5a484fa3b7457109f9e8668fbf16cbaef52006e0e6f6f89 SHA512 7b9efc5bdefa6610862be06831404380939dfffad6e2a488d362f4a247356eb0739c2b9078f41e554eca21d64fd4b1b145291ca8140f18d1586328f7d19cefc9
-DIST regex-2024.9.11.tar.gz 399403 BLAKE2B 6ddf11954723183aa2cf15568592e0466a072897f7d69a22139c3db08fbf113a5b5df5df8b7982e4dc1987be836bbd323612549ba4723408cc235b36c21ae7b1 SHA512 5fec15361d19df69445093a3e4ef59e66d72c5c0a661d83640877850e31d874827aab5ebece2004a93534d7c4cc6084f76f76dda5db8ca3196f9f0a5f98a0043
diff --git a/dev-python/regex/regex-2024.7.24.ebuild b/dev-python/regex/regex-2024.7.24.ebuild
deleted file mode 100644
index 86c71f5be843..000000000000
--- a/dev-python/regex/regex-2024.7.24.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.9.11.ebuild b/dev-python/regex/regex-2024.9.11.ebuild
deleted file mode 100644
index 1a7c9d430c7c..000000000000
--- a/dev-python/regex/regex-2024.9.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 960eeefa4608..1161c359698a 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,4 +1,2 @@
-DIST s3transfer-0.10.4.tar.gz 145287 BLAKE2B 0b15068862236237287243237639310d35de942b0d3d399edd5ee924195ee8f45b2badea4b02f8dceef64f034111a810910b8208cb6e0c5db070b39f5c39f615 SHA512 671d95e9f507bdca8cf53b88cd28285f9c2ae1456fcb24ba4a61a75d30e8c8fa8b2a4faa8c8364114dc3e5c57f630d5b61575847b167e37b3de44b42c45f6a63
-DIST s3transfer-0.11.2.tar.gz 147885 BLAKE2B ec8e8bbcce2136dbc3ddc502ee166ac4bec3c3236c13238a5f9bd8be93671c3d445cef3fe952491aebb43e6db05350f615e3a44e992f3dbd06ee54696f284d10 SHA512 f118422878cfbbbc965ddecc6e93e49d194e68fce223ddf0bb7ff342ba48fa6fd0621cdc158e7e0bd1f35f22bafaed259e743304f4aac23bc58679e955dd9b40
 DIST s3transfer-0.11.3.tar.gz 148042 BLAKE2B 05cc685f969029ad832c990c3d3a24ea2bfe9a628e182f36cfb16deccf0565192ae1e588433a95ca760952b11ec94318f8ef4d6dda0007967927daeb512e232f SHA512 22e0a6c028dd93c0cac59bf2acc2b2fd9a964941288559c348ac75807ecb0d8c86e6d7f4e1955aea68e19e424e5d123ad8d17e6b6351420b73a633fecb526677
 DIST s3transfer-0.11.4.tar.gz 148419 BLAKE2B 140cdc5810cde2d758726ff0605d2fcf45ed0f1001e5f66f37ff1c5502129cc3e329fe2c67298eb541fba75ccb977c8fabd1fca2d059c7d46c16ba3a9ecbdabf SHA512 824e03bccd8d724ebe8146f8c2b115c0d43ffe3a89d005f7cfa53431140130c77997b66fc605ea1a61d3291f4d808e6869150466b2f30a216c2290e902554c5b
diff --git a/dev-python/s3transfer/s3transfer-0.10.4.ebuild b/dev-python/s3transfer/s3transfer-0.10.4.ebuild
deleted file mode 100644
index cdd32c162bcc..000000000000
--- a/dev-python/s3transfer/s3transfer-0.10.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="
-	https://github.com/boto/s3transfer/
-	https://pypi.org/project/s3transfer/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/botocore-2[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.33.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.11.2.ebuild b/dev-python/s3transfer/s3transfer-0.11.2.ebuild
deleted file mode 100644
index 657985bff697..000000000000
--- a/dev-python/s3transfer/s3transfer-0.11.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="
-	https://github.com/boto/s3transfer/
-	https://pypi.org/project/s3transfer/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/botocore-2[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.36.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.11.3.ebuild b/dev-python/s3transfer/s3transfer-0.11.3.ebuild
index 87658147ab54..657985bff697 100644
--- a/dev-python/s3transfer/s3transfer-0.11.3.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.11.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.11.0.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.11.0.ebuild
index 0d857183cbbe..e99b8f329abb 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.11.0.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/setproctitle/setproctitle-1.3.5.ebuild b/dev-python/setproctitle/setproctitle-1.3.5.ebuild
index 76006026878a..7bfdff16725f 100644
--- a/dev-python/setproctitle/setproctitle-1.3.5.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index b77e62158a9b..958e31ceea70 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -43,11 +43,16 @@ DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19b
 DIST proc-macro-hack-0.5.20+deprecated.crate 15045 BLAKE2B fb7b9fa57ad64f2920e801482bfccc762bb7b2c8c1db7da32f393c7b47414fab37234c8a408a4ca9d7072a541df22b07775fc509f76f352fb6be9fe822f84dfd SHA512 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43
 DIST proc-macro2-1.0.82.crate 48452 BLAKE2B c01f60b788c1395d1041d7eb55fe9519ae4e78f86e3dfa732458747767ff801fcdd5a19a81ee9a8d8cd2457eb0a2bb7cec118299a5a9a64d65b5cf06b9d81165 SHA512 3726463868483243adce01c319c1deb1ab153188f1adcb083b53bff838fa80371091bb8e20ce88709ea850ab3ef74dcd99ca5aa95fa375b330841fd4230c842d
 DIST pyo3-0.23.4.crate 1087676 BLAKE2B 2c7d3530460ff687e8f60dcff0fb01465b2a4642043ebdfc927fc3824b9fbce9c4b304250808a85405d21df12d17a1d1ada7bdf8f3563710692f22223e2732f1 SHA512 0015aa75163ad0ec026d185e15c26f59aaad0eb3cc3044b146e5d703bb375fcd838df2044febbd52e6e129dfba81c8249329fc3e4805695274dac7a69eee0651
+DIST pyo3-0.24.0.crate 1108432 BLAKE2B 03098e1ed1f2bcb489ab5fbaf2605631f75804ad138591ae88975c287b8e7544e5f70ef7e3261625075498ac00545b79f6c0b5aab3bcdee2897cbbfabc3f7e87 SHA512 2b9be3cc780c48198ccad08c304053c5248d7c3b7a32e8a3eeba48246b962aa71cbf31ab8c49cab9b555933cccd447412761017b477019a35dc2598999fe63ad
 DIST pyo3-build-config-0.23.4.crate 33885 BLAKE2B 7f95a8a9e08d413899ff1fa64af5a52783bad4a7b4db92835464f12bd8565f152497aaeb45d25cc91eed73950abeea30ca4c7495e3b15423ae588b97038beb18 SHA512 b11442609f43d9baab79daf083caf0366987f6ae182239814ad6df6fe4ad31b95132d74f1162fa9428d229bd8c18ef9b696a4c3329b3960fd705d1705fc5e973
+DIST pyo3-build-config-0.24.0.crate 33982 BLAKE2B 7972eb69fafdfc73ab7e2ef65498a05a5eeb122e332d10db9990d1a7849fc651a9179fa7dba71707150b005258a7f32fe711d7068fac5c5ca071abdb10bdb55d SHA512 f1f571ead6731d1d775210a02df5ca8ef850460eeabfbe04552403477f9d656eebe25a8833ea03b2e2bc7080bdcf9c6ce3b2b3f9b0f746c316ee31b11b5a2365
 DIST pyo3-ffi-0.23.4-pypy3_11.patch.xz 2140 BLAKE2B 29cf1a3b340241bb323192261b11a431a0b78748819dfe05683ce51c18fb53b5e9394fd4269197475d467f6be82df1fdc92e45450a1e2416ddd459bc00174b6e SHA512 43da84518b24022b82314fc509e8125ad6a9e5c47f8e2eb20da2fa38631719759ce821253a62bdd9fc3fdbedf798e9a37168c39d913570a6cfc53aca3ec0eedb
 DIST pyo3-ffi-0.23.4.crate 74806 BLAKE2B 650784d46347c00f09c010c39e9762f778efc510ad0b99b5ddf30cab18edaba552207339ad44ed4ae6d87ddfcc56fa540a17e3a4cb331905a0988d5ba2dc682a SHA512 c12097292b4620f4fd98d61fde4a0f0c7d423a94d518fa5b1cf759089b066fede6d83e20171acc2aa7bf268de5700c9b59da32131216734626b0fa5cd5651801
+DIST pyo3-ffi-0.24.0.crate 76274 BLAKE2B 2f5873a9b2e6bb6a420056a2cfc063e6e04c184bce58a39498307730aa5e061f277de6e805a70ef2448d4473b0bf32e8413c281438464391ffce457749d43c91 SHA512 2206cfaaa157ce7ab7b480823af0f96524e9d78abab1b042c00fd74f872a8df9e9014a3ab1db28492b750e8ecc8150f6519c3190b7ef297837597b72b64f999a
 DIST pyo3-macros-0.23.4.crate 8852 BLAKE2B ba5722fd52e47aa4dc2e89bacd69326bd98943a1670ebeab08a2e9e8070a0975ebbe928a0bce8b53a700b65294fee2b00d2a1e6623a0c48ac15902cdbfcb7a97 SHA512 c36c9005db5a4b48b5fda881130f4e7da8eef46e2c363c395ccca3fe476e0204d98c2a832cd03c787fb37a2664fadd42bf8f47de71eb44d055754ab5766af934
+DIST pyo3-macros-0.24.0.crate 8850 BLAKE2B 7470b3c8af49c3da5da979a08051d549255ed2bbf1e77e2e186ed43daa832ffe51c28c732e5d390effb8662f66c5c138a517a07cd0e90a73a4476e9d018eefdd SHA512 e949224b6ff3368f4594eb946859afd777efc43ca9fd436e176eef9d4549bd7428d04cee55ea8af02c8cb066dd9396a405de5ee6290a966ee52a0f1c64fd2749
 DIST pyo3-macros-backend-0.23.4.crate 70912 BLAKE2B a428c732f0b17d9a8f620d0e8d58469f2cba339c8a8307393ce252a7860808e5d50e6bbf711cafd0635c844f4b1d48e57db4dd99ef7b5e3d97d6f760164278e9 SHA512 2fe670fbf35724f489cc82f38d3f7c1e6aa15b087a2674b7a68b562572f9bb00cbb7746cccfcb62d0861a18f6d24c5739273c8302d1662a161142f4a6b532b6f
+DIST pyo3-macros-backend-0.24.0.crate 71998 BLAKE2B d3cd57fdf2a8b0f750d8f00fa36f32b95f9f13adf9453e0823fec0791ae99af018db6e596205ff9f9f555489cec024e23eb19c53379c09381c0cb209d8a5a695 SHA512 58b06343fa03b2b7aacdafcf219865bbb5b80cc2b28fdf16133a7d43fb7723cd83718e067bf6e01f96b94738bb83cda87d4ac2703d8d59588708d938df8e66eb
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
@@ -66,6 +71,7 @@ DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470
 DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
 DIST setuptools-rust-1.10.2.gh.tar.gz 303901 BLAKE2B 163513eac052461f387cf27645e43f7c57ea3a850e8871e1e9d1485cd514ad45fdd4bca99917f72b5907069d81f00be8285a6f46c7f6a812f1989901cc865a49 SHA512 0e085ffed62085fc342bf3c5250ac3d4c5c1a7e84cf57694745b7f6361fef469e2c4e8b6226924b55201adca79c6279f20e9cf4283e0f9595aad9ac6dfe602f7
+DIST setuptools-rust-1.11.0.gh.tar.gz 304819 BLAKE2B 89db587872c729892583e3f2d62dea0cd6d42da7944b9645e4ff3b309069007dde36143299f836a48771ca6b52f24c25c00d3e530f74abed63bed2f7f07c5537 SHA512 debce91fe4f966563eadbbaec9bab3f05894235e353fd780b3c863c7420792d80de78cae259b72ec151b5066620084f21625deddad457b67753143e0a8488af2
 DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
@@ -74,6 +80,7 @@ DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
+DIST target-lexicon-0.13.2.crate 27923 BLAKE2B 0761f0ffdc23b9c9df86b384d59611c7b8b5e29ff068f03367ad2fe84cfb6d11e1af149b9338236978e9566fedc51387db9f239d2a602db41045ac3db907faec SHA512 d25e3cc3d679cb6b6f24c03e0c24db9d6ca31b8ed42ac9531bd7637557fbba225a6c8ac4f68a8eaf3569195814d599e668a968afbc73b940a77cbc27552cc90a
 DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
 DIST thin-slice-0.1.1.crate 4484 BLAKE2B 7efcd3c30dd24c22641139288b0c530ffe56dd82f26c2c31f557f1fa09ced695cf12b645fa6bc4c12324af0b9b05792a9cff422b6deee3bbb06b57a7cec06f47 SHA512 27b9e6b2a8485b3f89f659d80d67ccb96370f3371996e39f97784c40bdd7fef5429fb96f48d9c045eec5906051708f169fe4ca8f5f546a25e5f6859cafa42925
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.11.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.11.0.ebuild
new file mode 100644
index 000000000000..f0ab55e70001
--- /dev/null
+++ b/dev-python/setuptools-rust/setuptools-rust-1.11.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+CRATES="
+	autocfg@1.3.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	convert_case@0.4.0
+	cssparser-macros@0.6.1
+	cssparser@0.27.2
+	derive_more@0.99.17
+	dtoa-short@0.3.4
+	dtoa@1.0.9
+	futf@0.1.5
+	fxhash@0.2.1
+	getrandom@0.1.16
+	getrandom@0.2.15
+	heck@0.5.0
+	html5ever@0.25.2
+	indoc@2.0.5
+	itoa@0.4.8
+	kuchiki@0.8.1
+	libc@0.2.154
+	lock_api@0.4.12
+	log@0.4.21
+	mac@0.1.1
+	markup5ever@0.10.1
+	matches@0.1.10
+	memoffset@0.9.1
+	new_debug_unreachable@1.0.6
+	nodrop@0.1.14
+	once_cell@1.19.0
+	parking_lot@0.12.2
+	parking_lot_core@0.9.10
+	phf@0.8.0
+	phf_codegen@0.8.0
+	phf_generator@0.10.0
+	phf_generator@0.8.0
+	phf_macros@0.8.0
+	phf_shared@0.10.0
+	phf_shared@0.8.0
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	precomputed-hash@0.1.1
+	proc-macro-hack@0.5.20+deprecated
+	proc-macro2@1.0.82
+	pyo3-build-config@0.24.0
+	pyo3-ffi@0.24.0
+	pyo3-macros-backend@0.24.0
+	pyo3-macros@0.24.0
+	pyo3@0.24.0
+	quote@1.0.36
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.4
+	rand_hc@0.2.0
+	rand_pcg@0.2.1
+	redox_syscall@0.5.1
+	rustc_version@0.4.0
+	scopeguard@1.2.0
+	selectors@0.22.0
+	semver@1.0.23
+	serde@1.0.200
+	serde_derive@1.0.200
+	servo_arc@0.1.1
+	siphasher@0.3.11
+	smallvec@1.13.2
+	stable_deref_trait@1.2.0
+	string_cache@0.8.7
+	string_cache_codegen@0.5.2
+	syn@1.0.109
+	syn@2.0.61
+	target-lexicon@0.13.2
+	tendril@0.4.3
+	thin-slice@0.1.1
+	unicode-ident@1.0.12
+	unindent@0.2.3
+	utf-8@0.7.6
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.52.5
+"
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
+HOMEPAGE="
+	https://github.com/PyO3/setuptools-rust/
+	https://pypi.org/project/setuptools-rust/
+"
+SRC_URI="
+	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		${CARGO_CRATE_URIS}
+	)
+"
+
+# crates are used at test time only, update via pycargoebuild -L -i ...
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${RUST_DEPEND}
+	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_test() {
+	local examples=(
+		html-py-ever
+		namespace_package
+		rust_with_cffi
+	)
+	for example_dir in ${examples[@]}; do
+		pushd examples/${example_dir} >/dev/null || die
+		einfo "Running ${example_dir} test"
+		esetup.py build --build-lib=build/lib
+
+		case ${example_dir} in
+			html-py-ever)
+				pushd tests >/dev/null || die
+				local -x PYTHONPATH=../build/lib
+				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
+				popd >/dev/null || die
+				;;
+			*)
+				pushd build/lib >/dev/null || die
+				epytest ../../tests
+				popd >/dev/null || die
+				;;
+		esac
+
+		rm -rf build || die
+		popd >/dev/null || die
+	done
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 2f413a823494..8a9a2a399bc4 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,2 @@
-DIST setuptools-75.8.0.tar.gz 1343222 BLAKE2B a71cba4c11ede52aae24e8a8045f2733f93001b896ea4dd46ebdfa0dd639fccfcc24b038cf4f9b6363b768e98d66cbeac2331cbcd4bb38767ea73f1811a11837 SHA512 4afa657c5259f9f405c39d82d8c264236749861ba2b104e8b26dd49da8ffb27ad3089ea894f2bb65208f480d7a4042114b93228f1cf2b224dc248774d7681a3d
-DIST setuptools-75.8.1.tar.gz 1343534 BLAKE2B c68a054bbb9367416b9c801d330699f96016e5e22459dfd833a8d1f62d908473f3909083261e8fe41c2ac0cbbdd571800321ad133c4821837be618cb46c8b5cb SHA512 6177074601f10b4d1eff52aa9be80eb52f4f2fc74f0e54d10d556a0812b2de9568ab9d7bc3692fc286b54070728fe41c41d2271403403d0d757733fe2ac74a8f
 DIST setuptools-75.8.2.tar.gz 1344083 BLAKE2B 7d4dff2c0948bb411ef5f70e5f5f91bc0e230b155a97419d263f88e54a94390fd7dcadad14105f4d886a25024bf4c95e776ae7b25e4b1d6f17e45e6060b99da2 SHA512 adf7f5d2eab7621b03c86e3f96857b176631108dc8a0eba2b16b87e394bff0b607998bc24cc074cd3f7b0ed6dbe0bd753cce5af2f108fce2473fb50b22f32913
-DIST setuptools-75.9.0.tar.gz 1345084 BLAKE2B 6c8f6aafa89f8c1098132941e9f8d46571e9c9a9dc53de11cba0c9731420e65016fdd5d1ded6d66aaee3b6d0fff10f49ecf1d8ba82aaa560e864967dc73e79cd SHA512 e5c633e0684e1d2b4e030b91da25515ee696ad1d971d907498a0b5ccba940b69d27488f62eac08ea1c54fade1e96578e4dce9b7a9213ab202bfd5e1c46bbdbaf
-DIST setuptools-75.9.1.tar.gz 1345088 BLAKE2B 7cd34173283a5bf79fd0cb9f60af1a072726c43bdee2bf3fb7227183eef2064f13e936acfdba27a8564f14f510dbc6f6ed4f1deef2f6be22426a82739bb77687 SHA512 a79009f5ef1e5d7de8a54f4052d6ebeb76371501974dad264fc079056c5b98f73e21905008d6b9dbd49a4b5b88f70dcb839d7a08221fa8c8b6531c6fb7a1c509
 DIST setuptools-76.0.0.tar.gz 1349387 BLAKE2B 4293d1b0719c70c17bde8b6091f394420a300175b787f0a1aa5a42cc81b4dfad186f1d0927b32124f37f78a730a049e16cfd87dbc71fa1ed5c1bb632634ece84 SHA512 8272f0f2823d8f093d24eeb12270f978dab52d1a609c08275248024decf2b47bc5b1ce352f22ea198bd93eb3375c829757e573921721e05f5269651669df9b2e
diff --git a/dev-python/setuptools/setuptools-75.8.0.ebuild b/dev-python/setuptools/setuptools-75.8.0.ebuild
deleted file mode 100644
index 63744a3af599..000000000000
--- a/dev-python/setuptools/setuptools-75.8.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.8.1.ebuild b/dev-python/setuptools/setuptools-75.8.1.ebuild
deleted file mode 100644
index 85474085b864..000000000000
--- a/dev-python/setuptools/setuptools-75.8.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.8.2.ebuild b/dev-python/setuptools/setuptools-75.8.2.ebuild
index 85474085b864..63744a3af599 100644
--- a/dev-python/setuptools/setuptools-75.8.2.ebuild
+++ b/dev-python/setuptools/setuptools-75.8.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-75.9.0.ebuild b/dev-python/setuptools/setuptools-75.9.0.ebuild
deleted file mode 100644
index 85474085b864..000000000000
--- a/dev-python/setuptools/setuptools-75.9.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-75.9.1.ebuild b/dev-python/setuptools/setuptools-75.9.1.ebuild
deleted file mode 100644
index 85474085b864..000000000000
--- a/dev-python/setuptools/setuptools-75.9.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index ac6115f715a1..ed06110686fb 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,2 +1 @@
-DIST sh-2.2.1.tar.gz 345105 BLAKE2B f788bb73b9a348caf98053147dd28133abd90e68c5398d7d285034d1ef7426f89b47dd4ef107ff2c692994f73453cf00e16b23c95c2dce821829165b2a4dfcf6 SHA512 42036749a1a036be9d984e945f6f5b42360d52d3f49cc5520ea3622873cbb121caf447ad1be65498a28e3d226398dccded139d17d4763fc2b010ceb54c50d3a9
 DIST sh-2.2.2.tar.gz 345866 BLAKE2B dcbfcb257b1c1e7ea57f41aa4207b5d16506c134f503a967f99102ce44ac10b1681369325ebefbb5b64e47b26f52a65bdac3fbd5e89071f321caf72e5a2fd056 SHA512 7235aac25d5f88320f27cf0f5a87ab4e8585e3585aea21d87e927745cf8e255067d0557f865695956b947fe084b28cd5d8ce97102e77cfc9483b39a9eaae23d7
diff --git a/dev-python/sh/sh-2.2.1.ebuild b/dev-python/sh/sh-2.2.1.ebuild
deleted file mode 100644
index 1d0305f76e0b..000000000000
--- a/dev-python/sh/sh-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="
-	https://github.com/amoffat/sh/
-	https://pypi.org/project/sh/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
-
-python_test() {
-	local -x SH_TESTS_RUNNING=1
-	eunittest -p "*_test.py"
-}
diff --git a/dev-python/sh/sh-2.2.2.ebuild b/dev-python/sh/sh-2.2.2.ebuild
index 3b7e6d863f02..1d0305f76e0b 100644
--- a/dev-python/sh/sh-2.2.2.ebuild
+++ b/dev-python/sh/sh-2.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r2.ebuild
index 4afddd7fcc1f..da33908ae93c 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r1.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 13ee56912d30..605d4fb1f3f7 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-doxylink-1.12.4.gh.tar.gz 24425 BLAKE2B 04c3a9fef624d87b5f9b756dde6bd9a12acfcefb5331ebaa9a97267b0a8389b96676f996bbd8817c0e4096aad693e711527e4981f8a035e70a4abfd26834b53d SHA512 6b1edef1e78635d30fba34abe6f6cfaadf9e941a50c2c13790da848300289938e1f9eafdce5a820e68ff26f2975a14945ee1c43963074343858daa34c16de513
 DIST sphinxcontrib-doxylink-1.13.0.gh.tar.gz 25389 BLAKE2B e834d6cfa5f369f6c32f3ccc527b26d97d51ec3d2bf168a5687ea21b86057ee24804c8e53cf3df1e56076cd43b09cfe5443dc9423eb490d6a32d7f169fd59a37 SHA512 f4df39c5d63bc19ce01b16bb614b3a624f768ea883621167ffda6c724cf8ef296ecfd37179d3f3849f4a953cc9e7d72085507eb8f2313a4dfb992b19c434921f
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.4.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.4.ebuild
deleted file mode 100644
index 714325ce3417..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/doxygen
-		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
index 0065aecfec5d..714325ce3417 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.13.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index 41290b406627..801533beb01c 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1,2 +1 @@
-DIST spotipy-2.25.0.gh.tar.gz 117172 BLAKE2B 1d8c8a286e8849b0799c66f94a2137f16b0e636e9b7ff37e19047cc7d41cc8c7183a0f6b0c73834c0746b562f4d8192a3c5d1343cd70c7d5796c5c75ca0ad0e2 SHA512 2406eb445976f6cf54ce78a92739c18453415bbf330c40f255c2ab8a4734874051d38c329b044659723da7843bc06600ffa656c9d679a984390bf16a75e2fa72
 DIST spotipy-2.25.1.gh.tar.gz 107750 BLAKE2B 5814a831d81f94f112fe9312fc508497275d7780d41250f807ea7b72cc555511ee883ed8a0ec3b3d21c6f13b7facb462b9380a478866f0d90d52dd31b1e5d2e7 SHA512 1c9af1f8a07d111a719d4f9646ccc8fea21d86325221c0395fdfe155a1ed2b588dfcf5c9e958bf3ecc286033117f7cc3061f975a046788e11a1cea4f9e2a927a
diff --git a/dev-python/spotipy/spotipy-2.25.0.ebuild b/dev-python/spotipy/spotipy-2.25.0.ebuild
deleted file mode 100644
index d4bd777f8e84..000000000000
--- a/dev-python/spotipy/spotipy-2.25.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight Python library for the Spotify Web API"
-HOMEPAGE="
-	https://spotipy.readthedocs.io/
-	https://github.com/spotipy-dev/spotipy/
-	https://pypi.org/project/spotipy/
-"
-SRC_URI="
-	https://github.com/spotipy-dev/spotipy/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/redis[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/redis \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/unit/test_oauth.py::TestSpotifyClientCredentials::test_spotify_client_credentials_get_access_token
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/spotipy/spotipy-2.25.1.ebuild b/dev-python/spotipy/spotipy-2.25.1.ebuild
index a4eb765cae4b..d4bd777f8e84 100644
--- a/dev-python/spotipy/spotipy-2.25.1.ebuild
+++ b/dev-python/spotipy/spotipy-2.25.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 6b080d714b8c..4d3b7ce12994 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,2 +1 @@
-DIST stripe-11.5.0.tar.gz 1386601 BLAKE2B 009cd3d273a009d20ec46f7d1875212cdee92514f9735a8474eba321d92f2fed9d55ea946feecf1aaf0e456dd76c5cd651eccaad8c68838575e7655940b75e5b SHA512 2f18732d59b92b9d17f4f3b728c8457dc10457d7a2c53d80ff1f770c09f77b7d7d1627ce51f4bd37432bc41b1aab5377eecc0adaa735a6b3f45f2193e0acf4fb
 DIST stripe-11.6.0.tar.gz 1390405 BLAKE2B 0a630201e0c85d1c456a02f18c1383d8367e8980485cf20ab62fbad2a6a6f0612b2199626de1e7f5cefb477e7dcc07777d2af095994de04805fcba206469f6cd SHA512 f92978feef4083cb1a662da44101b9b670d442c141921f29b93a551a36d641faccdff60499115a4b8a0c62b74498403ad3ac7f04c4b16992f3cab5ee498cb25d
diff --git a/dev-python/stripe/stripe-11.5.0.ebuild b/dev-python/stripe/stripe-11.5.0.ebuild
deleted file mode 100644
index ee5e6f67a58b..000000000000
--- a/dev-python/stripe/stripe-11.5.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.192.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_http_client.py::TestLiveHTTPClients::test_httpx_request_async_https
-		'tests/test_integration.py::TestIntegration::test_async_raw_request_timeout[asyncio-aiohttp]'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-11.6.0.ebuild b/dev-python/stripe/stripe-11.6.0.ebuild
index 865cef97ef18..b652190db5b5 100644
--- a/dev-python/stripe/stripe-11.6.0.ebuild
+++ b/dev-python/stripe/stripe-11.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 6711b74640e0..1cd3c8b45a18 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,2 +1 @@
-DIST trimesh-4.6.3.gh.tar.gz 13622877 BLAKE2B 156424ebfe41fee80fc67ed099e17e72c83d86912056b6ec0ac0fba336109eede793dd998e4133d3df3903f7426f6b5fb05db7a4ed9cde554a9e57c3e300984c SHA512 b5e614e8846b9534af545aa1d8e9ba5f5c694e0c86ef46a7f40fcd186cc6d36a52d3fcae8313b021a38a74eacc21e41189f6dbfce7397a2d5abd94b7b5ec8c3a
 DIST trimesh-4.6.4.gh.tar.gz 13624427 BLAKE2B b61caf9a08f219bd0dc7f6f55262dd798d3ce7c56e7a9daf3486365ec8b035b19c63f1d99ddc68ecfa9e940480e2f4307229a4fb8371e75a583f5cf8d9c29db0 SHA512 2f52ea216d448fbab32938f905137df6aac593f88343672e0e93a808f2dfece8eb477e82185c0d1150245742f2c4bb4be8c704757e428cba87f528dc1ebdb3d7
diff --git a/dev-python/trimesh/trimesh-4.6.3.ebuild b/dev-python/trimesh/trimesh-4.6.3.ebuild
deleted file mode 100644
index 71f4a8bbad96..000000000000
--- a/dev-python/trimesh/trimesh-4.6.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/charset-normalizer[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	dev-python/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox-earcut[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=1800
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires manifold3d
-		tests/test_boolean.py::test_multiple_difference
-		# timing nonsense
-		tests/test_bounds.py::BoundsTest::test_obb_mesh_large
-	)
-	local EPYTEST_IGNORE=(
-		# require pyinstrument
-		tests/test_sweep.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox-earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.6.4.ebuild b/dev-python/trimesh/trimesh-4.6.4.ebuild
index 9a55e3b051f5..71f4a8bbad96 100644
--- a/dev-python/trimesh/trimesh-4.6.4.ebuild
+++ b/dev-python/trimesh/trimesh-4.6.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/dev-python/trio-websocket/Manifest b/dev-python/trio-websocket/Manifest
index d513a693e69a..88cd0b9f5faf 100644
--- a/dev-python/trio-websocket/Manifest
+++ b/dev-python/trio-websocket/Manifest
@@ -1,3 +1 @@
-DIST trio-websocket-0.11.1.gh.tar.gz 45682 BLAKE2B 0f926421828476c9e23cf962df7a17a2cf4470e0898dddbc4690497521205ea11973a188ca460685739d08c34be237682b0bbbbe2c279d35e5c2fdce9b3ce020 SHA512 4b0eb6f0c012cefedb69b97e9452ba979336fbe9f154799c4c68871b8013e728374e4872a2343ab4d27fa6e25e40c3063e681e80470123d37f13f531be4f6644
-DIST trio-websocket-0.12.1.gh.tar.gz 52699 BLAKE2B 01823d61a633339a89ed5295d2a82c842ff6e46ebf27cc3e99e7136e3d12458f22d2ce088f6389b10609528a3bc7685b1de440c6f188e23eec53fa40ee13226b SHA512 5b7b3f696f241e341e8a0217ddd3395c281a7e4ddc6dfcf3106333df50777af12fe63e55035e29bdfce306b16af680d0f648058d86ea7bf53d5f9adefc0beb0c
 DIST trio-websocket-0.12.2.gh.tar.gz 52738 BLAKE2B d20f159c5596d6a784d08f5010fc0d08aab254005abb15d8f6829923750b53327aabf77a072b428edfdac27647d6a170e595660ebeadce1d62dd5f6bd5ff5739 SHA512 220ecac499de12c77f4004c739154380ad8dd05570e43512549d9205515f7d9dd7aa085248b1373fae0c690bd1ce7df757332abb5fe6edfbe2ee74c33834ef49
diff --git a/dev-python/trio-websocket/trio-websocket-0.11.1.ebuild b/dev-python/trio-websocket/trio-websocket-0.11.1.ebuild
deleted file mode 100644
index 1c65a49d5106..000000000000
--- a/dev-python/trio-websocket/trio-websocket-0.11.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client and server implementation for Python Trio"
-HOMEPAGE="
-	https://github.com/python-trio/trio-websocket/
-	https://pypi.org/project/trio-websocket/
-"
-SRC_URI="
-	https://github.com/python-trio/trio-websocket/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/trio-0.11[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception tests are broken with trio-0.25
-		# https://github.com/python-trio/trio-websocket/issues/187
-		tests/test_connection.py::test_handshake_exception_before_accept
-		tests/test_connection.py::test_reject_handshake
-		tests/test_connection.py::test_reject_handshake_invalid_info_status
-		tests/test_connection.py::test_client_open_timeout
-		tests/test_connection.py::test_client_close_timeout
-		tests/test_connection.py::test_client_connect_networking_error
-		tests/test_connection.py::test_finalization_dropped_exception
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p trio
-}
diff --git a/dev-python/trio-websocket/trio-websocket-0.12.1.ebuild b/dev-python/trio-websocket/trio-websocket-0.12.1.ebuild
deleted file mode 100644
index 4586c359be27..000000000000
--- a/dev-python/trio-websocket/trio-websocket-0.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client and server implementation for Python Trio"
-HOMEPAGE="
-	https://github.com/python-trio/trio-websocket/
-	https://pypi.org/project/trio-websocket/
-"
-SRC_URI="
-	https://github.com/python-trio/trio-websocket/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/trio-0.11[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-0.14[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-trio-0.5.0[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception tests are broken with trio-0.25
-		# https://github.com/python-trio/trio-websocket/issues/187
-		tests/test_connection.py::test_handshake_exception_before_accept
-		tests/test_connection.py::test_reject_handshake
-		tests/test_connection.py::test_reject_handshake_invalid_info_status
-		tests/test_connection.py::test_client_open_timeout
-		tests/test_connection.py::test_client_close_timeout
-		tests/test_connection.py::test_client_connect_networking_error
-		tests/test_connection.py::test_finalization_dropped_exception
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p trio
-}
diff --git a/dev-python/trio-websocket/trio-websocket-0.12.2.ebuild b/dev-python/trio-websocket/trio-websocket-0.12.2.ebuild
index 4586c359be27..1c65a49d5106 100644
--- a/dev-python/trio-websocket/trio-websocket-0.12.2.ebuild
+++ b/dev-python/trio-websocket/trio-websocket-0.12.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index ff227a8c5bc4..39751f13005c 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,4 +1,2 @@
-DIST types_setuptools-75.8.0.20250225.tar.gz 48448 BLAKE2B dd7ea2540369df155f466c8d0b5f8b01070c1a6824ca21eff68f6a44506fb6bd2c98d4609eb9247dd0f42cbf831c2ed093f2d2aac3e81094626e734d6bbdaa9e SHA512 12d8b695c2cf4655c7cab771eac4a0e11253ed6b1d4b6c5dc57fa23c5eb6f6e365bb674ad84cdfde7d77b2128eca28c9f4f5f9f68c6d559e63e5c2d9e445949a
-DIST types_setuptools-75.8.2.20250301.tar.gz 48468 BLAKE2B c880369fc2545a8b3762cce89f3d441d8576f5a74f77eb14fb5772b7528d7f6ea8e6590e2b9d49a9311d20d45ea98ae1889cd828d7e2795e7680e6c58c248fce SHA512 60261095cae1f3f3ca26981ee4f914d9d5aca7f5ed62318180655ce062b8397b3808ae2dad0b423c5e30832509909a1e8267e4c47c96366ac75b491fb18f8b58
 DIST types_setuptools-75.8.2.20250305.tar.gz 42609 BLAKE2B b54727f3dfd7ee554c35052b9edd2b598cd13b78de6fbf30fc2e95d3c01557e4e612869dd81828f52e982b4ac17a188bfd1c5c49f44e3ce00db019a3624bda40 SHA512 610b26a0dce431815858a2ed89a1be32127916d6b6aa9e4fa38aee45d5f416780a7ef38dcba5dd97f7e3958b580950dc2cbb75378d69cf1e6d611fbc7d00a526
 DIST types_setuptools-76.0.0.20250313.tar.gz 43627 BLAKE2B 49a7f30037b7a8a43a53d257b6af29270e965138bb020673fc8d33b609a10354371d750adf65de1fb3de8c622d51e7d7d0cd7ee222f368f76282a994eac7d179 SHA512 7aeb6d5db438a0c5f30aa410717a0cd8a78e7d7540aec03fbc1962618e47495b25e7d17fd5eb59d263b4913862838b7d698dc3d8ee63dc1268f41782c40fa349
diff --git a/dev-python/types-setuptools/types-setuptools-75.8.0.20250225.ebuild b/dev-python/types-setuptools/types-setuptools-75.8.0.20250225.ebuild
deleted file mode 100644
index aa7e65d38ab7..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.8.0.20250225.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-75.8.2.20250301.ebuild b/dev-python/types-setuptools/types-setuptools-75.8.2.20250301.ebuild
deleted file mode 100644
index 4d6bfa0439df..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.8.2.20250301.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-75.8.2.20250305.ebuild b/dev-python/types-setuptools/types-setuptools-75.8.2.20250305.ebuild
index 4d6bfa0439df..aa7e65d38ab7 100644
--- a/dev-python/types-setuptools/types-setuptools-75.8.2.20250305.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-75.8.2.20250305.ebuild
@@ -13,4 +13,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2025-03-15 18:55:58 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2025-03-15 18:55:58 +0000
commit	58cb2b2362108a7f1f9906079c86e9fb28e88e3a (patch)
tree	a578463cfa782b6dbe5dbe88ef8641fada5002dd /dev-python
parent	2a91a97565fe6cce21a172c72f23935a18adf4eb (diff)
download	baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.tar.gz baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.tar.xz baldeagleos-repo-58cb2b2362108a7f1f9906079c86e9fb28e88e3a.zip