Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-08-10 09:20:42 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-08-10 09:20:42 +0000
commit: 46b22cbda83fea140ffc339a0c979d43c3ba1471 (patch)
tree: 059fcbd1e92c5aaac0defc16981043fc536098eb /dev-python
parent: 5439f76b0795ab33c7c8a07b3e1918a9cde7abf1 (diff)
download: baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.tar.gz
baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.tar.xz
baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.zip
131 files changed, 701 insertions, 2821 deletions
diff --git a/dev-python/apprise/Manifest b/dev-python/apprise/Manifest
index a6f018c31d56..dac209227bae 100644
--- a/dev-python/apprise/Manifest
+++ b/dev-python/apprise/Manifest
@@ -1,2 +1 @@
-DIST apprise-1.8.0.tar.gz 1651688 BLAKE2B 32458b2a4787c0366db54890b505ca86cf1abee4299d32fd49f8fc8d37b87a6123c902747f97466b061857e7f284ed78c4001e61f587f3b47e17194324217d37 SHA512 312165b1b5c05ee632b5f2631eafc4af2b318881444851966ff6893775caa303b8d8fc819de9c2f8790eb224ac849535c5e5038a2f51dc30d477a503ed48b920
 DIST apprise-1.8.1.tar.gz 1696426 BLAKE2B ddc8966716e89a3e18995370e90f20c080a1249faccdbcf5f28fb22a89dc3f415c33208a5c98352307a28a65b45e305d1b9c3e2df52f6f6f017197a6f893a101 SHA512 b0e5d760ad8fcbecaa51de8e398abbb8766ef8a52bbd9cbd7f77156e4e00194adc1e18e0b6a95c611863ae72162041971408744348a7ea9e6579f4f4aae15f04
diff --git a/dev-python/apprise/apprise-1.8.0.ebuild b/dev-python/apprise/apprise-1.8.0.ebuild
deleted file mode 100644
index c01a1ad9cbea..000000000000
--- a/dev-python/apprise/apprise-1.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Push Notifications that work with just about every platform"
-HOMEPAGE="
-	https://pypi.org/project/apprise/
-	https://github.com/caronc/apprise/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="+dbus mqtt"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	mqtt? ( dev-python/paho-mqtt[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/apprise/apprise-1.8.1.ebuild b/dev-python/apprise/apprise-1.8.1.ebuild
index 1fb4c1bf85d5..c01a1ad9cbea 100644
--- a/dev-python/apprise/apprise-1.8.1.ebuild
+++ b/dev-python/apprise/apprise-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="+dbus mqtt"
 
 RDEPEND="
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 07ae03288fec..28f76708b66f 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,2 @@
-DIST astroid-3.2.3.gh.tar.gz 465447 BLAKE2B d41d206e3b362316ba71f109729fb26ff6b4f63719a0337f78545ce58fabaaa73a3ee62ff6bffa9c4a2f10e6e10718bdc17a38ecc319bce443695a60628ac315 SHA512 d9e8b85401598c0ffd3a27c37c4133bc9bba8436cdeb3dadc9a2337ebbf731c062451cdc5c9cf72a768ecf98253051ac012cfdb08084009a9c4a9043acfeabbc
 DIST astroid-3.2.4.gh.tar.gz 465788 BLAKE2B 745a860b7bacb45cb86e9b232fe3a37cdac40cb471b00832a7dd7da4c3374760749cebe8c8688748e750cc3639554515a7a9e24f5f4d2ebac10af2c906fa04a9 SHA512 e48289794f67cf53bb8a2dcf357c1e892140a0a625c2e19601cf5ad579aaa33a94f0e052915fa6e854bc0a2e626f41b2d13773aa2b2af2412efeb33d030ed2b6
-DIST astroid-3.3.0.gh.tar.gz 463962 BLAKE2B 64f80499e6a435326ef822e4e9baae3ae8cea1f0c2762e79bb6fa4a7158897b8399deb17e7416ce4cbc243dbd38701729e9083c3c92ee9577a216b5e9d7e624c SHA512 c8e494704b9cd769eb4175556f160e5596a7058fe73a020e3b6f261626d9cc7ce7fabeea517e8e172467524126a4950d4280f830a9f49c1607382f9ceb8aed84
 DIST astroid-3.3.1.gh.tar.gz 464132 BLAKE2B 011b61777ce4f3900ed1c23a664b7ae0c16e364f61cd664078d78bf6a90097f423afe03579e151439a9b02874e2fa12844f0587632e1bf1f40b428d2d99cc6da SHA512 992f80c30fdb02d283e73d1329a58ddd10a4f800e74b4697086b194a329ff6ae7ae026c907317e9604371a60cb814f243f2506d921d196214f11741f098485c1
diff --git a/dev-python/astroid/astroid-3.2.3.ebuild b/dev-python/astroid/astroid-3.2.3.ebuild
deleted file mode 100644
index 646db3e27209..000000000000
--- a/dev-python/astroid/astroid-3.2.3.ebuild
+++ /dev/null
@@ -1,86 +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_{8,9,10,11,12} 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 ~ia64 ~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}
-
-PATCHES=(
-	# https://github.com/pylint-dev/astroid/pull/2424 (rebased)
-	"${FILESDIR}/${PN}-3.2.2-py313.patch"
-)
-
-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
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.2.4.ebuild b/dev-python/astroid/astroid-3.2.4.ebuild
index 929dc27577d2..f25ce815816c 100644
--- a/dev-python/astroid/astroid-3.2.4.ebuild
+++ b/dev-python/astroid/astroid-3.2.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/astroid/astroid-3.3.0.ebuild b/dev-python/astroid/astroid-3.3.0.ebuild
deleted file mode 100644
index 3ae97f5efa59..000000000000
--- a/dev-python/astroid/astroid-3.3.0.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_{8,9,10,11,12} 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 ~ia64 ~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/bcrypt/bcrypt-4.2.0.ebuild b/dev-python/bcrypt/bcrypt-4.2.0.ebuild
index e5deb39a1f70..388370429963 100644
--- a/dev-python/bcrypt/bcrypt-4.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.2.0.ebuild
@@ -64,7 +64,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5ad216d4a158..1859347e1f7e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,3 @@
-DIST boto3-1.34.145.gh.tar.gz 841776 BLAKE2B e93a6c4d634c2df22ed27e58c2abe0a6cc835364b4a93c73c8c221ba39b63b89c5f3ddbf210eb90a451c9b6650061f08a173395f1fb3cd4abe8fde90347b4c63 SHA512 ebd85e3068d1ad332b2ed4c2ad45c022fadb090f8aacdcd72c0d515f91b218201afd69750281b68c909dbf2ab35bef3a39412a616f5b134780f15c0cc9854123
 DIST boto3-1.34.149.gh.tar.gz 845064 BLAKE2B 25e77483b8ac8a52e7f5586794839dcab694cf8db3cc27112db25fc77b55845cb84dd2750a45dd5097b49e62e62403077fd741d7f1610fc7f735d8344e6fd23c SHA512 21a942ca15023b3e2732678ee79d1b8c7b027e89958b5761a8d543b91c434d06d7c84e137177e1fde52440c801f62dfa4caed309ec92400f6516720bbcc11690
 DIST boto3-1.34.153.gh.tar.gz 847038 BLAKE2B f29aec887fd57d2bc4b6be125787384438e0dba65dd01effcc91016b9301be2fdde315a2fbdc8f122350ae52f904ba1c281aee9a5dc52994ddd11b45ead3f8a3 SHA512 a8d8f75ef48ad8418aafddbdea4fb021f64b041e7beabf68a0c2f6c461c3aa0b3f2f20c33122ac87d57296fd0d14ee8834b96257085c522b556f6aa1d99ea0d1
-DIST boto3-1.34.154.gh.tar.gz 847586 BLAKE2B 6ae763f1e112f865f8711951ac52f4ff28976928470ac3d8c468278e0abde23750457b8f92a9346b1468f94da4282b5b71eba09f7b442fd448ab8c1501e79914 SHA512 22eb130dbeaf9dfc87d2e01dddd00d3bd10a2fa91c8c7994add2ad3d739769dbd56717d9d034a0edb8e02ad15b8b956a31737269b303a3ec3508d8cfc00482ed
-DIST boto3-1.34.155.gh.tar.gz 847949 BLAKE2B 922377411d5535ff98b81f96cdb15dfd98de23bda40acabb172c889b221936083ad91403f59926fb29ca480f6d0056fb0441371dcfbd2b94d05158c34503bb8c SHA512 c8d7764c10a81fa8fb32eecdd242a36032db451bf4afe1bbc1974de422e0dc387d18e9ef78dcbdb41b19a05db4da8d66131d246b074463a33ae072a61141c362
-DIST boto3-1.34.156.gh.tar.gz 848245 BLAKE2B ee690925f3e3866f0b843bebdfd48bf4bf2f63232c5207f2e3c5823f7b5142c8990b65d5cdfb14a2d14b2460c463efec6444c50733ac920b3a28188dc814adff SHA512 f42ddc6eab3cd07b80021fc3fa99c2fdeae85d70249a369d8a8d5c1e0fc7d692e78989489de8976ac66ce91327352f9df2b70574a8067bf44c1f09b4476ef0ca
-DIST boto3-1.34.157.gh.tar.gz 848610 BLAKE2B a11c44d0d9685e3a1b2237b0b3d9e2927066bcb4feee6ed8198ed83b07673e53635c19328986edc2a70cad69f89db5637db09ff5768368b3494ad14aeaf4a250 SHA512 dc2e1d22d532ea398fadc653ff29642b99e2effbfb23af38288a437a0726d3191eafad481a19f6dc947d790546782e9b0b3c7926d28cf4a0f7fc0d5ac71faa6d
+DIST boto3-1.34.158.gh.tar.gz 848930 BLAKE2B 5db04b9eee08f5418a595e736f075fbe22b92adada9219e8a8cf2299c723d09e2edf88e5ebb3d09c1613a01e5d0d5c837e9545c6ee3110c430c521da10fa2bde SHA512 03f532e78a1a2b8ec01396f0b7f7bae7059165e35440eda47f4393e99d2a8ded229470cf3269a71c746b8a66dccd8626444f1e429e561df1dc1ec0f6b8653272
diff --git a/dev-python/boto3/boto3-1.34.145.ebuild b/dev-python/boto3/boto3-1.34.145.ebuild
deleted file mode 100644
index 1ad6d3c11774..000000000000
--- a/dev-python/boto3/boto3-1.34.145.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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.149.ebuild b/dev-python/boto3/boto3-1.34.149.ebuild
index 509842b2699d..1ad6d3c11774 100644
--- a/dev-python/boto3/boto3-1.34.149.ebuild
+++ b/dev-python/boto3/boto3-1.34.149.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.34.155.ebuild b/dev-python/boto3/boto3-1.34.155.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.155.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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.156.ebuild b/dev-python/boto3/boto3-1.34.156.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.156.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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.157.ebuild b/dev-python/boto3/boto3-1.34.157.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.157.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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.154.ebuild b/dev-python/boto3/boto3-1.34.158.ebuild
index 509842b2699d..509842b2699d 100644
--- a/dev-python/boto3/boto3-1.34.154.ebuild
+++ b/dev-python/boto3/boto3-1.34.158.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 20cf60fc2872..1315c3805335 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,3 @@
-DIST botocore-1.34.145.gh.tar.gz 13230154 BLAKE2B ebcf6acdd7ab01bca4032eaa9bc94fd72807edb3b0ce7cdc7addc4bed9a3500627b95d95e69c3027ecb384e65d95c0955e71a0e3262d89e3e8d49eefc37e9aaf SHA512 96042253f2f5ec74b258327c3c4eb322a8ed534ac8ed78f38a5aafb3a97ce832bfe5184090a2dadd41e30b75bf35c463d8d80c3de72a46410656d62076469650
 DIST botocore-1.34.149.gh.tar.gz 13245965 BLAKE2B 6bc05c1d93eaa62fa9acb3c0e42acdc67272df442452892cb8e833d93edaafd0dfe03f9467e5f305d2827a12bcc9f0658e13a889f9165e1a83250a9ba1bd5f5b SHA512 e44ab480c611b43e13474db97642b92ac59c4b9e641d45ca0967aca385c608f37dd77541088161e7ac1b05ff9b5e4fa544e8d8711d7fbe0a8a4e78e7d7710722
 DIST botocore-1.34.153.gh.tar.gz 13269606 BLAKE2B 1b2ec1af3b699c18c5761fe72b8488361f843e1b2abc5f311736e7c93a52574738a8e72708791657d0d86586d64ee3c85804514779c6dc75c6c2e37035517be1 SHA512 9a7b3359f4304bcb4d3605e2516514360e8898d7b8b1fdee8fab5dc6026a7d8197b09199da4e9aefcf1ab0b094a2e0e336ad13942ce0364f7b5ac87d86fdc4fd
