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

[Michał Górny]

commit:     0c2d62f8854dc3409e9fcd2c351fa66ada6d6691
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 09:28:13 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:44:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2d62f8

distutils-r1.eclass: Require >=pyproject2setuppy-15

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

 eclass/distutils-r1.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index d7a476f4858..1446d2cda74 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -129,7 +129,7 @@ _distutils_set_globals() {
                        rdep+=" ${setuptools_dep}"
                        ;;
                pyproject.toml)
-                       bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]'
+                       bdep+=' 
>=dev-python/pyproject2setuppy-15[${PYTHON_USEDEP}]'
                        ;;
                *)
                        die "Invalid 
DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
@@ -465,8 +465,7 @@ esetup.py() {
 
        local setup_py=( setup.py )
        if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then
-               # TODO: remove '.main' when we require v10
-               setup_py=( -m pyproject2setuppy.main )
+               setup_py=( -m pyproject2setuppy )
        fi
 
        if [[ ${EAPI} != [67] && ${mydistutilsargs[@]} ]]; then