Adding metadata

172 files changed, 765 insertions, 3252 deletions

diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index ea2de4a0fa92..324b8cea1b06 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,4 +1 @@
-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
 DIST apsw-3.47.2.0.zip 2428145 BLAKE2B 12ece7d7854a729510b2e18d3285fc49135b3cbb3480567a0c6879c98d48b2d49bc75f4cb46af738c4a565cc6c29f7cd5d35fd2c6ea5fe1814e8048030f966fb SHA512 9884f36811bfff7276642841ebaa198669c48f4d54bb764a985ea5bdd88f9f630f9fd8a13cf0a44b5675e374c2a911fcec579ca4165622e8049bff327ef66c1d
diff --git a/dev-python/apsw/apsw-3.46.1.0.ebuild b/dev-python/apsw/apsw-3.46.1.0.ebuild
deleted file mode 100644
index a0cb04531bfe..000000000000
--- a/dev-python/apsw/apsw-3.46.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/apsw/apsw-3.47.0.0.ebuild b/dev-python/apsw/apsw-3.47.0.0.ebuild
deleted file mode 100644
index 4f01c003f49d..000000000000
--- a/dev-python/apsw/apsw-3.47.0.0.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/apsw/apsw-3.47.1.0.ebuild b/dev-python/apsw/apsw-3.47.1.0.ebuild
deleted file mode 100644
index 4f01c003f49d..000000000000
--- a/dev-python/apsw/apsw-3.47.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/apsw/apsw-3.47.2.0.ebuild b/dev-python/apsw/apsw-3.47.2.0.ebuild
index f52079d4d818..50abf3a58642 100644
--- a/dev-python/apsw/apsw-3.47.2.0.ebuild
+++ b/dev-python/apsw/apsw-3.47.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index d2fcabd3cd24..115992703cb9 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1 @@
-DIST argcomplete-3.5.2.tar.gz 82341 BLAKE2B ddc118d562a742bda9f552c62f9b873010c7d660267d606a46ae98453384bf2c9ebc90b5fdaee675f65cf9a9c27a8d5fcc2484e9a54d83d6ac0e51f67ef60766 SHA512 6c852b8cf81d0dc174c8053b5d8310fe716d8491380e7d98018c5788d83a4c01167963d6e713b30db892090e7140e19be092d35f2c8137292ed48c98fd835e8e
 DIST argcomplete-3.5.3.tar.gz 72999 BLAKE2B a31ff9ff63fbbca0b132948b6cd0c126e355eadecc1b84004d6bde90ac5f5d010d492e6addc2e926caa9ac8323e6fa9b6e0c41ee48ecd0695da50c56bd9ee5b3 SHA512 f22319ad0a37570a33ad9b674ba51af50e1a21ddd21950778a6804ee62e08352cdfb73387116f6669525a7b7582a567bda06d3b63084edcabea31b4235cb7624
diff --git a/dev-python/argcomplete/argcomplete-3.5.2.ebuild b/dev-python/argcomplete/argcomplete-3.5.2.ebuild
deleted file mode 100644
index cd11eeba7e74..000000000000
--- a/dev-python/argcomplete/argcomplete-3.5.2.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=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="
-	https://github.com/kislyuk/argcomplete/
-	https://pypi.org/project/argcomplete/
-"
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		app-shells/zsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)
-"
-
-PATCHES=(
-	# increase test timeouts -- this is particularly necessary
-	# for entry point tests because they read metadata of all installed
-	# packages which can take real long on systems with lots of packages
-	"${FILESDIR}/argcomplete-3.1.6-timeout.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-3.5.3.ebuild b/dev-python/argcomplete/argcomplete-3.5.3.ebuild
index 57fcd9048df9..70228217368a 100644
--- a/dev-python/argcomplete/argcomplete-3.5.3.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.5.3.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/beartype/Manifest b/dev-python/beartype/Manifest
index fc2da5ef4a57..c99ac187dff8 100644
--- a/dev-python/beartype/Manifest
+++ b/dev-python/beartype/Manifest
@@ -1 +1,2 @@
 DIST beartype-0.19.0.tar.gz 1294480 BLAKE2B 7a0d2800a28af49815bf300c93081faee0e01c922497418bc7328c0968cac077a0fdfe984de66c214af610bb972a217224a6d164a2f3aac9c0a2d067c0658fc3 SHA512 9a87086736ba0d3497f3dfc3b57fdfd3ebb33812aaf58d195f1161474a553499e87d6f3f9c12bc66ab33cb3ca1697b00220828d004d568495ac743efb473c1e8
+DIST beartype-0.20.0rc0.tar.gz 1375891 BLAKE2B 96945c21f5ab8e8e86b8e16958d748fa5f47e5f1a843f35f52d9edf6a7039ecf919ff90f0f6e737d6a19b1aedcea5cb634e70df0b09c8f758569e3aac16094ce SHA512 bfb714c997455659cfd91b167b72d9f64bf81b662118b693a8a1444801a635bb24b2f6d385235524cf968792f7d07fb4f10e3c5a9835ef8bd05805d233bff307
diff --git a/dev-python/beartype/beartype-0.20.0_rc0.ebuild b/dev-python/beartype/beartype-0.20.0_rc0.ebuild
new file mode 100644
index 000000000000..a0d3859e8eda
--- /dev/null
+++ b/dev-python/beartype/beartype-0.20.0_rc0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unbearably fast runtime type checking in pure Python"
+HOMEPAGE="
+	https://pypi.org/project/beartype/
+	https://github.com/beartype/beartype/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fragile performance test
+		beartype_test/a00_unit/a70_decor/test_decorwrapper.py::test_wrapper_fail_obj_large
+		# test for building docs, apparently broken too
+		beartype_test/a90_func/z90_lib/a00_sphinx
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 7b95eb17c1b3..370f0c740fc9 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,2 +1 @@
-DIST bitstring-4.2.3.tar.gz 250537 BLAKE2B 81902038a0b422533b5fe863a4dc71ec7b828d55a45e9edabb632ffc4682e1bf5d5620edce69c245b877d0ee93dff474533db3d46ddd57435a7a4c0b0bd71f9a SHA512 caf53aeb746f4c132d7b91e2c0983bc96f33cb240033872e9d6fc15318f3ced2638427ccc6fc5bfbac05d221fbb4cad4791213b32f97d8a1f8d57e8841a3e176
 DIST bitstring-4.3.0.tar.gz 251408 BLAKE2B 62e4e28752758a149d8b612efcfaa67cf379e5b426034146b4163182edc5be158bc26b8ecefd0dc44c034c4b901354a3ffc372360c20d3955876667c60eeb87f SHA512 72a4b343d5035ed6f88a165466337d7b519b10bde58a91ebb001e74e81ad1eaeb03ad643958a4956ffbe012da237533eaec9bb8c18cc546030a7306172dbd826
diff --git a/dev-python/bitstring/bitstring-4.2.3.ebuild b/dev-python/bitstring/bitstring-4.2.3.ebuild
deleted file mode 100644
index 4be5b3a19099..000000000000
--- a/dev-python/bitstring/bitstring-4.2.3.ebuild
+++ /dev/null
@@ -1,36 +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="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="
-	https://github.com/scott-griffiths/bitstring/
-	https://pypi.org/project/bitstring/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/bitarray-3[${PYTHON_USEDEP}]
-	>=dev-python/bitarray-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/gfloat-0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_benchmarks.py
-)
diff --git a/dev-python/bitstring/bitstring-4.3.0.ebuild b/dev-python/bitstring/bitstring-4.3.0.ebuild
index d59ae13bd0a0..faab6098be63 100644
--- a/dev-python/bitstring/bitstring-4.3.0.ebuild
+++ b/dev-python/bitstring/bitstring-4.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	=dev-python/bitarray-3.0*[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5beaf7c24b0e..bcdeb8398c4a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.35.98.gh.tar.gz 921601 BLAKE2B ec4b4e24a60174ce2799977f26fb1ce732ed
 DIST boto3-1.35.99.gh.tar.gz 921797 BLAKE2B f42ac47ce3e1c647555320f0434cfa3539053029efe0fbb06f12f7a165a7afc194acc0d9131fc3654dbcf4cc734c7fac634427fd19adadbcacc99d9693b88741 SHA512 0f04e7c45c022593da150e610cd8af5020b63fb1abeb0e0135936d949928147f6776676611509bf905f1ee6656292e0c4e0a36b87438f62e04769072186afed8
 DIST boto3-1.36.0.gh.tar.gz 923064 BLAKE2B 3e3afd985492be0e0a1bd2e66b1a645ab0f25f0809533a240ba109b97b55aa0683a8df7197367e9623f67b9308b9fec2bf1e8627339793981f5b8456db547ee4 SHA512 7701866feadd5115b255f8b9d783297774dfaeb2ceac503d10d682457144fcbd2f885ec0b5671b0ae317de6bf87669be3895a15c02b7442a99194b84a131dc62
 DIST boto3-1.36.1.gh.tar.gz 923135 BLAKE2B 7935b58d3a5815ec5e34541981d18c82400e0ba31b27956106d408732887cc8be560831b6aa4397fca91d1caed19f6a03b0cdf13a47735119c5d9246ef237b40 SHA512 b0c5ef5d34068290d4de7e546131f0ccfded90db61f4e480ed98627bf7a649b07311d3ebff85d4782bd46fd7749ef3ac90fd7530f8d9bb035f6a5bafcb8ed38f
+DIST boto3-1.36.2.gh.tar.gz 923432 BLAKE2B 91f19eb6e1451923adbf323688d89cfadd384009fbc3fdcae688b48dee54d9a3f14956cedaed07b15f2cdc3badaf0533a6ec1e1baf5cedc88e91580104834eb2 SHA512 e9e14f4aacd0814952198d5446050f0cf822baac0b3ce3604c40dbb6b122c431624b46b144ea4699be7328f6236e099981905a4be6a9de3400750800d8d40e60
diff --git a/dev-python/boto3/boto3-1.36.2.ebuild b/dev-python/boto3/boto3-1.36.2.ebuild
new file mode 100644
index 000000000000..dfe05b3d9a81
--- /dev/null
+++ b/dev-python/boto3/boto3-1.36.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7654b32acccf..3d1f1c4a43e7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.35.98.gh.tar.gz 14182207 BLAKE2B 427a5d1fa48cea7f2862fcfc8e994c5
 DIST botocore-1.35.99.gh.tar.gz 14183345 BLAKE2B bc75753f1a18aa402ec4885daea1edc8c019a4d7558dd35a7848e01fef531cf20fd81de2a88cb4aff59972f11d8ef70e7df70c3ea68587f1855d06e9e236c5e0 SHA512 d0304fa26305fd8d451333892904bc0e5d87308222ba50cfe0b867f3bf0b0d4e2daf8c7f93d921374132384b9a3b89d4110f048c1a509070228fc5ef6c278989
 DIST botocore-1.36.0.gh.tar.gz 14191030 BLAKE2B 32e34c717fe5d2161c92380010b8f9936509bae4775626133b0f6c56ffe3096673902adc464ea392befbb97998277e907159659e2ede5ff31062d3c54ee8c2ff SHA512 95923e75a549c791588c58e5e5fef25ee5920b1f949fb93d8478926583de40216160147c2421fa90a1a23cb4f58dc4c2e194aabfb5fcabd30a31c944bc95567c
 DIST botocore-1.36.1.gh.tar.gz 14190157 BLAKE2B ff3c5ef62d6eb7c3907187ccb29bedc4515456d1d50fe3169d27dfd6e8374d953a33761dce0958131fb8d25681be3dfc3b07495e0082292a278695199a93d1bf SHA512 cc50a7b84c8002dad65434899958ef07b0fd9368efeed59d1419580c96824a0e4f34edbf39668138a200169cfdec3820d5ce669b8e0aedf498c7c45497efc127
+DIST botocore-1.36.2.gh.tar.gz 14197789 BLAKE2B 21441cd52052d117ce05e425c13f34941dcc1ca26a03e2e7eefb6c82584d7faffb548435ebb6b716b72db8149cfe6a3378b79f9174c676fd193c194501b0c844 SHA512 45d9515c493b238a003e5ad264b152b68a62e7ca140ea13111865a4b7c674a7b309a0f550f9782c37966b95c114136b8788f00ba0c83ed4bc61521b593376594
diff --git a/dev-python/botocore/botocore-1.36.2.ebuild b/dev-python/botocore/botocore-1.36.2.ebuild
new file mode 100644
index 000000000000..df85ee0d220c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.36.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 6d6d2a79d47d..f33d3efa0845 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -1,2 +1 @@
-DIST cerberus-1.3.6.gh.tar.gz 920930 BLAKE2B 168ca5e628448a4477f1aec7f1371cdf8c89c0e40c3e3f10bd3b6da1c7d78580e0db4403c8f2abe98baa7db5cbbe1b92241af725bacd9f3eced899397bafe8eb SHA512 2ee32ade240198af6aa2927d80a24e00a5d4aac22486aa13b375f7235e5491a2c61910a16e1d965c0e57cf226a3865675f2037e281d1461b262c6cbb13cb6271
 DIST cerberus-1.3.7.gh.tar.gz 920947 BLAKE2B 0cf9cb6fbb156007f7c44dfc427579649b8ed1e70cdf7f89f728b4d6071fda7073d5e5328be6e398744fa715dbc53ff8ea79195ef87e42f9b3bc4c838532c531 SHA512 69ed22089f3fb8c1869585abff39510f9a0bcf8dfbf82fa995177999e634e1a93bc535a2c7d330ec2491b01a0fe807d803144d3f08cdd6c9589c39e2aaec9235
diff --git a/dev-python/cerberus/cerberus-1.3.6.ebuild b/dev-python/cerberus/cerberus-1.3.6.ebuild
deleted file mode 100644
index 509daaece203..000000000000
--- a/dev-python/cerberus/cerberus-1.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight and extensible data-validation library for Python"
-HOMEPAGE="
-	https://docs.python-cerberus.org/
-	https://github.com/pyeve/cerberus/
-	https://pypi.org/project/Cerberus/
-"
-SRC_URI="
-	https://github.com/pyeve/cerberus/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-EPYTEST_DESELECT=(
-	# Require currently unpackaged pytest-benchmark, more useful
-	# to developers than to end users.
-	cerberus/benchmarks/
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cerberus/cerberus-1.3.7.ebuild b/dev-python/cerberus/cerberus-1.3.7.ebuild
index 8ee670333bd6..509daaece203 100644
--- a/dev-python/cerberus/cerberus-1.3.7.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 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"
 
 EPYTEST_DESELECT=(
 	# Require currently unpackaged pytest-benchmark, more useful
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 7f17b877907f..d9a94d18d03e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1,2 @@
-DIST cfn_lint-1.21.0.tar.gz 2747268 BLAKE2B 580fffc95d5829374f1dda111e2cc805639a463514112cabe0e34b6f53344991819f81b8246adb9fe3ee8fe59ee5db9000befead7a21ce85694bac248589a72a SHA512 2091f02a30ee22313db52094e9f54e5978eca69aa0c0cc96e1e39cae720f04165b4ff2aa0f01419c5327f149d5bd5ab16c4ba9b2af0a8f42b1a1872991a6e4da
-DIST cfn_lint-1.22.2.tar.gz 2848845 BLAKE2B 4f9194e019c1dae1d373b8432693be9463a668e5db522c7a23adcfaf04c591e49d0d1dc4853323f32fdb0d2c8db1c9e7a0bf6cddf652541bb057cfc3525ed53e SHA512 8e80892692e4458591f9863ad43af8bd8c5fbe2e554c75dda3029ac73a5a04987238221d50a3d2597dc0195dd049f36f9fcdc2b917c68b9a4d6807b4e8bf411c
 DIST cfn_lint-1.22.3.tar.gz 2700564 BLAKE2B d1bfed3fda2d5133919396a54257ad484c3c7fd50b1a387e94eff404f9b8175135f0f39455bc45b69c8112e2f2c57eb055d7b2c879415bdc4abfdad74b7bb34f SHA512 45502d913488784ff8e355a24317cce42fc7df39b3afd80b8fc170c9c5b7e6191f3ff41a460e8bb0277d1c21483aef8addb41d60fe2e8e5d13058aa85fefcc84
-DIST cfn_lint-1.22.4.tar.gz 2707627 BLAKE2B 348dbbc46e1e7be9041ccd64e3f9a6409e7276533c275e2329b94c5dc63ba13a49955c1912447326cd79eba2ea1c4eb8941a4552de25d493b2594ef8d4910333 SHA512 01c2a581fd02ecc553dd1e95741eda174a7290aeabbe91a8f0da96bd77276aa134c627b78f60a7c18085252d16fa8a1fc0067faad78e59c623924a3bcaa0166a
 DIST cfn_lint-1.22.5.tar.gz 2722622 BLAKE2B 147f1ec4543a2e54c6b6652b439ca4dd870aad44532a71bc75564bcb71e1aed0258b0387e3be57ef2c8059343cefaf2fef1af02b9442c37347987c018c9411ef SHA512 772430a958e53b90c529311a6f90602de7c2ced9d86840907a9c1e612f18db456c6678d2de43b3bee2e3498cc71b238e2ab8564238aef4467cc285c52ad3a6dd
diff --git a/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
deleted file mode 100644
index a0cf3e0df44d..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.21.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.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/cfn-lint/cfn-lint-1.22.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.2.ebuild
deleted file mode 100644
index 2481db200741..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.22.2.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/cfn-lint/cfn-lint-1.22.3.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild
index 2481db200741..f52ac728e3f2 100644
--- a/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.22.4.ebuild b/dev-python/cfn-lint/cfn-lint-1.22.4.ebuild
deleted file mode 100644
index 3ae37d5581a5..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.22.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="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/chameleon/Manifest b/dev-python/chameleon/Manifest
index 496452a4eb93..edfff0d60787 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,2 +1 @@
-DIST Chameleon-4.5.4.tar.gz 180464 BLAKE2B cb77a1a928e67b029038f7e2704f077cc45e2baf79dfb30bdf460d0f940cb8fb30f5e42ef5b977a6c33e070b229ede1b53268d30a5d2f165607db8f03179f061 SHA512 476ecc902e252eca6de0552f4526666eaccd305f973d2cf6035c209174152c27d7dce8f4e8a21b9507a3609c38215446bfaa7203865c6151d02922893422e160
 DIST Chameleon-4.6.0.tar.gz 181111 BLAKE2B cbc518ab34d10d1a715418365728b1a7643a8ab8a31f8cf5adfa33ed24afc4fa502c6226db67d62b704cae577aea4ad2207c8312b68cb380ea2c8b2f78e267c7 SHA512 ff840c73d3b14a060dc98f27d50206ef4d1ae90a1b1541662c585089d5cadd522c58bea03d27883bcb6e80fa0d8ce7e31c8054ef31094eeed065ad074e3ab856
diff --git a/dev-python/chameleon/chameleon-4.5.4.ebuild b/dev-python/chameleon/chameleon-4.5.4.ebuild
deleted file mode 100644
index 331528e12e3b..000000000000
--- a/dev-python/chameleon/chameleon-4.5.4.ebuild
+++ /dev/null
@@ -1,23 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/chameleon/chameleon-4.6.0.ebuild b/dev-python/chameleon/chameleon-4.6.0.ebuild
index 0651b00134fe..19bfbf8e09c2 100644
--- a/dev-python/chameleon/chameleon-4.6.0.ebuild
+++ b/dev-python/chameleon/chameleon-4.6.0.ebuild
@@ -18,6 +18,6 @@ HOMEPAGE="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/clang/Manifest b/dev-python/clang/Manifest
index cb5f43e438ae..b7114fc7aeab 100644
--- a/dev-python/clang/Manifest
+++ b/dev-python/clang/Manifest
@@ -12,6 +12,5 @@ DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee5
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
-DIST llvm-project-2529a8df53af9bc6cecfd6c83404ffa5e89e3370.tar.gz 224493461 BLAKE2B 0d3c757a8f34a9bf6b2ac0ad394cc1f8125cfee534c8bd0c5875eba56fe0171892586ec05b6f1e859e5962f81c76c9a315f60bcda012df73a3bd66709b265038 SHA512 a49fa1da2fd398b279a90292704e30d8ff7163219bfd91c4a80fa5123d957cdef52d2ee41710a8bcbfea3d9a5eec269dfc756584fcc27a495f7f381176de4e69
 DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/clang/clang-20.0.0_pre20241227.ebuild b/dev-python/clang/clang-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 023b77279789..000000000000
--- a/dev-python/clang/clang-20.0.0_pre20241227.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
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for llvm-core/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="
-	>=llvm-core/clang-${PV}:*
-	!llvm-core/llvm:0[clang(-),python(-)]
-	!llvm-core/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		llvm-core/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/clang/clang-20.0.0_pre20250104.ebuild b/dev-python/clang/clang-20.0.0_pre20250118.ebuild
index a99c5601e047..a99c5601e047 100644
--- a/dev-python/clang/clang-20.0.0_pre20250104.ebuild
+++ b/dev-python/clang/clang-20.0.0_pre20250118.ebuild
diff --git a/dev-python/clr-loader/Manifest b/dev-python/clr-loader/Manifest
index d5b783bc3770..8bd2dfd07c0d 100644
--- a/dev-python/clr-loader/Manifest
+++ b/dev-python/clr-loader/Manifest
@@ -1,4 +1,3 @@
-DIST clr_loader-0.2.6.tar.gz 44757 BLAKE2B dd1a9513ffebc39b0861780d14c85b98e2b08b9911fd34bef180dcf76a5fc9f95236db47d3802b4cdcc7bcfb9343de4b1d4c516036562baf92d3e37e07ff42c0 SHA512 59d7918de9ca0b42dd7509b43f7994a5b3788e01fa4015e00e7957f4430c8291ad8736615b859ca0a91d26ad9a495677cb724654414f870f7f43d07d1b6516ce
 DIST clr_loader-0.2.7.post0.tar.gz 56701 BLAKE2B 17271bc3bdbaa70a2aec0d3570df0739536a05289bb538349fdbe4daed2fca041a0640b110cea7e2b8f67d03f5437a76d46829c77d418f05918af29b4adaee33 SHA512 9ab59712556d293ae3611cf841ce072346973ab731cb9fbb1cdd5dfb737a1a410d447d3032485f4bb918490ae68c3c4893629a8b63639b06c0bb9d9e6c682986
 DIST microsoft.netcore.platforms.1.1.0.nupkg 17960 BLAKE2B 6a9fa22d75f5a1c65746dd71a63c3d4e37c393e99c23007c10f5ecce248a04863bf26e7562c7751177a6985eaac266c29cc6a5443a4a853e773f88994ad2a3fd SHA512 6bf892c274596fe2c7164e3d8503b24e187f64d0b7bec6d9b05eb95f04086fceb7a85ea6b2685d42dc465c52f6f0e6f636c0b3fddac48f6f0125dfd83e92d106
 DIST microsoft.netframework.referenceassemblies.1.0.0.nupkg 20946 BLAKE2B ac609f5ddaec68f4afca36b710408e8f5601f13e6b2c793dae11e1afd3f8fc9b45c3ae9abba2429b4f414a43a48f8e0ea11498f439a17158257701466f372582 SHA512 c8f18b9fc83113c65086d93f7dfd9d62600edd614f5eaaeb294d96cc46bb024cc1cbd93b665f849a33d367acd4df30913db1e50ebc695de7e12cd185a6e1ee9e
diff --git a/dev-python/clr-loader/clr-loader-0.2.6.ebuild b/dev-python/clr-loader/clr-loader-0.2.6.ebuild
deleted file mode 100644
index b33b9f5ac486..000000000000
--- a/dev-python/clr-loader/clr-loader-0.2.6.ebuild
+++ /dev/null
@@ -1,91 +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} )
-
-DOTNET_PKG_COMPAT=8.0
-NUGETS="
-microsoft.netcore.platforms@1.1.0
-microsoft.netframework.referenceassemblies.net461@1.0.0
-microsoft.netframework.referenceassemblies.net47@1.0.0
-microsoft.netframework.referenceassemblies@1.0.0
-netstandard.library@2.0.3
-nxports@1.0.0
-"
-
-inherit check-reqs dotnet-pkg distutils-r1
-
-DESCRIPTION="Generic pure Python loader for .NET runtimes"
-HOMEPAGE="https://pythonnet.github.io/clr-loader/
-	https://github.com/pythonnet/clr-loader/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/pythonnet/${PN}.git"
-else
-	inherit pypi
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/cffi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-CHECKREQS_DISK_BUILD="500M"
-DOTNET_PKG_PROJECTS=(
-	example/example.csproj
-	netfx_loader/ClrLoader.csproj
-)
-
-EPYTEST_DESELECT=(
-	# Mono only.
-	'tests/test_common.py::test_mono'
-	'tests/test_common.py::test_mono_debug'
-	'tests/test_common.py::test_mono_signal_chaining'
-	'tests/test_common.py::test_mono_set_dir'
-
-	# MS Windows only.
-	'tests/test_common.py::test_netfx'
-	'tests/test_common.py::test_netfx_chinese_path'
-	'tests/test_common.py::test_netfx_separate_domain'
-)
-
-distutils_enable_tests pytest
-dotnet-pkg_force-compat
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_prepare() {
-	# To be compatible with .NET >= 6.0.
-	cat <<-EOF > Directory.Build.props || die
-<Project>
-<PropertyGroup>
-<RollForward>Major</RollForward>
-</PropertyGroup>
-</Project>
-EOF
-	nuget_writeconfig "$(pwd)/"
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	dotnet-pkg_src_configure
-	distutils-r1_src_configure
-}
diff --git a/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild b/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild
index 1c472a033e97..5ef3178a0cff 100644
--- a/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild
+++ b/dev-python/clr-loader/clr-loader-0.2.7_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,8 +19,11 @@ nxports@1.0.0
 inherit check-reqs dotnet-pkg distutils-r1
 
 DESCRIPTION="Generic pure Python loader for .NET runtimes"
