Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-06-22 17:42:58 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-06-22 17:42:58 +0000
commit: 9b2dbe02784d42d572e7c34746d92d0dcd641636 (patch)
tree: 33512bd0a426cee57d7d3dbb85ea6d134173bc95 /dev-python
parent: 6dee9399536acc2c36960b5b40ae671d37b235ce (diff)
download: baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.tar.gz
baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.tar.xz
baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.zip
105 files changed, 653 insertions, 2636 deletions
diff --git a/dev-python/Faker/Faker-25.3.0.ebuild b/dev-python/Faker/Faker-25.3.0.ebuild
deleted file mode 100644
index 7654943106a7..000000000000
--- a/dev-python/Faker/Faker-25.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Faker-25.8.0.ebuild b/dev-python/Faker/Faker-25.8.0.ebuild
index 7b5041981ad9..40c219eeffd7 100644
--- a/dev-python/Faker/Faker-25.8.0.ebuild
+++ b/dev-python/Faker/Faker-25.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 7edbdbbed937..5813f2f8ccb7 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,2 @@
-DIST Faker-25.3.0.tar.gz 1760396 BLAKE2B 46e12f80a84385b4bb50e19a26fe436be1ee846f87309869bc624ec45c15550f33e733d70d9e87c493521020c4e16cddb6f17f2bbc36b6d8072829f582f0beed SHA512 d4b3a762d22b9947ebae254d07abc7e0c3511d9277439075fe876371f1c25dbcbe5a08729e33925c98ec86ef3b5f3321b5a3ac3802784bb42f8296fe9a09eb30
 DIST Faker-25.8.0.tar.gz 1760950 BLAKE2B 89b18875ae2c3934423d4e7ce9d0da048830f73384db73589372791c6a1798254e3cab54b566ecfbe3263c44edbe12f2c3e7e0d6cbb004e6fc09e9b2e12f7e89 SHA512 88d0c073b48e0df050d3601d97223d64ccf04ad57d59cb37e26a40211633b04301000e7ce12a124e97b32b63225b440f5b44e1d6197f9c8999f7dd0b579a075e
 DIST Faker-25.9.1.tar.gz 1762549 BLAKE2B f331ba11899f0711a74aa4c6a3f883113c00ef16960816b26163be2355bfd1aeda1e01fb5ff430d5f34f99a21e74195d8cdd1fb44fb23e3870a6592242564ab9 SHA512 191ccf0cccdf125cabf2af20cf74681d3aa28038eb2551f7e1cd3a285b17e2fc1d8b245888c44d9a1f66b1f9a5ddc1847ff2e421ef9fb8732efeb56e0957a898
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index cca3311716c6..66a9178a133a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,3 @@
-DIST boto3-1.34.117.gh.tar.gz 813596 BLAKE2B 1b68c6410a9e4859c05ec6e8baa7b4d0a8eda39ac9cfe7173d581e5712409bb5df83d35f30deb4f5e4e1dd70c0dc411cd8a1725b00f1e8a3026dbaef9862cde0 SHA512 40c6c1d62d94e0ac8d0237abbbacb9b7473dbce0ee7be5f2e8106f0c0be99b6bf048f3068e2978c578a8df5948f854bd4f3b9d99d935094a646a33f3bada7136
 DIST boto3-1.34.122.gh.tar.gz 817093 BLAKE2B ecc91833d5d8b7ae33c2fe435e33bc8fa236388dcd36bbbfad138e72dcada1018d9fe032a04565bc6ba04f252c5b1e066f650620aab2b6682705d164660eaa9b SHA512 26ece26e24a09ce12f57fd7cbede798446ddb60c28dd7d090c2604b71cc92fca9cfdc268e6d65fad1bcecf161976186b21acefdb70a2de8acaccd85567a388d0
 DIST boto3-1.34.127.gh.tar.gz 820740 BLAKE2B ddfb7802440a01af27059daed4bc7cd3797eb192004a0e7b78e1e56a8ff479206b4835a79bcac1db273c2936fb8dfde0ba16bebe8cbe1befeb188070bf46b2c7 SHA512 b139ad68a4ce29e84e0fa1618b97c4aea13b668521921712df74256ad61c21d2077ea216dfb4102d8f9910a8119b24509aa10a504d746bdb410fee1cecc0461c
-DIST boto3-1.34.128.gh.tar.gz 821252 BLAKE2B 7f7d13106d69b54d4932a52c0d0b2803cc5131773ce9503a1fc8ea8ff3fdfb5ba5f372b2665312ce3c136f4f37889e54cd61b49eec72ac21902f379b0ec87f29 SHA512 ee46351e613c55cf720e2bf361df8bb07954a05bc9707ce20fe75390abf195674d50e4f862ed8d357397e83c7ffcc586eff396d186596e688b895deaaaf4699f
-DIST boto3-1.34.129.gh.tar.gz 821825 BLAKE2B c672b77844c366190ed1a7d3bd1621267da9db321bdf36bad3d6f4de359b560509467156a602a598b53e5f12c4442558294199185c6a6074b7c303b914b645ae SHA512 af548985020c54ff5f9838639c89daafb2d14d2da0376a541f274d4440219758610811fb71654ecf4aa59cad1e6b56c8cb4e830949d0686665ae30a99d48f3fc
-DIST boto3-1.34.130.gh.tar.gz 822203 BLAKE2B b7abf46e88f08a64f13abc39089fb3b61164cf115c41716b038b285fc1002bd0a3bc63e30774a001a9965ed5beecdd792d19ba41ca658b49dfa2c2c52566b8a7 SHA512 c6a600577a5be8639a42d5c643eb6cb4f7b534667ecff4d78f7c5ebe79e6f79fd94e8ed0a86b777d7b2fa253fbe9ce6b78fcf85e7887f1fd8bc94a69ddc685e6
 DIST boto3-1.34.131.gh.tar.gz 822851 BLAKE2B cc4b06ca1785e62314308efb7d9ffa6e10a40fe48bdd3e31f9f12490a57843ad528685d04ea9ec40cf2203acc0ee0a9fb58ee272837c9a637f44c2716f60de7a SHA512 79cd8718c6d84cdcdcadfcde80368addc095770624806eb8cfa981852c2a8ebcc8074533ec8f8e24b01a3aed241afccb6f49fdce250ae07f630d8596931778e3
diff --git a/dev-python/boto3/boto3-1.34.117.ebuild b/dev-python/boto3/boto3-1.34.117.ebuild
deleted file mode 100644
index 1ad6d3c11774..000000000000
--- a/dev-python/boto3/boto3-1.34.117.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.122.ebuild b/dev-python/boto3/boto3-1.34.122.ebuild
index 509842b2699d..1ad6d3c11774 100644
--- a/dev-python/boto3/boto3-1.34.122.ebuild
+++ b/dev-python/boto3/boto3-1.34.122.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.34.128.ebuild b/dev-python/boto3/boto3-1.34.128.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.128.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.129.ebuild b/dev-python/boto3/boto3-1.34.129.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.129.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.34.130.ebuild b/dev-python/boto3/boto3-1.34.130.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.130.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index ca6b2a244dee..8dfcae552b25 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,3 @@
-DIST botocore-1.34.117.gh.tar.gz 13076178 BLAKE2B defbd66d6409004fe49df44aec0a00b4bbe1a459d3e4b067c5c8609b998c63e7d62c8d3c48805416d44c08aeb3ab261f4449cc7e6a7c66dd3ca5f97bdcce291f SHA512 d9736ddb868e602afbaad95989d284b2835636f273e8a4263caa7eec619fe7cc45515fbbe98d4fd33121fe0d97d34353f7cd811bc878a81d1f5f7437798b24d6
 DIST botocore-1.34.122.gh.tar.gz 13066937 BLAKE2B f22af79873b5574ae4b2b9041568cfc1d727625c3fa45c9b8d1bef71ffcce893aa8a3591c83160437c7e617be72814a2209569db633d857f869a2152af7c8e05 SHA512 f08dcb2920d4bd26a47478edb871f75b240275a7b96acf58be838080dddca3d4f64b9fda8683e5a3db97defe367298b2ba634fc4d605523805b23c83c3a5ae0d
 DIST botocore-1.34.127.gh.tar.gz 13112261 BLAKE2B e883f0a1e29178667678132195aea9666a124456e731e1b158eed895c125fd614e5671639766f7ad46c2e6b16c4156ff5e42594bc04e49bf25380c91cfcbe264 SHA512 48ca2179c24bb219202e5029dd62350a6fc5c64707762f0f33282e542dbc2227bb146376afa9e6b9eb1e45e3c801208a142bef4827d5036eb4724299c826d534
-DIST botocore-1.34.128.gh.tar.gz 13115625 BLAKE2B 77be2cb79722d1052b64df55a7bb7a9d43dc7d0052c2a4ce18265745edb7b6f9f30780a98f2395abadcfc16817e7375b182691b51f44450574846cc4bb423df5 SHA512 d5f709230ba73ea7c78a4b55a07c0d834b1abf2c3196d43d47d042e1cb190f5d8d08ad942053963ad5df9b2e01b5f905d167840f54842a41181de5305762d5d1
-DIST botocore-1.34.129.gh.tar.gz 13122365 BLAKE2B bbe68547fd9cab43c75368091abd81e3cf602e3df2f9ea4ab79250f12ba34ea410ce50683309001b1898a6c7c5fb3e23dda145833f4db74304417e665bcf1ce1 SHA512 bea364bf0185a6a9086fd712ccfec7fa0870328fe4569d8553ccfea8577c3b64212e7860a37aeec35fbb7bd1a179c32d487ecdc98651076b27a8f07429c843b4
-DIST botocore-1.34.130.gh.tar.gz 13122638 BLAKE2B f43167295b7cd590fbca8c2910fb5e1eca159c3cc77912e901d9caf95fac9cb7d38712b68c3f8115fbfbb2346944a24f42a1e707f23c53d23a64dec9656453b0 SHA512 d6102b5a7d519de3a69aea26ac89cd38cead5c8f1c86f9c6be6c05c50ce23bd9f2ff3115505230e3de46430a7a25dda63896773cab6c31f410d845e2d3ac4abb
 DIST botocore-1.34.131.gh.tar.gz 13129943 BLAKE2B 916360c6a9526edcfd338718f80556e59d54692aac13f38490e49457edd59016d264a5acbfeb6298af494f09f9c385e16347a9bf7f144c5a11afda2df188aeed SHA512 9bb788ac8e8a2ec7be999acafef88ccbb4e693ccb315efe5655b80cf3f6629eebccbdac6f201550d2f75e476d83c5a800f1add6c71e2fe5b3d503da313f6d3d3
