From ff52f9dc31004becb8022e6437088d01917f413c Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 7 Dec 2011 22:22:31 -0800
Subject: Make USE=prefix enable EPREFIX in all EAPIs.

This is safe because the prefix flag should be masked in all non-prefix
profiles, and older EAPIs would otherwise be useless with prefix
configurations. This brings compatibility with the prefix branch of
portage, which also supports EPREFIX for all EAPIs (for obvious
reasons).
---
 bin/phase-functions.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin/phase-functions.sh')

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index f46368d68..351ae9e1d 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -96,6 +96,8 @@ filter_readonly_variables() {
 	# supported by the current EAPI.
 	case "${EAPI:-0}" in
 		0|1|2)
+			[[ " ${USE} " == *" prefix "* ]] && \
+				filtered_vars+=" ED EPREFIX EROOT"
 			;;
 		*)
 			filtered_vars+=" ED EPREFIX EROOT"
@@ -500,7 +502,8 @@ dyn_install() {
 	ebuild_phase pre_src_install
 
 	_x=${ED}
-	case "$EAPI" in 0|1|2) _x=${D} ;; esac
+	[[ " ${USE} " == *" prefix "* ]] || \
+		case "$EAPI" in 0|1|2) _x=${D} ;; esac
 	rm -rf "${D}"
 	mkdir -p "${_x}"
 	unset _x
-- 
cgit v1.2.3-1-g7c22