-HOMEPAGE="https://pythonnet.github.io/clr-loader/
-	https://github.com/pythonnet/clr-loader/"
+HOMEPAGE="
+	https://pythonnet.github.io/clr-loader/
+	https://github.com/pythonnet/clr-loader/
+	https://pypi.org/project/clr_loader/
+"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
@@ -29,7 +32,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	inherit pypi
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index c26eb4eb5661..c73ccdb9a857 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1 +1,2 @@
 DIST cmd2-2.5.8.tar.gz 592395 BLAKE2B 52ea8ffd83dc8fdc904bba8b0bc72960d3782d0bf43a7dcb99b00d68f5bc4fcb5d17ddbe44655cb812bceed861a0dfd8d8753d818233dd9b1ad0e4461ce29eff SHA512 ce19006dff46279f14ac7d23ab4177b7926b061565ceff054291a508773ed0c037bdd20ffc72ecc99d44bcbc3751a486a14dd9d1d43c2e61a7ebd45cf967f06c
+DIST cmd2-2.5.9.tar.gz 883164 BLAKE2B 386c713e5bede98516842965c42f16abf97daaea1b52d8e2beaae04d32bcdfc419d00d5c48bff95dfc703be6dc073327da6dd8aeac947451218ac1f6e06d7632 SHA512 09d742728a964cbc6d01668b554c71535025834f46b1bae36cded63fc07234d0b53c5adae712437826f3df863b80734d7a78b6c36389bffab93201871be9eca1
diff --git a/dev-python/cmd2/cmd2-2.5.9.ebuild b/dev-python/cmd2/cmd2-2.5.9.ebuild
new file mode 100644
index 000000000000..4ddf8e2180f4
--- /dev/null
+++ b/dev-python/cmd2/cmd2-2.5.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 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-1.8[${PYTHON_USEDEP}]
+	>=dev-python/wcwidth-0.2.10[${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}]
+		dev-python/pytest-rerunfailures[${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 -p rerunfailures --reruns=5 tests || die
+}
diff --git a/dev-python/coverage/coverage-7.6.10.ebuild b/dev-python/coverage/coverage-7.6.10.ebuild
index cbd14cc1a10c..bdb767256c9c 100644
--- a/dev-python/coverage/coverage-7.6.10.ebuild
+++ b/dev-python/coverage/coverage-7.6.10.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/django-environ/Manifest b/dev-python/django-environ/Manifest
index 38f3ee34526b..4190401fa2da 100644
--- a/dev-python/django-environ/Manifest
+++ b/dev-python/django-environ/Manifest
@@ -1,2 +1,2 @@
-DIST django-environ-0.10.0.gh.tar.gz 49508 BLAKE2B 1df34e55fad0072b5be368af880609cb439772ded6446d63e4af03560adc11825e8dda3ac39dddcddf78667a28f0bf26ebc87942c7aaeb5274e56299f240483b SHA512 31296172cb919d2fc295c177618b2af09229943a8683beeeab3da4544bc0aad2eafe64d8ba98c45ede8a0ccd38c63b06425c268c548c47277747b47c21673001
 DIST django-environ-0.11.2.gh.tar.gz 50806 BLAKE2B d7ae0300fb3074e1f0c1bd97b46623f4e703f9330ce016f3690b8758ed6109f64f007747cf098d3f680110edd576476bf7c5c4080651b50f35bfd14320e24d80 SHA512 f712783d087f8942ac23d88ae1fc3f3a55ef9eaf4e63124a433151717b7245853c6e70a3fcfb0d90c31d0432de12ebd246dfc465c7a428d244393ca82194b649
+DIST django-environ-0.12.0.gh.tar.gz 52854 BLAKE2B 4c930d3ac66bbf9bd629ceee10c0fbeb78073c26e49c910a6300e481488562de97b9074b3da74aa27500b330eb391399922a19edd42aa40f09c8b2b107b0f5e2 SHA512 299ded59546847e0bfac25dea3c8967685d6e1f35b4aabe27cc7ae7104430bda1b989fd286915428e1dd1c429fd8ed156faaecfc41a2df0d2293d7cd75f9adb8
diff --git a/dev-python/django-environ/django-environ-0.10.0.ebuild b/dev-python/django-environ/django-environ-0.10.0.ebuild
deleted file mode 100644
index 94319b82d0ad..000000000000
--- a/dev-python/django-environ/django-environ-0.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django application to retrieve user's IP address"
-HOMEPAGE="
-        https://github.com/joke2k/django-environ
-"
-SRC_URI="
-        https://github.com/joke2k/django-environ/archive/refs/tags/v${PV}.tar.gz
-                -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-        >=dev-python/django-1.11[${PYTHON_USEDEP}]
-"
-
-python_test() {
-        "${EPYTHON}" tests/manage.py test -v2 myapp ||
-                die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-environ/django-environ-0.12.0.ebuild b/dev-python/django-environ/django-environ-0.12.0.ebuild
new file mode 100644
index 000000000000..de45f4f1608d
--- /dev/null
+++ b/dev-python/django-environ/django-environ-0.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023-2025 Liguros 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 Django application to retrieve user's IP address"
+HOMEPAGE="https://github.com/joke2k/django-environ"
+SRC_URI="https://github.com/joke2k/django-environ/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${EPYTHON}" tests/manage.py test -v2 myapp || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 0b504e00620c..201439c3991e 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,2 +1 @@
-DIST flexmock-0.12.1.tar.gz 52765 BLAKE2B 5b1317ff0d9b1a14d58b47d558a88f38ff7aef40fd349d0e70e9d9688a89b0464419aca953ba481afe3f4ccf88217b76c34e8bf1a053c62caaa1f9877ad35183 SHA512 898876695e9eff4fc37a9d3f6b93a34869500a3ce740e7c43cd4c4317ba59f2ea16ec11b4094037e6b56755047584870fa3af27a041003eb6200d79b3a716e63
 DIST flexmock-0.12.2.tar.gz 53195 BLAKE2B f1f0b33f3f75ba87e4fb983df2461b0478f02402de31edeeede017a08c61ea0b3a1f69408b0360dcbccc1130bbf93161e5f0767f888e83dfa757e0744ab44089 SHA512 8fac117032c6321b05dfb6c4d53e2f3e29c121ef9029d70aeaae8a96aadbb4e0120f319817c0a5e7699cd80d765f974d128a8e3d7b151e30c1a8ff834b87dbd5
diff --git a/dev-python/flexmock/flexmock-0.12.1.ebuild b/dev-python/flexmock/flexmock-0.12.1.ebuild
deleted file mode 100644
index 48a869ad3d3b..000000000000
--- a/dev-python/flexmock/flexmock-0.12.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Testing library to create mocks, stubs and fakes"
-HOMEPAGE="
-	https://flexmock.readthedocs.io/
-	https://github.com/flexmock/flexmock/
-	https://pypi.org/project/flexmock/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_teamcity.py
-		tests/test_testtools.py
-		tests/test_unittest.py
-	)
-	epytest -p no:flaky
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs
-}
diff --git a/dev-python/flexmock/flexmock-0.12.2.ebuild b/dev-python/flexmock/flexmock-0.12.2.ebuild
index 0503d3f5f161..416ed92ef24c 100644
--- a/dev-python/flexmock/flexmock-0.12.2.ebuild
+++ b/dev-python/flexmock/flexmock-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index c542131a2650..7271387321e0 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,2 +1 @@
-DIST gitdb-4.0.11.tar.gz 394469 BLAKE2B a79caf7def6094f1c99ff8621d7a01a9bc438e3ff54c73e5e9f598fada892e0209334edf73415476e31aef1cd0cd344fba6c8fe11c80cc157fdef5b9d2cda292 SHA512 024256481c553cd8e4b7fb0c0adc735aa6485c396e43aba73873cd4ad950ca686c3df7000a85acd1ac4f09db3f6ab613018739d24a8a69b4708150c171acf13d
 DIST gitdb-4.0.12.tar.gz 394684 BLAKE2B 5176e65a3991c2d2bfc925995029b4d8f35ec7206ff0b60400b82ffb20c2e4b8a15d6494c7841c18e642a17ec42491bd44fa8052469e48bfbd3ee3dc7f99c2c4 SHA512 10891c05dd238094b6b62ff0346529af98c1110eabc3c26992afb6cd767b938291a1e1ff6dc2c33423cbcf11c0a8daf0718232a20522c06a40fb5113a64a7b6a