diff --git a/dev-python/botocore/botocore-1.34.117.ebuild b/dev-python/botocore/botocore-1.34.117.ebuild
deleted file mode 100644
index beb1bdc6a919..000000000000
--- a/dev-python/botocore/botocore-1.34.117.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.122.ebuild b/dev-python/botocore/botocore-1.34.122.ebuild
index 857224b496b7..beb1bdc6a919 100644
--- a/dev-python/botocore/botocore-1.34.122.ebuild
+++ b/dev-python/botocore/botocore-1.34.122.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.128.ebuild b/dev-python/botocore/botocore-1.34.128.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.128.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.129.ebuild b/dev-python/botocore/botocore-1.34.129.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.129.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.130.ebuild b/dev-python/botocore/botocore-1.34.130.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.130.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/caldav/caldav-1.3.9.ebuild b/dev-python/caldav/caldav-1.3.9.ebuild
index 0ea6b1274a2d..f95076df0e3a 100644
--- a/dev-python/caldav/caldav-1.3.9.ebuild
+++ b/dev-python/caldav/caldav-1.3.9.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
diff --git a/dev-python/cbor2/cbor2-5.6.4.ebuild b/dev-python/cbor2/cbor2-5.6.4.ebuild
index 96b4b1b35f34..1367fdfca6ba 100644
--- a/dev-python/cbor2/cbor2-5.6.4.ebuild
+++ b/dev-python/cbor2/cbor2-5.6.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index fbb7e76315b2..b0fac7610c88 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,3 @@
-DIST cfn_lint-0.87.3.tar.gz 3963065 BLAKE2B 400532698248204fe2bbf9f29fb374d178cd4a8b168dcb681b284da0d5d7be17cd28292b8f37a7c600936b96a56e90d925e5e0d88f062f5c8a7821f0ffe43528 SHA512 b23ed7259907da993469b4b2a6cfb6a5b8f1bc9186d65e8392ccf628b8b37fe7a0bde6d5d57ca6924d738770367e67245f13abce4777fa88945316569eb59b4b
 DIST cfn_lint-0.87.5.tar.gz 4059125 BLAKE2B 93d1b6ad445628360f62d1d4ceab75af85c1ed8ae9b5ac667f70346e5ddb6e75cac57544f5fb4f1f44d30503041c2259a4cedcd4be343eb7408b6d82a9e2fe9a SHA512 3a1fc8514a9490544190e6f8b9d1333676683ebdafbe040660558f9c2cd3675494ac44979019f1fc57857cb692ee32000e60218a9abb959e686949ff032e6eb9
-DIST cfn_lint-0.87.6.tar.gz 4076995 BLAKE2B 57a5d598d2725851d1a59094bda249b32f7426381224cb8c2e6701e5eea92d0aea2984a5dcc6eb1640194e2535c9fd570712d80620c86fb20fcf42938942fd7a SHA512 06f3a51487ec19a4288ebfa87d6c00bd4fc2b3bfc81299c23e3afa7991ac1234e772dd989cf94af21ee3fa7d236fd9d36119e34d6d57f8da0ad304cb754a3326
 DIST cfn_lint-0.87.7.tar.gz 4077539 BLAKE2B d7382b8112332821988854f719a2965749b5cb4cda3cbe3d1e7c5851d8b758f4136218ef151bc3983bf94b8e8a3d33989f987bf0162f4dfdaac8333ae798e049 SHA512 8c3f4c840100b407cacfd788722ceb980f8409180f80f76b722cb5efa237444a2d38f8e2e17c5763d9d1adcf9471f57b4d9d58f2a793b0b80f8e0c988820411d
-DIST cfn_lint-1.3.0.tar.gz 2425129 BLAKE2B 7ae63c4c3c1959070ab74fc26751d7ea8b739f6ab5b2fe49a7b000d3239f27d9bf71ddeeedd4cc380dbd603a42a77949c91877428f43de0fd9f1cdac68bfb88f SHA512 a4b9af0ae4d4da276f2239d7efc6e96d0ad37a8133b079d53fe4f82d074e74c251d0791a4a07ac35730192e3bf29a3a2ab86a27a7fff5440f52f18200831ea2f
-DIST cfn_lint-1.3.2.tar.gz 2485054 BLAKE2B 524d81285a90fb32380cf157150257cc3daa6bf0c584b3fcb628e956fbf6b0f3f1876401bedbeb20f8541e82131d56984b13f63e1a1af3c398bce16460794d9c SHA512 e237ffa10037dd724ee01d5687d37114e74a889e0afee1181671363552c7444ea3cb7433326565b0905bcaa8cb2205aad06dcc3f87fd11c9a6048f8aa7c7f3cf
 DIST cfn_lint-1.3.3.tar.gz 2474929 BLAKE2B d5c8685e48739b178a1ab222b90a31626fffc9dfa91e9fbac6554d33d559a675ef50a2670c00a750aeac057777d29ac6a95526829862794ac289d30d53e268ec SHA512 726e96d4b5fa7e3446382cd8050dc99dce1cb848f7a11f5d1795c5a1a408b1d9e9148f7e3aea7887ebb361b1fd597c434ca0fbbf6a31631d8ac021aaf522427f
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.3.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.3.ebuild
deleted file mode 100644
index 73b0182fc3ee..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.87.3.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 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.87.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.5.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.5.ebuild
index c538c0ae4a62..76d2822890c4 100644
--- a/dev-python/cfn-lint/cfn-lint-0.87.5.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.87.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.6.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.6.ebuild
deleted file mode 100644
index c538c0ae4a62..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.87.6.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 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.3.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.3.0.ebuild
deleted file mode 100644
index 254c72bc6707..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.3.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.3.2.ebuild
deleted file mode 100644
index 254c72bc6707..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cftime/cftime-1.6.4.ebuild b/dev-python/cftime/cftime-1.6.4.ebuild
index eb478dbe628e..9d66b23b6185 100644
--- a/dev-python/cftime/cftime-1.6.4.ebuild
+++ b/dev-python/cftime/cftime-1.6.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm64 ~riscv ~s390 ~x86"
 
 DEPEND="
 	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 33d82d72c308..4396da943f61 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,2 +1 @@
-DIST cssutils-2.11.0.tar.gz 723164 BLAKE2B 433358b1bd167d72ceda9c60f4460a95804c492a92854747dfc49ef4e2efe69388781c515adbb3c5d9010895e13a039ea33c46d4b2c71cb8bb15eead3e998b60 SHA512 42ce87502757d213ab5b2812c8a76724955f565826c69ffe4db53d49020ce960c8544423428f2b8c24d9b1b215c22f18de9dff66ef249c8060d17aad990d9a6f
 DIST cssutils-2.11.1.tar.gz 711657 BLAKE2B 08522271238efd160dba06e580e01136ec1dab69bef8400f458edcf58a179ffc1d5bbca9423afddb66b5c781c2742a00f9a9fc0c5119ed3d865f914ebce2238f SHA512 7e38f08c5ff340b82ea39bda207d099b39ce6b88c8ac0d7ac1fb29e7b4ae6d8baa341e0a9b27e6d2285e31266112ec51d1fff9ef3e5a17a4bf55546fb4927845
diff --git a/dev-python/cssutils/cssutils-2.11.0.ebuild b/dev-python/cssutils/cssutils-2.11.0.ebuild
deleted file mode 100644
index 7a546c5fdcb0..000000000000
--- a/dev-python/cssutils/cssutils-2.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/lxml[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		encutils/__init__.py::encutils
-		examples/website.py::examples.website.logging
-	)
-	local EPYTEST_IGNORE=(
-		# path mismatch with "parse" package
-		examples/parse.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network"
-}
diff --git a/dev-python/cssutils/cssutils-2.11.1.ebuild b/dev-python/cssutils/cssutils-2.11.1.ebuild
index 4f5bbd42f004..26aa2ed17e40 100644
--- a/dev-python/cssutils/cssutils-2.11.1.ebuild
+++ b/dev-python/cssutils/cssutils-2.11.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 081d5679743c..bb620a0d5251 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1 +1,2 @@
 DIST pip-24.0-py3-none-any.whl 2110226 BLAKE2B 6a0c8c9796cd574ef1d709de40a8530a15e50158143e332b79e5ad3edceda6ce93c5ef4df49b169062598618dcc6967c2115ac2c10b05abf345318204f1eeffc SHA512 5d7462a584105bccaa9cf376f5a8c5827ead099c813c8af7392d478a4398f373d9e8cac7bbad2db51b335411ab966b21e119b1b1234c9a7ab70c6ddfc9306da6
+DIST pip-24.1-py3-none-any.whl 1823006 BLAKE2B ca5282b1100243cc4e391ce30d5ae7d4978987e46323b7e151c87457c4ab762f909c88ae3cb72015d09bf7c1243ddb6ad791e991093713431961962fc6fdde83 SHA512 84e8318896294e5750f30a3fa55833e5e5c802066091802e05ff94fe139c825f3fe0fb5014b899f0afd844ad1129e8d04b9fedd74a7f46a1c248dac546ab16f8
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-24.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-24.1.ebuild
new file mode 100644
index 000000000000..85e9351f85b0
--- /dev/null
+++ b/dev-python/ensurepip-pip/ensurepip-pip-24.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared pip wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/pip/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/fonttools/fonttools-4.53.0.ebuild b/dev-python/fonttools/fonttools-4.53.0.ebuild
index 9e8761cd5e7d..e9da193aa661 100644
--- a/dev-python/fonttools/fonttools-4.53.0.ebuild
+++ b/dev-python/fonttools/fonttools-4.53.0.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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 651c0458c20d..67c3ed50adcb 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,2 @@
-DIST google-api-python-client-2.130.0.tar.gz 11178249 BLAKE2B 8f89f85124f72fa1c23ef6ab2d8e0eba2935ae14bf3528102de977aeec6b6b525f51f6d6d574e582b010ad49f6d8ac450cdf6edae7653a6b47b15868754e6ea4 SHA512 3553a140a86974cbf05cf21b4792f59adb3dee23e50772c8b6d285868ef08566bda8a64895b7054fa3f340dac0c9f52b4a712eba3fabea8feebca7390149e0ed
 DIST google-api-python-client-2.132.0.tar.gz 11256536 BLAKE2B 4a046c03a50b3922b94e6a07bfce974851752542a69300d544b7c8439c4ad54fc9fd2d5fdf84656801ebe9bf5ad35588d39dc3603537d67db93ea995b50651ff SHA512 ecd6be9009f979447ee7d29dc05af2b25c500ca17a8d88ae6660ac0a72f6bb8237f3224dda63b22378a38c6cf7fab914bc6372351d95e691c3b16f248be04a64
