Adding metadata

17 files changed, 369 insertions, 45 deletions

diff --git a/dev-python/execnet/execnet-2.1.1.ebuild b/dev-python/execnet/execnet-2.1.1.ebuild
index 976c235e719a..818ac33a7075 100644
--- a/dev-python/execnet/execnet-2.1.1.ebuild
+++ b/dev-python/execnet/execnet-2.1.1.ebuild
@@ -27,6 +27,17 @@ distutils_enable_sphinx doc
 distutils_enable_tests pytest
 
 python_test() {
+	local EPYTEST_DESELECT=()
+
+	case ${EPYTHON} in
+		python3.13t)
+			EPYTEST_DESELECT+=(
+				# https://github.com/pytest-dev/execnet/issues/306
+				testing/test_channel.py::TestChannelBasicBehaviour::test_channel_callback_remote_freed
+			)
+			;;
+	esac
+
 	# the test suite checks if bytecode writing can be disabled/enabled
 	local -x PYTHONDONTWRITEBYTECODE=
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/executing/executing-2.1.0-r1.ebuild b/dev-python/executing/executing-2.1.0-r1.ebuild
index 644f723bd1fe..7ecca0fd70be 100644
--- a/dev-python/executing/executing-2.1.0-r1.ebuild
+++ b/dev-python/executing/executing-2.1.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/freezegun-1.5.1.ebuild b/dev-python/freezegun/freezegun-1.5.1.ebuild
index d858d7232a52..d98c9f2528db 100644
--- a/dev-python/freezegun/freezegun-1.5.1.ebuild
+++ b/dev-python/freezegun/freezegun-1.5.1.ebuild
@@ -32,7 +32,7 @@ distutils_enable_tests pytest
 python_test() {
 	local EPYTEST_DESELECT=()
 	case ${EPYTHON} in
-		python3.13)
+		python3.13*)
 			EPYTEST_DESELECT+=(
 				# https://github.com/spulec/freezegun/issues/547
 				tests/test_datetimes.py::TestUnitTestMethodDecorator::test_method_decorator_works_on_unittest_kwarg_frozen_time
diff --git a/dev-python/pexpect/files/pexpect-4.9.0-py313.patch b/dev-python/pexpect/files/pexpect-4.9.0-py313.patch
new file mode 100644
index 000000000000..838cfdd22d86
--- /dev/null
+++ b/dev-python/pexpect/files/pexpect-4.9.0-py313.patch
@@ -0,0 +1,37 @@
+From 95d09c54d2502d8d48f2da591089ceb6d09df056 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 29 May 2024 12:21:52 +0200
+Subject: [PATCH] Force NO_COLOR=1 to fix test failures with Python 3.13+ REPL
+
+Python 3.13+ has colors now. Always setting this variable should be safe.
+---
+ pexpect/replwrap.py    | 2 +-
+ tests/test_replwrap.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pexpect/replwrap.py b/pexpect/replwrap.py
+index 08dbd5e8..c8714a23 100644
+--- a/pexpect/replwrap.py
++++ b/pexpect/replwrap.py
+@@ -35,7 +35,7 @@ def __init__(self, cmd_or_spawn, orig_prompt, prompt_change,
+                  continuation_prompt=PEXPECT_CONTINUATION_PROMPT,
+                  extra_init_cmd=None):
+         if isinstance(cmd_or_spawn, basestring):
+-            self.child = pexpect.spawn(cmd_or_spawn, echo=False, encoding='utf-8')
++            self.child = pexpect.spawn(cmd_or_spawn, echo=False, encoding='utf-8', env={'NO_COLOR': '1'})
+         else:
+             self.child = cmd_or_spawn
+         if self.child.echo:
+diff --git a/tests/test_replwrap.py b/tests/test_replwrap.py
+index ddafa5d6..5ac782a4 100644
+--- a/tests/test_replwrap.py
++++ b/tests/test_replwrap.py
+@@ -124,7 +124,7 @@ def test_no_change_prompt(self):
+         if platform.python_implementation() == 'PyPy':
+             raise unittest.SkipTest(skip_pypy)
+ 
+-        child = pexpect.spawn(sys.executable, echo=False, timeout=5, encoding='utf-8')
++        child = pexpect.spawn(sys.executable, echo=False, timeout=5, encoding='utf-8', env={'NO_COLOR': '1'})
+         # prompt_change=None should mean no prompt change
+         py = replwrap.REPLWrapper(child, u">>> ", prompt_change=None,
+                                   continuation_prompt=u"... ")
diff --git a/dev-python/pexpect/pexpect-4.9.0.ebuild b/dev-python/pexpect/pexpect-4.9.0.ebuild
index a13dad16dd62..7c556949490d 100644
--- a/dev-python/pexpect/pexpect-4.9.0.ebuild
+++ b/dev-python/pexpect/pexpect-4.9.0.ebuild
@@ -29,6 +29,11 @@ distutils_enable_tests pytest
 distutils_enable_sphinx doc \
 	dev-python/sphinxcontrib-github-alt
 
+PATCHES=(
+	# https://github.com/pexpect/pexpect/pull/794
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -47,16 +52,6 @@ python_test() {
 		tests/test_env.py::TestCaseEnv::test_spawn_uses_env
 	)
 
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# TODO: changes in python3.13's prompt?
-				tests/test_replwrap.py::REPLWrapTestCase::test_python
-				tests/test_replwrap.py::REPLWrapTestCase::test_no_change_prompt
-			)
-			;;
-	esac
-
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest
 }
