4 files changed, 95 insertions, 269 deletions
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index 0b7fb30f667a..bf8a554c4cb8 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,3 +1,2 @@
-DIST pdm-2.23.0.tar.gz 2648692 BLAKE2B aba0a73dbf6a34636144bf35e04226d8b11cc4e54f22c8c15f486424d564aa59161662477d0f740ed489382dfd7d95b743f4a548059c67dccb1caef4588d6db7 SHA512 47b17fcd23ead47886359f34eeb73783688349339efa00af709f740eefe9722d3313baea9ba479892dad9bc67ff85ec8b94d790f15cc9ab5a8322a09711ed0ff
-DIST pdm-2.23.1.tar.gz 2650012 BLAKE2B 02e5189aa83425aca6f23091bb4596498302375915772aa770b69563fe4d4218d92059daceae3df7e528136b1d4f733e116efcba98e1477e5ad848fb8ecb0b1a SHA512 857367c90e6d92c2d7cb5143c9a9bcf4ea5402a2ef1334efca259ec079f97e4b87da1c1a86cd736e8ec4d8c69c80da9c3ca1c5413c72d431be96ba85c914662c
 DIST pdm-2.24.0.tar.gz 2655682 BLAKE2B 8c84f15e319308c1c05b74e9a2594c69f6b923cd3ba1ecf303444eab48ca205d26621991cbf1b47e26358f499cbb9d2d9cb527593fcd3fd5d53327f3880d71b4 SHA512 a0308e747e723a1a855d4973d0457d63cc8a9e19ecaf0266b75c5f39f27e0326911e942b5a72808752924ad28de07ef7541f35c5cf29a730738662981e9cdb08