diff --git a/dev-python/gitdb/gitdb-4.0.11.ebuild b/dev-python/gitdb/gitdb-4.0.11.ebuild
deleted file mode 100644
index 6581df4ca94a..000000000000
--- a/dev-python/gitdb/gitdb-4.0.11.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=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:,<[0-9.]*::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		gitdb/test/performance
-	)
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	epytest
-}
diff --git a/dev-python/gitdb/gitdb-4.0.12.ebuild b/dev-python/gitdb/gitdb-4.0.12.ebuild
index 37013196b3fa..a132306ee522 100644
--- a/dev-python/gitdb/gitdb-4.0.12.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.12.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gitpython/Manifest b/dev-python/gitpython/Manifest
index 99e81a809a0f..d3a738671a02 100644
--- a/dev-python/gitpython/Manifest
+++ b/dev-python/gitpython/Manifest
@@ -1,7 +1,4 @@
-DIST GitPython-3.1.43.gitbundle 10674326 BLAKE2B c430e6fec138077502dce16a1a100459c30134af7865a2e228646791465a7176ee3ef4db5cc83081f56b5e9877aeb4ba7e54b0526d6c2f594520335db4b48e9e SHA512 8c4b2fdf2e382393420bee1cb19929171d72e72669ac3ef96ff112119d803775aae92a14908b9bd51873f102ab85dfadd940b0789da6179b0f99354ae4b6d469
-DIST GitPython-3.1.43.tar.gz 214149 BLAKE2B bc95520b839a43b88571678d7dadd3998a613a4e4f5b0e59f8740add7794767db2820e2d68a98940976ed27fa57b6e487895b1f3d2894b55f1d7f4e06757a461 SHA512 c193418bbb6ebb4f202c4f6aa95b731acf319d6560db176aa7126cf848a1f11eea9f432c4ff6812e8ddb5f8386b1fa5e10335fbf170f3ec3ac5fd2dcde783415
 DIST GitPython-3.1.44.gitbundle 10877475 BLAKE2B bb699c221be259d0be53cf9b0a8e62191547dda2dee911406b14ce753f92748dabe5827adf86a5e5a373f6113daa8d5c93490208bc7250589a37379debd42f93 SHA512 b20ac8f691e57283d0167ee0d021d559153e51fef1ae64811624e3efb96620566ed8625d6bfd0d17a6ea385534de78c60c34aaa4a9bf8416bd45da36e196ee43
-DIST gitdb-4.0.11.gitbundle 1620355 BLAKE2B 8095193318d4262b8ebb04f35a0500eda8757057ed472dbaaece53e6afa6227e2b2c02a2be5daa5e4c0cc43dcbb5046555407d3d7c8dbed0bc5c415515032b8d SHA512 17e404b335a3c081f4058aeba5c57e5697a580f8ad7a280fde868968cf48f5a0852bfa45019eab730279582c0c536f8204e973d93af09da05908477329d73360
 DIST gitdb-4.0.12.gitbundle 1627457 BLAKE2B 2fb730fb72f682bac9a71a2b70af6ed476f69d57e00b323e669550793bcc330bd4b71575e0d0f008ed58f39e5beb622213ce2a10df6f512f1f5536b72c77871a SHA512 2fc619f511e373ad2ee51a108057e3a558dbfd68cbd7632244d7fd7914ed5fce99c182de5542264273de642e6e7680ee9b54a6da95224c562f43cf65e325db56
 DIST gitpython-3.1.44.tar.gz 214196 BLAKE2B e51d50bdfaf7a96d58f744dd632439ae7d0001df25af00a732a292970ec5666e7efe167ecf4b83c32ce8f1717e465fee419405d44a3963004bd5e04461fe86c2 SHA512 ad87a76510c980cce1cf24eb1097a11d3f44833708556af6ae46d7a3e5fe6610f6a9d00e03e2e03fc0b48bb1d4d546a854c574d99e46f364478d0264abc1d076
 DIST smmap-5.0.1.gitbundle 362567 BLAKE2B 72c8b48ad3250a33b94218c145c02033dee84c1da5f1eea57983a58699262d51844be675330d95c7d64924b6aeaacd4b0a57e9a5acad3be184aaad62102202e7 SHA512 9ca8386bfec25d1562cdf1c2ee85f7edb15fd3f44ecd1abbef738979f12b82f0b0f39a06589203a39f89518d981d7129e35f64f2d855cd162cd964bdd87c8d18
diff --git a/dev-python/gitpython/gitpython-3.1.43.ebuild b/dev-python/gitpython/gitpython-3.1.43.ebuild
deleted file mode 100644
index 3f025529954b..000000000000
--- a/dev-python/gitpython/gitpython-3.1.43.ebuild
+++ /dev/null
@@ -1,83 +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=GitPython
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.11
-SMMAP_P=smmap-5.0.1
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="
-	https://github.com/gitpython-developers/GitPython/
-	https://pypi.org/project/GitPython/
-"
-SRC_URI+="
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/typing-extensions[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimportant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_quick_doc.py::QuickDoc::test_cloned_repo_object
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest -o addopts= test
-}
diff --git a/dev-python/gitpython/gitpython-3.1.44.ebuild b/dev-python/gitpython/gitpython-3.1.44.ebuild
index b8c17c56986a..edf31f913c47 100644
--- a/dev-python/gitpython/gitpython-3.1.44.ebuild
+++ b/dev-python/gitpython/gitpython-3.1.44.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 920a35cd304d..93023ca1c0e1 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,2 @@
-DIST google_api_python_client-2.156.0.tar.gz 12230345 BLAKE2B 9ce77dc4fd962bf24a8046678c4c21501218dd1f3a356b364bb6940f564f9aa7e6d99c77db9b5e7fea271a17b10726a668f07dec6ec344bad5cad98a1975a107 SHA512 c29debb48f8504eb6316ec465613e87b083429344a9e74f4f52d07f6edf47b017a7f0b539557de4ca575ead3dda1d4b0579faf483102fab407c15386277d5078
 DIST google_api_python_client-2.157.0.tar.gz 12275652 BLAKE2B 9410a8b7a726c94286f9ded13091cf59d8de7238c184969f0f7cdb9330f9e6e278b2953d70cf91fa2e74b62314f02ae5372ac661a04c426ac813cec651fdacbd SHA512 3ff7078c8ccb80d84cbe8df3eefb15f5a5c986285ab6e7b06e0b49962b96f25655fc618ae15416af2c33744673c36058ffcc9df3cc1b31fb78d4dd0f053a5d19
-DIST google_api_python_client-2.158.0.tar.gz 12277176 BLAKE2B b2926912b1bdf6528a7ba9801bb31b599222fa65b67ba6d7fddd7897646196d6f1beebf1c5be7128286111eb443697b5e41a7ec3e863514cebd26d7f428f7aed SHA512 05296dd6a0a55de09c914596330edd92dae152a157c9e9194fe377420e163b22bd94de30ef55960798feca738d51a1e5fd0dcfc730d498f28687a40cf175ef31
 DIST google_api_python_client-2.159.0.tar.gz 12302576 BLAKE2B a4cf681694930b303aab3a1756fee9af2bbd52258fa6ce3a3ede3db0a211467b0ad3a8d4d75e756d66d08ee5d5b58d799136ebc6d4e739bb9e655fbf6ca24eae SHA512 57295f7a9d651466760cfb69c61e52478951da083c4c7a2238d1b0e55860cbe9d1f6d76c9b89acf36bfa39beac28c8594f96c4ecfeb04f174474d259434c32e5
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild
deleted file mode 100644
index 75fc31e16901..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.156.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild
index b2220fafe3ef..75fc31e16901 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.157.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.157.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/google-api-python-client/google-api-python-client-2.158.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.158.0.ebuild
deleted file mode 100644
index b2220fafe3ef..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.158.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild b/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
index ac5618caa2cc..660181684adb 100644
--- a/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.68.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/src/python/grpcio_status
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d0c6584e8956..db0ee0d3fcda 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,3 +5,4 @@ DIST hypothesis-6.123.17.gh.tar.gz 9508250 BLAKE2B 494c41299a646856050889e2093da
 DIST hypothesis-6.123.2.gh.tar.gz 9506171 BLAKE2B a7033cf2b5d56753ce19c5b369889b62d88c86df8254c840341c599dd97f575fc84e73236e701f4303d6141146bdef24f13f8d666f30a578ff80b067976934ba SHA512 d46b3d83a14b629a39f7eb2dcb0915802ee8185b4796ea38d053e44f2e8e4025a053c99a0aea7b4b59442a24fd3600b78d5a19e1f0bbd13e8a2d9f93cdca3df6
 DIST hypothesis-6.123.7.gh.tar.gz 9509012 BLAKE2B 71def0634aee97b4d64bacf9b4a09e091fb209c9de2d2ecbcbb86ad0f7bc2e330e7d7b93e1c810b864fd80ecd82eb6bf51aaf6a6de99c74c338609062ce1e90e SHA512 00b26f4e040a948aaf64554ee395fad4c9b0bb116c87d97bd3ef20be1d25068a79ed1c856c497c1d3d5122481386625c3323be77c0ec851fab823a706350b437
 DIST hypothesis-6.124.0.gh.tar.gz 9509075 BLAKE2B 06bcce0c2f3772ae16c623367e53410b1d5237a2f62f77643080d69e4b32b47f0cbbeba98c66a83247c35d3d6a3d9e7c6493383393a13fc63d86792ef464ca59 SHA512 f876e18fcc784f9b61c18435c66a9aaf9aee76875f5d5e29dbca31448421e7691977660946ea5e3d3f0c33d740ddee55d860995636ff54706cd5c01d39663dc4
+DIST hypothesis-6.124.1.gh.tar.gz 9512599 BLAKE2B 4220d41a7c2573fc4fe2ae550370c563feb3a558f74808979ea66afc5da3e749960842ab8a213d4826c2c2c4c8e9ddfbb263b99820b7fb142f0586036a8683d4 SHA512 64a1c64ad68295ddaeb11cd28c7650fc79fbf668129daefc6fa8c492d3de919468015127721bf1525512f1929dd0dd70906a864ab402571517ddd61ddb097ae7
diff --git a/dev-python/hypothesis/hypothesis-6.124.1.ebuild b/dev-python/hypothesis/hypothesis-6.124.1.ebuild
new file mode 100644
index 000000000000..b67bbcacc7ba
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.124.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+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/identify/Manifest b/dev-python/identify/Manifest
index 0dee12bd8df9..8369c789de3e 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,2 @@
-DIST identify-2.6.3.gh.tar.gz 101836 BLAKE2B e4a66cc0df9ce3f172bdba78322ea22ba2d89cc54a82c03388a0cd00bfe8e6645e1e42c80a94d0c407319c2719509ce12ce3e9fb2e3714ce2a46bffeec75eb9e SHA512 462b0b54643b7de91cf96ca07a38e4f8a0a424edf205d37e28eee9720cdd0f0804d9a7c8094f099656c2ae5cbb09a966b2b87732647f92ddb71ce5143def0d87
 DIST identify-2.6.4.gh.tar.gz 101872 BLAKE2B 5e1cad94df06eb5ba60e37c1f88341098759ab9e1e76aa765618fa948c24b2bbba704a3ace87fe37a2af3f4c6e47eaa41b02abca438554095f44c4d0f76277cb SHA512 ce89b6a49ab683f97fdd7a506f5c82419b73ab53e1c4aa0728ede499e48e958fcfe14532bc2d81a0e0bf73411413143744048f8f2e7616cd0166f4c7b8c91279
 DIST identify-2.6.5.gh.tar.gz 101871 BLAKE2B 32beb0e5185f39df6f3f45969eb2a4e11e711f36bd1c728322307ffa02aa60c3d7f20c5cf3f93afc88a3304ad98f36d426cca32108d9b2e79663250acaaddd57 SHA512 933e269c1f68a7ba4e97f2b20297b665e9ba955e3d26b3a9f535e84d8d8e929f844a4e5d8f6c053d819318368ae89c87058ca81f8d24e92c60a5f053db3056ba
diff --git a/dev-python/identify/identify-2.6.3.ebuild b/dev-python/identify/identify-2.6.3.ebuild
deleted file mode 100644
index 289815a86e90..000000000000
--- a/dev-python/identify/identify-2.6.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.6.4.ebuild b/dev-python/identify/identify-2.6.4.ebuild
index f6bbe575b185..ef19a9ea1cc4 100644
--- a/dev-python/identify/identify-2.6.4.ebuild
+++ b/dev-python/identify/identify-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index c8fd4f91ac05..4b9be661ac51 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,2 +1 @@
-DIST inflect-7.4.0.tar.gz 72730 BLAKE2B eaaaa46a1f710f5b05165f3f894eb5a2437908299146369a2537a675a1d50facba56c7a9efa2e459b7cfb95a4f2c5f615d64948fb278a4a990423b40414f701a SHA512 fe3658a2f4c9303db90604268a525112c6a67f66ed37f6fbe76cd04a008658362e682413297dc1fcae6e6a0415098f3adaf0f205b781e1e24a050f59c9dc9021
 DIST inflect-7.5.0.tar.gz 73751 BLAKE2B a17c5cb5bfcd10530f29537335ffd1b4725fb1f53e78ef7ce1f40a3031fa486baae3400878e575c8ce6a77b4953332f051ec65dcba024a14c527301e51079edb SHA512 ee9f69dff451017a2aad2226d8c6ae02b4b7b4bc4d4c49f3efee50d85eeef43c49c6c6ef3e7f30fa2c5ef21e065ff5242140d5a98bc71af17c7e70d9e75e54c1