-DIST botocore-1.34.154.gh.tar.gz 13272973 BLAKE2B ce1616749d9baddf6fbbf08be1dc0c5343b3b9ec3bf2b357690ca31076d52f814e7a7d4f61f2a2e2629d35c55894bd56e6fa4ada8834e1df1b072638ec6dd874 SHA512 5b5d8efb5834ddfac08216a9919f2e1d3ac92823b635530a429e45b90f16fbf426dabec7da98e965f5e540fb471eba49d3ccbf55e771d956fa200f6196612837
-DIST botocore-1.34.155.gh.tar.gz 13274262 BLAKE2B ec3602e31e2091877faa07841494e63b169624992c88a7eb9fa0315c2dcb205b7903e1eba101291caeadc89f078365e1fb605ffd1dc096cbb748e206d9bc5df1 SHA512 6582c286304cb667048325c7b2710fc040f41a822497732919e7982791d686af21e9f7851239b736e0b2f7e463f00fdb9e0e2793004d04c3fce7831d10f46e60
-DIST botocore-1.34.156.gh.tar.gz 13279124 BLAKE2B 022551a3247c467a4ec81ec257b50887ea9626b966df42b3f175a1ff3fa3daab73be9c17d0fdf8b2d0a69797f26575c84b11aac8e39ca26b624e4f3228de92e6 SHA512 ae4dbde1624b410b26c2e514582470ece7d841faad72d8288da09e980314170e60594095d86aeb3cba0878687832cf1e971277f943f935ecee2625eaefd4faab
-DIST botocore-1.34.157.gh.tar.gz 13281159 BLAKE2B a23a3d53731998db87ff634aa58bc22c101a1d65630102f701f4908cc0e8b2676c20071dc5a1b62b2d0162cb3583b33f27b34190c31a4714af0350695014250e SHA512 38d3695ee29d688f470743cfa48f9cb9baaf1e278fdabdd15cf9b6f87597bf067d27e243d05a99f2ad1c785e9eaa6e4820e5fe4335c0db1592b9595d126df19c
+DIST botocore-1.34.158.gh.tar.gz 13282704 BLAKE2B c244a36093cdaf57ac82dc11a3e9d4268d7cce36b8119674530228825f6ec4053abbc909dd664a1ea10ec48e0c418b90803275aabc89a41a99eaba6e138a5a17 SHA512 b60c743bfd1a1f3806c6ae71158a998587b8e87f43bdbe88c960cee19bcef41a4b3fd2fe5f50408abc97b22200a689990f79cbb6e952347c747e4bc8c21ae368
diff --git a/dev-python/botocore/botocore-1.34.145.ebuild b/dev-python/botocore/botocore-1.34.145.ebuild
deleted file mode 100644
index 3f7c926a5b9d..000000000000
--- a/dev-python/botocore/botocore-1.34.145.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.149.ebuild b/dev-python/botocore/botocore-1.34.149.ebuild
index 64a61a30c80b..3f7c926a5b9d 100644
--- a/dev-python/botocore/botocore-1.34.149.ebuild
+++ b/dev-python/botocore/botocore-1.34.149.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.155.ebuild b/dev-python/botocore/botocore-1.34.155.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.34.155.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.156.ebuild b/dev-python/botocore/botocore-1.34.156.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.34.156.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.157.ebuild b/dev-python/botocore/botocore-1.34.157.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.34.157.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.154.ebuild b/dev-python/botocore/botocore-1.34.158.ebuild
index 64a61a30c80b..64a61a30c80b 100644
--- a/dev-python/botocore/botocore-1.34.154.ebuild
+++ b/dev-python/botocore/botocore-1.34.158.ebuild
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index b1398af50f68..0edc225308aa 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,3 +3,4 @@ DIST cfn_lint-1.9.3.tar.gz 2562556 BLAKE2B c8816021cfb83e2c0d915cc58e7c099bf8ff0
 DIST cfn_lint-1.9.4.tar.gz 2563835 BLAKE2B 50694ee3982cda4e6df6aa2e8be2c0ae3182899947897d71764426f7fa14225ce44248af42e3d74e1b0159f216a02bc41f6675ab04dd09210bc66419913a5fdb SHA512 345d3aaa1dc6dfa1049061b4563c0f705510e69058e2184e7220f3dba776522967115a273e5044032a02b96c985a71acd4c1c31f7a71d819309d74dd60242456
 DIST cfn_lint-1.9.5.tar.gz 2457425 BLAKE2B 37a065cc7e0462feae7d4fc0b599bf9e2c96a88010690d1440de0f45c829d75c4df98eb7513e3a4992bd7769795351e5022f23925aae84f262183afb474fb59d SHA512 b793271a4b0d5febc4eb1f4411daf5ba3e17cb864ce63e143963c55becc3dbd11617eae8e66c4299f906c1ac4aadf8361c9082e6dd5e1fa11663ddad09f1618a
 DIST cfn_lint-1.9.6.tar.gz 2519342 BLAKE2B 17d14674853cae9a8eb0c3dfc05486a42e9f5a6e435fbfdf9e34e6ba8cb59c5b508e395a46c788fbc220a0f3918bc5156eb69be6ac6f3c429f78cff474625eec SHA512 2e9cf33e333d3eb098525fe7c54db0f76c68e08a50a2b02a023798d8f4b33041a6e92790a93a6b13a7a10933911512ef1d49718577af49df049567499862cd4b
+DIST cfn_lint-1.9.7.tar.gz 2519610 BLAKE2B a454027a85bb55770b91ab4d801ffad807a2b9200e88872e2149485bb17196e050e0eea02db9be6bd705f7b427d825b5510cd0e78ff4d0db2cefa988be138782 SHA512 b6fff3b56f78b85d7335d33fa93e41003311c60f008ce56ae3f373ec32b2105ad40bc68210bd15ee88cc4bcb9f6cd61bfb1367773ff870cc4ec1807aec011100
diff --git a/dev-python/cfn-lint/cfn-lint-1.9.7.ebuild b/dev-python/cfn-lint/cfn-lint-1.9.7.ebuild
new file mode 100644
index 000000000000..cb4c0566bc6f
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-1.9.7.ebuild
@@ -0,0 +1,70 @@
+# 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_{8,9,10,11,12} )
+
+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.89.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/coverage/coverage-7.6.0.ebuild b/dev-python/coverage/coverage-7.6.0.ebuild
index 8d48c5f4afb1..a2efa74b0ed6 100644
--- a/dev-python/coverage/coverage-7.6.0.ebuild
+++ b/dev-python/coverage/coverage-7.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/crc32c/Manifest b/dev-python/crc32c/Manifest
index 326fbd5bbccd..6aabad8ac867 100644
--- a/dev-python/crc32c/Manifest
+++ b/dev-python/crc32c/Manifest
@@ -1,2 +1,3 @@
 DIST crc32c-2.4.1.tar.gz 38277 BLAKE2B 3d4a0eeb5811e8bc46df30b8890ab409de92dc3cfe2c5c3ab355df3394e56812c19ac26523be2cf9c33bb5825fb6e080b6f27ea77bed5c38d98fbe6c247653fb SHA512 005f95f66e97f552a83b5c94b706224f44280895d70c348fee86943bf1589a94b57eeddde5e18499fea9c77cbcbcfd5691d9d4b33ed788dc885a1333b6db476b
 DIST crc32c-2.5.tar.gz 41514 BLAKE2B a9424ef917f3c89f3b8b3881ccd5d59cb8a634d6177260ce9e7300e151e68e97e55b74448dd4cd545d2d66d2e2d8e70a085578719f768662542e43f06e914d20 SHA512 446f2290706eae8a625590c6b314d8422938dd9b8bffcf5e4dd6d3d260932548dbc5d9a9b6e7e5eaaaaac8dce424876f4e4acc9b0b1ea2b7cdc6ddd101228cfd
+DIST crc32c-2.6.tar.gz 42985 BLAKE2B 0193b26a56c6a2ec071231815cfcdf8ab3ce58de98e2948ab68c8ccd5779772923c8fd1464c70376ade8d4a6a38a575f8330791b7cda8de82d001a869b22e7e2 SHA512 7ca2614994b558c0f9b12fb743b0dadcfd6e6e3ab71c7550fd892324a91a90816b2dadf9c9946078e0ee2cd4abe14fdca385421bcd9468e41fd656a080b4d52e
diff --git a/dev-python/crc32c/crc32c-2.6.ebuild b/dev-python/crc32c/crc32c-2.6.ebuild
new file mode 100644
index 000000000000..5a5ea87c360b
--- /dev/null
+++ b/dev-python/crc32c/crc32c-2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 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_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CRC32c algorithm in hardware and software"
+HOMEPAGE="
+	https://github.com/ICRAR/crc32c/
+	https://pypi.org/project/crc32c/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+# NB: these don't affect the build, they are only used for tests
+IUSE="cpu_flags_arm_crc32 cpu_flags_x86_sse4_2"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x CRC32C_SW_MODE
+
+	# force = run "software" code (i.e. unoptimized)
+	# none = run "hardware" code (i.e. SSE4.2 / ARMv8 CRC32)
+	for CRC32C_SW_MODE in none force; do
+		if [[ ${CRC32C_SW_MODE} == none ]]; then
+			if ! use cpu_flags_arm_crc32 && ! use cpu_flags_x86_sse4_2; then
+				continue
+			fi
+
+			# the test suite just skips all tests, so double-check
+			"${EPYTHON}" -c "import crc32c" ||
+				die "Importing crc32c failed (accelerated code path broken?)"
+		fi
+
+		einfo "Testing with CRC32C_SW_MODE=${CRC32C_SW_MODE}"
+		epytest
+	done
+}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 44312663bf23..525d2a744516 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,2 @@
-DIST setuptools-71.0.4-py3-none-any.whl 2341127 BLAKE2B 6312511c9981ff41e0f8a7eb3da511c9bf35b52af9fb7cbd826d3fecf342008911d8b13a6a0747a1f3d0a8189fcf701d82b03b7b62c73774845d35dc38fb8743 SHA512 a5909a1bbc46924ac8ee89322ed35fbf5562397fc46f5d20d12f6d63dbd94355c4c9718c07597b6d50c7fe46a771b96c2c25f1f2f53d6ff17c4d7cbd9e6bcb09
 DIST setuptools-71.1.0-py3-none-any.whl 2341722 BLAKE2B 5d2aa4205b91f619a5c6e9596d9ac77aaef4759a98d4a2ee1cd706b01febadf2b94cc891f92640da185ac565d315b141c66f628a213fa199a3ab282250250d34 SHA512 3c2a49f5a3953b525885635bbd93a503e6bc378914da2a2ff658b5800b27848e91ee268d652176c7034f55b8937db10d7e68f3d4d315ca03124ee3054f58e36c
 DIST setuptools-72.1.0-py3-none-any.whl 2337965 BLAKE2B 88954b396a47b4223b73313100b9ae0782a16f755660da1abed31316f056beca78401b151f1bec39a791b1c556da09479e527b2316f5d1391e6996f5433c0bc3 SHA512 ef9f855c8ca4d7f6e5eb79f3d40b44830eede4664ec5667415fc676a0b8230a64fb62fda49c1eef6a9c3f89d4724b0717e7d702be99ab61f8763d91feb9a6ea1
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.0.4.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.0.4.ebuild
deleted file mode 100644
index 6e384d8b8a5b..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.1.0.ebuild
index 97aca4a61872..6e384d8b8a5b 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.1.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-71.1.0.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/gmpy/gmpy-2.2.1.ebuild b/dev-python/gmpy/gmpy-2.2.1.ebuild
index 37f7b473993b..d260cc8b647c 100644
--- a/dev-python/gmpy/gmpy-2.2.1.ebuild
+++ b/dev-python/gmpy/gmpy-2.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 3e3f59516d2b..7adf1b254fac 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-DIST google_api_python_client-2.137.0.tar.gz 11477114 BLAKE2B e0d7e64bfdd86bd882c8762b8d78fcd390152e569ca32df16fcbe91290508565086e4ca7e958d8d48ecaa6d5d23a0b1188b85f6a53004af54139977602c4f72c SHA512 442c08033fb12dbdcab3e45b911a9d43d93a4841369cd14344c9201a40b453d88ce602c3f45d965713ca826bec1f3e333f9425008d1cf1f59b6441283eb09807
 DIST google_api_python_client-2.138.0.tar.gz 11595036 BLAKE2B 554abf4e58264d60a5a09174b7199f31ac6cf31bd024add66ff73a71992e9da077c8046abfd8d9400d1b17fa0ccd27ca484ae62dca8b6900bbad42e2a26af9ee SHA512 f9e7501a289e96aebe8db78e32dc30771a860af34808d1bc6d6192c4511ecbbf871cbbf8cdf50daeeb865908a86236400d651e159d913b415b1f2fdf8eb045ab
 DIST google_api_python_client-2.139.0.tar.gz 11606939 BLAKE2B 9ad0cd36a913235e8c7b5afe2f4334399deb662d2d6287a64d98b02d890368839b345dba5e64aad3c852d655e99a04f8eb6902498664c4efa3a693ae2a2c6aeb SHA512 b6235f866a402ebde20fc8cfce41ad5bd0b8034311ab5b4f1b4cc88cea03f52021ee23264a32e9577ee1fa5bcbbb07af1c4e6d5e3f85bc53c0e6760654543b34
 DIST google_api_python_client-2.140.0.tar.gz 11618875 BLAKE2B 0d156fa072b302c0410f8e70681556ee146d8d8951576b1890e429b40363661d263554ad61157256feebee9a45afdf3dcdbb287b7c1dc367a6b6940ec488a645 SHA512 168e75ea734edbf0182078fad27d30f8dd56b07a8c7056973c7df99fb7faff83034901b6742aab8e03c833b73a5fd31a92455105ccc6f0f5b741fadb66715f30
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.137.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.137.0.ebuild
deleted file mode 100644
index ac128eeaffaf..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.137.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_{8,9,10,11,12} )
-
-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.138.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.138.0.ebuild
index 10fa88d021bb..ac128eeaffaf 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.138.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.138.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/hiredis/Manifest b/dev-python/hiredis/Manifest
index 9c650e9c85cb..dbb9d4231330 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,3 +1 @@
-DIST hiredis-py-2.3.2.gh.tar.gz 19076 BLAKE2B 4a3e747765f559407b3ad84524bc1040e3a530723b5756320743fc20400bc70e867d48e71696d732a5fa5eb231199cbefb6f487d0b5ece6fc8f6c41f10f3c0d8 SHA512 1a22ab324f9675973c3dc37c55d6dd9cf43fbc161003003a73b2e1dfbb3fed7dcb1433f4fc51045a88cb2735f7c8495b93a819a0a9f6300e05b0cc85160eaace
-DIST hiredis-py-2.4.0.gh.tar.gz 19076 BLAKE2B a5b047db044801e5dabdd5bcaefb5a89cce472f45baa6a3d590b09014446695ed84baaa46bc4d8a809cc6ffa2a2e219e03b62268ee9f818ef5e9c770cd064591 SHA512 638184fff812cf2c0d0e731be98e22c37c2c07db539ce2ad1e5d45e8f399864bc49e5e26cd0b1fcdf7db9fc776a664f8541229ef00da0b597c4be4f3ab7461cf
 DIST hiredis-py-3.0.0.gh.tar.gz 19055 BLAKE2B 2ad3c185b6a70ebb509e0d34b1a1122784c74ecc843c966620a20d122e05dcb11129dbb7f76a7956081d147881edc2c66264fda1109e6990ef2171f15b339da7 SHA512 64abc15f73eaf65e16b1c3f98c21cf31823ffeb7131b89eeefee9856654c016867903d9a5d8c7ab0bdb24922076a67cb553c4298abcccd69ad0d5ba2d18c8a67
