Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-12-28 18:49:50 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-12-28 18:49:50 +0000
commit: 5e40752e4b8e3aa126d6e44746ed89a92a7b84a6 (patch)
tree: 744f7fee64ab8aa7a683a40502f07504fffb478e /dev-python
parent: 6755ceb5710085dde2c6858873dde9fb3e73cbee (diff)
download: baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.tar.gz
baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.tar.xz
baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.zip
130 files changed, 493 insertions, 1959 deletions
diff --git a/dev-python/aiohttp/aiohttp-3.11.10.ebuild b/dev-python/aiohttp/aiohttp-3.11.10.ebuild
index 5e7326424593..f9b8b5715cb9 100644
--- a/dev-python/aiohttp/aiohttp-3.11.10.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions test-rust"
 
 RDEPEND="
diff --git a/dev-python/aiosignal/Manifest b/dev-python/aiosignal/Manifest
index fbb57435d7d6..37509c980b16 100644
--- a/dev-python/aiosignal/Manifest
+++ b/dev-python/aiosignal/Manifest
@@ -1,2 +1 @@
-DIST aiosignal-1.3.1.gh.tar.gz 26119 BLAKE2B 16112f674f20b97406eff16a6a9baca1ef414132ec53a67789e08347f06a462ff653c7a00d6865855f5fe0fd70ba4a2bebe286020fdf1942da41d43f72e67837 SHA512 c03454d1b855bb3e84d3ce07fb32d08855b42d1ca7723fd67d3b2ef1bc66038a31974fabda7561c90e2beaf4cdd2c28cc0463e43eb5d5c127df0cd187ae3c2e2
 DIST aiosignal-1.3.2.gh.tar.gz 27043 BLAKE2B 253022824866f47658fd5e2ebfc0e234e31541c38679695a2645ae0612888134edab3c5f36a01242db87c28ba37d50d45edfc782b48278860a72c3f3aadcdf73 SHA512 9a66e79d43e0aecd1195721db07d4e21da6ea9be81198b965471dd01beda44791d56400839f4ea30ba4d0c106f0b9bf6f91277c310c219669de45a4f874957e5
diff --git a/dev-python/aiosignal/aiosignal-1.3.1.ebuild b/dev-python/aiosignal/aiosignal-1.3.1.ebuild
deleted file mode 100644
index 2d33798bebac..000000000000
--- a/dev-python/aiosignal/aiosignal-1.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A list of registered asynchronous callbacks"
-HOMEPAGE="
-	https://pypi.org/project/aiosignal/
-	https://github.com/aio-libs/aiosignal/
-"
-SRC_URI="
-	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/aiosignal/aiosignal-1.3.2.ebuild b/dev-python/aiosignal/aiosignal-1.3.2.ebuild
index 626b7651c7f8..2d33798bebac 100644
--- a/dev-python/aiosignal/aiosignal-1.3.2.ebuild
+++ b/dev-python/aiosignal/aiosignal-1.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 98b387abe8e2..c082aedbebf1 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,3 @@
-DIST astroid-3.3.5.gh.tar.gz 465885 BLAKE2B 64453a7b17aa1584083ca3c1fea4fdf8a236a1e0b80a66d8fe83a7201f2ef7c1cb362370648d61f766e8dc101c7797fbb7c5a2ab6f21e23da3830072e6a66c23 SHA512 323774d0853e8bebf5074eab3da3c29dfd2c04c96f222eb9a7fbe8da37544f7e6dceed8d0fd163591a2cd56a3d06ebf8ec33d23baeb921aa49cccb0f29cae426
 DIST astroid-3.3.6.gh.tar.gz 466233 BLAKE2B 6b8bebeb7f56009d6ea7749f911a309e6cd2a0a7bac7ade1ea91ca74bc157f048c3652a50321a72c961670cb8dcc8f584bd39ef8a2d82408b4be27c8efcbdb58 SHA512 7ed2900cdf563cb761596cb816452e64be131c34d7ea7eedb27a5ceac4e588c3c675deba72bee17557c408c019e489c6f1e86772bdc235e2f1b048239b76c993
 DIST astroid-3.3.7.gh.tar.gz 466979 BLAKE2B 1f6abc37d1fd35eafc3bd6cebdc7611259cb6e77ff4c447d108ce1d88fa723a867c82eab2a93b9095bee033745a2fe3e81441e940d9c7b82910d5d04c75c334c SHA512 1debf08f1707714ac23e024632a0f686020fe7e46fdd9e417586923b7ff5b393d2e106e6145b7580c8ffece728f3228d52f71ca0b52adbd8ad1c40102fc72bc8
 DIST astroid-3.3.8.gh.tar.gz 467093 BLAKE2B 0f019e8569d7fff96d0c6e4025312d03ec518a3d7014b35bd381989d88b4ed4bb4c796597cbf6ee892ea25c03eeb9159e1f40791f20f9a27a0f8c2578d565a0c SHA512 b788815d07d6a9f5796a4e5d1c1d1df5ad9786c43b82c9f10719097bad01881c394352aaeada3171bfaf8fa72f1542efb1f75b88b8ea9164f96f4946654d00c6