diff --git a/dev-python/inflect/inflect-7.4.0.ebuild b/dev-python/inflect/inflect-7.4.0.ebuild
deleted file mode 100644
index d7209993a7c1..000000000000
--- a/dev-python/inflect/inflect-7.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/typeguard-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-7.5.0.ebuild b/dev-python/inflect/inflect-7.5.0.ebuild
index 19ca1665c95b..872f8cc50a7e 100644
--- a/dev-python/inflect/inflect-7.5.0.ebuild
+++ b/dev-python/inflect/inflect-7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/typeguard-4.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index 39df976abf49..fbcab25257c7 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,2 +1 @@
-DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
 DIST keep-2.11.tar.gz 12175 BLAKE2B 88116819bf3aafeac5d4891a136f4a17751aff3141d55891bb7c29bbcf36e7c3a5a7d5aeaf6ccf62377cf7f660178cc971ffba7c8e8a80e9d3ffb87f91bed150 SHA512 b26349dcaf03cdec6463ee73029e644a41985f09efa4923ce6344884ea8d4189679747202af1ec930479ec1290374b4c55d4ae478590ce690f8920de00276782
diff --git a/dev-python/keep/keep-2.10.1-r2.ebuild b/dev-python/keep/keep-2.10.1-r2.ebuild
deleted file mode 100644
index 6a3d9c9a6936..000000000000
--- a/dev-python/keep/keep-2.10.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Personal shell command keeper and snippets manager"
-HOMEPAGE="
-	https://pypi.org/project/keep/
-	https://github.com/orkohunter/keep
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/pygithub[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	"${EPYTHON}" - <<-EOF || die "Smoke test failed with ${EPYTHON}"
-		import datetime, sys, os
-		import keep.cli, keep.utils
-
-		# avoid automatic initialization, otherwise keep basically just creates
-		# this directory and exits
-		# see https://github.com/OrkoHunter/keep/blob/8dddc00aaaf0e53edbd2477a02d3fe53e38b7f28/keep/utils.py#L53-L63
-		os.makedirs(keep.utils.dir_path, exist_ok=True)
-
-		# keep tries to check newest version on pypi once a day, let's pretend
-		# that this check was already done
-		# see https://github.com/OrkoHunter/keep/blob/8dddc00aaaf0e53edbd2477a02d3fe53e38b7f28/keep/utils.py#L23-L50
-		with open(os.path.join(keep.utils.dir_path, 'update_check.txt'), 'w') as f: f.write(datetime.date.today().strftime("%m/%d/%Y"))
-
-		sys.exit(keep.cli.cli())
-	EOF
-}
diff --git a/dev-python/keep/keep-2.11.ebuild b/dev-python/keep/keep-2.11.ebuild
index c055398dc038..0277ad9e0cb1 100644
--- a/dev-python/keep/keep-2.11.ebuild
+++ b/dev-python/keep/keep-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild
index 4be00598f797..5823f0c37b0d 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.3.0[${PYTHON_USEDEP}]
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 cb5f43e438ae..b7114fc7aeab 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -12,6 +12,5 @@ DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee5
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
-DIST llvm-project-2529a8df53af9bc6cecfd6c83404ffa5e89e3370.tar.gz 224493461 BLAKE2B 0d3c757a8f34a9bf6b2ac0ad394cc1f8125cfee534c8bd0c5875eba56fe0171892586ec05b6f1e859e5962f81c76c9a315f60bcda012df73a3bd66709b265038 SHA512 a49fa1da2fd398b279a90292704e30d8ff7163219bfd91c4a80fa5123d957cdef52d2ee41710a8bcbfea3d9a5eec269dfc756584fcc27a495f7f381176de4e69
 DIST llvm-project-8af4d206e0f979f68925a08f9dffd60a98ce97e2.tar.gz 224825146 BLAKE2B 36e9c8f9615d65fc72beb699c4ce5959676975267a4c4288a01009d26ab84ae411f2855e4e6475957b91ddc21da29251ab22e331395bc9fee0f9bc907a05384a SHA512 ec72cdd7cc6d9bef31ae9295606d18e4935468fe60ab632aced21261d437e76f11d83d0d7199a6028689990260d9155098f7d64e97db0e0af28ea6c75a773bcc
-DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 BLAKE2B 6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3 SHA512 ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1
+DIST llvm-project-c3a935e3f967f8f22f5db240d145459ee621c1e0.tar.gz 225133913 BLAKE2B ced922010bad14df6bce0dbbb9323ee3cc9d7bf2f764f8c982d134d7a97e38d84b0b81635bbb16031aa1899c744e7c036cec5d1957733bbed7a2f18f89db0b6f SHA512 0ea083defb3c0ecaa5d8d28682f140c68ec6b3ab6cbfc60fc38a9265a8eb88b618c075d6ae03170ed54c5e7dcb3b7003eaacea2fcb115e9864b64a17cea0013d
diff --git a/dev-python/lit/lit-20.0.0_pre20241227.ebuild b/dev-python/lit/lit-20.0.0_pre20241227.ebuild
deleted file mode 100644
index 277d267df2b8..000000000000
--- a/dev-python/lit/lit-20.0.0_pre20241227.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 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}]
-		llvm-core/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from llvm-core/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/lit/lit-20.0.0_pre20250104.ebuild b/dev-python/lit/lit-20.0.0_pre20250118.ebuild
index 4230fa63b2a4..4230fa63b2a4 100644
--- a/dev-python/lit/lit-20.0.0_pre20250104.ebuild
+++ b/dev-python/lit/lit-20.0.0_pre20250118.ebuild
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 79c0a1158aaf..f6884f8965ae 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,2 +1 @@
-DIST mistune-3.0.2.tar.gz 90840 BLAKE2B bc4f477b24c8244d2fb7032835b3dc3bfc0bda8948fabbfa78660f77c861df76f9e01abcb58f8643efd689482fe3a187995cc92dd7cd0b7817ad799237d9b72d SHA512 9a7e0e2886afddb8a6e314af1e4ed6e41f886f64823713f941b6a713a29986044ac66c437c4029e0fbf20224d106ce445a46906825b20b17b9e2ff6173476d28
 DIST mistune-3.1.0.tar.gz 94401 BLAKE2B e1e6f17c5aa378998bec8a8480c8b311243e067f52a9da6b451db33c639ec5a69f6d8b3c815bf9582b0b9c9a7aff3d197ab9bf477c634805eb704c0bbdaebe67 SHA512 2532565f15c1563547db131e28ea373a76dc5ab96b98a0f2f156709e625953f6f52a9e7b216e235b17ab09b282dfea8ee82c3975d9a08a0f52463b235e5589d8
diff --git a/dev-python/mistune/mistune-3.0.2.ebuild b/dev-python/mistune/mistune-3.0.2.ebuild
deleted file mode 100644
index 9c7293efeb99..000000000000
--- a/dev-python/mistune/mistune-3.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="
-	https://github.com/lepture/mistune/
-	https://pypi.org/project/mistune/
-"
-
-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"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-3.1.0.ebuild b/dev-python/mistune/mistune-3.1.0.ebuild
index 073fe4c87819..8f28443c5e99 100644
--- a/dev-python/mistune/mistune-3.1.0.ebuild
+++ b/dev-python/mistune/mistune-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 86bddc4891e3..0625f86ab2b5 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-material-9.5.49.gh.tar.gz 14750118 BLAKE2B dfa64a6e61363edc8829a5a97c7990d59e1f48d1a11c60085396471f38f3dbe5930550b0859c06ee2d7d3d5c593b7eeddd755cff765847fbc998c8ad1852fa19 SHA512 7b2121fcf5aeace241ccaa8c4d97cd1492fcf0b2c829945656beb140a2f132955cc80b5448e6ceee932fcacec3870deca693411152ef2ceec3032d30a688ac11
+DIST mkdocs-material-9.5.50.gh.tar.gz 14753521 BLAKE2B 3d4b98bdd89d3e106f5cbd78b4deb639164991da1adb5b0dc141c7feb1b07a08466daba7793e3cc46b7db5c26bb6c46ebe3635dfc4e9f943318eff829eced6e8 SHA512 1a24b97deb43e92de7ffac52f7b3a1139f26ae112e6a9218d1a31ac8f07e250bfd0905b95d3d01f3ad5daf12246b4aa98d852fac3cecc7e5dc60b1337b820ec7
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild
new file mode 100644
index 000000000000..09a2daf59272
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.50.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+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/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 19ac8166a969..9dbdd85b043e 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,2 +1 @@
-DIST nbconvert-7.16.4.tar.gz 854422 BLAKE2B f04a8fbffde70e08736d13a3db3278c9248f742b27688eb56760b9ff46c58aec63aa05a4cff256e5929009c3f76d760ce71209f3c49b40af374f06b073ddd661 SHA512 f9793ce89f18530492e1e9aeba3759ac6ae8aa8e0459be52928689a58b0d816128d275bdf9061ec9f33a047e0b6c8d4d83e5a81da556700e0add48374f15fcd8
 DIST nbconvert-7.16.5.tar.gz 856367 BLAKE2B d1b44e2665a4a96c2d7a78c986b93c5e9e5e12bc984f20735a03e1fb28d81b43cc7b1d6ebf0a8dad56b470e5e683c672f096c9fd98d22852f5c8fe94a9c2ce44 SHA512 703ed3e33efc2a42c8bde84829b82a8e9ef2313c1766bfc0ab642743173ade642d4a796afa9ef489ba2f58bd75fc0ce6e50009676e2ef1d3848967ddf775f861
