Adding metadata

49 files changed, 226 insertions, 1037 deletions

diff --git a/dev-python/PySDL2/PySDL2-0.9.16.ebuild b/dev-python/PySDL2/PySDL2-0.9.16.ebuild
index 2e574c84f08d..927fd1bb046a 100644
--- a/dev-python/PySDL2/PySDL2-0.9.16.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.16.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/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index bdc661d6a878..35215250bd96 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -1,2 +1 @@
-DIST aiosmtpd-1.4.5.tar.gz 152668 BLAKE2B 5f689e029afcc267b8b9f1863ce20d76bea16985d7fddac1e6cf0624d7bef6bbbe7089b4933bee8b5aaa74e63d996295e3684b3a7891b697608cbd311be92728 SHA512 c9507e25b5aeec442d299e13624ce00777ecf8089eee230b9cb9f92c18816cef890968c25144a56b95fd9b063b1440921841a16add624d717b8f6378d55c85a4
 DIST aiosmtpd-1.4.6.tar.gz 152775 BLAKE2B 6432388c563bc9e8439f0e685130e103a855004443d24e004ab7bf740c0e93cb7601fc435104f7c1c450e1d6374fe9070ed4a91df58ca0f013e516cd9f40e748 SHA512 5aceaa03d6a00c3c99cd2d53b9320aa3a044d0ee09c22bd4fadf3ee56ea0e307120d1fe4cc798d7a04d53059da674f6dba816a6a6ed7326a510f6caf074e8f90
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.5.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.5.ebuild
deleted file mode 100644
index 5a74c05c4353..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.4.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 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="Reimplementation of the Python stdlib smtpd.py based on asyncio"
-HOMEPAGE="
-	https://aiosmtpd.aio-libs.org/
-	https://github.com/aio-libs/aiosmtpd
-	https://pypi.org/project/aiosmtpd/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/atpublic-4.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-23.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/pytest-mock-3.12.0[${PYTHON_USEDEP}] )
-"
-
-EPYTEST_DESELECT=(
-	# Needs dev-vcs/git
-	aiosmtpd/qa/test_0packaging.py::TestVersion
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/--cov=/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
index 5a74c05c4353..84e44d758e76 100644
--- a/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.6.ebuild
@@ -39,3 +39,18 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# https://github.com/aio-libs/aiosmtpd/issues/403
+				aiosmtpd/tests/test_server.py::TestUnthreaded::test_unixsocket
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
index 867edf59ce87..dc102cc9eb22 100644
--- a/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
+++ b/dev-python/ansible-pygments/ansible-pygments-0.1.1-r1.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517="poetry"
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Pygments lexer and style Ansible snippets"
-HOMEPAGE="https://github.com/ansible-community/ansible-pygments"
+HOMEPAGE="
+	https://github.com/ansible-community/ansible-pygments/
+	https://pypi.org/project/ansible-pygments/
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv"
 
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.1.1-make_lexer_test_compare_tokens.patch
diff --git a/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild b/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild
index 857315940c16..622ebbc1cb5d 100644
--- a/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.ebuild
+++ b/dev-python/apache-libcloud/apache-libcloud-3.8.0-r1.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
@@ -35,13 +35,14 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# Needs network access
-	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
-	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
-)
-
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/apache/libcloud/pull/2014
+		"${FILESDIR}/${P}-pytest-8.2.patch"
+	)
+
+	distutils-r1_src_prepare
+
 	if use examples; then
 		mkdir examples || die
 		mv example_*.py examples || die
@@ -49,8 +50,19 @@ src_prepare() {
 
 	# needed for tests
 	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+}
 