diff --git a/dev-python/astroid/astroid-3.3.5.ebuild b/dev-python/astroid/astroid-3.3.5.ebuild
deleted file mode 100644
index c54d226aaea8..000000000000
--- a/dev-python/astroid/astroid-3.3.5.ebuild
+++ /dev/null
@@ -1,89 +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="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.6.ebuild b/dev-python/astroid/astroid-3.3.6.ebuild
index f342635e39aa..c54d226aaea8 100644
--- a/dev-python/astroid/astroid-3.3.6.ebuild
+++ b/dev-python/astroid/astroid-3.3.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 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"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/asyncssh/asyncssh-2.19.0.ebuild b/dev-python/asyncssh/asyncssh-2.19.0.ebuild
index 2894234d9d6e..b241a91aa387 100644
--- a/dev-python/asyncssh/asyncssh-2.19.0.ebuild
+++ b/dev-python/asyncssh/asyncssh-2.19.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( EPL-2.0 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/openssh
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b21797bb6c43..0aaed38c8360 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,5 +1,3 @@
-DIST boto3-1.35.76.gh.tar.gz 910113 BLAKE2B 3e7429976b348e29ba4184bffe03c643b85dd978cc520b924263e8430b5e5935b95152cced2f6c0807c65de4e6e1405c55bb24565ac5bc425292e9adac178c03 SHA512 132f37e77b7b36d525e9cf678fe2f624eed77a9eb9fa8e7d7f079a362e5d7a5f3edcd17c7d8bc1e27570171927d26e74a94d267a1b0cbddda3890ac6a0f21cdc
 DIST boto3-1.35.81.gh.tar.gz 913534 BLAKE2B aab88ae95d4c93c8f54042ef2b3ec9defdafa4d9dd4dfb57ff1da896254bbc0d1ac8c4583b8870cc8cc814366f9ef79d67d69d45b0f373878d1c22dba465e523 SHA512 fcbc31295a94983620405dbaa0f32eee2149619cf113658c2955fe84ca541cb93e8d6d637d8d7b322e6b7252bfc390b4aff77b99af3978267c64cfa5effef1f3
 DIST boto3-1.35.86.gh.tar.gz 917880 BLAKE2B 9ebf2ff2d8674013f6edead87ff92c649e977ff942fd50dfe80da4ac7a00f812735ff38791e5572b442524d335a838f4cb16fa0cc2bf54e51ef5932cb4639bf2 SHA512 4daa945a64381aca49175211b40893bf05ec733a92ab8b972c3c3e53cfd29ac8ca142c7903ee49ba75097bdf10f7a7b36d35ff0f8cb1501b12149c9f6dffdb65
-DIST boto3-1.35.87.gh.tar.gz 918374 BLAKE2B 9cc0ceaddb41fed4d776495bf1f7647c3fe3ddcadce54ed31e422964e09b9269b48206ddcb4c6d6344afa4b6ee73a4ed0a3808f2be168ba9c0709b7dfb5ca697 SHA512 ce63979076b9ad33aef2c5190e4492dd96dd7f672d9a2a4fb5a75b8ef19f31754371dfa10c86b1fad1fcf980e72fa84f9312daf2e7c3131e53e8325229e1b76f
-DIST boto3-1.35.88.gh.tar.gz 918543 BLAKE2B b5ee939bf8307c94d84ac4958d82be908df9ebc6f0585695c27ca509659fd69ee95e4806211108add40ddb5bab13736a1c1c6e8da591e1fa3952330a3e2f85b2 SHA512 07f4d244ace9bc6483b9734b1e152b00c084181a9b0f909d7ad7c3a8df2a663c7b9dad49e65f57b63d40dce57fd663226350998e01fd0b054c4ceb0bd8a92bdb
+DIST boto3-1.35.90.gh.tar.gz 918672 BLAKE2B a875ee6f59cac2a5f085719fed71090f8d717071dc7e2941075d12d3d98bd9850283c157a9176e890f67dfb78f68cd9f3942e0c8515629f70fa9cd9090eac837 SHA512 ab19a1fc324fb151cf781ac8de306af67edceb7190c6970e296c1f6dfc59e66da6c056a84aefbbe2509c7acb33ca3da81ad58736217ad45ccc16490eb4d96fc2
diff --git a/dev-python/boto3/boto3-1.35.76.ebuild b/dev-python/boto3/boto3-1.35.76.ebuild
deleted file mode 100644
index 3a10a36056b1..000000000000
--- a/dev-python/boto3/boto3-1.35.76.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.81.ebuild b/dev-python/boto3/boto3-1.35.81.ebuild
index d91ce27598cf..3a10a36056b1 100644
--- a/dev-python/boto3/boto3-1.35.81.ebuild
+++ b/dev-python/boto3/boto3-1.35.81.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.88.ebuild b/dev-python/boto3/boto3-1.35.88.ebuild
deleted file mode 100644
index d91ce27598cf..000000000000
--- a/dev-python/boto3/boto3-1.35.88.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.87.ebuild b/dev-python/boto3/boto3-1.35.90.ebuild
index d91ce27598cf..d91ce27598cf 100644
--- a/dev-python/boto3/boto3-1.35.87.ebuild
+++ b/dev-python/boto3/boto3-1.35.90.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0da8cd0fb4a2..647c84999626 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,5 +1,3 @@
-DIST botocore-1.35.76.gh.tar.gz 14117270 BLAKE2B b072b926daae520e54871676d5afc4832ddbc8c91a2ee15f103a9d48df2e17d8cef304fab28c4050bfe6d70629979c48d8bc00d5caf42a0129a19ff5a3a2baa3 SHA512 e7433d60519a0da5118b3283c192a7199e8bfdd605fc6bb98d05cc90485a1e4aec537a035ffc08bcb6c35e9d31394422596e113a98cc00c23bd3dd350577ac1d
 DIST botocore-1.35.81.gh.tar.gz 14142565 BLAKE2B f0c5c284f5f0964841ab0f84f278fa574b696df614d5602856065c83971bf366449b7ccb12fbf15c3bb734d894e6eb49be89e5dae3000bd8fd8913d2f465c5e6 SHA512 7b67d6f1dc31369afc3a4ebf109682b9365b59fe46635ef92b0e8adcaa16fbcaf7e1350a13537149dd0a55b60a57534a18d9f4e8bbb28663e8b2e427ece20819
 DIST botocore-1.35.86.gh.tar.gz 14177900 BLAKE2B 7b80010dca6496eceedf8598f195ac80d4416c0f2032f931586a1db2ec100185e8c9591d6d42f549fb9a579b295178aee293c4b317717b4e9264d9adc54fb2c5 SHA512 28185963f5a3a937bddcd47a3afc13fab16b32ec092bfa7b6c007ff77cfe5e0ead1b253f708ff9077638185173034d484abee0d49f97475a88dfb00fad0c31c2
-DIST botocore-1.35.87.gh.tar.gz 14180574 BLAKE2B 2b2a685940528ebc99c2f8f6651536545b624ecbe9fbba69c72be419e7891b91dde0d196ffd0ec434fdf02b530637fe575ae2720f44988fda21fa08deae26a39 SHA512 ff8065b8cc5926243e1888338040d431d6f00cc3a636ca62db794756b90ef66789c4600a4fced96c748a6b106ff0f7b599aaae4298e2fe7e5b8d78e90e0b58ed
-DIST botocore-1.35.88.gh.tar.gz 14178518 BLAKE2B 81cd23b41b4219d19891b23e038499c40398a675dfdba26c9bf06bc838f7f013734b3fd88b08843499f420a6165fa4c38905c320d4663223a8b59a40ce1233cb SHA512 3aab3f9a4faac57facd743bac028cbab3581708717bf9cb3ef6dbdff1ad7c01354e4c4fb28af9c056fff490e92d4e733d9ba60fba73fd4d7424af6f0290a9e55
+DIST botocore-1.35.90.gh.tar.gz 14180996 BLAKE2B d3b39e375d33af6515649c9be4b783e6dc7717ffc29460f83507ba392ae4b77a55811e07b7a0fc732e9d5d24b7bd0d1dee450ae7c62ef535c7f70d79936cb186 SHA512 8814eb1c435f753195f5189d21bb60ae29ccc007f16cd451bea0fc7650b6c5daf1c94e07e04d95b3c320974b2dcf27520aa3ab6b56b1351b22d137312d9dc3c2
diff --git a/dev-python/botocore/botocore-1.35.76.ebuild b/dev-python/botocore/botocore-1.35.76.ebuild
deleted file mode 100644
index c81d932a2d78..000000000000
--- a/dev-python/botocore/botocore-1.35.76.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.81.ebuild b/dev-python/botocore/botocore-1.35.81.ebuild
index 7816e9efeb52..c81d932a2d78 100644
--- a/dev-python/botocore/botocore-1.35.81.ebuild
+++ b/dev-python/botocore/botocore-1.35.81.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.88.ebuild b/dev-python/botocore/botocore-1.35.88.ebuild
deleted file mode 100644
index 7816e9efeb52..000000000000
--- a/dev-python/botocore/botocore-1.35.88.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.87.ebuild b/dev-python/botocore/botocore-1.35.90.ebuild
index 7816e9efeb52..7816e9efeb52 100644
--- a/dev-python/botocore/botocore-1.35.87.ebuild
+++ b/dev-python/botocore/botocore-1.35.90.ebuild
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index aa3b10d6f81e..626927f240ab 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,2 @@
-DIST cfn_lint-1.20.2.tar.gz 2734631 BLAKE2B 1935793ad1438f5fc4f217390541b476192ab68a6d1614d7322eca1981b7d3712d85c090394eec2e8d2f2c15bb3798a148987613a3fe71fdc4355a57bf31a836 SHA512 e327e703cd96cd1d4d9342525cdccde3f11373ad5624a6a6b9ba16f76fa1b12be83b8f6a5118c0ceb947dada7a5bd30f8bf6434f4e61cbfc8bfa0dd8cf49ece9
 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
diff --git a/dev-python/cfn-lint/cfn-lint-1.20.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.20.2.ebuild
deleted file mode 100644
index a0cf3e0df44d..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.20.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.21.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
index 2481db200741..a0cf3e0df44d 100644
--- a/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.94.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cppy/cppy-1.3.0.ebuild b/dev-python/cppy/cppy-1.3.0.ebuild
index 0624c5cae1bd..fd7efb4b019c 100644
--- a/dev-python/cppy/cppy-1.3.0.ebuild
+++ b/dev-python/cppy/cppy-1.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="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"
 
 RDEPEND="
 	>=dev-python/setuptools-61.2[${PYTHON_USEDEP}]
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
index 01887c1c3471..3cdf7575d025 100644
--- a/dev-python/django-allauth/Manifest
+++ b/dev-python/django-allauth/Manifest
@@ -1,2 +1,2 @@
-DIST django-allauth-65.2.0.gh.tar.gz 1220679 BLAKE2B 55b936715afedf1891e280ec11fc309ae0fc7e0d6c6607342f839534305fd7e1e70f90423dbddeb169592c10b47cae491f055728195bbf3867b1af14e8c5dc02 SHA512 c668449d9d8803f7d0fe86e9902fd72d9e9bff4fffe4ad098c549c0aee285601ecc54ac04c9f1d22b522c4e72abc186e431a02b1afaa22d056d53f868cf955f5
 DIST django-allauth-65.3.0.gh.tar.gz 1222088 BLAKE2B 3ac3dd9822ed72d217db6e7f51a328f03e74681c814ec2d3739f6781f267e9cf28e5c126c97fd03efd4f60afee213d1bfbb30a72a0c54610c07cbe18e8e2a78c SHA512 69e505bb8410442d90e41e3ad9fe71a62fb2d0192b9a2027c3c18a4d391706e2f9022dc1839c8befef38c6afc23ae31d271deb80b5cd56201cc87430f18880bf
+DIST django-allauth-65.3.1.gh.tar.gz 1223075 BLAKE2B 5c1913a93f3f1f063221e1c9855e69bb5cedff958b7e9536f1fd23bd65f5b6249b4a660673527e61a7730e4a35eebdc5a128a13ae0ac4cc180abe823c19b1fb4 SHA512 8b6d7852b0c0cdf100e7882582b67cbdc1de231f83fb71d1d35d5b26b177a6ef2f0bf2c020519a68157e0532ac836239caa4f1281a96f03d44da4a4db001aa24
diff --git a/dev-python/django-allauth/django-allauth-65.2.0.ebuild b/dev-python/django-allauth/django-allauth-65.3.1.ebuild
index c76884f73e2e..c76884f73e2e 100644
--- a/dev-python/django-allauth/django-allauth-65.2.0.ebuild
+++ b/dev-python/django-allauth/django-allauth-65.3.1.ebuild
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index c6d62a3f34c4..d5addd226a4a 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,2 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
-DIST fido2-1.1.3.tar.gz 252813 BLAKE2B f88ddd1c201aefddbf8c0a91040a121a3ba446229f90c17df6114c6b7fd3c047a4089475601f2d7d38d06fcd5fd14dba25177fa2b22360226a7c90d66137e978 SHA512 9ee226ab5762afe263c917d24ddfded9f3da40b38f97383c25c5fbfc3adc6085d3d218dc5f12b288689bf2e5e89fe9cecb2e40e45e5441d2001f945b336c2d0b
 DIST fido2-1.2.0.tar.gz 266369 BLAKE2B 6170fffe46c5d3baa79b061583ffa597690b7f636a6205bcafcc2d997d7a82d49388ce4f573511e4ade976e491bdabb24e16c8be23a6aba3cbb1a1e70437b218 SHA512 c9c7a47ed6608f2dcf06b38905708d64b85ca91ea2656b654474e3164a90b3feae36a0898cf984a4811f1f757e22d3c7ca3dad1ba909b6c8191e418b1a0f938c
diff --git a/dev-python/fido2/fido2-1.1.3-r1.ebuild b/dev-python/fido2/fido2-1.1.3-r1.ebuild
deleted file mode 100644
index 9792b9ccccfd..000000000000
--- a/dev-python/fido2/fido2-1.1.3-r1.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=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based FIDO 2.0 library"
-HOMEPAGE="
-	https://github.com/Yubico/python-fido2/
-	https://pypi.org/project/fido2/
-"
-SRC_URI="
-	https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz
-"
-
-LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
-SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/cryptography-45[${PYTHON_USEDEP}]
-	<dev-python/pyscard-3[${PYTHON_USEDEP}]
-	examples? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${S}"/examples/.
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/fido2/fido2-1.2.0.ebuild b/dev-python/fido2/fido2-1.2.0.ebuild
index 839d3858d39d..73025e2bcceb 100644
--- a/dev-python/fido2/fido2-1.2.0.ebuild
+++ b/dev-python/fido2/fido2-1.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 9da2f3ecbc27..0b504e00620c 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1 +1,2 @@
 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.2.ebuild b/dev-python/flexmock/flexmock-0.12.2.ebuild
new file mode 100644
index 000000000000..0503d3f5f161
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.12.2.ebuild
@@ -0,0 +1,36 @@
+# 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/fonttools/fonttools-4.55.3.ebuild b/dev-python/fonttools/fonttools-4.55.3.ebuild
index 2b9bd3ce3dd4..3b29c231f744 100644
--- a/dev-python/fonttools/fonttools-4.55.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.55.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 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"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index d22b120879f9..4eb35369492d 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,2 +1 @@
-DIST python-api-core-2.23.0.gh.tar.gz 207393 BLAKE2B 7a179f4778c7bb38328f1621a072cd7f627cfa16ff0cbdb9e4e625c3d97e10f85b717b0fd458bc6a2137390dc18d6dd8a6d7c8bbacd256d897cc41411fc27392 SHA512 64554cd39038b85ed4d9f84394282b296a1889031c7ddcc8f6c1789dfff89c6179b9eb4cfbf2ad1707913f13054cfd01a959af4ba676aa84d2efb6901e4c6c8e
 DIST python-api-core-2.24.0.gh.tar.gz 210006 BLAKE2B 816b4dbde52d5246feccea95ccdadea700d4fa803faad70f3801a9a66daf4d02dd8dfab5ec372d44b03caf8e250a9c8ebc44c671bac83313354867144ad17faa SHA512 6c279303dcfb05ff655aa5bb9426d0a28fcef9300bab542b1ec4100aecf7d236f05f6889433f8b8ab7d2abcc9084a5879af8357c2d5098db67e4231919e8bc17
diff --git a/dev-python/google-api-core/google-api-core-2.23.0.ebuild b/dev-python/google-api-core/google-api-core-2.23.0.ebuild
deleted file mode 100644
index a1f159b2f9a3..000000000000
--- a/dev-python/google-api-core/google-api-core-2.23.0.ebuild
+++ /dev/null
@@ -1,63 +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} )
-
-inherit distutils-r1
-
-MY_P=python-api-core-${PV}
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="
-	https://github.com/googleapis/python-api-core/
-	https://pypi.org/project/google-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html
-"
-SRC_URI="
-	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="grpc"
-
-RDEPEND="
-	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/proto-plus-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-3.19.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	grpc? (
-		>=dev-python/grpcio-1.49.1[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-status-1.49.1[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		>=dev-python/grpcio-1.49.1[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-status-1.49.1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# The grpc_gcp module is missing to perform a stress test
-	tests/unit/test_grpc_helpers.py
-)
-
-python_test() {
-	rm -rf google || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.24.0.ebuild b/dev-python/google-api-core/google-api-core-2.24.0.ebuild
index 36c0ecc76be4..a1f159b2f9a3 100644
--- a/dev-python/google-api-core/google-api-core-2.24.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.24.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="grpc"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index bcb7fdd55e14..0b35522f164e 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,2 @@
-DIST google_api_python_client-2.154.0.tar.gz 12070143 BLAKE2B 91b2838116246e04fc93a155fb27792a2efa6e258eeddf29989c62229db7975b389435efeb6342d069358797539c57ea630c7bf7da64a0cdef7ceb4801586a85 SHA512 9728f4cda59919ddec28876f27b6e7716d96c9ba08088f064aa1ac0e0a4ccd1d7ad66e592ac8e2429f04520b64d8228fd3d358f7ae7d157048c9719fcb7b8cd3
 DIST google_api_python_client-2.155.0.tar.gz 12195015 BLAKE2B f9c82244881b131dd022b7fd817c9fae28d4be6c6a1410e5e674d050e66b1361182515b6a220eef988ab4fdfa62e4cbf13de58e699672b3382a5449380c422e9 SHA512 1b2101d93178aa0507dcb2d8fb70c0ec29d547b87a7572508f56c87f8877b6c795f494c7f7f020df72d9e2b96083d135dfddd0ad80bb9d317189598fca9192f8
 DIST google_api_python_client-2.156.0.tar.gz 12230345 BLAKE2B 9ce77dc4fd962bf24a8046678c4c21501218dd1f3a356b364bb6940f564f9aa7e6d99c77db9b5e7fea271a17b10726a668f07dec6ec344bad5cad98a1975a107 SHA512 c29debb48f8504eb6316ec465613e87b083429344a9e74f4f52d07f6edf47b017a7f0b539557de4ca575ead3dda1d4b0579faf483102fab407c15386277d5078
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.154.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.154.0.ebuild
deleted file mode 100644
index 2727f2d53b96..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.154.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild
index 595a1e3cbd88..2727f2d53b96 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.155.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.155.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/gssapi/gssapi-1.9.0.ebuild b/dev-python/gssapi/gssapi-1.9.0.ebuild
index 40399ba67c4e..dfa9990d47b3 100644
--- a/dev-python/gssapi/gssapi-1.9.0.ebuild
+++ b/dev-python/gssapi/gssapi-1.9.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx-socks/Manifest b/dev-python/httpx-socks/Manifest
index 6a256d3095f2..dd284b97eaf5 100644
--- a/dev-python/httpx-socks/Manifest
+++ b/dev-python/httpx-socks/Manifest
@@ -1,2 +1 @@
 DIST httpx-socks-0.10.0.gh.tar.gz 15429 BLAKE2B fcc96ce3ca5a68a65d89a617ba832961a800d65d543a9f6edfa794fac03ecbb6b2f35364a58f584b4b44c96b4ffc137835f189e370ad1dfc1d373853de4856d3 SHA512 b8c513dece25b10b653a147b98bb8f173ead8c4200d67af96675e33a12e151e2f11368ebd12c35b96fe7fd94797db1a009cc86921d1f9defcd553bffa2f1f2d4
-DIST httpx-socks-0.9.2.gh.tar.gz 15445 BLAKE2B 273380fc722780d090039aa74dd646ca3cd5dbc18d5ab3a030847fef0ad515f4ad171289d9cc125d1e8218b8e81a73c1b192caa2708238ed7ac288d3b2419c41 SHA512 41816f9dfa998b8a7e99ddc68d9e3473184fa44ecb08950234759dd9765496e92309852474d8688e392f6a25c4fcbeb7d6358b07bc574c68fd423e05bd052990
diff --git a/dev-python/httpx-socks/httpx-socks-0.10.0.ebuild b/dev-python/httpx-socks/httpx-socks-0.10.0.ebuild
index bd68c66c89af..d21ac4771976 100644
--- a/dev-python/httpx-socks/httpx-socks-0.10.0.ebuild
+++ b/dev-python/httpx-socks/httpx-socks-0.10.0.ebuild
@@ -21,7 +21,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"
 
 RDEPEND="
 	>=dev-python/httpx-0.28.0[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx-socks/httpx-socks-0.9.2.ebuild b/dev-python/httpx-socks/httpx-socks-0.9.2.ebuild
deleted file mode 100644
index 376edb1575f1..000000000000
--- a/dev-python/httpx-socks/httpx-socks-0.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Proxy (HTTP, SOCKS) transports for httpx"
-HOMEPAGE="
-	https://github.com/romis2012/httpx-socks/
-	https://pypi.org/project/httpx-socks/
-"
-# no tests in sdist, as of 0.7.6
-SRC_URI="
-	https://github.com/romis2012/httpx-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"
-
-RDEPEND="
-	>=dev-python/httpx-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-0.17.3[${PYTHON_USEDEP}]
-	>=dev-python/python-socks-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/async-timeout-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hypercorn-0.14.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.25.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin dependencies
-	sed -i -e 's:,<[0-9.]*::' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 823630ece876..931d6e27edd0 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,3 +7,4 @@ DIST hypothesis-6.122.6.gh.tar.gz 9499547 BLAKE2B 2d111698688050f3ce0d9cfdc1bc5b
 DIST hypothesis-6.122.7.gh.tar.gz 9503262 BLAKE2B d7b98f0df159c8e234d8d46d94f2803f9db21d9b36e029ae1e7ddd8403193a3bf0ddaf46087b7dd0cf003c3cf55cbecbac8431f140462b60d5eebe00d7b65a79 SHA512 c8625ba7252c750ee26f2db28f899e63b1bcfb7e5cecb8eb722fe75bb26cbed69e7e1e3616b27bae5336b68cd823ac658058e9fdb55a9df777c99b9f9c95354d
 DIST hypothesis-6.123.0.gh.tar.gz 9504064 BLAKE2B a71a119dfa15318bf8afd0fa586edc2cc67e7987d5544eca7a15495a73a4c3a9c637c3948003ac868aafb9cb6540426fd0628b8fc8f8d21d2e606ff536993924 SHA512 29459331a546ee03e6ee7307049c632523af6dddd475ce6d690a7f6fe11d6506ce4b37de8ea11cd8dc7b35acede901c0138018488973b35f3827e832a6ccc5f9
 DIST hypothesis-6.123.1.gh.tar.gz 9504686 BLAKE2B 755a1eca08744621ab9d836d8ea610bf58ea6e768da3580e6b88514ec46d578dd0bfdfe9cd0d416d889e6c48fdf8d58970a007a40f608f81c5686e477092a7bb SHA512 ed0646f9a0f88da130e44976a3340125253d626fcb0c5aa06ce0631471d320c74818326c3858198c2288e4a05557e491026d0f8bdf905daadf54a7a5d4bfb6ae
+DIST hypothesis-6.123.2.gh.tar.gz 9506171 BLAKE2B a7033cf2b5d56753ce19c5b369889b62d88c86df8254c840341c599dd97f575fc84e73236e701f4303d6141146bdef24f13f8d666f30a578ff80b067976934ba SHA512 d46b3d83a14b629a39f7eb2dcb0915802ee8185b4796ea38d053e44f2e8e4025a053c99a0aea7b4b59442a24fd3600b78d5a19e1f0bbd13e8a2d9f93cdca3df6
diff --git a/dev-python/hypothesis/hypothesis-6.123.2.ebuild b/dev-python/hypothesis/hypothesis-6.123.2.ebuild
new file mode 100644
index 000000000000..7d8a0e518f7a
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.123.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 251d1e39ddb0..564feb126b00 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,3 +1 @@
-DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
-DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
 DIST jupyter-1.1.1.tar.gz 5714959 BLAKE2B cdeaae6cfbc6aa0d5411a7ac0358a85b07d2b2b81ed1b4a6cb83aa536ff374128c8177533ce95e0b43b90cd6bfa6640fa4dba792b995853f7635c141bcea00ee SHA512 5a9249de71d4c8568e96374b4fc2a2cd2e0913c67a3f7733a7edc980d212418a05f9e4915c559c4afbb8b65360bf137982a82a8f77a1d183f52853e3a3cd966c
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
deleted file mode 100644
index d78f562f0d29..000000000000
--- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="https://jupyter.org"
-SRC_URI+="
-	https://patch-diff.githubusercontent.com/raw/jupyter/jupyter/pull/198.patch
-		-> ${P}-file-colision.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/jupyter-console[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipywidgets[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/jupyter-core-4.2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
-
-PATCHES=( "${DISTDIR}"/${P}-file-colision.patch )
diff --git a/dev-python/jupyter/jupyter-1.1.1.ebuild b/dev-python/jupyter/jupyter-1.1.1.ebuild
index dcacb3174d35..155357d229b3 100644
--- a/dev-python/jupyter/jupyter-1.1.1.ebuild
+++ b/dev-python/jupyter/jupyter-1.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index f6bf93e37e8e..94355ed153ad 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,4 +1,3 @@
-DIST jupyterlab-4.2.5.tar.gz 21508698 BLAKE2B 9222972e40e60549360d80221b97806e47b70592ffa9a63b3cb030e4b4ad061a8f8eadf295d76ae0302efb3bbf854cde9f5dfcacb6df3c6ad1994bf6ab66d1cc SHA512 7c5c3aab1bf86da0e49742630ece8a311ec351be99bfce3e35b5e92e06e858296e882a47f7a1abe9ab1c63cc92062f21d557f4f6237846a3c8377fc6288bf298
 DIST jupyterlab-4.3.2.tar.gz 21797175 BLAKE2B 72626351e0cadb523a8fc8a3b5ce7c6f452755eb145a5ac1c07118a0fbe2830025f78f94015381097360a171f9f4f5903fe71c3941d931db633328869caf5a28 SHA512 44e364b4bed7985394cfc28f2a7ff5e82c78861d61021886816c2ff26c9fca68140e956d281726433e63eee8f076ca35131ca930341430023c3043ee297981e2
 DIST jupyterlab-4.3.3.tar.gz 21797278 BLAKE2B d68dbe86e2d7a94a862f6323920b1b725ff5595e01834c36cdced4a56ff8b2860ab23321da0fa4d22fb93c6e7dd98013892d61c4c7ea4425de02d695dceb78cb SHA512 6cd2a3c68adf824ef586eb8df52bc878ee32cc26395a0aa47212fbb10e8e435efe5005dad875771910de9839694eb28eabb2e9e548416500ce5d1aa37f27e1f1
 DIST jupyterlab-4.3.4.tar.gz 21797583 BLAKE2B 6b3cf186992edd58dd02e77e58c5e729391468438ab04a18a59b286adb9d8db677c14878eb09cc2d8857dd80915dd7191ae8bd24abaa1f7d96e8c76785ae0a57 SHA512 e9d46ec06f5bca037d45a9c6ef811a1927db3e1fb32996592676f8578563d4a24aaad82facf4f75014740711247d66a8362d2e344537d4952c2af3a9e5bdf9e3
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
deleted file mode 100644
index 356c8cf5a226..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.2.5.ebuild
+++ /dev/null
@@ -1,81 +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 xdg
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab/
-	https://pypi.org/project/jupyterlab/
-"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/async-lru[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.5.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.3[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-cache[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# These tests call npm and want internet
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
-	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
-	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
-)
-
-EPYTEST_IGNORE=(
-	jupyterlab/tests/test_announcements.py
-)
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild b/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild
index 5810f5176d7e..6d30b8da7f2d 100644
--- a/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.3.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/async-lru-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/k5test/k5test-0.10.4.ebuild b/dev-python/k5test/k5test-0.10.4.ebuild
index c70eedb3055d..84bc798c4080 100644
--- a/dev-python/k5test/k5test-0.10.4.ebuild
+++ b/dev-python/k5test/k5test-0.10.4.ebuild
@@ -16,4 +16,4 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-python/libnacl/libnacl-2.1.0.ebuild b/dev-python/libnacl/libnacl-2.1.0.ebuild
index 2ac7ff72c6e3..11eca1a15995 100644
--- a/dev-python/libnacl/libnacl-2.1.0.ebuild
+++ b/dev-python/libnacl/libnacl-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/libsodium
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 7666048625ea..bdc9dd306656 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1 @@
-DIST mako-1.3.7.tar.gz 392052 BLAKE2B 06e5c850f77c85fd5e11a66707f0eb3d318dcc5f5080f6a8f4292270a0195f17a032ecc87cbe418e2364e6ebe74e29ca2b6acbf9cdf0bc2b4992981acc85168c SHA512 b52bcaa688091ae0fb8195e16bec6b4075c1424073cb0aef9cfdd7a92a27386f492181aeeb6c1b30aea57a9c9c4c32dc909133e9ef8e1de858d24c2d816c776c
 DIST mako-1.3.8.tar.gz 392069 BLAKE2B aa0815aecb41435498adc1c62e30d91762bd778ec62c3ff9650f1c4ca43445c5a5381555f0b0af071ffe7bd1ceb9273de1b763303c297383668b98fdb8512734 SHA512 e7fc401526b2b1d69f94be68511aac7e99a0692b1fa8fe8e46894fd6c331bd9e19656715ed6523b04c0bf0e1c78268bb6b54d53f6c7402119ba057c119eccf0b
diff --git a/dev-python/mako/mako-1.3.7.ebuild b/dev-python/mako/mako-1.3.7.ebuild
deleted file mode 100644
index 4ccaed3e6993..000000000000
--- a/dev-python/mako/mako-1.3.7.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_PN=${PN^}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-		EPYTEST_DESELECT+=(
-			test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-		)
-		;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.3.8.ebuild b/dev-python/mako/mako-1.3.8.ebuild
index 8fafab0f5a3e..4ccaed3e6993 100644
--- a/dev-python/mako/mako-1.3.8.ebuild
+++ b/dev-python/mako/mako-1.3.8.ebuild
@@ -18,7 +18,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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 948bb0dbaede..5a0b27a4a6ef 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,2 +1 @@
-DIST markdown2-2.5.1.tar.gz 140957 BLAKE2B 204ba7b388ff4c16db603761aceb1baf4b8b2dac3e4b1e85776c0a8a99223822a41b414535691be579c78f29e146713190fe80c1cf7d1303b7c3c80d5abbb1c5 SHA512 758d2f66c157cd709edc3bd4e67839eaae37db7a2c126451c840e32b150792cd11c1cd25ff8c4d46bff2bed290af8a3c7c87361e2d62009b16a00eb8f549af98
 DIST markdown2-2.5.2.tar.gz 141583 BLAKE2B ec817df668eafcf53da9e56ebcf89391156d4bf603c1bf2e915707cce56eebee90769df83b6fd7b8f77bfbcab9efb26136e7300da4818caf335f316554f5c19f SHA512 776e8ec20a5d9489c59d4ebe5193f3544342fe1c630a3605708b674db3aa3f9ab6ecfa2a918785c29efe3fe97cf83303bb2dd810b447f4b8d46ee81b2a12766f
diff --git a/dev-python/markdown2/markdown2-2.5.1.ebuild b/dev-python/markdown2/markdown2-2.5.1.ebuild
deleted file mode 100644
index 6505cb4e8ca3..000000000000
--- a/dev-python/markdown2/markdown2-2.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Markdown language reimplementation"
-HOMEPAGE="
-	https://github.com/trentm/python-markdown2/
-	https://pypi.org/project/markdown2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.5.2.ebuild b/dev-python/markdown2/markdown2-2.5.2.ebuild
index 590afae8661a..6505cb4e8ca3 100644
--- a/dev-python/markdown2/markdown2-2.5.2.ebuild
+++ b/dev-python/markdown2/markdown2-2.5.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pygments-2.7.3[${PYTHON_USEDEP}]
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 6f34f0119532..6b5aff5834d1 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,2 +1 @@
-DIST Markups-4.0.0.tar.gz 22968 BLAKE2B a39fed89fd63785d0d4348a72c00c8e886726dfc5613b5b359606f8b0c42d2cdfbb5cf3bd1b6ec11621f924c3ac1dbc91db083682b4ba95a6f4baa97824bbd72 SHA512 5868b480debad480100ce632223aeca62ef22a6d9b2af6b4911d3477c94bcd99b88b5bc56f990d24d92de0d2665340e0fce37721f7979938ba947fab2c65900c
 DIST markups-4.1.0.tar.gz 23072 BLAKE2B 87629e0c5b43e9224c10a5371fb723e16a159474df32fd1b6ab5f1413ad8fe9b6ad90e84813292b75cda787dc17cdb6eef574a26df9ac9ec6b684aeb68b9c908 SHA512 f87a2c25e8d27d8f2502980b2a9810fa895ba37731b38579d01766bd390497fe86eab5285b6d5e7ec6aa177f3019995bfce570fb7431bd7eafa71a5c5f91254b
diff --git a/dev-python/markups/markups-4.0.0.ebuild b/dev-python/markups/markups-4.0.0.ebuild
deleted file mode 100644
index a24dcb8c8a33..000000000000
--- a/dev-python/markups/markups-4.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	https://pymarkups.readthedocs.io/en/latest/
-	https://github.com/retext-project/pymarkups
-	https://pypi.org/project/Markups/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN^}")"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/python-markdown-math[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/textile[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs
diff --git a/dev-python/markups/markups-4.1.0.ebuild b/dev-python/markups/markups-4.1.0.ebuild
index be0e1338c1ab..726595a9234b 100644
--- a/dev-python/markups/markups-4.1.0.ebuild
+++ b/dev-python/markups/markups-4.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.9.4.ebuild b/dev-python/matplotlib/matplotlib-3.9.4.ebuild
index d465b2c54ff5..6234e95d143d 100644
--- a/dev-python/matplotlib/matplotlib-3.9.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.9.4.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
 
 DEPEND="
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
index bba4391ef5e7..177724d73b4d 100644
--- a/dev-python/munkres/munkres-1.1.4-r1.ebuild
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 30db1a350be0..177897dc2391 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,2 @@
-DIST notebook-7.2.2.tar.gz 4948876 BLAKE2B 2f145ee832e9eff647f7c736d116cbf684ae63948d8e2e1da2a1d8f2d1d3df23d198719bde9f8a705eb5b77b62dbd654e16ac4de658fbd4a9a809e37d3add8e4 SHA512 b18348e898f6135bea72e759a8137bf32f6ea79619388bd8b3627bd497746a233de69e1b7865bec473a7c49d65f22bc5755afbf79eeb1b4dbb7e0e3e8afe8e7f
 DIST notebook-7.3.1.tar.gz 12777449 BLAKE2B 76e874c692ecdd6cf0b694c5185184e7f6523ef75e65b3dbe512773f4194dfb56fe41bac6b41af6f5a14fcd7c56251efc68b3812fe20460bd4681bedc6331d1a SHA512 af9f4f85163e5494e3e7540d2ef5cc63304018a1afd3ad48158e5b9192ca6c7b1a23760f62ae372fb4a73c081fab1255649ac592b717270f86266712173f500f
 DIST notebook-7.3.2.tar.gz 12781804 BLAKE2B 708d9d2bf43db2de71b4a9b5b1bf664b5922cde036171e7792238e10b6ac05a2ae93dcf478dc7d9d262ab8bbf8ad916695f46eeddd32ea763b53bd8c53009f73 SHA512 71c81e745488985ecb75b37e70d5c3937a824366270e3ee8d45c6bc535614d1e5c0f0f06b5e2b7bc0a8d5f47fa99679d1fe6de86659f494be9ba4d99e9bfe34e
diff --git a/dev-python/notebook/notebook-7.2.2.ebuild b/dev-python/notebook/notebook-7.2.2.ebuild
deleted file mode 100644
index fd03dfb75f53..000000000000
--- a/dev-python/notebook/notebook-7.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.2.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.3.1.ebuild b/dev-python/notebook/notebook-7.3.1.ebuild
index b811487dfa81..34fea67737f8 100644
--- a/dev-python/notebook/notebook-7.3.1.ebuild
+++ b/dev-python/notebook/notebook-7.3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-7.3.2.ebuild b/dev-python/notebook/notebook-7.3.2.ebuild
index 4a05bb599dda..a4aed5a54fa6 100644
--- a/dev-python/notebook/notebook-7.3.2.ebuild
+++ b/dev-python/notebook/notebook-7.3.2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 
 BDEPEND="
 	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.3.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-4.3.4[${PYTHON_USEDEP}]
 	<dev-python/jupyterlab-4.4[${PYTHON_USEDEP}]
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-api/Manifest b/dev-python/opentelemetry-api/Manifest
index a6e357ee17a4..68742ea9263e 100644
--- a/dev-python/opentelemetry-api/Manifest
+++ b/dev-python/opentelemetry-api/Manifest
@@ -1,2 +1 @@
-DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
 DIST opentelemetry-python-1.29.0.gh.tar.gz 1178849 BLAKE2B f26914c14025e77486df0c587318f96c4b27bd2caeacc877091300fc054f4670a642ca6fcafa909b986a97168ab004d4a969a05571ee38ab7797b3b38f4cc91f SHA512 92c90e6a684d8cfab3bba4d72612ccf53ae54cdd9784e3434b25adc3730fe114f21fd7aa21da80edf6e0e7c80b39c64ee31fb16f68b04809289bbf5d49d4ca2e
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild
deleted file mode 100644
index c4d560cc8714..000000000000
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.28.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python API"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-api/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-
-	# Unnecessary restriction
-	sed -i -e '/importlib-metadata/s:, <= [0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-semantic-conventions opentelemetry-sdk \
-		tests/opentelemetry-test-utils
-	do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.29.0.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.29.0.ebuild
index 6764b9297c21..c4d560cc8714 100644
--- a/dev-python/opentelemetry-api/opentelemetry-api-1.29.0.ebuild
+++ b/dev-python/opentelemetry-api/opentelemetry-api-1.29.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-sdk/Manifest b/dev-python/opentelemetry-sdk/Manifest
index a6e357ee17a4..68742ea9263e 100644
--- a/dev-python/opentelemetry-sdk/Manifest
+++ b/dev-python/opentelemetry-sdk/Manifest
@@ -1,2 +1 @@
-DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
 DIST opentelemetry-python-1.29.0.gh.tar.gz 1178849 BLAKE2B f26914c14025e77486df0c587318f96c4b27bd2caeacc877091300fc054f4670a642ca6fcafa909b986a97168ab004d4a969a05571ee38ab7797b3b38f4cc91f SHA512 92c90e6a684d8cfab3bba4d72612ccf53ae54cdd9784e3434b25adc3730fe114f21fd7aa21da80edf6e0e7c80b39c64ee31fb16f68b04809289bbf5d49d4ca2e
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild
deleted file mode 100644
index bc3461eefdc1..000000000000
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.28.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Python SDK"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-	)
-"
-
-# Tests cannot handle xdist with high makeopts
-# https://bugs.gentoo.org/928132
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		"${PN}"/tests/resources/test_resources.py::TestOTELResourceDetector::test_process_detector
-		"${PN}"/tests/metrics/integration_test/test_console_exporter.py::TestConsoleExporter::test_console_exporter_with_exemplars
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests
-}
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.29.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.29.0.ebuild
index 499009fb6d59..bc3461eefdc1 100644
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.29.0.ebuild
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.29.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-semantic-conventions/Manifest b/dev-python/opentelemetry-semantic-conventions/Manifest
index a6e357ee17a4..68742ea9263e 100644
--- a/dev-python/opentelemetry-semantic-conventions/Manifest
+++ b/dev-python/opentelemetry-semantic-conventions/Manifest
@@ -1,2 +1 @@
-DIST opentelemetry-python-1.28.2.gh.tar.gz 639603 BLAKE2B 6c185c91cd3f31c58f8f1f73edfbe1b5b242bf8ac855e573a40b6f3ea73dc558b40d89785a9e24d61c2b4950a008c5bc51f319013f955877d14028f9b88101b7 SHA512 49f97ffb1bec390eaa9181bfc16eb0c5b1f7b50602a5edbcf4851fb7077685eff3f261738143be59184e6a01c283fac4f766602eebd9b6daea74005cf3e0c4d9
 DIST opentelemetry-python-1.29.0.gh.tar.gz 1178849 BLAKE2B f26914c14025e77486df0c587318f96c4b27bd2caeacc877091300fc054f4670a642ca6fcafa909b986a97168ab004d4a969a05571ee38ab7797b3b38f4cc91f SHA512 92c90e6a684d8cfab3bba4d72612ccf53ae54cdd9784e3434b25adc3730fe114f21fd7aa21da80edf6e0e7c80b39c64ee31fb16f68b04809289bbf5d49d4ca2e
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild
deleted file mode 100644
index 32a1f4e1ea0d..000000000000
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.28.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-MY_P="opentelemetry-python-${PV}"
-DESCRIPTION="OpenTelemetry Semantic Conventions"
-HOMEPAGE="
-	https://opentelemetry.io/
-	https://pypi.org/project/opentelemetry-sdk/
-	https://github.com/open-telemetry/opentelemetry-python/
-"
-SRC_URI="
-	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
-	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	for dep in opentelemetry-sdk tests/opentelemetry-test-utils; do
-		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.29.0.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.29.0.ebuild
index 1da141e261fd..32a1f4e1ea0d 100644
--- a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.29.0.ebuild
+++ b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.29.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pbs-installer/Manifest b/dev-python/pbs-installer/Manifest
index 1916cf97048d..f7ca79ef478a 100644
--- a/dev-python/pbs-installer/Manifest
+++ b/dev-python/pbs-installer/Manifest
@@ -1,2 +1,2 @@
 DIST pbs-installer-2024.10.16.gh.tar.gz 79499 BLAKE2B 749a0ecc54a4df1e5989eee54b874b92bd7592307fe9bc0a13aa77dea96dcec8b6ff7b5fcfd10e354eaad21054cbf264c718fa7d692c6ee2df348f9217ca89ca SHA512 1b6bfc64bf311d03cf318365b1d16968ac599b40b247970477d6555791407bc104813bd60f82e30d88a13cd37873fef269a98640ee301f86028e6ddf7d097958
-DIST pbs-installer-2024.4.24.gh.tar.gz 73601 BLAKE2B f56483899dc7795d0334b4698e08f71799ede456fdb7f78accc9278f32437a6b785055ec0b61854c6ec05663bc3b4bd41be8d45138a5793dcab35aa80da32de8 SHA512 7bd440e1522a1c826dcfac801763ad256d79f60315a30828082ea65169e5f4cc8527866491a5c4d84d847150ed6f90167b550104031f417e0103640e2c291aeb
+DIST pbs-installer-2024.12.19.gh.tar.gz 82721 BLAKE2B b6a6ed17b4d1e55d9160361f45d4f15b3f8f12a6fa97208a2428c0c9b7f3b3f46e846f01d03539df86f5a4b109623a12133169880445aa386623b3f9e74935c3 SHA512 481ce48d4ba823d13e6c488aa146725e7406baf7f1d42a8561273d69311174e032930fa5d4d9c4f6edd3ce9ea866320e0266763a2b8b8456ed2f052149eb892a
diff --git a/dev-python/pbs-installer/pbs-installer-2024.4.24.ebuild b/dev-python/pbs-installer/pbs-installer-2024.12.19.ebuild
index 9d3568a97650..9d3568a97650 100644
--- a/dev-python/pbs-installer/pbs-installer-2024.4.24.ebuild
+++ b/dev-python/pbs-installer/pbs-installer-2024.12.19.ebuild
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 27a648c89f1f..fc24c9227987 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1 @@
-DIST python-phonenumbers-8.13.51.gh.tar.gz 4916017 BLAKE2B ded6fc61bfc619d79d31c12cf1bb13a13b96182674373aebd66a9ac02e7fda957c59807af6c6aa31e373c6af9cdca6ec8e10a575877121cfcef3cbcbd4419243 SHA512 fab5542107ef69fc94ed5f4a74425ef6be6277b88339ae882782c6cf35254e13f0d351f704dd4b84d16a82a40121b3681abd4599b85341284ef42b3f5af19803
 DIST python-phonenumbers-8.13.52.gh.tar.gz 4916262 BLAKE2B 51267704170ca614f93f8dee5cc1bbe3a8ef833e3aaf7d9ba48e9715eb1f37a7742f942c3bfb543f140d9c08d83006fc698c34fa3264a3b9e9d626bf741b586b SHA512 ac2fa94cffeabc18197a2ca0e2e5ac62f4584e417fb1bee0d52eaeec71d7ce5f1d12722f0f5a48b7d2ff89cfb394f49ec02006a7e8247bb20b2375d0a617132c
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild
deleted file mode 100644
index bc08ce78c87e..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.51.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.52.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.52.ebuild
index a54d1a1f9af6..bc08ce78c87e 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.52.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.52.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyaml/Manifest b/dev-python/pyaml/Manifest
index 569afe76e157..f61ae4547bda 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-24.9.0.tar.gz 28111 BLAKE2B ff3dcf2ece6e3b03b8f9837e7ea7db04cd1bcffd94e0101c73e5cc38b5c140e65f45c9936b5353fe73950d8b88ee0265c8be290a795ac6e844e64fb853faae18 SHA512 a10026d2e69c5bbfabbe5ed02814fecb8838c969761eec0137a93465478abc518ba83cfae4b9df643040aa5fe46a62fc9def1fd763830ae8d2cfdce3b3061365
diff --git a/dev-python/pyaml/pyaml-24.12.1.ebuild b/dev-python/pyaml/pyaml-24.12.1.ebuild
index 88bd2947fea6..3d729248811f 100644
--- a/dev-python/pyaml/pyaml-24.12.1.ebuild
+++ b/dev-python/pyaml/pyaml-24.12.1.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/pyaml/pyaml-24.9.0.ebuild b/dev-python/pyaml/pyaml-24.9.0.ebuild
deleted file mode 100644
index 3d729248811f..000000000000
--- a/dev-python/pyaml/pyaml-24.9.0.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/pycurl/pycurl-7.45.4.ebuild b/dev-python/pycurl/pycurl-7.45.4.ebuild
index 7fdb8551b2f9..41f97cc7ad27 100644
--- a/dev-python/pycurl/pycurl-7.45.4.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pyscard/pyscard-2.2.0.ebuild b/dev-python/pyscard/pyscard-2.2.0.ebuild
index 449728e3fb54..dc26e38164f1 100644
--- a/dev-python/pyscard/pyscard-2.2.0.ebuild
+++ b/dev-python/pyscard/pyscard-2.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	sys-apps/pcsc-lite
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 544c27cdeca4..36d11be52470 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1 @@
-DIST pytest_asyncio-0.23.8.tar.gz 46920 BLAKE2B 6b7a66e6ef28f2c7a874a115e0346b3803051df5d57e5b8ba35480982231a804adfbe8a4a2c605847730ea940fafe9df2aa94f5081b43aa753b64c3e2ea027a5 SHA512 68f23458c5f22bdb75a6a0a12f185b1f22c5231c0cdcd84806781419f5c866844e851398d771c5932af4a42b5dfdcce6624181f2c0d2f70187bb5feed0ba7c97
-DIST pytest_asyncio-0.24.0.tar.gz 49855 BLAKE2B 55813b655252f2c1fbe1658a0a2d739bb03a56794297dde9cf598b8200c0d3aa7437af7a241a821eff47ffe57841142adb93c6434c920cbd1d26b33a8ac8fe96 SHA512 abf2442afb9f5933b223e920c0b107d5781350f2a9c2e58ca141494a4f391acf97f2e377db1fc67b5213031bf371f222dc9c4718ff3c6b5985f5e49913f03cb7
 DIST pytest_asyncio-0.25.0.tar.gz 53298 BLAKE2B e29641f9e0ae24aac80bca7eaa14258d0bdfa6080abeaedd38ffe121cb9a9bf5886da2a38a3033010fcb47f4c2aee0eb17b0f63cee020c5ae81e8334486c66b7 SHA512 162d1693c82c4be96cf20cfeb075c4e434e897cdfc172564b8b2513b362a6bbf54d8be6da4a63a7de34236b6c55eb515e60b994198c07a5c63a63333fe019932
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild
deleted file mode 100644
index 54663d3725a0..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.23.8.ebuild
+++ /dev/null
@@ -1,51 +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-5.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.64[${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/modes/test_legacy_mode.py
-		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_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
-		tests/test_pytest_min_version_warning.py
-		tests/trio/test_fixtures.py::test_strict_mode_ignores_trio_fixtures
-
-		# TODO
-		tests/test_is_async_test.py::test_returns_false_for_unmarked_coroutine_item_in_strict_mode
-	)
-
-	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.24.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0.ebuild
deleted file mode 100644
index 80a46dba751a..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.24.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-3.64[${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.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
index 55e59d08726b..7972912f463d 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.25.0.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/pytest-freezer/Manifest b/dev-python/pytest-freezer/Manifest
index 98fb3f0efcc8..a8480c538f2f 100644
--- a/dev-python/pytest-freezer/Manifest
+++ b/dev-python/pytest-freezer/Manifest
@@ -1,2 +1 @@
-DIST pytest_freezer-0.4.8.tar.gz 3212 BLAKE2B b16aa51c6a77f639eddf95c0a7e26c02f36b039b327ff86835f6223e5cc46c9d77c563705644d91f96310f2dd892182262c2c2cf6d85cf8d711387ca8eed7cb2 SHA512 b5b3665dcc0400787ea61be3ea59437e126325697874e4190abd9821f9c5a5620ca6af3602721fb7b777037fc191aef6aac37be5d00cc38e7c2de808cdf5bf67
 DIST pytest_freezer-0.4.9.tar.gz 3177 BLAKE2B 77c0c115adf2c10e8078d5117213a857ee838665b59344d155f2ba1f6ed1a8ba55fa877cd5cee333ec62f39f44b2acd2e2863c593d498f041087f9ecf9de684a SHA512 cbe874b4f855a7badfdf214f53a5af403ca99445e66b62ec4a26ee1da72dfe2ec280d2c0b9263fb1a398654e7214418956b4f68421e1689a7cfb3b9ed9a1b124
diff --git a/dev-python/pytest-freezer/pytest-freezer-0.4.8.ebuild b/dev-python/pytest-freezer/pytest-freezer-0.4.8.ebuild
deleted file mode 100644
index 6aaaed56bebf..000000000000
--- a/dev-python/pytest-freezer/pytest-freezer-0.4.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin providing a fixture interface for spulec/freezegun"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-freezer/
-	https://pypi.org/project/pytest-freezer/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/freezegun-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-freezer/pytest-freezer-0.4.9.ebuild b/dev-python/pytest-freezer/pytest-freezer-0.4.9.ebuild
index aa3b28cf31c6..70363e8d5ef0 100644
--- a/dev-python/pytest-freezer/pytest-freezer-0.4.9.ebuild
+++ b/dev-python/pytest-freezer/pytest-freezer-0.4.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/freezegun-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 21b014265ae4..a92ef63397c1 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1 @@
-DIST pytest_subtests-0.13.1.tar.gz 15936 BLAKE2B 6301c0dae6eccd9f20acf6c08e0b1b77c7e80a64e4558628cc85e0d6c202d0b2bb0d7be27f930d7bf68ab8c4c2076e7fe68ab24b9b45cb22fbb3a4b31fd7b4e7 SHA512 c1c92a7a608710fd75a3a67cfd620ec257d7b1fa191fc4788a747ffebdf3973dde9407ed85e1842f15947558f6ec7c15e5c13ad84ce59489398386d6578f1caf
-DIST pytest_subtests-0.14.0.tar.gz 17363 BLAKE2B 3b0ebe86b0acd1e2f00c75f11a2d04f8269774ca44f2b55b337a2c1d68da9d1636e5c159e4e554c21f27f8a80adc91dd36bee7d8f2ec359340e9cc5de0edd702 SHA512 53306f887fdd500226991394624fac06c60dd1339e8689f041f5b14ee6ad75470a08cca48230dab774f04d75f5ae5a63c2f3f08231e5ae61a7d928f6e23781b6
 DIST pytest_subtests-0.14.1.tar.gz 17632 BLAKE2B 5a9013e1126ce921b1cc5932e2e743827f382f2566fb573c75bc040e806dd64e196a1c49ad1e4eabf13925ed82e68749e6d842f0d03098ab6bce4857134c581e SHA512 f79afa0747334ad885e4e592b2b4ff1381d00fb282ab24c785afe681120e2a9670dbcd7627bd9041cd24922a96146d8be30f0e221b4a6ee8bef8aa7b52038544
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.13.1.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.13.1.ebuild
deleted file mode 100644
index 57f04a8aae37..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.13.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_subtests.plugin
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.14.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.14.0.ebuild
deleted file mode 100644
index f91ee1b59cf8..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.4[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_subtests.plugin
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.14.1.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.14.1.ebuild
index f91ee1b59cf8..fa109cbc1e10 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.14.1.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.14.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-box/Manifest b/dev-python/python-box/Manifest
index 68a38a593fec..64bfd306d489 100644
--- a/dev-python/python-box/Manifest
+++ b/dev-python/python-box/Manifest
@@ -1,2 +1 @@
-DIST Box-7.2.0.gh.tar.gz 87699 BLAKE2B d6f033919e5451adfdcb0c14c28a47e25b619eb531280a39b68912179ad3a21638d4fadd6dbee2b09bc445b1adc2dd31e042d1e816dc5fc36098ea5eadab8a30 SHA512 8f2ec95a0539c8000d08353eccd66dd9de4049408b0cef9095f3bf98486424214e1d47ef5c408e425c5c2958652624efa512701138d91d51356f07795c508b9f
 DIST Box-7.3.0.gh.tar.gz 87791 BLAKE2B eba82f4fa083f2f7725547254143d86d034d1dbf0ad540eb4cef8eb387846053a44a7b7dc6b94878a124f98336cade4c6a64c89beb779e5db6008393b721ecc9 SHA512 9425dc339abac6649f9e78b279720ce191559e1629eb4451fc1a63495df1d5c64bf20a339407bbfc6f8e64d9def4accf312087958880a5300c83369ee9d6ceb4
diff --git a/dev-python/python-box/python-box-7.2.0.ebuild b/dev-python/python-box/python-box-7.2.0.ebuild
deleted file mode 100644
index a93ff99cbdfa..000000000000
--- a/dev-python/python-box/python-box-7.2.0.ebuild
+++ /dev/null
@@ -1,58 +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
-
-MY_P=Box-${PV}
-DESCRIPTION="Python dictionaries with advanced dot notation access"
-HOMEPAGE="
-	https://github.com/cdgriffith/Box/
-	https://pypi.org/project/python-box/
-"
-SRC_URI="
-	https://github.com/cdgriffith/Box/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+native-extensions"
-
-RDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use native-extensions; then
-		# a cheap hack, extensions are auto-disabled if Cython.Build
-		# is not importable
-		> Cython.py || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	rm -rf box || die
-	epytest
-}
diff --git a/dev-python/python-box/python-box-7.3.0.ebuild b/dev-python/python-box/python-box-7.3.0.ebuild
index 72cca346e81e..a93ff99cbdfa 100644
--- a/dev-python/python-box/python-box-7.3.0.ebuild
+++ b/dev-python/python-box/python-box-7.3.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index 84eb6ac8a78e..ee37365d25df 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1,3 @@
 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.34.2.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
new file mode 100644
index 000000000000..ec07eeef8a28
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.34.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{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-socks/Manifest b/dev-python/python-socks/Manifest
index 94edf03b58b8..b5fe21768b01 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,2 +1,3 @@
 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.6.1.ebuild b/dev-python/python-socks/python-socks-2.6.1.ebuild
new file mode 100644
index 000000000000..d729106a0575
--- /dev/null
+++ b/dev-python/python-socks/python-socks-2.6.1.ebuild
@@ -0,0 +1,48 @@
+# 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/pytools/Manifest b/dev-python/pytools/Manifest
index 98c183ed5e94..64ceb3a0ea78 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,3 +1,2 @@
-DIST pytools-2024.1.19.tar.gz 79674 BLAKE2B 8a6018e2d57f5c51481e96719c50c6a388c65346b937d8b12812315937c57dfec780f1b9a7f8a0b293336e013bcc38c1537a920e30916d5f54d4e8ba9a8d2f73 SHA512 a62b234f279001458428a0cba6d7a0ddcc04e631037ac5fd425eb6adb6675ce5e47c296ab1b20dcf63f25573f84ab9e92f806b221574fd81773968cbf2ab7033
 DIST pytools-2024.1.21.tar.gz 79853 BLAKE2B bf592feb22fa6c1c43a924cc54e7b17320705d823954f2179242b8db2ef893e306c5f671eeb63c66b5a97b18c9c3fb20b9b38516f48ea3cd51b419fa51739981 SHA512 2159d982a9b2272d7bc172a48d4cf9d7a9ce278ec99cc2cfd47cfb6162f543b774a2c717b312155c9332e7d96782914e42443cb90ebd9a1f342d54018f2c34aa
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
diff --git a/dev-python/pytools/pytools-2024.1.19.ebuild b/dev-python/pytools/pytools-2024.1.19.ebuild
deleted file mode 100644
index ef529a1f1963..000000000000
--- a/dev-python/pytools/pytools-2024.1.19.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-
-# NB: numpy & siphash24 are an "extra" (optional) deps
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
-	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2024.1.21.ebuild b/dev-python/pytools/pytools-2024.1.21.ebuild
index 863cfd5562a4..72ef10eb606a 100644
--- a/dev-python/pytools/pytools-2024.1.21.ebuild
+++ b/dev-python/pytools/pytools-2024.1.21.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 # NB: numpy & siphash24 are an "extra" (optional) deps
 RDEPEND="
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index 53753e11c066..722d4adfb74f 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1,2 +1 @@
-DIST scikit-learn-1.5.2.gh.tar.gz 6982418 BLAKE2B f1fdc37cdbc7625f5240b565b37b8213e1f6a21cb04886efaa2f9dad598eaa3c9bf567000cb51bcb78057172131ab3534134bb7382ed0b1df5037919d45fd65e SHA512 ed014858a9dd75765b761df03782048035228f012773d70ca3355d049d096707286b8b3d0139b88268266e8f0a6b4d430968495a87636975d094b161b9f0d712
 DIST scikit-learn-1.6.0.gh.tar.gz 7058791 BLAKE2B 57a81223d4cd2ac60cf00829f0e9b3fc404341428ec5ebbdf187f6c69213d90bf541ee6bf69a7dbe6e68225d34cf393302b098cc62e44068515b22d9e6462549 SHA512 7301503d581f908d7d70c708c44d5ec39567628c9f05a4135d69864a6bff6252fe1af6aac9c87c4c829c7e98008bab6fe964bcab6a3bb617996dc8368bb4fa60
diff --git a/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild b/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild
deleted file mode 100644
index 0d49463f4ad2..000000000000
--- a/dev-python/scikit-learn/scikit-learn-1.5.2.ebuild
+++ /dev/null
@@ -1,74 +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=meson-python
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="
-	https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn/
-	https://pypi.org/project/scikit-learn/
-"
-SRC_URI="
-	https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-	>=dev-python/numpy-1.19.5:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/threadpoolctl-3.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# For some reason this wants to use urllib to fetch things from the internet
-# distutils_enable_sphinx doc \
-# 	dev-python/matplotlib \
-# 	dev-python/memory-profiler \
-# 	dev-python/numpydoc \
-# 	dev-python/pandas \
-# 	dev-python/pillow \
-# 	dev-python/seaborn \
-# 	dev-python/sphinx-gallery \
-# 	dev-python/sphinx-prompt \
-# 	dev-python/scikit-image
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: floating-point problems
-		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
-	)
-
-	rm -rf sklearn || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs sklearn
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete || die
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/scikit-learn/scikit-learn-1.6.0.ebuild b/dev-python/scikit-learn/scikit-learn-1.6.0.ebuild
index c40a4af5b1fd..6d185e1921a3 100644
--- a/dev-python/scikit-learn/scikit-learn-1.6.0.ebuild
+++ b/dev-python/scikit-learn/scikit-learn-1.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index c60ff3c5a5a8..2309253a5558 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
 DIST sphinxcontrib_programoutput-0.18.tar.gz 26333 BLAKE2B d1f1da158296869efb9dfb98979069a7692f1742053ba29de611d2df2e239200ecbed2009aec6e9264af30a2056a02d23f257d8b66367110304bc7a3a7f1812f SHA512 2ead065812bfe85147a025e4e541880b25d5876a584406130fa3423009496b6c7cf482f86af92d22363d0893ce767d2957112e7c41bd8005fa41e043399e4d0e
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
deleted file mode 100644
index ff1a3d10372e..000000000000
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extension to sphinx to include program output"
-HOMEPAGE="
-	https://github.com/OpenNTI/sphinxcontrib-programoutput/
-	https://pypi.org/project/sphinxcontrib-programoutput/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest --pyargs sphinxcontrib.programoutput.tests
-}
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
index 1163059b8eba..516745d642b5 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.18.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index a51597243640..be349442abce 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,2 +1 @@
-DIST sqlparse-0.5.2.tar.gz 84951 BLAKE2B a270c94bc54de65f7c18549c262e40348cf7961cdd44c33dbcccdc7da59fe89ae1e746982b5f70cf859a2e16ca7721537f976ebce31f9664873c7182ebdf205d SHA512 d674996be8ef89309d73ae924904e3dbe09cfe6d9f2278d5aec43425571a8300785de96efd0936be82e49ec725668c234fd8a4a99b387832c4acce45ef0c8c62
 DIST sqlparse-0.5.3.tar.gz 84999 BLAKE2B 034c19eb1bb057c755a61248dc74c6e114d2bf2633f33d15b4a012ec4734c0374276f0bc8347706f6e48ef13d130c6769ceb9df04f09fabde2cb82bdb819e9a4 SHA512 219c4a3874606b6b3270fb507d89822412b51d8d120d50682fa683ab127fe05538256a575b5b29ee1a9f88be51ad46999e7c2ad2bb84a39e96ae6d2401eaffcd
diff --git a/dev-python/sqlparse/sqlparse-0.5.2.ebuild b/dev-python/sqlparse/sqlparse-0.5.2.ebuild
deleted file mode 100644
index 847d0bcb3eff..000000000000
--- a/dev-python/sqlparse/sqlparse-0.5.2.ebuild
+++ /dev/null
@@ -1,22 +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="A non-validating SQL parser module for Python"
-HOMEPAGE="
-	https://github.com/andialbrecht/sqlparse/
-	https://pypi.org/project/sqlparse/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
diff --git a/dev-python/sqlparse/sqlparse-0.5.3.ebuild b/dev-python/sqlparse/sqlparse-0.5.3.ebuild
index 325462cec3dd..847d0bcb3eff 100644
--- a/dev-python/sqlparse/sqlparse-0.5.3.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.5.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs/source
 distutils_enable_tests pytest
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 1aba09329931..998bad17843f 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,4 @@
-DIST translate-3.14.1.gh.tar.gz 1174769 BLAKE2B 3be39dbf964307ebaaca651f06683ecf67e3aaad9ea3774a68190f117867e8a5dc8ba732242fc5e34d53e629474bc038e2dbb2b8383fb914c0aa8325a6a3ac39 SHA512 4052c2062934720b347723a88f2a9fb187c03c064efa88a95992860b196637ed805e2c00986f0337253f56b3ce9f7e064ef33c12f9ba3da4af01b10257449c30
 DIST translate-3.14.2.gh.tar.gz 1175450 BLAKE2B db13e59036bd75a62847c68c4e2633a17152def48ccfd1d36531a0325b4b5d819711dab1cb3cfc23abc2e7201b348836434428ed155e6e593273ff8750038faa SHA512 7ae64bd93459b29e6a341ea8ded2993e02e277dbba48a0638eda28fff4dfcc9b490d0a669e277cb75c395f385e5a54feb0665919c27b1ab7c5cffd0add109d27
 DIST translate-3.14.3.gh.tar.gz 1174793 BLAKE2B 9aad67c2bc390083dcacca53a41b99adeff679db4d576c054d8298da0e5114e5204128c94ee924cf4e5851378b3cec7b99d52b2dd12c5ece86562d45d05c205d SHA512 6f584ea46aceb4080eda2b05e3fbe51d76667d8afcac8da4e0b7644965aa833617db031329e315cbb18c6194e289a9054f127814372e97535bc40d765d65316e
 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
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild
index 79a925032078..be482b873cad 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.14.2.ebuild
@@ -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/translate-toolkit/translate-toolkit-3.14.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
index 7184c2b03764..374508319ccc 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.14.1.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.14.5.ebuild
@@ -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="
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}]
+	>=dev-python/cwcwidth-0.1.9[${PYTHON_USEDEP}]
 	sys-devel/gettext
 	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
 	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 863fa7b4e764..bb0c93242659 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -7,6 +7,8 @@ DIST uv-0.5.10-crates.tar.xz 46466896 BLAKE2B 94093c9d74732dba6516a80fa24c3af8e9
 DIST uv-0.5.11.gh.tar.gz 3145749 BLAKE2B 7473182f05accb38a2253327f95d874a62defdd43f7b1937e0f03674882c2fc2daaca5b5087a870bc72200342fd0b423c7ffc29dea91959cc6237c241e5b6c73 SHA512 a6f8fea5d30a387e3f7efcdd3b5f721567d48fa55f16ac67cd26f67eff17cd892ba1f4e0f774f8911e679100bcc3e2a9adb8fde7d1082cf3a1419f4227e85a03
 DIST uv-0.5.12-crates.tar.xz 46555948 BLAKE2B 24a69983cd75b3bf3ad7c15503afc4bde7b80a70789630e6b123bf91abffb15b18803d613d81d354842de4a1b522db9aff1c9821722ff6f7188c43577df625b1 SHA512 a30e535e40a67cac18fcdaf9215a43cf870d4d992be9c4a6863c9264d6b8cb29fcc79d11f8757aa70c6701e4e9f06a8281c188b34c0f5ed52d07c034cff8b98c
 DIST uv-0.5.12.gh.tar.gz 3174790 BLAKE2B 5b9ddf4d70e5534731bc50ba168aaa16a3a5321887613d6cc4141e767f1122f8c5bcaf3a2ace3be11e28e61a8eb3ddd7d910a40071ae3cadb57cffbefed087df SHA512 9623b8ece53a4ab9fa3ea2a5f4cffdc3da13645a460b59cd97dcbda9a48247bfbd9fb2316363c7f9c78869cd888511cbcdc528413e6be1ffbca8d9ece210d5ff
+DIST uv-0.5.13-crates.tar.xz 46487696 BLAKE2B 88805f95f170f3417fdc9c98b09fab73d9196ba105edd22eaea261afadf962503acdf1dee349992c16932354f8e44166f2c241ef384f8e06b8f869d89f7f4d79 SHA512 d9b84064f628e5ff1858964e61c5288ab2247c7590a745d7e7d3b00eebc457bb0e52bd8aa5b9d82b37519089d098ba0e0267dc97118c55d1fb86548b2241ddaa
+DIST uv-0.5.13.gh.tar.gz 3175346 BLAKE2B 86dc0b635062e17b7cb35529ba71b173b3e4d89ba8cbc747a61c3eb03a2fc751726af1f07cc20bc31b759706a893a10b9ceda9ab579dc5d1ac84a61be9ec7d4c SHA512 9dfc771c203fdb4440e38a4e8ec6d4221030c2d2eca463fb335ba8651fe702430c7497d58a0928215e3e17a20719db252959899874a38d13016f377185b5f49b
 DIST uv-0.5.6-crates.tar.xz 46263172 BLAKE2B 73b1d2dc957f89f923dda09a8c038426041292c442ce253ff9110f996cd1e1f892a5a438d8e1c894fc0d823401cced0ddc8ad88b5e6a83199af7055a04ce85dc SHA512 c9d4f8085416bffb1e1872fd907d15a50cae0c0c5fba994d27b3acdc3c836dffd771558246573af4bb7467353a031ea56018d5ae1fbdffa4f63988462de00343
 DIST uv-0.5.6.gh.tar.gz 2952255 BLAKE2B b815b60b99f959751f5839365b8b210919247ad99bff93ee4d202bc152bd06b83a62914cfbf341bfddb5b2c87d9e546c5e2a6d1baff1599d0218160ee89de504 SHA512 fc8c7f4f60a3d2ce997341450daf20ad039ef379ac5dd4575f8db0327284bd8278419b66f8f9695f2701a9579ab004b5b60476bd8dc4c27314211f795118bc5a
 DIST uv-0.5.8-crates.tar.xz 46445240 BLAKE2B 119e471d7f9a851179e2e5d9cd15cb94476355e27db36b05378036b7f9a3e0021a33a2fd29ed9e5a67cd7d962783b3ea96145ca9092da0a6a114899ff2b712fd SHA512 d517fdc9e48b4cb4acacf1d3c986c7e348ee65c89cb5bdbd9c3947f66d450f7f59b5a4f5f0f45560d5241bc8f7756039014cf350a8aea22be876c197759e5aff
diff --git a/dev-python/uv/uv-0.5.13.ebuild b/dev-python/uv/uv-0.5.13.ebuild
new file mode 100644
index 000000000000..7eaa8c0ef6ae
--- /dev/null
+++ b/dev-python/uv/uv-0.5.13.ebuild
@@ -0,0 +1,170 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;c909fda63fcafe4af496a07bfda28a5aae97e58d;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;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=${PV}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-3.0 Unicode-DFS-2016 ZLIB
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	rust_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_configure() {
+	local myfeatures=(
+		git
+		pypi
+		python
+	)
+
+	cargo_src_configure --no-default-features
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+
+	insinto /etc/xdg/uv
+	newins - uv.toml <<-EOF || die
+		# These defaults match Fedora, see:
+		# https://src.fedoraproject.org/rpms/uv/pull-request/18
+
+		# By default ("automatic"), uv downloads missing Python versions
+		# automatically and keeps them in the user's home directory.
+		# Disable that to make downloading opt-in, and especially
+		# to avoid unnecessarily fetching custom Python when the distro
+		# package would be preferable.  Python builds can still be
+		# downloaded manually via "uv python install".
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-downloads
+		python-downloads = "manual"
+
+		# By default ("managed"), uv always prefers self-installed
+		# Python versions over the system Python, independently
+		# of versions.  Since we generally expect users to use that
+		# to install old Python versions not in ::gentoo anymore,
+		# this effectively means that uv would end up preferring very
+		# old Python versions over the newer ones that are provided
+		# by the system.  Default to using the system versions to avoid
+		# this counter-intuitive behavior.
+		#
+		# https://docs.astral.sh/uv/reference/settings/#python-preference
+		python-preference = "system"
+	EOF
+}
diff --git a/dev-python/watchfiles/watchfiles-1.0.3.ebuild b/dev-python/watchfiles/watchfiles-1.0.3.ebuild
index 0daca7eee6df..578930be04fd 100644
--- a/dev-python/watchfiles/watchfiles-1.0.3.ebuild
+++ b/dev-python/watchfiles/watchfiles-1.0.3.ebuild
@@ -92,7 +92,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index edf44932dd3e..a0adafdcec59 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,2 +1 @@
-DIST weasyprint-63.0.tar.gz 491295 BLAKE2B f25a777a5057502f5a056417037411325c7600db2f1609c854c43ade98a1d7bda6a5c4663e7221e3b8002dfa763aff1b104541ee4cb55b0079cf973f256efe6d SHA512 79384ead532dbcfc561d2c490fbc04d7d0d11ed3c589fe375e9b2bb43e57a28c5bcfeaa7a6fb8daa1b031ce56720775e7b558c0a6ac5d195dee4310a3a3cab8d
 DIST weasyprint-63.1.tar.gz 491880 BLAKE2B 564c52abe3299aa2c51733c883c59ea0581953e067c003377cf0456412bd0cc49f38a03ea46f9cc6e3a3eb4c8df4daa1359996e0525bd9420b1720a26a393877 SHA512 1fda3126dd5c028b42515819f58153092d1607ea5a327a8668cd11ce44aa2b73d7340c04825ce80486881ac1b0dcfe789ffaec277f7a81465efc9067b9b9c87c
diff --git a/dev-python/weasyprint/weasyprint-63.0.ebuild b/dev-python/weasyprint/weasyprint-63.0.ebuild
deleted file mode 100644
index 580d9a4f19e9..000000000000
--- a/dev-python/weasyprint/weasyprint-63.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=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-9.1.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tinyhtml5-2.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/weasyprint/weasyprint-63.1.ebuild b/dev-python/weasyprint/weasyprint-63.1.ebuild
index b738a0b80ce9..cc23c698018c 100644
--- a/dev-python/weasyprint/weasyprint-63.1.ebuild
+++ b/dev-python/weasyprint/weasyprint-63.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 576f99e67997..c6c7fb5e9c37 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,4 +1 @@
-DIST yarl-1.17.1.tar.gz 178163 BLAKE2B 88d864944829e4b69ae346b0c6eb205969e9f9d2326d46f1eb4ed0506516f71730731763daf56e8230b699d5775c053c4750f6a770422cad392199ba5c099074 SHA512 5c1c25a8b828694a6538e7a07d01fc5d14238b279f8db4d76ee247a4f043b3e836c292cf6a77bb5ba544ec43dee449f2417eb0a5aaed6954449043a0fea3f811
-DIST yarl-1.17.2.tar.gz 178947 BLAKE2B 5cca5ef7fa2745f76c72ba0fbd54a62344f8961d365f6777812cec6c44d42d3a573f25db25b3afe7ff93775aaff8c4f71a6cf13ed86061e14e37cab984c0d7d8 SHA512 d99cfb5bb89f60b41cad021af5971e42439f47c77b24de0ab43c372cedb15ee18bfca478889f002a322e24838e2978c30923f965ea879ba52549644b2a957348
-DIST yarl-1.18.0.tar.gz 180098 BLAKE2B bd49cb019cb0a7572ddb562aaf599929bfcd2f67758631d93fc0db90ea60919852f90ea196d6a5bdba9d03661d2bcbe82e2d51284c0ff6acc76b269e99bed5b5 SHA512 061b4cdb5d18718e847a45c5fdc854f75294be2198d5d803bf473eae06467a56188e36c672d31f083c7a96f213db831fe79c92479a43b63a40cc4a007062c0aa
 DIST yarl-1.18.3.tar.gz 181062 BLAKE2B 41e0e6173bb257b643d7678e3011af7ea7f6ac8100bd68aae6e5a9af95e36ae95f83c516a11169fd1d1d669742b3a8878267533c81289ec56a66bb0d53b2db25 SHA512 1686c5ef1b5f3e1cebd121abb7916e45f4a9b08d941a80c34861e87f6121187ee7a553a373405a9fef2332177adf55ffe89bc9a3cabbf24e31905357fdeceba3
diff --git a/dev-python/yarl/yarl-1.17.1.ebuild b/dev-python/yarl/yarl-1.17.1.ebuild
deleted file mode 100644
index d0d24dafa8fb..000000000000
--- a/dev-python/yarl/yarl-1.17.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	dev-python/expandvars[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local -x YARL_NO_EXTENSIONS=0
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# benchmarks
-		tests/test_quoting_benchmarks.py
-		tests/test_url_benchmarks.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local opts=()
-	# note different boolean logic than for backend (sigh)
-	local -x YARL_NO_EXTENSIONS=
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-
-	rm -rf yarl || die
-	epytest -o addopts= "${opts[@]}"
-}
diff --git a/dev-python/yarl/yarl-1.17.2.ebuild b/dev-python/yarl/yarl-1.17.2.ebuild
deleted file mode 100644
index e95e3d72c436..000000000000
--- a/dev-python/yarl/yarl-1.17.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	dev-python/expandvars[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local -x YARL_NO_EXTENSIONS=0
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# benchmarks
-		tests/test_quoting_benchmarks.py
-		tests/test_url_benchmarks.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local opts=()
-	# note different boolean logic than for backend (sigh)
-	local -x YARL_NO_EXTENSIONS=
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-
-	rm -rf yarl || die
-	epytest -o addopts= "${opts[@]}"
-}
diff --git a/dev-python/yarl/yarl-1.18.0.ebuild b/dev-python/yarl/yarl-1.18.0.ebuild
deleted file mode 100644
index 638ce0f69079..000000000000
--- a/dev-python/yarl/yarl-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	dev-python/expandvars[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local -x YARL_NO_EXTENSIONS=0
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# benchmarks
-		tests/test_quoting_benchmarks.py
-		tests/test_url_benchmarks.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local opts=()
-	# note different boolean logic than for backend (sigh)
-	local -x YARL_NO_EXTENSIONS=
-	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
-		YARL_NO_EXTENSIONS=1
-	fi
-
-	rm -rf yarl || die
-	epytest -o addopts= "${opts[@]}"
-}
diff --git a/dev-python/yarl/yarl-1.18.3.ebuild b/dev-python/yarl/yarl-1.18.3.ebuild
index e95e3d72c436..d0d24dafa8fb 100644
--- a/dev-python/yarl/yarl-1.18.3.ebuild
+++ b/dev-python/yarl/yarl-1.18.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index bfe1c01c54d3..2af9eaf5d668 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,2 +1,3 @@
 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.9.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
new file mode 100644
index 000000000000..c9b957dae4df
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.9.1.ebuild
@@ -0,0 +1,24 @@
+# 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
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-12-28 18:49:50 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-12-28 18:49:50 +0000
commit	5e40752e4b8e3aa126d6e44746ed89a92a7b84a6 (patch)
tree	744f7fee64ab8aa7a683a40502f07504fffb478e /dev-python
parent	6755ceb5710085dde2c6858873dde9fb3e73cbee (diff)
download	baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.tar.gz baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.tar.xz baldeagleos-repo-5e40752e4b8e3aa126d6e44746ed89a92a7b84a6.zip