diff --git a/dev-python/nbconvert/nbconvert-7.16.4.ebuild b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
deleted file mode 100644
index 697655483a39..000000000000
--- a/dev-python/nbconvert/nbconvert-7.16.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="
-	https://nbconvert.readthedocs.io/
-	https://github.com/jupyter/nbconvert/
-	https://pypi.org/project/nbconvert/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
-	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	<dev-python/mistune-4[${PYTHON_USEDEP}]
-	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		>=dev-python/ipywidgets-7.5[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
-		tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
-		# crazy qtweb* stuff, perhaps permissions
-		tests/exporters/test_qtpdf.py::TestQtPDFExporter::test_export
-		tests/exporters/test_qtpng.py::TestQtPNGExporter::test_export
-	)
-
-	# virtx implies nonfatal, make it explicit to avoid confusion
-	nonfatal epytest || die
-}
-
-pkg_postinst() {
-	if ! has_version virtual/pandoc; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc or app-text/pandoc-bin."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-7.16.5.ebuild b/dev-python/nbconvert/nbconvert-7.16.5.ebuild
index d66830d0e044..469b25744ef2 100644
--- a/dev-python/nbconvert/nbconvert-7.16.5.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.16.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/numpy-2.2.1.ebuild b/dev-python/numpy/numpy-2.2.1.ebuild
index 48abed5e0b7d..2c54dfd11fc4 100644
--- a/dev-python/numpy/numpy-2.2.1.ebuild
+++ b/dev-python/numpy/numpy-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="big-endian +lapack"
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index d048be4775fb..b0339bbe0316 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-3.4.0.tar.gz 1256314 BLAKE2B 595f1a8b1729cd79e998d4de9817daf23365b4e1b9d8361afbddbd20ecd8ead3c07662a5ff0de70986547ed3cad32785c5182cdf1fadfea455d6824036b5f59b SHA512 34cc9a2f4d1f6cda86e4f4b411edaf3d3fc229c2384ce160cb9b65068054793867b14c40beaf9f4b46948da8f22f70a68d5a3868c4b8605ade0aa2b0d8750828
 DIST openstackdocstheme-3.4.1.tar.gz 1256381 BLAKE2B df100b6092c8c3635b80f01cb31de4cc3ded146289c40c77049c6f2f993bd779147d295b7867b23f930d44590e89d5d26af7b03e935077ca74702122f3699113 SHA512 93473465e6ce5199b20f738232f71d837d537052fa273efa3dc11448ec4d86a7f6a0253baac4fbcec7f3378d1e6683982c14d91dd1f9f2fd7638d1fe96791a33
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
deleted file mode 100644
index 942fedbd55d6..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
index 528f5d259e8a..8cf44db93c7b 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.10.13.ebuild b/dev-python/orjson/orjson-3.10.13.ebuild
index caa4398ad8b1..80f6fbbae6b9 100644
--- a/dev-python/orjson/orjson-3.10.13.ebuild
+++ b/dev-python/orjson/orjson-3.10.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -63,7 +63,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-3.0
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	>=dev-util/maturin-1.7.8[${PYTHON_USEDEP}]
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 665696a8d3f4..73e351da33f8 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,2 +1 @@
-DIST path-17.0.0.tar.gz 49721 BLAKE2B eb25e41c5fd5a269023dbdf331a1abb4228707f8b2ca8e4523fabd749fe7c76dc564ea18dd1d9ee4af085bfe72a47400c2bd21c8235af8654998bbefbeb87512 SHA512 9e2e6d51f32f6380d944006fc618d41fb6136d878b758a10a81b3cee5b3e11e5330fba3cc88b0f185c4244aa38f338a32f49685da733539e2cf1cd281ed65412
 DIST path-17.1.0.tar.gz 50081 BLAKE2B ed3c87658cd65ff84e6283967d3d91c19f81bc462452592410fef6c86b576cba25584e55c02243dcad36a36ba5bfbe3086b8c427591f94fa32dcfcaab3e98ec0 SHA512 af369767442780c69ae73006f4a18aa2ca15a67718a482190bf0035352473ac2fdae7aa6dd017c9fec075cdd916f42768db16f8f40ebcd68861baaa47f115305
diff --git a/dev-python/path/path-17.0.0.ebuild b/dev-python/path/path-17.0.0.ebuild
deleted file mode 100644
index fbe8c4964f5d..000000000000
--- a/dev-python/path/path-17.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="
-	https://github.com/jaraco/path/
-	https://pypi.org/project/path/
-"
-
-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 ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
diff --git a/dev-python/path/path-17.1.0.ebuild b/dev-python/path/path-17.1.0.ebuild
index ee1d19e5ef16..292dbea9eb3d 100644
--- a/dev-python/path/path-17.1.0.ebuild
+++ b/dev-python/path/path-17.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pillow/pillow-11.1.0.ebuild b/dev-python/pillow/pillow-11.1.0.ebuild
index 86b1c92786ac..b980af0387c2 100644
--- a/dev-python/pillow/pillow-11.1.0.ebuild
+++ b/dev-python/pillow/pillow-11.1.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/portalocker/Manifest b/dev-python/portalocker/Manifest
index f2ffbaa559d5..1fbee53fd126 100644
--- a/dev-python/portalocker/Manifest
+++ b/dev-python/portalocker/Manifest
@@ -1,2 +1 @@
-DIST portalocker-3.0.0.gh.tar.gz 35104 BLAKE2B b96591c56f8f894eaf012bfa89dd4e5cf7ee300176f4ea861e29dbf6f2a3cade061605b2d0a5796010369caebc3b032d77b77bddff165959bd464e9d9e8b4ebc SHA512 b3417bc0b4f726129b6625a778d7d828ab8401422ee1847b20ee79019fc029acb0cebbe539495e071cdf8dcd628d5764f39036059b19718b5ba2d0702388ac9c
 DIST portalocker-3.1.1.gh.tar.gz 36653 BLAKE2B 88fe7b46cf3d2d4b8f6aa2df8b6ac7582eda35965d7af8688e17f9c22c0ff29e671bfe4c74aef91532ce01e957b4777abc2c93bc3c93503f0f7fee995fdfb1ec SHA512 80163a12d8eab1a0e2bc2eb5fd8f4c64f0abb49cbb99faa48d8e7ae4f61996c5c934e661a7a26996000962b68c45d5ab72c41abf03d7e7593dcaa98e69d0478f
diff --git a/dev-python/portalocker/portalocker-3.0.0.ebuild b/dev-python/portalocker/portalocker-3.0.0.ebuild
deleted file mode 100644
index 8f4481833d53..000000000000
--- a/dev-python/portalocker/portalocker-3.0.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 optfeature
-
-DESCRIPTION="A library for Python file locking"
-HOMEPAGE="
-	https://github.com/WoLpH/portalocker/
-	https://portalocker.readthedocs.io/
-	https://pypi.org/project/portalocker/
-"
-SRC_URI="
-	https://github.com/WoLpH/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="
-	test? (
-		dev-python/redis[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-6.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Disable code coverage in tests.
-	sed -i '/^ *--cov.*$/d' pytest.ini || die
-}
-
-pkg_postinst() {
-	optfeature "redis support" dev-python/redis
-}
diff --git a/dev-python/portalocker/portalocker-3.1.1.ebuild b/dev-python/portalocker/portalocker-3.1.1.ebuild
index b05074c44835..5d51bdbac45a 100644
--- a/dev-python/portalocker/portalocker-3.1.1.ebuild
+++ b/dev-python/portalocker/portalocker-3.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/protobuf/protobuf-5.28.3.ebuild b/dev-python/protobuf/protobuf-5.28.3.ebuild
index 2efcee4d74c6..f35b90e11590 100644
--- a/dev-python/protobuf/protobuf-5.28.3.ebuild
+++ b/dev-python/protobuf/protobuf-5.28.3.ebuild
@@ -26,4 +26,4 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-python/pyaml/Manifest b/dev-python/pyaml/Manifest
index cc90044a0606..683b589f9abf 100644
--- a/dev-python/pyaml/Manifest
+++ b/dev-python/pyaml/Manifest
@@ -1,2 +1 @@
-DIST pyaml-24.12.1.tar.gz 29288 BLAKE2B 392579d0afbf1b71e0cc38d875c0f8492e9f33b33bdd619f1a9b3d9f042d1cc62ba19a495bab14331c53e745691e802a80b772ff0293dabb8da00da75a3a53ce SHA512 46125a594609cbcfc91f5005d5f551ab8b20ff4615bf8df586f68b1afcda090c1649d973f8e281c1aacd139c27359d44625b8e5aa2f9792a49bde9b2942993b5
 DIST pyaml-25.1.0.tar.gz 29469 BLAKE2B f73ba6bfdcbd5437ec9540845316940d60194b04f039b91180829207b680d1524c7811f424d3a055df87ddc179394e53020083c3fde0e1f10cfde5d495716c71 SHA512 ab006e2ee2c4592ac2e1f8aa2afa3443e206d8147739fc561f994273a41473dfb6faf6324c2c6e9fdc46a9829424f9416b85e8a85a06495430183deca47f16ec
diff --git a/dev-python/pyaml/pyaml-24.12.1.ebuild b/dev-python/pyaml/pyaml-24.12.1.ebuild
deleted file mode 100644
index 3d729248811f..000000000000
--- a/dev-python/pyaml/pyaml-24.12.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 pypi
-
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="
-	https://github.com/mk-fg/pretty-yaml/
-	https://pypi.org/project/pyaml/
-"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyaml/pyaml-25.1.0.ebuild b/dev-python/pyaml/pyaml-25.1.0.ebuild
index 6c343e815a2f..6674ea846b29 100644
--- a/dev-python/pyaml/pyaml-25.1.0.ebuild
+++ b/dev-python/pyaml/pyaml-25.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/pyglet/pyglet-2.0.21.ebuild b/dev-python/pyglet/pyglet-2.0.21.ebuild
index 69349092c3ba..be836eab5248 100644
--- a/dev-python/pyglet/pyglet-2.0.21.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.21.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/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
deleted file mode 100644
index 9f3d2de35aea..000000000000
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Spyder extensions for the python language server"
-HOMEPAGE="
-	https://github.com/spyder-ide/pyls-spyder
-	https://pypi.org/project/pyls-spyder/
-"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
index e5adde690a6b..4eb1dc162039 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index d92ff7d0f041..1581b1b8b56f 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,2 +1 @@
-DIST pynvim-0.5.0.gh.tar.gz 59043 BLAKE2B 4c9ce46e90dbb6cf278b48a904bef6dbd821d696c578a29d84af5ee64b223c602727dd09bdecbc90f7b6a634cbcd11b615d7ae48782e5cf71ae59faf8f8b1ff2 SHA512 91ffe3f42cc23ba372223b8c9f6930b0cff9d30b6764052a77a5c34e39a3312a1834b9a753152e96d04d5b4b61ce647bd7470095fac3122ae6b1346dcdf07f2f
 DIST pynvim-0.5.2.gh.tar.gz 61269 BLAKE2B 252c9e38935cfb8558ad0536090942b5dbd582f5164c7172fb85e0fa76ba50f18c6be42831905599e28c6a1c074af7c71d7b35b6a37560a28f7bb8a11fcc7b5b SHA512 3bc07e6e1aec265d9584cb03946a0d72fbd43be498bfcefc35d6b60f23316d1dd0ea812f24d96a0e156bd54918944b3cce6303f9a66b23e61c9a000233aa10eb
diff --git a/dev-python/pynvim/pynvim-0.5.0.ebuild b/dev-python/pynvim/pynvim-0.5.0.ebuild
deleted file mode 100644
index 6a0fb4b40d65..000000000000
--- a/dev-python/pynvim/pynvim-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="
-	https://github.com/neovim/pynvim/
-	https://pypi.org/project/pynvim/
-"
-SRC_URI="
-	https://github.com/neovim/pynvim/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/greenlet[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? ( app-editors/neovim )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pynvim/pynvim-0.5.2.ebuild b/dev-python/pynvim/pynvim-0.5.2.ebuild
index fcd6e11bb0f8..8bf6532c232c 100644
--- a/dev-python/pynvim/pynvim-0.5.2.ebuild
+++ b/dev-python/pynvim/pynvim-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/msgpack[${PYTHON_USEDEP}]
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 01c574d19afb..8efc5c0c1585 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,2 +1 @@
-DIST pyparsing-3.2.0.tar.gz 920984 BLAKE2B 417dc6f21f0f16e21422531c729efa4948eba458a28b38347cb665148b4fc438c8e420e4084d79c41386a959a8929f05a80c9b6323f1282b41e8cc1b85f1165d SHA512 0a3096f07c41d3ff954c9aba8bd259a1c8af7ecb391add863e5743262b34778d32f05a617736295dcadbda80d94ca9af2e395a2077f616ac4d1557459a0b7cff
 DIST pyparsing-3.2.1.tar.gz 1067694 BLAKE2B dc82426b4b74d22932451a828cf76a69501b926f737d201c5b01d32b152e113e2d3f6e900723e2dc6cd7b8d21eda11dfc55bd7436bba625125f5e25f52e132b6 SHA512 bb0e703ebf7bcdf34909ac693e16a1c17386a3e92b6c52c157ef338360b3c0cfab9a238bcbfdfe9c061fdff93a34c732d4e1a184b8fb12c728b2b7f2306aa978
diff --git a/dev-python/pyparsing/pyparsing-3.2.0.ebuild b/dev-python/pyparsing/pyparsing-3.2.0.ebuild
deleted file mode 100644
index a981db6b72e2..000000000000
--- a/dev-python/pyparsing/pyparsing-3.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2004-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="Easy-to-use Python module for text parsing"
-HOMEPAGE="
-	https://github.com/pyparsing/pyparsing/
-	https://pypi.org/project/pyparsing/
-"
-
-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"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# railroad-diagrams not packaged (and not suitable for packaging yet)
-		tests/test_diagram.py
-	)
-	local EPYTEST_DESELECT=(
-		# also railroad-diagrams
-		tests/test_examples.py::TestExamples::test_range_check
-		tests/test_examples.py::TestExamples::test_rosettacode
-		tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-		tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-	)
-
-	if ! has_version "dev-python/matplotlib[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_matplotlib_cases.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-3.2.1.ebuild b/dev-python/pyparsing/pyparsing-3.2.1.ebuild
index b940290c93cf..cf9bfb28b161 100644
--- a/dev-python/pyparsing/pyparsing-3.2.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.2.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 ~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"
 IUSE="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index ed6150f0e14a..df811f97bb91 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,2 @@
-DIST pytest_asyncio-0.25.0.tar.gz 53298 BLAKE2B e29641f9e0ae24aac80bca7eaa14258d0bdfa6080abeaedd38ffe121cb9a9bf5886da2a38a3033010fcb47f4c2aee0eb17b0f63cee020c5ae81e8334486c66b7 SHA512 162d1693c82c4be96cf20cfeb075c4e434e897cdfc172564b8b2513b362a6bbf54d8be6da4a63a7de34236b6c55eb515e60b994198c07a5c63a63333fe019932
 DIST pytest_asyncio-0.25.1.tar.gz 53760 BLAKE2B e7e30691734c0c0c0783f152531b6e3e7455098b577a0ae87d560959e5fbd7a3a04148b85b13543a69763022b49d5d946af089a2ad0cedae5d9f3470643c1e6e SHA512 8a6ce121dfce4362a9b9dd320ee8207129a5f9d667e80fc8d6b9a43095883cfbbb59813e2fafc5deae062c596b2a9af76b80b18fabcc003fbecf9a0fc8b09e01
 DIST pytest_asyncio-0.25.2.tar.gz 53950 BLAKE2B 950cbaa50e2bb8a66cd2396e7e6b5c0c97e2cd0272381b0de23f3668dea2f663f9eaf0c92ec91c474cd1dc44f3aeae77dac1e347ee86cefb518850d9985d2e7a SHA512 d19e2de9ae27cfedc06580ffea21b8894054c35e62601a01487d485ece906f765640dcd9fb633059925701f082644c424b7b532a91e978b8c099192e9a324f6e
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
deleted file mode 100644
index 7972912f463d..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-asyncio/
-	https://pypi.org/project/pytest-asyncio/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-5.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on precise warning counts
-		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
-		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
-	epytest
-}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild
index a79c5bc094b7..fe37ad205b45 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.25.1.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index ee37365d25df..f97fdc1f7d38 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1 @@
-DIST python-dbusmock-0.33.0.tar.gz 105903 BLAKE2B 5a101e64d5eff70e7a32d21080cd0051fd5617c8d057fe1cbe465903eda419fab9d0e720b0c72bac2c856d9a1371493c9b01d07ec144c2a847b6c44b65f6dd3c SHA512 419f09a5bfeab4e914c809546f3dc3bd294844116f7f0cd4a6a0b4121493c64fe6587647866323f74ed2818d1d6b45d417e384ea54c6d1244233b2a7b0d8d97d
-DIST python_dbusmock-0.34.1.tar.gz 111561 BLAKE2B 933b09ea2a679831894432bcd2e74804c3b8e7023d924512eccfdab40165f99736f85a27dd98accc2d97e36e546729fff4954eb913f7d3f5293aa50ba9326620 SHA512 093b5dec4b6f9d70b480046320211beca02e83cd0bc077448bb5329d888634805e4e6dfac9d1665b4c1ee5a15c1cec613a530443954cb4676b7a025c52bf457f
 DIST python_dbusmock-0.34.2.tar.gz 111535 BLAKE2B 8f3f125bcfbf0d1674e0dea3d87d6f776e85fb818c5fd3f814ca139f4f6936e06eabe7c60c467114918609e1897b0c770a5765eb356fc1843eb781e264fd93ac SHA512 3a4a46afa0ca54004a6891c639c0e1bfd879e575189bdd1bbe031f12333d2358af77456e8b6cb32681010b7c19fb8171f819f67ec8960494408100118b19881d
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.33.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.33.0.ebuild
deleted file mode 100644
index 5546376156ed..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.33.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-power/upower
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# tests are fragile to long socket paths
-	local -x TMPDIR=/tmp
-	# Tests break if XDG_DATA_DIRS is modified by flatpak install
-	unset XDG_DATA_DIRS
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.1.ebuild
deleted file mode 100644
index ec07eeef8a28..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.1.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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-power/upower
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# tests are fragile to long socket paths
-	local -x TMPDIR=/tmp
-	# Tests break if XDG_DATA_DIRS is modified by flatpak install
-	unset XDG_DATA_DIRS
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
index ec07eeef8a28..69a7470204d0 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
index a68fa0374299..2bfacbcb5105 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.12.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="all-plugins"
 
 PLUGIN_DEP="
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
deleted file mode 100644
index ff4d5b3e95f2..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.12.0.ebuild
+++ /dev/null
@@ -1,88 +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 optfeature pypi
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-server/
-	https://pypi.org/project/python-lsp-server/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="all-plugins"
-
-PLUGIN_DEP="
-	>=dev-python/autopep8-2.0.4[${PYTHON_USEDEP}]
-	>=dev-python/flake8-7.1[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-3.1[${PYTHON_USEDEP}]
-	>=dev-python/rope-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		${PLUGIN_DEP}
-	)
-"
-BDEPEND="
-	test? (
-		${PLUGIN_DEP}
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/qtpy[gui,testlib,${PYTHON_USEDEP}]
-	)
-"
-
-# Note: xdist breaks some tests
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '/addopts =/d' pyproject.toml || die
-	# unpin all the deps
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by presence of pathlib2
-		'test/plugins/test_autoimport.py'
-	)
-	local EPYTEST_IGNORE=(
-		# pydocstyle is archived upstream and broken with py3.12
-		test/plugins/test_pydocstyle_lint.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "Automatically format Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index b5fe21768b01..4ff60428697c 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1 @@
-DIST python-socks-2.5.3.gh.tar.gz 32399 BLAKE2B 39360537311683cb4ec6d1d9850e51877ab9d5f2319d83eefbee7362af1d0061bf7fba0fea9ebc74d24b9fab3a46ba78722ca4629c783406e935758f393d8183 SHA512 fd6351adf611e019298d2885d97d4ecdf1b9c9160297621d61bc770568eb5e20652507c7590b72de11e1e7505a60326139329d979ae325cba4abc81947ad6189
-DIST python-socks-2.6.0.gh.tar.gz 32596 BLAKE2B f68032b98c0689d2d7b9bcb581be9b6aa08fcf7b2813427a8acb6eb291d817a54ffbaa8ecac7a114d47ffc30ce4f9ea940e9bba0310f22950b8c1d129e1df167 SHA512 88d9d4e5166ddeceae66b3c61d89f25f099a89aba87f5524cd414b176f7d0eebe51f8d5ec2d98db683504bfd4936aec50f3354fafad97b587a687d49e21ad6f0
 DIST python-socks-2.6.1.gh.tar.gz 32352 BLAKE2B 0bfc85bdeb6aefab34d307a6956171fad8b0876f49959bfc91193c864ba8ed7d05a1efb4f052202d99984aad7bb9bfc8472e2853d57b5812156dec6ee791a04e SHA512 2e046849a66125ddb14f887f84354e56f689034695a48532cbd4d4a1ef9508212c30e34faeb3b318ceede32a0604d62f92ca92cfe14b63c54a42fd5c1cfafbc0
diff --git a/dev-python/python-socks/python-socks-2.5.3.ebuild b/dev-python/python-socks/python-socks-2.5.3.ebuild
deleted file mode 100644
index 4635630e75d2..000000000000
--- a/dev-python/python-socks/python-socks-2.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.6.0.ebuild b/dev-python/python-socks/python-socks-2.6.0.ebuild
deleted file mode 100644
index d729106a0575..000000000000
--- a/dev-python/python-socks/python-socks-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.24[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.6.1.ebuild b/dev-python/python-socks/python-socks-2.6.1.ebuild
index d729106a0575..fa8e8b3687b3 100644
--- a/dev-python/python-socks/python-socks-2.6.1.ebuild
+++ b/dev-python/python-socks/python-socks-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/python-tests/python-tests-3.12.8_p1.ebuild b/dev-python/python-tests/python-tests-3.12.8_p1.ebuild
index 943b544daf16..1c35cd1ee4cd 100644
--- a/dev-python/python-tests/python-tests-3.12.8_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.8_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.13.1_p1.ebuild b/dev-python/python-tests/python-tests-3.13.1_p1.ebuild
index 5f6595212f2c..2f7741843f0c 100644
--- a/dev-python/python-tests/python-tests-3.13.1_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.13.1_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/pythonnet/Manifest b/dev-python/pythonnet/Manifest
index c660a11dd3e5..43509e1e2a64 100644
--- a/dev-python/pythonnet/Manifest
+++ b/dev-python/pythonnet/Manifest
@@ -48,7 +48,6 @@ DIST nunit3testadapter.3.16.1.nupkg 485883 BLAKE2B 601bbe55147c4a41ca35db0a9a91b
 DIST nunit3testadapter.3.17.0.nupkg 520006 BLAKE2B a8cd4eddd4a0dda614f17591b33e204944a63ab2358f24524ed6e1ca22c63d1cf305bb52d05fc208eece01938ef81957e528e8d4f9f7efd2042021f8aa48f5cf SHA512 e0459f379592f0523adc73be45af72a1aad87466d87ad7cc7e9d12597c48315e80e1136596227cfcf52789da2e421158fdf1ddc58bb345cdf338510d0c9b22ee
 DIST nunit3testadapter.4.6.0.nupkg 512620 BLAKE2B ab251ac7d56407d35cfb352956ae153f4052a4e6c014a50becdc31ed9b2c325d0b6fcb61752e3b11e435b61c86b1f7ea51415e72f1ae894dd35acb17410fb23b SHA512 4e489dea089cbf32e01b74105003eaf64a11e11a488aefba50553f856afde2940a2659d0017055b8a86a7aa79247d5572bee41b497ceb0efe7074e8b9c86294a
 DIST perfolizer.0.2.1.nupkg 51987 BLAKE2B 2e01e7673ae420136e6194d89c406fca31af85b7f90b460a53ebbe0fef82c38ba3be3821d9e1a7b9b2bf5d117bb9f2f4f91767796bffb51ac14e5cb9f472d873 SHA512 9db50cdcf13a85737c275a0aa3dc4a98b97e7d23e7aca1c9b27df28e454b0d4587315bd62f7181dc03e0257a83d79c7af2e90733eafda70afe5a956c92c20a9a
-DIST pythonnet-3.0.4.gh.tar.gz 421787 BLAKE2B 2e73192c21810878f7eb9da209dadb41604815f6f1d57bb1585a83e87f522f34ad92aae9dfc26f90e36926aba8bbc1686943d4c5f4928c64ceceaf1a339249a4 SHA512 82a15fd4cd239bd79fb20c406571e91bc419e4b4d7e888fcee89e322213c86af64543f6910ac71c171a9bf1a6cfedd27c5c71997978c8327fc81a532f4328afb
 DIST pythonnet-3.0.5.gh.tar.gz 370060 BLAKE2B 2f095e8e97cdb70ce31f76918c6bdd99e84a8b20108faa54188c2891104dc6a9882eba3d4192d9fc356c435ddfd81d15b5ea0a638b5cebace5bbcd50c8d73998 SHA512 235ca48e4375d880a7b38142fa90e9a84b5711565b45fa806bcd23c4b730d314f2e4b166c6fd5752f394832187285498b8c3c226706b4e7c87135c87fbe19eb4
 DIST runtime.any.system.collections.4.3.0.nupkg 107990 BLAKE2B 802e2ae919a4834150d825ac086d8f47e2185e31b60b45f3dbe5f63b1d714953d9faaa7d8fe4cc25a1ea8495c4f8fd925bb198eea0b67e594a8558238b18196c SHA512 9f8833176c139b71a58694ae401c5aec209a63227be07c7ab559bef772082bd1f6cc38ba2949cb1c8e5c5514ad9f4ff51859838dc2f28191f8bb7ae611a50239
 DIST runtime.any.system.diagnostics.tools.4.3.0.nupkg 43707 BLAKE2B 33d1c57eb4e50c06488da02ab2bb1b8dba9948026053e662986af05b74045c014e76815edbb588f10d6a904de22e4c50177f31f3fac36d159b9af361a4cb2b62 SHA512 bd257401e179d4b836a4a2f7236a0e303ae997d2453c946bf272036620a0b14e85e5f42c229332930a954655ab4cae359d191a3e3d9746df09535a651367764c
diff --git a/dev-python/pythonnet/pythonnet-3.0.4.ebuild b/dev-python/pythonnet/pythonnet-3.0.4.ebuild
deleted file mode 100644
index 992f6bbfacc1..000000000000
--- a/dev-python/pythonnet/pythonnet-3.0.4.ebuild
+++ /dev/null
@@ -1,288 +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} )
-
-DOTNET_PKG_COMPAT="8.0"
-NUGETS="
-benchmarkdotnet.annotations@0.13.1
-benchmarkdotnet@0.13.1
-commandlineparser@2.4.3
-iced@1.8.0
-lost.compat.nullabilityattributes@0.0.4
-microsoft.build.tasks.git@1.1.1
-microsoft.codeanalysis.analyzers@2.6.1
-microsoft.codeanalysis.common@2.10.0
-microsoft.codeanalysis.csharp@2.10.0
-microsoft.codecoverage@16.11.0
-microsoft.codecoverage@17.0.0
-microsoft.codecoverage@17.11.1
-microsoft.csharp@4.7.0
-microsoft.diagnostics.netcore.client@0.2.61701
-microsoft.diagnostics.runtime@1.1.126102
-microsoft.diagnostics.tracing.traceevent@2.0.61
-microsoft.dotnet.internalabstractions@1.0.0
-microsoft.dotnet.platformabstractions@2.1.0
-microsoft.net.compilers.toolset@4.0.1
-microsoft.net.test.sdk@16.11.0
-microsoft.net.test.sdk@17.0.0
-microsoft.net.test.sdk@17.11.1
-microsoft.netcore.platforms@1.0.1
-microsoft.netcore.platforms@1.1.0
-microsoft.netcore.targets@1.0.1
-microsoft.netcore.targets@1.1.0
-microsoft.netframework.referenceassemblies.net461@1.0.0
-microsoft.netframework.referenceassemblies.net472@1.0.0
-microsoft.netframework.referenceassemblies@1.0.0
-microsoft.sourcelink.common@1.1.1
-microsoft.sourcelink.github@1.1.1
-microsoft.testplatform.objectmodel@16.11.0
-microsoft.testplatform.objectmodel@17.11.1
-microsoft.testplatform.testhost@16.11.0
-microsoft.testplatform.testhost@17.11.1
-microsoft.win32.primitives@4.3.0
-microsoft.win32.registry@4.3.0
-microsoft.win32.registry@4.5.0
-netstandard.library@2.0.0
-netstandard.library@2.0.3
-newtonsoft.json@13.0.1
-newtonsoft.json@9.0.1
-noncopyableanalyzer@0.7.0
-nuget.frameworks@5.0.0
-nunit3testadapter@3.16.1
-nunit3testadapter@3.17.0
-nunit3testadapter@4.6.0
-nunit@3.12.0
-nunit@3.14.0
-perfolizer@0.2.1
-runtime.any.system.collections@4.3.0
-runtime.any.system.diagnostics.tools@4.3.0
-runtime.any.system.diagnostics.tracing@4.3.0
-runtime.any.system.globalization@4.3.0
-runtime.any.system.io@4.3.0
-runtime.any.system.reflection.extensions@4.3.0
-runtime.any.system.reflection.primitives@4.3.0
-runtime.any.system.reflection@4.3.0
-runtime.any.system.resources.resourcemanager@4.3.0
-runtime.any.system.runtime.handles@4.3.0
-runtime.any.system.runtime.interopservices@4.3.0
-runtime.any.system.runtime@4.3.0
-runtime.any.system.text.encoding.extensions@4.3.0
-runtime.any.system.text.encoding@4.3.0
-runtime.any.system.threading.tasks@4.3.0
-runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.native.system@4.3.0
-runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
-runtime.unix.microsoft.win32.primitives@4.3.0
-runtime.unix.system.diagnostics.debug@4.3.0
-runtime.unix.system.io.filesystem@4.3.0
-runtime.unix.system.private.uri@4.3.0
-runtime.unix.system.runtime.extensions@4.3.0
-system.appcontext@4.1.0
-system.appcontext@4.3.0
-system.buffers@4.3.0
-system.buffers@4.4.0
-system.collections.concurrent@4.3.0
-system.collections.immutable@1.5.0
-system.collections.nongeneric@4.3.0
-system.collections.specialized@4.3.0
-system.collections@4.0.11
-system.collections@4.3.0
-system.componentmodel.eventbasedasync@4.3.0
-system.componentmodel.primitives@4.3.0
-system.componentmodel.typeconverter@4.3.0
-system.componentmodel@4.3.0
-system.console@4.3.0
-system.diagnostics.debug@4.0.11
-system.diagnostics.debug@4.3.0
-system.diagnostics.fileversioninfo@4.3.0
-system.diagnostics.process@4.3.0
-system.diagnostics.stacktrace@4.3.0
-system.diagnostics.tools@4.0.1
-system.diagnostics.tools@4.3.0
-system.diagnostics.tracing@4.3.0
-system.dynamic.runtime@4.0.11
-system.dynamic.runtime@4.3.0
-system.globalization.extensions@4.3.0
-system.globalization@4.0.11
-system.globalization@4.3.0
-system.io.compression@4.3.0
-system.io.filesystem.primitives@4.0.1
-system.io.filesystem.primitives@4.3.0
-system.io.filesystem@4.0.1
-system.io.filesystem@4.3.0
-system.io@4.1.0
-system.io@4.3.0
-system.linq.expressions@4.1.0
-system.linq.expressions@4.3.0
-system.linq@4.1.0
-system.linq@4.3.0
-system.management@4.5.0
-system.memory@4.5.3
-system.numerics.vectors@4.4.0
-system.objectmodel@4.0.12
-system.private.uri@4.3.0
-system.reflection.emit.ilgeneration@4.0.1
-system.reflection.emit.ilgeneration@4.3.0
-system.reflection.emit.lightweight@4.0.1
-system.reflection.emit.lightweight@4.3.0
-system.reflection.emit@4.0.1
-system.reflection.emit@4.3.0
-system.reflection.extensions@4.0.1
-system.reflection.extensions@4.3.0
-system.reflection.metadata@1.6.0
-system.reflection.primitives@4.0.1
-system.reflection.primitives@4.3.0
-system.reflection.typeextensions@4.1.0
-system.reflection.typeextensions@4.3.0
-system.reflection@4.1.0
-system.reflection@4.3.0
-system.resources.resourcemanager@4.0.1
-system.resources.resourcemanager@4.3.0
-system.runtime.compilerservices.unsafe@4.5.2
-system.runtime.extensions@4.1.0
-system.runtime.extensions@4.3.0
-system.runtime.handles@4.0.1
-system.runtime.handles@4.3.0
-system.runtime.interopservices.runtimeinformation@4.0.0
-system.runtime.interopservices.runtimeinformation@4.3.0
-system.runtime.interopservices@4.1.0
-system.runtime.interopservices@4.3.0
-system.runtime.numerics@4.3.0
-system.runtime.serialization.primitives@4.1.1
-system.runtime@4.1.0
-system.runtime@4.3.0
-system.security.accesscontrol@4.5.0
-system.security.cryptography.algorithms@4.3.0
-system.security.cryptography.encoding@4.3.0
-system.security.cryptography.primitives@4.3.0
-system.security.cryptography.x509certificates@4.3.0
-system.security.principal.windows@4.5.0
-system.text.encoding.codepages@4.3.0
-system.text.encoding.extensions@4.0.11
-system.text.encoding.extensions@4.3.0
-system.text.encoding@4.0.11
-system.text.encoding@4.3.0
-system.text.regularexpressions@4.1.0
-system.text.regularexpressions@4.3.0
-system.threading.tasks.extensions@4.0.0
-system.threading.tasks.extensions@4.3.0
-system.threading.tasks.extensions@4.5.2
-system.threading.tasks.parallel@4.3.0
-system.threading.tasks@4.0.11
-system.threading.tasks@4.3.0
-system.threading.thread@4.3.0
-system.threading.threadpool@4.3.0
-system.threading@4.0.11
-system.threading@4.3.0
-system.valuetuple@4.5.0
-system.xml.readerwriter@4.0.11
-system.xml.readerwriter@4.3.0
-system.xml.xdocument@4.0.11
-system.xml.xdocument@4.3.0
-system.xml.xmldocument@4.3.0
-system.xml.xpath.xdocument@4.3.0
-system.xml.xpath.xmldocument@4.3.0
-system.xml.xpath@4.3.0
-"
-
-inherit check-reqs dotnet-pkg distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Nearly seamless integration with the .NET Common Language Runtime"
-HOMEPAGE="
-	https://pythonnet.github.io/
-	https://github.com/pythonnet/pythonnet/
-"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/pythonnet/${PN}.git"
-else
-	SRC_URI="https://github.com/pythonnet/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64"
-fi
-
-SRC_URI+=" ${NUGET_URIS} "
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/clr-loader[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-CHECKREQS_DISK_BUILD="1500M"
-EPYTEST_DESELECT=(
-	'tests/test_codec.py::test_sequence'
-	'tests/test_engine.py::test_import_module'
-	'tests/test_engine.py::test_run_string'
-	'tests/test_method.py::test_getting_method_overloads_binding_does_not_leak_memory'
-	'tests/test_method.py::test_params_array_overloaded_failing'
-	'tests/test_module.py::test_assembly_load_recursion_bug'
-	'tests/test_module.py::test_implicit_assembly_load'
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.3-no-sourcelink.patch"
-)
-
-DOCS=( AUTHORS.md CHANGELOG.md README.rst )
-DOC_CONTENTS="Python.NET defaults to the mono runtime, not .NET SDK's coreclr.
-You can workaround this either by exporting PYTHONNET_RUNTIME=coreclr or some
-Python code. Please read the documentation on
-https://pythonnet.github.io/pythonnet/python.html"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	dotnet-pkg_pkg_setup
-}
-
-src_prepare() {
-	nuget_writeconfig "$(pwd)/"
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	dotnet-pkg_src_configure
-	distutils-r1_src_configure
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	readme.gentoo_create_doc
-}
-
-python_test() {
-	local -x PYTHONNET_RUNTIME="coreclr"
-
-	epytest --runtime coreclr
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/dev-python/pythonnet/pythonnet-3.0.5.ebuild b/dev-python/pythonnet/pythonnet-3.0.5.ebuild
index e99f98776d8a..5e3161a79cb1 100644
--- a/dev-python/pythonnet/pythonnet-3.0.5.ebuild
+++ b/dev-python/pythonnet/pythonnet-3.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -212,7 +212,7 @@ else
 	SRC_URI="https://github.com/pythonnet/${PN}/archive/refs/tags/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 SRC_URI+=" ${NUGET_URIS} "
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 55003184a6d7..4dea2a154163 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,2 +1,3 @@
 DIST rdflib-7.1.1.tar.gz 4864216 BLAKE2B b583e6f9afab95fc0818c4f11740ab8cab540b774a3db15fc8be7b836149f40af6eb445a61b61e020c55f9b561c17f5019275070272449bd4ea25827e4925e39 SHA512 6eafaebfb604446399b214496aabc91fe0c689e9b35d5637de35a5d9784a1acb9d727c7ad5eebe8700d0be2b1e54b3d51cd3fe723a2a6cbd38f0e259d42bc2c5
 DIST rdflib-7.1.2.gh.tar.gz 5030802 BLAKE2B 7a8444d39a456a8e1ca0f3956f3f3a7e43d7fd8a166b1738c5add32a21f6625d71ce5a97a65e5ff3550fbb6ac4eaa8de353e6f333fe7aad947be8e849298dee0 SHA512 a88efdbf461392033e14f72bfe755e449d86927b9d48668cded68e0ad2a5d04de1255eccf8086993cb8c9a3442eb5549dc73f66cfb2c97ff35fcba021c970ec7
+DIST rdflib-7.1.3.gh.tar.gz 5029906 BLAKE2B 4eff2756acfe636403ccf1cc8c11850e99385f444e1d80ca1a0ee6c04e1f5352df745a1c27a159a8740eb7a950211824ab51820e54830cec5e279e3d2a1a838f SHA512 ed735611719cfab7da636cf57b02456c26ee7732c18508e1382bc722cba3a0206ca5dcb4ad8cd2ebc0e5550038c5571fb1b0195b9fae172f768cbab72db2b621
diff --git a/dev-python/rdflib/rdflib-7.1.3.ebuild b/dev-python/rdflib/rdflib-7.1.3.ebuild
new file mode 100644
index 000000000000..c0dc164e4a14
--- /dev/null
+++ b/dev-python/rdflib/rdflib-7.1.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_REQ_USE="sqlite?,threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="
+	https://github.com/RDFLib/rdflib/
+	https://pypi.org/project/rdflib/
+"
+# tests removed in 7.1.2
+SRC_URI="
+	https://github.com/RDFLib/rdflib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/isodate-1[${PYTHON_USEDEP}]
+		>=dev-python/isodate-0.7.2[${PYTHON_USEDEP}]
+	' 3.10)
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# doctests require internet
+	sed -i -e '/doctest-modules/d' pyproject.toml || die
+
+	# we disable pytest-cov
+	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
+
+	# allow regular html5lib, html5rdf is a fork with minimal changes:
+	# removing six dep (which is kinda good) and bundling webencodings
+	# (which is horrible)
+	find -name '*.py' -exec sed -i -e 's:html5rdf:html5lib:g' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not webtest"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 4622b9eef062..8af3d857f146 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1 @@
-DIST rich-13.7.1.gh.tar.gz 15058064 BLAKE2B 6fad18bf0a4e4f72e530c78db7a498f27dd8c9a7b9b17ca5ef12a94bbe513857f3c42d4903f8ebbfe8907727cddaf290f08862c27efb29db8aaf70c7bcb13ace SHA512 0c69101bc6c2a238a4c516812cda08299115b903b8282ee348b45b212a88fcbfbf69d11a3705a97bdb6192988ee3047804bb5b52b7950d860542cde8ce2d4bd2
-DIST rich-13.9.3.gh.tar.gz 15064090 BLAKE2B 4ef76583ed13692b9f4a9714a68186fd06262e76d691f79cd256b4ab153052efd5fdf2320df797683ea1765cf063215a6b2d2614cd8040ebed0b89178cdcf2e0 SHA512 ca74d59e5df0476b482f60fac8d1f2e0810ffa61a10d410ff188c82548df3307405119f3b18992d96b01458b921ebcd61c99bf68dd808358395e9b04cf78579b
 DIST rich-13.9.4.gh.tar.gz 15064359 BLAKE2B bf0bd53f3993fbfa309012b646d293799699040827c160a627fb4dbf292146e43b4a823606a6d9855d835f9739c1d75f539328aa093471db54adff44ef7d4e77 SHA512 36d9f0442759784453a75c9a80cd3dde113db5544d62da1eb85bc0572c16b6247da9b5254246fa571007ce0e70a234aea2ab1ed5dc20c1ec23084070733d39a1
diff --git a/dev-python/rich/rich-13.7.1.ebuild b/dev-python/rich/rich-13.7.1.ebuild
deleted file mode 100644
index a786c0768469..000000000000
--- a/dev-python/rich/rich-13.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-21.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		# TODO: segfault in recursion (PyQt6 interfering?)
-		tests/test_traceback.py::test_recursive
-	)
-	# version-specific output -- the usual deal
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# pypy3.10, to be more precise
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311
-				tests/test_pretty.py::test_pretty_dataclass
-				tests/test_pretty.py::test_reference_cycle_dataclass
-				tests/test_pretty.py::test_max_depth_dataclass
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.9.3.ebuild b/dev-python/rich/rich-13.9.3.ebuild
deleted file mode 100644
index 1331940a83d8..000000000000
--- a/dev-python/rich/rich-13.9.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-21.4.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		# TODO: segfault in recursion (PyQt6 interfering?)
-		tests/test_traceback.py::test_recursive
-	)
-	# version-specific output -- the usual deal
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# pypy3.10, to be more precise
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				tests/test_inspect.py::test_inspect_builtin_function_except_python311
-				tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-				tests/test_inspect.py::test_inspect_integer_with_methods_python310only
-				tests/test_inspect.py::test_inspect_integer_with_methods_python311
-				tests/test_pretty.py::test_pretty_dataclass
-				tests/test_pretty.py::test_reference_cycle_dataclass
-				tests/test_pretty.py::test_max_depth_dataclass
-				tests/test_pretty.py::test_attrs_broken
-			)
-			;;
-	esac
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.9.4.ebuild b/dev-python/rich/rich-13.9.4.ebuild
index 394f7a04fbcf..bca2bf0baf9c 100644
--- a/dev-python/rich/rich-13.9.4.ebuild
+++ b/dev-python/rich/rich-13.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rope/rope-1.13.0-r1.ebuild b/dev-python/rope/rope-1.13.0-r1.ebuild
index 34b4528b241e..b9bb2116cd78 100644
--- a/dev-python/rope/rope-1.13.0-r1.ebuild
+++ b/dev-python/rope/rope-1.13.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rope/rope-1.13.0.ebuild b/dev-python/rope/rope-1.13.0.ebuild
deleted file mode 100644
index 19165fd27209..000000000000
--- a/dev-python/rope/rope-1.13.0.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=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# our venv style confuses this comparison
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
-	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
-	# TODO
-	ropetest/contrib/autoimport/autoimporttest.py::TestQueryUsesIndexes::test_search_by_name_like_uses_index
-	ropetest/contrib/autoimport/autoimporttest.py::TestQueryUsesIndexes::test_search_module_like_uses_index
-)
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 46d42819c3b1..dcaf69ce4e58 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,2 @@
 DIST ruamel.yaml-0.18.10.tar.xz 198860 BLAKE2B 02b6a1791002e5bd31c321c6307b7239be6f248e9b9186fcf9bdc440b966f15f5e947976a3295a279071a3b1f2853a2eb196851363ad3ed87f943850e40f0909 SHA512 089977ba0ac7b2f9cf761b4d94aa647ec431abe88fe21f167011899be3d13b5072b330a4c3f09cd14406692377235ec433db3f15e15df1a56697443cce4027fa
