From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 3 Dec 2011 15:19:56 +0000 (+0100)
Subject: misc-functions.sh: don't set local ED/EPREFIX some more
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6b379cff421282d6a0dac5f4ea65be40df4175a;p=portage.git

misc-functions.sh: don't set local ED/EPREFIX some more

In Prefix EPREFIX, ED are always set, so don't try to redefine them with
wrong values (or local).  In fact, it fails because ED and EPREFIX are
defined as read-only.
---

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 58f5bc8e6..20d52a79a 100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -70,7 +70,9 @@ canonicalize() {
 prepcompress() {
 	local -a include exclude incl_d incl_f
 	local f g i real_f real_d
-	case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# END PREFIX LOCAL
 
 	# Canonicalize path names and check for their existence.
 	real_d=$(canonicalize "${ED}")
@@ -1514,7 +1516,9 @@ preinst_mask() {
 		 return 1
 	fi
 
-	case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# END PREFIX LOCAL
 
 	# Make sure $PWD is not ${D} so that we don't leave gmon.out files
 	# in there in case any tools were built with -pg in CFLAGS.
@@ -1542,7 +1546,9 @@ preinst_sfperms() {
 		 return 1
 	fi
 
-	case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# END PREFIX LOCAL
 
 	# Smart FileSystem Permissions
 	if has sfperms $FEATURES; then
@@ -1580,7 +1586,9 @@ preinst_suid_scan() {
 		 return 1
 	fi
 
-	case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# END PREFIX LOCAL
 
 	# total suid control.
 	if has suidctl $FEATURES; then
@@ -1645,7 +1653,9 @@ preinst_selinux_labels() {
 
 dyn_package() {
 
-	case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local ED=${D} ;; esac
+	# END PREFIX LOCAL
 
 	# Make sure $PWD is not ${D} so that we don't leave gmon.out files
 	# in there in case any tools were built with -pg in CFLAGS.
@@ -1725,7 +1735,9 @@ __END1__
 
 dyn_rpm() {
 
-	case "$EAPI" in 0|1|2) local EPREFIX= ;; esac
+	# PREFIX LOCAL: always support ED
+	#case "$EAPI" in 0|1|2) local EPREFIX= ;; esac
+	# END PREFIX LOCAL
 
 	cd "${T}" || die "cd failed"
 	local machine_name=$(uname -m)