From 3bd94dbffd4cf338de8cc786f60525b0a84d2562 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 8 Dec 2011 09:46:55 -0800
Subject: Support FEATURES=force-prefix.

This adjusts the logic from commit
ff52f9dc31004becb8022e6437088d01917f413c to use FEATURES=force-prefix
instead of USE=prefix. This has the advantage that we don't have to
make any assumptions about the USE=prefix.
---
 bin/phase-helpers.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index aadfac17d..969cecfe0 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -19,7 +19,7 @@ into() {
 		export DESTTREE=""
 	else
 		export DESTTREE=$1
-		[[ " ${USE} " == *" prefix "* ]] || \
+		[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 			case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 		if [ ! -d "${ED}${DESTTREE}" ]; then
 			install -d "${ED}${DESTTREE}"
@@ -37,7 +37,7 @@ insinto() {
 		export INSDESTTREE=""
 	else
 		export INSDESTTREE=$1
-		[[ " ${USE} " == *" prefix "* ]] || \
+		[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 			case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 		if [ ! -d "${ED}${INSDESTTREE}" ]; then
 			install -d "${ED}${INSDESTTREE}"
@@ -55,7 +55,7 @@ exeinto() {
 		export _E_EXEDESTTREE_=""
 	else
 		export _E_EXEDESTTREE_="$1"
-		[[ " ${USE} " == *" prefix "* ]] || \
+		[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 			case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 		if [ ! -d "${ED}${_E_EXEDESTTREE_}" ]; then
 			install -d "${ED}${_E_EXEDESTTREE_}"
@@ -73,7 +73,7 @@ docinto() {
 		export _E_DOCDESTTREE_=""
 	else
 		export _E_DOCDESTTREE_="$1"
-		[[ " ${USE} " == *" prefix "* ]] || \
+		[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 			case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 		if [ ! -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
 			install -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
@@ -141,7 +141,7 @@ docompress() {
 keepdir() {
 	dodir "$@"
 	local x
-	[[ " ${USE} " == *" prefix "* ]] || \
+	[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 		case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
 		shift
@@ -379,7 +379,7 @@ unpack() {
 econf() {
 	local x
 
-	[[ " ${USE} " == *" prefix "* ]] || \
+	[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 		case "$EAPI" in 0|1|2) local EPREFIX= ;; esac
 
 	_hasg() {
@@ -476,7 +476,7 @@ econf() {
 einstall() {
 	# CONF_PREFIX is only set if they didn't pass in libdir above.
 	local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}"
-	[[ " ${USE} " == *" prefix "* ]] || \
+	[[ " ${FEATURES} " == *" force-prefix "* ]] || \
 		case "$EAPI" in 0|1|2) local ED=${D} ;; esac
 	LIBDIR_VAR="LIBDIR_${ABI}"
 	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
@@ -607,7 +607,7 @@ has_version() {
 	local eroot
 	case "$EAPI" in
 		0|1|2)
-			[[ " ${USE} " == *" prefix "* ]] && \
+			[[ " ${FEATURES} " == *" force-prefix "* ]] && \
 				eroot=${ROOT%/}${EPREFIX}/ || eroot=${ROOT}
 			;;
 		*)
@@ -642,7 +642,7 @@ best_version() {
 	local eroot
 	case "$EAPI" in
 		0|1|2)
-			[[ " ${USE} " == *" prefix "* ]] && \
+			[[ " ${FEATURES} " == *" force-prefix "* ]] && \
 				eroot=${ROOT%/}${EPREFIX}/ || eroot=${ROOT}
 			;;
 		*)
-- 
cgit v1.2.3-1-g7c22