diff --git a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
deleted file mode 100644
index 67f6a5650f66..000000000000
--- a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- hiredis-2.2.2.orig/setup.py
-+++ hiredis-2.2.2/setup.py
-@@ -18,8 +18,7 @@
- 
- 
- def get_sources():
--    hiredis_sources = ("alloc", "async", "hiredis", "net", "read", "sds", "sockcompat")
--    return sorted(glob.glob("src/*.c") + ["vendor/hiredis/%s.c" % src for src in hiredis_sources])
-+    return sorted(glob.glob("src/*.c"))
- 
- 
- def get_linker_args():
-@@ -38,17 +37,16 @@
- 
- def get_libraries():
-     if 'win32' in sys.platform:
--        return ["ws2_32", ]
-+        return ["ws2_32", "hiredis"]
-     else:
--        return []
-+        return ["hiredis"]
- 
- 
- ext = Extension("hiredis.hiredis",
-                 sources=get_sources(),
-                 extra_compile_args=get_compiler_args(),
-                 extra_link_args=get_linker_args(),
--                libraries=get_libraries(),
--                include_dirs=["vendor"])
-+                libraries=get_libraries())
- 
- setup(
-     name="hiredis",
---- hiredis-2.2.2.orig/src/pack.c
-+++ hiredis-2.2.2/src/pack.c
-@@ -16,7 +16,7 @@
- extern sds sdsnewlen(const void *init, size_t initlen);
- #endif
- 
--#include <hiredis/sdsalloc.h>
-+#include <hiredis/sds.h>
- 
- PyObject *
- pack_command(PyObject *cmd)
-@@ -32,7 +32,7 @@
-     }
- 
-     Py_ssize_t tokens_number = PyTuple_Size(cmd);
--    sds *tokens = s_malloc(sizeof(sds) * tokens_number);
-+    sds *tokens = sds_malloc(sizeof(sds) * tokens_number);
-     if (tokens == NULL)
-     {
-         return PyErr_NoMemory();
diff --git a/dev-python/hiredis/hiredis-2.3.2.ebuild b/dev-python/hiredis/hiredis-2.3.2.ebuild
deleted file mode 100644
index 8ae07ff769cc..000000000000
--- a/dev-python/hiredis/hiredis-2.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=hiredis-py-${PV}
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="
-	https://github.com/redis/hiredis-py/
-	https://pypi.org/project/hiredis/
-"
-SRC_URI="
-	https://github.com/redis/hiredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=dev-libs/hiredis-1.0.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/hiredis-2.2.2-system-libs.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf hiredis || die
-	epytest
-}
diff --git a/dev-python/hiredis/hiredis-2.4.0.ebuild b/dev-python/hiredis/hiredis-2.4.0.ebuild
deleted file mode 100644
index 8943a49ac4cf..000000000000
--- a/dev-python/hiredis/hiredis-2.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=hiredis-py-${PV}
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="
-	https://github.com/redis/hiredis-py/
-	https://pypi.org/project/hiredis/
-"
-SRC_URI="
-	https://github.com/redis/hiredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=dev-libs/hiredis-1.0.0:=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/hiredis-2.4.0-system-libs.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf hiredis || die
-	epytest
-}
diff --git a/dev-python/hiredis/hiredis-3.0.0.ebuild b/dev-python/hiredis/hiredis-3.0.0.ebuild
index 82c80d7899d1..6aac0cf2de45 100644
--- a/dev-python/hiredis/hiredis-3.0.0.ebuild
+++ b/dev-python/hiredis/hiredis-3.0.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/hiredis-1.0.0:=
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 2a04c2d6c864..7ee3cc5b8858 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,4 +1,2 @@
 DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
-DIST importlib_metadata-8.0.0.tar.gz 52667 BLAKE2B 5ca77157938dcced0c32a526e760a2d29bae5c34fa5a8f5711f3746278a9843ca85d82405eafe18821b5f7956bf75cdb2b619db903be8de96d60462b4af7fb62 SHA512 07245e6ba3f47ecc7ff4201b2dd24e6970317fe7ef0a39d74a66de180269f480c09e12601738c7c11e720a2e7c78347871ff83700c7f796a01fb1a12c8e46ff6
-DIST importlib_metadata-8.1.0.tar.gz 53881 BLAKE2B b441a78e12b1f2f360deeed5d54d2694d97994881ee18a5e7c2790c96d25b433385fe20b38b70b075ced138853ac242792e098105f53c40d7f749864d06c511f SHA512 98a5f72eab0871b55a394de5e18ab74c225515620eed62ee0273de2c23607566af7a449ffc4b3900f8d0fd8e6eb7bd2a893666c1b459f9f07b700319a7236ac0
 DIST importlib_metadata-8.2.0.tar.gz 53907 BLAKE2B 3864e1fcea4f0c30134c401f787b83500b8c13860a69784f769a67d1db1d4345c8a289fec2a21812f29dc3f07c522836dc1271f33eaf4592bcb709561f0adbe6 SHA512 cc0467f5ac95503b4fcbce6bf0b4211a5bf9ba8389a714c6d0cb3f35756b7c5bcb6359873cfeb1dbd068b0a41ddf57b27a564aeaad9bc17cb8a5e4d71fa12e8a
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild
deleted file mode 100644
index 19792b4071e0..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-8.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.1.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.1.0.ebuild
deleted file mode 100644
index ce9e2dc50049..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-8.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild
index ce9e2dc50049..19792b4071e0 100644
--- a/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-8.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/krb5/krb5-0.6.0.ebuild b/dev-python/krb5/krb5-0.6.0.ebuild
index 7d2c188f32a2..783a3bf12643 100644
--- a/dev-python/krb5/krb5-0.6.0.ebuild
+++ b/dev-python/krb5/krb5-0.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	virtual/krb5
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 9e8f4bb82656..7d9256487de2 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,2 @@
-DIST mkdocs-material-9.5.29.gh.tar.gz 14923128 BLAKE2B 646f58cab9d58d15f73e1b38bf165a819d70f3ebb39a75190fd03dc5baa04e92a0b73174c8ca9420602aabec00a4d1b51dadf2b8df57694365826d9b35387d14 SHA512 12b3c48c55f1fe32a6387cc18d9c102de8c1dc8a45ee28089236702ff0d0e7a3abb1032e4bdab206e45c24201f92a4c7aa8de10556d3034e953d2f57508398e6
 DIST mkdocs-material-9.5.30.gh.tar.gz 14925913 BLAKE2B 291d9302e8c49724e31493176ad72f6ad7926f167ff1e761087b83158f6689cf081ab0155eeff29985ae5f4ca5bdf36e988515e128c86506fb742ff7e3105a14 SHA512 67afb9b558368922aaf585f797b054b7a1eb32d47653212723fa57fc6f6f52e540fadf0d90fdb9e1043e5f60e2210fe9225746caf53451163700ad0319caf522
 DIST mkdocs-material-9.5.31.gh.tar.gz 14926142 BLAKE2B ae47e54eaaea55885d5161c1e3435a2feb96f8495487ddb13c9bbb57c8ceb8d961c30d66a4ec51cf4212892724395b64d46d47c3e9547b8256d0fb17b4d1843a SHA512 ee74d6ab05d16fad3545c39efaed196242a68479a6a8286dcd96c1a61ec2d1fbd2a2678b7a3edea50bf8784d3c986060ce5abe5490f53a1d584c0954733134c2
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.29.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.29.ebuild
deleted file mode 100644
index 5c080c205d27..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.29.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.30.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.30.ebuild
index eec1908ef846..5c080c205d27 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.30.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.30.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-2.0.1.ebuild b/dev-python/numpy/numpy-2.0.1.ebuild
index 1d06e3af61d1..7f1cdd8f4820 100644
--- a/dev-python/numpy/numpy-2.0.1.ebuild
+++ b/dev-python/numpy/numpy-2.0.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 2a55279af042..db9965b10791 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,2 +1,3 @@
 DIST numpydoc-1.7.0.gh.tar.gz 87818 BLAKE2B b31e9478324bc45d78904c16330c9ed1513eca5668f20472faf9e2a36c0ed7eb03b18cf1c314180ec35716a26bd05357d5ef93025efbb8fb09c885a614ac7ea9 SHA512 0858d7eaafdd93d5a0894bb107b8238f75bd7cd34afa64fee38effcf4bebf9b4db957768143a46eec46023e69b53599a79b07a39640887f3a0471b5996022247
+DIST numpydoc-1.8.0.gh.tar.gz 90624 BLAKE2B 112274fa185bd48909a3fbe0cd2a98465f94b30207060234a396278e1802058224164fb6f3c492a6b1e76b7e0f7966ecaf6c592c96675e6e45fae044414f62c7 SHA512 d7ea64f1140395815e0d95697d1b855ba0a5f63fc99e8cf1fb7d240cd799be1958c2efd034cbec64c8b3b1742076c8b7db5a0ddc54af3ef39fc341ea0e3ec586
 DIST numpydoc-1.8.0rc2.gh.tar.gz 90642 BLAKE2B cf47c0a2865ab5579c7f095607a58fe3db4e64ccf521e052797e4286d74351017ebe9c300b968f3f2f799fc0fc07f3d8eebbef59e1f1aab269ededf6d0a8bd12 SHA512 f323ca5fc62ba37af10a8d892b22a348ca3b2ecd9faa3bd885f0b233f51e169e8d86eb364bd0155bb8c9daee9185866f962e586123758555dae03ef46f437450
diff --git a/dev-python/numpydoc/numpydoc-1.8.0.ebuild b/dev-python/numpydoc/numpydoc-1.8.0.ebuild
new file mode 100644
index 000000000000..1346548324a1
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.8.0.ebuild
@@ -0,0 +1,52 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="
+	https://numpydoc.readthedocs.io/en/latest/
+	https://github.com/numpy/numpydoc/
+	https://pypi.org/project/numpydoc/
+"
+SRC_URI="
+	https://github.com/numpy/numpydoc/archive/v${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/sphinx-6[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.10[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require Internet (intersphinx)
+		numpydoc/tests/test_full.py::test_MyClass
+		numpydoc/tests/test_full.py::test_my_function
+		# TODO
+		numpydoc/tests/test_validate.py::test_extract_ignore_validation_comments
+	)
+	epytest -o addopts= --pyargs numpydoc
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d5586bc77728..0e2e92616217 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST python-phonenumbers-8.13.40.gh.tar.gz 4914854 BLAKE2B eab8e8e28a5895f9eb92ce9198a77a4d9bfd6f3d58f17c5a7909913ea43af2efd1dcff84c9d517c5f4f17ba87ce68786ab64f523b10ddf6aa3354801021843d3 SHA512 ef2199d86998201485d48cf4d5d56baa82476dbe41b2b4f89aebfcbf840af0ae35a78308a0f74b2daad58a2c330e10444c93ffb59a402d5fe5cc5baff78fdcb2
 DIST python-phonenumbers-8.13.42.gh.tar.gz 4915152 BLAKE2B 4abdd4e583e09f7915203f8b9a7908eeae7c57910b21e3fd2d8bccef4ba799ddb13299ff0a9fa307665c08955923f3f56a56893b5fa1ec0ccb102feda286aeed SHA512 21cb0093486d3f29f1ed7b9ce9a0caa06df854ef2f4120c345f07ad7a73e374bf94e8f7844e29f71157f5b645423385ae39d3ec6a0ea6bd35a77881e76b9afb9
