3 files changed, 10 insertions, 72 deletions
diff --git a/dev-python/pdm/Manifest b/dev-python/pdm/Manifest
index 86ab50f5224f..e2d724b4af9e 100644
--- a/dev-python/pdm/Manifest
+++ b/dev-python/pdm/Manifest
@@ -1,2 +1 @@
-DIST pdm-2.4.9.tar.gz 2883026 BLAKE2B f9b481562d257f54f67d768cb40d6371f97a38880cc4f30e2a8615bdc75baf050301df97ed95c66c2553919d36cac5111b7d8c0efad362e97925fc8064a876fb SHA512 1a8952c99e408c7a37d3f3f1e3655cfbe8674e323a21501cdfe7740580ddb8b854b69c9bec46d091027fe16a310929f58e43c26d28e10a5d0f3a81c356edd1fe
-DIST pdm-2.5.1.tar.gz 3050818 BLAKE2B bd450e7e1cde0820180910f1ff8a021db1dbf490af3b83cdf56d81ba2082544439257ce51db9b78dd9e5d00f9c17289e4a7d844873220acd631972bd7bf0ee9c SHA512 f91aeda2eb888624e028e041592b981ceff935553623bef770af15e06f57db44c5a0aa12eab07dc6404c6374e03793ea1e82532175cb6b396962cc4b590d132d
+DIST pdm-2.5.4.tar.gz 3051088 BLAKE2B 717867fe16bdb02efb41136360afe9d7bd06c1706e30014a0a6f66ee69a676461d86f0efe726d6b2002290fb45c1623e92a7614efd7d15742479187c399afc6a SHA512 0a3d1ae42d1541ce458c77ef2bce41564c000fc599ee596aec25d6153d40723595fd0fa1170d7ece6bf24055670030556582b043505d45484acc99052192c063
diff --git a/dev-python/pdm/pdm-2.4.9.ebuild b/dev-python/pdm/pdm-2.4.9.ebuild
deleted file mode 100644
index 356c61d2932a..000000000000
--- a/dev-python/pdm/pdm-2.4.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 pypi
-
-DESCRIPTION="Modern Python package and dependency manager supporting latest PEP standards"
-HOMEPAGE="
-	https://github.com/pdm-project/pdm/
-	https://pypi.org/project/pdm/
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-	dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/unearth[${PYTHON_USEDEP}]
-	dev-python/findpython[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/python-dotenv[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-1.0.0[${PYTHON_USEDEP}]
-	dev-python/installer[${PYTHON_USEDEP}]
-	dev-python/cachecontrol[${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-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion bash > completion.bash || die
-	PDM_CHECK_UPDATE=0 "${EPYTHON}" -m pdm completion zsh > completion.zsh || die
-}
-
-python_test() {
-	epytest -m "not network"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pdm
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pdm
-}
diff --git a/dev-python/pdm/pdm-2.5.1.ebuild b/dev-python/pdm/pdm-2.5.4.ebuild
index 4862a6f008e3..9b7b24b0adf9 100644
--- a/dev-python/pdm/pdm-2.5.1.ebuild
+++ b/dev-python/pdm/pdm-2.5.4.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/platformdirs[${PYTHON_USEDEP}]
 	dev-python/rich[${PYTHON_USEDEP}]
@@ -61,6 +62,14 @@ python_compile_all() {
 }
 
 python_test() {
+	local EPYTEST_DESELECT=()
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/cli/test_others.py::test_build_distributions
+		tests/models/test_candidates.py::test_expand_project_root_in_url
+	)
+
 	epytest -m "not network"
 }