From 0c2d62f8854dc3409e9fcd2c351fa66ada6d6691 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 20 Jun 2021 11:28:13 +0200 Subject: distutils-r1.eclass: Require >=pyproject2setuppy-15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- 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 d7a476f48586..1446d2cda749 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 -- cgit v1.2.3-65-gdbad