diff --git a/dev-python/psutil/files/psutil-6.0.0-py313t.patch b/dev-python/psutil/files/psutil-6.0.0-py313t.patch
new file mode 100644
index 000000000000..1cdc63ed406e
--- /dev/null
+++ b/dev-python/psutil/files/psutil-6.0.0-py313t.patch
@@ -0,0 +1,190 @@
+From 5c0c0893c7565a39f1ac3f9c286fd1e1c58a7cd6 Mon Sep 17 00:00:00 2001
+From: Sam Gross <colesbury@gmail.com>
+Date: Mon, 24 Jun 2024 17:51:07 +0000
+Subject: [PATCH 1/2] Fix GIL warnings and a few thread-safety issues in
+ free-threaded CPython
+
+- The temporary `argv` C array is no longer global in OpenBSD's
+  proc_cmdline
+- The `maxcpus` variable is no longer global in FreeBSD's per_cpu_times.
+
+Signed-off-by: Sam Gross <colesbury@gmail.com>
+---
+ psutil/_psutil_aix.c       | 3 +++
+ psutil/_psutil_bsd.c       | 4 ++++
+ psutil/_psutil_linux.c     | 4 ++++
+ psutil/_psutil_osx.c       | 4 ++++
+ psutil/_psutil_posix.c     | 4 ++++
+ psutil/_psutil_sunos.c     | 4 ++++
+ psutil/_psutil_windows.c   | 4 ++++
+ psutil/arch/freebsd/cpu.c  | 2 +-
+ psutil/arch/openbsd/proc.c | 4 +++-
+ 9 files changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/psutil/_psutil_aix.c b/psutil/_psutil_aix.c
+index ce89a7bd7c..42f921188e 100644
+--- a/psutil/_psutil_aix.c
++++ b/psutil/_psutil_aix.c
+@@ -1080,6 +1080,9 @@ void init_psutil_aix(void)
+     PyObject *module = PyModule_Create(&moduledef);
+ #else
+     PyObject *module = Py_InitModule("_psutil_aix", PsutilMethods);
++#endif
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
+ #endif
+     PyModule_AddIntConstant(module, "version", PSUTIL_VERSION);
+ 
+diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c
+index 6517d5800a..facaba831f 100644
+--- a/psutil/_psutil_bsd.c
++++ b/psutil/_psutil_bsd.c
+@@ -143,6 +143,10 @@ static PyMethodDef mod_methods[] = {
+     if (mod == NULL)
+         INITERR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
++#endif
++
+     if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
+     // process status constants
+ 
+diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c
+index 292e1c5524..46244c5792 100644
+--- a/psutil/_psutil_linux.c
++++ b/psutil/_psutil_linux.c
+@@ -78,6 +78,10 @@ static PyMethodDef mod_methods[] = {
+     if (mod == NULL)
+         INITERR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
++#endif
++
+     if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
+     if (PyModule_AddIntConstant(mod, "DUPLEX_HALF", DUPLEX_HALF)) INITERR;
+     if (PyModule_AddIntConstant(mod, "DUPLEX_FULL", DUPLEX_FULL)) INITERR;
+diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c
+index 4aa11d1700..09fa267a98 100644
+--- a/psutil/_psutil_osx.c
++++ b/psutil/_psutil_osx.c
+@@ -91,6 +91,10 @@ static PyMethodDef mod_methods[] = {
+     if (mod == NULL)
+         INITERR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
++#endif
++
+     if (psutil_setup() != 0)
+         INITERR;
+ 
+diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c
+index 24628afc78..8ced7beaac 100644
+--- a/psutil/_psutil_posix.c
++++ b/psutil/_psutil_posix.c
+@@ -913,6 +913,10 @@ static PyMethodDef mod_methods[] = {
+     if (mod == NULL)
+         INITERR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(mod, Py_MOD_GIL_NOT_USED);
++#endif
++
+ #if defined(PSUTIL_BSD) || \
+         defined(PSUTIL_OSX) || \
+         defined(PSUTIL_SUNOS) || \
+diff --git a/psutil/_psutil_sunos.c b/psutil/_psutil_sunos.c
+index 54f353c106..d21f59c618 100644
+--- a/psutil/_psutil_sunos.c
++++ b/psutil/_psutil_sunos.c
+@@ -1721,6 +1721,10 @@ void init_psutil_sunos(void)
+     if (module == NULL)
+         INITERROR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
++#endif
++
+     if (psutil_setup() != 0)
+         INITERROR;
+ 
+diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c
+index bb6e12ff80..0c221bdc23 100644
+--- a/psutil/_psutil_windows.c
++++ b/psutil/_psutil_windows.c
+@@ -165,6 +165,10 @@ void init_psutil_windows(void)
+     if (module == NULL)
+         INITERROR;
+ 
++#ifdef Py_GIL_DISABLED
++    PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
++#endif
++
+     if (psutil_setup() != 0)
+         INITERROR;
+     if (psutil_set_se_debug() != 0)
+diff --git a/psutil/arch/freebsd/cpu.c b/psutil/arch/freebsd/cpu.c
+index a15d96efc1..9fa1a7dbe6 100644
+--- a/psutil/arch/freebsd/cpu.c
++++ b/psutil/arch/freebsd/cpu.c
+@@ -26,7 +26,7 @@ For reference, here's the git history with original(ish) implementations:
+ 
+ PyObject *
+ psutil_per_cpu_times(PyObject *self, PyObject *args) {
+-    static int maxcpus;
++    int maxcpus;
+     int mib[2];
+     int ncpu;
+     size_t len;
+diff --git a/psutil/arch/openbsd/proc.c b/psutil/arch/openbsd/proc.c
+index 96b85bc502..bec2c42ea7 100644
+--- a/psutil/arch/openbsd/proc.c
++++ b/psutil/arch/openbsd/proc.c
+@@ -147,7 +147,7 @@ PyObject *
+ psutil_proc_cmdline(PyObject *self, PyObject *args) {
+     pid_t pid;
+     int mib[4];
+-    static char **argv;
++    char **argv = NULL;
+     char **p;
+     size_t argv_size = 128;
+     PyObject *py_retlist = PyList_New(0);
+@@ -189,9 +189,11 @@ psutil_proc_cmdline(PyObject *self, PyObject *args) {
+         Py_DECREF(py_arg);
+     }
+ 
++    free(argv);
+     return py_retlist;
+ 
+ error:
++    free(argv);
+     Py_XDECREF(py_arg);
+     Py_DECREF(py_retlist);
+     return NULL;
+
+From 69c74c63a322fae4a763bf8347f9e5e3202d5ecf Mon Sep 17 00:00:00 2001
+From: Sam Gross <colesbury@gmail.com>
+Date: Mon, 24 Jun 2024 18:26:00 +0000
+Subject: [PATCH 2/2] Add `if (argv != NULL)` check
+
+Signed-off-by: Sam Gross <colesbury@gmail.com>
+---
+ psutil/arch/openbsd/proc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/psutil/arch/openbsd/proc.c b/psutil/arch/openbsd/proc.c
+index bec2c42ea7..0881ccd555 100644
+--- a/psutil/arch/openbsd/proc.c
++++ b/psutil/arch/openbsd/proc.c
+@@ -193,7 +193,8 @@ psutil_proc_cmdline(PyObject *self, PyObject *args) {
+     return py_retlist;
+ 
+ error:
+-    free(argv);
++    if (argv != NULL)
++        free(argv);
+     Py_XDECREF(py_arg);
+     Py_DECREF(py_retlist);
+     return NULL;
diff --git a/dev-python/psutil/psutil-6.0.0-r1.ebuild b/dev-python/psutil/psutil-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..04f59576c87f
--- /dev/null
+++ b/dev-python/psutil/psutil-6.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+TEST_PATCH=psutil-6.0.0-tests.patch
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="
+	https://github.com/giampaolo/psutil/
+	https://pypi.org/project/psutil/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${WORKDIR}/${TEST_PATCH}"
+)
+
+python_test() {
+	# Since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disabled for CI
+	local -x TRAVIS=1
+	local -x APPVEYOR=1
+	local -x GITHUB_ACTIONS=1
+	local -x GENTOO_TESTING=1
+	"${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# Force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pycpio/pycpio-1.3.2.ebuild b/dev-python/pycpio/pycpio-1.3.2.ebuild
index b61de842d843..458d17730851 100644
--- a/dev-python/pycpio/pycpio-1.3.2.ebuild
+++ b/dev-python/pycpio/pycpio-1.3.2.ebuild
@@ -20,5 +20,5 @@ RDEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
 distutils_enable_tests unittest
 
 python_test() {
-	eunittest tests/
+	eunittest tests
 }
diff --git a/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild b/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
index e7ebb5fda0a5..96023722d2bb 100644
--- a/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.9.0_p0.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_FULLY_TESTED=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
 
 inherit distutils-r1 pypi
 
@@ -28,7 +29,9 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
 	)
 "
 
@@ -45,3 +48,15 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/hypothesis[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/property
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
index 01b06f469758..61fe8ec829d7 100644
--- a/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 pypi
 
 DESCRIPTION="Manage versions by scm tags via setuptools"
 HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
+	https://github.com/pypa/setuptools-scm/
 	https://pypi.org/project/setuptools-scm/
 "
 
diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild
index 880a4d7b908a..04209465f389 100644
--- a/dev-python/six/six-1.16.0-r1.ebuild
+++ b/dev-python/six/six-1.16.0-r1.ebuild
@@ -22,14 +22,14 @@ distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
 
 python_test() {
-	local EPYTEST_DESELECT=()
+	local EPYTEST_DESELECT=(
+		# requires USE=gdb on CPython, no point in forcing the dep
+		# also missing on PyPy
+		'test_six.py::test_move_items[dbm_ndbm]'
+	)
+
 	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'test_six.py::test_move_items[dbm_ndbm]'
-			)
-			;;
-		python3.13)
+		python3.13*)
 			EPYTEST_DESELECT+=(
 				'test_six.py::test_move_items[tkinter_tix]'
 			)
diff --git a/dev-python/wheel/files/wheel-0.44.0-ft.patch b/dev-python/wheel/files/wheel-0.44.0-ft.patch
new file mode 100644
index 000000000000..600318dc275e
--- /dev/null
+++ b/dev-python/wheel/files/wheel-0.44.0-ft.patch
@@ -0,0 +1,38 @@
+From d30f834fcec7ecdbb74e263789db2fbe9ff37e99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 11 Oct 2024 16:12:50 +0200
+Subject: [PATCH] Skip abi3 tests when freethreading Python build is used
+
+Skip the tests using abi3 extension when the freethreading build is
+used, as Python 3.13 freethreading does not support the limited API
+and its use results in a build error.
+
+Fixes #636
+---
+ tests/conftest.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 5ee84da..d5bd356 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -7,6 +7,7 @@ from __future__ import annotations
+ import os.path
+ import subprocess
+ import sys
++import sysconfig
+ 
+ import pytest
+ 
+@@ -22,7 +23,7 @@ def wheels_and_eggs(tmp_path_factory):
+         "unicode.dist",
+     )
+ 
+-    if sys.platform != "win32":
++    if sys.platform != "win32" and sysconfig.get_config_var("Py_GIL_DISABLED") != 1:
+         # ABI3 extensions don't really work on Windows
+         test_distributions += ("abi3extension.dist",)
+ 
+-- 
+2.47.0
+
diff --git a/dev-python/wheel/wheel-0.44.0.ebuild b/dev-python/wheel/wheel-0.44.0.ebuild
index 486e44e988c0..5df530aae951 100644
--- a/dev-python/wheel/wheel-0.44.0.ebuild
+++ b/dev-python/wheel/wheel-0.44.0.ebuild
@@ -36,10 +36,20 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 src_prepare() {
+	local PATCHES=(
+		# https://github.com/pypa/wheel/pull/637
+		"${FILESDIR}/${P}-ft.patch"
+	)
+
+	distutils-r1_src_prepare
+
 	# unbundle packaging
 	rm -r src/wheel/vendored || die
 	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
 	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+}
 
-	distutils-r1_src_prepare
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
 }
diff --git a/dev-python/zenlib/Manifest b/dev-python/zenlib/Manifest
index fd151faa557e..e73b261c36b5 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,4 +1,3 @@
-DIST zenlib-2.1.2.tar.gz 17293 BLAKE2B 3d5067b9796f31d28d0ca04c842b4ef1807e0557a77c5b6ec5798cfa2aa04ee5e7eafa3549df6add4228e7c3014ca33eb1584c0aee6db9c0acc882f170972b36 SHA512 a0a53ed63a3efe83dc8f49fd512685b82ed383494f404072a47734c02a1955e0a4c9a6c9df48503419c82cb7479783669b6de8deef174a597ab73cad61da5c3e
 DIST zenlib-2.2.0.tar.gz 17727 BLAKE2B 073bbaa252ab000a30602e0a603a8293b8c3a322374ad4172758a6c95d52483b03cc84d4b72aa868168bde03796defb3efca85682ca8f7b7fce6243d8112198f SHA512 4b324e1b56d757536a80d4d5fe31d4087ee8e1a0aa1ff8a19a43252033ea6e5115c55c5c6d69bcae8594bc36c84625b75df2ce93a2f49f7b885179aa05b45d80
 DIST zenlib-2.2.4.tar.gz 17734 BLAKE2B 9c054eafaa8a70231f9ffca241aad0fdd49257f77de02d47ca0fed7636c06a95923b1398ce8b11de7e690aa7be6762e4e0576b82edae15977f6f0b20a7c31c10 SHA512 ad1be96b6cd4f46e342e012cbd93b76fd051b7cd2d03d23b0065978b1d0a15a751ad5866322fd69b70890ed18f154355556b9b8402e6f19d17175340c1b5a0d3
 DIST zenlib-2.3.0.gh.tar.gz 20248 BLAKE2B e2e043fd2c61a72d1805bb33d5dfdc6c4eba588d39b08fbab8d89c514b2a5d1d29d93729cfddd330e6e331898167db30f24e874900badf38788e365d04772335 SHA512 fdf9cbe7faa8e7087bf352ef597992a9574fcd821a7ab75a713f520fe18db1fd28379c704ee646a2c28215c4241705de6f27d390f552c56722ec34ade919df3f
diff --git a/dev-python/zenlib/zenlib-2.1.2.ebuild b/dev-python/zenlib/zenlib-2.1.2.ebuild
deleted file mode 100644
index f166aef39d04..000000000000
--- a/dev-python/zenlib/zenlib-2.1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
diff --git a/dev-python/zenlib/zenlib-2.3.0.ebuild b/dev-python/zenlib/zenlib-2.3.0.ebuild
index 6e20c60e172f..86ec550ccfbe 100644
--- a/dev-python/zenlib/zenlib-2.3.0.ebuild
+++ b/dev-python/zenlib/zenlib-2.3.0.ebuild
@@ -22,6 +22,5 @@ KEYWORDS="~amd64 ~arm64"
 distutils_enable_tests unittest
 
 python_test() {
-	cd tests || die
-	eunittest
+	eunittest tests
 }
diff --git a/dev-python/zenlib/zenlib-9999.ebuild b/dev-python/zenlib/zenlib-9999.ebuild
index c29fc71906d8..037a8ec35ee5 100644
--- a/dev-python/zenlib/zenlib-9999.ebuild
+++ b/dev-python/zenlib/zenlib-9999.ebuild
@@ -18,6 +18,5 @@ SLOT="0"
 distutils_enable_tests unittest
 
 python_test() {
-	cd tests || die
-	eunittest
+	eunittest tests
 }