+DIST python-phonenumbers-8.13.43.gh.tar.gz 4916529 BLAKE2B 78f904af583fe4390ddd0d8f0838634a1e898ee93187a676b9bf409301c03e392d6e7404f30ae5d3b36d36809db647f749d48ea5e0b48f2db904a47513952433 SHA512 80df3d5bdb4ad7a32d4e1c1b3f7a4db473e21b9ff7e260fba5bc814e96067e042c81e805c3eb8494b31d2ecf3a0a73689ba2fc9714a9e8e7fe8098a7d13beb5b
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
new file mode 100644
index 000000000000..062c56c77784
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.43.ebuild
@@ -0,0 +1,39 @@
+# 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_{8,9,10,11,12} )
+
+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[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pure-eval/pure-eval-0.2.3.ebuild b/dev-python/pure-eval/pure-eval-0.2.3.ebuild
index a8c9cecd2616..fa7d8ab5bbd2 100644
--- a/dev-python/pure-eval/pure-eval-0.2.3.ebuild
+++ b/dev-python/pure-eval/pure-eval-0.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pymongo/pymongo-4.8.0.ebuild b/dev-python/pymongo/pymongo-4.8.0.ebuild
index 98e7489efa91..fefc91c73c1a 100644
--- a/dev-python/pymongo/pymongo-4.8.0.ebuild
+++ b/dev-python/pymongo/pymongo-4.8.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc kerberos +native-extensions +test-full"
 
 RDEPEND="
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 66ba293d16e0..fcc9008a135d 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,4 +1,2 @@
-DIST pypdf-4.2.0.gh.tar.gz 8009612 BLAKE2B a21108679a6dd5d9bc16aaf4a9c1beaaab875f0a8f974722d6d318635eecee82bc37c7c4c175816079ce9604f8b88f07f31458b08994833a25ee18bc46cbc294 SHA512 99fe599a81ae7e115ee6fca82ffabaff613ee49756a7e937de32a4d59b5731effe5cc3a076d92423b2299896a6ecab41ab5096aea6836fec79ba637e2c7b7620
-DIST pypdf-4.3.0.gh.tar.gz 8015836 BLAKE2B 691e729050e7e6d052d8f4ccf1698b2cd6685c007026036b98c321bf9cd007abf8830ffe5281bdabab1b57afb6e6015e631e8e62104d144de98ed270f8ba992e SHA512 ba0cb8815d889742e2f0155e9b296b483e29c22ef2ecff3779c05baae3132900827f1b6f9a155bf4a2ae2f442727ae0fe310e322d0211cb43ee821cd8f6d411c
 DIST pypdf-4.3.1.gh.tar.gz 8016393 BLAKE2B 1ff64b79dda008c92670188e174940137da5af721e169e3a45f4784aa5fdd41f9b679701009f9fa59ac31a401786cece8315d72bd7942ca5af8b05e4ed4564be SHA512 17e1b127efe744a0ff2e9733295effcbab8e497d65cae3cb821646df1c0178991771910f0ef0b4f72525d980d840bfdc4290a05ea191669887f2122ec3521825
 DIST pypdf-sample-files-8c405ece5eff12396a34a1fae3276132002e1753.gh.tar.gz 11748093 BLAKE2B c5989200893b28a3c2062bb024a5cfc6f3389dc259ec129857979fa43469e1274559612b4d555499e2c7e16cf34be07825229932bf4d147fa6d7324d043e97d5 SHA512 c9771129b7668a2fd1fa79bb859ae9213f3d60341cf1b9937ff0eaab0de9bf4c35adcb7b896e93329038dc0f3809a0c697c523f8fe41b43030b0b029a88058e3
diff --git a/dev-python/pypdf/pypdf-4.2.0.ebuild b/dev-python/pypdf/pypdf-4.2.0.ebuild
deleted file mode 100644
index 332b95a29d3e..000000000000
--- a/dev-python/pypdf/pypdf-4.2.0.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=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=8c405ece5eff12396a34a1fae3276132002e1753
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/test_reader.py::test_decode_permissions
-		tests/test_workflows.py::test_text_extraction_layout_mode
-		# rely on -Werror
-		tests/test_utils.py::test_deprecate_no_replacement
-		tests/test_workflows.py::test_orientations
-		tests/test_writer.py::test_remove_image_per_type
-		tests/test_generic.py::test_name_object
-		# Internet
-		tests/test_generic.py::test_calling_indirect_objects
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-4.3.0.ebuild b/dev-python/pypdf/pypdf-4.3.0.ebuild
deleted file mode 100644
index 656b4069fadd..000000000000
--- a/dev-python/pypdf/pypdf-4.3.0.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=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=8c405ece5eff12396a34a1fae3276132002e1753
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/test_reader.py::test_decode_permissions
-		tests/test_workflows.py::test_text_extraction_layout_mode
-		# rely on -Werror
-		tests/test_utils.py::test_deprecate_no_replacement
-		tests/test_workflows.py::test_orientations
-		tests/test_writer.py::test_remove_image_per_type
-		tests/test_generic.py::test_name_object
-		# Internet
-		tests/test_generic.py::test_calling_indirect_objects
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-4.3.1.ebuild b/dev-python/pypdf/pypdf-4.3.1.ebuild
index 656b4069fadd..332b95a29d3e 100644
--- a/dev-python/pypdf/pypdf-4.3.1.ebuild
+++ b/dev-python/pypdf/pypdf-4.3.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 389a19d6cfc8..9ce6a91d6eb5 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,2 +1 @@
-DIST pyspnego-0.11.0.tar.gz 225609 BLAKE2B 580ba1eb5a36af973af5acd6421ea373597961fe35e8f32c1cdd7938f550e0e20307a540405182761181927ebb69822dd289170ffe5110a8b49bfc4cc4f99f01 SHA512 7717dfbca4cd40f71f6aa436ed3f23f4cfd77c50569af90dd2f4b337cf46b485b8046fc5b2ded6a77c54af2ef3fca28e085616e900e25d8830b3600cbd3e44b5
 DIST pyspnego-0.11.1.tar.gz 225697 BLAKE2B fae4a4873bb7d84076c3703398f7dbb8ce27712804430290232239fef06e9c5b3a30ef397e82f109d6b4dcc61682cdb87d6469c5a1d323818dd16194fcc3b2df SHA512 3fac72600e162aed20d888727d74f67a7f1ae44aa000e0290c25e66a86d37bf2afb0718b36084926316149cb5157affe8beac65507b4d6e924d810c9aa6d86dc
diff --git a/dev-python/pyspnego/pyspnego-0.11.0.ebuild b/dev-python/pyspnego/pyspnego-0.11.0.ebuild
deleted file mode 100644
index e7d572cf4979..000000000000
--- a/dev-python/pyspnego/pyspnego-0.11.0.ebuild
+++ /dev/null
@@ -1,38 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="
-	https://github.com/jborean93/pyspnego/
-	https://pypi.org/project/pyspnego/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.11.1.ebuild b/dev-python/pyspnego/pyspnego-0.11.1.ebuild
index 18171f5ebe2d..e7d572cf4979 100644
--- a/dev-python/pyspnego/pyspnego-0.11.1.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index e669ee772b9d..75d4db52d8e8 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,2 +1,3 @@
 DIST pytest_asyncio-0.23.8.tar.gz 46920 BLAKE2B 6b7a66e6ef28f2c7a874a115e0346b3803051df5d57e5b8ba35480982231a804adfbe8a4a2c605847730ea940fafe9df2aa94f5081b43aa753b64c3e2ea027a5 SHA512 68f23458c5f22bdb75a6a0a12f185b1f22c5231c0cdcd84806781419f5c866844e851398d771c5932af4a42b5dfdcce6624181f2c0d2f70187bb5feed0ba7c97
 DIST pytest_asyncio-0.24.0a0.tar.gz 49299 BLAKE2B 2bc9f0a85169db463f344ed1f42dd954599c6e50a3fa3d7bf95bddb3eb162c4ddf454f512d7b1577e0d394174f52dd63664e4eec32a6106a7c2779cf955cb79a SHA512 109ff55bb3f742a246463ed650a6568833e70cd0b4ed30507efb62cf3c9eb5aa9caed960b3b1c9b92c1cb30025436e9e98e33135243a5763b2614632cbae5c8e
+DIST pytest_asyncio-0.24.0a1.tar.gz 49212 BLAKE2B d65eb2587ef865d62a8f3469165da58ca9db0ffe98b4ba02b3be36811f635aeac01457b0931fda4653ec7e8634d3dfe70e7e3b5a40be5ae7018bb8f7317fef95 SHA512 33a84c17a853a5b3c4153a178e70fa04ce3494d6f316f0a141b4d945c5052c6c336f55f7ca691423ce448d1e7535d84bc69d939cfc4544076e704a7e5b4509f7
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.ebuild
new file mode 100644
index 000000000000..3b07e4f76077
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.24.0_alpha1.ebuild
@@ -0,0 +1,44 @@
+# 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_{8,9,10,11,12} 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 ~ia64 ~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-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index 320d21078692..e5960d3c5602 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,2 +1 @@
-DIST pytest_httpserver-1.0.11.tar.gz 66742 BLAKE2B 641c566b2ae349bf02f9a457c488ac6820cbeabbf430d12d84ba02b09382947aa60b61a6a1578b260d160b3e8d01c37745dfd2e90bdb6aea40f546a8103b367f SHA512 3d3055bc48bbe523fddbf9e9ba3495c3141a6dcd4f8b2cf9c19f11d1e6f4a93eebe64bb920ea5bd3bc0d30f4469ecb9a8beca35fc844ca2c62f6868edcb570ee
 DIST pytest_httpserver-1.0.12.tar.gz 66948 BLAKE2B b50871038b1c313db76c456e86bfe82046bcb8207cb72126db18bde5dea4e3cabb6740a19d27eba672967078f60978c1b20946bf502837e0859d957d0318afeb SHA512 fd3d290b23137d0c2893672611e7087e86ed47ccda865779304d177ac2ef6e0068321eb42f42ec89db859fb66910ad68399d3a4aefde250bd207ab9ff4666e3e
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.11.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.11.ebuild
deleted file mode 100644
index b7ecd3a50b79..000000000000
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP server for pytest to test HTTP clients"
-HOMEPAGE="
-	https://github.com/csernazs/pytest-httpserver/
-	https://pypi.org/project/pytest_httpserver/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# confused by extra compressors available (for Accept-Encoding)
-		tests/test_log_querying.py::test_verify_assert_msg
-	)
-	local EPYTEST_IGNORE=(
-		# tests from building release artifacts
-		tests/test_release.py
-	)
-
-	epytest -p no:localserver
-}
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild
index 6d111605c24d..5a67bd230b91 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.12.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-import-check/Manifest b/dev-python/pytest-import-check/Manifest
index 6439eed65ca1..10e039baaf78 100644
--- a/dev-python/pytest-import-check/Manifest
+++ b/dev-python/pytest-import-check/Manifest
@@ -1,2 +1 @@
-DIST pytest_import_check-0.0.3.tar.gz 16993 BLAKE2B c0d9ccff18f46b4331ba455fec3e4353084769be631f81e56bf8f0fce374cbc3b9e5ef16e3527f7d39e2b6f46ea7e26b88ffd4197487575b14ee607f94389045 SHA512 4618bc4f5988480f712d0a5dcf7dc2743520a454e5b32beb225f04afeb70235a65bfc27c5a30dbdf248429b844a64edd4a0af805eaa720ba5658aa7dccf8fbb4
 DIST pytest_import_check-0.0.4.tar.gz 17221 BLAKE2B d835f1104a1b96aa07e42b5abf6db70284affdb50cfbda22f4a1d4cdf6a7bc5fc93914c95c96b775cf799c0a895bedded63b767946a1caa25b3339a20f16daff SHA512 b661c8da479ec3c02907d34c1b87aaf2a6ab2570bcc61bd9bb662d1292d02093f9b2726e23ae773d6a0d8c28f64a7e2025222dd2c8a2bd7af85adcafb85e69ed
diff --git a/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild b/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild
deleted file mode 100644
index 2215dac828c5..000000000000
--- a/dev-python/pytest-import-check/pytest-import-check-0.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to check whether Python modules can be imported"
-HOMEPAGE="
-	https://github.com/projg2/pytest-import-check/
-	https://pypi.org/project/pytest-import-check/
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-8.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_import_check.plugin
-	epytest
-}
diff --git a/dev-python/pytest-import-check/pytest-import-check-0.0.4.ebuild b/dev-python/pytest-import-check/pytest-import-check-0.0.4.ebuild
index 749b264325bc..211e7606ebb5 100644
--- a/dev-python/pytest-import-check/pytest-import-check-0.0.4.ebuild
+++ b/dev-python/pytest-import-check/pytest-import-check-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-lazy-fixtures/Manifest b/dev-python/pytest-lazy-fixtures/Manifest
index 57ae2ef747db..5716cc075fca 100644
--- a/dev-python/pytest-lazy-fixtures/Manifest
+++ b/dev-python/pytest-lazy-fixtures/Manifest
@@ -1,3 +1 @@
-DIST pytest_lazy_fixtures-1.0.7.tar.gz 6958 BLAKE2B e8bd937592fc0773077712517655f25a3051263c3ef0a9450e78a22b3e69fa028ecbe17b8f9c5d4e38eff263a2a3a8cb5b0a64e0ca77cd47c80b3128f9a46122 SHA512 abb4cc08d3a3a3de5e1df2df7df8b9f552cefc715408b402a738ebc0368475480f63c627d49b7fe0bdfdb468f15cfc8e568ac1057511f9f9cc4c13231a8c3e71
-DIST pytest_lazy_fixtures-1.1.0.tar.gz 6952 BLAKE2B 487e449368a0cc38a2249c4b1863ddaf050f6c1841624639365b3c972400be677ab2b40e4a9032cd41fbfcadb125109d1801459d48519faaa72533ea54213e3d SHA512 71c55335153520c72dc12b8decc99f2f82369e737ff5067b2a5d53d09ebd5550cf182bb594ef74c574d77f0ce851856eb982860c952147d3fe65b32345e8d6b7
 DIST pytest_lazy_fixtures-1.1.1.tar.gz 6978 BLAKE2B 975f76783a224c5f1237546108c25936a3fc5f6f466e936f506957675f220cf200dd0bb4f516e361fb56795281951b4196e1e7f1f399bf15dd9337766eb611a0 SHA512 b8b215f16414ddfd2f6c16b1eb8f10cc6b9931ff44f7a0a158e721071160d94e550336e785d1b5ab772ccc2a88c08687c3e5bdcf684c5e496630f341ba8b423d
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.7.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.7.ebuild
deleted file mode 100644
index 1277b1e77c15..000000000000
--- a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Allows you to use fixtures in @pytest.mark.parametrize"
-HOMEPAGE="
-	https://github.com/dev-petrov/pytest-lazy-fixtures/
-	https://pypi.org/project/pytest-lazy-fixtures/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_lazy_fixtures.plugin
-	epytest
-}
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild
deleted file mode 100644
index 17c2003838a4..000000000000
--- a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Allows you to use fixtures in @pytest.mark.parametrize"
-HOMEPAGE="
-	https://github.com/dev-petrov/pytest-lazy-fixtures/
-	https://pypi.org/project/pytest-lazy-fixtures/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_lazy_fixtures.plugin
-	epytest
-}
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.1.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.1.ebuild
index 17c2003838a4..1277b1e77c15 100644
--- a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.1.ebuild
+++ b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-reserial/Manifest b/dev-python/pytest-reserial/Manifest
index 6e222b761d17..90a52133ef6a 100644
--- a/dev-python/pytest-reserial/Manifest
+++ b/dev-python/pytest-reserial/Manifest
@@ -1,2 +1 @@
-DIST pytest_reserial-0.4.1.tar.gz 11687 BLAKE2B 68c54b8e89c25d41fcb99f715a6008f71f55ad9e3101b37a90bb3b944fac473dd66392d08bcbe464af942fae58d9406492a65a3d61b547bef33d446b46d69f6a SHA512 1ac92258b3fdfeb9aca95b105c7a8ea21891f2609c591e7aa07ed8cc3d9b17f48eb7ec7d3d53524b564d5572ca679d897b8b06107fc4c370f3ed3cd2125cdfdf
 DIST pytest_reserial-0.4.2.tar.gz 12374 BLAKE2B 4f0d89bef2f4f99f2a9d9ef1ac5c46e31817ed4c91b78bd41f2670a89dd87dd642a1c80f0574957c24467cb77cebb9f0de27e540b47e0f70933cd6cf4a933ac7 SHA512 e3b9a82feee58c6808bb0491bf6c92f6ee0e1f83b3fafb676a4eac4ed03c90e29ead8d93ed275a83a7f2de3148aa55ba27f6dc6266c2e308e7085794d88a0ffa