-DIST google-api-python-client-2.133.0.tar.gz 11299741 BLAKE2B d964eebe1ce76448d716865f200b07f06eeffac866aa40f602a8bae09cdfd0f66ec6eec8d96f71a63d8cbad68c4677c7398f0b7157507b8f56b04210debe937a SHA512 a22871af52b0a40b328328438c248b324d5f695f507df2df470ef6735b7d3b7261915d087d8260dc315a57c7a12825412cc1a468170c8b77a74fbc0523858952
 DIST google-api-python-client-2.134.0.tar.gz 11393129 BLAKE2B f5339dfa42f621dbdd145295a2c2710ef9e6e2af543ff5b9643bea884f9e0678065999d60cbf150a56e7b0d8c283588c53461c86eeb491a6ba2ad0c553a48344 SHA512 09a137ee3e3d8f38129fc02d8ffed8934daf6cfcd13904692f44038332da026b30d952048148c8c4fe5c4fed3347196574a860f58e1943312d19f6f03a01ab36
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.130.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.130.0.ebuild
deleted file mode 100644
index 0d95bd55107c..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.130.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
index 2b0d333aae0a..0d95bd55107c 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild
deleted file mode 100644
index 2b0d333aae0a..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index da514ff6d133..feeed912e37d 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1 @@
-DIST google-auth-2.29.0.tar.gz 244326 BLAKE2B 36b0bd8f445e3c7c3e0a83d07cf5924401dec99cdd22a6042bf5b9ca1cc9b1e28d0029f8f1509bcb32a7c54abd7c453dd5077ad25886d265822cf1c880b1326f SHA512 0f6d7e9728479a5937d72321f5ae6cfa3592dd42bb518a5519fc0936b533472e872fe947470a1774f8e53a2dad3c65e001de3899b74b6373dd149c6944423473
 DIST google-auth-2.30.0.tar.gz 251462 BLAKE2B 63deab7b36e79a590348f6e0cfa5c1c0e0715468d35dfcb0e7227932d4d543953668ec4c4b78a087ee1fc22a37bfbc913f07c428f02fa894d28228fae68d0942 SHA512 23ebaf17c12d745214405867661b85eb628dafbc06b87f101ad10d4c4ea8e2cea04a4c9b0c0037ba8f0d8cc12c2221bd4199613fe3c3e3987c72525cb94a5bd3