+DIST pdm-2.24.1.tar.gz 2655876 BLAKE2B 557a1a8dac5fe2770a46f9f9baf17ee334795c88f17347924b5450dd681ac90da8c13f184020ee1d200d3d41bc91a6dadde98c210f3a7707c2ee8c83418b917c SHA512 5e41ffeeb8ebf431c840b156caa72e86c22313589f31430258c5002508cb9956f2bbf723c168697721bedb79af7d90bed54a00d53ad1a226f613324830a32146
diff --git a/dev-python/pdm/pdm-2.23.0.ebuild b/dev-python/pdm/pdm-2.23.0.ebuild
deleted file mode 100644
index 281b11e31d7b..000000000000
--- a/dev-python/pdm/pdm-2.23.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.0[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/uv
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		'tests/resolver/test_resolve.py::test_resolve_local_artifacts[sdist]'
-		'tests/resolver/test_resolve.py::test_resolve_two_extras_from_the_same_package'
-		'tests/resolver/test_resolve.py::test_resolve_file_req_with_prerelease'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock
-}
diff --git a/dev-python/pdm/pdm-2.23.1.ebuild b/dev-python/pdm/pdm-2.23.1.ebuild
deleted file mode 100644
index 1f41e18bcec7..000000000000
--- a/dev-python/pdm/pdm-2.23.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
-HOMEPAGE="
-	https://pdm-project.org/
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/dep-logic-0.4.4[${PYTHON_USEDEP}]
-	<dev-python/findpython-1[${PYTHON_USEDEP}]
-	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
-	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	>=dev-python/id-1.5.0[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
-	>=dev-python/unearth-0.17.5[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/uv
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unpin deps
-	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		'tests/cli/test_build.py::test_build_with_no_isolation[False]'
-		tests/test_project.py::test_access_index_with_auth
-		"tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]"
-		tests/cli/test_others.py::test_build_distributions
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
-		'tests/models/test_candidates.py::test_expand_project_root_in_url[-e file:///${PROJECT_ROOT}/tests/fixtures/projects/demo-#-with-hash#egg=demo]'
-		tests/models/test_candidates.py::test_find_candidates_from_find_links
-		tests/cli/test_build.py::test_build_single_module
-		tests/cli/test_build.py::test_build_single_module_with_readme
-		tests/cli/test_build.py::test_build_package
-		tests/cli/test_build.py::test_build_src_package
-		tests/cli/test_build.py::test_build_package_include
-		tests/cli/test_build.py::test_build_src_package_by_include
-		tests/cli/test_build.py::test_build_with_config_settings
-		tests/cli/test_build.py::test_cli_build_with_config_settings
-		tests/cli/test_build.py::test_build_ignoring_pip_environment
-		tests/cli/test_others.py::test_show_self_package
-		tests/cli/test_publish.py::test_publish_and_build_in_one_run
-		"tests/cli/test_hooks.py::test_hooks[build]"
-		"tests/cli/test_hooks.py::test_hooks[publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[build-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_publish]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-pre_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_build]"
-		"tests/cli/test_hooks.py::test_skip_option_from_signal[publish-post_publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:all-publish]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-build]"
-		"tests/cli/test_hooks.py::test_skip_all_option_from_signal[:pre,:post-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[pre-publish]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-build]"
-		"tests/cli/test_hooks.py::test_skip_pre_post_option_from_signal[post-publish]"
-		"tests/cli/test_venv.py::test_conda_backend_create[True]"
-		"tests/cli/test_venv.py::test_conda_backend_create[False]"
-		tests/cli/test_lock.py::test_lock_all_with_excluded_groups
-		'tests/resolver/test_resolve.py::test_resolve_local_artifacts[sdist]'
-		'tests/resolver/test_resolve.py::test_resolve_two_extras_from_the_same_package'
-		'tests/resolver/test_resolve.py::test_resolve_file_req_with_prerelease'
-		# hangs on interactive keyring prompts
-		tests/cli/test_config.py::test_repository_overwrite_default
-		tests/cli/test_config.py::test_hide_password_in_output_repository
-		tests/cli/test_config.py::test_hide_password_in_output_pypi
-		# junk output, sigh
-		tests/cli/test_others.py::test_info_command_json
-		# why does it try to use python 2.7?!
-		tests/cli/test_run.py::test_import_another_sitecustomize
-		# fails in tinderbox (bug #928964)
-		tests/test_project.py::test_project_packages_path
-		# i guess doesn't expect some dep to be present
-		tests/cli/test_build.py::test_build_with_no_isolation
-	)
-	[[ ${EPYTHON} != python3.10 ]] && EPYTEST_DESELECT+=(
-		# test seems hardcoded to 3.10
-		tests/test_project.py::test_project_packages_path
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest  -m "not network and not integration and not path" \
-		-p pytest_mock -p pytest_httpx
-}
diff --git a/dev-python/pdm/pdm-2.24.1.ebuild b/dev-python/pdm/pdm-2.24.1.ebuild
new file mode 100644
index 000000000000..ae9262e9b3fe
--- /dev/null
+++ b/dev-python/pdm/pdm-2.24.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python package and dependency manager supporting the latest PEP standards"
+HOMEPAGE="
+	https://pdm-project.org/
+	https://github.com/pdm-project/pdm/
+	https://pypi.org/project/pdm/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/dep-logic-0.5[${PYTHON_USEDEP}]
+	<dev-python/findpython-1[${PYTHON_USEDEP}]
+	>=dev-python/findpython-0.6.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/hishel-0.0.32[${PYTHON_USEDEP}]
+	>=dev-python/httpcore-1.0.6[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	>=dev-python/id-1.5.0[${PYTHON_USEDEP}]
+	dev-python/installer[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pbs-installer-2024.4.18[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.1[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	>=dev-python/truststore-0.9[${PYTHON_USEDEP}]
+	>=dev-python/unearth-0.17.5[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/uv
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# https://github.com/pdm-project/pdm/issues/3486
+		"${FILESDIR}/${PN}-2.24.0-respect-python.patch"
+	)
+
+	distutils-r1_src_prepare
+
+	# unpin deps
+	sed -i -e 's:,<[0-9.a]*::' pyproject.toml || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		# https://github.com/pdm-project/pdm/pull/3488
+		# (the third one I can't reproduce)
+		tests/models/test_candidates.py::test_find_candidates_from_find_links
+		'tests/test_project.py::test_find_interpreters_with_PDM_IGNORE_ACTIVE_VENV[True]'
+		'tests/models/test_candidates.py::test_expand_project_root_in_url[demo @ file:///${PROJECT_ROOT}/tests/fixtures/artifacts/demo-0.0.1.tar.gz]'
+
+		# unhappy about extra packages being installed?
+		# (also fails randomly in venv)
+		tests/cli/test_build.py::test_build_with_no_isolation
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest  -m "not network and not integration and not path" \
+		-p pytest_mock -p pytest_httpx -p pytest_httpserver
+}