diff --git a/dev-python/pytest-reserial/pytest-reserial-0.4.1.ebuild b/dev-python/pytest-reserial/pytest-reserial-0.4.1.ebuild
deleted file mode 100644
index b8cf23d15a33..000000000000
--- a/dev-python/pytest-reserial/pytest-reserial-0.4.1.ebuild
+++ /dev/null
@@ -1,26 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for recording and replaying serial port traffic during tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-reserial/
-	https://github.com/bessman/pytest-reserial/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild b/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild
index 2c8ad48baa64..b8cf23d15a33 100644
--- a/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild
+++ b/dev-python/pytest-reserial/pytest-reserial-0.4.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/pyserial[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index 04ea6c52f7f5..d48baf75e0c2 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1 +1,2 @@
 DIST pytest-skip-markers-1.5.1.gh.tar.gz 73219 BLAKE2B f8f23bf64dfc23263ee58397fa8571bf76a77820230f8f27003f72f0a26cbb19ae76185ed203e5b516326a40a355c2d006101f2eb7cd4df40f4a4d80e8e7c629 SHA512 4221e39ab472a88c4f6d0cf2fbf0de1568f99f5ca9962e4afab060b6cfd8365d106583cf818a98bbc7f8f4d5192c7fc9678e4e0da2b6c1082c26ee2e049b0004
+DIST pytest-skip-markers-1.5.2.gh.tar.gz 73513 BLAKE2B 51eb60d13a4b91030f68cf95cf1cb1987cc77bc105355fbceb289e73412f577347ba0340403e32b7930c08945b4d0292b7eededc84e8a5932c457073c823be1e SHA512 631cc632dc3d56cc9a62253f50897b98305402516faa2cf10fce8099069618bc82d281ddf1bf5e89ce8e62b798a8391a09132ec493199f3a86e8681c7062b58f
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild
new file mode 100644
index 000000000000..f825e6a8b953
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.2.ebuild
@@ -0,0 +1,47 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="
+	https://github.com/saltstack/pytest-skip-markers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestskipmarkers.plugin,pyfakefs.pytest_plugin
+	epytest
+}
diff --git a/dev-python/pytest-subprocess/Manifest b/dev-python/pytest-subprocess/Manifest
index 2cef4ce5fd6b..fdac6d1036de 100644
--- a/dev-python/pytest-subprocess/Manifest
+++ b/dev-python/pytest-subprocess/Manifest
@@ -1,3 +1 @@
-DIST pytest-subprocess-1.5.0.gh.tar.gz 34771 BLAKE2B b76ab9234ff2ec437ef9679c2e8af6cdc545189c7fd9f832f68c5cad094c80250c5fe1fd6e0da54d7a8c09da30a66f7f097da66f03d169e149186b49e2b72b56 SHA512 8489993cc396d41d127927ab46a43120528dbcb9641e7be03777689af127df29fe618eee3a815e96a0353cc02117dc1af22800d748476c4fe2b76c2246229f08
-DIST pytest-subprocess-1.5.1.gh.tar.gz 35269 BLAKE2B a614376eb25b0e58fe438f2bfc2033ebdb4e83a34cc4fd2ef68b162830dadc2ec4eea436abdcf7d88591ade57e05dd2dcdfbb6443ae30549a03aa9c0935afeeb SHA512 1b719a6d3d1a38638490d574f2b3f9b8a6b76f4059fd05f8c7230395db34caf5e34e58a977ad47a779e65b77317bc05af1293378bca84469fdf205822fbc1cdc
 DIST pytest-subprocess-1.5.2.gh.tar.gz 35438 BLAKE2B bbc92d99dfdd094e8295df37dd3fb66a022ebd4d711bb3f80408d21c8dbe3304bdafd8e7b0fcba15c681b8598bb55f92e0e91e9bd837ca165e94b791ef02c4e3 SHA512 56bf95ee085e74df1b9691d23a1e766de304896a74fb319df22dbb3faa6e4959fe9b7e790cd65a55c816fb39f3ae8db68bd501aeaade0db498a7273cd7267e45
diff --git a/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild b/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild
deleted file mode 100644
index 44a6409a3110..000000000000
--- a/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin to fake subprocess for pytest"
-HOMEPAGE="
-	https://github.com/aklajnert/pytest-subprocess/
-	https://pypi.org/project/pytest-subprocess/
-"
-SRC_URI="
-	https://github.com/aklajnert/pytest-subprocess/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/anyio[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.15.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-subprocess/pytest-subprocess-1.5.1.ebuild b/dev-python/pytest-subprocess/pytest-subprocess-1.5.1.ebuild
deleted file mode 100644
index 80e8900dc3c4..000000000000
--- a/dev-python/pytest-subprocess/pytest-subprocess-1.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin to fake subprocess for pytest"
-HOMEPAGE="
-	https://github.com/aklajnert/pytest-subprocess/
-	https://pypi.org/project/pytest-subprocess/
-"
-SRC_URI="
-	https://github.com/aklajnert/pytest-subprocess/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/anyio[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.15.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/aklajnert/pytest-subprocess/pull/162
-	sed -i -e '/py_modules/d' -e '/find_packages/d' setup.py || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_subprocess.fixtures,pytest_asyncio.plugin
-	epytest -p rerunfailures
-}
diff --git a/dev-python/pytest-subprocess/pytest-subprocess-1.5.2.ebuild b/dev-python/pytest-subprocess/pytest-subprocess-1.5.2.ebuild
index 4f4e29ad9e31..ff98cfbe44f7 100644
--- a/dev-python/pytest-subprocess/pytest-subprocess-1.5.2.ebuild
+++ b/dev-python/pytest-subprocess/pytest-subprocess-1.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 5eebe2b1b608..afe2ed9a7571 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,5 +2,4 @@ DIST pytest-7.4.4.tar.gz 1357116 BLAKE2B 0bf281b3d4b7b2eb7805423a75c8c2befa820cc
 DIST pytest-8.0.2.tar.gz 1396924 BLAKE2B ad95d246f5592cfe54faea6c96e38cb60d3e2713070d1ff7cab6c42aea312883c5d97c99a930dbcbd8493e966c4b8351320f6494b4ab904afbf21d7e1dd004a7 SHA512 c495943baad05e09b467d23c7afadb3edff7ae93ee96290d6db9e64739236888148b63dff7e8e25b331b11bd48c55fb0ca8901cf823d69b1a922e94915bab2f1
 DIST pytest-8.1.2.tar.gz 1410060 BLAKE2B 1379047c5ba434e98a383756c53a9cf31dc3bd3abcc49820f872b9110ec70906ca14080ce17ed2770b71195fbd79627a0eb16ee00429e165368144b20153a02b SHA512 a6ffae29da98ee4c357ebb03f00c4bc1a33f093ef867ad118841695548468c7f229eaa2c029a2ce3b158bbb0a65be5014e91555a223d04c1c72e614cb1d00546
 DIST pytest-8.2.2.tar.gz 1427980 BLAKE2B 7f343e5ff05e4d26f816595ad1c52ee2b79d38029e75e3641ed0bbb7477e0a47e5ae48ebc3058a8e9f374cd1a391d360d9eda73eca2e41d8b533eda7948aedcb SHA512 896192f0d41f3fef49915dfea6ae33dbb939f6bbe54de27861bf1554bf87f910702169293e923af9bc40466e7f806aa19ca54cbe41a848c233f70b52bb86a63c
-DIST pytest-8.3.1.tar.gz 1438997 BLAKE2B acf50897e018b678231beecc73093788d1b810c47cf81f5d9b156c04f61bfbea00b2c3d49c5ec81d70d0b1f4c3fe084a821c4fa53a200ffe6950177a823a66a2 SHA512 fd650785ec91233242c9ee2a1847d3f4a679cfc4504fa6863410bda2f16527e655261eb285e936219e0bca0d95d958265aa7d3e06401bcd5f5127af3f2809425
 DIST pytest-8.3.2.tar.gz 1439314 BLAKE2B a8edbd9d0eef59e1277d88ef657c4720b79ada68c51b1a30af81ae5652e1bc6c30bf6723472729015446da7815d8b3a7c73af4f5a49664d96beeedc96bbb3d54 SHA512 df4df6603f89658c1d814e209ec71a29606b2c015e58f139e3154b2092b08d369d4660401ed0ea9f04c3c6cdc86357a5279ad01e102a3b81e2cbf6e1572ca007
diff --git a/dev-python/pytest/pytest-8.3.1.ebuild b/dev-python/pytest/pytest-8.3.1.ebuild
deleted file mode 100644
index 0158ceec3c95..000000000000
--- a/dev-python/pytest/pytest-8.3.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1[${PYTHON_USEDEP}]
-	' 3.10)
-	!!<=dev-python/flaky-3.7.0-r5
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-
-		# PDB tests seem quite flaky (they time out often)
-		testing/test_debugging.py::TestPDB
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# regressions on pypy3.9
-				# https://github.com/pytest-dev/pytest/issues/9787
-				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-				testing/test_unraisableexception.py
-			)
-			;;
-	esac
-
-	local EPYTEST_XDIST=1
-	epytest
-}
diff --git a/dev-python/pytest/pytest-8.3.2.ebuild b/dev-python/pytest/pytest-8.3.2.ebuild
index 0158ceec3c95..610b1d9ecf27 100644
--- a/dev-python/pytest/pytest-8.3.2.ebuild
+++ b/dev-python/pytest/pytest-8.3.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 088e9bf7d7e7..999df944c8bc 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,3 @@
-DIST pytools-2024.1.10.tar.gz 81741 BLAKE2B 39d44636c82ce7f2cadd543e9e3f7a32def0e11b3df24f0ae43aa47da924a1c2d9258b3147187dc9b0a12a5485e74bb906a87655ee863390af61ec6ce03ec95e SHA512 2e8d401b9f26b9a60ef4f479c982ff2b8801b00ac35b7ec06e36980fb5071c709d574e2a841f826d7ceff8a1303591c46a269284b09730c30eaca6759ca88ad5
 DIST pytools-2024.1.11.tar.gz 81917 BLAKE2B 197481c41ddf589c46e7f5470de6122f13aa1b69fab46342e20b30e51cc0f5a54cfc240522e16daaea941f4492eb9dd858de66255fba4ddbec8bd763a4f87069 SHA512 03521c3e6473e5e26c329ddeb596548c11a814c65a45b9d5a925346b7cdd9332ec0968cf80c350310955288e703c2e3d914a24253d34546a6ee814b07d373ae6
 DIST pytools-2024.1.12.tar.gz 82577 BLAKE2B 7463a8c8f5644cf2f3c0d1326cc353c111fe87230727149881a1f68a8fce046049c54ae3d414a8d60adec66cccefbd133ab446a65bf35cdb21f08a383f7571e2 SHA512 c234a55493e6dcb1b26a18f666a9e3892d2e6d3eb76cda24db97231c1a1b6fff796780ac0c6776a00a3e2d21fc6e56364879e3d39de3fcf5173c6cf7a183a3a2
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
diff --git a/dev-python/pytools/pytools-2024.1.10.ebuild b/dev-python/pytools/pytools-2024.1.10.ebuild
deleted file mode 100644
index 9e69c699f46c..000000000000
--- a/dev-python/pytools/pytools-2024.1.10.ebuild
+++ /dev/null
@@ -1,34 +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_{8,9,10,11,12} )
-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 is now an "extra" (optional) dep -- we can remove it from
-# RDEPEND If revdeps don't need it
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
-	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-	' 3.{10..12})
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2024.1.11.ebuild b/dev-python/pytools/pytools-2024.1.11.ebuild
index fcd4323118fd..9a39dd5de917 100644
--- a/dev-python/pytools/pytools-2024.1.11.ebuild
+++ b/dev-python/pytools/pytools-2024.1.11.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/qiskit/Manifest b/dev-python/qiskit/Manifest
index 67113d9b5115..b647dd897858 100644
--- a/dev-python/qiskit/Manifest
+++ b/dev-python/qiskit/Manifest
@@ -156,6 +156,7 @@ DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99b
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST qiskit-1.1.0.gh.tar.gz 9734708 BLAKE2B b188fe116ff5d0fa498e2b5c829b61950043163528ff39a51701d4f497a9dc0e1ffa27c518833dec84198682477c3398e8edb737d74b4f321b70fb3971b25a57 SHA512 7830b004b32461918ae5a739ee0dc1043386877f22f5112607828f6100e8b7b8b00fd946f465a1ae160fa1f6c40c1339dc743c7811add1c03e20c67d206a29e4
 DIST qiskit-1.1.1.gh.tar.gz 9741147 BLAKE2B ffacc2ca98fe9e5de995e44e45f5bdc463accd9a2f42d045c37dbe3571b0cd71ef78a5a89e2661cfade40bb1cc2fcdbae37733853f690c7c31b649760de30cb2 SHA512 90b241e87b7a7d6399101269d6f33c14ae8195e988a10c2a2ae5512c0e14b4a30d85845ee6ef79e1c322bccac4a036c3343fb9c362cd123305e05250cf47ec6c
