From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 12 Jun 2016 20:30:39 +0000 (+0200)
Subject: python-any-r1.eclass: Ensure not to emit := in || () deps
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=48fd5f1f3f0bed2ff6dedd20435df54d7520e34c;p=gentoo.git

python-any-r1.eclass: Ensure not to emit := in || () deps
---

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c6dfc9c7aecb..0b49944c5199 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -137,7 +137,8 @@ _python_any_set_globals() {
 	for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
 		python_export "${i}" PYTHON_PKG_DEP
 
-		PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}"
+		# note: need to strip '=' slot operator for || deps
+		PYTHON_DEPS="${PYTHON_PKG_DEP%=} ${PYTHON_DEPS}"
 	done
 	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 	readonly PYTHON_DEPS
@@ -220,7 +221,8 @@ python_gen_any_dep() {
 		python_export "${i}" PYTHON_PKG_DEP
 
 		local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
-		out="( ${PYTHON_PKG_DEP} ${i_depstr} ) ${out}"
+		# note: need to strip '=' slot operator for || deps
+		out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}"
 	done
 	echo "|| ( ${out})"
 }