diff --git a/dev-python/google-auth/google-auth-2.29.0.ebuild b/dev-python/google-auth/google-auth-2.29.0.ebuild
deleted file mode 100644
index 05c87b7a9a33..000000000000
--- a/dev-python/google-auth/google-auth-2.29.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 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/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.30.0.ebuild b/dev-python/google-auth/google-auth-2.30.0.ebuild
index 0269b458272d..05c87b7a9a33 100644
--- a/dev-python/google-auth/google-auth-2.30.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.30.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/files/imageio-2.34.1-numpy-2.patch b/dev-python/imageio/files/imageio-2.34.1-numpy-2.patch
new file mode 100644
index 000000000000..c5c8288da471
--- /dev/null
+++ b/dev-python/imageio/files/imageio-2.34.1-numpy-2.patch
@@ -0,0 +1,36 @@
+From 511ad9b3705fc09d4654d69e42bbafef97bcb0a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Wallk=C3=B6tter?= <sebastian@wallkoetter.net>
+Date: Sat, 22 Jun 2024 14:56:11 +0200
+Subject: [PATCH] support numpy 2.0
+
+---
+ imageio/core/util.py      | 2 ++
+ imageio/plugins/_dicom.py | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/imageio/core/util.py b/imageio/core/util.py
+index 6b2830421..bfb7e9fe9 100644
+--- a/imageio/core/util.py
++++ b/imageio/core/util.py
+@@ -163,6 +163,8 @@ def __array_wrap__(self, out, context=None):
+             return out.dtype.type(out)  # Scalar
+         elif out.shape != self.shape:
+             return out.view(type=np.ndarray)
++        elif not isinstance(out, Array):
++            return Array(out, self.meta)
+         else:
+             return out  # Type Array
+ 
+diff --git a/imageio/plugins/_dicom.py b/imageio/plugins/_dicom.py
+index 96fb6fcde..2f2f7ac51 100644
+--- a/imageio/plugins/_dicom.py
++++ b/imageio/plugins/_dicom.py
+@@ -531,7 +531,7 @@ def _apply_slope_and_offset(self, data):
+                 data = data.astype(np.float32)
+             else:
+                 # Determine required range
+-                minReq, maxReq = data.min(), data.max()
++                minReq, maxReq = data.min().item(), data.max().item()
+                 minReq = min([minReq, minReq * slope + offset, maxReq * slope + offset])
+                 maxReq = max([maxReq, minReq * slope + offset, maxReq * slope + offset])
+ 
diff --git a/dev-python/imageio/imageio-2.34.1-r1.ebuild b/dev-python/imageio/imageio-2.34.1-r1.ebuild
new file mode 100644
index 000000000000..9314afc2688c
--- /dev/null
+++ b/dev-python/imageio/imageio-2.34.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+TEST_IMAGES_COMMIT=1121036015c70cdbb3015e5c5ba0aaaf7d3d6021
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/test_images/archive/${TEST_IMAGES_COMMIT}.tar.gz
+			-> imageio-test_images-${TEST_IMAGES_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+BDEPEND="
+	test? (
+		>=dev-python/imageio-ffmpeg-0.4.9-r1[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+		|| (
+			media-video/ffmpeg[openh264]
+			media-video/ffmpeg[x264]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}/imageio-2.22.0-block-download.patch"
+		# https://github.com/imageio/imageio/pull/1089
+		"${FILESDIR}/${P}-numpy-2.patch"
+	)
+
+	if use test; then
+		mv "${WORKDIR}/test_images-${TEST_IMAGES_COMMIT}" .test_images || die
+		# upstream tries to update the image cache, and invalidates it
+		# if "git pull" fails
+		sed -i -e 's:git pull:true:' tests/conftest.py || die
+		# ffmpeg tests expect it there
+		mkdir -p "${HOME}/.imageio/images" || die
+		cp .test_images/cockatoo.mp4 "${HOME}/.imageio/images" || die
+	fi
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# uses fsspec to grab prebuilt .so from GitHub, sigh
+		tests/test_freeimage.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Note: upstream has a needs_internet marker but it is also
+		# used to mark tests that require test_images checkout that we
+		# supply
+
+		# Tries to download ffmpeg binary ?!
+		tests/test_ffmpeg.py::test_get_exe_installed
+		# blocked by our patch
+		tests/test_core.py::test_fetching
+		tests/test_core.py::test_request
+		# Internet
+		tests/test_bsdf.py::test_from_url
+		tests/test_core.py::test_mvolread_out_of_bytes
+		tests/test_core.py::test_request_read_sources
+		tests/test_pillow.py::test_gif_first_p_frame
+		tests/test_pillow.py::test_png_remote
+		tests/test_pillow_legacy.py::test_png_remote
+		tests/test_swf.py::test_read_from_url
+		# requires pillow-heif, also possibly Internet
+		tests/test_pillow.py::test_avif_remote
+		tests/test_pillow.py::test_heif_remote
+		# not important, requires random system libs
+		tests/test_core.py::test_findlib2
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 95b718f4764d..f75009013a00 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-material-9.5.25.gh.tar.gz 14879571 BLAKE2B 4a3b36d73d583fad189b0a19b4e66506318ab7ae0ef86ef1b3fec8c9e36c758c7aa941b0faa02e080c96ab018cad3f2874d676033dea8c83512b8d1561e9e79a SHA512 1c3a1466100feeb0e4150025668bd2de0d4d0552de4a156d336a5cda6bf6e94583513b1449ca0b7da4aa911e51201c105c4c95b87972b691eff280fdf32acdf2
 DIST mkdocs-material-9.5.26.gh.tar.gz 14915417 BLAKE2B d026405c89d41c8190ba1694bbea5ed3bad9ccfebda3af590d78192c7ad1ee5514740fa42c7f0f7cea59d5b8fb8a9685fa87cba0a67175e9cde53da514442241 SHA512 b2a02fcfae3ea8c0a8777726589288ab4a703175216f3ec4a96b621ff8eec8e210953fbe4ce112db151671821266f319b01bbac4d732157d2aec059120ab41a6
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.25.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.25.ebuild
deleted file mode 100644
index 5c080c205d27..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.25.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.26.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.26.ebuild
index eec1908ef846..5c080c205d27 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.26.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.26.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
index 84eec8351b07..2e6677d8f935 100644
--- a/dev-python/munkres/munkres-1.1.4-r1.ebuild
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild
index 30663972e64a..9dddc260da91 100644
--- a/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/nodeenv/nodeenv-1.9.1.ebuild b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
index 3c2ca5547135..7427b5112a8c 100644
--- a/dev-python/nodeenv/nodeenv-1.9.1.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 # requires network access
 RESTRICT="test"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 2167d950a8bc..4d38801a4682 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,2 +1 @@
-DIST notebook-7.2.0.tar.gz 4946565 BLAKE2B f29d784c972a2b84b84c67e0e0a225e933468c1097c698690e68f99bd5ace98765d4c0ff5146e4cd0b3be3db0b0affd5a8a41ded262b8ffe50304594cd0ae2ee SHA512 6d76d67ea02493c04287a5571f8f817cf3a4072635995bde3ae7695cd00926519f20ae44a267a38b7b65578be507103f895137e37360c93bf4219b2e8f134935
 DIST notebook-7.2.1.tar.gz 4946671 BLAKE2B 2f78c497b1527c29a911fd0a057df41f3e522e426e3eae940d9adea9f1df982b14c5bb61210357dfc271df51d2534f97408790bffb4e02ff2f12b33769f9836e SHA512 e11415139a21a7dd8692673c2011d11621881cd4b99f69de5f32c23161734b1620560f57654b2e57177cb3ba01152bb76e0c9f79c2f7924b0d8424c21c219677
diff --git a/dev-python/notebook/notebook-7.2.0.ebuild b/dev-python/notebook/notebook-7.2.0.ebuild
deleted file mode 100644
index e7bff000c2b5..000000000000
--- a/dev-python/notebook/notebook-7.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Interactive Notebook"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/notebook/
-	https://pypi.org/project/notebook/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-4.2.0[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-4.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-server-2.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	<dev-python/notebook-shim-0.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/nbval[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-7.2.1.ebuild b/dev-python/notebook/notebook-7.2.1.ebuild
index c5ed968aea82..e7bff000c2b5 100644
--- a/dev-python/notebook/notebook-7.2.1.ebuild
+++ b/dev-python/notebook/notebook-7.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/pikepdf-9.0.0.ebuild b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
index 64f6e92b2621..785dc5b35862 100644
--- a/dev-python/pikepdf/pikepdf-9.0.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-9.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="big-endian"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 3116dbf3047d..2fd0cf6f1120 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1 +1,2 @@
 DIST pip-24.0.gh.tar.gz 9398156 BLAKE2B 17a7ed9e15e9b8efa0d3e3c5586dc446958b62cf9ba52155a0d1ad97a3e212ee7a08a0e88a592718fc3d542eb8f434155a75cb98d90c008904bd8f59bd2b40b6 SHA512 0c2ecb2ecde4f155c83468d35bc4f52f37efffc16821ae7c706d035e1e8cc3709b41cb10f8140ff09205e8bbdba2c76128ad76d1cbd18401328b619228e834df
+DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1
diff --git a/dev-python/pip/files/pip-24.1-test-offline.patch b/dev-python/pip/files/pip-24.1-test-offline.patch
new file mode 100644
index 000000000000..ebbf5a94a1ba
--- /dev/null
+++ b/dev-python/pip/files/pip-24.1-test-offline.patch
@@ -0,0 +1,65 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 35101cef2..5934e9f95 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -395,6 +395,7 @@ def pip_editable_parts(
+             "-m",
+             "pip",
+             "install",
++            "--no-build-isolation",
+             "--target",
+             pip_self_install_path,
+             "-e",
+diff --git a/tests/functional/test_config_settings.py b/tests/functional/test_config_settings.py
+index 3f88d9c39..857722dd1 100644
+--- a/tests/functional/test_config_settings.py
++++ b/tests/functional/test_config_settings.py
+@@ -118,6 +118,7 @@ def test_config_settings_implies_pep517(
+     )
+     result = script.pip(
+         "wheel",
++        "--no-build-isolation",
+         "--config-settings",
+         "FOO=Hello",
+         pkg_path,
+diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
+index eaea12a16..e19446385 100644
+--- a/tests/functional/test_install.py
++++ b/tests/functional/test_install.py
+@@ -685,7 +685,7 @@ def test_link_hash_in_dep_fails_require_hashes(
+     # Build a wheel for pkga and compute its hash.
+     wheelhouse = tmp_path / "wheehouse"
+     wheelhouse.mkdir()
+-    script.pip("wheel", "--no-deps", "-w", wheelhouse, project_path)
++    script.pip("wheel", "--no-build-isolation", "--no-deps", "-w", wheelhouse, project_path)
+     digest = hashlib.sha256(
+         wheelhouse.joinpath("pkga-1.0-py3-none-any.whl").read_bytes()
+     ).hexdigest()
+@@ -903,7 +903,7 @@ def test_editable_install__local_dir_setup_requires_with_pyproject(
+         "setup(name='dummy', setup_requires=['simplewheel'])\n"
+     )
+ 
+-    script.pip("install", "--find-links", shared_data.find_links, "-e", local_dir)
++    script.pip("install", "--no-build-isolation", "--find-links", shared_data.find_links, "-e", local_dir)
+ 
+ 
+ def test_install_pre__setup_requires_with_pyproject(
+diff --git a/tests/functional/test_self_update.py b/tests/functional/test_self_update.py
+index c50755220..1331a87c3 100644
+--- a/tests/functional/test_self_update.py
++++ b/tests/functional/test_self_update.py
+@@ -11,12 +11,12 @@ def test_self_update_editable(script: Any, pip_src: Any) -> None:
+     # Step 1. Install pip as non-editable. This is expected to succeed as
+     # the existing pip in the environment is installed in editable mode, so
+     # it only places a .pth file in the environment.
+-    proc = script.pip("install", pip_src)
++    proc = script.pip("install", "--no-build-isolation", pip_src)
+     assert proc.returncode == 0
+     # Step 2. Using the pip we just installed, install pip *again*, but
+     # in editable mode. This could fail, as we'll need to uninstall the running
+     # pip in order to install the new copy, and uninstalling pip while it's
+     # running could fail. This test is specifically to ensure that doesn't
+     # happen...
+-    proc = script.pip("install", "-e", pip_src)
++    proc = script.pip("install", "--no-build-isolation", "-e", pip_src)
+     assert proc.returncode == 0
diff --git a/dev-python/pip/pip-24.1.ebuild b/dev-python/pip/pip-24.1.ebuild
new file mode 100644
index 000000000000..73cd302dcd1a
--- /dev/null
+++ b/dev-python/pip/pip-24.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-pip along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ensurepip-setuptools
+			dev-python/ensurepip-wheel
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			test-rust? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-23.1-no-coverage.patch"
+		# https://github.com/pypa/pip/issues/12786 (and more)
+		"${FILESDIR}/pip-24.1-test-offline.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		local wheels=(
+			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
+		)
+		mkdir tests/data/common_wheels/ || die
+		cp "${wheels[@]}" tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		# Internet
+		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+	)
+	local EPYTEST_IGNORE=(
+		# requires proxy.py
+		tests/functional/test_proxy.py
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.10)
+			EPYTEST_DESELECT+=(
+				# no clue why they fail
+				tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
+				tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
+				tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
+			)
+			;;
+	esac
+
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_XDIST=1
+	epytest -m "not network" -o tmp_path_retention_policy=all
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/pooch/pooch-1.8.2.ebuild b/dev-python/pooch/pooch-1.8.2.ebuild
index 0a6ae739677d..d2bdccb3a823 100644
--- a/dev-python/pooch/pooch-1.8.2.ebuild
+++ b/dev-python/pooch/pooch-1.8.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index f97533125ade..1885b6ebe4d9 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-DIST pylint-3.2.2.gh.tar.gz 1443983 BLAKE2B aeff52756e03278da1db7478d0c95ca0d5fa0c8a15203ada4b30fe5fb2fa56bfc2fc60e020bee9b2e242339214cf383838c93cbf1369a82655bedd62e3b2634f SHA512 84d625b0cd1ea0c308ff4381a9f553663af52fec534856a258ee50f00ec7238cf9af98d1e2c851522a8bd440c55e318d5c89035652d872cbd812d19ff14a0698
 DIST pylint-3.2.3.gh.tar.gz 1444655 BLAKE2B 4d43c107b03cac4e1c054cac97e2082f1adcf8196fe9b6eabf7b582f0c226f7996526326d2cca19c4935c84bd11b0421f5c4b29022a2dd7f601a5b380f4eb4e8 SHA512 07492e98e709b4db0168479544a9ab79cde2bd2ef4c48a479192ae1241f2a96f21d90a83c697f2b43cb7a070fff3bdd77157ffe5cb746df8cc4277f391e27121
diff --git a/dev-python/pylint/pylint-3.2.2.ebuild b/dev-python/pylint/pylint-3.2.2.ebuild
deleted file mode 100644
index 2447e92fb244..000000000000
--- a/dev-python/pylint/pylint-3.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.3[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[recursion_error_3159]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.2.3.ebuild b/dev-python/pylint/pylint-3.2.3.ebuild
index 8f166f55d954..2447e92fb244 100644
--- a/dev-python/pylint/pylint-3.2.3.ebuild
+++ b/dev-python/pylint/pylint-3.2.3.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pystache/pystache-0.6.5.ebuild b/dev-python/pystache/pystache-0.6.5.ebuild
index 4cc79a1cbc99..1829e2e284c7 100644
--- a/dev-python/pystache/pystache-0.6.5.ebuild
+++ b/dev-python/pystache/pystache-0.6.5.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
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 1ee23e63c77f..25f636991b6d 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,2 +1 @@
-DIST pytest-bdd-7.1.2.gh.tar.gz 81260 BLAKE2B 5120a79a5c085976f379afbd4ae7bc68c0d07a8517b6653bb2c94407b9964cd3adcfc92e8abc31cb658caa5c108e0590913c13cbcc408021841b91dbf52b8124 SHA512 7630b119649502e36d7ae2b6027c11b667513eab451511104076617e50de1456ee4b2ff128254ac0db630556258704e21e2a5e73ce9afc20ed403d0186c0a226
 DIST pytest-bdd-7.2.0.gh.tar.gz 81301 BLAKE2B e47ec5873546596e913453f86d7c0654b8212de74b0bfa46022da093fa87191c9303559ec670bd37f94e282973192596c77a1f7293a608ae8dedbd863fc245c2 SHA512 d0991feb446f264f0f114693dccb67682a10a427cb5fda28dccafd67cc37810e00c34e3235bb38d02b7fa1edabf1359c6c119be9cfdce0ccf00235ca3dde337b
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.1.2.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.1.2.ebuild
deleted file mode 100644
index 0a02c7cb9f12..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-7.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pytest-bdd.readthedocs.io/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse_type[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
index 3b7bbee62b82..0a02c7cb9f12 100644
--- a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
+++ b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c2797fed66ed..a28b0058ed0c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,6 +1,4 @@
 DIST pytest-7.4.4.tar.gz 1357116 BLAKE2B 0bf281b3d4b7b2eb7805423a75c8c2befa820cc230318511e5a2d5ea35321a78a2603d5dbc033414ed73171525371efa9d9f54083d5638fc752c1c218e6d53aa SHA512 28a259dac6739683c131993409d508e10fbfee461291b8fc7697dd83f30725a3c60e681ba00b5669a215af6a5e683f07a329485d780acc9ad0372a6552f783a1
 DIST pytest-8.0.2.tar.gz 1396924 BLAKE2B ad95d246f5592cfe54faea6c96e38cb60d3e2713070d1ff7cab6c42aea312883c5d97c99a930dbcbd8493e966c4b8351320f6494b4ab904afbf21d7e1dd004a7 SHA512 c495943baad05e09b467d23c7afadb3edff7ae93ee96290d6db9e64739236888148b63dff7e8e25b331b11bd48c55fb0ca8901cf823d69b1a922e94915bab2f1
 DIST pytest-8.1.2.tar.gz 1410060 BLAKE2B 1379047c5ba434e98a383756c53a9cf31dc3bd3abcc49820f872b9110ec70906ca14080ce17ed2770b71195fbd79627a0eb16ee00429e165368144b20153a02b SHA512 a6ffae29da98ee4c357ebb03f00c4bc1a33f093ef867ad118841695548468c7f229eaa2c029a2ce3b158bbb0a65be5014e91555a223d04c1c72e614cb1d00546
-DIST pytest-8.2.0.tar.gz 1422883 BLAKE2B 91f39aa14bfc56f7f98789ef9eeed80d1aa81c864f56181bf1e819b73543043eda307fec53151bf5dbcf8e63abd8dd8ad1290dd245c387cb68583d2160981cf2 SHA512 1a74a2269010804101fc4b8efc370c5d8d484eb145eb4e181feeb1a17046457b97071d2de925c3e8bbd4c6090cd00ca532d69286cb9e10ea023e59a99cd51088
-DIST pytest-8.2.1.tar.gz 1424649 BLAKE2B 56c63526b7bb2c7eb6b260197bb1b52945b92598a9697bc99c053540caf4fcc7432cf70cfa1455da668b38ddf81a7abbac1b91a5e58688640519a16e4155ad6d SHA512 c837b2031c2b198345ce090cc5fcbebd2640a521131a60b882250b70825dc85e5072403a80e9a73f62e429156b57dce405d8400255457c55b14d4a2f700c5331
 DIST pytest-8.2.2.tar.gz 1427980 BLAKE2B 7f343e5ff05e4d26f816595ad1c52ee2b79d38029e75e3641ed0bbb7477e0a47e5ae48ebc3058a8e9f374cd1a391d360d9eda73eca2e41d8b533eda7948aedcb SHA512 896192f0d41f3fef49915dfea6ae33dbb939f6bbe54de27861bf1554bf87f910702169293e923af9bc40466e7f806aa19ca54cbe41a848c233f70b52bb86a63c
diff --git a/dev-python/pytest/files/pytest-8.2.0-py313.patch b/dev-python/pytest/files/pytest-8.2.0-py313.patch
deleted file mode 100644
index 196fb9a7422f..000000000000
--- a/dev-python/pytest/files/pytest-8.2.0-py313.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
-index b80d53ca5f..cfa226bb74 100644
---- a/src/_pytest/_code/code.py
-+++ b/src/_pytest/_code/code.py
-@@ -424,15 +424,14 @@ def recursionindex(self) -> Optional[int]:
-             # which generates code objects that have hash/value equality
-             # XXX needs a test
-             key = entry.frame.code.path, id(entry.frame.code.raw), entry.lineno
--            # print "checking for recursion at", key
-             values = cache.setdefault(key, [])
-+            # Since Python 3.13 f_locals is a proxy, freeze it.
-+            loc = dict(entry.frame.f_locals)
-             if values:
--                f = entry.frame
--                loc = f.f_locals
-                 for otherloc in values:
-                     if otherloc == loc:
-                         return i
--            values.append(entry.frame.f_locals)
-+            values.append(loc)
-         return None
- 
- 
-diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
-index 31c6de7819..f9ab007a4d 100644
---- a/src/_pytest/pytester.py
-+++ b/src/_pytest/pytester.py
-@@ -289,7 +289,8 @@ def assert_contains(self, entries: Sequence[Tuple[str, str]]) -> None:
-         __tracebackhide__ = True
-         i = 0
-         entries = list(entries)
--        backlocals = sys._getframe(1).f_locals
-+        # Since Python 3.13, f_locals is not a dict, but eval requires a dict.
-+        backlocals = dict(sys._getframe(1).f_locals)
-         while entries:
-             name, check = entries.pop(0)
-             for ind, call in enumerate(self.calls[i:]):
-@@ -760,6 +761,9 @@ def _makefile(
-     ) -> Path:
-         items = list(files.items())
- 
-+        if ext is None:
-+            raise TypeError("ext must not be None")
-+
-         if ext and not ext.startswith("."):
-             raise ValueError(
-                 f"pytester.makefile expects a file extension, try .{ext} instead of {ext}"
-diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
-index 86e30dc483..b547451298 100644
---- a/testing/code/test_excinfo.py
-+++ b/testing/code/test_excinfo.py
-@@ -1,6 +1,7 @@
- # mypy: allow-untyped-defs
- from __future__ import annotations
- 
-+import fnmatch
- import importlib
- import io
- import operator
-@@ -237,7 +238,7 @@ def f(n):
-                 n += 1
-             f(n)
- 
--        excinfo = pytest.raises(RuntimeError, f, 8)
-+        excinfo = pytest.raises(RecursionError, f, 8)
-         traceback = excinfo.traceback
-         recindex = traceback.recursionindex()
-         assert recindex == 3
-@@ -373,7 +374,10 @@ def test_excinfo_no_sourcecode():
-     except ValueError:
-         excinfo = _pytest._code.ExceptionInfo.from_current()
-     s = str(excinfo.traceback[-1])
--    assert s == "  File '<string>':1 in <module>\n  ???\n"
-+    # TODO: Since Python 3.13b1 under pytest-xdist, the * is `import
-+    # sys;exec(eval(sys.stdin.readline()))` (execnet bootstrap code)
-+    # instead of `???` like before. Is this OK?
-+    fnmatch.fnmatch(s, "  File '<string>':1 in <module>\n  *\n")
- 
- 
- def test_excinfo_no_python_sourcecode(tmp_path: Path) -> None:
-diff --git a/testing/code/test_source.py b/testing/code/test_source.py
-index 2fa8520579..a00259976c 100644
---- a/testing/code/test_source.py
-+++ b/testing/code/test_source.py
-@@ -370,7 +370,11 @@ class B:
-         pass
- 
-     B.__name__ = B.__qualname__ = "B2"
--    assert getfslineno(B)[1] == -1
-+    # Since Python 3.13 this started working.
-+    if sys.version_info >= (3, 13):
-+        assert getfslineno(B)[1] != -1
-+    else:
-+        assert getfslineno(B)[1] == -1
- 
- 
- def test_code_of_object_instance_with_call() -> None:
-diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py
-index d7815f77b9..8728ae84fd 100644
---- a/testing/test_cacheprovider.py
-+++ b/testing/test_cacheprovider.py
-@@ -194,7 +194,7 @@ def test_custom_cache_dir_with_env_var(
-         assert pytester.path.joinpath("custom_cache_dir").is_dir()
- 
- 
--@pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "/tox_env_dir")))
-+@pytest.mark.parametrize("env", ((), ("TOX_ENV_DIR", "mydir/tox-env")))
- def test_cache_reportheader(
-     env: Sequence[str], pytester: Pytester, monkeypatch: MonkeyPatch
- ) -> None:
-diff --git a/testing/test_doctest.py b/testing/test_doctest.py
-index d731121795..9b33d641a1 100644
---- a/testing/test_doctest.py
-+++ b/testing/test_doctest.py
-@@ -224,11 +224,7 @@ def test_doctest_unexpected_exception(self, pytester: Pytester):
-                 "Traceback (most recent call last):",
-                 '  File "*/doctest.py", line *, in __run',
-                 "    *",
--                *(
--                    (" *^^^^*",)
--                    if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
--                    else ()
--                ),
-+                *((" *^^^^*", " *", " *") if sys.version_info >= (3, 13) else ()),
-                 '  File "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
-                 "ZeroDivisionError: division by zero",
-                 "*/test_doctest_unexpected_exception.txt:2: UnexpectedException",
-@@ -385,7 +381,7 @@ def some_property(self):
-                 "*= FAILURES =*",
-                 "*_ [[]doctest[]] test_doctest_linedata_on_property.Sample.some_property _*",
-                 "004 ",
--                "005         >>> Sample().some_property",
-+                "005 *>>> Sample().some_property",
-                 "Expected:",
-                 "    'another thing'",
-                 "Got:",
-diff --git a/testing/test_main.py b/testing/test_main.py
-index 345aa1e62c..6294f66b36 100644
---- a/testing/test_main.py
-+++ b/testing/test_main.py
-@@ -3,7 +3,6 @@
- import os
- from pathlib import Path
- import re
--import sys
- from typing import Optional
- 
- from _pytest.config import ExitCode
-@@ -45,32 +44,18 @@ def pytest_internalerror(excrepr, excinfo):
-         assert result.ret == ExitCode.INTERNAL_ERROR
-     assert result.stdout.lines[0] == "INTERNALERROR> Traceback (most recent call last):"
- 
--    end_lines = (
--        result.stdout.lines[-4:]
--        if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
--        else result.stdout.lines[-3:]
--    )
-+    end_lines = result.stdout.lines[-3:]
- 
-     if exc == SystemExit:
-         assert end_lines == [
-             f'INTERNALERROR>   File "{c1}", line 4, in pytest_sessionstart',
-             'INTERNALERROR>     raise SystemExit("boom")',
--            *(
--                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
--                if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
--                else ()
--            ),
-             "INTERNALERROR> SystemExit: boom",
-         ]
-     else:
-         assert end_lines == [
-             f'INTERNALERROR>   File "{c1}", line 4, in pytest_sessionstart',
-             'INTERNALERROR>     raise ValueError("boom")',
--            *(
--                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
--                if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
--                else ()
--            ),
-             "INTERNALERROR> ValueError: boom",
-         ]
-     if returncode is False:
diff --git a/dev-python/pytest/pytest-8.2.0-r1.ebuild b/dev-python/pytest/pytest-8.2.0-r1.ebuild
deleted file mode 100644
index 814fb156e1c1..000000000000
--- a/dev-python/pytest/pytest-8.2.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1[${PYTHON_USEDEP}]
-	' 3.10)
-	!!<=dev-python/flaky-3.7.0-r5
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-PATCHES=(
-	# https://github.com/pytest-dev/pytest/pull/12334
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-
-		# PDB tests seem quite flaky (they time out often)
-		testing/test_debugging.py::TestPDB
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# regressions on pypy3.9
-				# https://github.com/pytest-dev/pytest/issues/9787
-				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-				testing/test_unraisableexception.py
-			)
-			;;
-	esac
-
-	local EPYTEST_XDIST=1
-	epytest
-}
diff --git a/dev-python/pytest/pytest-8.2.0.ebuild b/dev-python/pytest/pytest-8.2.0.ebuild
deleted file mode 100644
index 1aaf16328a1f..000000000000
--- a/dev-python/pytest/pytest-8.2.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1[${PYTHON_USEDEP}]
-	' 3.10)
-	!!<=dev-python/flaky-3.7.0-r5
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-
-		# times out
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_exception
-		testing/test_debugging.py::TestPDB::test_pdb_with_caplog_on_pdb_invocation
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# regressions on pypy3.9
-				# https://github.com/pytest-dev/pytest/issues/9787
-				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-				testing/test_unraisableexception.py
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# regressions reproduced via `tox -e py313`
-				# https://github.com/pytest-dev/pytest/issues/12323
-				testing/code/test_excinfo.py::TestFormattedExcinfo::test_repr_traceback_recursion
-				testing/code/test_excinfo.py::TestTraceback_f_g_h::test_traceback_recursion_index
-				testing/code/test_excinfo.py::test_exception_repr_extraction_error_on_recursion
-				testing/code/test_source.py::test_getfslineno
-				testing/test_collection.py::TestSession::test_collect_custom_nodes_multi_id
-				testing/test_collection.py::TestSession::test_collect_protocol_single_function
-				testing/test_collection.py::TestSession::test_collect_subdir_event_ordering
-				testing/test_collection.py::TestSession::test_collect_two_commandline_args
-				testing/test_doctest.py::TestDoctests::test_doctest_linedata_on_property
-				testing/test_doctest.py::TestDoctests::test_doctest_unexpected_exception
-				testing/test_legacypath.py::test_testdir_makefile_ext_none_raises_type_error
-
-				# TODO?
-				testing/code/test_excinfo.py::test_excinfo_no_sourcecode
-
-				# more weird timeouts
-				testing/test_debugging.py::TestPDB::test_pdb_used_outside_test
-				testing/test_debugging.py::TestPDB::test_pdb_used_in_generate_tests
-			)
-			;;
-	esac
-
-	local EPYTEST_XDIST=1
-	epytest
-}
diff --git a/dev-python/pytest/pytest-8.2.1.ebuild b/dev-python/pytest/pytest-8.2.1.ebuild
deleted file mode 100644
index 0158ceec3c95..000000000000
--- a/dev-python/pytest/pytest-8.2.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="
-	https://pytest.org/
-	https://github.com/pytest-dev/pytest/
-	https://pypi.org/project/pytest/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1[${PYTHON_USEDEP}]
-	' 3.10)
-	!!<=dev-python/flaky-3.7.0-r5
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/argcomplete[${PYTHON_USEDEP}]
-			>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
-			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-
-		# TODO (XPASS)
-		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
-		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
-		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
-		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
-
-		# setuptools warnings
-		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
-
-		# PDB tests seem quite flaky (they time out often)
-		testing/test_debugging.py::TestPDB
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# regressions on pypy3.9
-				# https://github.com/pytest-dev/pytest/issues/9787
-				testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-				testing/test_unraisableexception.py
-			)
-			;;
-	esac
-
-	local EPYTEST_XDIST=1
-	epytest
-}
diff --git a/dev-python/pytest/pytest-8.2.2.ebuild b/dev-python/pytest/pytest-8.2.2.ebuild
index 0158ceec3c95..610b1d9ecf27 100644
--- a/dev-python/pytest/pytest-8.2.2.ebuild
+++ b/dev-python/pytest/pytest-8.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index d9c5369db715..b614e0b8b54e 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1 @@
-DIST pytools-2024.1.3.tar.gz 79453 BLAKE2B 00d19b5e3918ae2e230db8778edcbaa8102436be1d82ee0a24f5f7504ef5f8ca5903c07386b5ebb1359138d4cb2f68840585b30e118f5dc1f3e2266230ec7d1d SHA512 89ee628af18ab68ebc1dab500a886cad243333a0ebf85128c1b06608b51638fc713e2d485b8d50bd3c70ab3143c46e789a49f7f7fc4fa8a14dd9644e7a822d72
 DIST pytools-2024.1.5.tar.gz 80774 BLAKE2B 37e9e14d5a62cdad34ddbfd0eabec747c392ba1506aacc76322f090699192369915882ba948fa07cd7a45369d3391343d9b2554def851e844976bc0442ddcfb6 SHA512 af7b79f1e26a43459765627ce6e6740953c38e05e26f3ec17360ccdf588ac320eabb5540fbbf9570cde324b8aae2412878316e9930e5195f467dbf5b74ca76b8