-DIST ruamel.yaml-0.18.6.tar.xz 198544 BLAKE2B 94d50ba8aef92e2885b24118bd9f4b1d06a82d51b2e7930c39dea93f4c0f9fc9d0604dfbbe716f81f3c9a927698d14c7005bb0ce2ae5d2eadf27514dfbba88c1 SHA512 319e1029746ebf6ef1c6b6bf6055d7c56e7caa2559b34b4fe639616c4332ef46661afad67c42d123bd0de67819812ea8f9cc9d51c0189edd6e33d5d47f47bb26
-DIST ruamel.yaml-0.18.7.tar.xz 199304 BLAKE2B 707e83c78c4301aae6d6130664a9e98fde7323c8d886f2ef1a5e9f147e1cb5cc835e414a1b055e359bd64442c45d0ab6f024f9165b5df8388bda423ed51c20ba SHA512 c5efa894d0fa1e8cfa9ff586d71e29ed7663c0f2e379603880d009260441ec2e476de6b2e97076c43e9b51cbb452e2cc18f21955c9d9bab54d56195567d3406d
 DIST ruamel.yaml-0.18.8.tar.xz 199244 BLAKE2B 02935cd28ede36bf1ae84bb9d0cc4f15793051940195f714f9ed124df643c828cea7624310c58bf50312e8569ba7d0bc83af223b54c5e5e2a3c122dc0438f9be SHA512 533ede0b41101a0a02131983d032c229e8a6c64c5b679fc2793b9a98c81809c253a250a94c36a94e96f184ffe9a5fc8cd5dc8568f568e47d78219561638363b5
