From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 30 Nov 2019 10:47:55 +0000 (+0100)
Subject: python-single-r1.eclass: Use new-style flags for python-exec dep
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9c4fe911d04d36d390786f1b9cecbbf60f10532a;p=gentoo.git

python-single-r1.eclass: Use new-style flags for python-exec dep

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>
---

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index ad7e39558cf1..f042bf4e1167 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -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?)!"