| 1 |
commit: 25d4b5e701068b6849b11ab25446235b49ffa10b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 31 18:59:27 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 1 18:33:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d4b5e7 |
| 7 |
|
| 8 |
distutils-r1.eclass: Move DISTUTILS_OPTIONAL check into set_globals |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/distutils-r1.eclass | 16 +++++++++------- |
| 13 |
1 file changed, 9 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 16 |
index 8942a6149c93..4a9fdb4018b4 100644 |
| 17 |
--- a/eclass/distutils-r1.eclass |
| 18 |
+++ b/eclass/distutils-r1.eclass |
| 19 |
@@ -213,15 +213,17 @@ _distutils_set_globals() { |
| 20 |
[[ -n ${rdep} ]] && rdep="$(python_gen_cond_dep "${rdep}")" |
| 21 |
fi |
| 22 |
|
| 23 |
- RDEPEND="${PYTHON_DEPS} ${rdep}" |
| 24 |
- if [[ ${EAPI} != 6 ]]; then |
| 25 |
- BDEPEND="${PYTHON_DEPS} ${bdep}" |
| 26 |
- else |
| 27 |
- DEPEND="${PYTHON_DEPS} ${bdep}" |
| 28 |
+ if [[ ! ${DISTUTILS_OPTIONAL} ]]; then |
| 29 |
+ RDEPEND="${PYTHON_DEPS} ${rdep}" |
| 30 |
+ if [[ ${EAPI} != 6 ]]; then |
| 31 |
+ BDEPEND="${PYTHON_DEPS} ${bdep}" |
| 32 |
+ else |
| 33 |
+ DEPEND="${PYTHON_DEPS} ${bdep}" |
| 34 |
+ fi |
| 35 |
+ REQUIRED_USE=${PYTHON_REQUIRED_USE} |
| 36 |
fi |
| 37 |
- REQUIRED_USE=${PYTHON_REQUIRED_USE} |
| 38 |
} |
| 39 |
-[[ ! ${DISTUTILS_OPTIONAL} ]] && _distutils_set_globals |
| 40 |
+_distutils_set_globals |
| 41 |
unset -f _distutils_set_globals |
| 42 |
|
| 43 |
# @ECLASS-VARIABLE: PATCHES |
Archives