-DIST ruamel.yaml-0.18.9.tar.xz 199372 BLAKE2B 409f54eea90c44c4ffefb57b1669ba8d279a4d2b8ce67b6e401b369fe7a92a5b62bcdf21d8a2ac6e2e2b7ad5e75c536af3bc1839d1163467a256590d3ac7572f SHA512 d9ef12e385eb591fcae1af92ba1536d14b317260b7f47312355ef935e35c938cf5032d28f8687fd637a148a91a25ab23cca1d053d9b499a010abc4b46ce4c31e
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.6.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.6.ebuild
deleted file mode 100644
index 25e3c0ade650..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.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} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.ebuild
deleted file mode 100644
index 38533f302627..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.7.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} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
index 2bccc5e4d8cb..f0f2c827b878 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.18.8.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.18.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.18.9.ebuild
deleted file mode 100644
index 2bccc5e4d8cb..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.18.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/projects/ruamel-yaml/
-"
-# PyPI tarballs do not include tests
-SRC_URI="https://downloads.sourceforge.net/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]
-	!dev-python/namespace-ruamel
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-	local EPYTEST_IGNORE=(
-		# Old PyYAML tests from lib/ require special set-up and are
-		# invoked indirectly via test_z_olddata, tell pytest itself
-		# to leave the subdir alone.
-		_test/lib/
-	)
-
-	# this is needed to keep the tests working while
-	# dev-python/namespace-ruamel is still installed
-	distutils_write_namespace ruamel
-	epytest
-}
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 6b0a3e167a8a..65dc7b9c35e7 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,2 +1 @@
-DIST slixmpp-1.8.5.tar.gz 574560 BLAKE2B 3ac5b1f41acdf4dd725355cdb06e7642d67b5b51a533e933af1b451df424d3e81267ce945e577b21a07f943578119913a9a42dd4e65426223ff413ad52c3f110 SHA512 f2e123bd462097d0b7dc28cd960f723419f4fa2af59c8f5b7d30a05135c2f9fc6982e6d2855ea10b22936bdd4a96faeae73f87a495e2d1f10e6c63cdcb412665
 DIST slixmpp-1.8.6.tar.gz 581633 BLAKE2B 43482ae13020c8302ec432cb77da5bac53a4ed43368ee5398e05c300f63db5d14b4590aacbf592cbdf904b7ce6f07bcd72b152efd0614fba2028cf01f3663174 SHA512 b013145fbd44dd6f38fd7beb15af5d83bd9e6f843308a2124b2fbb1a70f0ead1f0739946c24d66a11aef60d660de6fcced846e91ecd1ad58ef84410be89b2356
diff --git a/dev-python/slixmpp/slixmpp-1.8.5.ebuild b/dev-python/slixmpp/slixmpp-1.8.5.ebuild
deleted file mode 100644
index 429af7d14f21..000000000000
--- a/dev-python/slixmpp/slixmpp-1.8.5.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="
-	https://codeberg.org/poezio/slixmpp/
-	https://pypi.org/project/slixmpp/
-"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://codeberg.org/poezio/slixmpp.git"
-	inherit git-r3
-else
-	inherit pypi
-	KEYWORDS="amd64 ~riscv"
-fi
-
-DEPEND="
-	net-dns/libidn:=
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-lang/python-3.12.1_p1:3.12
-	' python3_12)
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	rm -rf slixmpp || die
-	eunittest -s tests
-}
diff --git a/dev-python/slixmpp/slixmpp-1.8.6.ebuild b/dev-python/slixmpp/slixmpp-1.8.6.ebuild
index 17688d15dc52..213d80c1e2f8 100644
--- a/dev-python/slixmpp/slixmpp-1.8.6.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="amd64 ~riscv"
 fi
 
 DEPEND="
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index cde1d78cc6f6..5dcb277587b1 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,4 +1,2 @@
-DIST starlette-0.42.0.gh.tar.gz 2575175 BLAKE2B 8c8d85288ad7a42b9771431377e5b6ecd98f6c6088fa913bddf496db2de1c7c1e471d1b9a0a6a17885acfe96e503391e066d1b8c6f612329afe69d8ca8743935 SHA512 d7b0da5333930d6ce9315387cc7e23fd22b4ed379d37c8f143cf6e6a07b5cb2d207d4c349616788633387fa54c6fc377feb28df6ccd1216b824e66a47c950f2b
 DIST starlette-0.44.0.gh.tar.gz 2575663 BLAKE2B f566f354b87379ba076b37ebb7366ffc8c209bf1318f8c49ffcdc2cb604b90d29ecb24071b17c551c7e2aa4d383393fae9bf2b3e8129095e7adcaf10956d3a9d SHA512 052baac1a0f60354a35711e87de58b90b1c6fd13f6a2290746663dcc88d131840c340a2c95f8664b4b6347a7397639e26e547a1c353ca7b1911c3f5e3873868e
-DIST starlette-0.45.1.gh.tar.gz 2573973 BLAKE2B 25969d380b0318b28bf176ef38136d3280ce6f93d501f547734427110f2c65527d45131315aecf3f19d188b9d8ac551a2e64ff59497b054b72eede3f0d842fac SHA512 7ead358b2cabef0df89b7f61674f5b24c350fd1dc48437e0578b31ebc995e22aadbe8569dd04878cd47c44ffa3aad0ef3beb6d6b9ae14b13116c035e2d60cd12
 DIST starlette-0.45.2.gh.tar.gz 2574149 BLAKE2B 8e75566e5235bb987fc6ee3e9ab56b792c11c32046f0c93e10ca71488bf93fede2741ed6425511d6d061144c2bac4c859620310b6517d9860ab4e81d4b4cbcfa SHA512 f8a7f553abba43554263d94de65d843784a7a97d05f76142a6ba4c814488e0abc398305b6c11ed3d5228c287795df78f1174f0a4ecd79a7beb2ad3b5e76bf86f
