Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-01-29 17:53:41 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-01-29 17:53:41 +0000
commit: 1fdeabdc269610ddb66f36f34e1f6416a5eea439 (patch)
tree: fdc643778f2a873bdb2b3581ae354bb10f242215 /dev-python
parent: f9e0c4a63c8eacef6ef1379be1fee3c5b90f7c0e (diff)
download: baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.tar.gz
baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.tar.xz
baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.zip
155 files changed, 517 insertions, 3608 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.41.ebuild b/dev-python/GitPython/GitPython-3.1.41.ebuild
index b80b43f89830..60ea35ca629f 100644
--- a/dev-python/GitPython/GitPython-3.1.41.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.41.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ~riscv ~s390 sparc"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index ea185863d65a..fc5ddc20aa43 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1 +1,2 @@
 DIST aiohttp-3.9.1.tar.gz 7482118 BLAKE2B 2150ae98f799f9c6e1f48987bfd8b1847439d8b87cd21417676c2fa5c971fcdc13c3f933dfdd5eceb92b47ad604d16c2a71d884118d8bde1816f2d944d2930a2 SHA512 3288085d5fbcfb7e3664f906345aeab6f989f2318babae6bf5cc3955de48707e9de56ce3b9553d6ee35c72b8f884dc1fd01861a638ee738573e78a203e6a9dec
