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

[Michał Górny]

commit:     25d4b5e701068b6849b11ab25446235b49ffa10b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 18:59:27 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 18:33:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25d4b5e7

distutils-r1.eclass: Move DISTUTILS_OPTIONAL check into set_globals

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

 eclass/distutils-r1.eclass | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 8942a6149c93..4a9fdb4018b4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -213,15 +213,17 @@ _distutils_set_globals() {
                [[ -n ${rdep} ]] && rdep="$(python_gen_cond_dep "${rdep}")"
        fi
 
-       RDEPEND="${PYTHON_DEPS} ${rdep}"
-       if [[ ${EAPI} != 6 ]]; then
-               BDEPEND="${PYTHON_DEPS} ${bdep}"
-       else
-               DEPEND="${PYTHON_DEPS} ${bdep}"
+       if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
+               RDEPEND="${PYTHON_DEPS} ${rdep}"
+               if [[ ${EAPI} != 6 ]]; then
+                       BDEPEND="${PYTHON_DEPS} ${bdep}"
+               else
+                       DEPEND="${PYTHON_DEPS} ${bdep}"
+               fi
+               REQUIRED_USE=${PYTHON_REQUIRED_USE}
        fi
-       REQUIRED_USE=${PYTHON_REQUIRED_USE}
 }
-[[ ! ${DISTUTILS_OPTIONAL} ]] && _distutils_set_globals
+_distutils_set_globals
 unset -f _distutils_set_globals
 
 # @ECLASS-VARIABLE: PATCHES