Don't filter/interfere with prefix variables unless they are supported by the

current EAPI. (trunk r15031)

svn path=/main/branches/2.1.7/; revision=15065

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3cd6554960c46eae10dd908c87d7f59d2eb14793..a9591581db80faa99668cbfae925349169fb666c 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1657,7 +1657,18 @@ filter_readonly_variables() {
                SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
                SANDBOX_LOG SANDBOX_ON"
        filtered_vars="$readonly_bash_vars $bash_misc_vars
-               $READONLY_PORTAGE_VARS ED EPREFIX EROOT PATH"
+               $READONLY_PORTAGE_VARS PATH"
+
+       # Don't filter/interfere with prefix variables unless they are
+       # supported by the current EAPI.
+       case "${EAPI:-0}" in
+               0|1|2)
+                       ;;
+               *)
+                       filtered_vars+=" ED EPREFIX EROOT"
+                       ;;
+       esac
+
        if hasq --filter-sandbox $* ; then
                filtered_vars="${filtered_vars} SANDBOX_.*"
        else