Adding metadata

198 files changed, 848 insertions, 4450 deletions

diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index b8271e8d7902..0653dd5f2260 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,2 +1 @@
-DIST aiohttp-socks-0.9.0.gh.tar.gz 13590 BLAKE2B 1fb13b8607a9245d872d0ad45f50860492132c661d1a0f52fb846e56568d784f1545abab8f08bb2bd633460033f85982c80979c880841ccc40bcc0b2ae3f2ba4 SHA512 c19b8325270cbb660d9200e84c34a4c753097cdb282397bc31261c7082e184c947cab7821f63d326881f0ac4bb4104a813ebb8fc2b3df663f8891da246f0c789
 DIST aiohttp-socks-0.9.1.gh.tar.gz 13699 BLAKE2B 9d6f86fdb767b286f72b6b6a9c7c7abd5a4ee05f52bfe5c94830ee477a12cd1c97572e31acdb05ca8ea0d70a5a12bd23afff7b946859e7de3fa8ce4cfdafd18e SHA512 dd4f5c2a8a7c7af6d46293fd0213fedd3f75c0cf36b96c776aa05f7e1433d2032c7927f1b10cf74d801e5e294bd0cde066562abcd8b196aeb0e1c58a88de0423
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.9.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.9.0.ebuild
deleted file mode 100644
index 35fbf054f509..000000000000
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.9.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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS proxy connector for aiohttp"
-HOMEPAGE="
-	https://pypi.org/project/aiohttp-socks/
-	https://github.com/romis2012/aiohttp-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-socks-2.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/yarl[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/tiny-proxy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild
index 8c92513ab68e..35fbf054f509 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-3.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index ac94c1999ff1..e243b3a49208 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1,3 @@
-DIST apsw-3.46.0.1.gh.tar.gz 912632 BLAKE2B b2c89def11102a00dde64fa7d7546f50e302dfe4219394d3d6ddd7f66fec455a60689db61a94230f7ef9578069b08ecd826de82b4e8b019107b9a0b6a36c4271 SHA512 894cf6c49d608d9d8eff369dcf42dd3b2f5174cd98a2c471f41773e2c1474c13d31f08402d053fd0869acb5c038e26543caa345d205c46bd3b3ec6aaecda5089
 DIST apsw-3.46.1.0.gh.tar.gz 913223 BLAKE2B c0ad61e61a97471ef677ffe80f3f91e6520c95f8cece225a8086884f34de497714892e4ce0ca375f2ec66f48b8ecb4d38dd5ebdb57cd94050ef5eaee20d5d3ee SHA512 3cd81ceab03dadf10d9c10d645d33b962ba9ec55075bb193eb076f458dde11d5c5c6ec087ec31fc96d011ca1b339a9ffe07cb5d660b8205f6f156baaa0b18c81
 DIST apsw-3.47.0.0.gh.tar.gz 1633544 BLAKE2B a84634948c760cc8e8d6be83b1667ff86c973a1e8c52172d5f91852d42fd25189b367357f0eb0cb3b7b3868b21553e5258427da0958b5c117e05e55c3496a2b6 SHA512 4b90c7f13dbed9015ce1b7215c9dd6d8889433917e123bfac642f271dfec1d8be929b41fa530e867ec4f068a8c4fc337a82043811e8afcb707b187a46db7e176
 DIST apsw-3.47.1.0.gh.tar.gz 1647701 BLAKE2B b40fe83b86ce618234876eb5fad4ae7558d9d360913b7eada60e7ddb2057882cca1c491d8f5893727186b9efe27217f160d0ddf49cda7e547f223fbe63092720 SHA512 520434f89cf3ea317ed2cb9d1746f358d9da4cf136ffe3c8fbf19e27698f8a01ad3d56a90c758c5d7d77e7662fe44898d63f6b2f1c438861054d141dff12128f
diff --git a/dev-python/apsw/apsw-3.46.0.1.ebuild b/dev-python/apsw/apsw-3.46.0.1.ebuild
deleted file mode 100644
index a0cb04531bfe..000000000000
--- a/dev-python/apsw/apsw-3.46.0.1.ebuild
+++ /dev/null
@@ -1,51 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 5c4c179a6f63..99f34b682901 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1,2 @@
-DIST argcomplete-3.5.0.tar.gz 82237 BLAKE2B 7a5acd6f1311ec153333363e207037634b6901cca1415bd68d8e009888fa8cdfdfc3a50189f14c5da4bddfa5c861bbc009cf0d34248ff168caaa6ebad6ad8a7d SHA512 89c305a97b0808301976a48f9c8cb914e7cc12e33540cebd1c6514bbed8017db27b2232e3526abb74fe4f152f23c211be5a48aeafd63bbfca2dcc42f92b4877e
 DIST argcomplete-3.5.1.tar.gz 82280 BLAKE2B be4467ffae1fb5f6e433e2f80c43e33cc455883c7e8962d2add7dabfb8d6415daa9fc67538c394d4582828faf5036ceaaf8b1e158457529574405aa72ce51d8d SHA512 478680a65f2786f9bca0fd598a3c0d938759f8aacaec5506a08875dcd73fb0e13f3446d6500c694bb1943ebb65fdfd1544a51364c8f79d44eb02eb06294af9cc
