Adding metadata

19 files changed, 6 insertions, 661 deletions

diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 61fc1646d638..1c4e50629bb6 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-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
@@ -30,6 +30,7 @@ unset _IUSE_QT_MODULES
 REQUIRED_USE="
 	|| ( pyqt5 pyqt6 pyside2 pyside6 )
 	python_targets_python3_12? ( !pyside2 )
+	python_targets_python3_13? ( !pyside2 )
 "
 
 # These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
@@ -139,7 +140,9 @@ BDEPEND="
 				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
 				dev-python/pyside2[xml,xmlpatterns]
 				dev-qt/qtsql:5[sqlite]
+				dev-python/pyside2-tools[${PYTHON_USEDEP}]
 			' python3_{10..11})
+			dev-qt/qtsql:5[sqlite]
 		)
 		pyside6? (
 			dev-python/pyside6[${PYTHON_USEDEP}]
@@ -148,6 +151,7 @@ BDEPEND="
 			dev-python/pyside6[printsupport,qml,quick,quick3d,scxml(-),sensors(-)]
 			dev-python/pyside6[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel]
 			dev-python/pyside6[webengine,websockets,widgets,xml]
+			dev-python/pyside6-tools[${PYTHON_USEDEP}]
 			dev-qt/qtbase:6[sqlite]
 		)
 	)
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.2.3.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.2.3.ebuild
index 44eed8095827..3972c9a0ba66 100644
--- a/dev-python/qdarkstyle/qdarkstyle-3.2.3.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-3.2.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/regex/Manifest b/dev-python/regex/Manifest
index 9b9c7ede63b1..71d89549d628 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1 @@
-DIST regex-2023.12.25.tar.gz 394706 BLAKE2B 742abe3a3515b527465d81df8fd9404aaa6aa1545e3e6a8c4a87d72d41138caf7f63bceae8bf06b3576656a6b5577bfec51629a60fe837ad2f3a4cd60a08ac06 SHA512 ecc5916633e2acb8d8a0c5ccfdc1c612f673546c42271d5627aa92a163fa6c8fd5a30ed734a02c23fa64807aaf2f883fa51175b7f482888631f699e77d1c0e15
-DIST regex-2024.4.16.tar.gz 394724 BLAKE2B 75df2f861116ebf37845abdb0883774ac53d7d61e4cdf18128c74b4c1d5a55b86bfd447616cdb8fc14239c0a5aeaa2c7e59cb0b2b365b57185d785a3728e6dce SHA512 15da80751f1a4b000e4ea59887963aec939fc6431a672391a7f882e05ff15934b89e191d19fd388b9dd6032d2ea44f8511c0ce238e5f1d8db102a89d1866f456
-DIST regex-2024.4.28.tar.gz 394810 BLAKE2B 6fa882219feb783c7340015769655e05257ddd17a6e34f830a60f319afca5face64de72511b0bef0820ace4f379ff5ad557bbdfef414cc0371136a79949a7e13 SHA512 3a05ea8f197d6924f6fd3db2609c1ca13f452f1bc598f8d6ec2ee45a0e5966655e93f039cc76e1cdc714856fa5d21e64aae8d83063ebafdd85e44c82e65f8c50
-DIST regex-2024.5.10.tar.gz 394828 BLAKE2B a16a9b2bcfbec0df059342aee3faa6d71342f8cca78d8db2176be89ee9ababfa03875177f860791701eee2b1b6f3f00ad5e0a7ee74fc78d3c19279893098b69f SHA512 349c2961d96d39cdb76d2f05c7238f0d7e8726445b945001673ad989e2d72e045aeac0f4e661b510cf177bc3634e4573edef211b3b825840acb328be7cf0c9df
 DIST regex-2024.5.15.tar.gz 394856 BLAKE2B 8990bbc78f7f9c6a4dc07d913ec5557a4cd1bac022bc71093e3d8083b5d547182e08f2e8189c3808d8e368ed42530578df9951367b59dc3450bb09458b57f496 SHA512 7e465987bff529a6895cd6606b5a188c0fb2cdf333de108a4e3e37c7badeea146fd23d1d757f47b65d4facdc30cbdb0ca3c0df2395124c8e3e6946a98f52f413
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
deleted file mode 100644
index 706b41b74688..000000000000
--- a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Fri, 30 Jul 2021 11:13:41 +0300
-[PATCH] PyPy3: fix test_empty_array
-
-As an optimization, PyPy sets empty array.array to use a NULL buffer
-pointer, while CPython uses empty buffer (but not NULL).
-Add a very specially crafted fix for PyPy3
-
-Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
----
- regex_3/_regex.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/regex_3/_regex.c
-+++ b/regex_3/_regex.c
-@@ -18062,9 +18062,19 @@ Py_LOCAL_INLINE(BOOL) get_string(PyObject* string, RE_StringInfo* str_info) {
-     }
- 
-     if (!str_info->view.buf) {
-+#if defined(PYPY_VERSION)
-+        /* In PyPy3, when the array.array is empty, it's buffer is NULL */
-+        str_info->characters = NULL;
-+        str_info->length = 0;
-+        str_info->charsize = 1;
-+        str_info->is_unicode = FALSE;
-+        str_info->should_release = FALSE;
-+        return TRUE;
-+#else
-         PyBuffer_Release(&str_info->view);
-         PyErr_SetString(PyExc_ValueError, "buffer is NULL");
-         return FALSE;
-+#endif
-     }
- 
-     str_info->should_release = TRUE;
diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
deleted file mode 100644
index ae5958021781..000000000000
--- a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Arthur Zamarin <arthurzam@gmail.com>
-Date: Fri, 30 Jul 2021 11:38:26 +0300
-[PATCH] PyPy3: fix test_issue_18468
-
-When using the small subclass classes to test correctness of split
-results, there are difference between CPython and PyPy3:
- - CPython returns always the base class (for example str instead
-   of StrSubclass)
- - PyPy3 returns the same class, so we get an StrSubclass
-
-Based on the test, it looks like the behaviour of PyPy3 is correct,
-but the test works based on CPython.
-
-The fix was to relax the equals type to check that it is a subclass.
-
-Signed-off-by: Arthur Zamarin <arthurzam@gmail.com>
----
- regex_3/test_regex.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/regex_3/test_regex.py
-+++ b/regex_3/test_regex.py
-@@ -52,7 +52,7 @@ class RegexTests(unittest.TestCase):
-                 for x, y in zip(actual, expect):
-                     recurse(x, y)
-             else:
--                self.assertIs(type(actual), type(expect), msg)
-+                self.assertIsInstance(actual, type(expect), msg)
- 
-         recurse(actual, expect)
- 
diff --git a/dev-python/regex/regex-2023.12.25.ebuild b/dev-python/regex/regex-2023.12.25.ebuild
deleted file mode 100644
index fccf4ad1f018..000000000000
--- a/dev-python/regex/regex-2023.12.25.ebuild
+++ /dev/null
@@ -1,37 +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
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.4.16.ebuild b/dev-python/regex/regex-2024.4.16.ebuild
deleted file mode 100644
index 2e5c81b5b2db..000000000000
--- a/dev-python/regex/regex-2024.4.16.ebuild
+++ /dev/null
@@ -1,37 +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
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.4.28.ebuild b/dev-python/regex/regex-2024.4.28.ebuild
deleted file mode 100644
index 2e5c81b5b2db..000000000000
--- a/dev-python/regex/regex-2024.4.28.ebuild
+++ /dev/null
@@ -1,37 +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
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.5.10.ebuild b/dev-python/regex/regex-2024.5.10.ebuild
deleted file mode 100644
index 39e9de8e2592..000000000000
--- a/dev-python/regex/regex-2024.5.10.ebuild
+++ /dev/null
@@ -1,37 +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
-# pypy isn't supported upstream because of its UTF8 representation for strings
-# See https://github.com/mrabarnett/mrab-regex/issues/521#issuecomment-1936260187.
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://github.com/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2024.5.15.ebuild b/dev-python/regex/regex-2024.5.15.ebuild
index fccf4ad1f018..abfda93950b1 100644
--- a/dev-python/regex/regex-2024.5.15.ebuild
+++ b/dev-python/regex/regex-2024.5.15.ebuild
@@ -22,11 +22,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
 distutils_enable_tests unittest
 
 python_install_all() {
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 8ad0d6307452..f1832dd36a7b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,3 @@
-DIST setuptools-69.0.3.tar.gz 2219609 BLAKE2B 1a5e7896c7ea82d51b0aa4794435b9899cef871f6ae43d22ae5e08c57d87b70641f3f2abfcc29956a3de515f90b112fd61d3daf793474b4cf33f8567e3a38f4a SHA512 11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d
-DIST setuptools-69.5.1.tar.gz 2291314 BLAKE2B 3756dd587136c7e688bdfecf4c0434c0e799f50f9a9a95750d41cb75e26b613b3dc178f43a9e0d21f17c42a7c4ad7461e7986966aefb814e3d0ff05178c82542 SHA512 81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a
 DIST setuptools-70.0.0.tar.gz 2265182 BLAKE2B 436189fbd614473c42a08da75837c5bb2f6fb6bc03bfc9b99db22810fa043fb071c2344659125439d507d10354d42ea5b703e91c0572caad90f5d805eca9ee8d SHA512 13a5ac09401165dc36d2a365c0ea236c01153374c002b062c4b403a537157ce86593848e93e3c26f5c81f5783e43e6aa96d813f9a39a55732ea3911ddc5c337a
 DIST setuptools-70.1.1.tar.gz 2292324 BLAKE2B 9d489117a80ef9cefab6b730680a614d990f338aa54579928bafbe3c87dbb5e4db8527b8a0b6c1090bcd3504be97cc69a9ce979e593d0634d9b66b66bccb25e5 SHA512 63452aa1e1d1dea6ad622a21fcc9334bc3603e45de9a1485f79776e02a0fb3b0a0a8b3e886af73845c3c373348c7021f2e06a5665676e9015ee9855441512136
 DIST setuptools-70.2.0.tar.gz 2332711 BLAKE2B d552e3c7fb8bad3829b6c210827af2a3993afa7c534502d08cb7f87df846f9939b75ce181217c673be7a0c71e81ede437b5f44cf9a42ff13133a9f922e426c1d SHA512 a2b0aaf57d012326475ee7637e65ebbc3b1a09b338850e8b0c6a0f169c49651f934c813d6d347ba1ff04894a4d8341bb5fedbea35d45dbc19f317587bbb35094
diff --git a/dev-python/setuptools/files/setuptools-69.5.1-py313.patch b/dev-python/setuptools/files/setuptools-69.5.1-py313.patch
deleted file mode 100644
index 7222d3dba266..000000000000
--- a/dev-python/setuptools/files/setuptools-69.5.1-py313.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c6266e423fa26aafa01f1df71de7c6613273155e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 14 May 2024 16:24:07 +0200
-Subject: [PATCH] Make the validation test for entry-points work with Python
- 3.13+
-
-The exception in importlib.metadata has changed.
-See https://github.com/python/importlib_metadata/issues/488
-
-This makes an existing test pass with Python 3.13.
-
-Partially fixes https://github.com/pypa/setuptools/issues/4196
----
- setuptools/_entry_points.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setuptools/_entry_points.py b/setuptools/_entry_points.py
-index 747a69067e..b244e78387 100644
---- a/setuptools/_entry_points.py
-+++ b/setuptools/_entry_points.py
-@@ -17,7 +17,8 @@ def ensure_valid(ep):
-     """
-     try:
-         ep.extras
--    except AttributeError as ex:
-+    except (AttributeError, AssertionError) as ex:
-+        # Why both? See https://github.com/python/importlib_metadata/issues/488
-         msg = (
-             f"Problems to parse {ep}.\nPlease ensure entry-point follows the spec: "
-             "https://packaging.python.org/en/latest/specifications/entry-points/"
diff --git a/dev-python/setuptools/setuptools-69.0.3-r1.ebuild b/dev-python/setuptools/setuptools-69.0.3-r1.ebuild
deleted file mode 100644
index f003f0b98705..000000000000
--- a/dev-python/setuptools/setuptools-69.0.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!!<dev-python/setuptools-rust-1.8.0
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-	)
-
-	local EPYTEST_XDIST=1
-	epytest -o tmp_path_retention_policy=all setuptools
-}
diff --git a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild b/dev-python/setuptools/setuptools-69.5.1-r1.ebuild
deleted file mode 100644
index 74a7ce30f451..000000000000
--- a/dev-python/setuptools/setuptools-69.5.1-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# check */_vendor/vendored.txt
-RDEPEND="
-	!!<dev-python/setuptools-rust-1.8.0
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/tomli[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-		' python3_10 pypy3)
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-
-		# https://github.com/pypa/setuptools/pull/4357
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# Internet, sigh
-		setuptools/tests/test_integration.py
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# TODO
-				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_distutils_command_dep
-				setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_transitive_extra_dependency
-			)
-	esac
-
-	local EPYTEST_XDIST=1
-	epytest -o tmp_path_retention_policy=all setuptools
-}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index e27517390d0b..e42564b8ef6b 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,2 +1 @@
-DIST watchdog-4.0.0.tar.gz 126415 BLAKE2B 59cba81d705031b89b6cd0a92959cd714ec701c4b986446fb7946898b9df1389734bc7eb7521d5af2df5a1a5e31b2f1dc436ca603b8f70313e99ad2abf0e9922 SHA512 ba1beafe292b52b4628eb570b05d816faffe09acd3b63bc50d986cf04f3c7b4fa9c1ebe5c99a10c0723b5604cfdcbd0c09a17507196a32b8fddeeb46faccf4dd
 DIST watchdog-4.0.1.tar.gz 126583 BLAKE2B fb2499181b466d50e46b4cc18f78bbee0234d4ca533e92d006411475b6795a90e184335a8523d6b08dbf40d65c4c7807484791d6f243206d046dfad7139bd797 SHA512 0d759d1f9e97a6bc4b5578dbee5cdee01fc3a0f684ac1cb9e3f14c9b5f9a1353b992d690e3ac9801d73f2425b48b1320b20ee0b4d1101f0e80a9f6a7a25da01d
diff --git a/dev-python/watchdog/watchdog-4.0.0.ebuild b/dev-python/watchdog/watchdog-4.0.0.ebuild
deleted file mode 100644
index 3b635bc6f00d..000000000000
--- a/dev-python/watchdog/watchdog-4.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# known flaky
-		tests/test_emitter.py::test_close
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 2ffa3c2ab45b..8ba8be0e1f6c 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,3 +1 @@
-DIST zope.interface-6.3.tar.gz 294679 BLAKE2B e70c0581213776a685ff8e208a418f82adc5df2d53cc00316e38621dfa05559836416a897366cf7df76784405490c3cb137ff48d35287812f503a4685e2e75be SHA512 fcc318fd098ca91a4617f2a15123cb727c4ebcdeb56b4e0c59475a55d67afdfeb2f2e2d0fdef462e22236c8733ba2c5982ba72c8e75648be6bf55116f5d39139
 DIST zope.interface-6.4.post2.tar.gz 294539 BLAKE2B c6d892357e2ead04841cc5dde924b560e0cd968d84c607e3d1d2ebd804c2d1fbc764a721e8182ffd373a6339967b5230153e3e4934359028e98a0ad4e26c92a9 SHA512 da53c2136a6057de49374a428e855ad731288e45f27787d255073adb188680cb46a7b493258da01d6bbce5d7c7181306b64eb90609520aab361ac07dfba00d4b
-DIST zope_interface-6.4.tar.gz 293987 BLAKE2B 40eb0fbd56c49c82773d4854f92ba691bf3b68850f443362249c22401b3c0f3859b3adc6768c9fc6c01d9f9435d1fde45bf5dce0a72b69981220424e8a49ef5d SHA512 a76d7235bac040fe0b663eabd7bd993ea9db31e39f3786343ee56aef13c36c036398cd17856f33413d4aa6f4d203c4997c178bea306a05eb9c5da8cb880e02c3
diff --git a/dev-python/zope-interface/zope-interface-6.3.ebuild b/dev-python/zope-interface/zope-interface-6.3.ebuild
deleted file mode 100644
index 372d1383f4cd..000000000000
--- a/dev-python/zope-interface/zope-interface-6.3.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="
-	https://github.com/zopefoundation/zope.interface/
-	https://pypi.org/project/zope.interface/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!dev-python/namespace-zope
-"
-BDEPEND="
-	test? (
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -e "/'setuptools'/d" -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-interface/zope-interface-6.4.ebuild b/dev-python/zope-interface/zope-interface-6.4.ebuild
deleted file mode 100644
index c2ed63217d8c..000000000000
--- a/dev-python/zope-interface/zope-interface-6.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interfaces for Python"
-HOMEPAGE="
-	https://github.com/zopefoundation/zope.interface/
-	https://pypi.org/project/zope.interface/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!dev-python/namespace-zope
-"
-BDEPEND="
-	test? (
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -e "/'setuptools'/d" -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}