| 1 |
commit: 0c2d62f8854dc3409e9fcd2c351fa66ada6d6691 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 20 09:28:13 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 23 21:44:24 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2d62f8 |
| 7 |
|
| 8 |
distutils-r1.eclass: Require >=pyproject2setuppy-15 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/distutils-r1.eclass | 5 ++--- |
| 13 |
1 file changed, 2 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 16 |
index d7a476f4858..1446d2cda74 100644 |
| 17 |
--- a/eclass/distutils-r1.eclass |
| 18 |
+++ b/eclass/distutils-r1.eclass |
| 19 |
@@ -129,7 +129,7 @@ _distutils_set_globals() { |
| 20 |
rdep+=" ${setuptools_dep}" |
| 21 |
;; |
| 22 |
pyproject.toml) |
| 23 |
- bdep+=' dev-python/pyproject2setuppy[${PYTHON_USEDEP}]' |
| 24 |
+ bdep+=' >=dev-python/pyproject2setuppy-15[${PYTHON_USEDEP}]' |
| 25 |
;; |
| 26 |
*) |
| 27 |
die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" |
| 28 |
@@ -465,8 +465,7 @@ esetup.py() { |
| 29 |
|
| 30 |
local setup_py=( setup.py ) |
| 31 |
if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then |
| 32 |
- # TODO: remove '.main' when we require v10 |
| 33 |
- setup_py=( -m pyproject2setuppy.main ) |
| 34 |
+ setup_py=( -m pyproject2setuppy ) |
| 35 |
fi |
| 36 |
|
| 37 |
if [[ ${EAPI} != [67] && ${mydistutilsargs[@]} ]]; then |
Archives