From 80b175067f59e81d6219c84803fe4c9bf6241e81 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 11 Dec 2009 06:04:07 +0000
Subject: Don't filter/interfere with prefix variables unless they are
 supported by the current EAPI.

svn path=/main/trunk/; revision=15031
---
 bin/ebuild.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 0bbfc10f0..009c59c38 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1651,7 +1651,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
-- 
cgit v1.2.3-1-g7c22