[gentoo-commits] proj/portage:master commit in: bin/

[Zac Medico]

commit:     ab484dc9a2612aa6709fad3ff926c8589a706637
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 04:57:10 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 04:57:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ab484dc9

phase-helpers.sh: fix best/has_version for prefix

---
 bin/phase-helpers.sh |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 8a2f381..a47064e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -600,11 +600,13 @@ _eapi4_src_install() {
 # Takes single depend-type atoms.
 has_version() {
 
+	local eroot=${EROOT}
+	case "$EAPI" in 0|1|2) eroot=${ROOT} ;; esac
 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
-		"$PORTAGE_BIN_PATH"/ebuild-ipc has_version "$ROOT" "$1"
+		"$PORTAGE_BIN_PATH"/ebuild-ipc has_version "${eroot}" "$1"
 	else
 		PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
+		"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" has_version "${eroot}" "$1"
 	fi
 	local retval=$?
 	case "${retval}" in
@@ -621,11 +623,13 @@ has_version() {
 # Takes single depend-type atoms.
 best_version() {
 
+	local eroot=${EROOT}
+	case "$EAPI" in 0|1|2) eroot=${ROOT} ;; esac
 	if [[ -n $PORTAGE_IPC_DAEMON ]] ; then
-		"$PORTAGE_BIN_PATH"/ebuild-ipc best_version "$ROOT" "$1"
+		"$PORTAGE_BIN_PATH"/ebuild-ipc best_version "${eroot}" "$1"
 	else
 		PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" best_version "${ROOT}" "$1"
+		"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" best_version "${eroot}" "$1"
 	fi
 	local retval=$?
 	case "${retval}" in