diff --git a/dev-python/pytools/pytools-2024.1.3.ebuild b/dev-python/pytools/pytools-2024.1.3.ebuild
deleted file mode 100644
index e4a80b579b6b..000000000000
--- a/dev-python/pytools/pytools-2024.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-# NB: numpy is now an "extra" (optional) dep -- we can remove it from
-# RDEPEND If revdeps don't need it
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2024.1.5.ebuild b/dev-python/pytools/pytools-2024.1.5.ebuild
index a7eae61cafc1..e4a80b579b6b 100644
--- a/dev-python/pytools/pytools-2024.1.5.ebuild
+++ b/dev-python/pytools/pytools-2024.1.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 # NB: numpy is now an "extra" (optional) dep -- we can remove it from
 # RDEPEND If revdeps don't need it
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 6dc6cc08bb08..26f6d79593ce 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,3 +1,2 @@
-DIST redis-py-5.0.4.gh.tar.gz 4774815 BLAKE2B a6f3b678f217a7938d1a2ecbe24058994e33a7985faf0d4b6664aa08d5095c71dc9cd1d98ee327d6ff31589795eed29ece4cdd3ce914a782e60d3ac3f44ab962 SHA512 3c4893e348632d52215096358e5b4a86b3cf5e0153e4d218c46fe77fbb61df116fc98f477f4e8ba94fe7e9bb6f964f478b1187c8b7983a71fc206f14b643965c
 DIST redis-py-5.0.5.gh.tar.gz 4775177 BLAKE2B e092692ca8070d811ccd953be2749859094baef610858fcc7f28fd18ec51e643cb0a003ddb5734e8066252e9beb49bdf633983906bb4615c0e8309389343aa2f SHA512 014c5bd9e7604cf757d990b1a0ad2d3c876822b1ee5b372eaa18cf26b5bf61bcdf6bd2d5e3f5eaa9e73de5dcc6a7ad11835856cb12c995a539961244e54c16fc
 DIST redis-py-5.0.6.gh.tar.gz 4775649 BLAKE2B 7d6a7c10da592aed05fe70b1f0001697984c34244c29567755a13f0cb0d61db927f1392dd100212c88c63de52afbad2a9f17024d9af11f500db13386d080be2a SHA512 ae430e3c261bd8240bf1c736e28d066c685bb674dd6c2aabbf57bfa436027af31e59c2583777625ab3e1aa94f9b55a8e6513a94399c3aaec7e46b1128de8dd42