diff --git a/dev-python/starlette/starlette-0.42.0.ebuild b/dev-python/starlette/starlette-0.42.0.ebuild
deleted file mode 100644
index 5f2b1c02bc29..000000000000
--- a/dev-python/starlette/starlette-0.42.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.44.0.ebuild b/dev-python/starlette/starlette-0.44.0.ebuild
index a366892d6c54..5f2b1c02bc29 100644
--- a/dev-python/starlette/starlette-0.44.0.ebuild
+++ b/dev-python/starlette/starlette-0.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/starlette-0.45.1.ebuild b/dev-python/starlette/starlette-0.45.1.ebuild
deleted file mode 100644
index a366892d6c54..000000000000
--- a/dev-python/starlette/starlette-0.45.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	<dev-python/httpx-0.29[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja2[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.18[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/symengine/symengine-0.13.0.ebuild b/dev-python/symengine/symengine-0.13.0.ebuild
index 9f227be7d57d..d83c25676291 100644
--- a/dev-python/symengine/symengine-0.13.0.ebuild
+++ b/dev-python/symengine/symengine-0.13.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	dev-build/cmake
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 30128f3db181..0797827d3c3f 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1 @@
-DIST tempora-5.7.0.tar.gz 22239 BLAKE2B 11c9ba681b1973b75e22cc4a2c8bcc1a2620e0284ce1b7d42fda25ce8c2a35bd4a9a4b329013143dbfd27613a327fb8d3d048d1230f679a240ed5ea6abc9761a SHA512 4c1bc7e45cfa1f415bfa6bcee3d6b82246477279b89328a98b8b944dddf7184a515e0733bb868321f63cbcb21fcb7847543a2643c059e6d2e0721c2e66ad4239
-DIST tempora-5.7.1.tar.gz 23234 BLAKE2B 882eef718f7f49b072de62d7bbdd023b11b602c173fd5e156d1b16176f9b5a5976b84966d8d07e2e27a87b49c3f79e7b043102ebb2f4b55f5c65e6ac6e17a5c8 SHA512 58d10ca6bc10994b65db1dc5d90af2446141ac0d7aef11459808c38bac76b775fbeefe11529a6c81d76659b8e2317f6a3de82ea94b300a0dab5596a16a1c7cea
 DIST tempora-5.8.0.tar.gz 23019 BLAKE2B 698dfd60181612f95ae5f411af0d909dc966c06250871cebc6ccf46caf9b1212814a15ad57ff00a520c16465a55b7f72fc1de51f0b41626f1c6511511d77adcf SHA512 387c08b2ec9b1f8345835f26a95aa47659399c9b2422168e114b2c28331e0ecdf627d0ba41a0279f3d74cb3da1670e3db918d83ccf9e169d3fc962926b4cfee5
diff --git a/dev-python/tempora/tempora-5.7.0.ebuild b/dev-python/tempora/tempora-5.7.0.ebuild
deleted file mode 100644
index 374881dc7108..000000000000
--- a/dev-python/tempora/tempora-5.7.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_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezer
-}
diff --git a/dev-python/tempora/tempora-5.7.1.ebuild b/dev-python/tempora/tempora-5.7.1.ebuild
deleted file mode 100644
index 445c29d537df..000000000000
--- a/dev-python/tempora/tempora-5.7.1.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_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezer
-}
diff --git a/dev-python/tempora/tempora-5.8.0.ebuild b/dev-python/tempora/tempora-5.8.0.ebuild
index 445c29d537df..c04bcf5bb8cd 100644
--- a/dev-python/tempora/tempora-5.8.0.ebuild
+++ b/dev-python/tempora/tempora-5.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild b/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild
index 76ef9227b583..7d2bf1be6522 100644
--- a/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild
+++ b/dev-python/terminaltables3/terminaltables3-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 189d2a5e7458..327758210d2a 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1,2 @@
-DIST translate-3.14.4.gh.tar.gz 1174947 BLAKE2B 1a4f9b4b146145ef215ca0118c328c5c6153461b3f6899c665d1c69762bfe543ffffb7e590229b6d5ada5c5373b46484d4ebf6fbc4d9cac4b908174fde358d04 SHA512 4cb4b94f02858348c7e2e66cc3b0efa495084fbf03fb659ec701349f693c27647b11f2aefefca7b585b2c6e68a699149e85cedccbcf796e57edf825925e4f7d2
 DIST translate-3.14.5.gh.tar.gz 1175068 BLAKE2B d3627d8a69f98d01fceb3d8e233ff9d19238ff42aa5255e5f4b8372ecacb07f1cea02ff75c6e7e27eec684eeda207db83b91c6905edf7b82d93ca1a275db4564 SHA512 40467e48aeca0a51caf6baabce13a3daa3b643a5416a1dc8b8ce70198b7b6f13688f808c0e050ca2e2e6d977347dab59b454b6d9c537b4d615f623d5531bcc10
 DIST translate-3.14.6.gh.tar.gz 1175486 BLAKE2B 3cfd844815adcd7ac24a41df41f3e717d7afa7c19f4e4467f9ce7892ec9adb321ed2e499358cdaa294c5a5d8ca8e20271ac47cc598b8e7585c290eea8e9b8235 SHA512 a2e23c4ec29e61fdcc0c28e7789478d595a11751c6117b7b5cc9191deec01e31309cea8a6e39c81635105b8b6b10c34533af5b91b736f7c2bbd4780146b79b3d
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild
deleted file mode 100644
index 14eea3a8ab6d..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
index 374508319ccc..14eea3a8ab6d 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 0c834fad7db6..b24494f778ef 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,2 +1 @@
-DIST trustme-1.2.0.tar.gz 26350 BLAKE2B 885b96d8ef63a8bf0b96583ecac2c19148f7df28a9e2ad8816fe0d0f752718bb91d84f3d01a7e73663133a3094eb8199ad6eea609e27958db4720a14ff62b1be SHA512 84cfa02cf00bac1a304dacbae8b3d673307d066116e38c396f25fb868174f020c415921d4c56a6a37354e5205f294cf95611a8c4f2b02f82dda2aa9b2e80192b
 DIST trustme-1.2.1.tar.gz 26844 BLAKE2B 83512726438b191e131d3aec847fa80a799463447f1be3586a32bae604d0fc26c8d3d68366c80df4a77661e9ce073c857c1df5bce4fd6ecdb46f22bd63ec410e SHA512 3dc5158294d79603378a281e706ea6b376833a40621c211f12c383bc1ef0720b2b6c1441eadab43292cbeee34aaa4618ed8ce4b8dedc4ca6f1faa14e4cb485bc
diff --git a/dev-python/trustme/trustme-1.2.0.ebuild b/dev-python/trustme/trustme-1.2.0.ebuild
deleted file mode 100644
index 17caf6461926..000000000000
--- a/dev-python/trustme/trustme-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="
-	https://github.com/python-trio/trustme/
-	https://pypi.org/project/trustme/
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/trustme/trustme-1.2.1.ebuild b/dev-python/trustme/trustme-1.2.1.ebuild
index dce1d2df2b4e..c4029a78a137 100644
--- a/dev-python/trustme/trustme-1.2.1.ebuild
+++ b/dev-python/trustme/trustme-1.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 21f906067d17..5f69d954b30e 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -11,5 +11,6 @@ DIST uv-0.5.17.gh.tar.gz 3229851 BLAKE2B ed463ce99e3ae32e846482cb4bc9d601bfe3953
 DIST uv-0.5.18.gh.tar.gz 3230088 BLAKE2B 1244e352f2853dc66e8d99ce304b4b086d1f1b0c8c84fd06bb5c589e73ea0c82acbd477042a5f98da5229b6c4af81281d11b6397393001f7abe1c7218fc9af27 SHA512 3b0a709808155846a3d7d4ba1e916b93a6acc2c26a0a6fd0394f44791fbfe866adb15a1c4170893f7d9480568b87bcf3f38d1a445634376a4f7091f7eadda2b3
 DIST uv-0.5.20-crates.tar.xz 53845912 BLAKE2B 3ebe6099304f4520cba49bf36a7b900146b57740c6dcf783cf2f064707b5880041eac8ee0adf2e251819cb7f3ac3f2739dd89636a48618f6220bc21bdb7fd334 SHA512 fbfb6becb1008c5dbfd571871abe053721f4a9939f98e1d0b1c3c5ad405d1d4dcdd121986e12cdaab9e1ff7a9bc0353aa69345ddb2fbb8c0ac0a427bdbb6c9f9
 DIST uv-0.5.20.gh.tar.gz 3256266 BLAKE2B 595e8c6e868b469a3ec0366d77ce685feabd56351a276208d40f9f45e9b35e07df9b118766c1955d77cdacf80e4aeafb27fc16e668d8a48702ea68e906aa4a61 SHA512 388e406950266933e168a76399ff349b941caee38c99d49c866c191b3841936df8ed15564528bf351454f52f480a7bffce3e260d502d630e890609aa876b11c1
+DIST uv-0.5.21.gh.tar.gz 3260658 BLAKE2B 064f52d4c690d2992988ca1683ce2c5183c2662961b931519b84651bebedff90a5b64fd87052b79c591b62a8fa07691997c38cf2b636e9a0facfb5683e64627b SHA512 351bf2a76cc0ec10f254f9eab0df0c0f307594a7052388e3b793c8314d9119488c2ebaa20125021fe0bf54192ce17d7e69719832c17aa4c815a5d9d69521e225
 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
diff --git a/dev-python/uv/uv-0.5.21.ebuild b/dev-python/uv/uv-0.5.21.ebuild
new file mode 100644
index 000000000000..346ff22e5500
--- /dev/null
+++ b/dev-python/uv/uv-0.5.21.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024-2025 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;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%'
+	[tl]='https://github.com/astral-sh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+	[version-ranges]='https://github.com/astral-sh/pubgrub;648aa343486e5529953153781fc86025c73c4a61;pubgrub-%commit%/version-ranges'
+)
+
+RUST_MIN_VER="1.83.0"
+
+inherit cargo check-reqs
+
+CRATE_PV=0.5.20
+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/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index d8c618e30981..7ec54968093f 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,2 +1 @@
-DIST vcrpy-6.0.2.gh.tar.gz 338830 BLAKE2B 946c30bc7d0a5663b2dea8989b298665fba6ce63dcb59127e7e444a1384457d65838ba0b24bac7c6285196c3fe796014aa68373ebf902f3e4e8928b76df3a120 SHA512 7e6b86bd60d2a2bd9ca8843f08143ec75656fc017ef7a9df29d4ee45e09bf985e9591204c466372459eb7987951ac2dbc730783e127e0db610e25261656275b2
 DIST vcrpy-7.0.0.gh.tar.gz 339068 BLAKE2B 15ae3cdfa3ba6755c0d7b2a31b91a4465bd603a80ee2900207181ba95dca4b863d16cf44ae98b7cac35bd312daaa95ca882a2a9d75e46e2a48b788e7bf82ab51 SHA512 6e82f56adddc5b5e3d56c261e612af5a66daed6a3485dfc082be235e95901ceaae9aa83bab96cef19d8fbe35c27953b4b101fea702fd3a44cbe578c926990d87
diff --git a/dev-python/vcrpy/vcrpy-6.0.2.ebuild b/dev-python/vcrpy/vcrpy-6.0.2.ebuild
deleted file mode 100644
index 8900000a9599..000000000000
--- a/dev-python/vcrpy/vcrpy-6.0.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=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.16.2[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-httpbin-2.0.0-r1[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests are failing with recent dev-python/werkzeug; losely related:
-		# https://github.com/kevin1024/vcrpy/issues/645
-		tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times
-		tests/integration/test_urllib2.py::test_random_body
-		tests/integration/test_urllib2.py::test_multiple_requests
-		# Internet
-		"tests/integration/test_urllib3.py::test_post[https]"
-	)
-
-	local EPYTEST_IGNORE=(
-		# requires boto3
-		tests/integration/test_boto3.py
-		# Internet
-		tests/integration/test_tornado.py
-		tests/integration/test_aiohttp.py
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not online' -p httpbin -p rerunfailures --reruns=5
-}
diff --git a/dev-python/vcrpy/vcrpy-7.0.0.ebuild b/dev-python/vcrpy/vcrpy-7.0.0.ebuild
index 2b7d21437de0..cdff8878bff7 100644
--- a/dev-python/vcrpy/vcrpy-7.0.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 9831b31d7928..a2044690cc62 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,2 @@
-DIST virtualenv-20.28.0.tar.gz 7650368 BLAKE2B b18ae57a929bb2a84a7ffa92771913dbd941cc2fc4c2962b18ce34dc105dcdfdb46b01366affea04ec44a7795b9c78a136b385eee8c457274079e65313d19896 SHA512 6a66663af74a240b9ad1cd3170f765ea44aea5f013d63c996a66af4aa0ad4e56c2c38c4f51d43181ac55c6099363694478d7ef15b640c56f8f801d3cd318966e
 DIST virtualenv-20.28.1.tar.gz 7650532 BLAKE2B 08b356a1547573f5a4d55e32e5d0c0f0d12f137d651a46efe79dba8680cdb7e8e24dc37adc7fcb12ba3a83ed7b0185c553dc2269767488d9280e0e4f99282da9 SHA512 f68f0c0cbcfb5a0a7e7d98eb695a9843ff20f8fbb50412919f1001f939c56ba1ccc64506c53d0c0f37bcd28db376bac7c72be99c0ebec8b584e2402cd17b2342
-DIST virtualenv-20.29.0.tar.gz 7658081 BLAKE2B e0413f9aa44a970108e9079afbbd9cb0eef8a8c74d4be1f6ea53164e4a1103fe730e08906b28e1b4373b831a9d4e865f4e9f63b17438a03084ab8402e1c16c2c SHA512 543b38365f6904c20560cc996a58aec081d166590a99f00ba176558bd9c487c6ef3007f1c60b7372ca7e10307932c62145508e4de596bb48c9cff70e201a4f55
+DIST virtualenv-20.29.1.tar.gz 7658028 BLAKE2B b03008966fdeb0f7e72525ae5612a17721b9e5cbfb1e95f7a0b1d9677dfc8d3036e86623724a722ea5571f32bb7a43a7af0ec530fba3fa4e96b5215b5ee06e66 SHA512 94a2c9ce13cb98bf1df6f2e0a9db0e1acacf4667fb9609ad39d8ae7a6529818c0b1597b463262b0ea9a492684d9af027fa0ac9c1bb499e862ab587786b3b9511
diff --git a/dev-python/virtualenv/virtualenv-20.28.0.ebuild b/dev-python/virtualenv/virtualenv-20.28.0.ebuild
deleted file mode 100644
index c8204c9d2907..000000000000
--- a/dev-python/virtualenv/virtualenv-20.28.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-
-	dev-python/ensurepip-pip
-	dev-python/ensurepip-setuptools
-	dev-python/ensurepip-wheel
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# use wheels from ensurepip bundle
-		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-
-	# remove bundled wheels
-	rm src/virtualenv/seed/wheels/embed/*.whl || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		# tests for old wheels with py3.7 support
-		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
-		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
-		# broken by different wheel versions in ensurepip
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
-		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
-		# hangs on a busy system, sigh
-		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
-	)
-	case ${EPYTHON} in
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# remove bundled wheels, we're using ensurepip bundle instead
-	find "${ED}" -name '*.whl' -delete || die
-}
diff --git a/dev-python/virtualenv/virtualenv-20.28.1.ebuild b/dev-python/virtualenv/virtualenv-20.28.1.ebuild
index ef8e66b486df..b13c5e683fe4 100644
--- a/dev-python/virtualenv/virtualenv-20.28.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.28.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.29.0.ebuild b/dev-python/virtualenv/virtualenv-20.29.1.ebuild
index ef8e66b486df..ef8e66b486df 100644
--- a/dev-python/virtualenv/virtualenv-20.29.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.29.1.ebuild
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 2af9eaf5d668..a7f08ab4883a 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,3 +1 @@
-DIST ytmusicapi-1.8.2.tar.gz 284079 BLAKE2B c47560141062bd43af8334132c16d095daa3e8a6accc90f7c2300f602d85627bcefdda6ef05f2371bef11bd33be1f83575cda1b6bd386a0b449f82b9cbfcd8b9 SHA512 6396f1e245bc390251ca37fe896cf41bb0c5608608134a7d8cc07895aca35cb348e18fdd861b830d8efc4399d5931b82e489e734914f9b685606a2bd7af890ea
-DIST ytmusicapi-1.9.0.tar.gz 292697 BLAKE2B da46b1d5687b5c2f9906e17ec522f918f2286b3ed847c1d43ec3e4e067fc90e8af52f7291c72ae91ccd3cecc7ac07dd9379bef95e9e6b2189d65592dea7bada1 SHA512 4a1236590c0500ffc8a6b4cf809d29ea10998b8ea89e5fde91e1ed1fa65edfcd2fc8e94690e1f332c52fe812669e3c148d405dd821ec4d38b8508e95247183a9
 DIST ytmusicapi-1.9.1.tar.gz 294717 BLAKE2B db290d1d229dfd0791c3d6e24c933b5743c68743cc7030a4344901e9b70300f3617f789a3cc50b57883e896e1c9f8daf6545230576f1a4453d414982f2a886b9 SHA512 0418d224b8ee0563d6f904a9cf429bd8d8d7c9ca9cb51e950a1177317d7d84612280e031d96d4c42c2b713768bbbae13e1ac8172437d093f5b143978979f6577
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild
deleted file mode 100644
index d212eb60009e..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.8.2.ebuild
+++ /dev/null
@@ -1,24 +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="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild
deleted file mode 100644
index c9b957dae4df..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.9.0.ebuild
+++ /dev/null
@@ -1,24 +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="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
index c9b957dae4df..71c1c3d05cfd 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index fcd2f14983b9..18b5b624bd03 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,2 +1 @@
-DIST zstd-1.5.5.1.tar.gz 1106585 BLAKE2B 6c0d6108a3c5e5e3d013d6e10fadad8150311d2e17d304751dba4ac709e2c8005575ff73e2800392dfd9d7b6bcda9a8e8014d3cbe4a90d12bf12e7416776d744 SHA512 7dc2f3ffe0f94b56ba0cf8360ee510b292e9b8b1e92b8ba1ad1a9206b50f852a4e67e04d8e4900c0705820163d551644b38977e2864c648aae7dcc6b2a2c0a68
 DIST zstd-1.5.6.1.tar.gz 643831 BLAKE2B 8c6cc1cca4fb9fb8a697ea2840f7eded5ec528f079115d15f24fd87b65648aaddfdb784315df8ba6f5fee18bee7c628478fc248b4769cfccca4f300d859768ee SHA512 1dd99ec381794664ae0891d1982ed0d627f72569f1d2c1b439204ccc5194979de8f393594bae17e5e4abbfde29811b4276085385c40664cc65f4b7940ce84d9d
diff --git a/dev-python/zstd/zstd-1.5.5.1.ebuild b/dev-python/zstd/zstd-1.5.5.1.ebuild
deleted file mode 100644
index 72d3f1a85414..000000000000
--- a/dev-python/zstd/zstd-1.5.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-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 pypi
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.6.1.ebuild b/dev-python/zstd/zstd-1.5.6.1.ebuild
index ec012348fc60..2f106e84b734 100644
--- a/dev-python/zstd/zstd-1.5.6.1.ebuild
+++ b/dev-python/zstd/zstd-1.5.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd:=