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

[Michał Górny]

commit:     48fd5f1f3f0bed2ff6dedd20435df54d7520e34c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 20:30:39 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 20:32:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48fd5f1f

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

 eclass/python-any-r1.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c6dfc9c..0b49944 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})"
 }