diff --git a/dev-python/redis/redis-5.0.4.ebuild b/dev-python/redis/redis-5.0.4.ebuild
deleted file mode 100644
index 1c9b25e08163..000000000000
--- a/dev-python/redis/redis-5.0.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=redis-py-${PV}
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-		# require extra redis modules that apparently aren't packaged
-		# on Gentoo
-		tests/{,test_asyncio/}test_bloom.py
-		tests/{,test_asyncio/}test_graph.py
-		tests/{,test_asyncio/}test_json.py
-		tests/{,test_asyncio/}test_timeseries.py
-		# apparently available only in "Redis Stack 7.2 RC3 or later"
-		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
-		tests/test_commands.py::TestRedisCommands::test_tfunction_list
-		tests/test_commands.py::TestRedisCommands::test_tfcall
-		# TODO
-		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	if has_version ">=dev-db/redis-7"; then
-		local extra_conf="
-			enable-debug-command yes
-			enable-module-command yes
-		"
-	fi
-
-	# Spawn Redis itself for testing purposes
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1 ::1
-		${extra_conf}
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis/redis-5.0.5.ebuild b/dev-python/redis/redis-5.0.5.ebuild
index 0ebac27e07d2..1c9b25e08163 100644
--- a/dev-python/redis/redis-5.0.5.ebuild
+++ b/dev-python/redis/redis-5.0.5.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 5c1268bb8c6a..4aa6a1dae21e 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,2 @@
-DIST responses-0.25.0.tar.gz 77681 BLAKE2B 0437c343feecb071f544d8f6ce1ad15c4d6e2f00c0fff0404dff9160c962a5de46d0b2c882e8d044b6e09c441a534e7bd8772f826a45c9a9b79e34daf0610546 SHA512 6aed8ce17f55e8c1a7438b3e1aa7e7e59322120f3580fede93d61224ea9f1e1f05382cdf82c11cbef29447b6591d7d6e25d156c087025b93d6e5a3e2da82d90d
 DIST responses-0.25.2.tar.gz 77494 BLAKE2B 35df38f1a28c006b9b1edfe77cd8e68e55466c3ad50ea8c0a095dae4de35b8d89aa1290a0bab0a813fcbf63224f652ad7e1964d59151eb5633b4a6000ba489bf SHA512 32c9c3a5028687a23bc8b3ec5c3061cfa9f18c98d66867d2dd94de3e2d59c6176de2bbc3ae3c31df3826819e5f04eb5f4ab7cb0c09ac8e93ed2d8c4d5aa4225d
 DIST responses-0.25.3.tar.gz 77798 BLAKE2B c85ccca93bf24e392e33bffc697d657e1bdb1d733c36ba035dffb0e1185ad579e35b44c9342d257c3eec735ea789961ea37e739884511b0c5ef9ef88f344dd77 SHA512 f5691cb603174a06a8efebde3e64091a8b21005adc841dcfa83f2bb9aea0c0b8bd8a3d490cc579d77fd4a1106bbdd2f140da1d3c04cbcfd42a6d49c900618f47
diff --git a/dev-python/responses/responses-0.25.0.ebuild b/dev-python/responses/responses-0.25.0.ebuild
deleted file mode 100644
index 066078f8f453..000000000000
--- a/dev-python/responses/responses-0.25.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="
-	https://pypi.org/project/responses/
-	https://github.com/getsentry/responses/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-# tomli backend is optional now, with pyyaml being the new default.
-# However, keeping it unconditional here for backwards compatibility.
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o asyncio_mode=auto -p asyncio -p pytest_httpserver
-}
diff --git a/dev-python/responses/responses-0.25.2.ebuild b/dev-python/responses/responses-0.25.2.ebuild
index 08ae15c11fc9..066078f8f453 100644
--- a/dev-python/responses/responses-0.25.2.ebuild
+++ b/dev-python/responses/responses-0.25.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # tomli backend is optional now, with pyyaml being the new default.
 # However, keeping it unconditional here for backwards compatibility.
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f6bca701b6e7..3b375fba0369 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,4 +1,3 @@
 DIST sentry-python-1.45.0.gh.tar.gz 475425 BLAKE2B 8dc46154dfc1c7c9104a706be032b5269d407dee6845da252f1c603ea4f9486d02d1d3c6bec314064b821dee31b503d07a9c17935ca1f4dd6cc4d7b9c3165094 SHA512 dad23a3f6a8e6ef5fe78e1d38a61977d8974edf306d5688537f331801d8fa0f60743d18cc3dadf6e9a9666c55a01c98b9ff8d8808ece7d8f95ee68a69b6cb9be