+DIST qiskit-1.1.2.gh.tar.gz 9740466 BLAKE2B 72c962d4dd875cd29fbbe3d873053726074cb9db9493834efdea89fdaa1992a2b93c8ac93f8a5928c5c5685b75a976fc502b4500fffd4ebf2ef35aab179319ac SHA512 7d0054957298de2243e4bf1f9ae27c30a6dbaa0fd1253f407927878bc299ed2466bbf6e90c42874678e4f863c3262c15571b4a8cbafcf0f883998146111d8f87
 DIST qiskit-1.2.0rc1.gh.tar.gz 10922664 BLAKE2B dbf1f3b578fde251ea168c2836599446e1e35592c191e5870bde29d17259eb609c16a6e873211836306e9c3822cf7fcc2ad50aa03dd0958637c981c67ddfef14 SHA512 837de76d94bce3e6ffaefa67fb17d9a8030073f5eabfb503c3494c019af97a5470a3500f71825ba9814814db86e6e7451761af32cf71f25fe3c37523bc81bf6f
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST ra_ap_limit-0.0.188.crate 1283 BLAKE2B 265a70d088ed76500cdbefa04d1b2778d54985aa978b806e9ebb016348556559799b8ac889c00aeff51d4ff08f3fa86cd3be3742f5896916edbbda49bca1946e SHA512 01d56844fb4437959e93fc3394d674848eaae3365d271c01ba5ff12fc05d4a1d11eb4145ee89a65eb5ba12db4075e8102ee31df55c569c8ee5ad6d383f9f451a
diff --git a/dev-python/qiskit/qiskit-1.1.2.ebuild b/dev-python/qiskit/qiskit-1.1.2.ebuild
new file mode 100644
index 000000000000..fec0e0248dba
--- /dev/null
+++ b/dev-python/qiskit/qiskit-1.1.2.ebuild
@@ -0,0 +1,304 @@
+# Copyright 2022-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_{8,9,10,11,12} )
+
+CRATES="
+	ahash@0.7.8
+	ahash@0.8.11
+	allocator-api2@0.2.18
+	always-assert@0.1.3
+	approx@0.5.1
+	ariadne@0.3.0
+	autocfg@1.2.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	block-buffer@0.10.4
+	boolenum@0.1.0
+	bytemuck@1.15.0
+	bytemuck_derive@1.6.0
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	coe-rs@0.1.2
+	concolor-query@0.3.3
+	concolor@0.1.1
+	countme@3.0.1
+	cov-mark@2.0.0-pre.1
+	cpufeatures@0.2.12
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	dbgf@0.1.2
+	digest@0.10.7
+	drop_bomb@0.1.5
+	dyn-stack@0.10.0
+	either@1.11.0
+	enum-as-inner@0.6.0
+	equator-macro@0.1.9
+	equator@0.1.10
+	equivalent@1.0.1
+	faer-entity@0.18.0
+	faer-ext@0.1.0
+	faer@0.18.2
+	fixedbitset@0.4.2
+	gemm-c32@0.17.1
+	gemm-c64@0.17.1
+	gemm-common@0.17.1
+	gemm-f16@0.17.1
+	gemm-f32@0.17.1
+	gemm-f64@0.17.1
+	gemm@0.17.1
+	generic-array@0.14.7
+	getrandom@0.2.14
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	heck@0.4.1
+	hermit-abi@0.3.9
+	indexmap@1.9.3
+	indexmap@2.2.6
+	indoc@2.0.5
+	is-terminal@0.4.12
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	jod-thread@0.1.2
+	libc@0.2.154
+	libm@0.2.8
+	lock_api@0.4.12
+	log@0.4.21
+	matrixcompare-core@0.1.0
+	matrixcompare@0.3.0
+	matrixmultiply@0.3.8
+	memchr@2.7.2
+	memoffset@0.9.1
+	miow@0.5.0
+	ndarray@0.15.6
+	npyz@0.8.3
+	num-bigint@0.4.4
+	num-complex@0.4.5
+	num-integer@0.1.46
+	num-traits@0.2.18
+	numpy@0.21.0
+	once_cell@1.19.0
+	oq3_lexer@0.6.0
+	oq3_parser@0.6.0
+	oq3_semantics@0.6.0
+	oq3_source_file@0.6.0
+	oq3_syntax@0.6.0
+	parking_lot@0.12.2
+	parking_lot_core@0.9.10
+	paste@1.0.14
+	pest@2.7.10
+	pest_derive@2.7.10
+	pest_generator@2.7.10
+	pest_meta@2.7.10
+	petgraph@0.6.4
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	priority-queue@1.4.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.81
+	pulp-macro@0.1.1
+	pulp@0.18.10
+	py_literal@0.4.0
+	pyo3-build-config@0.21.2
+	pyo3-ffi@0.21.2
+	pyo3-macros-backend@0.21.2
+	pyo3-macros@0.21.2
+	pyo3@0.21.2
+	quote@1.0.36
+	ra_ap_limit@0.0.188
+	ra_ap_stdx@0.0.188
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_pcg@0.3.1
+	raw-cpuid@10.7.0
+	rawpointer@0.2.1
+	rayon-cond@0.3.0
+	rayon-core@1.12.1
+	rayon@1.10.0
+	reborrow@0.5.5
+	redox_syscall@0.5.1
+	rowan@0.15.15
+	rustc-hash@1.1.0
+	rustversion@1.0.15
+	rustworkx-core@0.14.2
+	same-file@1.0.6
+	scopeguard@1.2.0
+	seq-macro@0.3.5
+	serde@1.0.200
+	serde_derive@1.0.200
+	sha2@0.10.8
+	smallvec@1.13.2
+	smol_str@0.2.1
+	syn@1.0.109
+	syn@2.0.60
+	sysctl@0.5.5
+	target-lexicon@0.12.14
+	text-size@1.1.1
+	thiserror-impl@1.0.59
+	thiserror@1.0.59
+	triomphe@0.1.11
+	typenum@1.17.0
+	ucd-trie@0.1.6
+	unicode-ident@1.0.12
+	unicode-properties@0.1.1
+	unicode-width@0.1.12
+	unicode-xid@0.2.4
+	unindent@0.2.3
+	version_check@0.9.4
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows-sys@0.45.0
+	windows-sys@0.52.0
+	windows-targets@0.42.2
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.52.5
+	xshell-macros@0.2.6
+	xshell@0.2.6
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo distutils-r1
+
+MY_P=qiskit-${PV}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+	https://github.com/PyO3/pyo3/pull/4324.patch
+		-> pyo3-ffi-0.22.1-py313.patch
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+
+	cd "${ECARGO_VENDOR}"/pyo3-ffi-*/ || die
+	eapply -p2 "${DISTDIR}/pyo3-ffi-0.22.1-py313.patch"
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# docstring mismatches
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
+			)
+			;;
+	esac
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
diff --git a/dev-python/regex/regex-2024.7.24.ebuild b/dev-python/regex/regex-2024.7.24.ebuild
index 141086a0dd4b..163e675b0f0b 100644
--- a/dev-python/regex/regex-2024.7.24.ebuild
+++ b/dev-python/regex/regex-2024.7.24.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sabctools/Manifest b/dev-python/sabctools/Manifest
index 3683e8b7a95c..deb34950b42d 100644
--- a/dev-python/sabctools/Manifest
+++ b/dev-python/sabctools/Manifest
@@ -1,3 +1,4 @@
 DIST sabctools-8.1.0.gh.tar.gz 8963885 BLAKE2B 36d6bbc34f636ac4e892f941eb6e583166ee1f5f740440b3f07faacddf7715d8b4c642a4e6252ece1bdef69017be3d04ce5d6c8e36479bb176e4cd0635f1567d SHA512 862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6
 DIST sabctools-8.2.3.gh.tar.gz 8974172 BLAKE2B 15b15cb1a5b7e923cc43e5e619e02f09d34f69d05d692b11bf3de8b12a1f33efcf6cf8cd8b251c646f1e2be7e2941c755e2e30a205b9e066d280038b287b262d SHA512 7bf1b0e9f55d9f6384166cca911c0d1dd79b3d4d1c33effe295fe4e053394a674a36548e5241a86817ce109a1165e0814954550436f5381daddfc8c1a7c188e5
 DIST sabctools-8.2.4.gh.tar.gz 8974209 BLAKE2B ddea09ec8a0a4b34779f1e8fe5fc4712ce7dd311ded308c77fb7925b8236e740bb8c345998f7e8e92837c7c19e9c4bbaf0bd0c2ac2b967cf98aa660105814d59 SHA512 2e79a7b854be51b04a91fffb3401a4bd2e7c6d74d1815d1228a9fca97b79c599463a062386f85555ba6ce9a3e8130a1615a3c576fe5411b7dff48c37eaf6b34b
+DIST sabctools-8.2.5.gh.tar.gz 8974284 BLAKE2B acc5dcbeaa20e916a8fc8691bd389c8f60c9a9d2eca9dff2fb7dd4da4abee9ad7dcd9003eeb5f37b51f3ec5c7041517ebf60679373bd101b9546d0de7de2ac0e SHA512 8e3ed65ca4cb8879e07a48033bc6b7efd6bbd4f5a7df43db8fa28719dde194aa55a53709c9d4c29ac273369ceeb845188f1b8a0cde6904962148e6352acb40fa
diff --git a/dev-python/sabctools/sabctools-8.2.5.ebuild b/dev-python/sabctools/sabctools-8.2.5.ebuild
new file mode 100644
index 000000000000..ceda76ecedef
--- /dev/null
+++ b/dev-python/sabctools/sabctools-8.2.5.ebuild
@@ -0,0 +1,39 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_PN="sabctools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="
+	https://github.com/sabnzbd/sabctools/
+	https://pypi.org/project/sabctools/
+"
+SRC_URI="
+	https://github.com/sabnzbd/${MY_PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/selenium/selenium-4.23.1.ebuild b/dev-python/selenium/selenium-4.23.1.ebuild
index a99b7205bb66..58b9a6990740 100644
--- a/dev-python/selenium/selenium-4.23.1.ebuild
+++ b/dev-python/selenium/selenium-4.23.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 40503959b560..1f9b8edd1c96 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,4 +1,3 @@
 DIST sentry-python-1.45.1.gh.tar.gz 474940 BLAKE2B ae3195bceee5beb79d36958b79992fc8433d5315052e7cb4dde2dad4a21482549b28325329a9bd6cc44376acff69ca41b1506e7341c17314318cc93360b5fbcd SHA512 15c42187ef1a9ec1515e23e4e49980e8aecec4bd1f63866bc793bbaf75d9663a636d34c1fcc46faec839685d50366e0a2c9a2e735780d8a1f47f5986bf9fc6a6
 DIST sentry-python-2.11.0.gh.tar.gz 537891 BLAKE2B ce46efe95a61088f92c02c13ed55c4cde4e1b17cbfbbbdbb0b8092f83d5571239d004810ca193f7954f0469018b2b881ec254530c13d58056993c2811a14a376 SHA512 339ed1b325c84ef350ca29deb326b4adff5a9b648a03ec28dcf6ca461856c79b2f30944a1360204d54020732564f6c30ebe3fc8902c3b3c2a7e66e5bb0f7994b
 DIST sentry-python-2.12.0.gh.tar.gz 537094 BLAKE2B cb009c4569e5defae8cfb44bbc1260d63554dc0f002675910e8be0b9d0259f89a860d2852d9f9af8460c76d2eb311339f40847d94bc05fb06fbd677cad3d46e3 SHA512 61cdd006792dbcf4cb77f1dd3935d1ba1232361aa2e7b48f2b423873fec88c6d01c24c52cc4520989a501d372ee1d22a580ef89887c454045f6d5ce20e2e2c32
