Bug #322049 - Make use_with() and use_enable() handling of empty

3rd argument conditional on EAPI in order to ensure backward
compatibility. This reverts the behavior change from commit
a05bba76435d94407fd25549d0552902962baf62 for EAPI 0, 1, 2, and 3.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b46d14a6341542758d6d525cbf20a0c9dcdfd8c0..9784298c4f01c7905e64e3463108423a4368c45b 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -230,7 +230,11 @@ use_with() {
                return 1
        fi
 
-       local UW_SUFFIX=${3+=$3}
+       if ! has "${EAPI:-0}" 0 1 2 3 ; then
+               local UW_SUFFIX=${3+=$3}
+       else
+               local UW_SUFFIX=${3:+=$3}
+       fi
        local UWORD=${2:-$1}
 
        if useq $1; then
@@ -248,7 +252,11 @@ use_enable() {
                return 1
        fi
 
-       local UE_SUFFIX=${3+=$3}
+       if ! has "${EAPI:-0}" 0 1 2 3 ; then
+               local UE_SUFFIX=${3+=$3}
+       else
+               local UE_SUFFIX=${3:+=$3}
+       fi
        local UWORD=${2:-$1}
 
        if useq $1; then