-DIST sentry-python-2.3.1.gh.tar.gz 511775 BLAKE2B 5cc0cf6a225b8619df76492abbce76d01631148dc73aeea47d13c71435e973af7cc7904ef50e7edcde5821bce28b213b5e3ca3208887688e2d4cec1d03c7d54e SHA512 12ccd25142fd42262735babe986f9972571b4a3c48607c47c8b6887e722f53a964e259e82be56cf4c4ba6d14efe8335ebb32ed98a40a763a63a5f7b52ef6ce9e
 DIST sentry-python-2.5.1.gh.tar.gz 515056 BLAKE2B fab3e6e4faa1f07879fc679d43d86fc9590ba3049f5117efe69827a5678b7292c30c9e2d04992a2d75abe54498c3e6fe0366cea210e81b92ccf302c7abcf7e3c SHA512 6467e3836af9f44be93c9a9d0b2e4cf341b7ea4b70937a9624f5d53b746f9a5d2ee5507056c3f58662e0382d88bd3a9851b2ebdf2438bd39e4d5b15096d84a3b
 DIST sentry-python-2.6.0.gh.tar.gz 519912 BLAKE2B 065aa2a633c24f163e483fe6ace9696b3bb088caae2eedaff7bbfc09213bec593f1db5a70b41f9771db602ece77d7107f51945683799de35ad59aa2c10f0a47f SHA512 f69ccc15154ea10302610329bc9d80fb9cf249a9996b99b34268468b010a24e90ca46e62b223b3331518a2ee57c6e3e028e6d6b2d1e0c9bbac4f11176403c790
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.3.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.3.1.ebuild
deleted file mode 100644
index 382d3dc49417..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-2.3.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# tests require Internet access
-		tests/integrations/httpx/test_httpx.py
-		tests/integrations/requests/test_requests.py
-		tests/integrations/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: most of them hang
-		tests/integrations/starlette
-		# TODO
-		tests/integrations/tornado
-		# requires mockupdb
-		tests/integrations/pymongo
-		# requires AWS access
-		tests/integrations/aws_lambda
-		# requires quart_auth
-		tests/integrations/quart
-		# TODO: require opentelemetry (with py3.10)
-		tests/integrations/opentelemetry
-		# broken (incompatible rq version?)
-		tests/integrations/rq
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# broken teardown?
-		tests/test_client.py::test_uwsgi_warnings
-		# too many dependencies installed, sigh
-		tests/test_new_scopes_compat_event.py
-		# Internet
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/integrations/django
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_utils.py::test_default_release
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
-		tests/utils/test_contextvars.py::test_leaks
-		# pointless, fragile to packages being installed in parallel
-		tests/test_utils.py::test_installed_modules
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.5.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.5.1.ebuild
index 3b37b4d4b84e..382d3dc49417 100644
--- a/dev-python/sentry-sdk/sentry-sdk-2.5.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-2.5.1.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/stripe/Manifest b/dev-python/stripe/Manifest
index 5255344a892a..dbf0e1d48f6c 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,2 @@
 DIST stripe-9.10.0.tar.gz 1273670 BLAKE2B ebe42096846a124dea93744b26103dfc0a82f51191be612962258d7ab8c903e3da707dad3e35bafaa7431dd65a08234d9df5f9a614ff1959d86dc2d992ae7ad0 SHA512 f2a22534703add04512fa5ee124bd0ac48dd8a69dd19438260e9fce2cd00b659b9b014f76e325b6b0e51c79c157d15acb775d4ee4e1401a837d7e7dd81e81191
-DIST stripe-9.11.0.tar.gz 1276871 BLAKE2B 82d02301e4e08c98593631c16b44de5b8481f918839f2839575c8fb8a89a4245436950406e1cf13cb78999a965e8f085bd49821f5214341928be1d3cadd40563 SHA512 2f4878c704ef7b1e782b8264a47c7151d6bd9e7ad4b2799f97a753c00e3ae18c7f4425bdab7d58443bf0111e9da90eb577e047551682132f0682782556c5c1fa
 DIST stripe-9.12.0.tar.gz 1277151 BLAKE2B a23e490ac99f3814db204cd8ad71793b5da73a82c420823cecd87dad5f17c9dbe44a7dcdfbb519b5db4cb488f286e231029827bae25657c2bf4183d1c4dd8406 SHA512 c6c4a4cfeddda4c0e4042b31addea6885819304b469e4f7f701c894fca2d1ccca867dac511abf8d9dd9fc7cc135185387a5b55d37558b9355ee4add16b6318cb
-DIST stripe-9.8.0.tar.gz 1268721 BLAKE2B 12eeb333a51e71f39c366dda1a4bf82c15f7c3673fc4d27c0e25b978a19902b722d44d5b0f17c017638740cb95f353a024f5012ad70b13c0ac7f7b420df4b082 SHA512 3b19ba9709818af12ba2110b32232c9a33f3a43ce33dfeb8a1e0a7c8a2d643f96795ef474ccdef9e780c1ab58bfa3e687105311cc1d5d24c2984d442d539706b
diff --git a/dev-python/stripe/stripe-9.10.0.ebuild b/dev-python/stripe/stripe-9.10.0.ebuild
index 27387de014be..276300751862 100644
--- a/dev-python/stripe/stripe-9.10.0.ebuild
+++ b/dev-python/stripe/stripe-9.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/stripe/stripe-9.11.0.ebuild b/dev-python/stripe/stripe-9.11.0.ebuild
deleted file mode 100644
index cb8f555d6683..000000000000
--- a/dev-python/stripe/stripe-9.11.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.186.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-9.8.0.ebuild b/dev-python/stripe/stripe-9.8.0.ebuild
deleted file mode 100644
index 276300751862..000000000000
--- a/dev-python/stripe/stripe-9.8.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.186.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 492bc318ba8a..6a6c1a095be4 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,2 +1 @@
-DIST testfixtures-8.2.0.tar.gz 136662 BLAKE2B 37dcc8c718a0db51d42f7f7c5b8876e852d4e9ddbd157ce7f278c0ccbd304ce923e41e5126ee9194680059274fad04567de6e56976b281249e85e540b1a984d8 SHA512 a151767ea44a36c244e4c46fc2ce8665ebc64a52159213e5739f78537e684d6760b03a56b393894afabb70a5d777e3b9fbe0aa8acec33c958fc973eda3ec1e5e
 DIST testfixtures-8.3.0.tar.gz 137420 BLAKE2B bf0fe6705bbbb33a26dcc98be061c1dafbe331ca6c4ac8c028e146f7e156870ee8abe5118b3182600e8d513530c442a4fa1efa696253b9b0c114733bd40fc6ee SHA512 b2c18a35c44b90bce50cc68ca9bf9909ac8f75287c7188eeddfa855aec1db3bd14f3fccb4c5ef0e44b19c683ad4bd6be4876554ce9127698e8e20cbfa4191800
diff --git a/dev-python/testfixtures/testfixtures-8.2.0.ebuild b/dev-python/testfixtures/testfixtures-8.2.0.ebuild
deleted file mode 100644
index 4b03d90c7706..000000000000
--- a/dev-python/testfixtures/testfixtures-8.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="
-	https://pypi.org/project/testfixtures/
-	https://github.com/Simplistix/testfixtures/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		>=dev-python/sybil-6[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		sys-libs/timezone-data
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-8.3.0.ebuild b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
index ae720bc75fd4..a50cfa91b206 100644
--- a/dev-python/testfixtures/testfixtures-8.3.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-8.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tornado/tornado-6.4.1.ebuild b/dev-python/tornado/tornado-6.4.1.ebuild
index 2ba161d109d7..67f6fe8d22d0 100644
--- a/dev-python/tornado/tornado-6.4.1.ebuild
+++ b/dev-python/tornado/tornado-6.4.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index c20636d02a87..ef63c13168bf 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,6 +1 @@
-DIST typing_extensions-12e901ed0cb8a826726357f8020cf3837d961e15.gh.tar.gz 95229 BLAKE2B 1d5feabe39d0a04486e2ed5acf6b46f91a1656d10175a54d6b41e194d4693bbf6d5d135d7ed887308c90d8e65f4f7e99fe095263f761d4077bbf7baa9eaabd51 SHA512 c61249d1b6bcda302991f6f981261361730b3c11f860df98cdba0304ff575a89228ad96966810c17b50cac75bde0ed5f9e6519a2904d56f6021fd2048ad155cc
-DIST typing_extensions-4.11.0.tar.gz 78744 BLAKE2B 641d4a13fcd10151a0b7059d11393c78974883710a860805dc132a148677c80a0be06dc32f66cffc4ae2dd838c607bdaa8d3f44e4e3cf55848d2a315bd74ce5a SHA512 d795fadbe9c0a24c4d3190f375d72576f5b42a14dc3a999127c1356f2ae77d4bffdc04a23b7a05331cc8b703a81f504328aaf5d6c1247ea24cbeed25dccb0a37
-DIST typing_extensions-4.12.0.tar.gz 84291 BLAKE2B 96ebdf7ea479fb96e106e79782845380dcb1323265bf4931d26e1c09c09519c6712cbff9270a97ab45e26e61b48d5fb57f44c3ec6651eec29ef724b5896046e0 SHA512 da9d983f320ae4c7f386ab2bcaf57a881ff2b6bb6030618f270195ce9f905f2cbaf4f67c40311f21c096bedc014b7717c014f142f33fd25bf8e41803ac12bc4a
-DIST typing_extensions-4.12.0rc1.tar.gz 83702 BLAKE2B 5f8faaf15bb975f84fc4e217ab1ef9aaa3526dbfc3e17150a1b94cade70e19b27d9e0b637b175aae108719dd234a972c53696e96f7d6b5e96c626c31ded68123 SHA512 a0ce4d62695facb9ad11a4719ea31a0d5f95ca10eee939fb9b3fde8bae963e343a6779e7f5507af7f8751cf0b944d703110bcb18a345f020923ff5ebac54bc9e
-DIST typing_extensions-4.12.1.tar.gz 84923 BLAKE2B aff356290f0d138d29d0e52e8530e0b3ff11f8e53cceac97609f99d4a1ca062eb628b53b202626a538c16c511cbe5909f735740c5b15de049fec58e4bb5adfd9 SHA512 b9084010de271f0193181c77c4a74d72d207a6484d2ccec9f5162cfb288c38a6f7c9d844804e907816ca9a0d2f2aa7a8afcb9b377f7734a2fa927281744b0106
 DIST typing_extensions-4.12.2.tar.gz 85321 BLAKE2B 8f32740675f5da226c6fd5fa95e0b903794d76cc25d759bee6b136913a3eedc7a702cdc7709587cae13ba3b3d44a7bb1acbdad61333fe655382e3d01d63a3fa7 SHA512 b06f26ae55194f37ee48dcb894bf583051c9e74f639f25195990f56330eae7b585ab4b8655ca575539f48254c20f1920628db6db10512953d1f6364e3c076a27
