python-single-r1.eclass: Use new-style flags for python-exec dep
authorMichał Górny <mgorny@gentoo.org>
Sat, 30 Nov 2019 10:47:55 +0000 (11:47 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sat, 7 Dec 2019 14:36:31 +0000 (15:36 +0100)
Depend on PYTHON_TARGETS directly in dev-lang/python-exec dep,
instead of relying on old-style PYTHON_USEDEP.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
eclass/python-single-r1.eclass

index ad7e39558cf162e9f55b19065cfcf618f9642334..f042bf4e11676b8cef62c16a44f7bee588479e4d 100644 (file)
@@ -250,15 +250,16 @@ _python_single_set_globals() {
                requse+=" python_single_target_${i}? ( python_targets_${i} )"
 
                python_export "${i}" PYTHON_PKG_DEP
-               deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
+               # 1) well, python-exec would suffice as an RDEP
+               # but no point in making this overcomplex, BDEP doesn't hurt anyone
+               # 2) python-exec should be built with all targets forced anyway
+               # but if new targets were added, we may need to force a rebuild
+               deps+="python_single_target_${i}? (
+                       ${PYTHON_PKG_DEP}
+                       >=dev-lang/python-exec-2:=[python_targets_${i}]
+               ) "
        done
 
-       # 1) well, python-exec would suffice as an RDEP
-       # but no point in making this overcomplex, BDEP doesn't hurt anyone
-       # 2) python-exec should be built with all targets forced anyway
-       # but if new targets were added, we may need to force a rebuild
-       deps+=">=dev-lang/python-exec-2:=[${usedep}]"
-
        if [[ ${PYTHON_DEPS+1} ]]; then
                if [[ ${PYTHON_DEPS} != "${deps}" ]]; then
                        eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!"