-DIST sentry-python-2.9.0.gh.tar.gz 531490 BLAKE2B 8b67caa6911fd44e58c2a1d1206e6ecb9dc31f81c15c66763a04f1a65fc89d4667e60f27e055016342c6b4cac5470729c802ffb046e6e0796d5bfd7044caf27d SHA512 aed112a2ee35e23a1431486ff18e67772476ecfc63eacc388d17454a723b98f6e05cfa95a6c9db2cb6be572eed73d249951a411c60184b20eb251520071a4254
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.11.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.11.0.ebuild
index 1d2a2bd98e46..568979a3f01a 100644
--- a/dev-python/sentry-sdk/sentry-sdk-2.11.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-2.11.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild
deleted file mode 100644
index 79169c4ad77c..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-2.9.0.ebuild
+++ /dev/null
@@ -1,127 +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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: most of them hang
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-		# requires quart_auth
-		tests/integrations/quart
-		# TODO: require opentelemetry (with py3.10)
-		tests/integrations/opentelemetry
-		# broken (incompatible rq version?)
-		tests/integrations/rq
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# broken teardown?
-		tests/test_client.py::test_uwsgi_warnings
-		# too many dependencies installed, sigh
-		tests/test_new_scopes_compat_event.py
-		# Internet
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
-		tests/integrations/aiohttp/test_aiohttp.py::test_span_origin
-		tests/integrations/stdlib/test_httplib.py::test_span_origin
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_span_origin
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/integrations/django
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_utils.py::test_default_release
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
-		tests/utils/test_contextvars.py::test_leaks
-		# pointless, fragile to packages being installed in parallel
-		tests/test_utils.py::test_installed_modules
-		# TODO
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
-		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
-		tests/profiler/test_transaction_profiler.py::test_profile_captured
-		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
-		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked -o addopts=
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 28df0d796873..c5d95793d3f7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,2 @@
-DIST setuptools-71.0.4.tar.gz 2421868 BLAKE2B 29c63bedd87dd4c79ef86d20b6ab4297ae434a59d412813d0ef136c6239b8c77c7ec81b8384319a0e18617d0f8417da3c28d9f8ece40f4509949611c575c35a2 SHA512 efd1996e2720244b8bb385682258be4b2cd67d18b0910aa3f32c23907fad998144ff47455fb8866298e2b879b714624d09efefdcf1bf1d55047ecd3d1e36548e
 DIST setuptools-71.1.0.tar.gz 2422233 BLAKE2B b98bc2155cdf5acabd52c942a8b7908dbb48b39a3abbf065e42b089e22c3bba27aeee3492c5ecfc1de8b4bdba3c97259cfc609a31cdc11cdaf23f9a2dbab8685 SHA512 2cb817d3dee790ab1e71739b3980361c6dface44fa9c027a92aa3f96e758c034b0330de5eae48365dfa17933fe050f8418cff23fea192b3c616789215e411c1a
 DIST setuptools-72.1.0.tar.gz 2419487 BLAKE2B df05affc48f8909b6b3b9dc30ef33e31c4b3781e747fea7d23b855d0294976f563e25b268666bfd2c758be66eca00e3e850463ff3d6f26b891185a2a15c8d31c SHA512 d0a34f16dfa6bb9a6df39076cd43528cf854d343f6f801c448ea0ebab2a259aec3d03571e2a26709df6082ed2fcb6c43b86448be556fd559b6af41831b4f38e0
diff --git a/dev-python/setuptools/setuptools-71.0.4.ebuild b/dev-python/setuptools/setuptools-71.0.4.ebuild
deleted file mode 100644
index 7dd2fdeb4a7a..000000000000
--- a/dev-python/setuptools/setuptools-71.0.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!!<dev-python/setuptools-rust-1.8.0
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/jaraco-test[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.7.2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor setuptools/_distutils/_vendor || die
-
-	find -name '*.py' -exec sed \
-		-e 's:from [.]_vendor[.]:from :' \
-		-i {} + || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-71.1.0.ebuild b/dev-python/setuptools/setuptools-71.1.0.ebuild
index a6e9a718aab0..7dd2fdeb4a7a 100644
--- a/dev-python/setuptools/setuptools-71.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-71.1.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index ccf1a9ebc0c0..04447c744e8b 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,3 +1 @@
-DIST sphinx-autoapi-3.1.2.gh.tar.gz 68260 BLAKE2B 31315fb298f7dae78c10f839e2738340eaf68d5497f22368c50f14309a564d1c5636015a715a9f99080a4f753416a10c63147e63dfcd53a27d7466ad422f95c4 SHA512 18e4a49e831446fa14278ffda4fec703f3b2c86654ce78fa7f4b89e5a41f1e6b19ea76cb64e7290a3125dc027a2de8aa052495a8bfd4bcc1828780f762e81957
-DIST sphinx-autoapi-3.2.0.gh.tar.gz 68693 BLAKE2B f9d70febea444a12c4db906614223415f51e649c3cb02770ca24e7274cb1e6c64a86802545ff1cb7b22e0e63bb63ceaaf1c27e487982a3d8d45e750a497dda01 SHA512 d14d62d4ab414f54f0066a63de490c293fbbbb1ca364b3094ca915fcb7765f373650a933026bf9582aeafb5556efb83c72a907f17c5168888bcfd7cbad081583
 DIST sphinx-autoapi-3.2.1.gh.tar.gz 68891 BLAKE2B b31db0f584498a96d3bf7e57fa92abd884d3b8bb8812236a8491685f0fc81d212e114ae1663e316ba7ba14dee082dd4aeab19941f3d6ab85de95399f3736f596 SHA512 e1920a79ce8954a9da1d33fd46e5c1968990e5cfd960a8c97ac344d3d6dd97c06dbbafb3144e67d223f6504b233e0cf59328f015d918264df12b00aed8e34f8f
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.1.2.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.1.2.ebuild
deleted file mode 100644
index 7e9a3be7b273..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.1.2.ebuild
+++ /dev/null
@@ -1,50 +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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-# sdist is missing docs, as of 2.1.0
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/python/test_pyintegration.py::TestPEP695::test_integration
-		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
-		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
-	)
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.0.ebuild
deleted file mode 100644
index 0405fcac85d4..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.0.ebuild
+++ /dev/null
@@ -1,50 +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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-# sdist is missing docs, as of 2.1.0
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/python/test_pyintegration.py::TestPEP695::test_integration
-		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
-		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
-	)
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.1.ebuild
index 0405fcac85d4..7e9a3be7b273 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.1.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.2.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index a58e2bb07f7a..bfa5822e3887 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,4 @@
 DIST sphinx-7.2.6.gh.tar.gz 7067425 BLAKE2B 4da1cb5ccebea4df0dc134c552311d7b70ce9b76424ea4355ad67b1ece60c9b445e56c96b838832d4df2f50940832b3fa9555b596390464a4017a573bcf514c3 SHA512 204e859318ad5044639f2e682098b07c7cc675b54ba801feeb3322290bfd15316cc15a2cae8fa6a55e6ec6d1e9690790e5402652eb04720bfe96e172f4c8bdbc
 DIST sphinx-7.3.7.gh.tar.gz 7165383 BLAKE2B bcc68f26937e6aefe60cedea533a5c8e245c76b59ab4913fb6516f285e3afc32be60b336c662ac8305fb88e82fcc2b477128f2d8b9bf92f037b124f4c855df2a SHA512 540553ecddc55b3e673c79bc776a899d2c660f1e93ef819711be52174accf5b70465883a46bed81d163534e56718caf0765b4bae153e9307a3792387d8228df5
-DIST sphinx-7.4.6.gh.tar.gz 8187130 BLAKE2B 69cf73dc3644ac0fbb4e2d26ee07652b4a16bb2d87fba1a6f5a3dba74533af470d2449658eb7029479618d47ea34d6dc896126cfe330d31b343c0a3300ba90b3 SHA512 7015aa5b926856e1e3ed35b559a78dbeb8a1746028f4a488a3237c65ea5eb786a9feff05649b8126395c6f8277802a093c704ca13e941d3aab561b2fca8b0de8
 DIST sphinx-7.4.7.gh.tar.gz 8135111 BLAKE2B b5a511355b16edfbcf32f9a20855466251c592a7fbffa33a84d84369f2a9de7767cd9529cce3f350cdf25bfbb53534ddea70d9482c1d6d78e9ab160d2c9821e8 SHA512 bfb48d4dc09f108986c5b7737710c7495fbdd83eb18f2a1c77bc9d324c499bffb5103f65ebf7396260f10c0f89eddb1ae5eb8d037bd33fffd748483f4391a7e1
-DIST sphinx-8.0.0rc1.gh.tar.gz 8139326 BLAKE2B 3cb69ece3d6f85ceebd494abe9ae11a76b3473eca52611b197cd3a34985e37bc0275c9c194d87ca529a63d46976c9624ff9270734b638f8cbfb81c25f5fee0be SHA512 cd7e1b01a2a6dcc3106aef6f110bbd1c4cc06865e7c20c85e65b191128c4a28c836c5401f02e6a812317033b97ff4f683948b78d3edd56fbb8d12d6a7ada52f6
-DIST sphinx-8.0.1.gh.tar.gz 8264971 BLAKE2B 5c0fb71607b75fc445cafe115bc2765e859d0224857149862517060e6133a610a05ca2c10fe78f32cf7f99396bd4991a834dcdecd0d3945bc6300a010dfdf408 SHA512 11e6901c27484fbad7c9f1b3c192603f3dd9d79092f3910ea05edd6541d0f8368471134c53d694f6032ad2d22131baf1b0bee2725f89c291dc236a6195315ed9
 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d
diff --git a/dev-python/sphinx/sphinx-7.4.6.ebuild b/dev-python/sphinx/sphinx-7.4.6.ebuild
deleted file mode 100644
index fc49ec061c2a..000000000000
--- a/dev-python/sphinx/sphinx-7.4.6.ebuild
+++ /dev/null
@@ -1,142 +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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	' 3.10)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# we can't use distutils_enable_sphinx because it would
-	# introduce a dep on itself
-	use doc && build_sphinx doc
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# less interesting failures
-		tests/test_builders/test_build_latex.py::test_build_latex_doc
-		tests/test_extensions/test_ext_math.py::test_imgmath_png
-		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
-	)
-	case ${EPYTHON} in
-		python3.13x)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
-				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
-				tests/test_extensions/test_ext_autodoc.py::test_cython
-				tests/test_extensions/test_ext_autodoc.py::test_format_signature
-				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
-				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-				tests/test_util/test_util_inspect.py::test_isattributedescriptor
-				tests/test_util/test_util_inspect.py::test_signature
-				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
-			)
-			;;
-	esac
-
-	# note: pytest-xdist causes random test failures
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=5
-}
diff --git a/dev-python/sphinx/sphinx-7.4.7.ebuild b/dev-python/sphinx/sphinx-7.4.7.ebuild
index fc49ec061c2a..3be4424831e9 100644
--- a/dev-python/sphinx/sphinx-7.4.7.ebuild
+++ b/dev-python/sphinx/sphinx-7.4.7.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-8.0.0_rc1.ebuild b/dev-python/sphinx/sphinx-8.0.0_rc1.ebuild
deleted file mode 100644
index e1702504343d..000000000000
--- a/dev-python/sphinx/sphinx-8.0.0_rc1.ebuild
+++ /dev/null
@@ -1,144 +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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	' 3.10)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# we can't use distutils_enable_sphinx because it would
-	# introduce a dep on itself
-	use doc && build_sphinx doc
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# less interesting failures
-		tests/test_builders/test_build_latex.py::test_build_latex_doc
-		tests/test_extensions/test_ext_math.py::test_imgmath_png
-		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
-	)
-	case ${EPYTHON} in
-		python3.13x)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
-				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
-				tests/test_extensions/test_ext_autodoc.py::test_cython
-				tests/test_extensions/test_ext_autodoc.py::test_format_signature
-				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
-				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-				tests/test_util/test_util_inspect.py::test_isattributedescriptor
-				tests/test_util/test_util_inspect.py::test_signature
-				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
-			)
-			;;
-	esac
-
-	# note: pytest-xdist causes random test failures
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=5
-}
diff --git a/dev-python/sphinx/sphinx-8.0.1.ebuild b/dev-python/sphinx/sphinx-8.0.1.ebuild
deleted file mode 100644
index e1702504343d..000000000000
--- a/dev-python/sphinx/sphinx-8.0.1.ebuild
+++ /dev/null
@@ -1,144 +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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx/
-	https://pypi.org/project/Sphinx/
-"
-SRC_URI="
-	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	' 3.10)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		app-text/dvipng
-		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		virtual/imagemagick-tools[jpeg,png,svg]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
-	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# we can't use distutils_enable_sphinx because it would
-	# introduce a dep on itself
-	use doc && build_sphinx doc
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# less interesting failures
-		tests/test_builders/test_build_latex.py::test_build_latex_doc
-		tests/test_extensions/test_ext_math.py::test_imgmath_png
-		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
-	)
-	case ${EPYTHON} in
-		python3.13x)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
-				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
-				tests/test_extensions/test_ext_autodoc.py::test_cython
-				tests/test_extensions/test_ext_autodoc.py::test_format_signature
-				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
-				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
-				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
-				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-				tests/test_util/test_util_inspect.py::test_isattributedescriptor
-				tests/test_util/test_util_inspect.py::test_signature
-				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
-			)
-			;;
-	esac
-
-	# note: pytest-xdist causes random test failures
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures --reruns=5
-}
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 03a784bb3097..d910e8d2c09b 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,2 @@
-DIST sphinxcontrib_htmlhelp-2.0.5.tar.gz 21925 BLAKE2B ba023e53c14b5427b09a9608cfc45ccdf932d4c27cce40932088fadb127ebfe50d7b2639513589469facf108fdc748e0f07195766e6e4bc67d26c50d00a2bf75 SHA512 537ef6a1a32863728a6324fcd50f9374e4f488ed7ed112f9f0ceb9e4488637f502280dda21835e8d63c6b6297d2a3db3032c3f307dce5948b516f293d07b9711
 DIST sphinxcontrib_htmlhelp-2.0.6.tar.gz 21957 BLAKE2B 44b03832d8b89978062028be32a1253f2d5f2134b83f7e95fc685ab669ae3b4131dbad452e49d84cef56993a701f1cc1fbf1f50583fdc114eed7a05ad261c5ac SHA512 842194261315b35c470dee36ea7945b73dd08338f2b86d542b3a21d1cb900a2fbe0ba8ec2412589b4c8993b71d88b0e4fcfb0e3316db61c8ba2989811d3e073e
 DIST sphinxcontrib_htmlhelp-2.1.0.tar.gz 22617 BLAKE2B c9c97e4b879de3c4220795d6356925e70f09c6705740fafe609d2e1c02585c2f86a00e985969e60dd100bd26408a910d78e5537317d8e101e227b633bd2292c1 SHA512 9aa2650ed27712a94de6ea16954db952db9c4a0c5f509aba42e33c69ba46f7069e9ee01c09a31e531fd096882c0248cf72334404d717a9f35aafc22e3976530e
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.ebuild
deleted file mode 100644
index f0fb99ec9b56..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs HTML help book"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/
-	https://pypi.org/project/sphinxcontrib-htmlhelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.6.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.6.ebuild
index 4b368dea4d7b..f0fb99ec9b56 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.6.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index aa98a93e293c..1e77a20f28ae 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,2 @@
-DIST sphinxcontrib_qthelp-1.0.7.tar.gz 16685 BLAKE2B dbe4518134f31f9283a1de4a9f7c1b1fd59e3c639923dd5a84fe1c60323f8c0fbf31942ab51724241bf8865b78c5c83bc7c2187d7209b1c55027245cae2bd271 SHA512 fa11be5f663a0784a59ee18deaa8d497eeb4d5311fd86f75d48f40b70d8c0c868bd8625a001da274379d2b3412447abd810cb44af42f8a252cbcc31c400884c9
 DIST sphinxcontrib_qthelp-1.0.8.tar.gz 16778 BLAKE2B 71c0639f526e3a83bb5c47706e0073234a40691d22337cb41920f612fdd2798731b6d84cde2744e24e545c9d23559a48cc94ecdf49f887404370c3ef3f698756 SHA512 d3bde9e5e8ace4f58fc76bea22fdd7740a503f46a671f52f836039cd85f62733187b87395669bb2566de451c4de253725316ff97ca3c910b8dd31149c3c80331
 DIST sphinxcontrib_qthelp-2.0.0.tar.gz 17165 BLAKE2B 568d59a1ec6d46bf0974bda0112396ed0e73576bef691214ecd61e551030a55e719d485149aaa1ca353243155d48f8e0f1218a67ddeb73f3fc83c4b99655e52d SHA512 d551559a6f0fddf61ea24ce067e28a6bb8a61dda1f62e3a2531e43c8ec8059eb819b6a37f912425832c1b0f8dc4b830614240c38abca8a04b31ebb0ded59ec4d
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild
deleted file mode 100644
index 7e8300ef229a..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx extension which outputs QtHelp documents"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-qthelp/
-	https://pypi.org/project/sphinxcontrib-qthelp/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		${PDEPEND}
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.8.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.8.ebuild
index 13ff49468a58..182e4e5c8184 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.8.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.8.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PDEPEND="
 	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 9b435cff6ae6..06f7d7cb5555 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,3 @@