diff --git a/dev-python/typing-extensions/typing-extensions-4.11.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.11.0.ebuild
deleted file mode 100644
index cb36b4910b0f..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-
-LICENSE="PSF-2"
-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"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.11.0_p20240512.ebuild b/dev-python/typing-extensions/typing-extensions-4.11.0_p20240512.ebuild
deleted file mode 100644
index f56019fd57fd..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.11.0_p20240512.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-EGIT_COMMIT=12e901ed0cb8a826726357f8020cf3837d961e15
-MY_P=typing_extensions-${EGIT_COMMIT}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-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"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.12.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.12.0.ebuild
deleted file mode 100644
index d550b7e7a05b..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-
-LICENSE="PSF-2"
-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"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.12.0_rc1.ebuild b/dev-python/typing-extensions/typing-extensions-4.12.0_rc1.ebuild
deleted file mode 100644
index d550b7e7a05b..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.12.0_rc1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-
-LICENSE="PSF-2"
-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"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild
deleted file mode 100644
index d550b7e7a05b..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.12.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-
-LICENSE="PSF-2"
-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"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.12.2.ebuild b/dev-python/typing-extensions/typing-extensions-4.12.2.ebuild
index d550b7e7a05b..cb36b4910b0f 100644
--- a/dev-python/typing-extensions/typing-extensions-4.12.2.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 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"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 3d0600c7f270..88605c724754 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,2 @@
-DIST urwid-2.6.12.tar.gz 847508 BLAKE2B 9790f2bcb768ff859115c1eb1dd03899e49eff41a56540d24ab0a2340b43c23e0572bfe6b689033a37c579ed4860e67a6fb3ade913c5a9c9d68d4a7bb41e8dab SHA512 1b2c7de9f523fe6c80155fc039a2b9e9d416c27f7d52a41911443b0a057739526b755fcb9c901ce99ab8e1e7d1bb5ff2be5ab7c0251554d9d933c0235b44a8e8
 DIST urwid-2.6.13.tar.gz 847604 BLAKE2B ce2294f8c1eaf6609790f18e1312eec66fce610832d510a057c8af773675b4ac2ce47c027be10beff14c1e0d67bc9e59cd372ee612e3357c88d3d89fe4d4cb3f SHA512 9989c3f906cca38a32baccef3c4717deb964f15b5cb08135be75d3e2a5a26f4d64cfe6cc2f58cba5e0ba8da1fb52ef71a591a88dbed9f8e2c80960933dff3537
 DIST urwid-2.6.14.tar.gz 847848 BLAKE2B 3528c89b34a9846b6ee8524b789c80c0cb353185d6d819a179e099753cc9a5aa8fbbcdad7f80190543ad8f68126246359bb94d5e5b4112930f023b2c1619f09d SHA512 289ada7949119889ccfdd547266f423a9a6c0368c7ead20716d4f503f42c737864be84a9feff66ae036a9f7e230d338226e259f5d552e17d439a49fdbfc86149
diff --git a/dev-python/urwid/urwid-2.6.12.ebuild b/dev-python/urwid/urwid-2.6.12.ebuild
deleted file mode 100644
index 139d2a0fd2ba..000000000000
--- a/dev-python/urwid/urwid-2.6.12.ebuild
+++ /dev/null
@@ -1,47 +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} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="
-	https://urwid.org/
-	https://pypi.org/project/urwid/
-	https://github.com/urwid/urwid/
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	rm -rf urwid || die
-	eunittest
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Trio event loop" "dev-python/trio"
-}
diff --git a/dev-python/urwid/urwid-2.6.13.ebuild b/dev-python/urwid/urwid-2.6.13.ebuild
index 50bb4f9e2856..827bb1401fa6 100644
--- a/dev-python/urwid/urwid-2.6.13.ebuild
+++ b/dev-python/urwid/urwid-2.6.13.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch
new file mode 100644
index 000000000000..c4b631e5a2b6
--- /dev/null
+++ b/dev-python/virtualenv/files/virtualenv-20.26.3-ensurepip.patch
@@ -0,0 +1,37 @@
+From 468118fcf55abf1fd4927ad0ab0b48bbb25c0a3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 22 Jun 2024 14:28:23 +0200
+Subject: [PATCH] [Gentoo] Use ensurepip wheels instead of local bundle
+
+---
+ src/virtualenv/seed/wheels/embed/__init__.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/virtualenv/seed/wheels/embed/__init__.py b/src/virtualenv/seed/wheels/embed/__init__.py
+index 102ed8e..66ba52b 100644
+--- a/src/virtualenv/seed/wheels/embed/__init__.py
++++ b/src/virtualenv/seed/wheels/embed/__init__.py
+@@ -1,5 +1,6 @@
+ from __future__ import annotations
+ 
++import sysconfig
+ from pathlib import Path
+ 
+ from virtualenv.seed.wheels.util import Wheel
+@@ -51,6 +52,13 @@ MAX = "3.7"
+ 
+ 
+ def get_embed_wheel(distribution, for_py_version):
++    # Gentoo hack: get wheel from ensurepip directory
++    bundle_dir = Path(sysconfig.get_config_var("WHEEL_PKG_DIR"))
++    try:
++        return Wheel.from_path(next(bundle_dir.glob(f"{distribution}-*.whl")))
++    except StopIteration:
++        return None
++
+     path = BUNDLE_FOLDER / (BUNDLE_SUPPORT.get(for_py_version, {}) or BUNDLE_SUPPORT[MAX]).get(distribution)
+     return Wheel.from_path(path)
+ 
+-- 
+2.45.2
+
diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild
new file mode 100644
index 000000000000..4e425570228c
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild
@@ -0,0 +1,97 @@
+# 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 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=180
+distutils_enable_tests pytest
+
+src_prepare() {
+	# workaround test failures due to warnings from setuptools-scm, sigh
+	echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+	# remove useless pins
+	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
+
+	# remove wheels bundled for Python 3.7 -- we don't have it anymore
+	rm src/virtualenv/seed/wheels/embed/{pip-24.0,setuptools-68.0.0,wheel-0.42.0}-py3-none-any.whl || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		# tests old wheels for py3.7 support (that we're removing)
+		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
+		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
+		# hangs on a busy system, sigh
+		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
+	)
+	case ${EPYTHON} in
+		python3.1[23])
+			EPYTEST_DESELECT+=(
+				tests/unit/create/via_global_ref/test_build_c_ext.py
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# TODO
+				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezer )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
new file mode 100644
index 000000000000..c65710d31c61
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
@@ -0,0 +1,118 @@
+# 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 multiprocessing pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+
+	dev-python/ensurepip-pip
+	dev-python/ensurepip-setuptools
+	dev-python/ensurepip-wheel
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=180
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# use wheels from ensurepip bundle
+		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# workaround test failures due to warnings from setuptools-scm, sigh
+	echo '[tool.setuptools_scm]' >> pyproject.toml || die
+
+	# remove useless pins
+	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
+
+	# remove bundled wheels
+	rm src/virtualenv/seed/wheels/embed/*.whl || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		# tests for old wheels with py3.7 support
+		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
+		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
+		# broken by different wheel versions in ensurepip
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
+		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
+		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
+		# hangs on a busy system, sigh
+		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
+	)
+	case ${EPYTHON} in
+		python3.1[23])
+			EPYTEST_DESELECT+=(
+				tests/unit/create/via_global_ref/test_build_c_ext.py
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# TODO
+				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezer )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# remove bundled wheels, we're using ensurepip bundle instead
+	find "${ED}" -name '*.whl' -delete || die
+}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index de4919846f67..177b208d9dc3 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,2 +1 @@
-DIST webcolors-1.13.tar.gz 41152 BLAKE2B 0a510a7fe10db42af226da465437017b36ffe11382d31b588ee1c53c5d810b9b1bc95c5f8ccaa4a351956368fe7ee74fbac68c880927a83c1d9155937e0c198d SHA512 074aaf135ac6b0025b88b731d1d6dfa4c539b4fff7195658cc58a4326bb9f0449a231685d312b4a1ec48ca535a838bfa5c680787fe0e61473a2a092c448937d0
 DIST webcolors-24.6.0.tar.gz 41449 BLAKE2B dd1a0bb3c2efd8b9dae4ab48b38796f9798ab8883d3466039dfd9739dcc65acd7de37c0629996844d486871958b58196e46d04d43b31106d8462abdeb34c8e2e SHA512 22b4eda3c6b0c06c6cb5873f22b63227db4d1f87c8c673556be8a2f58ea4b27aedd1b115b882602a07d997066c973c1b64ba8162abf538fae96ff54e00f699a5
diff --git a/dev-python/webcolors/webcolors-1.13.ebuild b/dev-python/webcolors/webcolors-1.13.ebuild
deleted file mode 100644
index 93aadef4c215..000000000000
--- a/dev-python/webcolors/webcolors-1.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="
-	https://github.com/ubernostrum/webcolors/
-	https://pypi.org/project/webcolors/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-distutils_enable_tests unittest
diff --git a/dev-python/webcolors/webcolors-24.6.0.ebuild b/dev-python/webcolors/webcolors-24.6.0.ebuild
index 1edfccab4c30..93aadef4c215 100644
--- a/dev-python/webcolors/webcolors-24.6.0.ebuild
+++ b/dev-python/webcolors/webcolors-24.6.0.ebuild
@@ -16,6 +16,6 @@ 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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 490a29873968..5a8c5b582a1a 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,2 +1 @@
-DIST widgetsnbextension-4.0.10.tar.gz 1147204 BLAKE2B 16b81a1ad6c1d527c27d1fe48952d8ad89c14c2ae7cd1f7f00eea43263f9fde481df1db18d74a8a6417c9270bd29a46c77b495b520848c4782c1d60295d5850c SHA512 0e16dc994093712851a3ad0385844fd3f807157a024dd6ce26c3f6b3953cfb01421d877363def747405c8c887a00a880dcc06664d45d142b3c548b7d67b7008d
 DIST widgetsnbextension-4.0.11.tar.gz 1164354 BLAKE2B 85a96be89592ad08c8722c389d8848126da0e9fc235a126c44779aa1188aeeb1cc9e23c5e4f447562f8660dc637947da3410f7068d14949b337ef8d652705b01 SHA512 22b2bea35633212635718a49b33e219dac7688190c2e9c3b0eb560d830c984e7250d357c14e8b13102f493977863722e18cd77dc43dd7e309aa03006d63072cb
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.10.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.10.ebuild
deleted file mode 100644
index f0cd7d769dde..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipython.org/
-	https://pypi.org/project/widgetsnbextension/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
index 2ba0ebb7f8a4..f0cd7d769dde 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-06-22 17:42:58 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-06-22 17:42:58 +0000
commit	9b2dbe02784d42d572e7c34746d92d0dcd641636 (patch)
tree	33512bd0a426cee57d7d3dbb85ea6d134173bc95 /dev-python
parent	6dee9399536acc2c36960b5b40ae671d37b235ce (diff)
download	baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.tar.gz baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.tar.xz baldeagleos-repo-9b2dbe02784d42d572e7c34746d92d0dcd641636.zip