+DIST aiohttp-3.9.2.tar.gz 7499640 BLAKE2B 7e840d4493345b0cfa9315c562703de94cb550dc6ead293910552dab3e4fe13a47af210827452544b3c16b5fbc9d02d1e62a6cb4fadd54b0b4f1dd93b3b5c038 SHA512 8e9c41b45d1ffd99ef819a6c46f16dd7c92dd2416c383ad9c3d810c055cc0a0db4e7ab15e7ef5b3550eaa68b18538b246b45a969ce7d76cbce667209c7477643
diff --git a/dev-python/aiohttp/aiohttp-3.9.2.ebuild b/dev-python/aiohttp/aiohttp-3.9.2.ebuild
new file mode 100644
index 000000000000..a9fccc81a9f4
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.9.2.ebuild
@@ -0,0 +1,117 @@
+# 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 pypi
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/brotlicffi[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/async-timeout-5[${PYTHON_USEDEP}]
+		>=dev-python/async-timeout-4.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		test-rust? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+	sed -i -e 's:-Werror::' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+		# python_on_whales is not packaged
+		tests/autobahn/test_autobahn.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+		# broken by irrelevant deprecation warnings
+		tests/test_circular_imports.py::test_no_warnings
+		# TODO
+		tests/test_client_session.py::test_request_tracing_url_params
+		# fragile timing test
+		tests/test_imports.py::test_import_time
+		# crash in time-machine
+		# https://github.com/aio-libs/aiohttp/issues/7851
+		# https://github.com/adamchainz/time-machine/issues/403
+		tests/test_cookiejar.py::TestCookieJarSafe::test_max_age
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			# upstream unconditionally blocks building C extensions
+			# on PyPy3 but the test suite needs an explicit switch,
+			# sigh
+			local -x AIOHTTP_NO_EXTENSIONS=1
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest --forked
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e30c0821398b..8f66c70f6054 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,3 @@
-DIST boto3-1.34.14.gh.tar.gz 762792 BLAKE2B 87857a6ff7e19f8438fe6b57978cdb3c8d22f8a68008fad4fcfdd40358b919a1c45f810bc45637da5971d20ce221cd8343440663d072666349e32c4df2be97a2 SHA512 8b651c5946394e159d6dd719337e4a5a60f708fa22ef26026bd85a18b3f34efa06f71282b9e9ea8c8ad4995e4bd6d0c13e4dddac75a51922fc30154ac0b87ecb
 DIST boto3-1.34.18.gh.tar.gz 765458 BLAKE2B 29414e20fa034f63c899b6f2d5460d8973dd617aa97adbe1940daaf3f4a08cf9286bf24709fe9bcd745fdec8415578a87033f99cfd1335baa8ecf29f1723074d SHA512 aa5dc9363d3f04f49a40ea352ab75a30b52e9b1aa1153ab4ed9d6bef6059ea6cb0cb04301158f0e857d9abd19c670db447dda6cd9d8898d6c71c0b69242775fc
 DIST boto3-1.34.23.gh.tar.gz 766609 BLAKE2B d00b010c84c41695f02df58a51d483162af1ba770263218b6465132fdb104424ea8dd7c8d96e278c50700aa3c90d2321a21d31e9ae3b42712aff31a1a5c4b65d SHA512 4f1c0cafb3d511a23c07b97ed2b41369299d0a4819e0bf103288c7b44074c93bc55b729a2979b133a50d390660078a0bb0e251dcd1523244fdbe06cae6ef037a
-DIST boto3-1.34.25.gh.tar.gz 767540 BLAKE2B 0018e04ce16529de14bca16011f7e4dfc94966986d8a1ae952ddc6a26b9639aff56385ae2631feb6a7434d81665939c19a10e6b727ccbd4d1ab4afdbe36dc9e5 SHA512 e9e8a42c868b48d2c1cb0e7d80074d0dba63f58adb69adaa8288ab702e552f09d719acf06a1d436090187474e829f9b29d651531c14c1b0461c8807284a84b11
-DIST boto3-1.34.26.gh.tar.gz 767554 BLAKE2B 1dc099c1d6d1da2e704c574bc8bc70883fb2f8974faa1e8c87154e0c5a892a38a8768b6aef59710cad598a1d11ce0e03d81bb2f0c0c7e9a531b434a9ff22aa15 SHA512 3da5b2d00054c5344ec32ec20fbc1bd74b8be31616102d4b5c03367c4ffae97fc80fbec62562a8d42893df3791524d5f5b490570fe1881ac266fa3849f8ccc9a
-DIST boto3-1.34.27.gh.tar.gz 768012 BLAKE2B 4a8edd2470b58b02b684def8a3e1d70950621498e557e7a4f89bfbaf798339eb5e9bb89f3653063d79ebfbf1b04e706fa7209beef8d5e110e6a9f00e022d47d3 SHA512 76eb0e341f368a391be492c9551de77165e43721a54f87493c20d4c5bb89e2318b86e83009d92366014660a41d969165dfa9cb12591b0ac60f6fbb82fff590c0
-DIST boto3-1.34.28.gh.tar.gz 768214 BLAKE2B f208190d0321351252bd252f4152df7ecf337cb74e4642b4dc21c9d4d0aa7bb14aae2760b4220df292a1d47108fb23a42d73bc0d0aa28417298561d0f8795690 SHA512 3eeca1cd88a61bb8a7cdf23cd0c0317c3f5c4f915c4379a916a5b3a96263029c9932cb100286d8f5d9cef531a73e80ff66321d2869724cf9669a8fa9bcdec792
 DIST boto3-1.34.29.gh.tar.gz 769654 BLAKE2B 3eec92f78f343c1806eb7ad96a31b07592ffb355aed5bca75b9cf9bc32cc240a1c254cd43e618d7cba442dddab31035f43f319aa674b5fd6ee99e93d76514389 SHA512 1dff0825811b346e1300030770f00dfea9694d3f6c4beccddfb2ff00520503271b617321e124a1d922da8e8fb1d2c2beb08a83f23eb5e5754bf1d519ea994cf3
diff --git a/dev-python/boto3/boto3-1.34.14.ebuild b/dev-python/boto3/boto3-1.34.14.ebuild
deleted file mode 100644
index 6bf591555d3c..000000000000
--- a/dev-python/boto3/boto3-1.34.14.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${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.18.ebuild b/dev-python/boto3/boto3-1.34.18.ebuild
index 13391b8a8e76..6bf591555d3c 100644
--- a/dev-python/boto3/boto3-1.34.18.ebuild
+++ b/dev-python/boto3/boto3-1.34.18.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	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"
 fi
 
 RDEPEND="
diff --git a/dev-python/boto3/boto3-1.34.25.ebuild b/dev-python/boto3/boto3-1.34.25.ebuild
deleted file mode 100644
index 13391b8a8e76..000000000000
--- a/dev-python/boto3/boto3-1.34.25.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${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.26.ebuild b/dev-python/boto3/boto3-1.34.26.ebuild
deleted file mode 100644
index 13391b8a8e76..000000000000
--- a/dev-python/boto3/boto3-1.34.26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${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.27.ebuild b/dev-python/boto3/boto3-1.34.27.ebuild
deleted file mode 100644
index 13391b8a8e76..000000000000
--- a/dev-python/boto3/boto3-1.34.27.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${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.28.ebuild b/dev-python/boto3/boto3-1.34.28.ebuild
deleted file mode 100644
index 13391b8a8e76..000000000000
--- a/dev-python/boto3/boto3-1.34.28.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${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.29.ebuild b/dev-python/boto3/boto3-1.34.29.ebuild
index 13391b8a8e76..c6201d2c5818 100644
--- a/dev-python/boto3/boto3-1.34.29.ebuild
+++ b/dev-python/boto3/boto3-1.34.29.ebuild
@@ -13,20 +13,14 @@ 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"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
+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-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
deleted file mode 100644
index fc1e40c08394..000000000000
--- a/dev-python/boto3/boto3-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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} \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 26b9413878d4..2e040af92fa8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,3 @@
-DIST botocore-1.34.14.gh.tar.gz 12617340 BLAKE2B c4aac6682ccb8951f4652477857d58221c4f0d8f1d154b7ecfa4e536f6bdb199e4be43ef63f0fce0843e95c01cfc0a479af8c7773a9717461afc04cd4bb27912 SHA512 44b7b0e96c815b033dc603892c3940869a37c76d0826812d5778b644ca785ff27f870f3ec54c7d87696bd57d2a38cc31c4b3e70f295fe9d588afc12e8f7a914e
 DIST botocore-1.34.18.gh.tar.gz 12634296 BLAKE2B c3f18b042ea56c65f66b578f5b010613e34d4ca7a203cdbd479ef781fbebf3876b40623468e0fbbf7721f9a3e7ad82e71d1771bb24c721e3bc450acaff1f296a SHA512 bd0ace3da7e45edf98a13b1616b0699b0a2e2c3aec1e59dc7f8c11a3817fb1aefc8aae5634abcbf24f242c155df24ba93348f55fd6cb588abf129010b28f351e
 DIST botocore-1.34.23.gh.tar.gz 12647072 BLAKE2B be20994714a1f31ac5272d5b7be8424e574be1059c5be311e68d1932eb6884a54f71287dc5a9c11996063e4c2ab15a342bf778a0a90620710761e63a5deaa170 SHA512 fcc1879245e8d848c8cd6283af904e0408a5bdaa3b3e14c4ae267735cb29bdde50f1da5f3232ea23053f25fc1f29a1204a08a5c820909cf8667595543b6cfdea
-DIST botocore-1.34.25.gh.tar.gz 12652238 BLAKE2B 3509adf5f95387c1bc574dfed6edfbb69cd12508278101c5a5c509977eef0542ecd7748204182616095927ce6b834282f6e2e0c4018f094e9f046f0459c1d104 SHA512 5d94c9b3765399d7642ae3e1374ad5c065ee8c774557314f7535bc938dcc5db3dedb0d21a23df60140b8c1d3fc03d94502d61cd41bbc7c19953a9c6337479da4
-DIST botocore-1.34.26.gh.tar.gz 12658700 BLAKE2B 614b76d37259c4a37db4e91cce8a2bb64630bdb1172c081f169d8016ff6e4db221a56d5873594fb1251782b8c3758cf00ea7bb0aeffaedc2c9a163d86c8cd708 SHA512 86707d98ec287d01152eb179747e66f3ba8563e7fc83752d1c9c782296277dbe582ce56049859044dbc270fb4499c2d07de6a55b094597625234071203bf7d4b
-DIST botocore-1.34.27.gh.tar.gz 12662876 BLAKE2B 8e9dcdeb03da533960df43c3688c4cdce2604e0eefb36a54ac372e04c7f828354523a9c322ad6fc8b1b7d349bf49417041d6074a34628c64db9d5caa9e90fe29 SHA512 1bae71c8156c4e465b3343ad91675cfcf78cef66ff382a54e56a5b12bf7c4dc2d385860846b97507288dbb9fb5878dc3a52555d872edc411eedc1774e0151871
-DIST botocore-1.34.28.gh.tar.gz 12662404 BLAKE2B 31be5eb858f751947852d78d62d5bccb23b72eac03c4a83e27d576c4e1d651d27f78b5779afb9bc72797f6102f3efeb7c1aa78c9889d40ce988364ab4ea2d3c9 SHA512 042e31e106f5f22eeeed9cef1526710a767fbb9f398d39c85520a5767cb37f1bde10d4923cac7fbad6bec796ba4dfba330446309ab613ce53e4ff9b7771fab01
 DIST botocore-1.34.29.gh.tar.gz 12665018 BLAKE2B 928c27ae62a5e2675dc5476af05a4390cbeaf9d5c64cae6a5af0d5348f703417f48431258fc7c4ad316908fd29f6bfeb5a7c76290ea9622172f3d787f40021c7 SHA512 5314900eecf2d31fe08bcb9efbc1a361467fe034129c85f5cb4a678275115292fc5a6a95fbbe3cc06aa0a1387e14dde0f9115a9aa25ba59dba62a02c3b8db43b
diff --git a/dev-python/botocore/botocore-1.34.14.ebuild b/dev-python/botocore/botocore-1.34.14.ebuild
deleted file mode 100644
index 0106367c65a4..000000000000
--- a/dev-python/botocore/botocore-1.34.14.ebuild
+++ /dev/null
@@ -1,68 +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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.18.ebuild b/dev-python/botocore/botocore-1.34.18.ebuild
index 2fc3a4924fdb..0106367c65a4 100644
--- a/dev-python/botocore/botocore-1.34.18.ebuild
+++ b/dev-python/botocore/botocore-1.34.18.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	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"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.34.25.ebuild b/dev-python/botocore/botocore-1.34.25.ebuild
deleted file mode 100644
index 2fc3a4924fdb..000000000000
--- a/dev-python/botocore/botocore-1.34.25.ebuild
+++ /dev/null
@@ -1,68 +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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.26.ebuild b/dev-python/botocore/botocore-1.34.26.ebuild
deleted file mode 100644
index 2fc3a4924fdb..000000000000
--- a/dev-python/botocore/botocore-1.34.26.ebuild
+++ /dev/null
@@ -1,68 +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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.27.ebuild b/dev-python/botocore/botocore-1.34.27.ebuild
deleted file mode 100644
index 2fc3a4924fdb..000000000000
--- a/dev-python/botocore/botocore-1.34.27.ebuild
+++ /dev/null
@@ -1,68 +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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.28.ebuild b/dev-python/botocore/botocore-1.34.28.ebuild
deleted file mode 100644
index 2fc3a4924fdb..000000000000
--- a/dev-python/botocore/botocore-1.34.28.ebuild
+++ /dev/null
@@ -1,68 +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/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.29.ebuild b/dev-python/botocore/botocore-1.34.29.ebuild
index 2fc3a4924fdb..fd76f2226b9c 100644
--- a/dev-python/botocore/botocore-1.34.29.ebuild
+++ b/dev-python/botocore/botocore-1.34.29.ebuild
@@ -13,19 +13,14 @@ 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"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
deleted file mode 100644
index 9588357367ec..000000000000
--- a/dev-python/botocore/botocore-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x EPYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 46198970cfe3..b68b5ff25100 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,2 +1,3 @@
 DIST Chameleon-4.4.3.tar.gz 178203 BLAKE2B 0946e91b4f0be618bd8d5c9c87b3517af5cf1fd1af7182d2b1a60feda876e0ba5d1f2b7de9c3b2b27f0a4615dbd346b90abf497f0a1c9e3312b4b52ac8685e98 SHA512 0b72da4b17bf2b815eef329c9a07e51d8405fe38813e025db404279888e410e7d406b314a72ed5b76a7e5416d43a075ea0b0a8971cd363d4999d73172d9583c5
 DIST Chameleon-4.5.0.tar.gz 178580 BLAKE2B c4298048849bd294fc6c0778ad0a72ded30afbf928fda4c7e188fc54fd8d931f275f9e8d96bec8b0028261f8e470b7760b9a56bde4d1c3b7edab91c218dddd57 SHA512 36ffc2f7e917df967b5df530452c0610561cdf67a491994662cd9ce15ef8889ba5242f163a408c5bf02e4b87e8e2decbbe0d6f404e9953978bbdb319cb179ca2
+DIST Chameleon-4.5.1.tar.gz 178857 BLAKE2B 2fbe5519fa8686e3ae035b4a3c7e204778ca4e3d4b5e6f3770a50d908db43d5b445a243926832d3d3b9e4c95efacb4f0f996c2e24b974888160bdfa39abe1395 SHA512 1d130d40cdeecd95f6e28f074229e61e13a6bfcfb593909f96742f0744d8ee0887b2d94c1766e4f4ae78699a6d3b88c6160c043e255868f580aa4549e02d6ce9
diff --git a/dev-python/chameleon/chameleon-4.5.1.ebuild b/dev-python/chameleon/chameleon-4.5.1.ebuild
new file mode 100644
index 000000000000..d151699b1d62
--- /dev/null
+++ b/dev-python/chameleon/chameleon-4.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="
+	https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/
+"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/conway-polynomials/Manifest b/dev-python/conway-polynomials/Manifest
index 6636907eebe2..21c10c107e81 100644
--- a/dev-python/conway-polynomials/Manifest
+++ b/dev-python/conway-polynomials/Manifest
@@ -1,2 +1 @@
-DIST conway-polynomials-0.8.tar.gz 244196 BLAKE2B 0096f522b8a785ed9d5975aac4d8a518d491e608ad72e9bc70e0530c953fd4e033ec6b9d5c54b7ebce9e7c103c8445aed42c4dc6b7708537f857ea5860032b24 SHA512 ddc223a1924e8740734ad646950dc457454f19883f690bf0d94365a6087591bd296a1c9cd41f4935361ee62046d4b7a333bb3ba90614bcf92228716166f2745a
 DIST conway-polynomials-0.9.tar.gz 245106 BLAKE2B 3b44b337151428a18f8fc01bfa92ffe4019d2427242efed3a9edec93e2054f706ad3735505a5d90382a1c4c8e9846080de1d34538f053ba2ccda88e91fcc5fc6 SHA512 15f0dcd69f2ffb78f4f4a7d8e11ac0e37fb23bea124778b24a4bff228a00f2f09e830e49225f0b574869f88e9c90e9114921e240eb462c10071c124d04fe90a2
diff --git a/dev-python/conway-polynomials/conway-polynomials-0.8.ebuild b/dev-python/conway-polynomials/conway-polynomials-0.8.ebuild
deleted file mode 100644
index 5a1fa72e11b4..000000000000
--- a/dev-python/conway-polynomials/conway-polynomials-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python interface to Frank Lübeck's Conway polynomial database"
-HOMEPAGE="https://pypi.org/project/conway-polynomials/
-	https://github.com/sagemath/conway-polynomials"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-python_test(){
-	PYTHONPATH="src" \
-		  "${EPYTHON}" -m doctest src/conway_polynomials/__init__.py \
-		  || die
-}
diff --git a/dev-python/conway-polynomials/conway-polynomials-0.9.ebuild b/dev-python/conway-polynomials/conway-polynomials-0.9.ebuild
index 7c2c95d251bd..7e8b600efa55 100644
--- a/dev-python/conway-polynomials/conway-polynomials-0.9.ebuild
+++ b/dev-python/conway-polynomials/conway-polynomials-0.9.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 5bc66efa63be..73700a2519e4 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,3 +1,2 @@
-DIST dask-2023.12.1.gh.tar.gz 8967874 BLAKE2B f397512fb50a53719fff8e234db0e366b17c9abaca4b98c0b1d4a98287dec7f869612e688cfa2e717fc35c4ed1f7a8d8fe74c7dec939e8f669e6790490005370 SHA512 4a90239e83e7cbd4797ee91dc9609d7322a7003b976ed3309de95b47d20e2e9f449cea803618539c5f80ec552dd2ac71e55c87c024beeabf74062beeb3260292
 DIST dask-2024.1.0.gh.tar.gz 8975960 BLAKE2B bcc72c1428d0626eb686551c69b0dcbc7b9615524bbcdbc1bb6d5113929f32d53cc7d0952622d352ef7413057b9f90689471b3540b3748beb6cddd0dbbdef2f6 SHA512 a2a436cba1f84d7223ed049c395807f900bc012d7fb8c8ae18c27b15787885e6a6a02cd17da2cc7f765b26469190217e2c8306495fbfc82e3018e1bcee54d24b
 DIST dask-2024.1.1.gh.tar.gz 9328425 BLAKE2B 6b6208c59e0446816a962a9a3dc6a1754eba589810aacdab0c1ce38edd6d593763d1868578a344babfa74afd390ac1997d2461586b12180679fdc67ae26e0a74 SHA512 a5e424333c5d19f67d73c2b036544ef03122a99c2eb6a52019929f1e7b87297c776cbea713062372cf1685ef3b79d47734d6d0acd2c054ffadcbb3d96fb6deeb
diff --git a/dev-python/dask/dask-2023.12.1.ebuild b/dev-python/dask/dask-2023.12.1.ebuild
deleted file mode 100644
index f75a96d8b5f3..000000000000
--- a/dev-python/dask/dask-2023.12.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/click-8.1[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
-	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# more tests relying on -Werror
-		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-		dask/array/tests/test_random.py::test_RandomState_only_funcs
-		# TODO
-		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-		dask/tests/test_config.py::test__get_paths
-		dask/array/tests/test_linalg.py::test_solve_assume_a
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-		dask/array/tests/test_image.py::test_preprocess
-		dask/tests/test_system.py::test_cpu_count_cgroups_v2
-		# require sqlalchemy<2.0
-		dask/dataframe/io/tests/test_sql.py
-		# crashes
-		dask/tests/test_base.py::test_tokenize_object_with_recursion_error
-	)
-
-	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# fails if pyarrow is installed without USE=parquet
-			# (optional dep, skipped if it's not installed at all)
-			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_rerunfailures -m "not network" \
-		-p xdist -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/dask/dask-2024.1.0.ebuild b/dev-python/dask/dask-2024.1.0.ebuild
index e7216e3b1488..1c0fe8aea61b 100644
--- a/dev-python/dask/dask-2024.1.0.ebuild
+++ b/dev-python/dask/dask-2024.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/click-8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest
index de0664fc0583..04812b910f61 100644
--- a/dev-python/ffmpeg-python/Manifest
+++ b/dev-python/ffmpeg-python/Manifest
@@ -1,2 +1 @@
-DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301
 DIST ffmpeg-python-0.2.0_p20220711.gh.tar.gz 3286678 BLAKE2B f2dd4445f43ebf2a867d528e24e80b137ddc099770069e1fdf081b640f8ea192ee0b17c26d9ee3d8a69a9c7bbd61d0b75cc3468aa5da4fdd809e50126dff4e06 SHA512 81f20e5cad819500b941d9ac579fe01efb4292f61e6279c6d560d70c11143d7c04146a8ccf9ae8ab6985cf04e6b7cc05849ec67df646caa75764f3a2c5761cde
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
deleted file mode 100644
index fbbae92b165a..000000000000
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
+++ /dev/null
@@ -1,49 +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="Python bindings for FFmpeg with complex filtering support"
-HOMEPAGE="https://github.com/kkroening/ffmpeg-python"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kkroening/${PN}.git"
-else
-	SRC_URI="https://github.com/kkroening/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-"
-BDEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-_run.py-collections.patch
-	"${FILESDIR}"/${P}-setup.py-pytest-runner.patch
-)
-
-EPYTEST_DESELECT=(
-	ffmpeg/tests/test_ffmpeg.py::test__get_filter_complex_input
-	ffmpeg/tests/test_ffmpeg.py::test__input__start_time
-	ffmpeg/tests/test_ffmpeg.py::test__multi_output_edge_label_order
-	ffmpeg/tests/test_ffmpeg.py::test__probe
-	ffmpeg/tests/test_ffmpeg.py::test__probe__extra_args
-	ffmpeg/tests/test_ffmpeg.py::test_fluent_complex_filter
-	ffmpeg/tests/test_ffmpeg.py::test_pipe
-	ffmpeg/tests/test_ffmpeg.py::test_repeated_args
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/src
diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
index db54f126ec05..1dce710f89a6 100644
--- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
+++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0_p20220711.ebuild
@@ -21,7 +21,7 @@ else
 		-> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
deleted file mode 100644
index 6231ba17b86e..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-_run.py-collections.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index afc504d..bf43c06 100644
---- a/ffmpeg/_run.py
-+++ b/ffmpeg/_run.py
-@@ -137,7 +137,7 @@ def _get_output_args(node, stream_name_map):
-     if 'video_size' in kwargs:
-         video_size = kwargs.pop('video_size')
-         if not isinstance(video_size, basestring) and isinstance(
--            video_size, collections.Iterable
-+            video_size, collections.abc.Iterable
-         ):
-             video_size = '{}x{}'.format(video_size[0], video_size[1])
-         args += ['-video_size', video_size]
diff --git a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch b/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
deleted file mode 100644
index 67fbb2308a37..000000000000
--- a/dev-python/ffmpeg-python/files/ffmpeg-python-0.2.0-setup.py-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-index 0282c67..2011d2c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -60,7 +60,6 @@ keywords = misc_keywords + file_formats
- setup(
-     name='ffmpeg-python',
-     packages=['ffmpeg'],
--    setup_requires=['pytest-runner'],
-     tests_require=['pytest', 'pytest-mock'],
-     version=version,
-     description='Python bindings for FFmpeg - with complex filtering support',
diff --git a/dev-python/fonttools/fonttools-4.47.2.ebuild b/dev-python/fonttools/fonttools-4.47.2.ebuild
index c4dcb3b2034d..95088c3f87b4 100644
--- a/dev-python/fonttools/fonttools-4.47.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.47.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index ba51724576a3..241a3398d73f 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,2 @@
-DIST google-auth-2.26.1.tar.gz 238839 BLAKE2B 91f866d35a9a3c0faaa8305e0b4d28ce87c8c5cf7b1549d4b8cea6cda96efeda4909846fd50545774c8bb128a1b7b1b74bc79ffd9bd78c4ddf138d75829bedd8 SHA512 08593547cc447e10bc1a033f154f1f4e7a248250899ef2ea49aa818a2705d0df3aa01c4dc84b6f4eb1f51e08187c634d229c396d0f2615a987e7fcc2dec9010b
 DIST google-auth-2.26.2.tar.gz 238968 BLAKE2B 58b8410130c68fbf24a40d57eae28107432e46a1676c1e32684c05cc1b1077dd5133a5891d89eedc9c9e4acacf9148deca5e650ad3860e6f23096f4dc0457aa3 SHA512 4a4ed658d0911f97e46f7ae2d59e5409facf639c6faeee506869b64d14a448fa7b83b4121bf1a48b515882e1fdececc7dbdd96562bb6b5cce7c7bfc86abe806a
 DIST google-auth-2.27.0.tar.gz 239688 BLAKE2B 3fa3c3c3da41b6337140e0ae474ab5b3a2da5aad3d18be64959c90339e03279594af97033faf406c0e76a923686b89a8f55ce5f7dff3bf3ad4510aca85189240 SHA512 a352cfced15d3e312410d382170909024d00cc27c34c3ec166af36aacf37ea9ac76b5c8bafc6e1379e2ddf3e422c27ce996474338d4efd17c21c9e79f3756994
diff --git a/dev-python/google-auth/google-auth-2.26.1.ebuild b/dev-python/google-auth/google-auth-2.26.1.ebuild
deleted file mode 100644
index c7973081368a..000000000000
--- a/dev-python/google-auth/google-auth-2.26.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.26.2.ebuild b/dev-python/google-auth/google-auth-2.26.2.ebuild
index a05717a8fe9b..c7973081368a 100644
--- a/dev-python/google-auth/google-auth-2.26.2.ebuild
+++ b/dev-python/google-auth/google-auth-2.26.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2b282b12356d..222470e1edeb 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,14 +1,3 @@
-DIST hypothesis-6.92.2.gh.tar.gz 9408586 BLAKE2B f6d873d16a337ceb5d78bc80622a08fb6856b5fdbd0c0c228bca13d340375b882416bf6ad4cfd08bb9959807ce1ac482ef5b4202792713c76a30dfff78fd4d4b SHA512 51bfd0b5d520fe84b4e682772888320d61bc4c52c6b4dda609f758336cc151bcf00714635e19230cdd1695209b6adf05cee349a82003e443dc5f52a7f105feb5
-DIST hypothesis-6.92.6.gh.tar.gz 9410707 BLAKE2B 337369c5044682b3404ba0492cdab838db53e2c081e668e41facb6c8b6aaf38cf55f20a64150f1249360b64f90f34b42002becca6d7a33245a0ac55dd0e34e27 SHA512 86822dea75326343946aaf036aa8b0aee7287bdfbe501cf5c532e9377957bb6ba7f63595b1aae383bb007099e3ca33bd1f3d2ed6d7d8722ceb86b9146502a07e
-DIST hypothesis-6.92.7.gh.tar.gz 9412316 BLAKE2B eae3a5d46dde5d69ab5fea429178eebeed06bec4ff25744324a3ed75e9433ac9652eb467a3a0a32fbbbe9924913f25ac87b375d1cf27c82fa5b024bdcbcdb791 SHA512 5fd04e49d76ec42dea4575666ed19ee249ef8cdcdca81d8c652b79fa879d51cfecd1851245c9b950627227d42c7520f7396816d2a8cc66991e1abc955a2c6cbd
-DIST hypothesis-6.92.8.gh.tar.gz 9412899 BLAKE2B 48bd1218f20260b983df4c75def1ad30a48d368975e5cf64bcc0eeb5148bd8cd2afe9b9b912304f13be791ca35f99bade225bcd7e600687a8249060b8b1767bf SHA512 ce5b97360dc45f4cbc26a7c68b1b7200e9906821200207479be80ab0c4bab5f5c363d1e914bc163eda096e575560146cdeb5f129b0ffd1545455df427c00cac2
-DIST hypothesis-6.92.9.gh.tar.gz 9413220 BLAKE2B 066b291fe6df2d14a15c77be63196c26d27764ba69c6de4a417a6117a770b3305d8ff981643e62776d8254a7e2248741d4c7da6489adcb1a0fb641776f3520ef SHA512 1e9e81963aaa23d4b6d2290cca4644498a10aadd6a2417511ac57466ee87ebc89cc3b34eb7367af131916b04304aa52c3f736a5557a7e757fda5d40af478332a
-DIST hypothesis-6.93.0.gh.tar.gz 9413948 BLAKE2B 1cb75543757163b5ceffd4050f5eea9d1953f607f935af0ac290c56ccd48e62cfbfe6f124a4162c395c30f985dc7426bcc70d348c27dc515b89ca1a1b8fa2e95 SHA512 20f7727ef77cd961ed4368c4441dd1aa49495d19a4f486e84234360f0280f1f4b848915a19f0445b31c3f66b9f25e65a000dc147852bc2fa1ef42e35be31a0d7
 DIST hypothesis-6.93.2.gh.tar.gz 9415414 BLAKE2B cbd0d0dd1cc737d6e8587c888b255220adffa5b15027767cede0a29abf7343d94259da45c772f00fb976a5dc0baba5c00761993cb9cc70fdfc7489c9c02d0ed1 SHA512 b981f2781bc5e2f7c7e340fee22fd5ab3869154488a70518dca7c179636fa906fe64ff706f828df09a42daad4d9640a037b534e657d601d0a78e059ac6ad146a
-DIST hypothesis-6.94.0.gh.tar.gz 9418907 BLAKE2B 856ab9b074e308cc61c8a5d030d7d7d9930cade0995b901e75638d1acd1ad4fc4b2afe87627c384cd63df6cb8bb84292c76cf3da6cf23dc8951c26f87a99d30e SHA512 f9056ffacfbfa722e5ed0fa6ba5a82053b6959826aab68f7b131cf4136107b581bbf78bf3691e935c76a514d8742bb9599fcc398fe4a2bfeadc2408da26976b4
-DIST hypothesis-6.96.0.gh.tar.gz 9419802 BLAKE2B 347801a68db086f2f22c8cd49d1cb8f2e9dff5373fba4c2f5563734a4f198b7972b69ad3856604d5c9bb67c68e82fe70a8b54f27f16c2bf08672fc2eed1c084e SHA512 2c29d3d443f34381d8dc04fec1e5aeccf9a55790f9bc30aaca27e65521023605501d06251090a0b1ff321b9e88f08120c52be0c59878e7ea9e2d8e8ad44ded80
-DIST hypothesis-6.96.1.gh.tar.gz 9420126 BLAKE2B 546b9c77a144b58490fb5b6ba51fdff6e4f953bd942ce7a94a937e442e44526703479b5786787597e1af6028eb252e8d242f268c50591d83d2ffc438daeb006f SHA512 6c34819c8929d038c42e6539483a1d1c3f4c5dea7a5bed4db96194255b4f41ec3751a91f0eae242c27c9cf2135eb4428f0e759c596b6841fb95d7f971c5a5fe8
-DIST hypothesis-6.96.3.gh.tar.gz 9421880 BLAKE2B 0d73e363550ca45c316ddf05bc0615aaf9846482b0aaaf64daa0879ac716314b222afdd37aaf29bc00c32f3cfd984609292151e458c5b1165144b1d870cc698e SHA512 8d847e9db1ce83ebed7307be8df91dc517b37cf2588ddf005a158f8b3dca2cb3ee95ed5268d1d74d25a374959f7553d1fa8ab2bc83f314113042c090970a5307
 DIST hypothesis-6.96.4.gh.tar.gz 9422075 BLAKE2B 0ab12a01c8d714490f3785ac01779c69d0dc5f31bb3c85be3c1ff9831c1b2392f19ec45adfd40f334f20d48b3ad1300d38ed2e49ca318f17cae36de44895bc3d SHA512 8cbfbf36c7e1e56c31b58aadd9e592672430492eb7c7fb570d4e1277df3e0dd83f76ef39e27e0c644e38c3bc35c993b79d1e6687be73c0780fa36840b4a2baec
-DIST hypothesis-6.97.0.gh.tar.gz 9423342 BLAKE2B 77a1c7f3569e8a919e6e506222368163e87e98c99e35d4b65e07d4504db7842782689b4ca24bcf6d79cc4c0b59f9fafad2ceee54df6d94a48c7e114d10247bd1 SHA512 81308772235ed024e64ef4fd40f64905c26d9109ce4a21140eb83af60697a8025011ceeb354eb600eda5c39bc03247fc0b6ad8f3bfbe639be7dd8cc9d889c815
 DIST hypothesis-6.97.1.gh.tar.gz 9423481 BLAKE2B 6a52bf6a970bf8056284baaa21aa63fe85c289f4c7e856860eff39f82eab82b401360953d165e795db2b45c99bba16a28518328db052ab3eb2185f2c4b61881d SHA512 2334e23e3056c478c5288e1726ca6feff968caa97e2c6b3758fc62c54636d7026ea2d5e906a7e3d8c191a9d911bf9050f082ba9b42b78cffd5129f01985ac248
diff --git a/dev-python/hypothesis/hypothesis-6.92.2.ebuild b/dev-python/hypothesis/hypothesis-6.92.2.ebuild
deleted file mode 100644
index def1ceae16af..000000000000
--- a/dev-python/hypothesis/hypothesis-6.92.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.92.6.ebuild b/dev-python/hypothesis/hypothesis-6.92.6.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.92.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.92.7.ebuild b/dev-python/hypothesis/hypothesis-6.92.7.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.92.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.92.8.ebuild b/dev-python/hypothesis/hypothesis-6.92.8.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.92.8.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.92.9.ebuild b/dev-python/hypothesis/hypothesis-6.92.9.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.92.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.93.0.ebuild b/dev-python/hypothesis/hypothesis-6.93.0.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.93.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.93.2.ebuild b/dev-python/hypothesis/hypothesis-6.93.2.ebuild
index 1f7054962839..def1ceae16af 100644
--- a/dev-python/hypothesis/hypothesis-6.93.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.93.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 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"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.94.0.ebuild b/dev-python/hypothesis/hypothesis-6.94.0.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.94.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.96.0.ebuild b/dev-python/hypothesis/hypothesis-6.96.0.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.96.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.96.1.ebuild b/dev-python/hypothesis/hypothesis-6.96.1.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.96.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.96.3.ebuild b/dev-python/hypothesis/hypothesis-6.96.3.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.96.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.97.0.ebuild b/dev-python/hypothesis/hypothesis-6.97.0.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.97.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/jsonpath-ng/Manifest b/dev-python/jsonpath-ng/Manifest
index 4c6c86029e4e..7d340c03496d 100644
--- a/dev-python/jsonpath-ng/Manifest
+++ b/dev-python/jsonpath-ng/Manifest
@@ -1,2 +1 @@
-DIST jsonpath-ng-1.6.0.tar.gz 37132 BLAKE2B 5af13db8ab85482656d5c1501edfb2c61dc62a08a2c90a12a7ba7b141b538b5ebfca86c856b9f65ef1c1b82329eb0ed7db5c1890d881e4cb968cb6ca31ddeb6f SHA512 46eefe57330887143b98ef4deb97c5d7242f0cfbd923dffc17bd4147326ea4333c76df2451fbbb27933ada872628ad1ec04bdb9fc8e2c288c89bf37ec3783c43
 DIST jsonpath-ng-1.6.1.tar.gz 36024 BLAKE2B ed6b47974e55c8bb5e086249c24d847dc0e1719d6912c0097bf6bcc06ad096f54b99f9c7053c088bb2efae4c612a49364cae3b061593890508e408b6776e73fb SHA512 84f4ceb3b2e76665b56df6c6cd9bf8c155d3677cc6b4798531bb35e95a591e98186c7fa756d400cbbde4c62acc7da077d0fdf989f5101846fb74bba83dd4be58
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild
deleted file mode 100644
index 90edf0c26f53..000000000000
--- a/dev-python/jsonpath-ng/jsonpath-ng-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python JSONPath Next-Generation"
-HOMEPAGE="
-	https://github.com/h2non/jsonpath-ng/
-	https://pypi.org/project/jsonpath-ng/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/oslotest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
index 7b71d7e70c4c..a13874442cd9 100644
--- a/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
+++ b/dev-python/jsonpath-ng/jsonpath-ng-1.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/ply[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth1/Manifest b/dev-python/keystoneauth1/Manifest
index 286be000ead5..fc2f6241f55e 100644
--- a/dev-python/keystoneauth1/Manifest
+++ b/dev-python/keystoneauth1/Manifest
@@ -1,2 +1 @@
-DIST keystoneauth1-5.4.0.tar.gz 275020 BLAKE2B 10ef3799f4f3d06e966816cb6e6802511597e7371f96a75f31abfb2ad33832e90588b466fe0653ab0e7fb6728564e4b056bd208ee08184d7e44a6f230ac1b66f SHA512 874de3a0dded74ca96727b7c0149cdaddf2e3576632e76f84ca4d1810379f9db46ad4139317e36c5815d3340d18e12372bc1c942868c07e9f2800a53356142fc
 DIST keystoneauth1-5.5.0.tar.gz 275504 BLAKE2B d40d3d50efefa4d6617ed623ceacd041d3fbd58824fd3bd15c8f6c323daa897733db388985f0ef09f63e152ae06df292e1d2ffd93a0493f2744b7b3e309186a9 SHA512 161ed8967d322346ee2130300ff67c27f7a7bc412757bf5df404c2211747a8d683413ca0f695b9e66b84d78be5624a320091250e9c5f91b9040773785e89b334
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.4.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.4.0.ebuild
deleted file mode 100644
index a77d8ec2270f..000000000000
--- a/dev-python/keystoneauth1/keystoneauth1-5.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="
-	https://opendev.org/openstack/keystoneauth/
-	https://github.com/openstack/keystoneauth/
-	https://pypi.org/project/keystoneauth1/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fragile to test runner name
-	keystoneauth1/tests/unit/test_session.py::SessionTests::test_user_agent
-)
-
-EPYTEST_IGNORE=(
-	# require hacking
-	keystoneauth1/tests/unit/test_hacking_checks.py
-)
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.5.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.5.0.ebuild
index f850553e69fe..ef91df80ddfe 100644
--- a/dev-python/keystoneauth1/keystoneauth1-5.5.0.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
deleted file mode 100644
index 637368d2f237..000000000000
--- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,7 @@ setup(
-     author_email='michal.danilak@gmail.com',
-     url='https://github.com/Mimino666/langdetect',
-     keywords='language detection library',
--    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
-+    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
-     include_package_data=True,
-     install_requires=['six'],
-     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 630fe63c6f53..c09b7356f549 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,4 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
-
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 9731015499a0..75498eec6a3c 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,2 +1 @@
-DIST lark-1.1.8.tar.gz 255316 BLAKE2B 40f0590ee313e5da57e593fe1cd311dfe1222cea1be83c5d1686d9a74983c8abc4f4f913f456993c51df4ce79eced10412ff9bf3dfafbeaa30f11e1301c84f60 SHA512 e51ecb38d9e7c25cca2845c56cd3cce1b1b3940ec8f0e135373726ffb23bda46f750b03f0f0b8edc750794c2b2aab9c327ff9f381faaabd53f09e76760548957
 DIST lark-1.1.9.tar.gz 255451 BLAKE2B 0bdb34a75c17800cc6819413011de879a163317c7414b260e1a4a0ccc4b40d11636fad1ae84946e0408096525b6cfeb6f725c95caed8043d3dff3e318d15be1f SHA512 4d711451f129312a28cff84239a2928fdff96df1445f77ae7a9d882d13791a58e44663ef70fd064df954094878214611ee1313ce9315c8dcfb0833b003a3774f
diff --git a/dev-python/lark/lark-1.1.8.ebuild b/dev-python/lark/lark-1.1.8.ebuild
deleted file mode 100644
index 9e11177930b9..000000000000
--- a/dev-python/lark/lark-1.1.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.1.9.ebuild b/dev-python/lark/lark-1.1.9.ebuild
index f8c4c84e6079..7c937895837d 100644
--- a/dev-python/lark/lark-1.1.9.ebuild
+++ b/dev-python/lark/lark-1.1.9.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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/markdown/markdown-3.5.2.ebuild b/dev-python/markdown/markdown-3.5.2.ebuild
index 2abb464e13b7..2ada74ee4069 100644
--- a/dev-python/markdown/markdown-3.5.2.ebuild
+++ b/dev-python/markdown/markdown-3.5.2.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 25a9a8b35be2..4076e307d1a4 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,4 @@
 DIST mkdocs-material-9.5.3.gh.tar.gz 14676809 BLAKE2B 340e1a1e8527797e9256f034d39c0fedb97e4ff667f608fc6d7d2d94a9d24f35afc9d7372002623fba3f6da171fc5062d5ad7d3a843bfcafa4a2d423d41845c4 SHA512 5e5745193e661eab7016346cee619ad9b9d848cf49956aa9f9a3c3bb647525a0fa39c63afc6569c8973e566f6061e368d4512149f8634a463af98602c52d2163
 DIST mkdocs-material-9.5.4.gh.tar.gz 14681148 BLAKE2B 1b4b652a446a71986256dd53d87258519176b415758105ae644d2bb0fb39dd32a94462307dbcfa8011a6ba136e5f00ab8379c4937123a1435d66a94f660a9640 SHA512 79167e6751765830eb4defb6d82f7204d38dfa664a95f9e576179a9c6ee65e3dfcbce90a095e78a76c04201244400c8d67c3337130ce8f8a7dc1ac213b09581b
 DIST mkdocs-material-9.5.5.gh.tar.gz 14707046 BLAKE2B 34c5287ac701a06ddb7713fd1a7b18307cbb62de12f4e455cff6380255bfe7d28249c86e922c394d581dd0b95368309396f5f5055cb3c6edb283345ddd6a7e9c SHA512 73a4a513eed242fb690aae6a338636baf049bb510a7779ded6cefbedcdeb2cd1c681646b3587527d8e2a251315e70fa347acff4aeaa6959a26c9bfabd9ef3a64
+DIST mkdocs-material-9.5.6.gh.tar.gz 14705120 BLAKE2B 6dc6d8eca86e3f1b2942203dc3abafdf5b961afc9df0e59207809016b0c42b440d1b7e8c083cc9aa43db2095a49d3663e5e60d424f51be268906d09796b21e63 SHA512 4746f7e1ffad1e024f62005452e2250a7213c5c97a67446d664abdf68b13af670c61be0b94dda89dab72f9a2375e34e9c9a61ff343632e28182dd36af85ef381
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.6.ebuild
new file mode 100644
index 000000000000..eec1908ef846
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.6.ebuild
@@ -0,0 +1,67 @@
+# 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/nose2/Manifest b/dev-python/nose2/Manifest
index 4430f9371da3..095889d9c653 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1 +1,2 @@
 DIST nose2-0.14.0.gh.tar.gz 159460 BLAKE2B c72f939f597eead3a5d8be995fc4ae1988a0c76f5599dc9e040780520055aa1002d2d93f35527e56f90609d2f4ef560161bbf695bb3751cac71007dfbd06c522 SHA512 ed6b245bc57b63b011883f42dbda8b2797504afa02a102c43f4e7d3c6cbfcf7e8babca23f9341c7681b75dae12c2d269ea65a583c18d4d15b999df081fc0247b
+DIST nose2-0.14.1.gh.tar.gz 158984 BLAKE2B 36a79f2a9afc288fd1025e8e1875dd15f145708ea4715c2db11f7a769c87c3209ad367d55b1634b1ff032bd65606ca74ed1d4424a4fba74dd44a377820ff8208 SHA512 7cd4e4a67dfd87ce85927aa65137ca7df926e8a4b83162131cb081cbec357e951693826d43f92beb92af0e1d690c8f0a3f8cf6b0b58f174ae2516383892b5207
diff --git a/dev-python/nose2/nose2-0.14.1.ebuild b/dev-python/nose2/nose2-0.14.1.ebuild
new file mode 100644
index 000000000000..19ef3a1ce7fd
--- /dev/null
+++ b/dev-python/nose2/nose2-0.14.1.ebuild
@@ -0,0 +1,35 @@
+# 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="Unittest with plugins"
+HOMEPAGE="
+	https://github.com/nose-devs/nose2/
+	https://pypi.org/project/nose2/
+"
+SRC_URI="
+	https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinx-issues
+
+python_test() {
+	"${EPYTHON}" -m nose2.__main__ -vv || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/numpy/numpy-1.26.3.ebuild b/dev-python/numpy/numpy-1.26.3.ebuild
index f8e42fdd6e2c..e388da1d516b 100644
--- a/dev-python/numpy/numpy-1.26.3.ebuild
+++ b/dev-python/numpy/numpy-1.26.3.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 # is barely supported anyway, see bug #914358.
 IUSE="+lapack"
 if [[ ${PV} != *_[rab]* ]] ; then
-	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"
 fi
 
 RDEPEND="
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index c5ef203ff87e..f7b2b313e380 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
-DIST openstacksdk-2.0.0.tar.gz 1201657 BLAKE2B 5b1f2cf4958ace5b90b95b8c4789f70b3ab53809792ddb0337dd87d0ebb0a1bea93a3495f20e7413222cee63c1b60536c704405f683910099272ca46033e9810 SHA512 29f963aa5dce97b6bf7a90b9e82c341b6e027fd6e7937e76d98e87d05933890b0f110efbae2d03c7bc0a04feb3acf954ff0ec7d0ad28af5f0373a27e8d956683
 DIST openstacksdk-2.1.0.tar.gz 1208013 BLAKE2B 59867d2a5a8c7e11d916f760f62187b363395f72e26f0849b74bede207083d05c5b8e65e7f1aadd4c648b92995b96727c24c42b393af0f23942cfe32324f04ec SHA512 266c410ed8e1525bb341512d410abeaab8dc27deae5f2fba20ce1146cfec27f755062ff72ad0f446daf58f601409586b9d935877e56822ede306ba1425afcffe
diff --git a/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
deleted file mode 100644
index 9e907a40a53f..000000000000
--- a/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	# fragile warning-based tests
-	sed -e 's:test_unsupported_version_override:_&:' \
-		-i openstack/tests/unit/test_missing_version.py || die
-	sed -e 's:test_create_unknown_proxy:_&:' \
-		-i openstack/tests/unit/test_connection.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-2.1.0.ebuild b/dev-python/openstacksdk/openstacksdk-2.1.0.ebuild
index 7b29b390d71d..899f8fe1bd86 100644
--- a/dev-python/openstacksdk/openstacksdk-2.1.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-2.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index af6ee1296908..6242d27541be 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,2 +1 @@
-DIST osc-lib-2.9.0.tar.gz 99122 BLAKE2B 1b92c5dae95612373f8c204ad6f115b8a6728e8d193098388cad5be6514c117001f9a222c40eaa22939a53d16b02b8dee68e79ff6292e296bfbe8252ad1fa755 SHA512 253cffd491843acaa728a4361b52d9738d2eabfc82e49bb5bca0a8da583809b494161d91f243dbe92e3b0855a5b74e178fd1a5ad46c5ac69b235ad88265b0ece
 DIST osc-lib-3.0.0.tar.gz 99525 BLAKE2B f18d87433c8a135f4085ca419fb874f3d84f48966b8a45523e0da3aebf698adfcec75159f8ad4b52011e6d50f56f1627a9c8e1af5a0ab6fa3c07af153a83fd9a SHA512 61a3f900464078180503ddd86a64dc59f6bdd817a318e2cb9fa61778ca830947d00e14fd82846a62d44ec171047fee5b84edf6e1011ee89f5be578867e724ee1
diff --git a/dev-python/osc-lib/osc-lib-2.9.0.ebuild b/dev-python/osc-lib/osc-lib-2.9.0.ebuild
deleted file mode 100644
index 44fff45e4afc..000000000000
--- a/dev-python/osc-lib/osc-lib-2.9.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A package of common support modules for writing OSC plugins"
-HOMEPAGE="
-	https://opendev.org/openstack/osc-lib/
-	https://github.com/openstack/osc-lib/
-	https://pypi.org/project/osc-lib/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-3.0.0.ebuild b/dev-python/osc-lib/osc-lib-3.0.0.ebuild
index a06d88ea8199..587cf46b58dd 100644
--- a/dev-python/osc-lib/osc-lib-3.0.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-3.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 3f42c96cf8e9..1bd5d55eaaa2 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,2 +1 @@
-DIST oslo.concurrency-5.2.0.tar.gz 60052 BLAKE2B 9f45af8beaa5fc145963e3e12818325dff2a00178c3154a4cf7ce2950ca90d9771be590593cc195c2909930416501da1042768da9ba653c0126437bb518a338e SHA512 9f645aa611882e1b7218a7fbf65b54fef523d9cf067f894e9441c0a8de3ab80495ec8a167604412385edf12fc7a53b73ac0ef63e977889db7021dd5b93b0d72f
 DIST oslo.concurrency-5.3.0.tar.gz 60677 BLAKE2B 72af8a54bbea85e7564c5c04463e106e16ab1608f7ae8662b1e5db3cc07d07b0bd2531dedd9227d6823700c0e93e3c160afe7ddf27f6023715e62b787246fb64 SHA512 6f3adc558a7879ae05bfbfa30dfa4c687e5f1cd6385a6881b2e1647b116aab5816d1333b42bac0c8554685ea2ac3ee293d5b9dc836c214bb708e2d53a6971639
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild
deleted file mode 100644
index d7695e5c75d7..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.concurrency/
-	https://github.com/openstack/oslo.concurrency/
-	https://pypi.org/project/oslo.concurrency/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails, then hangs
-	rm oslo_concurrency/tests/unit/test_lockutils_eventlet.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-5.3.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-5.3.0.ebuild
index bc586d38f7c3..81b5ef160ad4 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-5.3.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-5.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 3c42c9d062bc..079ada6f8d71 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,2 +1 @@
-DIST oslo.config-9.2.0.tar.gz 161235 BLAKE2B 186b79bab199db9369dd53952a9c6f54fafe17f950d7b66ed753f173a24726a6dbd06b794c73387f5ea6e77aa54a4d5bd0ef4752a5c564dfeea4e729fdf151e7 SHA512 69d8461f4ed5d4988fe527e4022c528244e9ecf76913a7af572e8073c0218987a69e6094edc56ff14eaf1b05fc5ffe7d81bb26ff17f87e4bd29a78d7959a3935
 DIST oslo.config-9.3.0.tar.gz 161132 BLAKE2B 4971a9974f68db25080a70160636bf9c81effb8a817598d4c09aa2337fe69e9bdac4d2b19948d17f225bfcb20bbc65e1ddeb6a24e51792a8246033b5290e3fe1 SHA512 5472c44839724b11a1b4b31113c36716ce2c3dbb5e6500cb743cbfb7c73dc6ef878b4219b17d3178d7d8c2b7a46377a2d083cb21768dc82878078d3faed74514
diff --git a/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild b/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild
deleted file mode 100644
index a4e2ad8272e3..000000000000
--- a/dev-python/oslo-config/oslo-config-9.2.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.2.0.ebuild b/dev-python/oslo-config/oslo-config-9.2.0.ebuild
deleted file mode 100644
index cab10a142348..000000000000
--- a/dev-python/oslo-config/oslo-config-9.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.3.0.ebuild b/dev-python/oslo-config/oslo-config-9.3.0.ebuild
index 06420a4478ee..87e61f7ccba4 100644
--- a/dev-python/oslo-config/oslo-config-9.3.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index c1d28fea52a9..e535706ef634 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,2 +1 @@
-DIST oslo.serialization-5.2.0.tar.gz 35123 BLAKE2B 02dc1538562cdd0b5f601e9899561d44c6a651c514d3b4f00dbf05256e7109f485e1edabf1d69e578b903f177046128ddec944c85f2a2d238be9bf937bbe66d6 SHA512 6903b3a57ea3da75be5e22d0d9b5f14c8068be181be1845a5fed106d61e41c1f2288f9a667ec44b068670002b06f7f3f2d22821d34133fe60665f7146d133d22
 DIST oslo.serialization-5.3.0.tar.gz 35320 BLAKE2B 4c2aa63faff4b0d8409bfaf900c1ab826e474e87491d549e4ec13b209a354a0c64950579a2d1ff70974ba303aa01c2c6e9c6de0ed238d048c4dc137646646c2b SHA512 490a74993725f0a2c244ba2437c6afd414b870c469bcd29c5db260b08d449188156e453ca515cca0d104f494e8e9b5755d95dffdf800eba39396f995c4d78b85
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.2.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.2.0-r1.ebuild
deleted file mode 100644
index 65e14f857630..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.serialization/
-	https://github.com/openstack/oslo.serialization/
-	https://pypi.org/project/oslo.serialization/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	dev-python/tzdata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme
-
-python_prepare_all() {
-	# remove spurious rdep on pbr
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.3.0.ebuild
index dd3a287f276b..ae4ea18d6d4b 100644
--- a/dev-python/oslo-serialization/oslo-serialization-5.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-5.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index adb8f8df01c8..49c39d87d206 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.19.1.gh.tar.gz 17158420 BLAKE2B 2180bb37e2295f0499c6d00237207513ad6c186ff8fd8fac466cc43efa9b068cf8a272b5ae30da08d37db88d354d41c0b426643743251ea8460abb6ff627e3be SHA512 103910b385578732e356145247d3c1a4a3b0fe8acf22ce91f1c1155500cce2342e5caa0dff0a30825b11d7a614853c2dcb8657628f4d65682f6e543adb4db240
 DIST pycryptodome-3.20.0.gh.tar.gz 17173888 BLAKE2B 7706a7f512579b4edf080b5074a9f226b2f0ef18a8f1faf74e890cfccff85d0599b4883cd5011a5cc0296b5a10cccce94cb2b948de29d785f6add04e54215a5a SHA512 0d65ccd93f9f78548c04aa3af01cb65b6a39e81bb3dfa4bb08acc5a5a731b17f9c5b07a1d1780739b3f358402a3596b04e446fc7b39345a4c6f03fd5a2de7ff9
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch b/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
deleted file mode 100644
index f2d24f9cf696..000000000000
--- a/dev-python/pycryptodome/files/pycryptodome-3.19.1-gcc14-configure.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/Legrandin/pycryptodome/issues/787
-https://github.com/Legrandin/pycryptodome/commit/b4083688fde0580de6c2a4d36d84da31a2549a2c
-https://github.com/Legrandin/pycryptodome/commit/3f6a86e072ef0e650f04eebf086940e6d8b33c03
-
-From b4083688fde0580de6c2a4d36d84da31a2549a2c Mon Sep 17 00:00:00 2001
-From: Helder Eijs <helderijs@gmail.com>
-Date: Fri, 29 Dec 2023 14:36:19 +0100
-Subject: [PATCH] Better autodetect of AES support, in case of aggressive
- optimization
-
---- a/compiler_opt.py
-+++ b/compiler_opt.py
-@@ -140,7 +140,7 @@ def compiler_has_intrin_h():
-     {
-         int a, b[4];
-         __cpuid(b, a);
--        return 0;
-+        return a;
-     }
-     """
-     return test_compilation(source, msg="intrin.h header")
-@@ -154,7 +154,7 @@ def compiler_has_cpuid_h():
-     {
-         unsigned int eax, ebx, ecx, edx;
-         __get_cpuid(1, &eax, &ebx, &ecx, &edx);
--        return 0;
-+        return eax;
-     }
-     """
-     return test_compilation(source, msg="cpuid.h header")
-@@ -163,11 +163,16 @@ def compiler_has_cpuid_h():
- def compiler_supports_aesni():
-     source = """
-     #include <wmmintrin.h>
-+    #include <string.h>
-     __m128i f(__m128i x, __m128i y) {
-         return _mm_aesenc_si128(x, y);
-     }
-     int main(void) {
--        return 0;
-+        int ret;
-+        __m128i x = _mm_setzero_si128();
-+        x = f(x, x);
-+        memcpy(&ret, &x, sizeof(ret));
-+        return ret;
-     }
-     """
-
-From 3f6a86e072ef0e650f04eebf086940e6d8b33c03 Mon Sep 17 00:00:00 2001
-From: Helder Eijs <helderijs@gmail.com>
-Date: Fri, 29 Dec 2023 14:52:15 +0100
-Subject: [PATCH] Use memset, to avoid emmintrin.h
-
----
- compiler_opt.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/compiler_opt.py b/compiler_opt.py
-index 57db0a6f..a2711c09 100644
---- a/compiler_opt.py
-+++ b/compiler_opt.py
-@@ -169,7 +169,8 @@ def compiler_supports_aesni():
-     }
-     int main(void) {
-         int ret;
--        __m128i x = _mm_setzero_si128();
-+        __m128i x;
-+        memset(&x, 0, sizeof(x));
-         x = f(x, x);
-         memcpy(&ret, &x, sizeof(ret));
-         return ret;
- 
-
diff --git a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild b/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
deleted file mode 100644
index 8dc9ecff16e9..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.19.1-r2.ebuild
+++ /dev/null
@@ -1,61 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="
-	https://www.pycryptodome.org/
-	https://github.com/Legrandin/pycryptodome/
-	https://pypi.org/project/pycryptodome/
-"
-SRC_URI="
-	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2 Unlicense"
-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"
-
-DEPEND="
-	dev-libs/gmp:=
-	>=dev-libs/libtomcrypt-1.18.2-r1:=
-"
-BDEPEND="
-	$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
-	"${FILESDIR}/pycryptodome-3.19.1-gcc14-configure.patch"
-)
-
-python_prepare_all() {
-	# make sure we're unbundling it correctly
-	rm -r src/libtom || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
-	"${EPYTHON}" - <<-EOF || die
-		import sys
-		from Crypto import SelfTest
-		SelfTest.run(verbosity=2, stream=sys.stdout)
-	EOF
-
-	# TODO: run cmake tests from src/test?
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
index 34fb2d302a2e..74de4397d056 100644
--- a/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.20.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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"
 
 DEPEND="
 	dev-libs/gmp:=
diff --git a/dev-python/pypdf/pypdf-4.0.1.ebuild b/dev-python/pypdf/pypdf-4.0.1.ebuild
index 3bb3100ee06c..7f65f98fca46 100644
--- a/dev-python/pypdf/pypdf-4.0.1.ebuild
+++ b/dev-python/pypdf/pypdf-4.0.1.ebuild
@@ -30,7 +30,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 BDEPEND="
 	test? (
 		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,${PYTHON_USEDEP}]
+		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 58f0fa290cad..d25a7faea2a3 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,3 +1,2 @@
-DIST pyproject_fmt-1.5.3.tar.gz 15678 BLAKE2B 624cfc0e62285c59fdb1a3315d1f419cbb8c41430957b9a5eeed2521899a66fa15a1aae476d2986e18d990e4f5fc901312a70df819765cf8b4e077cf3678d8dc SHA512 3f269525b5e3e818cea5ef7b90644c7ced9e37a1dff4a514782ebf7769f6f5a53887cb831b488ed34d059f197a9d90fccc887146f5180c58c5a702c37ae9d79b
 DIST pyproject_fmt-1.6.0.tar.gz 15924 BLAKE2B 96c44d40e5d0554e8bd146adb519787b42c63916569846ad1871c16d28f65c2afc0caf2c6f967208704ceaee7af5efd2a91ec1383c320e9d2f5399f3e1aaf6c6 SHA512 74d13d4bef2f8cc81a7ec6dfab316606333cb9896f4cef759221e8496e686021515b8a259bcd7d9b74c9870ae507c98b7bf16b1d59ebb69a7e68c8510c446d5a
 DIST pyproject_fmt-1.7.0.tar.gz 16358 BLAKE2B 944ca460a002caebb98d06588bc89d8cd5c041f7ced200afc9748c6c47f6641dc1e3857cb426c13fc7a1f65738c9d2cbd5d0a575b11e9897be4875d3aff86316 SHA512 f69ade0e9b617a5ccf59b401220cbc95dcae006eb64ff92380ad5f0df598f5f7e8283d96666ffbdd4d2f9acc900923795c2a11496eda8842bcf1d8d1c9113bf8
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-1.5.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-1.5.3.ebuild
deleted file mode 100644
index 28337daf094b..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-1.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2023 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 pypi
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-# tox is called as a subprocess, to get targets from tox.ini
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-		dev-python/tox
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are completely meaningless and copying them
-	# to the ebuild is a horrible waste of time
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-1.6.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-1.6.0.ebuild
index d98f024c343f..67f607b37c1c 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-1.6.0.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-1.6.0.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/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index de8f00e7b5b4..ce788e5aad75 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,2 +1 @@
 DIST pyspelling-2.10.gh.tar.gz 152528 BLAKE2B 47ef182fb09bc3ec44b6c15da76f0d53266276ec807036378a3f5ae94daf98d3b3a49995ce2d12044c81743ee76d8b79547d84ae3c820be1f30161c75a654ba4 SHA512 dfe0d0c211555331dd6d97e06ce64ac2efbe5cc6172f684ca3b1802a8454b957781022375a9a53a2f522f4bd3bbf4e5892ab6be266bcfbe69c4861d95db00ab0
-DIST pyspelling-2.9.gh.tar.gz 151600 BLAKE2B c706767917e9ba3368f9670a492a2233b6a4c13c4dde6a594a06193d856b3fbad007988acb27486b8b8f62edfeb5a0b030ead3db712baa24b0ff3301cf776937 SHA512 b14d29dff4f7791d9223d20b490f4a48ba5a6a7613dc18fc3083a3b6bf810f9a42fcac94bfe72f92023802fc8c1fe0e6432d491af2f274a138ddc56db5550ea5
diff --git a/dev-python/pyspelling/pyspelling-2.10.ebuild b/dev-python/pyspelling/pyspelling-2.10.ebuild
index 2f277521cffb..1fecb1ea4fe2 100644
--- a/dev-python/pyspelling/pyspelling-2.10.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.10.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"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pyspelling/pyspelling-2.9.ebuild b/dev-python/pyspelling/pyspelling-2.9.ebuild
deleted file mode 100644
index ca82002cb77b..000000000000
--- a/dev-python/pyspelling/pyspelling-2.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs-pymdownx-material-extras-2.1
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Spell checker automation tool"
-HOMEPAGE="
-	https://github.com/facelessuser/pyspelling/
-	https://pypi.org/project/pyspelling/
-"
-SRC_URI="
-	https://github.com/facelessuser/pyspelling/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	|| ( app-text/aspell app-text/hunspell )
-
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-6.5[${PYTHON_USEDEP}]
-"
-# The package can use either aspell or hunspell but tests both if both
-# are installed.  Therefore, we need to ensure that both have English
-# dictionary installed.
-BDEPEND="
-	test? (
-		app-dicts/aspell-en
-		app-dicts/myspell-en
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -q -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3-r1.ebuild
index 77d2d4dd4149..92759c1877ad 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3-r1.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
-HOMEPAGE="https://github.com/tvorog/pytest-lazy-fixture"
+HOMEPAGE="
+	https://github.com/tvorog/pytest-lazy-fixture/
+	https://pypi.org/project/pytest-lazy-fixture/
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 013589819c34..3934f0ccd79d 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,2 +1 @@
-DIST pytest-plus-0.6.0.tar.gz 12795 BLAKE2B 6e618f29e679cf1c71018ab4993606add89a4e3fe47a78b3cb4a17908c2bb0192646108918786183b330016a8e8d5458e87900d8bf4b9b61e90d3e24feab43a8 SHA512 7798a4e53a4ca95b24f9039accea2657746982370cd99f5d34d5dceccc08640214241f1e81f3e354f03782f013bf1b375a4e16a69d23e211948232eca678f98d
 DIST pytest-plus-0.6.1.tar.gz 12811 BLAKE2B f3892227aa24466b2f2e35187bbf7cf3d67d96745377356b3cc4d295a9fdd8eab8b0fd11b7b5ba96d5209e2bd7440f5e12084cbd83951e3e56cb24c1f2bf6f7b SHA512 4ee2fa8783c36e65616b1fc2e155e4c4898e0a6347058619f9cc0caa319fc62b34304a2ec0377071abef7d2a526c81729f434b228f0fb2b9d1c73fae1169bfde
diff --git a/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild
deleted file mode 100644
index c1780f046cd2..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-plus/
-	https://pypi.org/project/pytest-plus/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/pytest-plus-0.6.1.ebuild b/dev-python/pytest-plus/pytest-plus-0.6.1.ebuild
index 18e6101d9a3c..aa9caed90c53 100644
--- a/dev-python/pytest-plus/pytest-plus-0.6.1.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 RDEPEND="
 	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 4f84d58cfa98..e77c0bc38cfa 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,2 +1 @@
-DIST python-keystoneclient-5.2.0.tar.gz 324652 BLAKE2B 2279e4d094faefc17b70211dc65083a4b726dd178d655d2efb55c9ae6f4d0837051d563e96b7ecca553c2f855de7affc20e11dcff615fdb2fb755fdd6e508f3c SHA512 2cb7137d88b090e3054448b3134084964597b77f013e75b3665bf80438b6f900630407b8dbd992ae39a877b2546bb61e6ffa665690cc7ed79aa453ee459c909e
 DIST python-keystoneclient-5.3.0.tar.gz 324777 BLAKE2B e6cc16b10771e062d96aa33868eec7c5e71b27d739f0f3c5fb57c505e9127d4f9b5636f1357ae07e3916f74c51076e7d6aa2085b558caadaf07b5d876e15d92d SHA512 788486de97faac3bb157c9834db97552f6665602155c9f38fb061feeb91c6b23b35d1bd3be47b23db53b5d67c80cd675cf45212d37062d2f0814f8406a3329b4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild
deleted file mode 100644
index 6d8b6ee4bb5a..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1,
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="
-	https://opendev.org/openstack/python-keystoneclient/
-	https://github.com/openstack/python-keystoneclient/
-	https://pypi.org/project/python-keystoneclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-5.3.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-5.3.0.ebuild
index b30d584caa93..1be1ebd8e80e 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-5.3.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-5.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mpd2/Manifest b/dev-python/python-mpd2/Manifest
index 7ea9e9852029..0c23aff9c345 100644
--- a/dev-python/python-mpd2/Manifest
+++ b/dev-python/python-mpd2/Manifest
@@ -1,2 +1 @@
-DIST python-mpd2-3.1.0.gh.tar.gz 69162 BLAKE2B fb9b13f3e73b654d7e2a6ee84907f84ebf354d8f56ee47f58046a28aef1d43b5ddd52bf51f42a3e56dd6d8036010abc74d5537cfe8cf4f976b0a758506879dfe SHA512 9d8dd774540d9e09804fd293ce362401b2253f8021c1581c0764bac0b61d2e4b5f50bb752e5d774459194a717354f28ad5d96d48f29ef0f54011969ec91ff106
 DIST python-mpd2-3.1.1.gh.tar.gz 69613 BLAKE2B 4769799edb7a5fa8d772e95fdda362845d97ff2e17bc5eed7ec057c0e17389e8ad3b5d1ecd3b169ddea9d33fdfc52d46b86b8e1abc89489cf04f53aa803219d0 SHA512 abd882bc0652ed4a8ee2f4abf0a039e7c62e77b35d278c5fc99bb032c220caac831cc483445516044964f2ea078d2134af61c64d55cb20770b4d32a5aa1ce5e2
diff --git a/dev-python/python-mpd2/python-mpd2-3.1.0.ebuild b/dev-python/python-mpd2/python-mpd2-3.1.0.ebuild
deleted file mode 100644
index 467d107493a5..000000000000
--- a/dev-python/python-mpd2/python-mpd2-3.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# py3.12: https://github.com/Mic92/python-mpd2/issues/214
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="
-	https://github.com/Mic92/python-mpd2/
-	https://pypi.org/project/python-mpd2/
-"
-# as of 3.1.0, sdist is missing some doc files
-SRC_URI="
-	https://github.com/Mic92/python-mpd2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-SLOT="0"
-IUSE="examples +twisted"
-
-RDEPEND="
-	twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	epytest mpd/tests.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples/.
-}
diff --git a/dev-python/python-mpd2/python-mpd2-3.1.1.ebuild b/dev-python/python-mpd2/python-mpd2-3.1.1.ebuild
index ab1e1d830a70..f146e3a84c2a 100644
--- a/dev-python/python-mpd2/python-mpd2-3.1.1.ebuild
+++ b/dev-python/python-mpd2/python-mpd2-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 "
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index 9e401f84587f..b6bd46bf314e 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,3 +1 @@
-DIST pytoolconfig-1.2.6.tar.gz 16425 BLAKE2B 669c3bc906b06ac48ecb5649f1bef8a6af53e85d8f8d23f4059b63e4d1e57e10b0a66d2e89e72e0b4afe7d00aa9d26b4ceb23cc49b8e46a891e7fae60d228686 SHA512 beade8cd1780eb986dab1d630c1583c9c75fea5067d399081a5b8361789fdec96087243d8d79291655c83aca481d5888b3414a1b445200a9d8c59703761a83b2
-DIST pytoolconfig-1.3.0.tar.gz 16686 BLAKE2B 77459f0d19bfd362ed8f0919ce27a3362e76add948dab224d38b3faa0dc07055181276fe2406150bdb5fdebf485031ef5e3de8344edc07bf6558e902c8c703e0 SHA512 9128f2ae116fb97edf991553207a97041df6b866e2ee4b4d05333418564a0429fdeb28c7807c3784707259f0700bb870955e89702fd5b723f19ae7639daaf150
 DIST pytoolconfig-1.3.1.tar.gz 16655 BLAKE2B 8a35f6e1751b99e7bccb81f173ee56dfc94b586237e28e8ddcc859befb6ff502469fd70f02521216585367bc87c85ac81503055f055cf355be12476bc3efe608 SHA512 c8321a5e46593044828d737532926a2df0341f563bd15ee7ffa39ebba8ab2ddcf8a56d6c099d3b8801cb65bbe7e688fddd916fc9f2babc862d00f0a925837a12
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild
deleted file mode 100644
index a7d502d6649b..000000000000
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python tool configuration"
-HOMEPAGE="
-	https://pypi.org/project/pytoolconfig/
-	https://github.com/bagel897/pytoolconfig/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10 )
-"
-BDEPEND="
-	test? (
-		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.3.0.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.3.0.ebuild
deleted file mode 100644
index 9a7401aa3ac6..000000000000
--- a/dev-python/pytoolconfig/pytoolconfig-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python tool configuration"
-HOMEPAGE="
-	https://pypi.org/project/pytoolconfig/
-	https://github.com/bagel897/pytoolconfig/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-1.4.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10 )
-"
-BDEPEND="
-	test? (
-		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.3.1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.3.1.ebuild
index 64f7baf3e41f..663672151054 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.3.1.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.3.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index d09ead4326bc..51503712917b 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1 +1,2 @@
 DIST pytz-2023.3.post1.tar.gz 316899 BLAKE2B 3274e11c38b34eae42089cacf92e537f1376fa721294ea2da3a68fe3491e7e95d1c88cb4687d1e83965be4730504373c72960f5dc5e9b6a8a339e541476515f4 SHA512 c2f1bd52e42c7d1014b8aebf3544b865eb5ae5e17146253406def72785af14bcfe34b9db6b71ca91a3c988c496fbe93e5d1731bee66349463c992be619d21f2c
+DIST pytz-2023.4.tar.gz 319467 BLAKE2B 59c27d2b6b748808edf81649ba08ca9230e9a14936f2307918c57fa69e5ff379d2dee1288252112bd718483e84ad1fafb551da222d26b01c4dd7c86424533993 SHA512 dc132f305d6f8f491a004f65fa823aa76713d324592ef474abfd5c0aafdf722d22386cf7f9140b2868f48e1309a64385204a129c0ed6c0bf8356844b92f13bb0
diff --git a/dev-python/pytz/pytz-2023.4.ebuild b/dev-python/pytz/pytz-2023.4.ebuild
new file mode 100644
index 000000000000..6a283f4adccb
--- /dev/null
+++ b/dev-python/pytz/pytz-2023.4.ebuild
@@ -0,0 +1,51 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="
+	https://pythonhosted.org/pytz/
+	https://github.com/stub42/pytz/
+	https://pypi.org/project/pytz/
+"
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		>=sys-libs/timezone-data-2023b
+		sys-libs/glibc[vanilla]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle timezone-data
+	rm -r pytz/zoneinfo || die
+	# remove hardcoded list of all timezones but leave subjective set
+	# of "common timezones"
+	sed -i -e '/^_all_timezones_unchecked/,/^all_timezones_set/d' pytz/__init__.py || die
+	eapply "${FILESDIR}"/pytz-2023.2-system-tzinfo.patch
+}
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/reno/reno-4.0.0.ebuild b/dev-python/reno/reno-4.0.0.ebuild
index 7b1723ce71e8..fb994fed99e4 100644
--- a/dev-python/reno/reno-4.0.0.ebuild
+++ b/dev-python/reno/reno-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ RDEPEND="
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 468d0b66394d..40e9c788b581 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,2 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-4.0.8.tar.gz 3683777 BLAKE2B e3fab54369a9d75f381fab651d5f5cd46ed090c0e9c7105d89225d291b133892f6311a3ad1e2727bf26be7a7ca3562f5a8a7c6126112adebe1aa530ebdd42187 SHA512 4d1db3e104374027a7be39815f7cbc06638bb3834477fcf29a4afda71be669a13d8e09c5a83dd1df085423cb61a89fa102a1fd1d106bccb2360cb02edbd918fc
 DIST reportlab-4.0.9.tar.gz 3684146 BLAKE2B 1db674238d481f77c8847c56527d73ea209a66df9d520c590460b91fa118bbdeb103fa37fc6fbc23f5cb28206c9bcf1e663ad0ab3b52f003e9d72b26b630e8fd SHA512 5ae2ce70e108b84e84d88c6ba54015d390f79552bdcf40564fa803d33428ea67e7a08824a68c836475e6dfeaf75b00b56c30b81e4ec82011fdbc8978a1cfb80c
diff --git a/dev-python/reportlab/reportlab-4.0.8.ebuild b/dev-python/reportlab/reportlab-4.0.8.ebuild
deleted file mode 100644
index 19c27cc59dc2..000000000000
--- a/dev-python/reportlab/reportlab-4.0.8.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/
-"
-SRC_URI+="
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-"
-BDEPEND="
-	app-arch/unzip
-"
-
-distutils_enable_sphinx docs/source
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-src_configure() {
-	cat > local-setup.cfg <<-EOF || die
-		[OPTIONS]
-		no-download-t1-files = 1
-	EOF
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py --post-install --verbosity=2 ||
-		die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-4.0.9.ebuild b/dev-python/reportlab/reportlab-4.0.9.ebuild
index caf4d9639c78..19c27cc59dc2 100644
--- a/dev-python/reportlab/reportlab-4.0.9.ebuild
+++ b/dev-python/reportlab/reportlab-4.0.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/rpds-py/rpds-py-0.17.1.ebuild b/dev-python/rpds-py/rpds-py-0.17.1.ebuild
index 9a3ca956fec1..15ce85f37466 100644
--- a/dev-python/rpds-py/rpds-py-0.17.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.17.1.ebuild
@@ -62,7 +62,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 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"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f12f9d152c01..647f3fc8b13c 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1 @@
-DIST sentry-python-1.39.1.gh.tar.gz 451286 BLAKE2B ff81f800f41d5f2c6a8ae0007338a394a176de4705753839e6bd4b74ac9aa21eb340582d6bc33e3a482c020fdc8307e472b9278ff101899f44a1a42429e158bd SHA512 0b162cc677b1e59434b6c58ccced4d84f6679b5ff733271938b07302e0e9a9d706304334282bd7b7e1c1f4026ed98fae3e5635cfac306e08a3aee801d75e1d7c
 DIST sentry-python-1.39.2.gh.tar.gz 452370 BLAKE2B 8ab1b4464ecbd8164c20d926a78f4c839be9c1dba6b09c26c2aacfdc236ca6e93406ea0aeac1a2b86439d2340b546a32c8a3f2db80cabefc6986f4567753f660 SHA512 728f799fe9419d30a07ae15eba0feae4e861edaabe1b16a23f54d8fe2a389273ebfc43a1183368ea22332f63a096ea154031ca0e1c3efcea26cf83c6093547c3
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.39.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.39.1.ebuild
deleted file mode 100644
index 3ce864b09ba4..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.39.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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/django[${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-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${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/stdlib/test_httplib.py
-		tests/integrations/flask/test_flask.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
-		# broken by rq-1.10.1 (optional dep)
-		tests/integrations/rq/test_rq.py
-		# fastapi is not packaged
-		tests/integrations/asgi/test_fastapi.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: causes breakage in other tests
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		'tests/test_transport.py::test_transport_works'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/asgi/test_asgi.py::test_websocket
-		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-		# incompatible version?
-		tests/integrations/falcon/test_falcon.py
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_session_cookies_{filtered,removed}
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-		# test for new feature, fails with IndexError
-		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-		# TODO
-		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-		tests/test_profiler.py::test_sample_buffer
-		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-		tests/test_profiler.py::test_thread_scheduler_single_background_thread
-		# broken with py3.11, *shrug*
-		tests/test_profiler.py::test_extract_stack_with_max_depth
-		# TODO
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-		tests/test_scrubber.py::test_span_data_scrubbing
-		# this is not even funny
-		tests/test_utils.py::test_installed_modules
-		# flaky hypothesis stuff
-		tests/test_serializer.py::test_bytes_serialization_repr_many
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/tracing/test_decorator_py3.py::test_trace_decorator_{,a}sync_py3
-		# crashes Python
-		tests/integrations/grpc/test_grpc_aio.py
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# TODO
-		tests/test_utils.py::test_default_release
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.39.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.39.2.ebuild
index 437e951ad6b6..6e3431a88cde 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.39.2.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.39.2.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/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
index 30664228dc97..a402cce7c2cf 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,14 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
 
 python_test() {
 	cd demo || die
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index fa28d625db11..735617b724ea 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_applehelp-1.0.7.tar.gz 19543 BLAKE2B c44cdb9403fc9272e5220f23b3ce6d9eb63f754b526b450d857f0260e92ab92e35bf814df40ba11186ae7bbd070516fdccf475c8777113393327c33afd42eb07 SHA512 8ab1e8ce73591a32c4d73d022ad87e003e6fba36bf4f670f7b9a6b213ed8f396506d8e2998182e19ec9c7ccf21e7d52b5de9b7a8ca0ed676738c4e10fbd738b2
 DIST sphinxcontrib_applehelp-1.0.8.tar.gz 19674 BLAKE2B f449cdc28cbf8374cdfa5bdacb501c3bfc8a4a93c855c220e66989d538f76653ddf4b81fb0534dd043771b60d0de01c9d3c30cecfb02cbb2fc0c0cd2320b377d SHA512 0afd38caf07e60b45b47e7e1cc8dea0d34578f7501a6000c6bc860454bb71d8c9d59c7b66ee39c173d635c1944735782762e713598d99dd4fefda51ccd1d74d3
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.7.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.7.ebuild
deleted file mode 100644
index d223a55c35f2..000000000000
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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 Apple help book"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-applehelp/
-	https://pypi.org/project/sphinxcontrib-applehelp/
-"
-
-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} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.8.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.8.ebuild
index b0d51cd704e7..b5c0c416ca26 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.8.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-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/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 1b3c004fb5b8..09b7c2a72faf 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_devhelp-1.0.5.tar.gz 12343 BLAKE2B f9c46d07888eab1bddcecce3a862fe503a0187620768a40f360fa985dee9cfaaf8d28f03c6a08e0b174788639675ee715141287bd7bf04ff403459e9858e4f9c SHA512 4412f9711b981c8e3beaa9940c09d02c21dc5e303a0ab80ca401f4cc5444bd159070a065a20c0e6f721202c05d880f20244ca5ff32df5911c8a4ba3d00ed9121
 DIST sphinxcontrib_devhelp-1.0.6.tar.gz 12480 BLAKE2B 40fcbd13156cba5d904ee30e98284f0bc6f53e4dc2003cbeca6cb0189122d8b453ca7ab849570bbea615a2b0d4fc016b1ff6f72b2f8ec337b9424b4fc9ff8a57 SHA512 97ab48f4adc16140323220bd23447d74fdec1d223e64c06a325df9568436bbce31edf5b33103dc81e0eb937f7ac8328b012fce80d2d6fd995dc0f63e9fb15f77
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.5.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.5.ebuild
deleted file mode 100644
index 2de13f4b0e85..000000000000
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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 Devhelp documents"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-devhelp/
-	https://pypi.org/project/sphinxcontrib-devhelp/
-"
-
-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} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.6.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.6.ebuild
index 33c47c7c7e49..98596c8de357 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.6.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.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-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 17bd1a860ab1..75fc7d08699a 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_htmlhelp-2.0.4.tar.gz 21799 BLAKE2B ef5f5c26696cadc37feefda8b5343562efd45ab7685d472d820f4e391a1699993f26634269087c24971b176ef7b05e0191f90dc6b07093ca25a424bbf7a2a69d SHA512 5f1c4619b986060fb6213e23b5339b7b5d57abdb8f6034473116c9ea7c3d04cf0985115141c5325cb93bac330eb6109d2e81327f53fda78838c9ed5435469b29
 DIST sphinxcontrib_htmlhelp-2.0.5.tar.gz 21925 BLAKE2B ba023e53c14b5427b09a9608cfc45ccdf932d4c27cce40932088fadb127ebfe50d7b2639513589469facf108fdc748e0f07195766e6e4bc67d26c50d00a2bf75 SHA512 537ef6a1a32863728a6324fcd50f9374e4f488ed7ed112f9f0ceb9e4488637f502280dda21835e8d63c6b6297d2a3db3032c3f307dce5948b516f293d07b9711
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.4.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.4.ebuild
deleted file mode 100644
index 00c99229926b..000000000000
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 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.5.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.ebuild
index 4b368dea4d7b..f0fb99ec9b56 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.5.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 810ea1a129d1..0c6c050e6cab 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_qthelp-1.0.6.tar.gz 16555 BLAKE2B 7fabbd35f5ccf5895f16fd17e335268445e32ee0cb8c596c68e537169d4ad0aa3dc102ee2474c136c62676cff6ab639288c5fff4892d78a257a85a7ab963fe9d SHA512 783cd757bf262ce63f54019a5ccf1d7e6fb59e8fde07e7cfa0610bf0cd49e6e51cada9c35bf11cc5ff351904da6a69569be1d4db58d450a96375aee7bf1f34ff
 DIST sphinxcontrib_qthelp-1.0.7.tar.gz 16685 BLAKE2B dbe4518134f31f9283a1de4a9f7c1b1fd59e3c639923dd5a84fe1c60323f8c0fbf31942ab51724241bf8865b78c5c83bc7c2187d7209b1c55027245cae2bd271 SHA512 fa11be5f663a0784a59ee18deaa8d497eeb4d5311fd86f75d48f40b70d8c0c868bd8625a001da274379d2b3412447abd810cb44af42f8a252cbcc31c400884c9
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.6.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.6.ebuild
deleted file mode 100644
index 2e3eabcd4326..000000000000
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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? ( ${PDEPEND} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild
index f37c84e8f4e3..800bdd545c0f 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.7.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-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 3c39df2891ad..91d9a0debee6 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,2 +1 @@
 DIST sphinxcontrib_serializinghtml-1.1.10.tar.gz 15592 BLAKE2B 35fd8458fbd300326b576aa798f9967a8bc4fe411a4d9ff0bfcf2f16f5945f9100480be7483fdafba1b4d11723f80b209e3cfd0e0f33dead1327105a11d0496b SHA512 e104817e8145cf99b3ca6cb548a7977d7f42dd442dc54e6de787c12722ea804e4a38bfe78bdb3d8ff5f71afc14bf4fbc84b15208d0c77790d377cf9ac91e4aa8
-DIST sphinxcontrib_serializinghtml-1.1.9.tar.gz 15446 BLAKE2B 53d61209a043e7481c252e0a83f7e01e71ab2e385a28d78c9672b4a0d4fae2911ab4dff47dced09442a760872a7f63e04bae5916d9d7d96ff85c57b6f732eb7c SHA512 9e14527794a71120c1db9dc534383f3e56ee18241009aab2a04133351fc4dd56ee9ba242ad64be13faf44162e90e88109eb36a5692fb343f4bb28f43cda78bba
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.10.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.10.ebuild
index 743b32bec2ae..bc435065e283 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.10.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.10.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-serializinghtml/sphinxcontrib-serializinghtml-1.1.9.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.9.ebuild
deleted file mode 100644
index 1dbcbd3fa5db..000000000000
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 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 outputs serialized HTML files"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/
-	https://pypi.org/project/sphinxcontrib-serializinghtml/
-"
-
-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} )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 131b69afd807..71079fde8dc4 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib_websupport-1.2.6.tar.gz 599139 BLAKE2B 661ba75c1a222993b558d2bcad0d76e99083ef8d2006526ac8d4f95228d93cb80f68638ba4e5fa245fd79e9bef13babbfcfb6c6decb1a02dd2e2623f37e88374 SHA512 d3085083132cbd9fcd289aff56a72c44f0ed8803e60996c1542da0ca1eaee7f3f38ddd2c45fc44045206091615cf69bc11bb60fb2f95ab5c6dadc2ef65251155
 DIST sphinxcontrib_websupport-1.2.7.tar.gz 599362 BLAKE2B 544e77a739e0ecd9391893f56eeec2df4d5ddc6840a30e9a92e84e35e9ed0a765d4190790a13e329621ba045ee46b5e01d4d0825b6f37e9848953f9e796ae8af SHA512 daa5ecf6fd3fb6df6a9a3b60668d42d50d93454dc3c2703a1dd43d75220b326e90c5e0ae2cca27afe62e41ae03e7144e6b4cfe70096b857af74c8981fadba9ca
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.6.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.6.ebuild
deleted file mode 100644
index a286dd0acdb6..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 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 websupport extension"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-websupport/
-	https://pypi.org/project/sphinxcontrib-websupport/
-"
-
-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 ~x64-solaris"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-# there are additional optional test deps on sqlalchemy and whoosh
-# but they're broken with sqlalchemy-2.0
-# https://github.com/sphinx-doc/sphinxcontrib-websupport/issues/61
-BDEPEND="
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
index 438183ac7f6a..5bbec41dbe5e 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.7.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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 6b6bd6b13392..02845bf335f3 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,4 +1,2 @@
-DIST starlette-0.34.0.gh.tar.gz 2841390 BLAKE2B c7eb980fe0a1a6fff0e2bb0c2bb0af4a409933a51de28d2641698f39f8280e7e1d767927f6f919cbb6e5817d34f81b48835c3ad8600c05c6194f70e4f0475d39 SHA512 bf8ce6b665f91e0410dca7b4f427f07cf977f5e9dd6614cf7c06ef2521e359410cdfc2008d7324a500c68bb8b1ecfd9b3a165c7dfc62a84c01762910debb981e
 DIST starlette-0.35.1.gh.tar.gz 2842796 BLAKE2B 1ea63f30d65103754559700eb2db699b3d03ce1dfc78081e7d2b9a680839dd0a453059d858e8b1390da2779ba755d5074033c53b5392ee7071fee27cc6739935 SHA512 75703c2ee23dd19e9c8bdd24a0a3d84f50486c0df0cad9609e0e08eb1fd3c61a4f56887d60018fbec4227bde2b3e12fb09decc865b8d5073bc4a1e066b6d5f69
-DIST starlette-0.36.0.gh.tar.gz 2843462 BLAKE2B 2a60d3cb8c4b838acfa0ece25d18be779aff43e80db1c3fd1d04b54a47bffac6e5eb78d1e1c3531cccaa487bd8f37f85ac0ef143906ece133e42e94e5d91e64f SHA512 acef48e3c0a4d9853a8aca4ae7afdfe4089aaed47c682795b3b307ec1d4529fbf8c5b340070f6ba561f826b7622c215ffd8243e509eff1194450e50822d4c49f
 DIST starlette-0.36.1.gh.tar.gz 2843494 BLAKE2B 633cd664785f32423c0dfeab04b400340b5e3197f4ef07edca9fcda20954444ccfef1ff9afc62969d5b2914f2091e08946420931ee1ee22e1ab771fe02db13ec SHA512 9a990098a1faa179bcf8df64237147d59e3114b1336f491ca358ffd0016412f18323845eb5f8691aa41810fef455e97cb47ff34d9456a0e3a5be3eb6b23027bb
diff --git a/dev-python/starlette/starlette-0.34.0.ebuild b/dev-python/starlette/starlette-0.34.0.ebuild
deleted file mode 100644
index 59f4c7178054..000000000000
--- a/dev-python/starlette/starlette-0.34.0.ebuild
+++ /dev/null
@@ -1,49 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.35.1.ebuild b/dev-python/starlette/starlette-0.35.1.ebuild
index 0106c8d8c43b..59f4c7178054 100644
--- a/dev-python/starlette/starlette-0.35.1.ebuild
+++ b/dev-python/starlette/starlette-0.35.1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/starlette-0.36.0.ebuild b/dev-python/starlette/starlette-0.36.0.ebuild
deleted file mode 100644
index 0106c8d8c43b..000000000000
--- a/dev-python/starlette/starlette-0.36.0.ebuild
+++ /dev/null
@@ -1,49 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild b/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
index 20ba8d3a7803..b7e037c24870 100644
--- a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
+++ b/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ~riscv ~s390 sparc"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch b/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
new file mode 100644
index 000000000000..2447289c0266
--- /dev/null
+++ b/dev-python/sybil/files/sybil-6.0.2-pytest-8.patch
@@ -0,0 +1,40 @@
+From d7428b4cfe5f817037030d025028bf09fd7992ee Mon Sep 17 00:00:00 2001
+From: Adam Dangoor <adamdangoor@gmail.com>
+Date: Mon, 29 Jan 2024 11:29:16 +0000
+Subject: [PATCH] Add fixes for Pytest 8.0.0
+
+---
+ CHANGELOG.rst               |  5 +++++
+ sybil/integration/pytest.py | 17 +++++++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/sybil/integration/pytest.py b/sybil/integration/pytest.py
+index 8ce6c72..cad311d 100644
+--- a/sybil/integration/pytest.py
++++ b/sybil/integration/pytest.py
+@@ -53,12 +53,21 @@ def __init__(self, parent, sybil, example: Example) -> None:
+     def request_fixtures(self, names):
+         # pytest fixtures dance:
+         fm = self.session._fixturemanager
+-        closure = fm.getfixtureclosure(names, self)
+-        initialnames, names_closure, arg2fixturedefs = closure
+-        fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
++        if PYTEST_VERSION >= (8, 0, 0):
++            closure = fm.getfixtureclosure(initialnames=names, parentnode=self, ignore_args=set())
++            names_closure, arg2fixturedefs = closure
++            fixtureinfo = FuncFixtureInfo(argnames=names, initialnames=names, names_closure=names_closure, name2fixturedefs=arg2fixturedefs)
++        else:
++            closure = fm.getfixtureclosure(names, self)
++            initialnames, names_closure, arg2fixturedefs = closure
++            fixtureinfo = FuncFixtureInfo(names, initialnames, names_closure, arg2fixturedefs)
+         self._fixtureinfo = fixtureinfo
+         self.funcargs = {}
+-        self._request = fixtures.FixtureRequest(self, _ispytest=True)
++        if PYTEST_VERSION >= (8, 0, 0):
++            self._request = fixtures.TopRequest(pyfuncitem=self, _ispytest=True)
++            self.fixturenames = names_closure
++        else:
++            self._request = fixtures.FixtureRequest(self, _ispytest=True)
+ 
+     def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
+         info = '%s line=%i column=%i' % (
diff --git a/dev-python/sybil/sybil-6.0.2.ebuild b/dev-python/sybil/sybil-6.0.2-r1.ebuild
index b201c88bbd36..3985cf5a76d8 100644
--- a/dev-python/sybil/sybil-6.0.2.ebuild
+++ b/dev-python/sybil/sybil-6.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,3 +32,13 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/simplistix/sybil/pull/108
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index b78ce4bfad0a..cc1653326423 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1 +1,2 @@
 DIST tekore-5.3.0.gh.tar.gz 262670 BLAKE2B 7d97a94ddb516e4c1fdfd391377d08b5df444fd4e753be6d7f8a41cd21ed118e27ee29a8364e69e564d94f31916f10511c1472aad2586c4ba016aa97ae8248f5 SHA512 5ff2520af36236a61be4681ebe5df011a67f0db9c2b88e58958368435f8c3a4c183f94657f9a84c16156cff54b856a8f93867ce2d475075ccffaf2230428c219
+DIST tekore-5.3.1.tar.gz 270742 BLAKE2B 08fd8a4deeaa5024f5bb138c4f9bc3fae25f5a2b21c4298bf5d12932793b33e778dd2b15cbdbeec2f62cba841f55a59e6f2c43d51f968d01603dcadd5883d91a SHA512 8d81af1528bedcc4d76ee96f2b310d0522262b0466bbc30bf3849eb7b936067e42311acf9fe724377ec801f2863fa50de61f409363d00486c6d596ab01acb09e
diff --git a/dev-python/tekore/tekore-5.3.1.ebuild b/dev-python/tekore/tekore-5.3.1.ebuild
new file mode 100644
index 000000000000..f2abbe1270d9
--- /dev/null
+++ b/dev-python/tekore/tekore-5.3.1.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 pypi
+
+DESCRIPTION="Spotify Web API client"
+HOMEPAGE="
+	https://tekore.readthedocs.io/
+	https://github.com/felix-hilden/tekore/
+	https://pypi.org/project/tekore/
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package sphinx_codeautolink
+# distutils_enable_sphinx docs/src \
+# 	dev-python/sphinx-rtd-theme \
+# 	dev-python/sphinx-tabs \
+# 	dev-python/sphinx-autodoc-typehints
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
+)
+
+src_prepare() {
+	# unpin dependencies
+	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 565622cddafb..70cd22a2d40b 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1 @@
-DIST Unidecode-1.3.7.tar.gz 192647 BLAKE2B bb32b816b9bd3cd8e29c84297a5ff81d60c2865c4b1e7039435e9819c5cd46057f3853d3eaf128ab13444105f81c5451533eac3a38d6181157bc8a30c86234bf SHA512 b4f7c8b40e1c2d05aab4e53b54fd657a3db35ea5feba0f95551ba2ccfd7e5b0da034aec6de11c5e43f23c3a9609f5cbe8e458fe18539ffdf7ef79e039e1b390e
 DIST Unidecode-1.3.8.tar.gz 192701 BLAKE2B 622b61b89d83070101626775187a666b830399bc86c67367b0793b6626667dc8f4655372c7bc8b61f2433ac927ec7572e5beb104407784dd2f8e20ced9ecf981 SHA512 0c93647b05b3ce041ba0091705630a4d75dfc249b3aa57b1d8bd26d26f1a067af1d0103a0f57ee2ea07224797ce204562e08df92d0fe60e250a16614bf146ece
diff --git a/dev-python/unidecode/unidecode-1.3.7.ebuild b/dev-python/unidecode/unidecode-1.3.7.ebuild
deleted file mode 100644
index db76b648c646..000000000000
--- a/dev-python/unidecode/unidecode-1.3.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidecode/unidecode-1.3.8.ebuild b/dev-python/unidecode/unidecode-1.3.8.ebuild
index 7241e8691130..00800d4923bf 100644
--- a/dev-python/unidecode/unidecode-1.3.8.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.8.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="https://pypi.org/project/Unidecode/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 62a9f0d041fe..fa439a01ed20 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,4 @@
 DIST urwid-2.3.4.tar.gz 678305 BLAKE2B 1b0de4ae4a18751275de968da9899e934277d8f9ac24cd1363ec9bbef48492f5fc6e00785c75447c8eddba2952fb37689b1e2b7b74a430590020b3aa77979f16 SHA512 e1ed9357b738975c909f847a2f12292cfad1cf824be9d3818ca0de3d1ca5c992ba89d5cea25888db3a8bb6c73a64b94ecb1df0a19d5af7f7b060bd113f93a8dd
 DIST urwid-2.4.5.tar.gz 801268 BLAKE2B 8517e4b71a5bd0b9db28d08dd503965f1187f88467f4579e0068175e22f1c57dc0605f46c42e39f629d7e4ccace550a07e34cfd95d3595f5f7fca17ca0b8f9d8 SHA512 2e107902d77461e5235f4f83c03770d80b05acd83136cac6d1197e17b74520e91abf265bcc344f2f055ab015e71150cbf08d59802165463214703b2f6b3eb978
 DIST urwid-2.4.6.tar.gz 801434 BLAKE2B 52b6cd256fbb6f7296619140c0d2cc9dacb910b3666dedb5e53f6c9c66eb17c628c2da7ec3e61ac7c24c9359161a032228bfa676ea9e53169ff3bef873782af3 SHA512 b7255b5f5f274fec952edb808ff859289dbd75f0600f3ddf1b608111f0fef50955efadeb1c1792fe16f5adc6c12a3641bfb50e42bbf8c07b10f431ca50cc0766
+DIST urwid-2.5.0.tar.gz 839216 BLAKE2B cd4ca032d725962074cd15494f8d1df0ecb73616cc4398cc1f1b13c665f547b4d9e4e3c1b1ee9e11488eeaea454a460d0efe6f082cdcf8d2840419c427673c1f SHA512 fc4d6b98a5b17c1d181ce96db7527e32b089c4fbbf597725a913f7f8f2412f3b922f39d375db8789f395da85fc6a23b954df1be768055a014fc9d86ebdfb5a32
diff --git a/dev-python/urwid/urwid-2.5.0.ebuild b/dev-python/urwid/urwid-2.5.0.ebuild
new file mode 100644
index 000000000000..13217dbda807
--- /dev/null
+++ b/dev-python/urwid/urwid-2.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023-2024 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/"
+SRC_URI="https://files.pythonhosted.org/packages/82/20/dc1ecc94c75e402887efc734785275fdd12ebd3fb2f312a575f741bf3dad/urwid-2.5.0.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_sphinx docs
+distutils_enable_tests setup.py
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+	python_optimize
+}
diff --git a/dev-python/uvloop/uvloop-0.19.0-r1.ebuild b/dev-python/uvloop/uvloop-0.19.0-r1.ebuild
index dfcb4c1d9860..7fae778d3f17 100644
--- a/dev-python/uvloop/uvloop-0.19.0-r1.ebuild
+++ b/dev-python/uvloop/uvloop-0.19.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.19.0-cython3.patch.xz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 -riscv ~sparc x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-01-29 17:53:41 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-01-29 17:53:41 +0000
commit	1fdeabdc269610ddb66f36f34e1f6416a5eea439 (patch)
tree	fdc643778f2a873bdb2b3581ae354bb10f242215 /dev-python
parent	f9e0c4a63c8eacef6ef1379be1fee3c5b90f7c0e (diff)
download	baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.tar.gz baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.tar.xz baldeagleos-repo-1fdeabdc269610ddb66f36f34e1f6416a5eea439.zip