-DIST stripe-10.3.0.tar.gz 1300786 BLAKE2B 626a3c52cbb93aeae3749f6ffedd421557aa4e8085d2b0591ca2c1c866caa64ef78bdf8f0e5c85ee814ffd588d95ee05267748a97f2a50ff89d28a9e501d4da8 SHA512 7353df871f0b83330208e1a3e0fa339d319c3bb1b2e4e90bf045dd691120b22b908e263f3cdae5127b3a1299b950be3685ec631492888884d42570947de70268
 DIST stripe-10.5.0.tar.gz 1301564 BLAKE2B 5cc9175c52bfadb0fc05528b406090f72215d2b27eefa51336508a74dd348d37d51b93e0e898ba22b1102316b95643bad6b0ca0e1ef84c8053b98a34ed496698 SHA512 c320c9f6b77ce38ef4182607168c811d512ba12d080c8f1c4f61fbdef6adaa2c955078e333715343e0bf796826e9d303a45765e1e67aee518a3cd6ffbfb801b4
 DIST stripe-10.6.0.tar.gz 1306235 BLAKE2B 0dbedd05118c31452e50f24fc92afb4f21a129ea1b47054d4c79bb48d6ea520ba34bc9b694c4919037488ad316180f793be0aa84068ed30c0c8bd7092841c4d7 SHA512 745aeedec3a666850afd77925c15599a74c73142808ee3cc9835e1853ece7c4fbb68c556f02b92d7265d638ed6fe39f254ccf3fb62cadeccc2e2bc57c57a9a7d
+DIST stripe-10.7.0.tar.gz 1311319 BLAKE2B c593f9478e180b8965e6d4c93c58f0e539c0821b79c48893d65fa59f4a31d29eece26ab74113f251fa5da0620358bb45e9030e1a64aa17d189974f7c6250cfcf SHA512 2f0c6082cf292068a8790c7080e60c2b7fef2a16b5cf9fd31dabd1e7428b6317941cb64b32c7710d165a5b6b2da1c5899e5cfa88e354bc88c49c9513c25c58a4
diff --git a/dev-python/stripe/stripe-10.5.0.ebuild b/dev-python/stripe/stripe-10.5.0.ebuild
index b2cab2367687..1cba4d61f3ac 100644
--- a/dev-python/stripe/stripe-10.5.0.ebuild
+++ b/dev-python/stripe/stripe-10.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/stripe/stripe-10.3.0.ebuild b/dev-python/stripe/stripe-10.7.0.ebuild
index 1f4fc9bd9f4d..759904f8a22d 100644
--- a/dev-python/stripe/stripe-10.3.0.ebuild
+++ b/dev-python/stripe/stripe-10.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="telemetry"
 
 RDEPEND="
@@ -26,7 +26,7 @@ RDEPEND="
 # please bump dev-util/stripe-mock dep to the latest version on every bump
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.186.0
+		>=dev-util/stripe-mock-0.187.0
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/httpx[${PYTHON_USEDEP}]
@@ -36,21 +36,25 @@ BDEPEND="
 	)
 "
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
 
 src_prepare() {
+	distutils-r1_src_prepare
+
 	if ! use telemetry; then
 		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
 	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
 }
 
 python_test() {
+	local EPYTEST_DESELECT=(
+		# exception message mismatch with aiohttp-3.10.0
+		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
+	)
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest tests -p anyio -p pytest_mock
 }
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 168b78c6af03..bbdcd5049cf9 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,2 +1 @@
-DIST tempora-5.6.0.tar.gz 21659 BLAKE2B 865fc851d852e054b389cbc5731a9523297b134c6d6e812cff9a6dfda8be0c0c9b2aa5f63324642ef3c151529f82292d867d01bf68a9aaa4f7a3e6d296a8f4bd SHA512 dd8dfe94813a482a2493e3129c9dd4f40dd399bc933a5348454b903d49def1c84a417696c24b66533bcfa93d3d334c67114bdc0cc2512ce39384c039911b4d0d
 DIST tempora-5.7.0.tar.gz 22239 BLAKE2B 11c9ba681b1973b75e22cc4a2c8bcc1a2620e0284ce1b7d42fda25ce8c2a35bd4a9a4b329013143dbfd27613a327fb8d3d048d1230f679a240ed5ea6abc9761a SHA512 4c1bc7e45cfa1f415bfa6bcee3d6b82246477279b89328a98b8b944dddf7184a515e0733bb868321f63cbcb21fcb7847543a2643c059e6d2e0721c2e66ad4239
diff --git a/dev-python/tempora/tempora-5.6.0.ebuild b/dev-python/tempora/tempora-5.6.0.ebuild
deleted file mode 100644
index 9c4da55b9aab..000000000000
--- a/dev-python/tempora/tempora-5.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-freezer[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezer
-}
diff --git a/dev-python/tempora/tempora-5.7.0.ebuild b/dev-python/tempora/tempora-5.7.0.ebuild
index d037dcfc60de..c6a38cf432d6 100644
--- a/dev-python/tempora/tempora-5.7.0.ebuild
+++ b/dev-python/tempora/tempora-5.7.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 6f1bb9bc3034..f546ec9d45b2 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,2 @@
-DIST uvicorn-0.30.1.gh.tar.gz 722580 BLAKE2B 33cb5683bf8d3f3bbc2a17a354356adee2be66259cd79413c9f1ef698485c46060a609a8f0a28cef05de71631569ac61c12aad6913a3243f45eb7e1691a481ea SHA512 ce705c1e99ca0feff3f82e067c0df9e21dea6ff3789541757edbc686718bcb0c80be392fd75f7c0962c5d7251e7e3e441e97633057dcb43e565c48a4d6b3d392
 DIST uvicorn-0.30.3.gh.tar.gz 723748 BLAKE2B 8191491ebbccf8586e668bc6c14ce0a526d958ee1bf618cbf714bcb0932c36e14bfa4365a3ce88129180dcb0a2ac62b65fd977262f936b31a84267e3d41a971e SHA512 de6299c4b93bb14ea5ef466d2ebb91e24c2b9ae3e47158e924ae8c1f1e58a3fffd39e3e001e647afa47512f9481f5a3e2cce613427600200bcf27c4143c4e608
 DIST uvicorn-0.30.5.gh.tar.gz 723960 BLAKE2B 462cdbe47f035a6b100908e5fa533a9afa7be3232ce79fda372686de54a14ca13771245a98c53b7ad729ba3119cd83b9d4acd5ab4069064f6c9fee3542f7b0be SHA512 9752b415159e152264d0d9a9a93cd82ec3b6ab08fe115698e54ecf5e2534c7c2368e05dfd21486c8711808482a85c563ecf1d5027c09587872aced4f7023a3dc
diff --git a/dev-python/uvicorn/uvicorn-0.30.1.ebuild b/dev-python/uvicorn/uvicorn-0.30.1.ebuild
deleted file mode 100644
index 31afe1b8844a..000000000000
--- a/dev-python/uvicorn/uvicorn-0.30.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-	)
-	case ${EPYTHON} in
-		pypy3)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.30.3.ebuild b/dev-python/uvicorn/uvicorn-0.30.3.ebuild
index 171f3a489763..31afe1b8844a 100644
--- a/dev-python/uvicorn/uvicorn-0.30.3.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.30.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index 9d28d21fc071..5ca5ecdd8c1e 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,2 +1 @@
-DIST versioningit-3.1.1.tar.gz 212882 BLAKE2B 786af766a5e85ea426dee02d1ae888b0a50712f9d154690302b3fdb1f4aa037a931612ad3f1f169a3d8f3481db09da895cf3ba7dcbc7d2f256b3b8622334e08e SHA512 f8e23834324f785b93668f4cb55d57885cf96e9ca16f1d6a06c3610dd00a79c018960fe52aff5fe4cc735b5fcec27be1ceb151a88e0e9a447cba750dd6956816
 DIST versioningit-3.1.2.tar.gz 213047 BLAKE2B d34f3d14a667e84a0d7f17fa9de59bbb4d900d466120879939dfb9586b20ee45c6f33991c586438e47cc58de70db03996ade0561a91efffeee49545ac5f1ef97 SHA512 0e09a51ed9a137ffa9a66c2a8b4c43131bd27d07e35b896248d963a780f955d6bf37de29c04e41acf06dd636a3609d045e359b28429d7272fad6187db7748c3c
diff --git a/dev-python/versioningit/versioningit-3.1.1.ebuild b/dev-python/versioningit/versioningit-3.1.1.ebuild
deleted file mode 100644
index 0f9b01547f68..000000000000
--- a/dev-python/versioningit/versioningit-3.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A setuptools plugin for versioning based on git tags"
-HOMEPAGE="
-	https://github.com/jwodder/versioningit/
-	https://pypi.org/project/versioningit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		<dev-python/tomli-3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Tries to do wheel/pip installs
-	test/test_end2end.py
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-python/versioningit/versioningit-3.1.2.ebuild b/dev-python/versioningit/versioningit-3.1.2.ebuild
index 3849504db724..0f9b01547f68 100644
--- a/dev-python/versioningit/versioningit-3.1.2.ebuild
+++ b/dev-python/versioningit/versioningit-3.1.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 96ee57a130cb..5cc835485be8 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,2 +1 @@
-DIST ytmusicapi-1.7.5.tar.gz 277989 BLAKE2B 18cedc9ecaa5f2220b81dd831102cab6aa7dedcd745be9d561d79b2c7ecc2e31973e9d4671bcdc79827da64f76102dd984a430222b94dff5a6b418df85c1dde6 SHA512 f5c9d2bd5deb45a8d834a262d3d45f7691c1a86a3a67f0b5e3129940f323a1b6f4e50f17e66a9b843f28ca0b04db9e9b2fc873f1edbf147ab915f399d38e386a
 DIST ytmusicapi-1.8.0.tar.gz 283301 BLAKE2B aa0d0a8b30b75873865360dfe7b0aec436debf5b2e0f96f2d4008f5234d42802a3a84acd55f83244c03995d605718139f30cda21a798d23c841cc4f9a395d4a5 SHA512 5b7d3fef54eef586b007b6bb6f5c81aaf068302de2493fff8e6ce6bdd9387836615bfa9ecd10ce2516effe1707d11de55ad8a967562e8d6faa527c7e808c377a
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild
deleted file mode 100644
index 8338c7b229db..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild
index 7cc8b0851928..8338c7b229db 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.8.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/dev-python/zstandard/zstandard-0.23.0.ebuild b/dev-python/zstandard/zstandard-0.23.0.ebuild
index 1d2fb3da6ab5..bc7c8e2797a8 100644
--- a/dev-python/zstandard/zstandard-0.23.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.23.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	app-arch/zstd:=
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-08-10 09:20:42 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-08-10 09:20:42 +0000
commit	46b22cbda83fea140ffc339a0c979d43c3ba1471 (patch)
tree	059fcbd1e92c5aaac0defc16981043fc536098eb /dev-python
parent	5439f76b0795ab33c7c8a07b3e1918a9cde7abf1 (diff)
download	baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.tar.gz baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.tar.xz baldeagleos-repo-46b22cbda83fea140ffc339a0c979d43c3ba1471.zip