+DIST argcomplete-3.5.2.tar.gz 82341 BLAKE2B ddc118d562a742bda9f552c62f9b873010c7d660267d606a46ae98453384bf2c9ebc90b5fdaee675f65cf9a9c27a8d5fcc2484e9a54d83d6ac0e51f67ef60766 SHA512 6c852b8cf81d0dc174c8053b5d8310fe716d8491380e7d98018c5788d83a4c01167963d6e713b30db892090e7140e19be092d35f2c8137292ed48c98fd835e8e
diff --git a/dev-python/argcomplete/argcomplete-3.5.0.ebuild b/dev-python/argcomplete/argcomplete-3.5.2.ebuild
index cd11eeba7e74..3e9d949f06cf 100644
--- a/dev-python/argcomplete/argcomplete-3.5.0.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.5.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index dd81c62cd77b..46d88baad7da 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1 @@
-DIST serverless-application-model-1.92.0.gh.tar.gz 5761362 BLAKE2B 57546b2996795a8a53ef678b790bdd7fe313c5d012ba40be22529e133d15687b095d95ad905db66ca663d885a0d28b9be4d660f6227fc2fede13baf3a5951035 SHA512 a5ac0e4489f75ca0554d9a0d0a7a4f2439fd14224a2bcd1bb6e21717684a4c5e5e204c7b3eb67f9264aceaa30d47474affba7357e4006a2250a870392e67411c
 DIST serverless-application-model-1.94.0.gh.tar.gz 5784510 BLAKE2B 11e21c28253ede80e43730a3e885a0dc88f3020a9864c82e78b3daa1bfb57624bde911e4a66419e941c60394f467c094704d3c0eb365992c3fa53aaa2de5e285 SHA512 c1fa136bf96877db477dfed0a7024d77733cad3f7101b40a38f6386cfca8a9c25c0d4121fb1caa706b4bf879e2161c5009442e9391736e1d03777f20320f5bbb
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.92.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.92.0.ebuild
deleted file mode 100644
index f63dd4cbeb10..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.92.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
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 multiprocessing
-
-MY_P=serverless-application-model-${PV}
-DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="
-	https://github.com/aws/serverless-application-model/
-	https://pypi.org/project/aws-sam-translator/
-"
-SRC_URI="
-	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/boto3-2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
-	<dev-python/pydantic-3[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# so much noise...
-	sed -i -e '/log_cli/d' pytest.ini || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AWS_DEFAULT_REGION=us-east-1
-	epytest -o addopts= -o filterwarnings= \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.94.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.94.0.ebuild
index 4419fad76380..f63dd4cbeb10 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.94.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.94.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
diff --git a/dev-python/bcrypt/bcrypt-4.2.1.ebuild b/dev-python/bcrypt/bcrypt-4.2.1.ebuild
index 8b0af5f4bbc6..71370aa2480b 100644
--- a/dev-python/bcrypt/bcrypt-4.2.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.2.1.ebuild
@@ -64,7 +64,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+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/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index a1b3291cecb1..1090edd4ebd5 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,2 +1 @@
-DIST bibtexparser-1.4.1.gh.tar.gz 97146 BLAKE2B 8040532fe2153ff6ec664631a11b4f61548f99198c565bb554d0fe09d1fa54ee368c08be72bf7e86c5b6ca696deb0210496d4772243a05c5c9b28d73f52e6dc5 SHA512 f8e8f911eac38e98362bbbeff5b4af986e426911db9c54e93ec4a4eee1b1ceed630222c1a51454639566a6b5bad60c86a70b882a1c05084927fcbe7315e837ce
 DIST bibtexparser-1.4.2.gh.tar.gz 81042 BLAKE2B 4522e46c371ae66af933ff6edc3cf1ce37336597c815facd8bbc62cc5b976c66bce45563af18f15a62c5ddf8ddda1bfbfa986eb16f21544aafaef3e22883cf4d SHA512 7aa58cb50c42773b8ae6d0448f817e83cc7445b8e65806430df17f9956219f440116cb227825da3423b40a5815921d1e42e407b236f6e917b3713eee5b8a989b
diff --git a/dev-python/bibtexparser/bibtexparser-1.4.1.ebuild b/dev-python/bibtexparser/bibtexparser-1.4.1.ebuild
deleted file mode 100644
index 1ad87eca9a1c..000000000000
--- a/dev-python/bibtexparser/bibtexparser-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A BibTeX parser written in Python"
-HOMEPAGE="
-	https://github.com/sciunto-org/python-bibtexparser/
-	https://pypi.org/project/bibtexparser/
-"
-SRC_URI="
-	https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( BSD LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bibtexparser/bibtexparser-1.4.2.ebuild b/dev-python/bibtexparser/bibtexparser-1.4.2.ebuild
index 7ebc86b69888..63d30c36bd2e 100644
--- a/dev-python/bibtexparser/bibtexparser-1.4.2.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-1.4.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/pylatexenc-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c40dc757aa62..c9409b8ace6d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,3 @@
-DIST boto3-1.35.63.gh.tar.gz 891481 BLAKE2B 092f4380aa31e57b3c8f6ef41ea8f0a4272e55f7a71762a532f338482f08782a11d57bdbc9af3630348706c4009bd0d3cd56ef4b2f1394d2d003638717cef860 SHA512 4deab7682b0f4d80a4aa12a8660b7263908411bd8f38692f9fa8820c6a18a4ecc3443e7524794282a0c0f38a4b94a1d09b6737e84ff3e01b9c8ac93abca2a9ce
 DIST boto3-1.35.68.gh.tar.gz 901189 BLAKE2B f7449998af169c873319d7b8748035db72c3af7be6499453c9fe61f40cbfd724dce7cf003fe700f6046f43c887768f4c26dd52e491f5734a5ec55c5b54e360c0 SHA512 24582ed20764870e2491a2dc48869089ebc4371a279eff68827ce3a6a962568fc1738e52285fa89a3a846385b498bb233460c1d0ae3177d735ad20b2cef7fea2
 DIST boto3-1.35.71.gh.tar.gz 903019 BLAKE2B 48bf56c54a8eaa52c1850078a92cef7e5acb06f2d9d551414d640c6f5c5f381f2edc4ae6f582d9c1578f68d78a272142033bd41caba95577af917a492e995edb SHA512 56df8d30c0d3efc71caa6d629354e1311d944c71b5568b4154fc93c315558d600e4411ccc80abca98cb4a3adf3a3ab4f4dbce22ca06184e11d720f36f33b58d2
-DIST boto3-1.35.72.gh.tar.gz 906195 BLAKE2B 42fa9727d0d35eaa2ea61580538923da30d57e2569dd2ff0b75a2f19ee29b0e5745e93724bf5145296794ee2ee51f3abe1bad017435e68ce9f12c61ccfd3bdf7 SHA512 c54bd53eb6c7753a310dfa26fa9080d5331b0e5ca4cc87c32265f045a615b406e2ace93e41301c6039108ea5be4aa5fd826b875b63253ca4b8c2f8c5892f7bcd
-DIST boto3-1.35.74.gh.tar.gz 908732 BLAKE2B e8e25f5a349956ebe12e80e3170b6cfb97e1e4ea166877f349191667098ae42775d2d37158470d90c41844f3ff2ddd37f40a533c7b18bc2a46dc5d21a14dc986 SHA512 86311657423cc06004268e66750037d0ea91518db156ed7712397afa66c701350b96c5ad32ead49936231e9e196a686dcaefbec8a90b5168450977ed77532486
 DIST boto3-1.35.76.gh.tar.gz 910113 BLAKE2B 3e7429976b348e29ba4184bffe03c643b85dd978cc520b924263e8430b5e5935b95152cced2f6c0807c65de4e6e1405c55bb24565ac5bc425292e9adac178c03 SHA512 132f37e77b7b36d525e9cf678fe2f624eed77a9eb9fa8e7d7f079a362e5d7a5f3edcd17c7d8bc1e27570171927d26e74a94d267a1b0cbddda3890ac6a0f21cdc
diff --git a/dev-python/boto3/boto3-1.35.63.ebuild b/dev-python/boto3/boto3-1.35.63.ebuild
deleted file mode 100644
index 3a10a36056b1..000000000000
--- a/dev-python/boto3/boto3-1.35.63.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.68.ebuild b/dev-python/boto3/boto3-1.35.68.ebuild
index d91ce27598cf..3a10a36056b1 100644
--- a/dev-python/boto3/boto3-1.35.68.ebuild
+++ b/dev-python/boto3/boto3-1.35.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.72.ebuild b/dev-python/boto3/boto3-1.35.72.ebuild
deleted file mode 100644
index d91ce27598cf..000000000000
--- a/dev-python/boto3/boto3-1.35.72.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.74.ebuild b/dev-python/boto3/boto3-1.35.74.ebuild
deleted file mode 100644
index d91ce27598cf..000000000000
--- a/dev-python/boto3/boto3-1.35.74.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 3ce066f7353a..6cbb79819555 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,6 +1,3 @@
-DIST botocore-1.35.63.gh.tar.gz 13692343 BLAKE2B 41ded808c412e9af8f938cf64db1632478f77d082417afac1f34905e946c0459545afa46854a41458090eab26a32b2733fb164f374455d8bdefea35718182632 SHA512 7185f5a288f848e1f3810ab9fa4eb46467321af6bdd345a8de623722ee513ab89f43303955487b014a3c349ed69a62c7bdf54e5095c3f4ebfd254fab51443ca8
 DIST botocore-1.35.68.gh.tar.gz 13887015 BLAKE2B f49ea77be07628c9c0a471a76b87bc2b2e0371afdfdaf6da2ad39fdc828376dff14681167a2989b440f37fc5754dae12c7160cb14fb82187acbcf07e34647fc3 SHA512 e31ff9022f29e4cacd9c6085e9c8741d799986746e34965c37e12d8ecfc3a5f4fed8e14045e9ce4f2f552f31d07641ffe8a0209d9d220b942e1b54c2e0d0f848
 DIST botocore-1.35.71.gh.tar.gz 13908196 BLAKE2B beba990a19a2a6de3a10d9acd9f97c79872548a5c2bdb2e0944d69292efefd171a0f2e2c989da1551f07902f35b9530984cfe037ff6a9ac9168f9fc5dc5105d5 SHA512 e962cd711e8a9ee6df4e58b3bab22b5e9ded2d75d89fcabd50476789270af50513dcdd4eaeba9f7f778cb9055b4b0cadde0e436cdb1ef333b4322c9f128e910e
-DIST botocore-1.35.72.gh.tar.gz 14003906 BLAKE2B 8d02bed4b6b39ff29ce981ed9bbca2acd1261c4d2514373ef299b6809126de90162c489dbece90e75e45e679bed2b5febaa5f48661b01168ed91a73f94ed5506 SHA512 b5b3941fe6bd0b8c150ca1443170c554314853def35641865479228d510cfc306b6ba5f70ff24c98ec34d3edd8c5da168f7351e6631c6df6837cd0f8b9f4f607
-DIST botocore-1.35.74.gh.tar.gz 14071251 BLAKE2B 13ac404c0b25a812df9638cc3a90d3ee36517b616da98315f9aa4b62a39c6c11076b23fbf45d250d13b15aee284b48ee90860b2d71c8edc6c6326d554110a5ff SHA512 185e038d5b0c204a12febc36297377ba92fa7ea91f56d084d7191f298a5eb333fb5fd059feca041055dbed3104381efae3aa9d575f489153e2d292dcee86ddb5
 DIST botocore-1.35.76.gh.tar.gz 14117270 BLAKE2B b072b926daae520e54871676d5afc4832ddbc8c91a2ee15f103a9d48df2e17d8cef304fab28c4050bfe6d70629979c48d8bc00d5caf42a0129a19ff5a3a2baa3 SHA512 e7433d60519a0da5118b3283c192a7199e8bfdd605fc6bb98d05cc90485a1e4aec537a035ffc08bcb6c35e9d31394422596e113a98cc00c23bd3dd350577ac1d
diff --git a/dev-python/botocore/botocore-1.35.63.ebuild b/dev-python/botocore/botocore-1.35.63.ebuild
deleted file mode 100644
index c81d932a2d78..000000000000
--- a/dev-python/botocore/botocore-1.35.63.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.68.ebuild b/dev-python/botocore/botocore-1.35.68.ebuild
index 7816e9efeb52..c81d932a2d78 100644
--- a/dev-python/botocore/botocore-1.35.68.ebuild
+++ b/dev-python/botocore/botocore-1.35.68.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.72.ebuild b/dev-python/botocore/botocore-1.35.72.ebuild
deleted file mode 100644
index 7816e9efeb52..000000000000
--- a/dev-python/botocore/botocore-1.35.72.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.74.ebuild b/dev-python/botocore/botocore-1.35.74.ebuild
deleted file mode 100644
index 7816e9efeb52..000000000000
--- a/dev-python/botocore/botocore-1.35.74.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~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/btrfsutil/btrfsutil-6.12.ebuild b/dev-python/btrfsutil/btrfsutil-6.12-r1.ebuild
index 09e67b23a429..cb12978d77b9 100644
--- a/dev-python/btrfsutil/btrfsutil-6.12.ebuild
+++ b/dev-python/btrfsutil/btrfsutil-6.12-r1.ebuild
@@ -44,3 +44,10 @@ src_unpack() {
 		default
 	fi
 }
+
+src_install() {
+	distutils-r1_src_install
+
+	rm "${ED}"/usr/share/doc/${PF}/README.md || die
+	dodoc "${S}"/../README.md
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 12f037bf4174..a9c868dc478c 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,4 +1,2 @@
 DIST cfn_lint-1.18.4.tar.gz 2788919 BLAKE2B c9815d61450d6afa6f054a305b90ceb14a2dd72206834fb64c8e51017cbcf02843dc83e909d1db0dfb183d7f059909a9b794e886745bbe48cac42dcf2c109150 SHA512 fc8ed928fa83d262000c141805734c788559f2ed7ad7b1b989771069cd8972c04dba67a8c4823cceb35ad70db19e28c5f36093cf42f86b232f35eeba8585c89b
-DIST cfn_lint-1.20.0.tar.gz 2879582 BLAKE2B da387ad8c8f7425c37106976a9dafe205206559971d847b897e245e283b3cd13179e7033b3e32e0b764b75b1b3d10d23764f84700d4e857fe727a3681b1ff1b2 SHA512 724d1f6ac67d9c1f975f8716d1df1a5ee9f8674a1f3851dad3ad0f5bead8226212012aa3d258ce1cb477904fea6c91c59f6b28291fd846de80fa1c7b3ea1d90f
-DIST cfn_lint-1.20.1.tar.gz 2799223 BLAKE2B 3accc016e5ce688e5e9200247b8d8361c6e367a60c3e8d3de38db079cc6516b50ce6acd773185f89b68b9302ace88eaaf380dbe564b12b43e7b5721509c4e70a SHA512 75d19d65b562737121a4bdca430f177e80a10f685f4cda78c0189ac26fd8bba3c5eee090e8ebd2146f08dbc47d9c24783dce6d89de1ae2712cb2f831e235599e
 DIST cfn_lint-1.20.2.tar.gz 2734631 BLAKE2B 1935793ad1438f5fc4f217390541b476192ab68a6d1614d7322eca1981b7d3712d85c090394eec2e8d2f2c15bb3798a148987613a3fe71fdc4355a57bf31a836 SHA512 e327e703cd96cd1d4d9342525cdccde3f11373ad5624a6a6b9ba16f76fa1b12be83b8f6a5118c0ceb947dada7a5bd30f8bf6434f4e61cbfc8bfa0dd8cf49ece9
diff --git a/dev-python/cfn-lint/cfn-lint-1.20.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.20.0.ebuild
deleted file mode 100644
index 2d14898895cd..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.20.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.92.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.20.1.ebuild b/dev-python/cfn-lint/cfn-lint-1.20.1.ebuild
deleted file mode 100644
index 2481db200741..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.20.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c349b276c950..f89bda64845c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -10,4 +10,5 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.5.src.tar.xz 141243716 BLAKE2B 228fc66ab688abfc16f31b2cd83163b81ef61604ace21eab69a1776f0dc88cbe8fa831162205849e5be3975a214136399572b4ad1b908986e37b2d38a1a7fa5d SHA512 648854e9c91fdcc5c677ce3800e046f2060b998a45cf9f7eebe02898431b3924f9348b6fc366102cd4fdda72dcb8f32076f98aa69927e0e20b3f1007fba10b22
 DIST llvm-project-19.1.5.src.tar.xz.sig 438 BLAKE2B 1d40a5c5405f99ef86e3360f9ea153afd1ae4001697210fd799a988113e8a3cef39e2c4794edd9332f384d8490f4ce2ab6bee6d98f794f84775807f833b81c0a SHA512 a438c86ce882eb1ac3e50842937068794ed162bb1b7ded68a2fe3ec2ab4f57cc38aee667cfb46afe6da22eef7ed1cb65820a473f63bd5a0dc6aad41df7bfad54
+DIST llvm-project-32f7f0010bca99ee4bd917f57272733fb2bf3bd9.tar.gz 223983502 BLAKE2B fd3e6b0b795abc42568ef98fa774d927029c18838a5d0f34eaa66c37976444a63f2fc5d883f3bf3a98533f51e387936f1c659230f31c757d26153425696a16cd SHA512 65a345ad5b77c627008f759947e5e9f28a62c8992d7146113e0446e5849feaf9088c15c8b22ca0824af5b927d6a417f5326258b489fb8ccea78ec9e0e0fe8fba
 DIST llvm-project-a348f223cab54b21a7b1c38dec7bc6aa2f81c949.tar.gz 223630067 BLAKE2B 3c2121a8d13e3a84a9ee98d17c58e5fd5a31d5870ac21c633c78c49b4af0c401310f7e91f64ff3b7cf7f6e8d205c730458b8b1101b1255f422659974d48e2ecb SHA512 33cc09a904e4fe0d529611a1d71d764e6d49f014cea903aadc0755d0420f65cfc763fdcfd4bb9a96adad79ce1c4475d8c005dcac37c4fe130a1fb3665172f1db
diff --git a/dev-python/clang-python/clang-python-20.0.0_pre20241207.ebuild b/dev-python/clang-python/clang-python-20.0.0_pre20241207.ebuild
new file mode 100644
index 000000000000..0cb38ead605a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-20.0.0_pre20241207.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index d0bc93540efa..3f10b273c99f 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,2 +1 @@
-DIST cliff-4.7.0.tar.gz 84250 BLAKE2B e49cb9b5e05ab37885df47b80489e41eaf7662cf39ce61bdcb545a6ef5496b786c94c60c2164af15ae9536af7a9841e723fa62091300b28a49beed8945941dc0 SHA512 f1e6a28fbedb911efae02a3827f019411b99afdc316fcb07b115ca2157dcd23bbcce72d2d63b9850bb5b1cb21a4787575528a26d178943f7aba2a125ed9b55e5
 DIST cliff-4.8.0.tar.gz 84206 BLAKE2B 91cee5b9b7233cf6d3df3dd07aee6f2aaf75f31a40d47ca8e3a15de713c82ed46344e5d5b05e304035fe418db99eadea54f535b6da8f56d4823c23e7db6cf422 SHA512 226b1f29adbe941b5c281db4bd37d0e2b195f1126b2944dd79c8766cb85deec79eaeb1b511d0964b7426fa02ef952e65e1e48c16d7566e24e4aaa8509f6e5cfd
diff --git a/dev-python/cliff/cliff-4.7.0.ebuild b/dev-python/cliff/cliff-4.7.0.ebuild
deleted file mode 100644
index d3c97ef3a517..000000000000
--- a/dev-python/cliff/cliff-4.7.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.8.0.ebuild b/dev-python/cliff/cliff-4.8.0.ebuild
index ecb1ae81f6ae..d3c97ef3a517 100644
--- a/dev-python/cliff/cliff-4.8.0.ebuild
+++ b/dev-python/cliff/cliff-4.8.0.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/cmd2/Manifest b/dev-python/cmd2/Manifest
index 7488c14c5dcb..41ccaff6e457 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,4 +1 @@
-DIST cmd2-2.4.3.tar.gz 678661 BLAKE2B 806fbd6abc26737032dd6330ebabc1e5308e9082f9c98002845a54f1458d314feb476e4d491892e74cde16f5043c57495426ad50aaf3e7e8d0d938f0388db6e2 SHA512 1d440752262f38a742069e636373884edcc49c17ba17b21b24015cfe559b4df36b45ac9489f2f643897fbd38f54b8e6120daf07ef25d2f209af8a4ac8e4c0085
-DIST cmd2-2.5.5.tar.gz 689948 BLAKE2B 60ffb516b4b410541281a34647b904a41e2fbbff96dfd6d896fd11a66385469606c3f7c27cbd7aa22c0b84af3c9db8e5facd2fe394608ab4294b2c95965837bc SHA512 b83e76ddb101b1f30239ad60bd00c75f9fbe67ff70b5758f7e9c9d4519f7916667b0eb87c75dda9c06295de74b6827e5dd218f5fb124893c32b43dca3fb1ef42
-DIST cmd2-2.5.6.tar.gz 690006 BLAKE2B 600e12c97914ed473111e9d7739c20a7a1c9dfb2f26c503ee988bf1010450c1f97fe16c2c95efd7cdd196ee4e4539043c54c510be0c3da6560ed4d4822131230 SHA512 f5c9b416b112b70d0aca08961a8ccdac2912b32e0f67e7c925010ac91a0a55a403bce055b2ec770aff560e3f7f706b15f30915fd983494957f1d9ae58980572e
 DIST cmd2-2.5.7.tar.gz 691584 BLAKE2B a43f22817cd028913d1ec49150d826e33ddde1037c2cd1bce066d9ee85c20e5f59daa1b7d5365968aa7f17e3709bd7a58e586c449415ea93f62b157df08eb366 SHA512 b230b7fbad97bdba28a1335839e13c711ef629b0c18c1773c24c64a34626217659e1c362e8d72d71726baa06c50ba3f89732860eee8e527d1485de17e0eeacb7
diff --git a/dev-python/cmd2/cmd2-2.4.3.ebuild b/dev-python/cmd2/cmd2-2.4.3.ebuild
deleted file mode 100644
index 082a2957b477..000000000000
--- a/dev-python/cmd2/cmd2-2.4.3.ebuild
+++ /dev/null
@@ -1,59 +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 virtualx pypi
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/cmd2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.5.5.ebuild b/dev-python/cmd2/cmd2-2.5.5.ebuild
deleted file mode 100644
index c2aa8ea01106..000000000000
--- a/dev-python/cmd2/cmd2-2.5.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 virtualx pypi
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/cmd2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyperclip[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# TODO: tests_isolated?
-	epytest -o addopts= -p pytest_mock tests || die
-}
diff --git a/dev-python/cmd2/cmd2-2.5.6.ebuild b/dev-python/cmd2/cmd2-2.5.6.ebuild
deleted file mode 100644
index c2aa8ea01106..000000000000
--- a/dev-python/cmd2/cmd2-2.5.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 virtualx pypi
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/cmd2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyperclip[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# TODO: tests_isolated?
-	epytest -o addopts= -p pytest_mock tests || die
-}
diff --git a/dev-python/cmd2/cmd2-2.5.7.ebuild b/dev-python/cmd2/cmd2-2.5.7.ebuild
index c2aa8ea01106..06e3f73d0f1b 100644
--- a/dev-python/cmd2/cmd2-2.5.7.ebuild
+++ b/dev-python/cmd2/cmd2-2.5.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyperclip[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 274e0399c7e5..8f7fe609377b 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,3 +2,4 @@ DIST coverage-7.6.4.tar.gz 798716 BLAKE2B 2b89e05fa71b18d94e19e9ee7acf3cea4125aa
 DIST coverage-7.6.5.tar.gz 799549 BLAKE2B f571b32e3b7e6168e0e132bfec82a44e2897c6a7e381d3df77ad41bfb0afafea4ae32969841329b2b37a3db2bfdcd0ce9ba208fb350396db762168e1e968196b SHA512 8d7cb585d100080db239c05c2a1d09de9c9da0b2372616d9b6e7f52becc1273df347abd7568fce20dc18357badc6ba12e30255bc39876768b3bf32365f1900ad
 DIST coverage-7.6.7.tar.gz 799938 BLAKE2B f780fdefcb9a9610384646ede95acaff27d1a27a6fcefdcf092baac6134c0731914c10c195fce966282c33b06f45d4fd404b275cb797d6bbbae681ad6abbe916 SHA512 73b4cf99eb17b2615e5c70488ee219d25e18c0484dc5e53dbaba459486b6b2308c60adfc4acf9093c258e5914729dfbbf21401a871ce6ed3c01bf95912261fc0
 DIST coverage-7.6.8.tar.gz 801425 BLAKE2B a1bfb660a0e079411c13d4fca28863085c6010cb696b4e0dd7d06686313baea1bb25c91373b095630854d737fdf003fd8ced67e91e356d807e2b9b4fc903398c SHA512 1d1aea6fba8511ebd0db1a5f528dccf79d40280b8f8a0531dfca293611346df2f82dba974a351a3ea1a17e648b30ea7ea6689cb646c56de84ac33778362b4b4c
+DIST coverage-7.6.9.tar.gz 801710 BLAKE2B ac3a28d939e5ad7af341e8ef6ac2021ce9aad14117a4f6a31ae68432a0d55c2721c0f99a5e4fec40d4f2bf293e1cd549533643d3f1d6dd20997955614c7eb987 SHA512 ee2e3f93dfd723dabe3c88bac888c056f8dabc890d9078c49393d01c21522d946f7f6d50565a978dfc1d5b8009eca612d9a102a86f568689adc85df8478ecb8c
diff --git a/dev-python/coverage/coverage-7.6.9.ebuild b/dev-python/coverage/coverage-7.6.9.ebuild
new file mode 100644
index 000000000000..5f3cb4e3c7fe
--- /dev/null
+++ b/dev-python/coverage/coverage-7.6.9.ebuild
@@ -0,0 +1,102 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_CORE=${1}
+	einfo "  Testing with the ${COVERAGE_CORE} core ..."
+	epytest -p flaky -p hypothesis -p xdist tests
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+		# broken because of pytest plugins explicity loaded
+		tests/test_debug.py::ShortStackTest::test_short_stack{,_skip}
+		# these expect specific availability of C extension matching
+		# COVERAGE_CORE (which breaks testing pytracer on CPython)
+		tests/test_cmdline.py::CmdLineStdoutTest::test_version
+		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
+		# mismatch of expected concurrency in error message
+		# TODO: report upstream?
+		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
+		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" coverage/ || die
+		test_tracer ctrace
+	fi
+
+	test_tracer pytrace
+
+	case ${EPYTHON} in
+		python3.1[01]|pypy3)
+			;;
+		*)
+			# available since Python 3.12
+			test_tracer sysmon
+			;;
+	esac
+
+	if [[ -n ${c_ext} ]]; then
+		rm coverage/*.so || die
+	fi
+}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 0269341b8b83..ccb767b18193 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,2 +1,3 @@
 DIST dns-lexicon-3.17.0.gh.tar.gz 6200497 BLAKE2B 8f423d4d44517b3186ec7f5cfc5d1e0560d4c98360f8a9d6caab429e0b0e5abe8ee42545b0d7c4cdaf1e2a6a9af41b095198144fda386a207f4f98c7693bb2ba SHA512 1bc182f5881d6acfac72b84331ba50da1219178d274c92e532ed11e73aa79696681d28a002cd1e23f48590953f48e50b62c2ef2db020a07ecf88547717508c0c
 DIST dns-lexicon-3.18.0.gh.tar.gz 6216871 BLAKE2B df41467a253cf56c2dd5c127c431973fc80bdca4c174fe84649227d897d7b4612219ca5dc2ad66ae7dc75f626ddfd32aaa950b5cea699bfbb7f05c9a5bda7f40 SHA512 da2804caeef6cd96eb53f7414833757905afa269f328271fccbdb06d988fb46695a0cb917b8dbdfb66579b01cc98d07de8eb7e1cb132c47d49fe05e2ebe18127
+DIST dns-lexicon-3.19.0.gh.tar.gz 6273456 BLAKE2B e0c47e8657b6c2724b50423359200cadac52434a31cbfd9c628ee5dd5cc3cd8779f4b51bb7522a308df90489f30aeec0a0ee44dcc850e5766d0f6b7d25b617f6 SHA512 4efc8864f073ca895a78eeedaf091f8b19df497caa9d8f759d051ac6e91c34e0798b0f7440cad601da62e4115a9abb596660255a8b02096959bd50411d5768be
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.19.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.19.0.ebuild
new file mode 100644
index 000000000000..539fd0620364
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.19.0.ebuild
@@ -0,0 +1,72 @@
+# 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 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="
+	https://github.com/AnalogJ/lexicon/
+	https://pypi.org/project/dns-lexicon/
+"
+SRC_URI="
+	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/beautifulsoup4-4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	>=dev-python/pyotp-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2[${PYTHON_USEDEP}]
+	>=dev-python/tldextract-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/boto3-1.28[${PYTHON_USEDEP}]
+		>=dev-python/zeep-3[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	tests/test_client.py::test_client_init_when_missing_action_should_fail
+)
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	tests/providers/test_transip.py
+	# Requires the "oci" module
+	tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	tests/providers/test_auto.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/dulwich/dulwich-0.22.6.ebuild b/dev-python/dulwich/dulwich-0.22.6.ebuild
index 0658934eeeeb..0bdccb043ac3 100644
--- a/dev-python/dulwich/dulwich-0.22.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.22.6.ebuild
@@ -51,7 +51,7 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
 LICENSE+=" )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index e7612a089f10..c8534b346343 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,2 +1 @@
-DIST setuptools-75.5.0-py3-none-any.whl 1222710 BLAKE2B 40359574a10a14fb6fdef3a5f5a1febe61446ae1510a96236f0cf93d7cd4dbf3c3904bd77729d0877bcceed3d4fc55bad6e1a6eba9800cd4bbe9a394a829b81f SHA512 3caee919ed5f352d6ca92d648f438c4a18a42cc3f4e1bbfe58dfa43e86ebcc9345476c2119c165d0aa07353e1a4e6c9fbc296d2e41d089084395f13678e80096
 DIST setuptools-75.6.0-py3-none-any.whl 1224032 BLAKE2B 7a91cf811611082234c0d4d52970f81126c5908f6ef1fe8455e33870c6872d86181447bdb052e21a145558cd259983e73b6e18128a7d9f42478c716816c74394 SHA512 2c80b0bbcfa0d09a8a380b60ef9512d387129fba233e1aab83279caa5ca53ecc252f060edaef9ed00eb6d79312cd10fed82dd2491b723d50940828d1766aee89
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.5.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.5.0.ebuild
deleted file mode 100644
index 894ea82f77e4..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.6.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.6.0.ebuild
index 64e13c4313a1..4d3a3181338a 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.6.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.6.0.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-wheel/Manifest b/dev-python/ensurepip-wheel/Manifest
index 293ab7c95416..667251597183 100644
--- a/dev-python/ensurepip-wheel/Manifest
+++ b/dev-python/ensurepip-wheel/Manifest
@@ -1,3 +1 @@
-DIST wheel-0.44.0-py3-none-any.whl 67059 BLAKE2B e02afce5ad38a1cccc19b67acca74d3c43e0b45f52f334d28102d71ed8ffff5f0749f0ffa49c26d8eb89ce63f0a240c33117593b7807c6797fffd1e6daf6fc87 SHA512 98209d3ff1a04fd50ae256b94a648deb9ff29114e90a632c0fc34304c9f8a904b000f66019c684e228f56900e51105fe8678dc9c1bbcdd9ec69dd28d8e98058a
-DIST wheel-0.45.0-py3-none-any.whl 72497 BLAKE2B ab83fa3a1dd36fb44791dd2277252c9ad71d69c3bb0913e29c9f92f3b3335074ab517c307d6f5030c5873f241f076f66035c1330d655ceb677847ccbe55991f4 SHA512 c24d09819cf081025f1abd896bf53efa86f459e37668ce2537f22d27b071b4bca931c532ef3c0526bf5e2804b403b7475c50c05b50cdb829ea579847f8dd9a38
 DIST wheel-0.45.1-py3-none-any.whl 72494 BLAKE2B f87dc394465368d06eb57c1697d45250ac3e04a15841ab018b1fc5ca5bb8eaa731108c61e6e2a018b6d2a6fa3ea66e5b182d6041c5143d03f7b2b92bdb2e71c6 SHA512 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild
deleted file mode 100644
index 5900daf1ef10..000000000000
--- a/dev-python/ensurepip-wheel/ensurepip-wheel-0.44.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared wheel wheel for use in pip tests"
-HOMEPAGE="https://pypi.org/project/wheel/"
-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"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild
deleted file mode 100644
index 03e848400d01..000000000000
--- a/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared wheel wheel for use in pip tests"
-HOMEPAGE="https://pypi.org/project/wheel/"
-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"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.1.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.1.ebuild
index 03e848400d01..5900daf1ef10 100644
--- a/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.1.ebuild
+++ b/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/faker/Manifest b/dev-python/faker/Manifest
index 7b5bc17f99e2..e0b9c21fe585 100644
--- a/dev-python/faker/Manifest
+++ b/dev-python/faker/Manifest
@@ -1,3 +1,2 @@
-DIST faker-30.8.2.tar.gz 1808329 BLAKE2B a9788fdf875bf57e76de33478cf6ebb81a6cc94b9261f5226ea9a797e2d8332a0c9035896b03e86f741b630312872c10678b34dee11d92eea00b9b37d719944f SHA512 4db0352155b724890986c5b1ae59783fed7cd6a0aca289f6df2065c028cd0b9e03560faee60f2b75455e51c212819bc85ddf10c13351e774424fce6f553636be
 DIST faker-33.0.0.tar.gz 1850076 BLAKE2B 3a1dc9fff3a45af023cc14c7cc89b8db93faba2de9e4f03a6d04b0bdc37d8271d1e0a7aa4347c5327c80ca95dc490f6fd86e1ab4c0ebee6644505e980d2c7f63 SHA512 8c74093f91121cf8beb63a6b59a99c783be21c58f2788fe83dfb670b16a334f358ca13e65aa734c0ea2c0e6fac863e37116c1ff456eb2b96fe079d4f53059150
 DIST faker-33.1.0.tar.gz 1850515 BLAKE2B 71ff6e379f195f220af96562daa1876cd0476f321bb881091929b82ce576b30aa6aa11444411eb5cad30d1922fcfc940012f8b3cd36d074defd3336eac5f8a4a SHA512 0a24af11d64588de2a6c22844efcac11eeacc74faf439e4c0e4bca2cd8d3723177d8fdf5e3b0c6286776e659e38397cea80024ffaaae09c17067ae9b13ea983d
diff --git a/dev-python/faker/faker-30.8.2.ebuild b/dev-python/faker/faker-30.8.2.ebuild
deleted file mode 100644
index ebbbc03e6941..000000000000
--- a/dev-python/faker/faker-30.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-# note: tests are flaky with xdist
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/faker/faker-33.0.0.ebuild b/dev-python/faker/faker-33.0.0.ebuild
index da73871f7d48..ebbbc03e6941 100644
--- a/dev-python/faker/faker-33.0.0.ebuild
+++ b/dev-python/faker/faker-33.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 5d7489f5e8d2..54f798a6edcf 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1 @@
-DIST google_api_python_client-2.153.0.tar.gz 12059322 BLAKE2B dec9affc093262984d9f050dbc55a746d9747c6069b54a85edf14ad037b732ba614e4f0c3dfd0ef678f79aec598625ccd5ce80e942870999f5f0c147337e261a SHA512 c4066807e2e6096b90f6cbe51c20919429abd7c9b25fcefbdd849e290335d926e2b190ad3e61531681589176bbbb72c77f53858687bfee040b1dda36f92ffef3
 DIST google_api_python_client-2.154.0.tar.gz 12070143 BLAKE2B 91b2838116246e04fc93a155fb27792a2efa6e258eeddf29989c62229db7975b389435efeb6342d069358797539c57ea630c7bf7da64a0cdef7ceb4801586a85 SHA512 9728f4cda59919ddec28876f27b6e7716d96c9ba08088f064aa1ac0e0a4ccd1d7ad66e592ac8e2429f04520b64d8228fd3d358f7ae7d157048c9719fcb7b8cd3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild
deleted file mode 100644
index 2727f2d53b96..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.153.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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.154.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.154.0.ebuild
index 595a1e3cbd88..2727f2d53b96 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.154.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.154.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/httpx/Manifest b/dev-python/httpx/Manifest
index 1ed867dd415f..44bd16e5da49 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,2 +1,3 @@
 DIST httpx-0.27.2.gh.tar.gz 2185609 BLAKE2B 7e77cab0e9bda032cd595549e43dfc102f90bb8668b62f6b1f0df6bce6b6358f34aa1f51457a315eb774dde8c76083d180c02ff45283dd348c39b4a659307713 SHA512 c7852ae3e982bacee1587b66aed506f3f7e12caf296e651d3cdd9c111a7d737af49473be455bcabccc8e52487ad18b4821ea56b39500c3b77ed2325fc55505ae
 DIST httpx-0.28.0.gh.tar.gz 4117883 BLAKE2B 0fa645a5767355d4c29d7eedb137c73ddf620ddb7b2b84550f6538fcf9e9900b27bcd91d7177392f6490db3cd6db92e1b7b6ab62e19e97b4a4a8cce0d72c65d9 SHA512 2b3a3a84af81dd130ad574e87369769c8cd76fd40793dd41032e89d2632f25468dcf7ae7279302cd0b3d32dafa9f4c17b7b4c9eae81b5dd7b9fcde1daa26e844
+DIST httpx-0.28.1.gh.tar.gz 4118011 BLAKE2B 76c24a3b3618798d5b65aaaa87ee583f9debf8cb7866204a3e12c151179d9f69a6ad23198c9ee7df61058f73b6ca84f453c3bced25a60f583d7b3ad7681839bb SHA512 5571957a3516533f1c1e76f311316811f6365e192d19ebae10c9ab0d0c4094d811063fd2be2995f3b6a41d6899a7882f27265badecf238a4f7903f976136d3ba
diff --git a/dev-python/httpx/httpx-0.28.1.ebuild b/dev-python/httpx/httpx-0.28.1.ebuild
new file mode 100644
index 000000000000..67fa1df86a6c
--- /dev/null
+++ b/dev-python/httpx/httpx-0.28.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2022-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 optfeature
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="
+	https://www.python-httpx.org/
+	https://github.com/encode/httpx/
+	https://pypi.org/project/httpx/
+"
+SRC_URI="
+	https://github.com/encode/httpx/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"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/anyio[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	=dev-python/httpcore-1*[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+# httptools cause tests to fail
+# https://github.com/encode/httpx/discussions/3429
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+		>=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/trio[${PYTHON_USEDEP}]
+		' 3.{10..13})
+		!!dev-python/httptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-0.27.0-opt-trio.patch"
+	)
+
+	if ! use cli; then
+		sed -i -e '/^httpx =/d' pyproject.toml || die
+	fi
+	sed -i -e '/rich/s:,<14::' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local args=()
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+	)
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	if ! has_version "dev-python/trio[${PYTHON_USEDEP}]"; then
+		args+=( -o filterwarnings= -k "not trio" )
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p anyio "${args[@]}"
+}
+
+pkg_postinst() {
+	optfeature "HTTP/2 support" dev-python/h2
+	optfeature "SOCKS proxy support" dev-python/socksio
+	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index b75cabe07c66..dcc798babb28 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,4 +1,2 @@
-DIST hypothesis-6.118.9.gh.tar.gz 9487943 BLAKE2B 3c8d17d2763877107c7342d9a9825cb733de91ce6c99c88ed7536ac0e82d728f54d762c9b26cb02d742c470afc05c2798fb20e1f3c6f52d3b9d0e2c9cea9e99a SHA512 ba4f32892088a3a4d1a3d9ca2d28b9828cd7e2f4c4878733943f34f431014d4ba4dfe07729878b4c87cc295b6d6f219094c1f774ac115acd3b375ecc3c58d580
 DIST hypothesis-6.119.4.gh.tar.gz 9490666 BLAKE2B 99a45054b90026317bca165915b2ffe3b3abfa03a98efc6181bd64f6ca851f9a90e4ba1b41ba4f3b2181de02818a91367f1c29523b78bca303da4eea31db1284 SHA512 003b01fd3e1e4ae2ea68f72b80063928dd56a069fdf8b6ffc73f6ffb3db4b048523564bd616d604d04a3ea55b19c01940ad7ba60bf1e88c54e29359ca0e397db
-DIST hypothesis-6.122.0.gh.tar.gz 9492529 BLAKE2B 1ee9d13b3d12381d84252c5e810b975705e534852a68eef4fa77462719ca33ecd161897cad84786dd2cc4d6bdd110e79fa16ef3b4690c97f13a236c3c8ad8787 SHA512 297766c88b52b0b45113715edbffec0c4d9ecf2126bc367b53f7de50ddb66a255660f9ed27ae7a680012f28f153f0070ece5fca657f521eadd8ebee6b83acdc3
 DIST hypothesis-6.122.1.gh.tar.gz 9492677 BLAKE2B 66f89d2388cb34e5df95bc73af69259c8460b0508b14b07b99d749443be44f0c43b20bfb1d2edddf844e97f18b20e98ceade1dc66d08ecfc8403fdb6f9a461dd SHA512 27e3fca0510cc4267f3ec4df112937fc1e06331d1498f0db1815912a6eaacd3fcb07705aed84db1f03212dae3bd3d4902071070c81694f9ae2df1a03d4964c14
diff --git a/dev-python/hypothesis/hypothesis-6.118.9.ebuild b/dev-python/hypothesis/hypothesis-6.118.9.ebuild
deleted file mode 100644
index 4591dd7bb202..000000000000
--- a/dev-python/hypothesis/hypothesis-6.118.9.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.119.4.ebuild b/dev-python/hypothesis/hypothesis-6.119.4.ebuild
index 737f4174ad91..4591dd7bb202 100644
--- a/dev-python/hypothesis/hypothesis-6.119.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.119.4.ebuild
@@ -25,7 +25,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.122.0.ebuild b/dev-python/hypothesis/hypothesis-6.122.0.ebuild
deleted file mode 100644
index 7d8a0e518f7a..000000000000
--- a/dev-python/hypothesis/hypothesis-6.122.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-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
-			)
-			;;
-	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/icalendar/Manifest b/dev-python/icalendar/Manifest
index 77304e2ad45a..c48f9066c818 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1 @@
-DIST icalendar-5.0.13.tar.gz 119371 BLAKE2B ab0673af636b76682f1b0409df4333511c9cb19623dbdc639d84f46dcb9c14580ebfc1ea0465aa22b729852d5eaf76b12aa76041d189bcb3099f205caf43fac4 SHA512 df688298acc0bf3cf25aa08b16e149abab696e44540f11695a654065b90316189460481bde17d68e7c6760c1c4bfbbc74e9d7c7e3e640b5a1978d2c6faafbb78
-DIST icalendar-6.0.1.tar.gz 98425 BLAKE2B 7f528b4f4be9ddbc3b3de5ed6f34c074d8dd43647e0d229941ed9f2fd7bbfd5ed4e44685b0ad9657c61aaa018153ebc370f2ca8fd56cb22e3b36a31d6671b696 SHA512 cc9806dd16f3b1fef875ffaac8e1d543e5ee6b133f4399d5ae8644500f63076a10f0e2fd7703c37b84bf0369e1a57b616b0c9b3f24559e4be944d821c83f1200
 DIST icalendar-6.1.0.tar.gz 142307 BLAKE2B fb5b6e6c337aaf4f18b1d2237d3523cbd4502e61255ee3d3de0f335ca90da384119c1cda5843b455f3eb93540c17d9448a3745e6a09e27b35158b26ab6f7e01f SHA512 dbab2542371d038060be9e9d2ecccdf6db7d51c4ca80515e02798db1a0f96fc9b4a7eb8e098831d7da97c2c8ba715da2836badf872a0d5c206299fb78923b864
diff --git a/dev-python/icalendar/icalendar-5.0.13.ebuild b/dev-python/icalendar/icalendar-5.0.13.ebuild
deleted file mode 100644
index 7fd890640b2c..000000000000
--- a/dev-python/icalendar/icalendar-5.0.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-6.0.1.ebuild b/dev-python/icalendar/icalendar-6.0.1.ebuild
deleted file mode 100644
index 53a1aad83d02..000000000000
--- a/dev-python/icalendar/icalendar-6.0.1.ebuild
+++ /dev/null
@@ -1,43 +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="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-copybutton \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-6.1.0.ebuild b/dev-python/icalendar/icalendar-6.1.0.ebuild
index 8f7da42dcdaa..65932d72db2d 100644
--- a/dev-python/icalendar/icalendar-6.1.0.ebuild
+++ b/dev-python/icalendar/icalendar-6.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index 989bd619b8b1..ffb3dd8b4740 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1,2 +1 @@
-DIST immutabledict-4.2.0.tar.gz 6165 BLAKE2B 6176a186e8108134f3e54e8d98712f2f825f3750685da72bb654b0eb2a1c75e87f6c8bf95dc6c4c06b2da68b4fa541fde32f2988735bf93cf57f772a29c8368b SHA512 56be1239ea8161e54744a7bf5d17c0cc29410d7a7327fe97b3290f9e566dd19f662bac0e4e9f3c060cceece0df5d39638bf4258f3edfcf693f7f9b2bddc1d6b7
 DIST immutabledict-4.2.1.tar.gz 6228 BLAKE2B 55c97af9d906567f8ba9096d4bc30734012f72b9d7d6cf3a6268ba1219b5b64eb985d2665b131be1ad017e93fc05d66250df3e0826d02f24eaacaf8daf13df89 SHA512 bf09067a371abe4caa829b9ad08000f244a8ed8cbbc6f25c118f555a9f281c2b7e26f66f112a5188e80b49e826a76953040f45eb64f3ce9d258dc66c911a5200
diff --git a/dev-python/immutabledict/immutabledict-4.2.0.ebuild b/dev-python/immutabledict/immutabledict-4.2.0.ebuild
deleted file mode 100644
index bda0848cfcaf..000000000000
--- a/dev-python/immutabledict/immutabledict-4.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2023-2024 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 pypi
-
-DESCRIPTION="An immutable wrapper around dictionaries"
-HOMEPAGE="
-	https://github.com/corenting/immutabledict/
-	https://pypi.org/project/immutabledict/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# performance test which fails occasionally under heavy load,
-	# see bug 924831
-	tests/test_immutabledict.py::TestImmutableDict::test_performance
-)
diff --git a/dev-python/immutabledict/immutabledict-4.2.1.ebuild b/dev-python/immutabledict/immutabledict-4.2.1.ebuild
index 6137a5f8c8d7..bda0848cfcaf 100644
--- a/dev-python/immutabledict/immutabledict-4.2.1.ebuild
+++ b/dev-python/immutabledict/immutabledict-4.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 arm64 ~ppc64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index 37a64204a00a..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 56733bbffc48..eb2586280d80 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..c0f74ac187e2 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index c349b276c950..f89bda64845c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -10,4 +10,5 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.5.src.tar.xz 141243716 BLAKE2B 228fc66ab688abfc16f31b2cd83163b81ef61604ace21eab69a1776f0dc88cbe8fa831162205849e5be3975a214136399572b4ad1b908986e37b2d38a1a7fa5d SHA512 648854e9c91fdcc5c677ce3800e046f2060b998a45cf9f7eebe02898431b3924f9348b6fc366102cd4fdda72dcb8f32076f98aa69927e0e20b3f1007fba10b22
 DIST llvm-project-19.1.5.src.tar.xz.sig 438 BLAKE2B 1d40a5c5405f99ef86e3360f9ea153afd1ae4001697210fd799a988113e8a3cef39e2c4794edd9332f384d8490f4ce2ab6bee6d98f794f84775807f833b81c0a SHA512 a438c86ce882eb1ac3e50842937068794ed162bb1b7ded68a2fe3ec2ab4f57cc38aee667cfb46afe6da22eef7ed1cb65820a473f63bd5a0dc6aad41df7bfad54
+DIST llvm-project-32f7f0010bca99ee4bd917f57272733fb2bf3bd9.tar.gz 223983502 BLAKE2B fd3e6b0b795abc42568ef98fa774d927029c18838a5d0f34eaa66c37976444a63f2fc5d883f3bf3a98533f51e387936f1c659230f31c757d26153425696a16cd SHA512 65a345ad5b77c627008f759947e5e9f28a62c8992d7146113e0446e5849feaf9088c15c8b22ca0824af5b927d6a417f5326258b489fb8ccea78ec9e0e0fe8fba
 DIST llvm-project-a348f223cab54b21a7b1c38dec7bc6aa2f81c949.tar.gz 223630067 BLAKE2B 3c2121a8d13e3a84a9ee98d17c58e5fd5a31d5870ac21c633c78c49b4af0c401310f7e91f64ff3b7cf7f6e8d205c730458b8b1101b1255f422659974d48e2ecb SHA512 33cc09a904e4fe0d529611a1d71d764e6d49f014cea903aadc0755d0420f65cfc763fdcfd4bb9a96adad79ce1c4475d8c005dcac37c4fe130a1fb3665172f1db
diff --git a/dev-python/lit/lit-20.0.0_pre20241207.ebuild b/dev-python/lit/lit-20.0.0_pre20241207.ebuild
new file mode 100644
index 000000000000..ab099932bcf2
--- /dev/null
+++ b/dev-python/lit/lit-20.0.0_pre20241207.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index 4d7b0008da94..6a13fdb39b73 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1 +1,2 @@
 DIST loguru-0.7.2.gh.tar.gz 443643 BLAKE2B 208c4ad989257e0e0d5cecf41c9722f398e5c73528f8a88c92e28490121723d5c19b4170ff246446e94237e8bb732f83e4b9fcc66c42aa7e3c1ba25aaa069e34 SHA512 e4d358f12ec33393bdac836206a15a3161653684b69839f58bbdc692155e4aee4b6ec700ab13b83f431a67df5ec86cacf2cb90fa052827e5e03c68c1f132e339
+DIST loguru-0.7.3.gh.tar.gz 459102 BLAKE2B 7d7cf167e1350814eea6a358cc00bac217ea6b153ae29ffd70c026f3be63cc126fbc184668ea643ea03416fc8f805bd51502fd8cc9e8d9bcc19099814b8c3fe6 SHA512 9bceddf7c83a14b4c62e3f48f9dc5d6957e068b4f0a8ce3e83ade0b558acd35dda86372d4c6c7abc489aebac3a3203eca56615c5973f42e15973e85894799fe7
diff --git a/dev-python/loguru/loguru-0.7.3.ebuild b/dev-python/loguru/loguru-0.7.3.ebuild
new file mode 100644
index 000000000000..265ce8a7f0ee
--- /dev/null
+++ b/dev-python/loguru/loguru-0.7.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python logging made (stupidly) simple"
+HOMEPAGE="
+	https://github.com/Delgan/loguru/
+	https://pypi.org/project/loguru/
+"
+SRC_URI="
+	https://github.com/Delgan/loguru/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}]
+	)
+"
+
+# filesystem buffering tests may fail
+# on tmpfs with 64k PAGESZ, but pass fine on ext4
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# mypy
+	tests/test_type_hinting.py
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# neuter mypy integration
+	sed -i -e 's:sys.version_info >= (3, 6):False:' tests/conftest.py || die
+}
diff --git a/dev-python/markdown-exec/Manifest b/dev-python/markdown-exec/Manifest
index cef5284faa98..15ebbca2a620 100644
--- a/dev-python/markdown-exec/Manifest
+++ b/dev-python/markdown-exec/Manifest
@@ -1,3 +1,4 @@
+DIST markdown_exec-1.10.0.tar.gz 76830 BLAKE2B 7c8194decf4d44cabecfddee27d74e8a513b227533b9eb1c5c2bdc100ca9f64e2ef3641386839167ac937d62c9ec13f511fd5cd76bca8050dd19bb74b4e399ea SHA512 996d4ad9ea06943d34ced435f2bd3b22c0b6a4453d5a59443966ad8caa767f1a3eea1c7c6f1f01056b4d2019550e202a2e11cd8e148a149c5ca35f9f87c45990
 DIST markdown_exec-1.9.1.tar.gz 24932 BLAKE2B 1b9b9904f8f6d7cc58f643bb537f2b4b3fa07f86c809590284eda5a714a998238910ae1356d58c7aab8e472ebcbc0511965ac3951b17a568128eafd9a3d0c852 SHA512 8c89cbea29c821a8110fed1825cec215a772753fd2bef96c26beb91dd8af34c905eedd4101fbf99b427cf9b9b2b4de08d69769dba66ad9b16bc72f16bec92a48
 DIST markdown_exec-1.9.2.tar.gz 25316 BLAKE2B 3f36b88f17f6c0444a60cf4846bf2358acf579a312a95d545339547aa5c1431acc265255dc60ee9cb06cc5cb9cd5b77d9c93bb9d0a6b04c7227f30aa2e013980 SHA512 d98a66ca9b3c5e1c748fafcada658623759d09038ed6a3b8b04767ee6133b90e767f5a0dc171814aa5ef9fdb7a6e7698539f3406d7e21ba5a9f50e3d709f9a39
 DIST markdown_exec-1.9.3.tar.gz 74674 BLAKE2B fc0b9a47f379aabe389b20a3b301a40d9db145234761ff5f7b1b5f2762db45e148006da6193d08463472e109a3a9215736e2ff1b78e4144076a64dacfadc968e SHA512 c4256ec4bcfa6559a169771dcdecbfe104445c237fdd85b6bd06baf5b6f9871713307303b45e1e18a15a9145f63ca952a8d2f7b082c1059d0ba6c29249acbac4
diff --git a/dev-python/markdown-exec/markdown-exec-1.10.0.ebuild b/dev-python/markdown-exec/markdown-exec-1.10.0.ebuild
new file mode 100644
index 000000000000..3c12d17d1059
--- /dev/null
+++ b/dev-python/markdown-exec/markdown-exec-1.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utilities to execute code blocks in Markdown files"
+HOMEPAGE="
+	https://pawamoy.github.io/markdown-exec/
+	https://pypi.org/project/markdown-exec/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="ansi"
+
+RDEPEND="
+	>=dev-python/pymdown-extensions-9[${PYTHON_USEDEP}]
+	ansi? (
+		dev-python/pygments-ansi-color[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index 96de06977485..2f644e17ff40 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1 +1,2 @@
 DIST micawber-0.5.5.gh.tar.gz 35109 BLAKE2B 3d60f8b27246a82001437481c5feec638a9673cf9b5427f1c69ca3f84e17935eba4e88078ab7d2818eaa1d9d98b22946a1ab5c3ff0f6261bd44a2150c663a616 SHA512 93949a813d99e5b46e8e06b4e9f501fa74092bc64ebab71572734334cd9889c2d4546a086775005b7f99d18df56222623ae7761cb6ba2f42c7f78c10a86e2d26
+DIST micawber-0.5.6.gh.tar.gz 35179 BLAKE2B 50bc9b5044c5e89af3ec31321eb14830a0ca9dda25d6f88c371556d8a2b36f5a7ee868b540da93f65dc6365ed4d278eaf5d6f9c10fb69a19823b40e536ab1eb3 SHA512 1a0577048922c6b329b22bb47718408f470af306fd607abd5a88eff59363e7d8402f544580c723e94563502c0c2e000dc349dc3253e0866c715a1cc6a6800699
diff --git a/dev-python/micawber/micawber-0.5.6.ebuild b/dev-python/micawber/micawber-0.5.6.ebuild
new file mode 100644
index 000000000000..2a19f3d2d48b
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.6.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="
+	https://github.com/coleifer/micawber/
+	https://pypi.org/project/micawber/
+"
+SRC_URI="
+	https://github.com/coleifer/micawber/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 15a8accd4d4b..4b7ce7fcca22 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-git-authors-plugin-0.9.1.gh.tar.gz 32985 BLAKE2B 4b0ba5ed91b809aa3873953018c80fe86e7d1d7df04b73de170b9cf546848fccdbcf5282b608c1197af27783856259fbcde945a53426c3e46c0927bcda4e9f5a SHA512 d93cef7d86961aeb321d2eb74487f69c0d775bc9e90445444e8978f624d9b9ae4af5b183c72ec494ad8d3e89a8d67ae81ecd999218adced597fff6a374132477
 DIST mkdocs-git-authors-plugin-0.9.2.gh.tar.gz 32983 BLAKE2B 3f709a180ee80b4553038a459b46684a367ef6c2f62bde4cb551d23aadb7ca701402e4b645d9b75c4d735346d4cd6f825821c23a391dca5264b750f2c2c544c8 SHA512 8933bbf828c239427b40a1a99ea014c1947400b46bb9a88beed6074420fb3b85d60083476c5daf88fe9e10e1f6a6cb5899dfd768ff6f12ead8d70f4bd3951b51
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild
deleted file mode 100644
index d5bdf3f51603..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{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-authors-plugin/mkdocs-git-authors-plugin-0.9.2.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.2.ebuild
index 1448d9fedabc..d5bdf3f51603 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.2.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 # Tests are broken outside of upstream git repo
 RESTRICT="test"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index a4177ea8fe59..b5f397de6bb8 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,4 +1,3 @@
-DIST mkdocs-material-9.5.44.gh.tar.gz 14764147 BLAKE2B e0aaed852abd060eee0b9049798a327a4ddc5969a84289b8aa983b0dfbe926b2e0dfd13525593c2783106bca882adfcfad7961c2eb0363a1f4a4131c364c42c8 SHA512 9a0c8d4a52c8b44b9c8e84b57839d5ddc3080eaa136cb6effc3da8eb9d08a2ef0c0898ff875afabc1783ea548653a9b00f00db67ceb48d52f323a93795529465
 DIST mkdocs-material-9.5.45.gh.tar.gz 14703865 BLAKE2B a48e2e00bf0c1511e58e3f621656aa23227f0e579b96f83d09666328c815dc67cc8015b5f5400e08dd371e022740f0d46f6f550d1e35880485adf75a9352a8e9 SHA512 1a55d96fbc9872c754570633b094a8e605ef5be2cfe41f5c47d4f1af8ba5bedf9c4e419748716f8c8014a2b661d6ff73e6e98bdb3396568c64534e08f676f11b
 DIST mkdocs-material-9.5.46.gh.tar.gz 14708818 BLAKE2B 3aed540e20f588f2cb08c94a2323e5311de5edd1467a7bfe1dbabfa81c69ed50875cab5d85aaa874648966bec4acea265a316004683b60b16703a6548aa1464e SHA512 f75bc96590f30c2109fa3ea915b91bd4cad50a4ce3d374fd162ee6178672f3acf812c9e98c348556a212587df935db1126ab2d1fe1f18cfdc3bd1f52efafa859
 DIST mkdocs-material-9.5.47.gh.tar.gz 14708561 BLAKE2B ea3ac2df6f88d3c9b8ebd9bbbe5b6d0bf826fe3ebe733f8a84d532becbbfa66e0c11aa069da9571810593405d91e5d4e45ea0aad158ca1a956cb18c9f7fa9f13 SHA512 3ccce10161552c70276255a25e4467064de4adc92e38ec77e244ae140e9e58fa95144c5667116de89b41807df875ad3bb988685eec37e1285534367a6b4e9d76
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild
deleted file mode 100644
index 9c5c238ac168..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.44.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.45.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.45.ebuild
index c99fc052adb8..9c5c238ac168 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.45.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.45.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/moto/moto-5.0.21.ebuild b/dev-python/moto/moto-5.0.21.ebuild
index 15cdc4754e1c..702684bf56a6 100644
--- a/dev-python/moto/moto-5.0.21.ebuild
+++ b/dev-python/moto/moto-5.0.21.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-api/Manifest b/dev-python/opentelemetry-api/Manifest
index 563dd2e67e0f..145836412bcb 100644
--- a/dev-python/opentelemetry-api/Manifest
+++ b/dev-python/opentelemetry-api/Manifest
@@ -1,4 +1 @@
-DIST opentelemetry-python-1.27.0.gh.tar.gz 619819 BLAKE2B d861624821cef77cb4cc81a0d04fd9f238f7363122d0fab34433856458bb06f47b7a04022b29dfdbba2d190159e9b2ffe813f0d56ac9473b44c084b764c982e4 SHA512 d8b5a617c7e804b4e6e1b508395e87481a3dcc3b375573110750830a1cf6037cfeb5c09dba3e7cfa472e385dbf619afedd79b1c31c5bfe4e87d44ea65f4d2f0b
-DIST opentelemetry-python-1.28.0.gh.tar.gz 637413 BLAKE2B e5897c671d95260b38e489a78b879d050355bc319748c3ac712f5e20b41cc1914963c9d835ecd2198f3965e72a429c772287a8d0f45186ec41b3a8bab2764bfa SHA512 1fff73bcd6d9a4bd33e29687674a87d9a1d293964c8d9fdac3122447bd5397161a27186c8cf123d6edef21a9227071a9fe13687593d6923db10dbb96f1e92312
-DIST opentelemetry-python-1.28.1.gh.tar.gz 639245 BLAKE2B f1d0b6518e0410bfcdbc7c404cd46a09427d07dc82ad8914cd527048dc68042010523a7d08a76286a4086d3f8bcb97fac8e9e2b70ca0df1071be760bc639c244 SHA512 898ae42c1a04e186fb09c51ea7ff39f729c3ccfb2a9e08f3822cd15049a4fb499bfcb3bf7ff153ab76ab52089441c6c86d5a31d12af9dc1e372487431ca5234b
 DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.27.0.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.27.0.ebuild
deleted file mode 100644
index 91141d30445f..000000000000
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.27.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="opentelemetry-python-${PV}"
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenTelemetry Python API"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-api/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Unnecessary restriction
-	sed -i -e '/importlib-metadata/s:, <= [0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-semantic-conventions opentelemetry-sdk \
-		tests/opentelemetry-test-utils
-	do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.28.0.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.28.0.ebuild
deleted file mode 100644
index 6764b9297c21..000000000000
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.28.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python API"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-api/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Unnecessary restriction
-	sed -i -e '/importlib-metadata/s:, <= [0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-semantic-conventions opentelemetry-sdk \
-		tests/opentelemetry-test-utils
-	do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.28.1.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.28.1.ebuild
deleted file mode 100644
index 6764b9297c21..000000000000
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.28.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python API"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-api/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Unnecessary restriction
-	sed -i -e '/importlib-metadata/s:, <= [0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-semantic-conventions opentelemetry-sdk \
-		tests/opentelemetry-test-utils
-	do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild
index 6764b9297c21..c4d560cc8714 100644
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild
+++ b/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-sdk/Manifest b/dev-python/opentelemetry-sdk/Manifest
index 563dd2e67e0f..145836412bcb 100644
--- a/dev-python/opentelemetry-sdk/Manifest
+++ b/dev-python/opentelemetry-sdk/Manifest
@@ -1,4 +1 @@
-DIST opentelemetry-python-1.27.0.gh.tar.gz 619819 BLAKE2B d861624821cef77cb4cc81a0d04fd9f238f7363122d0fab34433856458bb06f47b7a04022b29dfdbba2d190159e9b2ffe813f0d56ac9473b44c084b764c982e4 SHA512 d8b5a617c7e804b4e6e1b508395e87481a3dcc3b375573110750830a1cf6037cfeb5c09dba3e7cfa472e385dbf619afedd79b1c31c5bfe4e87d44ea65f4d2f0b
-DIST opentelemetry-python-1.28.0.gh.tar.gz 637413 BLAKE2B e5897c671d95260b38e489a78b879d050355bc319748c3ac712f5e20b41cc1914963c9d835ecd2198f3965e72a429c772287a8d0f45186ec41b3a8bab2764bfa SHA512 1fff73bcd6d9a4bd33e29687674a87d9a1d293964c8d9fdac3122447bd5397161a27186c8cf123d6edef21a9227071a9fe13687593d6923db10dbb96f1e92312
-DIST opentelemetry-python-1.28.1.gh.tar.gz 639245 BLAKE2B f1d0b6518e0410bfcdbc7c404cd46a09427d07dc82ad8914cd527048dc68042010523a7d08a76286a4086d3f8bcb97fac8e9e2b70ca0df1071be760bc639c244 SHA512 898ae42c1a04e186fb09c51ea7ff39f729c3ccfb2a9e08f3822cd15049a4fb499bfcb3bf7ff153ab76ab52089441c6c86d5a31d12af9dc1e372487431ca5234b
 DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.27.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.27.0.ebuild
deleted file mode 100644
index 9f67ee19987a..000000000000
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.27.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="opentelemetry-python-${PV}"
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenTelemetry Python SDK"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-# Tests cannot handle xdist with high makeopts
-# https://bugs.gentoo.org/928132
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		"${PN}"/tests/resources/test_resources.py::TestOTELResourceDetector::test_process_detector
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.0.ebuild
deleted file mode 100644
index 499009fb6d59..000000000000
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python SDK"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-# Tests cannot handle xdist with high makeopts
-# https://bugs.gentoo.org/928132
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		"${PN}"/tests/resources/test_resources.py::TestOTELResourceDetector::test_process_detector
-		"${PN}"/tests/metrics/integration_test/test_console_exporter.py::TestConsoleExporter::test_console_exporter_with_exemplars
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.1.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.1.ebuild
deleted file mode 100644
index 499009fb6d59..000000000000
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python SDK"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-# Tests cannot handle xdist with high makeopts
-# https://bugs.gentoo.org/928132
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		"${PN}"/tests/resources/test_resources.py::TestOTELResourceDetector::test_process_detector
-		"${PN}"/tests/metrics/integration_test/test_console_exporter.py::TestConsoleExporter::test_console_exporter_with_exemplars
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild
index 499009fb6d59..bc3461eefdc1 100644
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-semantic-conventions/Manifest b/dev-python/opentelemetry-semantic-conventions/Manifest
index 563dd2e67e0f..145836412bcb 100644
--- a/dev-python/opentelemetry-semantic-conventions/Manifest
+++ b/dev-python/opentelemetry-semantic-conventions/Manifest
@@ -1,4 +1 @@
-DIST opentelemetry-python-1.27.0.gh.tar.gz 619819 BLAKE2B d861624821cef77cb4cc81a0d04fd9f238f7363122d0fab34433856458bb06f47b7a04022b29dfdbba2d190159e9b2ffe813f0d56ac9473b44c084b764c982e4 SHA512 d8b5a617c7e804b4e6e1b508395e87481a3dcc3b375573110750830a1cf6037cfeb5c09dba3e7cfa472e385dbf619afedd79b1c31c5bfe4e87d44ea65f4d2f0b
-DIST opentelemetry-python-1.28.0.gh.tar.gz 637413 BLAKE2B e5897c671d95260b38e489a78b879d050355bc319748c3ac712f5e20b41cc1914963c9d835ecd2198f3965e72a429c772287a8d0f45186ec41b3a8bab2764bfa SHA512 1fff73bcd6d9a4bd33e29687674a87d9a1d293964c8d9fdac3122447bd5397161a27186c8cf123d6edef21a9227071a9fe13687593d6923db10dbb96f1e92312
-DIST opentelemetry-python-1.28.1.gh.tar.gz 639245 BLAKE2B f1d0b6518e0410bfcdbc7c404cd46a09427d07dc82ad8914cd527048dc68042010523a7d08a76286a4086d3f8bcb97fac8e9e2b70ca0df1071be760bc639c244 SHA512 898ae42c1a04e186fb09c51ea7ff39f729c3ccfb2a9e08f3822cd15049a4fb499bfcb3bf7ff153ab76ab52089441c6c86d5a31d12af9dc1e372487431ca5234b
 DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.27.0.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.27.0.ebuild
deleted file mode 100644
index 691d582da75d..000000000000
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.27.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="opentelemetry-python-${PV}"
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenTelemetry Semantic Conventions"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-sdk tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.0.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.0.ebuild
deleted file mode 100644
index 1da141e261fd..000000000000
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Semantic Conventions"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-sdk tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.1.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.1.ebuild
deleted file mode 100644
index 1da141e261fd..000000000000
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 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
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Semantic Conventions"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-sdk tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild
index 1da141e261fd..32a1f4e1ea0d 100644
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild
+++ b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
diff --git a/dev-python/osc-lib/osc-lib-3.2.0.ebuild b/dev-python/osc-lib/osc-lib-3.2.0.ebuild
index b326a0ef432b..cae48e3369aa 100644
--- a/dev-python/osc-lib/osc-lib-3.2.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-3.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index ba3d60c2ebb3..a44dc23cd1f0 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,2 +1 @@
-DIST oslo.context-5.6.0.tar.gz 34632 BLAKE2B 2aace96e2ac59fa50411d692b555e3f895288075f61f2221de9204e2f3a3e68a8aad6bb77affde12f239550f204abc44593e9bece5f7f8214980e74a4901f6df SHA512 2c4bb27fe12bf13ca11e23dcc1f1c4456fa0052956c357d5ef369f3775ccc0c1517c365ce898c21435876086118da10149e07cb540cb3f48e6dc008642d6d841
 DIST oslo.context-5.7.0.tar.gz 35115 BLAKE2B 9aac41ab425c9ab92616c4298562630fa0b958e1018fed084168522c758a940e29e4759534189e4b0926e76a2513b8f7aa982c772e956fd3ae5b7f91196d0023 SHA512 798eff2ed174b8d3d46a70592a8692018a5360a1e027a5fac880d35a32bcd7a3dd09a1f8fba104e4716e477049914356e2aa555aa6e9867aa5a377b65f22e3c9
diff --git a/dev-python/oslo-context/oslo-context-5.6.0.ebuild b/dev-python/oslo-context/oslo-context-5.6.0.ebuild
deleted file mode 100644
index 7497d92e5641..000000000000
--- a/dev-python/oslo-context/oslo-context-5.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.context/
-	https://github.com/openstack/oslo.context/
-	https://pypi.org/project/oslo.context/
-"
-
-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}]
-"
-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}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
diff --git a/dev-python/oslo-context/oslo-context-5.7.0.ebuild b/dev-python/oslo-context/oslo-context-5.7.0.ebuild
index 924d08e6d59f..7497d92e5641 100644
--- a/dev-python/oslo-context/oslo-context-5.7.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-5.7.0.ebuild
@@ -19,7 +19,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/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 2b4ec9bc1207..1a7cce724df5 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,2 +1 @@
-DIST oslo.i18n-6.4.0.tar.gz 48196 BLAKE2B 14a366d1042f288133a3a15ca14264446a6775318ab7347331b91fe4f36149c1592d920e6ce309a0db2ba8bb76209f2b6c917b4de8733427f3f9afd46bd7a295 SHA512 f68f5fb731175086f99f8a74e734f81fab4a19de3ce087279a55b7ec6df9a30a2eb70325faf2f3228fe11bb808d11b5f87eef93cc55e5b33ce4ed4e881d3915b
 DIST oslo.i18n-6.5.0.tar.gz 48080 BLAKE2B 40d39c504ae660cd11b2614ddec79e48c4fb8cf3f98d43de208d6dbc145a6ab22e7879ca0126b91352d34299d37b272364329b467d39985a7dee85a16fa5d8eb SHA512 8c02eaa28b29ed9d53b554b7b05429ac1bcc290db4b1b4e0eafdafc4eb06b4578e300541ae061721027bfe6aaa24f8789b3bc77e8bced1214a4d5479ef3dfa1d
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.4.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.4.0.ebuild
deleted file mode 100644
index 951b6809276c..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-6.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.i18n/
-	https://github.com/openstack/oslo.i18n/
-	https://pypi.org/project/oslo.i18n/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.5.0.ebuild
index 052f96283edf..951b6809276c 100644
--- a/dev-python/oslo-i18n/oslo-i18n-6.5.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-6.5.0.ebuild
@@ -19,7 +19,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.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index b1a69a6152bb..8a7e54ea733d 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,2 +1 @@
-DIST oslo.log-6.1.2.tar.gz 95653 BLAKE2B 2cbac1274b8409faeefe2dc1d070acb264a9f1089369eb11bd16dd2f62d978f060c4845b76e38fb9c18cd832d06f18ecfc60098adc28cd98693271d1584b1816 SHA512 5eaf8ac49a7658e60116cea20207687050c911e2d93361942fd33d4bc321f67e4cb48d47e15faba95e0e31f945b5d6b46442ae8b2d39c8603879677e8f2dad09
 DIST oslo.log-6.2.0.tar.gz 95864 BLAKE2B 146c824f1f6c6733d7d1ed541b592a6fdb06c6739fdad03f7d65d1b21079347c9e1deb91984dcd65dd0fa0d1fc0435d8eec9b150800fbd160588347ab6411137 SHA512 50a5f948af9f1989246d8aefb00755a8859fa796c21dbef90dc2ae6757426b5df4b80db3518e0ec68e96198757dfb40da497821096681bda56e91c4c67430671
diff --git a/dev-python/oslo-log/oslo-log-6.1.2.ebuild b/dev-python/oslo-log/oslo-log-6.1.2.ebuild
deleted file mode 100644
index be95cf4e199e..000000000000
--- a/dev-python/oslo-log/oslo-log-6.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.log/
-	https://github.com/openstack/oslo.log/
-	https://pypi.org/project/oslo.log/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-7.1.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-src_test() {
-	# requires eventlet
-	rm oslo_log/tests/unit/test_pipe_mutex.py || die
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/oslo-log/oslo-log-6.2.0.ebuild b/dev-python/oslo-log/oslo-log-6.2.0.ebuild
index 8d0821795037..be95cf4e199e 100644
--- a/dev-python/oslo-log/oslo-log-6.2.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-6.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index ba21926694e3..a55d7b4ba8bd 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,2 +1 @@
-DIST oslo.serialization-5.5.0.tar.gz 35102 BLAKE2B 7ac9ef1d35c3f1a7396456bc9b29d8c3100d9c62e72e90dd9e75bfe27e7416bc9c31ed41155bd5197e95536400b409d7f878819535511b2c805d2bb4111ea880 SHA512 51043ae3d27c5a9dc482234a95a175722d56dc35294cb34845e8d34e6de5d1b49a16a1cd5c84a4d51b595be77c76e9bb322054f61d6e5e5948f8fc48a8dd3294
 DIST oslo.serialization-5.6.0.tar.gz 35308 BLAKE2B 3344ba3f2e848abba0c9528ee1e31d63c1adcc91476814ab2fb910defc50812c38c95bce8ce4c0b1afd0df81f9bdea4f54832944ecba5d06e1064371e1567b94 SHA512 76068799e59218ac3fe243cb931e00636733f71e152898bc57953e6ff849b941be5aae86936931f0ae4107fd183b08f73d4520e8b7e4f5fdc395804ee3fd6499
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild
deleted file mode 100644
index 0a71a4b05109..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-5.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.serialization/
-	https://github.com/openstack/oslo.serialization/
-	https://pypi.org/project/oslo.serialization/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
-
-python_prepare_all() {
-	# remove spurious rdep on pbr
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.6.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.6.0.ebuild
index 1eae37e58e3f..0a71a4b05109 100644
--- a/dev-python/oslo-serialization/oslo-serialization-5.6.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-5.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 83d41d864254..6d4cc242db2c 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST python-phonenumbers-8.13.49.gh.tar.gz 4914069 BLAKE2B b4759021af0195af48a6b556df9d69d1aaf9fc5501d375b28b0bc61b0c5b249c5216670f24b239b52cb6c9baf1843026ce607d5e41222ad83079a49522c4d911 SHA512 a20a743e7cc82cf0d04676d19843886c74bb6d78355a40fe2eac110d463e2c6a6855a7924083c60201560c95d318c473b2728f1b1206c5874214d010bf232d3f
-DIST python-phonenumbers-8.13.50.gh.tar.gz 4915727 BLAKE2B be1eff822b2a9d8e3f3d67edbd11536efc4988611c2f5e771aac20345e71d31dd90052ab84946d0e1f9c2dc627e2cd9c0fd37389e8985ca4656526d25595e3db SHA512 bdbb898ae3599b569e4f383d0a880c5e617f69c086a4271f5fdf48b5d4aab4793cdc27336e82ba66466ff8c08e263866bc64059107cb6aab05a8b5320d00c969
 DIST python-phonenumbers-8.13.51.gh.tar.gz 4916017 BLAKE2B ded6fc61bfc619d79d31c12cf1bb13a13b96182674373aebd66a9ac02e7fda957c59807af6c6aa31e373c6af9cdca6ec8e10a575877121cfcef3cbcbd4419243 SHA512 fab5542107ef69fc94ed5f4a74425ef6be6277b88339ae882782c6cf35254e13f0d351f704dd4b84d16a82a40121b3681abd4599b85341284ef42b3f5af19803
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild
deleted file mode 100644
index bc08ce78c87e..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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/phonenumbers/phonenumbers-8.13.50.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.50.ebuild
deleted file mode 100644
index a54d1a1f9af6..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.50.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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/phonenumbers/phonenumbers-8.13.51.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild
index a54d1a1f9af6..bc08ce78c87e 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/pikepdf-9.4.2.ebuild b/dev-python/pikepdf/pikepdf-9.4.2.ebuild
index c0d7b6df04aa..99ce5e28e3b8 100644
--- a/dev-python/pikepdf/pikepdf-9.4.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-9.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 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="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
diff --git a/dev-python/poetry/Manifest b/dev-python/poetry/Manifest
index 4eecd9051dd4..886dbc5cd6ce 100644
--- a/dev-python/poetry/Manifest
+++ b/dev-python/poetry/Manifest
@@ -1,3 +1,2 @@
-DIST poetry-1.8.2.tar.gz 1516966 BLAKE2B 6ca39b426a4117d0c2c3f12b9151d621d629f746e51ca77cda8d7f67ae2493ea9ecb7dd02f69cad3f346579fc3bb16b1117c0dad0a148763bb439c35eac673a5 SHA512 0151c264c2f353753ab7c5a248cdd30e60e33505fd915d841e789a37b18cc06f28b4f987144cd3dbf915e23f6947f6b17cb8fa316b34ce866b6b3559e73b8ddc
-DIST poetry-1.8.3.tar.gz 1518910 BLAKE2B 87c06f9d72c7fbe9f821d8a1de66028d64dfb06a274d67f14d49030c0d9a21f702fc9a5c35fa3a1e75d11c8db01516182f8523e9c466398b305d908e0e02d211 SHA512 72e604e246ec8426a29151caae81bf6b0495d17af519a41a7b934f8d50496dbf77605ea3f2e03bd41fb75a0c97d274987ac0359004544ea6ea19dcc118129e05
 DIST poetry-1.8.4.tar.gz 1519163 BLAKE2B 20b73806ae4559e3a137d80db1abbd52b0ba2edb8b512875dcd784c66fa74ebe8659518af9a87349f5ae821f3962bd325d06c2f52567c6d7bd6fb9e10d2988d4 SHA512 59e4e9737ae8a129544460735aa6d82dd4370bd94b37231b5d336cc4f5b9d48a3b7aeaeea1a5b564339663fd0fa914afc83ddf43aef98aa62387daa959d032c0
+DIST poetry-1.8.5.tar.gz 1519790 BLAKE2B 378cb327fe6762e8dd09d7f08fb11cd17963c382754a20fba3cc000ac07ab93672b54d967ba6d609d00e9f303461e55ec40eb9549a0b9329f50c4af363fd2343 SHA512 91c2902e5dfb8f3319de53472b1da20b1d8f570a7a3212e6e55883e364295a9e58ce5b7c59450e741f97692e897283d9f624f3d2128db017476d94fd2ea7839c
diff --git a/dev-python/poetry/poetry-1.8.2.ebuild b/dev-python/poetry/poetry-1.8.2.ebuild
deleted file mode 100644
index ebc7a416e0df..000000000000
--- a/dev-python/poetry/poetry-1.8.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2023-2024 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 pypi
-
-DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
-HOMEPAGE="
-	https://python-poetry.org/
-	https://github.com/python-poetry/poetry
-	https://pypi.org/project/poetry/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# dev-python/build: 1.0 breaks backward compatibility
-# https://github.com/python-poetry/poetry/issues/8434
-RDEPEND="
-	>=dev-python/poetry-core-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/crashtest-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.21.2[${PYTHON_USEDEP}]
-	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.23.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-BDEPEND="
-	test? (
-			>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# unpin
-	sed -e 's:\^:>=:' \
-		-e '/poetry-core/s:":">=:' \
-		-e 's:,<[0-9.]*::' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Tests require network (they run `pip install ...`)
-	tests/installation/test_chef.py::test_isolated_env_install_success
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_directories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git_with_subdirectories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_non_wheel_files
-	tests/installation/test_installer.py::test_installer_with_pypi_repository
-	tests/installation/test_pip_installer.py::test_uninstall_git_package_nspkg_pth_cleanup
-	tests/masonry/builders/test_editable_builder.py::test_builder_setup_generation_runs_with_pip_editable
-
-	# Works with network, but otherwise: Backend 'poetry.core.masonry.api' is not available.
-	tests/installation/test_chef.py::test_prepare_sdist
-	tests/installation/test_chef.py::test_prepare_directory
-	tests/installation/test_chef.py::test_prepare_directory_with_extensions
-	tests/installation/test_chef.py::test_prepare_directory_editable
-
-	# Internal test for lockfile being up-to-date
-	# Meaningless, also sdist does not include lockfile
-	tests/installation/test_installer.py::test_not_fresh_lock
-
-	# TODO
-	tests/installation/test_executor.py::test_executor_known_hashes
-	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/poetry/poetry-1.8.3.ebuild b/dev-python/poetry/poetry-1.8.5.ebuild
index e41ce9dbf85c..6e2c3db53878 100644
--- a/dev-python/poetry/poetry-1.8.3.ebuild
+++ b/dev-python/poetry/poetry-1.8.5.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	>=dev-python/poetry-core-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/poetry-core-1.9.1[${PYTHON_USEDEP}]
 	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
 	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
 	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.23.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	' 3.10)
@@ -48,10 +48,9 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-			>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
 	)
 "
 
@@ -66,22 +65,6 @@ src_prepare() {
 }
 
 EPYTEST_DESELECT=(
-	# Tests require network (they run `pip install ...`)
-	tests/installation/test_chef.py::test_isolated_env_install_success
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_directories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git_with_subdirectories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_non_wheel_files
-	tests/installation/test_installer.py::test_installer_with_pypi_repository
-	tests/installation/test_pip_installer.py::test_uninstall_git_package_nspkg_pth_cleanup
-	tests/masonry/builders/test_editable_builder.py::test_builder_setup_generation_runs_with_pip_editable
-
-	# Works with network, but otherwise: Backend 'poetry.core.masonry.api' is not available.
-	tests/installation/test_chef.py::test_prepare_sdist
-	tests/installation/test_chef.py::test_prepare_directory
-	tests/installation/test_chef.py::test_prepare_directory_with_extensions
-	tests/installation/test_chef.py::test_prepare_directory_editable
-
 	# Internal test for lockfile being up-to-date
 	# Meaningless, also sdist does not include lockfile
 	tests/installation/test_installer.py::test_not_fresh_lock
@@ -91,4 +74,10 @@ EPYTEST_DESELECT=(
 	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
 )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network" -p pytest_mock
+}
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 6cc552c96922..f1ba10d5e17c 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -30,7 +30,6 @@ DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efea
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
 DIST jiter-0.5.0.crate 141152 BLAKE2B 5ab42f40c3a1fa5717447085cc289d89c649570022dde6c628f24f7dcce1c40cbdc5e4f6dc92afeabc3645683636fe7762ccf70665a1139bb39e2bdf481074da SHA512 79e1aaf52bbfccf010124325f7010839a9d5c4ce89cf0a6f68f8d6107af3e95dc4ed21ef341f92e71cf2e88119c911289af0cbea3aafdb5f5d49a45f103f26d7
-DIST jiter-0.7.0.crate 143599 BLAKE2B c0537ccab324a624195adbad8238cc238134a77fd4fc004072ac4704d10b3037dee2b7404ef9724baf29bcc1e1d191e3259149fb27ccc6a91e41e5f1a5e8b4fa SHA512 c3f3bc39c87a59bd017b60791b5f40534ed2e9995be9da43ca2c031f55b8505cfb3f01b7c595c2b34aa337f75566a55fdd8b4c5486f30de2ae1031966d4e2edf
 DIST jiter-0.7.1.crate 143767 BLAKE2B 314bca16d68483e90cae65138c2e1cb6066acc024cc2cd0fa7e838247b559b4372b63d17d23b7b14e031ffd4318f28c6b810890bd00718def7262c5c0ffd98da SHA512 b5377a8e6ca9e948fafd8c257bdd5bdceed3b76b7a6492065c7feb0deaac7b24851c2aa0440b23707cc86ba485065677bd563ee43819cf0f385362782c4afd69
 DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
 DIST lexical-parse-integer-0.8.6.crate 33647 BLAKE2B a0ebd7a51c271a163796b0f55bb85e16830bf06e26e3f10d9b13dc5b65af590c77f47fb64360a8738c5ad4be6e6932d58e83e1594a80c067859645c35b907c53 SHA512 e9a814d2928bf5bb2d9dce53e26c65356191c9e21c3aa0e674d58ed879aa52293272f3897f64372d996a3f8c471b0f59348ad48f15a21c2f35ed15f522ac2daa
@@ -47,23 +46,16 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
 DIST pydantic_core-2.23.4.tar.gz 402156 BLAKE2B af899e149693907542296b5b4fa5f982d2dca5c090331703212aabbbce0a8e0badca3947affa9e42998949ebd18b1ffc2ad9904b47e130bbe7e90150c32bc527 SHA512 c7c9a303ff3c751108622f804f812f3793ad93a95e560b0d6b0a866c3bd41ed7bfdbcd87483f37ad3849969c72adde24083d1a9015ebd610847a7fa6d4068e24
-DIST pydantic_core-2.26.0.tar.gz 411154 BLAKE2B 98206a7dad82d8908102b787cf4c0366a4abdb36bdd6129dc684b810aa22372cef681b49b42453df0b535361bf5232b2d6e1fea583090b2b282a915ca8d2e87d SHA512 08d38844f216994af6842038ada324fb4bddd63e07bc79ce44ac44acf12981aaf8400dd1da53be74cd9d748d8562ba9cc7814a3df79be5995302256bd9d0793c
-DIST pydantic_core-2.27.0.tar.gz 412675 BLAKE2B ee50fa4bc04033f5bca04b92acaf0542e22af73fabe522377cc9e76837945e55045700d6fbe1df8e63dda331e85db8b414cacd5dcfced2ade807ce877294f925 SHA512 55f3eb1b243800dd9d932643c1be5d4b09a86305b1f30fc21b9b73ea073f046fbc28c41158cba9f03ccbd396cb2ee0fc5eb87c19783b7db62785b50f4b95ac6b
 DIST pydantic_core-2.27.1.tar.gz 412785 BLAKE2B cdea663778301ed02649f4a06afc66f6d46e824ffc36c0f536cf48c291cb41da3498c55d79e0e52ad18e773baeb887493a048e3c8ef91a4a368528be6fb76494 SHA512 d3795398116bf971ddd389532e02494b08d40373a51013cfdd17608d05528cd65759b5e51d8e557b737e1a2d8491f9657a37e9c45696c2f08ac23139c81e0dc0
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
-DIST pyo3-0.22.5.crate 546700 BLAKE2B 8ee81360b205bcfc763dbd3d313e2d2f31bde4577bdc77a2ebc3084aa06e30bcc1f7efb97349d781b27882af5b8e82c6476498c86039b9c39286721ed1c08504 SHA512 48b9ada19bb12c6e5f1d41982c3b607f206d88dc078517c45106b631e0ad973145b0b60af06e58013a5189ca8b50e1cfa326c6904bba5aadb791933272ffb277
 DIST pyo3-0.22.6.crate 546746 BLAKE2B 2a6f8c5ce2ee96e1812177a11c5fad7e15f3a73d9e30850edf0855b13db6cc95427e186883b4aae25a2d2466d3fe82f56180a39f3e6e0a54bb0a3ef78d495400 SHA512 d746007eae22f5b7bbf173759c61cbd2aa893898d88b8be5680a0237deec4d113246edf5f62fbbec3579ad4bd7307499b94b887ec306112ffe3df5190fe70e44
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
-DIST pyo3-build-config-0.22.5.crate 31293 BLAKE2B c1e10f78ce66993fa4a88a5994f0266200a529c2939dc1d29137aaa6133bd4c83062cd00d347b491afe5dfcf2995f4a1a0da271a24baf198447b5983a9620d83 SHA512 c11ebfeff1e8ada612dbab16bd86fb8659edb9026bbd826cba84601096fa4192faf260e067b5f9efcd0e8e72fe90bc8f08358cbced45175c662d78bde5eb3d82
 DIST pyo3-build-config-0.22.6.crate 31369 BLAKE2B a1a72de120c4ac4f23a3faaf9b2e340231d7a778a29083ef25fd863fa213afb2a9b720333e3d46a6e1d32105f63073276a23b9bcd999a97fe71eaff3afc7db99 SHA512 9ab44c830e56ddb9ee537ce438fc690664d2c5416f01cdf72498ce062e4c1e7192eac8b7dc2de86c9f2212890b133b69a66209b1615c4eabdf4eaa6882a980fe
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
-DIST pyo3-ffi-0.22.5.crate 69354 BLAKE2B 91dfb41a24cb2b12bf54d6e54949a381ba6635ee55623a7f77a7e672fcf71d7f6937b7ab96f20457d770cf132047ddc9df50ea4aae8506d64e833f11a3b504e6 SHA512 36b8ed6273f7a0298179729c41081c787f353eb338be0f470859ce62a12e05305bd53eb24b6e72f2c56971f18bd64d16c63576f41909e9ac849f355041139a91
 DIST pyo3-ffi-0.22.6.crate 69352 BLAKE2B 99eea6ed87001b23fdeb263937bc14be0fadadc1ad77d4fa8834045ba2fc6ba5c0b89f4051916a058b7640be655afe22785b1da42aac8a32d10209b7b37bf810 SHA512 616e51a0eae1207830fe95251d5b62f126daf446bec68ac98cb1b8538aaa59761dbde62d446a9ee205c23453dbd32bd8ecb15e26265ed1fa1e5e2056efd96369
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
-DIST pyo3-macros-0.22.5.crate 8186 BLAKE2B 78f0c348fec0878ce4c873af3d4c438ccf02a5e971f2fd8b1cc9ea40a3aa8396dc6ea11e4d421a8b8c5eff5752182623632d92403ba6c5565b6b71b386768b04 SHA512 cfd848fb82f183290791930ca2e43a0db63de4f23436c1f1d3c688efdcbba1462346177c5956817418a0f0ea172b1039f5408a02a05ff03671dbb025f0697076
 DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184cabf6391761f850d23508cebcf8d496ce12f747ea241523bb3899886eb20494b076a0651151744bb81d52901a1b4 SHA512 63f7a7b42e099742518c8a3bbc7647e98debb5500d08c39e11e8140fc146e790ab06e005d8d14c89aba79ebc5bf04fe1c92c0e9c5b13421307d3a4682d044179
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
-DIST pyo3-macros-backend-0.22.5.crate 66308 BLAKE2B d30c021da6b013abb8bbc8d55f110f3394c79d85f02506d7a42bba256afd639647210ed66bae289f4dfbd6d060995c0365b278749798b302eb89f1b09c074ab3 SHA512 8a79f9c6f948375e20804d2bc4b98d9fd7d39f99a936afb1d9a0fab599a3ad07e95bc985aa51b0ab8410b6b4f5ebaa2aa347013ae722a2b3f4c51f318415d472
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
diff --git a/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild b/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
deleted file mode 100644
index 69075ed93a05..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	autocfg@1.3.0
-	base64@0.22.1
-	bitvec@1.0.1
-	cc@1.0.101
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.15
-	hashbrown@0.14.5
-	heck@0.5.0
-	hex@0.4.3
-	icu_collections@1.5.0
-	icu_locid@1.5.0
-	icu_locid_transform@1.5.0
-	icu_locid_transform_data@1.5.0
-	icu_normalizer@1.5.0
-	icu_normalizer_data@1.5.0
-	icu_properties@1.5.1
-	icu_properties_data@1.5.0
-	icu_provider@1.5.0
-	icu_provider_macros@1.5.0
-	idna@0.5.0
-	idna@1.0.2
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.7.0
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	litemap@0.7.3
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.1
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.214
-	serde_derive@1.0.214
-	serde_json@1.0.132
-	smallvec@1.13.2
-	speedate@0.15.0
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.82
-	synstructure@0.13.1
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinystr@0.7.6
-	tinyvec@1.6.1
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	uuid@1.11.0
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/inline-snapshot-0.13.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	# tests link to libpython, so they fail to link on pypy3
-	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
-	epytest -p pytest_mock -p timeout -o xfail_strict=False
-}
diff --git a/dev-python/pydantic-core/pydantic-core-2.27.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.27.0.ebuild
deleted file mode 100644
index d1c20ac1fb3b..000000000000
--- a/dev-python/pydantic-core/pydantic-core-2.27.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-CRATES="
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	autocfg@1.3.0
-	base64@0.22.1
-	bitvec@1.0.1
-	cc@1.0.101
-	cfg-if@1.0.0
-	displaydoc@0.2.5
-	enum_dispatch@0.3.13
-	equivalent@1.0.1
-	form_urlencoded@1.2.1
-	funty@2.0.0
-	getrandom@0.2.15
-	hashbrown@0.14.5
-	heck@0.5.0
-	hex@0.4.3
-	icu_collections@1.5.0
-	icu_locid@1.5.0
-	icu_locid_transform@1.5.0
-	icu_locid_transform_data@1.5.0
-	icu_normalizer@1.5.0
-	icu_normalizer_data@1.5.0
-	icu_properties@1.5.1
-	icu_properties_data@1.5.0
-	icu_provider@1.5.0
-	icu_provider_macros@1.5.0
-	idna@0.5.0
-	idna@1.0.2
-	indexmap@2.2.6
-	indoc@2.0.5
-	itoa@1.0.11
-	jiter@0.7.1
-	lexical-parse-float@0.8.5
-	lexical-parse-integer@0.8.6
-	lexical-util@0.8.5
-	libc@0.2.155
-	litemap@0.7.3
-	memchr@2.7.4
-	memoffset@0.9.1
-	num-bigint@0.4.6
-	num-integer@0.1.46
-	num-traits@0.2.19
-	once_cell@1.19.0
-	percent-encoding@2.3.1
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	radium@0.7.0
-	regex-automata@0.4.8
-	regex-syntax@0.8.5
-	regex@1.11.1
-	rustversion@1.0.17
-	ryu@1.0.18
-	serde@1.0.214
-	serde_derive@1.0.214
-	serde_json@1.0.132
-	smallvec@1.13.2
-	speedate@0.15.0
-	stable_deref_trait@1.2.0
-	static_assertions@1.1.0
-	strum@0.26.3
-	strum_macros@0.26.4
-	syn@2.0.82
-	synstructure@0.13.1
-	tap@1.0.1
-	target-lexicon@0.12.14
-	tinystr@0.7.6
-	tinyvec@1.6.1
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.15
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.23
-	unindent@0.2.3
-	url@2.5.2
-	utf16_iter@1.0.5
-	utf8_iter@1.0.4
-	uuid@1.11.0
-	version_check@0.9.5
-	wasi@0.11.0+wasi-snapshot-preview1
-	write16@1.0.0
-	writeable@0.5.5
-	wyz@0.5.1
-	yoke-derive@0.7.4
-	yoke@0.7.4
-	zerocopy-derive@0.7.34
-	zerocopy@0.7.34
-	zerofrom-derive@0.1.4
-	zerofrom@0.1.4
-	zerovec-derive@0.10.3
-	zerovec@0.10.4
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/inline-snapshot-0.13.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	sed -i -e '/^strip/d' Cargo.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-	local EPYTEST_DESELECT=(
-		# TODO: recursion till segfault
-		tests/serializers/test_functions.py::test_recursive_call
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	# tests link to libpython, so they fail to link on pypy3
-	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
-	epytest -p pytest_mock -p timeout -o xfail_strict=False
-}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 6f74332738a1..b152f4ac7e29 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,7 +1,2 @@
-DIST pydantic-2.10.0.tar.gz 781980 BLAKE2B 8880070271bc7bbffe2805699119077437dda3ed011b8dcb6e231eb235dff7e767c1412208a13af6699fc519d5dccbd5345456b76cda816a6460b23055455a4d SHA512 a50d5dfd8c9dd565a432744ff2f31a697d9d0ea6d1d71a69f973f45e75156413937c302f24af34736fbd566f391fcb1e94ab7a06884465cbfa0659ba2f15f117
-DIST pydantic-2.10.0b1.tar.gz 777569 BLAKE2B 6fdde0673b28feb51921417b501b8a9fb43b36d94f5e564f96d04d09bacc34710be7a7d1b72d8a4e17fad493824b5fc556553d5508bff3942303191dc8501e49 SHA512 ef1fb40fb3601949455901b645d9333b37bc7fd9b53b7882ba81e1824a4f123981a3e32e9654e45b29695257c7bcfc19eedde30263862769d8e1c887d9b11d43
-DIST pydantic-2.10.0b2.tar.gz 781700 BLAKE2B 82a3d8e4ab99113ca3e5ac46e058d1844d0870ce4fd5d6ada2ef23cebfc19cb040c4af553088b07904b857609e872caa7d20946536c5ed77fe4a452093e52cf3 SHA512 93ffa34b34ced16746b1f3e53218b863284f08cb1ec2f966cd024826926305c69b8b3bdfb389b9f1a2f26e5b678b054c20cd15bb2849cd665457977e9338b5e8
-DIST pydantic-2.10.1.tar.gz 783717 BLAKE2B fed0933c2f9443ab75cd1d8330944cef11abd0d1dad454c8b857ac76583c8dc9d32e1de99e7096b1e9b0134b258490dabd2b98db1c7901ef73fe5ef7c2675f1e SHA512 fd2283ec7463568f12e2a7a687e2a2b030441101f6c9aa621914ce1ba2bfd0b43da0767bdb0d1909a321f11cd37f85222eac4cc4ca59aa73a7b2fc6ccefd0f8a
-DIST pydantic-2.10.2.tar.gz 785401 BLAKE2B b148575c16226b6abf38348edc1727013aab3450d18df42862f49d44535888b6674d553057563d89bea3f980592fcdafa125984f8ed9d98aff2a1da79458604a SHA512 07aeec5a6fb18b11a27128c24835cb2cc414aa9caa5b3c50c61d5a4aaeed27c5d6fff8448c56328b3d3b25265ed6bb07360172ea341c054f3457cda202e0a44a
 DIST pydantic-2.10.3.tar.gz 786486 BLAKE2B 74abce2fb92704ab15b4b855fb1d96256720cca086a9911a031a5ffcf3c0fc8fcc2c9975affca8796709a13b4c5173c9598ec939207aa544762767577dc7117f SHA512 d5264c29b042ce24e8c03bad7a7db1fa556fb84c90b287cb87ddc52560d60db3d363ed7f05ea1af9e1469e52150388c9b119982cea5272960c0db2b31bd57fc6
 DIST pydantic-2.9.2.tar.gz 769917 BLAKE2B 4e34fda6a9e8e8331278d0b7d0c2dfd61bde637c126fa6dabf78a09c6ef993f84dc8df6af421c8fb6d69c8e1c387a40e4bcd38cbe02f5ac521c6c70821735763 SHA512 2aace9e79a98bd94e5dc626736a245051912a11fdce36013d2ad2f96b266052386a3e12b259dca30ddc38b63c6b00b5bcc9cd5e80f7805de4d8701064f0982aa
diff --git a/dev-python/pydantic/pydantic-2.10.0.ebuild b/dev-python/pydantic/pydantic-2.10.0.ebuild
deleted file mode 100644
index 120238a2408d..000000000000
--- a/dev-python/pydantic/pydantic-2.10.0.ebuild
+++ /dev/null
@@ -1,64 +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="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.27.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.10.0_beta1.ebuild b/dev-python/pydantic/pydantic-2.10.0_beta1.ebuild
deleted file mode 100644
index 0903907891bd..000000000000
--- a/dev-python/pydantic/pydantic-2.10.0_beta1.ebuild
+++ /dev/null
@@ -1,64 +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="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.26.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild b/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild
deleted file mode 100644
index 120238a2408d..000000000000
--- a/dev-python/pydantic/pydantic-2.10.0_beta2.ebuild
+++ /dev/null
@@ -1,64 +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="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.27.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.10.1.ebuild b/dev-python/pydantic/pydantic-2.10.1.ebuild
deleted file mode 100644
index f3124fe32d87..000000000000
--- a/dev-python/pydantic/pydantic-2.10.1.ebuild
+++ /dev/null
@@ -1,64 +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="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.27.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pydantic/pydantic-2.10.2.ebuild b/dev-python/pydantic/pydantic-2.10.2.ebuild
deleted file mode 100644
index f3d3b68b6777..000000000000
--- a/dev-python/pydantic/pydantic-2.10.2.ebuild
+++ /dev/null
@@ -1,65 +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="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/annotated-types-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/pydantic-core-2.27.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/faker-18.13.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-4.23.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-		# benchmarks
-		tests/benchmarks
-	)
-
-	if ! has_version "dev-python/cloudpickle[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_pickle.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 8941e459b0e1..9465c1b5c765 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
 DIST pyglet-2.0.15.gh.tar.gz 6426555 BLAKE2B 8066ac7c3acd613a6fe02403ec5c88822744d6f7ab5e0043ca01443ab94249be7e542bc97f5354286bd3f5675c1c2e4d108ab474d659efe2905b9892e44ece0c SHA512 8b85264a9f13505f86cef694ebdf1e1ff707980b6ec9d205a1c1ef639b2de0c837926476f8a26b33b7ad8a0cd7d9acfefdd0707bace1734db4185a48f01305d4
-DIST pyglet-2.0.17.gh.tar.gz 6499366 BLAKE2B 2113cc99459a543f5ae9612b89d214e99961e30e26ca367b6054b255173375187316d706a13409a160f1f57b4b56029c82ebb74f8722897a8d73e0aa23c88793 SHA512 25657e337df995059bcb7de18c14d151ea5a675e98b6c4ac6524b4cdbee1f44f280d09d15c86bada9f7309de36eb5dcd91ef177d96cbbe8f06c8ef9856838ce3
 DIST pyglet-2.0.18.gh.tar.gz 6505764 BLAKE2B 1eff94cdce597d8a1878d7999ad3d367dcfd03c7ac37af4d299357528ee79f12ece5b896fb0bb3584cf5145e7239a76a9b7cb370e977f9d09b832ff88d230236 SHA512 16c599f99d6b80214f04d7113af78dbec0f491dbe42febc4590cc80a4bbefbd3f1431fe1d6b1f87f48396d367750f7993e4b08b5e329b5d08b93c050c05c6bc6
 DIST pyglet-2.0.19.gh.tar.gz 6506528 BLAKE2B d7c814c800b1091c28009a2f90bbd7a0e62ba0a2139bf10455095fa3e943f6dcf70d2995501f916970ff93d5c8b3e0e605e9014d2deca026b354da2589518ae0 SHA512 a507e32c4f94f5004221d78429f04d89474576ccbd383ab31c039fcb28f0287e1898c4774b1f8739d2d0cb38d73913b004f599ffa84bedebd1c72713f4347a78
-DIST pyglet-2.1.rc1.gh.tar.gz 6528806 BLAKE2B 2da293268a4b196468454472968c7e56200402fb66d6a7076850e0e364d62eece4a1ae31e3c384eb1930e0fad990de65ef13d17085568131f8fc003c369ee556 SHA512 df4a21894b9eef512fc7681afb790355927a87bc3e69dc4c02a2d64195f91cf22b4f2da1a3622bbf077ead8de5594c57d09a1dc771abf1b57e11be8f62ec046e
+DIST pyglet-2.0.20.gh.tar.gz 6507362 BLAKE2B 43d1d60922f84e05da59ac970516fe33df4a7b86f8b30bb5c7433696d8b2414a2ccd7dbc1c3713f7bd92f1f5ce1c4547e28b65270132f4d7b4f8d4311f1e97ac SHA512 9a628206b758a07eb43efbc4e4d62e25e162885eb25e064a6e0dbfc045472baa57cbebc7c85a9cde0cebe1e3562304878b45f880b51e59c2b226a937da20565f
+DIST pyglet-2.1.rc2.gh.tar.gz 6535560 BLAKE2B c8a9682c914007c974ed311a644af3df4008dc22850fef7e8e6de062e29d1e0a8e813cd0e74a3a4d8e02e7b4f20bc8c79196a1acc7e7813671d471aaa137f971 SHA512 b3404eaf1e98df1d40457621187fe643cd7ce40839f412f0a8e3d997b8ef0bfc14ddd1bd2ac019835072e6236df92961bb7eb608274d07f006e925eeb2acfba6
diff --git a/dev-python/pyglet/pyglet-2.0.17.ebuild b/dev-python/pyglet/pyglet-2.0.20.ebuild
index f39643ccc608..a0ea9a81f29a 100644
--- a/dev-python/pyglet/pyglet-2.0.17.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 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/pyglet/pyglet-2.1_rc1.ebuild b/dev-python/pyglet/pyglet-2.1_rc2.ebuild
index 92556ed30f5a..92556ed30f5a 100644
--- a/dev-python/pyglet/pyglet-2.1_rc1.ebuild
+++ b/dev-python/pyglet/pyglet-2.1_rc2.ebuild
diff --git a/dev-python/pylatexenc/pylatexenc-2.10.ebuild b/dev-python/pylatexenc/pylatexenc-2.10.ebuild
index e6d9c497794d..5fd45fa75915 100644
--- a/dev-python/pylatexenc/pylatexenc-2.10.ebuild
+++ b/dev-python/pylatexenc/pylatexenc-2.10.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
index 340756048d87..f35eec1f7d0d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
@@ -134,7 +134,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	~dev-python/toml-fmt-common-1.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 303cedcb8b70..1d4952703de8 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,2 @@
-DIST pytest_httpx-0.33.0.tar.gz 51708 BLAKE2B c4b4a5bc41c44b982dcfe81f09ec4b3ee1eeed9cdc52cea6889988692bfb312eb7c4105cdcd60fadbbf0602236e2e5baf3c1a448248189214c0ec77cde8a3ea4 SHA512 96e3b5e0264f61644ed22fc809f35d0b2b255aa2ba75a5bf33d165c35276f2b731689b70cfbab5b5c901b1be4ff59c4b21704f8b15453582a6095611380830c8
 DIST pytest_httpx-0.34.0.tar.gz 54108 BLAKE2B b2c761a993d5c15aa28ee4d2b29ed44764c9825a3b9a9a471eef534a4f040324d6c822bfd413090d86428591be60d9092541a77188d8ef84bd3e333a976647da SHA512 49ca01ddd16fb68213ec2178111c65fb3f47be6416b67ebe356a47f658140ee42e275e07e377c6740956d895a4b1a719c2cf12ad9cbabc339b20cca94b892ef0
 DIST pytest_httpx-0.35.0.tar.gz 54146 BLAKE2B 1d0814478c3ef26720b42c0bf0fd0a2b42c57eda887b99ba8b09acd6d12a8af04dc3821645130e786558f2f0d42625e0f9145231a86f9ecd0e508fb9a5247a90 SHA512 70ecfc7778aa4eb617e4685851dacec563e507d5f2aa571cd5acae7ac9f1667d7c67ce40144fa5e2649993c0e0aaa11650ea32f2dfe74652ecb115291a4c77ff
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild
deleted file mode 100644
index 7545cb340444..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
-	=dev-python/pytest-8*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild
index 071c9a4d9583..7545cb340444 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.34.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 80ec500c84e7..a4a6723e944b 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,2 +1 @@
-DIST pytest-rerunfailures-14.0.tar.gz 21350 BLAKE2B bb273d77a732c0296ca041b4cbd91fd48052076e9f76839b862b03de9f448208a216483bc486f23542cd99a12ef2934a46e3ea4162ca87bfd5c0904f2d114179 SHA512 8aa23a57206b0e6af133c716517c3c96cc156cc2f86b06c0fa80e9fea2b11f32e98cfb41f6a5fb05b38bab7496258160ba42fe6ae00d7bef8024159a8ed4a3f5
 DIST pytest-rerunfailures-15.0.tar.gz 21816 BLAKE2B 75c42cec3a9cc0208e045be82c1b6660d56fff898ac0e97e992a020229a095a619eb1e87eeca8af7fba4f455f044ddd9729943becd90d185356e7bddb9ab1c6b SHA512 c03f430f9e24e0b149391e08ae6f38450d731d1f6a28294173e75f8776dc596230422e2082bbbc74cf31ea7e4c3105f5d8d57825dc418c4ce1c5538d84c861c3
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-14.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-14.0.ebuild
deleted file mode 100644
index a28588dee7e0..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-14.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-rerunfailures/
-	https://pypi.org/project/pytest-rerunfailures/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if has_version ">=dev-python/pytest-8.2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/pytest-dev/pytest-rerunfailures/issues/267
-			tests/test_pytest_rerunfailures.py::test_exception_match_only_rerun_in_dual_query
-			tests/test_pytest_rerunfailures.py::test_exception_matches_only_rerun_query
-			tests/test_pytest_rerunfailures.py::test_exception_matches_rerun_except_query
-			tests/test_pytest_rerunfailures.py::test_exception_not_match_rerun_except_query
-			tests/test_pytest_rerunfailures.py::test_run_session_teardown_once_after_reruns
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_rerunfailures
-	epytest
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.0.ebuild
index bbcfbe4c0c6e..e5cbb97ff8f0 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-15.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 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"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 67d095436d69..35d485b159f3 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1 +1,2 @@
 DIST redis-py-5.2.0.gh.tar.gz 4832021 BLAKE2B 0b35e2fa0aa2a0d0d03f0bd7bd225ab959e39d7cd37b91411bfcae77ba0571aa81d072a9deffce26dec818e6e298ea9027738ef00b6819405b92b6d2c05245e4 SHA512 7e8661f1bf9ab66d58527124fa08419a962b2a6d45026029487ea8ec8fdf41565ccfa6610311508201ac2ef9ec57f16a0e51793a8c6447de57e0f0c0a829468a
+DIST redis-py-5.2.1.gh.tar.gz 4824044 BLAKE2B 9adf1b7093d7e562782f0c17c9134f33326b19f6ae9895142eadf251165c7d8bed7e61eedc96360724602b42cde4e1f9a0a4193fa76a3de2e30b95268a2f5e2b SHA512 583495712b492558fa186a0b72f19576418fc49937e4e2c2716335f3b05f5c5da6dda149abe6a55ef1dc93284660348a5d545a69db0a1dde08218305f44e9f52
diff --git a/dev-python/redis/redis-5.2.1.ebuild b/dev-python/redis/redis-5.2.1.ebuild
new file mode 100644
index 000000000000..4706518f1a6d
--- /dev/null
+++ b/dev-python/redis/redis-5.2.1.ebuild
@@ -0,0 +1,111 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+MY_P=redis-py-${PV}
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# https://github.com/redis/redis-py/issues/3339
+	sed -i 's:(forbid_global_loop=True)::' tests/test_asyncio/*.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+		# require extra redis modules that apparently aren't packaged
+		# on Gentoo
+		tests/{,test_asyncio/}test_bloom.py
+		tests/{,test_asyncio/}test_graph.py
+		tests/{,test_asyncio/}test_json.py
+		tests/{,test_asyncio/}test_timeseries.py
+		# apparently available only in "Redis Stack 7.2 RC3 or later"
+		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
+		tests/test_commands.py::TestRedisCommands::test_tfunction_list
+		tests/test_commands.py::TestRedisCommands::test_tfcall
+		# TODO
+		tests/test_commands.py::TestRedisCommands::test_module
+		tests/test_commands.py::TestRedisCommands::test_module_loadex
+		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
+		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
+		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
+	)
+	local EPYTEST_IGNORE=(
+		# fails over missing certs, we don't do cluster anyway
+		tests/test_asyncio/test_cluster.py
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	if has_version ">=dev-db/redis-7"; then
+		local extra_conf="
+			enable-debug-command yes
+			enable-module-command yes
+		"
+	fi
+
+	# Spawn Redis itself for testing purposes
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+		${extra_conf}
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index da5b305e778f..e67351e2b608 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,2 +1 @@
-DIST s3transfer-0.10.3.tar.gz 144591 BLAKE2B eb25a7efabd3fbedfb93fb85dc94c53a2ad1e2ad5d72b0fb82355b50e9211adf2f1ad49dfec01dbeab5c59095c315a0a06ed60bfbb86b507375e67c52ea6d4b7 SHA512 63ad855ad5918daf0f1a6d2240ff15d96a0ad399c7248a1886d3b36bc445dcc2b64dd38f177653037e1a1216ab30cc08aa19c2822e5d0d1df5cfa302a50c4e3e
 DIST s3transfer-0.10.4.tar.gz 145287 BLAKE2B 0b15068862236237287243237639310d35de942b0d3d399edd5ee924195ee8f45b2badea4b02f8dceef64f034111a810910b8208cb6e0c5db070b39f5c39f615 SHA512 671d95e9f507bdca8cf53b88cd28285f9c2ae1456fcb24ba4a61a75d30e8c8fa8b2a4faa8c8364114dc3e5c57f630d5b61575847b167e37b3de44b42c45f6a63
diff --git a/dev-python/s3transfer/s3transfer-0.10.3.ebuild b/dev-python/s3transfer/s3transfer-0.10.3.ebuild
deleted file mode 100644
index 6e865197df28..000000000000
--- a/dev-python/s3transfer/s3transfer-0.10.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 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.10.4.ebuild b/dev-python/s3transfer/s3transfer-0.10.4.ebuild
index 597e8a906882..6e865197df28 100644
--- a/dev-python/s3transfer/s3transfer-0.10.4.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.10.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3d24cd43a3c9..fa831b8af949 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1 @@
-DIST setuptools-75.5.0.tar.gz 1336032 BLAKE2B 3e06713c45212ef64b0f041089aa0621f3c12b850c9716e21181e91192378bb0596f81cfd6c484c3ec2d6f7e29ea7967fb17a7e5bbc2de996968be4fc47c2c32 SHA512 353ad99bb946d5ed07139f3a6d5f0efc9a4ca9721b060fce9095ee6fc74ac0e832fd0ebf7b2d1d68c71021db30561c5fea6abdde42174981f26002390a1e0e67
 DIST setuptools-75.6.0.tar.gz 1337429 BLAKE2B 65ba2e3de8dd0c86ab0ad59a5dc99a860ef5b59f357272eb2568347a496d853ef8e12a2d456dee3effe6f100bfb8d29e2f9f60123b58d791003ce3cddac23e8a SHA512 bdc12309165912f8de84e6f4ceaaf8f6b05dc1506a9205201784eb740346d773a7701af9b570cb13c272d81dcc0b4928e53ea1c4bb7c179debf479701c35bb6e
diff --git a/dev-python/setuptools/setuptools-75.5.0.ebuild b/dev-python/setuptools/setuptools-75.5.0.ebuild
deleted file mode 100644
index 829d67b85e27..000000000000
--- a/dev-python/setuptools/setuptools-75.5.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# 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.2.0[${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"
-	)
-
-	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
-	)
-
-	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.6.0-r1.ebuild b/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
index f94e3c2bbb36..33c115434eb5 100644
--- a/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-75.6.0-r1.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.6.0.ebuild b/dev-python/setuptools/setuptools-75.6.0.ebuild
deleted file mode 100644
index d8a66522a526..000000000000
--- a/dev-python/setuptools/setuptools-75.6.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# 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.2.0[${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"
-	)
-
-	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
-	)
-
-	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/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index 2714c744e1ce..c60ff3c5a5a8 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1 +1,2 @@
 DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
+DIST sphinxcontrib_programoutput-0.18.tar.gz 26333 BLAKE2B d1f1da158296869efb9dfb98979069a7692f1742053ba29de611d2df2e239200ecbed2009aec6e9264af30a2056a02d23f257d8b66367110304bc7a3a7f1812f SHA512 2ead065812bfe85147a025e4e541880b25d5876a584406130fa3423009496b6c7cf482f86af92d22363d0893ce767d2957112e7c41bd8005fa41e043399e4d0e
diff --git a/dev-python/sphinxcontrib-programoutput/metadata.xml b/dev-python/sphinxcontrib-programoutput/metadata.xml
index aaa2f92cc06a..d1ac4947882d 100644
--- a/dev-python/sphinxcontrib-programoutput/metadata.xml
+++ b/dev-python/sphinxcontrib-programoutput/metadata.xml
@@ -15,8 +15,8 @@
    <email>jason@nextthought.com</email>
    <name>Jason Madden</name>
   </maintainer>
-  <changelog>&#xA;      https://raw.githubusercontent.com/NextThought/sphinxcontrib-programoutput/master/CHANGES.rst&#xA;    </changelog>
-  <bugs-to>&#xA;      https://github.com/NextThought/sphinxcontrib-programoutput/issues&#xA;    </bugs-to>
+  <changelog>&#xA;      https://raw.githubusercontent.com/OpenNTI/sphinxcontrib-programoutput/master/CHANGES.rst&#xA;    </changelog>
+  <bugs-to>&#xA;      https://github.com/OpenNTI/sphinxcontrib-programoutput/issues&#xA;    </bugs-to>
   <doc lang="en">&#xA;      https://sphinxcontrib-programoutput.readthedocs.org&#xA;    </doc>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
index 5f0843de304c..ff1a3d10372e 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit distutils-r1 pypi
 
 DESCRIPTION="Extension to sphinx to include program output"
 HOMEPAGE="
-	https://github.com/NextThought/sphinxcontrib-programoutput/
+	https://github.com/OpenNTI/sphinxcontrib-programoutput/
 	https://pypi.org/project/sphinxcontrib-programoutput/
 "
 
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
new file mode 100644
index 000000000000..8bcf66bbed73
--- /dev/null
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
@@ -0,0 +1,38 @@
+# 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="Extension to sphinx to include program output"
+HOMEPAGE="
+	https://github.com/OpenNTI/sphinxcontrib-programoutput/
+	https://pypi.org/project/sphinxcontrib-programoutput/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/furo
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# namespace
+	rm src/sphinxcontrib/__init__.py || die
+}
+
+python_test() {
+	epytest --pyargs sphinxcontrib.programoutput.tests
+}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 15da4f5eb087..e37a34acdbb4 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -13,8 +13,8 @@ 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 quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05
-DIST sqlglot-25.32.1.tar.gz 19754688 BLAKE2B 78c950ce80aa9bd4383e549994225161c6650ca882bb27ebafd11a2c3dd9635d957ec3ab0f286a848959479a0b03e68eb9b793ebe25a9fcb4e6761511c8564b0 SHA512 968a342b574a2756ddcfa4e00b3ff16ae20697d9e76f987faf55267dd0e65aa8c939991a55ce7c54ad2571511e8fb1432b01d327c5b7bd870f7fbf75e781011e
 DIST sqlglot-25.33.0.tar.gz 19759713 BLAKE2B 238af5c257d9eff2efb6c785134c3f3c42d31d1ec6c289e2bd7b2948ed898c2f44ecd7ce185042d006ce8032e6be75933bebef75741115365589a43e330c7a4b SHA512 e9d21abc3d05d69c6f4b25be83c996bad06115847ec389b76d036b8f1f81debf6c14cf2432019a91dfd87188ad03f457047f17ba1854278192980d565fe94b18
+DIST sqlglot-25.34.0.tar.gz 19770469 BLAKE2B 764ef90d3b446c854e18a73a08559201a52a365f5565cd700ea1e9f006eab2ec50c0eacefb18c8221958ab6b8aa6f5174e78f3243a7817837af510e388b17fa1 SHA512 8c97ebcf0082dcd05ab588ec94e47cb324f670a02ad25db770637e76b412c1616dbf4298dd0923b4e237149ed6556a46859e64ca605fa566a9792ce1f7726ef0
 DIST syn-2.0.87.crate 278076 BLAKE2B 93385f64103fdb482bec34c7912474ae7a5935948715e6eb9a54907e0db5c39f089f6cd393bab33c935c59a1bbb0f4099431f206343811c1a450554d96a35756 SHA512 bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
diff --git a/dev-python/sqlglot/sqlglot-25.32.1.ebuild b/dev-python/sqlglot/sqlglot-25.34.0.ebuild
index d48438a800cd..d48438a800cd 100644
--- a/dev-python/sqlglot/sqlglot-25.32.1.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.34.0.ebuild
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index f3d3d424c6bc..87b9880938c3 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,2 +1 @@
-DIST stevedore-5.3.0.tar.gz 513768 BLAKE2B 7220e422b4b84bfc236d77707ff79eefab3724f98f253f9d94761941cdc7d47f7a2a9cd428810d16189bf1bbd51f899c3c5d6492f06397a422efc4067fdd0558 SHA512 b08ba776a03ea5776d73ff6ef2aa0bca7de05c3228172bcec6eb438cec8f64ff821d7fe5b34873822522d51f71532ba9c182a396a915459966ffdbc3cada20bb
 DIST stevedore-5.4.0.tar.gz 513899 BLAKE2B 6fda4d24f51ef9dd25db8adf28832ff30308415feaac0416c4fa93d3cdc185ed99ee82b8d6f93c8fbf4ef747827dff4f95494dccd4c89bc926727a1964380570 SHA512 b377f79c3d467fc910b6a85bb1788f85982f6e0df561b5187ac06652301ca357d274048e1538b0d641d1159c1de973edfa2146561946a965ac86015a88b7cce0
diff --git a/dev-python/stevedore/stevedore-5.3.0.ebuild b/dev-python/stevedore/stevedore-5.3.0.ebuild
deleted file mode 100644
index 1a15c208830b..000000000000
--- a/dev-python/stevedore/stevedore-5.3.0.ebuild
+++ /dev/null
@@ -1,45 +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="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-5.4.0.ebuild b/dev-python/stevedore/stevedore-5.4.0.ebuild
index 2aac5b2a0996..1a15c208830b 100644
--- a/dev-python/stevedore/stevedore-5.4.0.ebuild
+++ b/dev-python/stevedore/stevedore-5.4.0.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"
 
 BDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index f9ca115e9ef7..b53c5abfee6d 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,2 +1 @@
-DIST stripe-11.2.0.tar.gz 1362386 BLAKE2B 56e22671886efe3e2b8d3c7f41402f5dcf4320e3ceea8d0ed9cf2813ba682ead62e9af796ef94d05f5eb18f678c55c36a1005902fdceca5ce9a9b5b4ac204193 SHA512 9344845d6b9b89886ea6ec2918b4ce53545141232aadaadfbf3f7bdd6522b1ee1bfe57f0145e69c0edeb66fb01dedb3a9fd7263410f7d2fbae7240c68ac87936
 DIST stripe-11.3.0.tar.gz 1367031 BLAKE2B b46cae95059a1aa7087743772b5cb23456e64b276befa852b0c13ce417f624ac6d9a90e64a43aeb3d60941ad73cc87afa114d4161c5e5b3e5ae6033b4378f6c1 SHA512 4b8934653f138b86f7d64977f2817fc0ad54a89d794521af7d1f193ecdcbb366e78ece286a3c768f946d281aba998443e675e6db66fcd3a0084641053e55a182
diff --git a/dev-python/stripe/stripe-11.2.0.ebuild b/dev-python/stripe/stripe-11.2.0.ebuild
deleted file mode 100644
index 3fb61018032d..000000000000
--- a/dev-python/stripe/stripe-11.2.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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.190.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-		"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.3.0.ebuild b/dev-python/stripe/stripe-11.3.0.ebuild
index 1abae105960d..ea7a080c7440 100644
--- a/dev-python/stripe/stripe-11.3.0.ebuild
+++ b/dev-python/stripe/stripe-11.3.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/toml-fmt-common/toml-fmt-common-1.0.1.ebuild b/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
index 431e3e8d75a3..06055f57fba3 100644
--- a/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
+++ b/dev-python/toml-fmt-common/toml-fmt-common-1.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index d0c0fd8dd881..2552f2335940 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,5 +1,4 @@
 DIST twisted-24.10.0.tar.gz 3525999 BLAKE2B 4d274a4b5989597c2789e05774bad3595ac5284f5da25fb488d46b87a4bb0e0ab311fcab228eaf070530451a28098bbefc326f6d4806378b2fe076adf5b07199 SHA512 dad7c1301c3b31f096db8c4796e064e864c2c28107c46c202b4f4b123c99a0e69f9b43afbf582997dd2c15a08e95b41213e4bc67ea1fe9fd8137c76656a20162
 DIST twisted-24.11.0.tar.gz 3526722 BLAKE2B cd874da038e3cbc369283de5d598b99680e3122ed9bdd0bbb8e541793b739b88281708c618c8f0cf9b4bf13684188b0b893ec5f744ae510c1af446822652a866 SHA512 cfd17cad9573b47b43761625ab529a1a0b27ce75545d9bc277622a7ce138b5dccf554d3c8764de1baafc07192e1172e50f4c6d19dc65590b5318a603a808efb9
-DIST twisted-24.11.0rc1.tar.gz 3526729 BLAKE2B df06ddce78b9e2b841f7753fd8731de4cd21e6c045f0e7d9b0e5f806c23a43428cb3bf4559d9b2b2472e904890db0e35ef4e8ff9ce609f7dc9cfeb35cadb0ae2 SHA512 8191bb1515ccd03b679f3d44555f8dd0a0f7c50f0257e9512e120c377909997c219212557c848665ab34037ba60fb77fec37a6e176e77af64ee5e0c5546b7516
 DIST twisted-24.7.0.tar.gz 3516844 BLAKE2B 169347260b473ea1c50806ce50324ebd51388186098886ccaad1f94e55f6b14eb7a7fc42728dbeaf4b5649d0e6dc1e4624cd5ab6d79feeaa733e18d09cfd689f SHA512 cd5a993c8f1dfdc82597bdc095e07c1016a2a86d1ce5b011b27f9f760db428fcba4579dda5733244979827f9c772c2480d1d419d2d24ae7af8697e2b8e852f62
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
diff --git a/dev-python/twisted/twisted-24.11.0_rc1.ebuild b/dev-python/twisted/twisted-24.11.0_rc1.ebuild
deleted file mode 100644
index ce5f45b52271..000000000000
--- a/dev-python/twisted/twisted-24.11.0_rc1.ebuild
+++ /dev/null
@@ -1,161 +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_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing pypi virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="
-	https://twisted.org/
-	https://github.com/twisted/twisted/
-	https://pypi.org/project/Twisted/
-"
-SRC_URI+="
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="conch http2 serial ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-24.8.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-3.3[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	http2? (
-		<dev-python/h2-5.0[${PYTHON_USEDEP}]
-		>=dev-python/h2-3.2[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-	)
-	serial? (
-		>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-	)
-	ssl? (
-		>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-		>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
-		>=dev-python/idna-2.4[${PYTHON_USEDEP}]
-	)
-"
-IDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	>=dev-python/incremental-22.10.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-			>=dev-python/bcrypt-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-			<dev-python/cython-test-exception-raiser-2[${PYTHON_USEDEP}]
-			>=dev-python/cython-test-exception-raiser-1.0.2[${PYTHON_USEDEP}]
-			>=dev-python/idna-2.4[${PYTHON_USEDEP}]
-			>=dev-python/httpx-0.27[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-6.56[${PYTHON_USEDEP}]
-			dev-python/pyasn1[${PYTHON_USEDEP}]
-			>=dev-python/pyhamcrest-2[${PYTHON_USEDEP}]
-			>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-			virtual/openssh
-			ssl? (
-				>=dev-python/pyopenssl-21.0.0[${PYTHON_USEDEP}]
-				>=dev-python/service-identity-18.1.0[${PYTHON_USEDEP}]
-			)
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON} (xfail)"
-		return
-	fi
-
-	# breaks some tests by overriding empty environment
-	local -x SANDBOX_ON=0
-	# for py3.13, see
-	# https://github.com/twisted/twisted/pull/12092#issuecomment-2194326096
-	local -x LINES=25 COLUMNS=80
-	"${EPYTHON}" -m twisted.trial  -j "$(makeopts_jobs)" twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]]; then
-		python_foreach_impl python_postinst
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index eaf3ff1949de..fb205427d1f3 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,4 +1 @@
-DIST types-setuptools-75.2.0.20241025.tar.gz 43477 BLAKE2B 76cc7b50a0b1a8f6bc11752caf5ff09272acd0ae8ddeb76c6c367fe8350be9ac9ce79b0cc8e603aaa3c90300b86fd97ab72241998ea69396a128207052dfd36b SHA512 86a1c753a7258d61678c9eda59c8d0f1549180e08216e754e717f7f07c50c4c48ec3275f1516d3b49566ba271be6aeee1b3ea3672c627fac98d8adbddf2b3d17
-DIST types-setuptools-75.5.0.20241119.tar.gz 43782 BLAKE2B 8148966d0ea9437d30b34644cede66fc37f7a7cd3f741edf4dcabb4987c764a2d22eb495137e2648bf91049b4a73182ff35193d7bf9a3d78dc1189d96de0163a SHA512 29775a81032efa3207a5161cad2b799b36a0100ba9e2cb291f8851b9d35ff06704fecb5da008784dd7b517677196e9b52ca50c39c32f21b3269688d3d9f754d5
-DIST types_setuptools-75.5.0.20241122.tar.gz 48541 BLAKE2B 0a839f6026030131d4bb4607dfca6f838291913764eaaa27ee524ae721be78a2c13ec7d542f9b0b89940d15996ca7f14cabcac73fcb5e24e2fa701cb622247c5 SHA512 a43450657b23f201f047252b8ad9f8829d94d50dbc9e8a93fff7aea3e7423bf27873072aa335d4ce0facd00d1c6485c20504d0dc158776629b686e393ce6fe54
 DIST types_setuptools-75.6.0.20241126.tar.gz 48569 BLAKE2B 0e896fa128c5799b14dcca2fdc7385c09223652f775bc0928b21ee7992e0f34c0e057a63ccc99065b48dd19cecccdf57423cad682060014a0e0c62d396d55f3d SHA512 89d2705fd69e117345d04f5f735c00d7365bae1ced78cfab3a210a69847df8be134fb25092db563b5d83621f5e8524e8abeab368c531186282f70dc9d7ac40ab
diff --git a/dev-python/types-setuptools/types-setuptools-75.2.0.20241025.ebuild b/dev-python/types-setuptools/types-setuptools-75.2.0.20241025.ebuild
deleted file mode 100644
index 8dd2f01eefd7..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.2.0.20241025.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{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.5.0.20241119.ebuild b/dev-python/types-setuptools/types-setuptools-75.5.0.20241119.ebuild
deleted file mode 100644
index d27d371b9a83..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.5.0.20241119.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{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.5.0.20241122.ebuild b/dev-python/types-setuptools/types-setuptools-75.5.0.20241122.ebuild
deleted file mode 100644
index db8f0783e475..000000000000
--- a/dev-python/types-setuptools/types-setuptools-75.5.0.20241122.ebuild
+++ /dev/null
@@ -1,16 +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} )
-
-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.6.0.20241126.ebuild b/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.ebuild
index db8f0783e475..066e0646b762 100644
--- a/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-75.6.0.20241126.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"
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index add25945fc8b..8a5d5c9a3ff4 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1 +1,2 @@
 DIST ubelt-1.3.6.gh.tar.gz 370002 BLAKE2B 1c3674ada7d2e0b9db7cbd28da50e453d6a56a81f8f874d4f791f6d41b5b8427d3dec84aa4c0cb283f6a38f5e413539193c4120a18b87442fb80507720f0b5c8 SHA512 bde288aca46bb62ac189a7ee2f3fc0771a766097b0ffca954ac90d8edd8ca156bad87c07163e812e99929ad8032b77d12cbfa984145cb7bc053fa4ab30d39a4a
+DIST ubelt-1.3.7.gh.tar.gz 374636 BLAKE2B a956b9a6ccae714bb634be977376b9b6f502d8c54768173f0560ae1e17e415209aaa94f43a6e639d430b9e9ccedb70e69f835d5375335250ce2ad9a783aee975 SHA512 778cf5d737bc479bfdec497cc03111b2386f5480e7ee5017a72cff7c33c145c7db70004993bf9d438df4f5c1549344869f2853f4d5143cedf41a3ca4e1e11046
diff --git a/dev-python/ubelt/ubelt-1.3.7.ebuild b/dev-python/ubelt/ubelt-1.3.7.ebuild
new file mode 100644
index 000000000000..2c6c660c37bd
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.3.7.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_editable_modules.py::test_import_of_editable_install
+	# relies on passwd home being equal to ${HOME}
+	ubelt/util_path.py::userhome:0
+)
+
+EPYTEST_IGNORE=(
+	# asserts for running on win32 in global scope
+	ubelt/_win32_jaraco.py
+)
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 3ed189eb2788..ac4197f2b6e8 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,16 +1,7 @@
 DIST pubgrub-57832d0588fbb7aab824813481104761dc1c7740.gh.tar.gz 95600 BLAKE2B 8bdf971091d6816c326925c4603aa9296d6a92c2ede6a6245e0e5e64b741863e5d93aac03990004c13bd592d3d6ca2c662500e4c8d33e9959d6df9e1023a41e5 SHA512 8eae3c00928d921ca7cfdeff124962e477ae32387fb4b1ebfecd968181ec6bb2c2d96c918d8a9f521f1b9666eb6272c9f982b444d22a432f9471414f081694ee
-DIST pubgrub-57afc831bf2551f164617a10383cf288bf5d190d.gh.tar.gz 93839 BLAKE2B 14253f61758d294b4140bbeacf4ab169e4e653eed1f8b36269a650962bda16e867a16b21b1f8304323e776d9c6714748807b69a29807378579940ae1ddc0d626 SHA512 1423aa1f2410ed130cba2d663e0bba4d0a27db53cec81d389fdfe08c196e203fc7212b73fed2aa8c382306093d1a38c8def069e5adc0fc3506ecefa820c825ac
-DIST pubgrub-95e1390399cdddee986b658be19587eb1fdb2d79.gh.tar.gz 88127 BLAKE2B 661b639a7028b7dfe4967b4e2f187c3d403e1796bb09ae4606854414547cf81a5907d7dc9c1f8c3f6fe6986b1c8c22a89fee9e93d2ca79d5241350916991cf05 SHA512 8fdcd1ca1badbd140eb386ff37dd91b26d2b81273544b25a376462b900e9b84e59523ff75a68abe4a03834d72ee0d44246f16aea5c7e9091ad5375a86d3aee70
-DIST pubgrub-9cd9049a64c7352de2ff3b525b9ae36421b0cc18.gh.tar.gz 95485 BLAKE2B 08db87c7bce1d6553e23fda3a4ab8d259d09ef50500846fbadae3c24841d7df0af40b052448d71f52196bb2da4ce0428ad9ad6c43dbede2910f39e602c168f6b SHA512 1ea397be9ecc236c275706c8bdd9c6f9baa9852fce30cdc7009bfeff43ecc745391c3aa75784f1a39bcc8d77b9687f028a494610af632ab6e8a9efbc88ad1653
-DIST reqwest-middleware-d95ec5a99fcc9a4339e1850d40378bbfe55ab121.gh.tar.gz 40815 BLAKE2B eb7edc4e4599635714b30e5a49b1ddf04e76a696618713320fbb06b240e5f77dafcba78e8532a7de3ada682773a65c88405a5bec2261a7da4310a7cc95b2554e SHA512 bc29f8e634cbfde9d89db3e7ac16a83b6545c15ecec1d0eb4eb2ea2c1647fb521712a9ebe98480cd0dff727fed0ecbceaaf3b23e0d85d97a0498f2e576cc9d7d
-DIST rs-async-zip-011b24604fa7bc223daaad7712c0694bac8f0a87.gh.tar.gz 51706 BLAKE2B 354eb52c95ea355521e1e6a7c841102424c47c156fdb0efb62e3cac666ecf289806aeefab8a0273a7c3283429ac81502283bdb5424d5f925621e5c2b1430fd4d SHA512 6650eef354e84daf41a8572b98b29f2873b7f071dd1d6983292c70b2f580fdc50cd26762d2228a70c2b200eae2f40476e6604702aa62cc97558301195bf19eb8
 DIST rs-async-zip-c909fda63fcafe4af496a07bfda28a5aae97e58d.gh.tar.gz 51763 BLAKE2B 59d053bc6692014d884a9247dea1b57a8789469ba2abbcc92ec21bb0022cbd74874afc463082156ab697aa6c80635019857a5d7e2dc150274e8b04d720518c36 SHA512 3a309566f4925b02496fcf19bc2865968edf6fb65082ca4079d2cee79e6b0353a1910c079f2afe656da0d0f6ddde5102052a221ea35a7dabc6d690a11218b20a
 DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
-DIST uv-0.4.30-crates.tar.xz 45786704 BLAKE2B 72a5828c5c504859248312e0d796a6505e4d0546218c8f7f99e37843afdf9496ea1ba4b1f094979299de417accca7f021e4f8971e467429e7d986ed9a3fb2008 SHA512 49abd05fa9e14b1bdb1b4d26f1e68a2038d57bd25c756440bca209b513de42fd8d33ce6e1333392dce65ab427285651809b44e024758359688af5fb87efc19ed
-DIST uv-0.4.30.gh.tar.gz 2832043 BLAKE2B 11c0d090161b9aa6d6e84d0edb15701c8eaba8281579653d6b0ba84003933f82ec5b71c3c33689e5324e51de70b7af41e4799f35fb45f57ce6d58fafa371a615 SHA512 4930c863aae71ae6e6f5b7ba20ff30ffe4c044f6980f973110d0c8c3079cb4aacbe774fe4577eb8d9c16f5d41d2cd0974c0fe63cf0d10e065c6b8d4cf553b80b
-DIST uv-0.5.3-crates.tar.xz 46488584 BLAKE2B 896f56ca633f3bdfb167df1a93c12358613ff2c42aaddfd3ac42eaff6812e4b78a5bedbdd4f6ce14b871cf778836e1bb8fed81134309411551dd6f36d67d6313 SHA512 ecb51b4e8fbe5f73c3bcba9706a6976a9b7eeee31e161463ff8923bd97ba6f0374e471b89e71cc090806561c2ed2fe9b2ad987934d89d0d8d96b88534305aa3b
-DIST uv-0.5.3.gh.tar.gz 2908026 BLAKE2B 0b9393a5d0cf8833e3e4bd9cd3374f689c5295053f02b4e750512f57a02844126d91e2538e044d4fac719a573ad13f592fe99ec1bcdd233b409e1dd9e32a3e9e SHA512 00afce159326a0551ef09d6e0fa82270b9baf40ba47ed3ef5e56b73e272f56d4d9a410fdc3e832989218c0997f7778a2d339b87171e69fed55baacdf2d48b556
-DIST uv-0.5.5-crates.tar.xz 46246372 BLAKE2B c461c5140f7ffae63d16fac6c4069999c57d62095d4e4c447981edc63bb7d5c0da74b5bdbd60150abbf9a645430c52df4ec305e05c1025ce0603b221e01d32bc SHA512 3caba853e65b9fec57a4e3a260c57af8a38e7d9a73b09da22661a14ec329cf0ed7d1851a6804d69c750390edb59872c6d97b023557c48730bedc7ccd2b1b9bef
-DIST uv-0.5.5.gh.tar.gz 2932557 BLAKE2B 0a31c0529ab82ed6eb0cbb5595f6b00dfffa53c55b204adc70bec5bd1b22b1108caff9422d9ff2adb0ff17468ede46b9393639945b7cd11df2f03fd0bdb754c3 SHA512 0962ccf3b69be53e7d3d6b5d539b2b0c02dd615ab25913c3feb2701e1285e2e8c2fc2ba3d0dc361121ceb4cd439d7fa3a30ff82eb6b76ec23958a8a27154c88d
 DIST uv-0.5.6-crates.tar.xz 46263172 BLAKE2B 73b1d2dc957f89f923dda09a8c038426041292c442ce253ff9110f996cd1e1f892a5a438d8e1c894fc0d823401cced0ddc8ad88b5e6a83199af7055a04ce85dc SHA512 c9d4f8085416bffb1e1872fd907d15a50cae0c0c5fba994d27b3acdc3c836dffd771558246573af4bb7467353a031ea56018d5ae1fbdffa4f63988462de00343
 DIST uv-0.5.6.gh.tar.gz 2952255 BLAKE2B b815b60b99f959751f5839365b8b210919247ad99bff93ee4d202bc152bd06b83a62914cfbf341bfddb5b2c87d9e546c5e2a6d1baff1599d0218160ee89de504 SHA512 fc8c7f4f60a3d2ce997341450daf20ad039ef379ac5dd4575f8db0327284bd8278419b66f8f9695f2701a9579ab004b5b60476bd8dc4c27314211f795118bc5a
+DIST uv-0.5.7-crates.tar.xz 46271856 BLAKE2B 5ffadeaaed6797be56f0bb74a696e1fe4d7df2bd7baf1db51380a1da6db7a462d7189fb16c07732dcf80066715f890dc55cb64ae2bf8b18b5b1a149858a8e84e SHA512 99be269ec5e9557ffcdf01feda9b697f65c43b81421dba395ab3b2203d37393a92bf9bb768608c3d91e350d415682e2828a754be8f7c15031eca5544f5b33a98
+DIST uv-0.5.7.gh.tar.gz 2973450 BLAKE2B 7da87d81a53517c075963e5af538ac7f1c5ad8a47931d75c1d6ec8377d533910a2a8953a164f131f269a0d39859fab101f1f9300f22e3af00374d78395bf16b0 SHA512 1bfcfd4406df25b8fd14dba65d7fd16a6b7294e848a9fc5c206f7517cabbf480fac36378d6c03be8b06c978a5118acabf7feed432110a53d305ecc3476b39781
diff --git a/dev-python/uv/uv-0.4.30-r1.ebuild b/dev-python/uv/uv-0.4.30-r1.ebuild
deleted file mode 100644
index 4d826c5cfb40..000000000000
--- a/dev-python/uv/uv-0.4.30-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%'
-	[reqwest-middleware]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-middleware'
-	[reqwest-retry]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-retry'
-	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.80.1"
-
-inherit cargo check-reqs
-
-CRATE_PV=${PV}
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-DFS-2016
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove patch.* that breaks GIT_CRATES
-	local reqmw=${GIT_CRATES[reqwest-middleware]}
-	reqmw=${reqmw#*;}
-	reqmw=${reqmw%;*}
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-}
diff --git a/dev-python/uv/uv-0.5.3.ebuild b/dev-python/uv/uv-0.5.3.ebuild
deleted file mode 100644
index 27ee2208aa68..000000000000
--- a/dev-python/uv/uv-0.5.3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-declare -A GIT_CRATES=(
-	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;57afc831bf2551f164617a10383cf288bf5d190d;pubgrub-%commit%'
-	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;57afc831bf2551f164617a10383cf288bf5d190d;pubgrub-%commit%/version-ranges'
-)
-
-RUST_MIN_VER="1.80.1"
-
-inherit cargo check-reqs
-
-CRATE_PV=${PV}
-DESCRIPTION="A Python package installer and resolver, written in Rust"
-HOMEPAGE="
-	https://github.com/astral-sh/uv/
-	https://pypi.org/project/uv/
-"
-# pypi sdist misses scripts/, needed for tests
-SRC_URI="
-	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
-	"
-fi
-
-# most of the code
-LICENSE="|| ( Apache-2.0 MIT )"
-# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
-# Dependent crate licenses
-LICENSE+="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
-	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
-"
-# ring crate
-LICENSE+=" openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-lang/python:3.8
-		dev-lang/python:3.9
-		dev-lang/python:3.10
-		dev-lang/python:3.11
-		dev-lang/python:3.12
-		!!~dev-python/uv-0.5.0
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-check_space() {
-	local CHECKREQS_DISK_BUILD=3G
-	use debug && CHECKREQS_DISK_BUILD=9G
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
-
-	# remove unbundled sources, just in case
-	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_configure() {
-	local myfeatures=(
-		git
-		pypi
-		python
-	)
-
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	cd crates/uv || die
-	cargo_src_compile
-}
-
-src_test() {
-	# work around https://github.com/astral-sh/uv/issues/4376
-	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
-	local -x COLUMNS=100
-	local -x PYTHONDONTWRITEBYTECODE=
-	# fix tests failing because of our config
-	local -x XDG_CONFIG_DIRS=${T}
-
-	cd crates/uv || die
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cd crates/uv || die
-	cargo_src_install
-
-	insinto /etc/xdg/uv
-	newins - uv.toml <<-EOF || die
-		# These defaults match Fedora, see:
-		# https://src.fedoraproject.org/rpms/uv/pull-request/18
-
-		# By default ("automatic"), uv downloads missing Python versions
-		# automatically and keeps them in the user's home directory.
-		# Disable that to make downloading opt-in, and especially
-		# to avoid unnecessarily fetching custom Python when the distro
-		# package would be preferable.  Python builds can still be
-		# downloaded manually via "uv python install".
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-downloads
-		python-downloads = "manual"
-
-		# By default ("managed"), uv always prefers self-installed
-		# Python versions over the system Python, independently
-		# of versions.  Since we generally expect users to use that
-		# to install old Python versions not in ::gentoo anymore,
-		# this effectively means that uv would end up preferring very
-		# old Python versions over the newer ones that are provided
-		# by the system.  Default to using the system versions to avoid
-		# this counter-intuitive behavior.
-		#
-		# https://docs.astral.sh/uv/reference/settings/#python-preference
-		python-preference = "system"
-	EOF
-}
diff --git a/dev-python/uv/uv-0.5.5.ebuild b/dev-python/uv/uv-0.5.7.ebuild
index 74f61c6fb2e1..c67a480aec6d 100644
--- a/dev-python/uv/uv-0.5.5.ebuild
+++ b/dev-python/uv/uv-0.5.7.ebuild
@@ -8,9 +8,9 @@ CRATES="
 
 declare -A GIT_CRATES=(
 	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
-	[pubgrub]='https://github.com/astral-sh/pubgrub;9cd9049a64c7352de2ff3b525b9ae36421b0cc18;pubgrub-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%'
 	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
-	[version-ranges]='https://github.com/astral-sh/pubgrub;9cd9049a64c7352de2ff3b525b9ae36421b0cc18;pubgrub-%commit%/version-ranges'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;57832d0588fbb7aab824813481104761dc1c7740;pubgrub-%commit%/version-ranges'
 )
 
 RUST_MIN_VER="1.80.1"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 0a4b5e6d5ae5..8c156daa3659 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,2 +1 @@
-DIST waitress-3.0.1.tar.gz 180560 BLAKE2B 20f7372ab2df88a9d67a7d7553f88d8024702e7003f5482aaa125ec89d00db1c5f1e1ec4f924a83b87613b871b440d4e56c72dafb450a9e107f756069afe811a SHA512 131492515d1c7c82e9dff0688c2f36f79594a2b1c6cd767ee29bfba53764aa514c8e2eeaef4319142df01001c850337954474745880541b6c9f8c39cd2ea5113
 DIST waitress-3.0.2.tar.gz 179901 BLAKE2B 159f834f4a378e2fecdf860134f47351981af368dfe052ba9c98145c39b9a4de7f76b11fb6d2e70d3df9a850a5fd5ef0e3e73a888900ad56b3bd538f2525d485 SHA512 f225447b936e4742cf6f0e45b72cc2e33c06ff609c9896fc226de23b9c7ba64140914e3525f57c901617c0a49df3052fe5acbd8ec46f9557832c383ab9d4a483
diff --git a/dev-python/waitress/waitress-3.0.1.ebuild b/dev-python/waitress/waitress-3.0.1.ebuild
deleted file mode 100644
index a273d89a9fc1..000000000000
--- a/dev-python/waitress/waitress-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="
-	https://docs.pylonsproject.org/projects/waitress/en/latest/
-	https://pypi.org/project/waitress/
-	https://github.com/Pylons/waitress/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fails on some systems, https://bugs.gentoo.org/782031
-	tests/test_wasyncore.py::DispatcherWithSendTests::test_send
-)
-
-src_prepare() {
-	sed -i -e 's:--cov::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/waitress/waitress-3.0.2.ebuild b/dev-python/waitress/waitress-3.0.2.ebuild
index 69787c5fb0fe..a273d89a9fc1 100644
--- a/dev-python/waitress/waitress-3.0.2.ebuild
+++ b/dev-python/waitress/waitress-3.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/whatthepatch/Manifest b/dev-python/whatthepatch/Manifest
index d3c30bbdf5b1..7e5191ee9eff 100644
--- a/dev-python/whatthepatch/Manifest
+++ b/dev-python/whatthepatch/Manifest
@@ -1,2 +1 @@
-DIST whatthepatch-1.0.6.tar.gz 31849 BLAKE2B cc540aa7455098a6f48e180defb173d25cc499d2c7415c639aef125cf0137e67c06ecdf18fb3337ef13e76e505ff598caa1b6a3d603c66dd38cb65f3f0a964ed SHA512 353866973b6a9b1d0bdb566d4c2eaf655a9a148d1acd73138cbbb5fbf5ec1d159391390857a34dfd75dca0c760168be720961e9d0d74dd8425849d641b2f5105
 DIST whatthepatch-1.0.7.tar.gz 34612 BLAKE2B a7a442ad4d00276c5fa3cdffd731f586faec512e93bb378e1e487cc87e54c4904a440573b230adab0da904bfa7134b9668a026fcb6538584abb20d2586386a57 SHA512 13df7e993babfc057d1e6bc1636d3153d68d860614b744da035d47d2acaeb5317067558a8f48d9b4014fdd8ff0caeb2fbe439d1004886667606bec3000f33987
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.6.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.6.ebuild
deleted file mode 100644
index 7c5ab29d6ce1..000000000000
--- a/dev-python/whatthepatch/whatthepatch-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A patch parsing and application library."
-HOMEPAGE="
-	https://github.com/cscorley/whatthepatch/
-	https://pypi.org/project/whatthepatch/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-EPYTEST_DESELECT=(
-	# the test measures performance of the patch parser together with test data
-	# preparation, which can take long time in some interpreters, bug #907243
-	tests/test_patch.py::PatchTestSuite::test_huge_patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.7.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.7.ebuild
index 0ccf5bdb072f..7c5ab29d6ce1 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.7.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 EPYTEST_DESELECT=(
 	# the test measures performance of the patch parser together with test data
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index a19527d88ab4..c6f56f57d7b6 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,3 +1 @@
-DIST wheel-0.44.0.tar.gz 100733 BLAKE2B 6beefa0875be52fb2dff2921cb87063bcafdf2e31c43963676fbae8aef4e68ea21675aa715f94052edc9f5e8dbbd5e2afe3abc17f521eb36b24fa628b0522bbe SHA512 f0a1efbf70e8a2eebdf7564932bdfa3892940a3fbfc00f256f61be03a51ff9cc5a55570d1d3f5878670be84ab233483453ce754ea46c508574fcf4ec61d480c8
-DIST wheel-0.45.0.tar.gz 107426 BLAKE2B 57cfbe247bbc2f0598a3ee18a1ab4b309e6ec6eb89486391bc7b5baa148736829b2620d05f1c6f75b0743ee1065ccbdc66ce690ee7efcf5f2b58519eb4cc8b25 SHA512 dca95cadde7c551baebde50f66ca79d4205d0a896da34b7f4f103c62fb72f78c0b9e71933564b951ab3878e6bc47d1961a73545bc0ead45e618de33b6b7cb16a
 DIST wheel-0.45.1.tar.gz 107545 BLAKE2B 13c8d60a2e39ded3d911c9e03915b01bda201f7e8cd6de456484ce6eeb2a990861a01f26e5d9f2ac4ca0ab2b6d0fea9db437d6f82cb39db9b1059c3c53202ec0 SHA512 df45f00e9eaeae2f27f813f31591590c961da2f6bff15bba6fb2a14d529c221f39b29894b8da408fe49cd4b760840a0e05c4baef377ccfacd9983c0bba83d6d8
diff --git a/dev-python/wheel/files/wheel-0.44.0-ft.patch b/dev-python/wheel/files/wheel-0.44.0-ft.patch
deleted file mode 100644
index 600318dc275e..000000000000
--- a/dev-python/wheel/files/wheel-0.44.0-ft.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d30f834fcec7ecdbb74e263789db2fbe9ff37e99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 11 Oct 2024 16:12:50 +0200
-Subject: [PATCH] Skip abi3 tests when freethreading Python build is used
-
-Skip the tests using abi3 extension when the freethreading build is
-used, as Python 3.13 freethreading does not support the limited API
-and its use results in a build error.
-
-Fixes #636
----
- tests/conftest.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 5ee84da..d5bd356 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -7,6 +7,7 @@ from __future__ import annotations
- import os.path
- import subprocess
- import sys
-+import sysconfig
- 
- import pytest
- 
-@@ -22,7 +23,7 @@ def wheels_and_eggs(tmp_path_factory):
-         "unicode.dist",
-     )
- 
--    if sys.platform != "win32":
-+    if sys.platform != "win32" and sysconfig.get_config_var("Py_GIL_DISABLED") != 1:
-         # ABI3 extensions don't really work on Windows
-         test_distributions += ("abi3extension.dist",)
- 
--- 
-2.47.0
-
diff --git a/dev-python/wheel/wheel-0.44.0.ebuild b/dev-python/wheel/wheel-0.44.0.ebuild
deleted file mode 100644
index 5df530aae951..000000000000
--- a/dev-python/wheel/wheel-0.44.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="
-	https://github.com/pypa/wheel/
-	https://pypi.org/project/wheel/
-"
-
-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"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# fails if any setuptools plugin imported the module first
-	tests/test_bdist_wheel.py::test_deprecated_import
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/pypa/wheel/pull/637
-		"${FILESDIR}/${P}-ft.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# unbundle packaging
-	rm -r src/wheel/vendored || die
-	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
-	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/wheel/wheel-0.45.0.ebuild b/dev-python/wheel/wheel-0.45.0.ebuild
deleted file mode 100644
index 816d213fe7b4..000000000000
--- a/dev-python/wheel/wheel-0.45.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A built-package format for Python"
-HOMEPAGE="
-	https://github.com/pypa/wheel/
-	https://pypi.org/project/wheel/
-"
-
-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"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# fails if any setuptools plugin imported the module first
-	tests/test_bdist_wheel.py::test_deprecated_import
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle packaging
-	rm -r src/wheel/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:wheel\.vendored\.::' \
-		-e 's:\.\+vendored\.::' {} + || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/wheel/wheel-0.45.1.ebuild b/dev-python/wheel/wheel-0.45.1.ebuild
index 816d213fe7b4..7543cd67cee5 100644
--- a/dev-python/wheel/wheel-0.45.1.ebuild
+++ b/dev-python/wheel/wheel-0.45.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/wrapt/wrapt-1.17.0.ebuild b/dev-python/wrapt/wrapt-1.17.0.ebuild
index 6597d08a3029..2868c7846ccf 100644
--- a/dev-python/wrapt/wrapt-1.17.0.ebuild
+++ b/dev-python/wrapt/wrapt-1.17.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/yarl/yarl-1.17.2.ebuild b/dev-python/yarl/yarl-1.17.2.ebuild
index 638ce0f69079..9f3dc40f42d8 100644
--- a/dev-python/yarl/yarl-1.17.2.ebuild
+++ b/dev-python/yarl/yarl-1.17.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zenlib/Manifest b/dev-python/zenlib/Manifest
index 574d7166b289..f6d6774c2e8c 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,2 +1 @@
-DIST zenlib-2.3.2.gh.tar.gz 20508 BLAKE2B 78ab80cbd1c4c71045900f6ddf3896a743fec2780a1645a7f10fd5678574cc68972321c28ae69b2fa60bcc6292691421c24e0b5c1c8326577d0a6e19a9a098b6 SHA512 08fec47999cf56d8db2bd585f9246708a0c566b529d9ddb49daca8c97a3b2e188217513087ede0c36d8182ff088d37483bc14539a35f51d2aca5d897c7479a99
 DIST zenlib-2.4.1.gh.tar.gz 21281 BLAKE2B e6a4005d7e5db95ccc18ecb87c10180e148bcf0a860923ac71177c90d448186247e08eee9f2c5dcb7e0803536dc07bfa3137b363a410ea2e03f875c4096fdadc SHA512 a8ceadbda243583ebe45fb56a4a72d2693505d9123346b3a140ccb16ed7de85d60caafffac0274e3f6289b0b82a82643feba039d85ea4f159fb259c7bdd46725
diff --git a/dev-python/zenlib/zenlib-2.3.2.ebuild b/dev-python/zenlib/zenlib-2.3.2.ebuild
deleted file mode 100644
index b74d022c380f..000000000000
--- a/dev-python/zenlib/zenlib-2.3.2.ebuild
+++ /dev/null
@@ -1,26 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib/"
-SRC_URI="
-	https://github.com/desultory/zenlib/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/zenlib/zenlib-2.4.1.ebuild b/dev-python/zenlib/zenlib-2.4.1.ebuild
index 86ec550ccfbe..b74d022c380f 100644
--- a/dev-python/zenlib/zenlib-2.4.1.ebuild
+++ b/dev-python/zenlib/zenlib-2.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/zeroconf/zeroconf-0.136.2.ebuild b/dev-python/zeroconf/zeroconf-0.136.2.ebuild
index 0c00ccff1261..afcf4b535bf3 100644
--- a/dev-python/zeroconf/zeroconf-0.136.2.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.136.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index 0809e5cfb478..a1b30e313188 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1 +1,2 @@
 DIST zope.configuration-5.0.1.tar.gz 83327 BLAKE2B 665687d49e77c43e08293d5e7816a1f1abc9ff0c97dcfa83a90693d6da9d5767ebc24512dd7593316464103c38655c41909949bb1c8bb3f5db272e3637066284 SHA512 58fec7b330a4ee5f9bb71238fbcb8f07fdd7b6767cb2d8e054699ffcb915973b9dfead33e5515f40049f6aede233d31624d09d7f84d75b96318e63f8ab454147
+DIST zope_configuration-6.0.tar.gz 84258 BLAKE2B f0e0b918125a24b0a4ac8679c3a02e4c01b44a013c7b33a778577b4cad54c2426eaab8a572cf3cc8a92e034d88658200a9787e007712bf04e1968aa9ed2ba627 SHA512 2dd86fe8beaf1b15dc7d96ce5b037c530cc3e4427c6e2152741e6697a84b90dd06f65d0d0968d938dccdded278d8b0bbfe924abedf772f1110ef039ee3eb5f8a
diff --git a/dev-python/zope-configuration/zope-configuration-6.0.ebuild b/dev-python/zope-configuration/zope-configuration-6.0.ebuild
new file mode 100644
index 000000000000..01cca9989596
--- /dev/null
+++ b/dev-python/zope-configuration/zope-configuration-6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Zope Configuration Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.configuration/
+	https://github.com/zopefoundation/zope.configuration/
+	https://zopeconfiguration.readthedocs.io/en/latest/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}