-	distutils-r1_src_prepare
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Needs network access
+		libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
+		libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
+		# TODO
+		libcloud/test/test_init.py::TestUtils::test_init_once_and_debug_mode
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
 }
 
 src_install() {
diff --git a/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch b/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch
new file mode 100644
index 000000000000..03917b0dac75
--- /dev/null
+++ b/dev-python/apache-libcloud/files/apache-libcloud-3.8.0-pytest-8.2.patch
@@ -0,0 +1,25 @@
+From 0b69d0bf23b6c2edb1e2002f47ff2df0080e96d9 Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 6 Jun 2024 12:25:15 +1000
+Subject: [PATCH] Mark MockHttp as not for collection by pytest
+
+pytest 8.2.0 contains a regression that will collect non-test classes,
+so as to be explicit about it, mark MockHttp (and therefore all of its
+children classes) as not to be collected.
+---
+ libcloud/test/__init__.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libcloud/test/__init__.py b/libcloud/test/__init__.py
+index d45c82c84d..d0da40c74a 100644
+--- a/libcloud/test/__init__.py
++++ b/libcloud/test/__init__.py
+@@ -97,6 +97,8 @@ class MockHttp(LibcloudConnection):
+ 
+         (int status, str body, dict headers, str reason)
+     """
++    # pytest may collect this class, and we don't need or want that
++    __test__ = False
+ 
+     type = None
+     use_param = None  # will use this param to namespace the request function
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 6deb9cf8a8ae..bc020e636e0d 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,4 +1 @@
-DIST apispec-6.4.0.tar.gz 79114 BLAKE2B 998b153a3d80c45247148210a929a0713d930560a4219dc0da0791e02480ff2a99a74d0b8bc2c170534f7d9e4e05a5fa231fa1d0eaf9359191e7ea6f37e5caf3 SHA512 2b9ceb99945c2e40e00af9f1626d0bd45cdb853fea1b75c58ef312b42b10d521405138c3bc788a33bf38eb31fc9220ed8e9a23c6a3c8980fc5549688d999dcdf
-DIST apispec-6.5.0.tar.gz 76109 BLAKE2B 63cf1fe60a828e3612d211214c07eb250accbab62760e76af48e30871f0bfbb6a3d80efe6373549da43a3b3e5ccacc80f61de48a236ad0391e210d9033e87c9f SHA512 1102bd0c00b8b7018c1ad88fe2b4531fbfcfc83fca73aa63e9b7965c0775634f40fb59c061ec901b804c79e69df43f5b33c7b64129a1684a4f8b0b6228f1b1de
-DIST apispec-6.6.0.tar.gz 76220 BLAKE2B b4dc3a931a501eb4abb0148c93234cb03929d45e7a8f939dfc996cb7ff1573b22e1b1941b52f7cc31374c68ae5dbae623d35cb6f15c03e5ae1b2155f3991e106 SHA512 8bdff0a7df17e30639bea2a2f6afb13c84d74bdeceef5c4748c85886c1bc2662a8d257f7873804fdca3e109380159c1671af9001bfeeae81da2c659858a39b19
 DIST apispec-6.6.1.tar.gz 76537 BLAKE2B e08f1545441be7f1dd266205a6a7dc1317385961325e47c25fde0aecbd68712410601249bced9b0c3491d3e6f772c94c14f638d77e3dbfac37bba5bb0dd1e284 SHA512 a6820444b017f9551d21cf5ba5a14f8f4eaa6bccd1848c540e41bd37140df06dc897bf5d29bc77a2e55b670d58dc84eeb6588769efb3fe400eba243c0a1b5425
diff --git a/dev-python/apispec/apispec-6.4.0.ebuild b/dev-python/apispec/apispec-6.4.0.ebuild
deleted file mode 100644
index 8ddcfdf300e8..000000000000
--- a/dev-python/apispec/apispec-6.4.0.ebuild
+++ /dev/null
@@ -1,46 +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 pluggable API specification generator"
-HOMEPAGE="
-	https://github.com/marshmallow-code/apispec/
-	https://pypi.org/project/apispec/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/apispec/apispec-6.5.0.ebuild b/dev-python/apispec/apispec-6.5.0.ebuild
deleted file mode 100644
index 0d1a12079720..000000000000
--- a/dev-python/apispec/apispec-6.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pluggable API specification generator"
-HOMEPAGE="
-	https://github.com/marshmallow-code/apispec/
-	https://pypi.org/project/apispec/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/apispec/apispec-6.6.0.ebuild b/dev-python/apispec/apispec-6.6.0.ebuild
deleted file mode 100644
index 0d1a12079720..000000000000
--- a/dev-python/apispec/apispec-6.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pluggable API specification generator"
-HOMEPAGE="
-	https://github.com/marshmallow-code/apispec/
-	https://pypi.org/project/apispec/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-rtd-theme
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires unpackaged prance
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 2fd1391260c6..27e4646f0a43 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1 @@
-DIST black-24.3.0.tar.gz 634292 BLAKE2B 9a853a0943ba081ecb7a4c22913b060607ac47fb90b70a9645358d681f3eab55707ad6fe9ad9928ba0d39a8adf5dfde0168598a8abcc24b823b407287cefaf82 SHA512 57e3b651009578f1d15b6e9ffb49d24be80885b2cf7ad48a68407862778ac2099d119e7ba6d58ddea4fc7fc21345435a7572a970baf882f763d9347868d5504b
-DIST black-24.4.0.tar.gz 635902 BLAKE2B 2821c0f4674524d3457fb8cbf1f1224d9c7e76abdbb1e47bcd4d488ff560a417b3ad57223318b28951c92c59d13c4a2894a323865a2be2859e7b7e891c54064c SHA512 3f9150faa36413ffff3a65f9f55b33a6b69b3abec5bf649bfc0662a92faa41edc76e90151e27a74f04bc3defc0687c898d54b2f137d16d13ea46e86670aa7a98
-DIST black-24.4.1.tar.gz 641335 BLAKE2B 996528509a71d8e2b8cb8e1ebf1beac5d2460d0759de77805645ca293a648aac8a658a4b9e6b239b591e9e4e43c0af66c7a972ca0b1ecc6d9aef911f559c0cff SHA512 057c2cc2ff47111487a46bfc50b961c719f92caaca49494a6cc57bb5e8aa19d0d47a7f3164421e104ef2815060e7d771a9532e970e07e1c2ce709b4cf7e99656
 DIST black-24.4.2.tar.gz 642299 BLAKE2B aa62394dc4a14fd6dd49502a86e46e7f707d6342127e2fb3b5cb7365ab392f5a0514df548d30219e9b6ed1f9d8ca80241ea206a06011ef8dc3d770191d3328ce SHA512 f3fb63fdbff947a217ad371939a6eaac1e818f58fb924516639f3c9469f0db6fbda8d4b207163d4a6db8a58a048fefe46fbfdb1ddf40f91348bd767208e60f35
diff --git a/dev-python/black/black-24.3.0.ebuild b/dev-python/black/black-24.3.0.ebuild
deleted file mode 100644
index c7dbb48fcf8b..000000000000
--- a/dev-python/black/black-24.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-24.4.0.ebuild b/dev-python/black/black-24.4.0.ebuild
deleted file mode 100644
index 2150f4c5d194..000000000000
--- a/dev-python/black/black-24.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-24.4.1.ebuild b/dev-python/black/black-24.4.1.ebuild
deleted file mode 100644
index 2150f4c5d194..000000000000
--- a/dev-python/black/black-24.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" \
-		"dev-python/aiohttp dev-python/aiohttp-cors"
-}
diff --git a/dev-python/black/black-24.4.2-r1.ebuild b/dev-python/black/black-24.4.2-r1.ebuild
index 86f49e9949d2..07727b88ee2f 100644
--- a/dev-python/black/black-24.4.2-r1.ebuild
+++ b/dev-python/black/black-24.4.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/btrfsutil/btrfsutil-6.9.ebuild b/dev-python/btrfsutil/btrfsutil-6.9.ebuild
index 8532e1a47bf5..1ef95d7a0f9b 100644
--- a/dev-python/btrfsutil/btrfsutil-6.9.ebuild
+++ b/dev-python/btrfsutil/btrfsutil-6.9.ebuild
@@ -34,10 +34,13 @@ distutils_enable_tests unittest
 RDEPEND+=" !sys-fs/btrfs-progs[python(-)]"
 
 src_unpack() {
-	if use verify-sig ; then
-		verify-sig_verify_detached \
-			<(xz -cd "${DISTDIR}"/${MY_P}.tar.xz) \
-			"${DISTDIR}"/${MY_P}.tar.sign
+	# Upstream sign the decompressed .tar
+	if use verify-sig; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+	else
+		default
 	fi
-	default
 }
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 870963f6d9b7..a04380e8892d 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,2 +1 @@
-DIST build-1.1.1.gh.tar.gz 44605 BLAKE2B aa1d554d55007e8cb715981938bb8765230ae5ddc6c5bc29efeb52c0e18b6337a13c27f3389772a83cc0ecc9b7d3e889fbc305e91f1290424d7031a1782f683f SHA512 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da
 DIST build-1.2.1.gh.tar.gz 47394 BLAKE2B d38a138dee5065ff0faee453bdc608fc519bc4b4a3cec8b60cf4f745288f8238dd7e9334f75bdd67765037a62b220079ce924c6581f745eb3750e732b2184d48 SHA512 77003e16d3776c3a4be920251bf14650eea112b92d94116cb1893195b8e16aae57321206ae63267119247f2794f220c891b7d913e07a8258b313d34c07d54fe9
diff --git a/dev-python/build/build-1.1.1.ebuild b/dev-python/build/build-1.1.1.ebuild
deleted file mode 100644
index 383374566cf3..000000000000
--- a/dev-python/build/build-1.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022-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
-
-DESCRIPTION="A simple, correct PEP517 package builder"
-HOMEPAGE="
-	https://pypi.org/project/build/
-	https://github.com/pypa/build/
-"
-SRC_URI="
-	https://github.com/pypa/build/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/filelock-3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.34[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}]
-		>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by the presence of flit_core
-		tests/test_util.py::test_wheel_metadata_isolation
-		# broken by the presence of virtualenv (it changes the error
-		# messages, sic!)
-		'tests/test_main.py::test_output[via-sdist-isolation]'
-		'tests/test_main.py::test_output[wheel-direct-isolation]'
-		# broken when built in not normal tty on coloring
-		tests/test_main.py::test_colors
-		'tests/test_main.py::test_output_env_subprocess_error[color]'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not network" -p pytest_mock -p rerunfailures
-}
diff --git a/dev-python/cftime/cftime-1.6.3.ebuild b/dev-python/cftime/cftime-1.6.3.ebuild
index acee3e586040..c1aec07a5945 100644
--- a/dev-python/cftime/cftime-1.6.3.ebuild
+++ b/dev-python/cftime/cftime-1.6.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv ~s390 x86"
 
 DEPEND="
 	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cleo/cleo-2.1.0.ebuild b/dev-python/cleo/cleo-2.1.0.ebuild
index e7f927ef72df..d33bbe21aeac 100644
--- a/dev-python/cleo/cleo-2.1.0.ebuild
+++ b/dev-python/cleo/cleo-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/crispy-bootstrap4/Manifest b/dev-python/crispy-bootstrap4/Manifest
index 834baab14ce7..6abc18f0806a 100644
--- a/dev-python/crispy-bootstrap4/Manifest
+++ b/dev-python/crispy-bootstrap4/Manifest
@@ -1,2 +1 @@
-DIST crispy-bootstrap4-2023.1.gh.tar.gz 31707 BLAKE2B 0a3c4c1b86ba9701365f1fcfb90811e1f6793fb9f374a510410c460bc62a48e06b72a75330f0efd3a06e51380f457eea66f236488774c3ee6bf758510136f08b SHA512 fbbc8c6e0f4351b50b0fa3a4d2faefb0775906c995f42cf9ccd9688d4780e05877a9a53f065ad92785d135a560064809f429dbcebe9f257f65f063d9539973e8
 DIST crispy-bootstrap4-2024.1.gh.tar.gz 31818 BLAKE2B 5778544067c7c23971a410bb52556a267fed9109bee4b5a4cd7e72c9bde0888e6744c2e12aa079c92217c0b6bc0ef2709de2eae127fe92ccc92ca1acb5015aa6 SHA512 c4c4e02117a2b3cf24c9111579c20f1454c5feb8c485c954e48436354e82d0a26e34b54212fb642d010a7c370236028119e5193fdb43ff2053cabae56a01a7c2
diff --git a/dev-python/crispy-bootstrap4/crispy-bootstrap4-2023.1.ebuild b/dev-python/crispy-bootstrap4/crispy-bootstrap4-2023.1.ebuild
deleted file mode 100644
index d83df4a787c6..000000000000
--- a/dev-python/crispy-bootstrap4/crispy-bootstrap4-2023.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap4 template pack for django-crispy-forms"
-HOMEPAGE="
-	https://github.com/django-crispy-forms/crispy-bootstrap4/
-	https://pypi.org/project/crispy-bootstrap4/
-"
-SRC_URI="
-	https://github.com/django-crispy-forms/crispy-bootstrap4/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/django-4.2[${PYTHON_USEDEP}]
-	>=dev-python/django-crispy-forms-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 0e15fc06f026..4a73fa39879a 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,2 +1 @@
-DIST kombu-5.3.6.tar.gz 439311 BLAKE2B 6be4f7b1459f9f48ba933075871a8f34c3817b5a7fa31875f4370b88abc8271a86ff628e94cbe5a1474f9fa01b99ecd98dfa6ada8dfcfaa26e518d15e83e1b6e SHA512 22712b3f105a87790103e8df3565d9bfa30bfadc706d7f8d8dc7eb908575603b8f3f596cc04b428bd69ff63b484509aadf0f031a792e315883d3dc878705a79e
 DIST kombu-5.3.7.tar.gz 439344 BLAKE2B 9443cb7d9d03ca7ed49b1e2c5a413e5d5633ccaf8cb2b8545b4bd0a7a7699f7fc773f735e6b26abf582502f1dbf11b088c612d749f09cab99950e145e8ee82e0 SHA512 48104d61a7c38a211ec378f90aade09d682a99d4f8b3d18b4bce49b51c80be794ab4b012d2974893fbc630a37c52dad10fb57f8335238b3002a64e025a148ee2
diff --git a/dev-python/kombu/kombu-5.3.6.ebuild b/dev-python/kombu/kombu-5.3.6.ebuild
deleted file mode 100644
index 0f7b6703fc05..000000000000
--- a/dev-python/kombu/kombu-5.3.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="
-	https://github.com/celery/kombu/
-	https://pypi.org/project/kombu/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/amqp-5.1.1[${PYTHON_USEDEP}]
-	<dev-python/amqp-6.0.0[${PYTHON_USEDEP}]
-	dev-python/vine[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.22.2[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-celery
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		t/unit/transport/test_redis.py::test_Channel::test_connparams_health_check_interval_supported
-	)
-	local EPYTEST_IGNORE=(
-		# obsolete Pyro4
-		t/unit/transport/test_pyro.py
-		# unpackaged azure
-		t/unit/transport/test_azurestoragequeues.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
-	optfeature "Etcd backend" dev-python/python-etcd
-	optfeature "MongoDB backend" dev-python/pymongo
-	optfeature "Redis backend" dev-python/redis
-	optfeature "sqlalchemy backend" dev-python/sqlalchemy
-	optfeature "yaml backend" dev-python/pyyaml
-	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
-	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
-}
diff --git a/dev-python/kombu/kombu-5.3.7.ebuild b/dev-python/kombu/kombu-5.3.7.ebuild
index 0f7b6703fc05..6f613f80e0b8 100644
--- a/dev-python/kombu/kombu-5.3.7.ebuild
+++ b/dev-python/kombu/kombu-5.3.7.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezer[${PYTHON_USEDEP}]
 		dev-python/zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-2.2.2-r1.ebuild b/dev-python/pandas/pandas-2.2.2-r1.ebuild
index 5fafae1b6617..88e31c227bd5 100644
--- a/dev-python/pandas/pandas-2.2.2-r1.ebuild
+++ b/dev-python/pandas/pandas-2.2.2-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="big-endian full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-2.2.2.ebuild b/dev-python/pandas/pandas-2.2.2.ebuild
index 7ec1f60603a1..1b490fc3831c 100644
--- a/dev-python/pandas/pandas-2.2.2.ebuild
+++ b/dev-python/pandas/pandas-2.2.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 IUSE="big-endian full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyarrow/pyarrow-16.1.0.ebuild b/dev-python/pyarrow/pyarrow-16.1.0.ebuild
index 3d9b921f632a..4753c9431a48 100644
--- a/dev-python/pyarrow/pyarrow-16.1.0.ebuild
+++ b/dev-python/pyarrow/pyarrow-16.1.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/pygame/pygame-2.5.2-r3.ebuild b/dev-python/pygame/pygame-2.5.2-r3.ebuild
index 44a0ed2ea6f7..ff14caddfcc4 100644
--- a/dev-python/pygame/pygame-2.5.2-r3.ebuild
+++ b/dev-python/pygame/pygame-2.5.2-r3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygit2/pygit2-1.15.0.ebuild b/dev-python/pygit2/pygit2-1.15.0.ebuild
index d4bc10707e75..979f90766d85 100644
--- a/dev-python/pygit2/pygit2-1.15.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.15.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 
 DEPEND="
 	<dev-libs/libgit2-1.9:=
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.1.2.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.1.2.ebuild
index 9408bbca5d2c..f2134c4ccaab 100644
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.1.2.ebuild
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.1.2.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/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index 9426f0c654d5..5c9547304fea 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1,2 +1 @@
-DIST scikit-learn-1.4.2.gh.tar.gz 7907022 BLAKE2B d52b808ae981883438592ee9155797fedf832181b0fe66c25728aedc43143143d44af190977b22844e3322da77cd21a1ce5c733e254686722df7f4c43029192c SHA512 ac4eea3d1f1f7c7280694d59ccb1e58362e77080f65dc2d4644dc257e874d7ff0d2d5b7abeb18acffc2752382527c6e9bbf5ebc47a8a74a2fab2a543e0220951
 DIST scikit-learn-1.5.0.gh.tar.gz 7806059 BLAKE2B d58a92fa230ee3f249cd9d9cf2cfd9406e12b0aaed6f3d3360fc5f914b7d690709786477474b95d90711f61b44d5490b01bcb57e36a320235591d3b2520dd9c0 SHA512 dfa6364770a982642c94e70a6ada8d60d3bba5e0a6e1d4acb622c102f176b39ba1c8b5ec8df6a12142afa258974cd606f0bdda4461dc23b7518bfaf71a7319cc
diff --git a/dev-python/scikit-learn/scikit-learn-1.4.2-r1.ebuild b/dev-python/scikit-learn/scikit-learn-1.4.2-r1.ebuild
deleted file mode 100644
index a7c6a18e0ccb..000000000000
--- a/dev-python/scikit-learn/scikit-learn-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Machine learning library for Python"
-HOMEPAGE="
-	https://scikit-learn.org/stable/
-	https://github.com/scikit-learn/scikit-learn/
-	https://pypi.org/project/scikit-learn/
-"
-SRC_URI="
-	https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	virtual/blas:=
-	virtual/cblas:=
-	>=dev-python/numpy-1.22.3:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/wheel[${PYTHON_USEDEP}]
-	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/threadpoolctl-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-# For some reason this wants to use urllib to fetch things from the internet
-# distutils_enable_sphinx doc \
-# 	dev-python/matplotlib \
-# 	dev-python/memory-profiler \
-# 	dev-python/numpydoc \
-# 	dev-python/pandas \
-# 	dev-python/pillow \
-# 	dev-python/seaborn \
-# 	dev-python/sphinx-gallery \
-# 	dev-python/sphinx-prompt \
-# 	dev-python/scikit-image
-
-python_test() {
-	rm -rf sklearn || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs sklearn
-}
-
-python_install_all() {
-	find "${S}" -name \*LICENSE.txt -delete || die
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild b/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
index 57800b0e7f80..99a6eca9a2de 100644
--- a/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
+++ b/dev-python/scikit-learn/scikit-learn-1.5.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/secretstorage/secretstorage-3.3.3.ebuild b/dev-python/secretstorage/secretstorage-3.3.3.ebuild
index 863e9be1b72f..8ecceb348b84 100644
--- a/dev-python/secretstorage/secretstorage-3.3.3.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.3.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/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index ec6ca76b2d02..f6bca701b6e7 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,4 @@
 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.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.6.0.ebuild
new file mode 100644
index 000000000000..7b82ad222347
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-2.6.0.ebuild
@@ -0,0 +1,124 @@
+# 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
+		# TODO
+		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
+		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
+		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
+		tests/profiler/test_transaction_profiler.py::test_profile_captured
+		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
+		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -p aiohttp -p pytest_forked
+}
diff --git a/dev-python/stestr/stestr-4.1.0.ebuild b/dev-python/stestr/stestr-4.1.0.ebuild
index 8a40ff6807fe..ccae59fe63cc 100644
--- a/dev-python/stestr/stestr-4.1.0.ebuild
+++ b/dev-python/stestr/stestr-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/subunit/subunit-1.4.4.ebuild b/dev-python/subunit/subunit-1.4.4.ebuild
index f3307a92d403..875da513a6aa 100644
--- a/dev-python/subunit/subunit-1.4.4.ebuild
+++ b/dev-python/subunit/subunit-1.4.4.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/tempora/tempora-5.6.0.ebuild b/dev-python/tempora/tempora-5.6.0.ebuild
index ac99165d5ea0..5cd5142a80d1 100644
--- a/dev-python/tempora/tempora-5.6.0.ebuild
+++ b/dev-python/tempora/tempora-5.6.0.ebuild
@@ -41,5 +41,5 @@ python_test() {
 	fi
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p freezegun
+	epytest -p freezer
 }
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild
index c21d8620f3ca..e82f048a54f9 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.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
@@ -18,4 +18,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 
+EPYTEST_DESELECT=(
+	# the test measures performance of the patch parser together with test data
+	# preparation, which can take long time in some interpreters, bug #907243
+	tests/test_patch.py::PatchTestSuite::test_huge_patch
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 133f894540fd..29d350457d5a 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,2 @@
-DIST xarray-2024.03.0.gh.tar.gz 3722922 BLAKE2B 52025d8ba196500ac989fc8ff85ae7578cae3602ede77b663350acf0e132d2d9358f3170c697aa2f158c2f3f3520607c23f9060356fec0942ebddb9ca3e039da SHA512 5d62c102a3fdf6dfc16182d3822386dc9edb75204dff9a9b8e3aa7bbe5b223c477f2a73f0a0e35de3454d9e738da6205da0c308bc778f8ffc9af80c20a49d6af
-DIST xarray-2024.1.1.tar.gz 3614037 BLAKE2B cc50fbfa19a2c9229b85b8c7d5d0e7e7f6d3e5a484955fcc81aa0b37839a0b992d2c2f928e4097ca05c7b8294ed1061fbd0c1b7e7c65c9087a940dab97c520ce SHA512 b6447ca2c80b3a3091ac2baba648fef4faa79ffff272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487
-DIST xarray-2024.2.0.tar.gz 3634288 BLAKE2B 8d1165360300da5af6d670947e5280052a3d8915768e02448b86ab38283d6d45258a2c4eb91982ba732ccedb3a7afc5f274116c9ee0072d35cdc5631b8a2ca50 SHA512 dcfe6d1f0edab8659664c5399b96d622d2e3df2f85bb7672d9afab6f74294a6449772efde080aaa7323f733c09cbd0f6f037e547be0afa79f39450eead777828
 DIST xarray-2024.5.0.tar.gz 3710689 BLAKE2B 04d2d9c70c90bccd0f269dde91be8a3f213b2dfe2d380b041abe946d118e80d0816ef09ed7e225b7bb164902c1943c1be335f1cac815d12c4aace6a0217379bb SHA512 d3aa6ef73afd2fd8a5c5551631ca5385d14221474bdab4c404cee1405b370c2f998c895bfd3506e6ccc1b2f511996b0eebefb331768df047d5e8b398ad2f9199
 DIST xarray-2024.6.0.tar.gz 3715179 BLAKE2B 42fa46883d27f656dca9b82e1647bd94a62a427582cd52d847131a8e01caf77a597fcc128453fee1f68c38897a9f995dd4c644e9b68b551ee1c28bc0d48e9465 SHA512 b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62
diff --git a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch b/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
deleted file mode 100644
index e85bb6de7b71..000000000000
--- a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 306a50e344522a3f321d49d95488f457975fa553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2024 11:31:26 +0100
-Subject: [PATCH 1/2] test_dataset: remove incorrect pytest.warns() to fix
- pytest-8
-
-Remove two incorrect `pytest.warns()` assertions to fix test failures
-with pytest-8.0.0.  Prior to this version, an exception raised would
-cause `pytest.warns()` to be ignored.  This way fixed in 8.0.0, and now
-warnings must actually be emitted prior to the exception.
-
-In `test_drop_index_labels()`, the exception is raised at the very
-beginning of the function, prior to the deprecation warning.
-
-In `test_rename_multiindex()`, the warning is not emitted at all (it is
-not applicable to the call in question).
----
- xarray/tests/test_dataset.py | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
-index fa9448f2f4..77d172f00b 100644
---- a/xarray/tests/test_dataset.py
-+++ b/xarray/tests/test_dataset.py
-@@ -2724,8 +2724,7 @@ def test_drop_index_labels(self) -> None:
-         assert_identical(data, actual)
- 
-         with pytest.raises(ValueError):
--            with pytest.warns(DeprecationWarning):
--                data.drop(["c"], dim="x", errors="wrong_value")  # type: ignore[arg-type]
-+            data.drop(["c"], dim="x", errors="wrong_value")  # type: ignore[arg-type]
- 
-         with pytest.warns(DeprecationWarning):
-             actual = data.drop(["a", "b", "c"], "x", errors="ignore")
-@@ -3159,8 +3158,7 @@ def test_rename_multiindex(self) -> None:
-                 original.rename({"a": "x"})
- 
-         with pytest.raises(ValueError, match=r"'b' conflicts"):
--            with pytest.warns(UserWarning, match="does not create an index anymore"):
--                original.rename({"a": "b"})
-+            original.rename({"a": "b"})
- 
-     def test_rename_perserve_attrs_encoding(self) -> None:
-         # test propagate attrs/encoding to new variable(s) created from Index object
-
-From 3bc5abf4da35edda1f0c3e9e0d53e39331c1a76b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 31 Jan 2024 11:35:04 +0100
-Subject: [PATCH 2/2] test_groupby: Clear recorded warnings for pytest-8
- compatibility
-
-Clear the warnings recorded during the `pytest.warns()` use
-in `test_groupby_dims_property`, to fix test failures with pytest-8.0.0.
-Prior to this version, `pytest.warns()` invocation used to capture all
-warnings.  Now it only captures the warnings that match the arguments,
-and the remaining warnings are re-emitted and therefore caught by
-`recwarn` fixture.  To provide compatibility with both versions of
-pytest, clear the recorded warnings immediately after `pytest.warns()`.
-
-Fixes #8681
----
- xarray/tests/test_groupby.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/xarray/tests/test_groupby.py b/xarray/tests/test_groupby.py
-index 25fabd5e2b..b65c01fe76 100644
---- a/xarray/tests/test_groupby.py
-+++ b/xarray/tests/test_groupby.py
-@@ -67,6 +67,8 @@ def test_groupby_dims_property(dataset, recwarn) -> None:
-     with pytest.warns(UserWarning, match="The `squeeze` kwarg"):
-         assert dataset.groupby("x").dims == dataset.isel(x=1).dims
-         assert dataset.groupby("y").dims == dataset.isel(y=1).dims
-+    # in pytest-8, pytest.warns() no longer clears all warnings
-+    recwarn.clear()
- 
-     # when squeeze=False, no warning should be raised
-     assert tuple(dataset.groupby("x", squeeze=False).dims) == tuple(
diff --git a/dev-python/xarray/xarray-2024.1.1-r1.ebuild b/dev-python/xarray/xarray-2024.1.1-r1.ebuild
deleted file mode 100644
index 3774c587431f..000000000000
--- a/dev-python/xarray/xarray-2024.1.1-r1.ebuild
+++ /dev/null
@@ -1,92 +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="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pydata/xarray/pull/8686
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-		# TODO: segv in netcdf4-python
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
-		xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
-		# TODO: broken
-		xarray/tests/test_backends.py::TestNetCDF4Data
-		xarray/tests/test_backends.py::TestNetCDF4ViaDaskData
-		# hangs
-		xarray/tests/test_backends.py::TestDask::test_dask_roundtrip
-		# mismatches when pyarrow is installed
-		# https://github.com/pydata/xarray/issues/8092
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_2D
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_not_daskarray
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.2.0-r1.ebuild b/dev-python/xarray/xarray-2024.2.0-r1.ebuild
deleted file mode 100644
index 42228ff1a9e7..000000000000
--- a/dev-python/xarray/xarray-2024.2.0-r1.ebuild
+++ /dev/null
@@ -1,92 +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="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning-targeted tests are fragile and not important to end users
-		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-		# TODO: segv in netcdf4-python
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
-		'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
-		xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
-		# TODO: broken
-		xarray/tests/test_backends.py::TestNetCDF4Data
-		xarray/tests/test_backends.py::TestNetCDF4ViaDaskData
-		# hangs
-		xarray/tests/test_backends.py::TestDask::test_dask_roundtrip
-		# mismatches when pyarrow is installed
-		# https://github.com/pydata/xarray/issues/8092
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_2D
-		xarray/tests/test_dask.py::TestToDaskDataFrame::test_to_dask_dataframe_not_daskarray
-	)
-	local EPYTEST_IGNORE=(
-		# requires datatree_ subpackage that is not part of public API
-		# https://github.com/pydata/xarray/issues/8768
-		xarray/tests/datatree
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.3.0-r1.ebuild b/dev-python/xarray/xarray-2024.3.0-r1.ebuild
deleted file mode 100644
index ef29ea481ead..000000000000
--- a/dev-python/xarray/xarray-2024.3.0-r1.ebuild
+++ /dev/null
@@ -1,77 +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
-
-# TODO: switch back to pypi in the next release
-MY_PV=2024.03.0
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-SRC_URI="
-	https://github.com/pydata/xarray/archive/v${MY_PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.3.0.ebuild b/dev-python/xarray/xarray-2024.3.0.ebuild
deleted file mode 100644
index e34110da61ab..000000000000
--- a/dev-python/xarray/xarray-2024.3.0.ebuild
+++ /dev/null
@@ -1,79 +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
-
-# TODO: switch back to pypi in the next release
-MY_PV=2024.03.0
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-SRC_URI="
-	https://github.com/pydata/xarray/archive/v${MY_PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	<dev-python/numpy-2[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-22[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires dev-python/cftime
-		'xarray/tests/test_coding_times.py::test_encode_cf_datetime_datetime64_via_dask[mixed-cftime-pandas-encoding-with-prescribed-units-and-dtype]'
-	)
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.5.0.ebuild b/dev-python/xarray/xarray-2024.5.0.ebuild
index 2a7c7f7018c7..e317cc619be1 100644
--- a/dev-python/xarray/xarray-2024.5.0.ebuild
+++ b/dev-python/xarray/xarray-2024.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 IUSE="big-endian"
 
 RDEPEND="