[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     715da0fdbbe67cf6952831af4cf04d86d6d8b78b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 17:01:04 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 09:36:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=715da0fd

distutils-r1.eclass: Run pdm.pep517.api via pdm-backend

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e4b17c433e5d..16d97501012b 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -124,8 +124,6 @@ esac
 #
 # - pbr - pbr backend
 #
-# - pdm - pdm.pep517 backend
-#
 # - pdm-backend - pdm.backend backend
 #
 # - poetry - poetry-core backend
@@ -257,11 +255,6 @@ _distutils_set_globals() {
                                        >=dev-python/pbr-6.0.0[${PYTHON_USEDEP}]
                                '
                                ;;
-                       pdm)
-                               bdep+='
-                                       
>=dev-python/pdm-pep517-1.1.4[${PYTHON_USEDEP}]
-                               '
-                               ;;
                        pdm-backend)
                                bdep+='
                                        
>=dev-python/pdm-backend-2.1.8[${PYTHON_USEDEP}]
@@ -1002,12 +995,6 @@ _distutils-r1_print_package_versions() {
                                        dev-python/wheel
                                )
                                ;;
-                       pdm)
-                               packages+=(
-                                       dev-python/pdm-pep517
-                                       dev-python/setuptools
-                               )
-                               ;;
                        pdm-backend)
                                packages+=(
                                        dev-python/pdm-backend
@@ -1214,12 +1201,9 @@ _distutils-r1_backend_to_key() {
                pbr.build)
                        echo pbr
                        ;;
-               pdm.backend)
+               pdm.backend|pdm.pep517.api)
                        echo pdm-backend
                        ;;
-               pdm.pep517.api)
-                       echo pdm
-                       ;;
                poetry.core.masonry.api|poetry.masonry.api)
                        echo poetry
                        ;;
@@ -1280,6 +1264,9 @@ _distutils-r1_get_backend() {
                        flit.buildapi)
                                new_backend=flit_core.buildapi
                                ;;
+                       pdm.pep517.api)
+                               new_backend=pdm.backend
+                               ;;
                        poetry.masonry.api)
                                new_backend=poetry.core.masonry.api
                                ;;