[gentoo-commits] proj/portage:prefix commit in: /

["Fabian Groffen" <grobian@gentoo.org>]

commit:     be56a2b322aa6149ec6c0873c44121b5ae0a2933
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 11:19:55 2012 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 11:19:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=be56a2b3

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild-helpers/dobin
	bin/ebuild-helpers/dodir
	bin/ebuild-helpers/dodoc
	bin/ebuild-helpers/doexe
	bin/ebuild-helpers/doinfo
	bin/ebuild-helpers/dolib
	bin/ebuild-helpers/doman
	bin/ebuild-helpers/domo
	bin/ebuild-helpers/dosbin
	bin/ebuild-helpers/ecompressdir
	bin/ebuild-helpers/fperms
	bin/ebuild-helpers/prepall
	bin/ebuild-helpers/prepallinfo
	bin/ebuild-helpers/prepallman
	bin/ebuild-helpers/prepallstrip
	bin/ebuild-helpers/prepinfo
	bin/ebuild-helpers/preplib
	bin/ebuild-helpers/prepman
	bin/ebuild.sh
	bin/misc-functions.sh


 bin/eapi.sh                                        |  113 ++++++++++++++
 bin/ebuild-helpers/dobin                           |    7 +-
 bin/ebuild-helpers/dodir                           |    7 +-
 bin/ebuild-helpers/dodoc                           |   23 ++--
 bin/ebuild-helpers/doexe                           |    7 +-
 bin/ebuild-helpers/dohard                          |   19 +--
 bin/ebuild-helpers/doheader                        |    8 +-
 bin/ebuild-helpers/doinfo                          |    7 +-
 bin/ebuild-helpers/doins                           |   18 +--
 bin/ebuild-helpers/dolib                           |    7 +-
 bin/ebuild-helpers/doman                           |    7 +-
 bin/ebuild-helpers/domo                            |    7 +-
 bin/ebuild-helpers/dosbin                          |    7 +-
 bin/ebuild-helpers/dosed                           |   19 +--
 bin/ebuild-helpers/dosym                           |    5 +-
 bin/ebuild-helpers/ecompressdir                    |    7 +-
 bin/ebuild-helpers/fowners                         |   10 +-
 bin/ebuild-helpers/fperms                          |    7 +-
 bin/ebuild-helpers/newins                          |   17 +--
 bin/ebuild-helpers/prepall                         |    7 +-
 bin/ebuild-helpers/prepalldocs                     |   17 +--
 bin/ebuild-helpers/prepallinfo                     |    7 +-
 bin/ebuild-helpers/prepallman                      |    9 +-
 bin/ebuild-helpers/prepallstrip                    |    9 +-
 bin/ebuild-helpers/prepinfo                        |    9 +-
 bin/ebuild-helpers/preplib                         |    7 +-
 bin/ebuild-helpers/prepman                         |    9 +-
 bin/ebuild-helpers/prepstrip                       |    5 +-
 bin/ebuild-helpers/unprivileged/chgrp              |    1 +
 bin/ebuild-helpers/unprivileged/chown              |   33 ++++
 bin/ebuild.sh                                      |   42 ++---
 bin/isolated-functions.sh                          |   17 +-
 bin/misc-functions.sh                              |   50 ++++---
 bin/phase-functions.sh                             |   55 +++-----
 bin/phase-helpers.sh                               |  155 +++++++++-----------
 bin/save-ebuild-env.sh                             |    9 +-
 pym/_emerge/BlockerCache.py                        |    4 +-
 pym/portage/dbapi/vartree.py                       |    4 +-
 pym/portage/dep/_slot_operator.py                  |   14 +-
 pym/portage/getbinpkg.py                           |    4 +-
 .../package/ebuild/_config/LocationsManager.py     |    7 +-
 pym/portage/package/ebuild/_config/UseManager.py   |   20 ++-
 pym/portage/package/ebuild/doebuild.py             |    4 +
 pym/portage/tests/ebuild/test_ipc_daemon.py        |    4 +-
 pym/portage/util/__init__.py                       |   16 ++-
 45 files changed, 486 insertions(+), 334 deletions(-)

diff --cc bin/ebuild-helpers/dobin
index 3d81c2d,0ba1eb0..2d38580
--- a/bin/ebuild-helpers/dobin
+++ b/bin/ebuild-helpers/dobin
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ $# -lt 1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/dodir
index 3b9a171,e03ba9a..779bccc
--- a/bin/ebuild-helpers/dodir
+++ b/bin/ebuild-helpers/dodir
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  install -d ${DIROPTIONS} "${@/#/${ED}/}"
  ret=$?
diff --cc bin/ebuild-helpers/dodoc
index 7f5e364,c551735..4c1c7bc
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@@ -2,19 -2,15 +2,15 @@@
  # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
- case "${EAPI}" in
- 	0|1|2|3)
- 		;;
- 	*)
- 		exec \
- 		env \
- 		__PORTAGE_HELPER="dodoc" \
- 		doins "$@"
- 		;;
- esac
- 
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
+ if ___eapi_dodoc_supports_-r; then
+ 	exec \
+ 	env \
+ 	__PORTAGE_HELPER="dodoc" \
+ 	doins "$@"
+ fi
+ 
  if [ $# -lt 1 ] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
  	exit 1 	
diff --cc bin/ebuild-helpers/doexe
index 9c845ca,aa050e9..7ada92d
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ $# -lt 1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/doinfo
index db49bed,355047f..816337f
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ -z $1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/doins
index 343a150,4679e83..1fdc1d9
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@@ -40,24 -41,12 +41,21 @@@ if [[ ${INSDESTTREE#${ED}} != "${INSDES
  	__helpers_die "${helper} used with \${D} or \${ED}"
  	exit 1
  fi
 +# PREFIX LOCAL: check for usage with EPREFIX
 +if [[ ${INSDESTTREE#${EPREFIX}} != "${INSDESTTREE}" ]]; then
 +	vecho "-------------------------------------------------------" 1>&2
 +	vecho "You should not use \${EPREFIX} with helpers." 1>&2
 +	vecho "  --> ${INSDESTTREE}" 1>&2
 +	vecho "-------------------------------------------------------" 1>&2
 +	exit 1
 +fi
 +# END PREFIX LOCAL
  
- case "$EAPI" in
- 	0|1|2|3)
- 		PRESERVE_SYMLINKS=n
- 		;;
- 	*)
- 		PRESERVE_SYMLINKS=y
- 		;;
- esac
+ if ___eapi_doins_and_newins_preserve_symlinks; then
+ 	PRESERVE_SYMLINKS=y
+ else
+ 	PRESERVE_SYMLINKS=n
+ fi
  
  export TMP=$T/.doins_tmp
  # Use separate directories to avoid potential name collisions.
diff --cc bin/ebuild-helpers/dolib
index 67055bb,fd92d7f..f161f72
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  # Setup ABI cruft
  LIBDIR_VAR="LIBDIR_${ABI}"
diff --cc bin/ebuild-helpers/doman
index dd5440d,d680859..8273cae
--- a/bin/ebuild-helpers/doman
+++ b/bin/ebuild-helpers/doman
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ $# -lt 1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/domo
index 8246973,9a8dda3..bb9fca2
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  mynum=${#}
  if [ ${mynum} -lt 1 ] ; then
diff --cc bin/ebuild-helpers/dosbin
index 9765b75,361ca83..0ddd655
--- a/bin/ebuild-helpers/dosbin
+++ b/bin/ebuild-helpers/dosbin
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  if [[ $# -lt 1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/ecompressdir
index 464dd37,75f3e3a..83bf7fe
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/helper-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/helper-functions.sh
  
  if [[ -z $1 ]] ; then
  	__helpers_die "${0##*/}: at least one argument needed"
diff --cc bin/ebuild-helpers/fowners
index 8066ab7,cee4108..0aef378
--- a/bin/ebuild-helpers/fowners
+++ b/bin/ebuild-helpers/fowners
@@@ -2,11 -2,11 +2,12 @@@
  # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 +
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) EPREFIX= ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	EPREFIX= ED=${D}
+ fi
  
  # we can't prefix all arguments because
  # chown takes random options
diff --cc bin/ebuild-helpers/fperms
index 0824c15,d854ebb..94f6af2
--- a/bin/ebuild-helpers/fperms
+++ b/bin/ebuild-helpers/fperms
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  # we can't prefix all arguments because
  # chmod takes random options
diff --cc bin/ebuild-helpers/prepall
index 3aacb7f,fb5c2db..407392f
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@@ -1,13 -1,12 +1,14 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
 +
 +[[ -d ${ED} ]] || exit 0
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  if has chflags $FEATURES ; then
  	# Save all the file flags for restoration at the end of prepall.
diff --cc bin/ebuild-helpers/prepalldocs
index 2804987,3094661..c7c85d6
--- a/bin/ebuild-helpers/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
@@@ -2,16 -2,12 +2,12 @@@
  # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- case "${EAPI}" in
- 	0|1|2|3)
- 		;;
- 	*)
- 		die "'${0##*/}' has been banned for EAPI '$EAPI'"
- 		exit 1
- 		;;
- esac
+ if ___eapi_has_docompress; then
+ 	die "'${0##*/}' has been banned for EAPI '$EAPI'"
+ 	exit 1
+ fi
  
  if [[ -n $1 ]] ; then
  	__vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
diff --cc bin/ebuild-helpers/prepallinfo
index 00e1fc4,1a20275..43d0980
--- a/bin/ebuild-helpers/prepallinfo
+++ b/bin/ebuild-helpers/prepallinfo
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  [[ -d ${ED}usr/share/info ]] || exit 0
  
diff --cc bin/ebuild-helpers/prepallman
index fbc2f1d,7c78324..4ad3a5e
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@@ -1,14 -1,15 +1,15 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  # replaced by controllable compression in EAPI 4
- has "${EAPI}" 0 1 2 3 || exit 0
+ ___eapi_has_docompress && exit 0
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  ret=0
  
diff --cc bin/ebuild-helpers/prepallstrip
index f99a15b,1aa6686..d80f27a
--- a/bin/ebuild-helpers/prepallstrip
+++ b/bin/ebuild-helpers/prepallstrip
@@@ -1,8 -1,11 +1,11 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
++source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+ 
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  exec prepstrip "${ED}"
diff --cc bin/ebuild-helpers/prepinfo
index 4ae4976,5afc18a..170e18a
--- a/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  if [[ -z $1 ]] ; then
  	infodir="/usr/share/info"
diff --cc bin/ebuild-helpers/preplib
index 8e3d4b3,764261d..145540c
--- a/bin/ebuild-helpers/preplib
+++ b/bin/ebuild-helpers/preplib
@@@ -1,8 -1,8 +1,8 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
  eqawarn "QA Notice: Deprecated call to 'preplib'"
  
diff --cc bin/ebuild-helpers/prepman
index 1411499,142d404..add01c8
--- a/bin/ebuild-helpers/prepman
+++ b/bin/ebuild-helpers/prepman
@@@ -1,11 -1,12 +1,12 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2011 Gentoo Foundation
+ # Copyright 1999-2012 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
  
- [[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 	case "$EAPI" in 0|1|2) ED=${D} ;; esac
+ if ! ___eapi_has_prefix_variables; then
+ 	ED=${D}
+ fi
  
  if [[ -z $1 ]] ; then 
  	mandir="${ED}usr/share/man"
diff --cc bin/misc-functions.sh
index b66ded4,986264e..3b2c309
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -14,14 -14,12 +14,16 @@@
  MISC_FUNCTIONS_ARGS="$@"
  shift $#
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/ebuild.sh"
 +source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}/ebuild.sh"
  
  install_symlink_html_docs() {
- 	[[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 		case "$EAPI" in 0|1|2) local ED=${D} ;; esac
- 	# PREFIX LOCAL: ED needs not to exist, whereas D does
- 	[[ ! -d ${ED} && -d ${D} ]] && dodir /
- 	# END PREFIX LOCAL
+ 	if ! ___eapi_has_prefix_variables; then
+ 		local ED=${D}
++	else
++		# PREFIX LOCAL: ED needs not to exist, whereas D does
++		[[ ! -d ${ED} && -d ${D} ]] && dodir /
++		# END PREFIX LOCAL
+ 	fi
  	cd "${ED}" || die "cd failed"
  	#symlink the html documentation (if DOC_SYMLINKS_DIR is set in make.conf)
  	if [ -n "${DOC_SYMLINKS_DIR}" ] ; then
@@@ -165,12 -164,11 +168,13 @@@ prepcompress() 
  
  install_qa_check() {
  	local f i qa_var x
- 	[[ " ${FEATURES} " == *" force-prefix "* ]] || \
- 		case "$EAPI" in 0|1|2) local EPREFIX= ED=${D} ;; esac
+ 	if ! ___eapi_has_prefix_variables; then
+ 		local EPREFIX= ED=${D}
+ 	fi
  
 -	cd "${ED}" || die "cd failed"
 +	# PREFIX LOCAL: ED needs not to exist, whereas D does
 +	cd "${D}" || die "cd failed"
 +	# END PREFIX LOCAL
  
  	qa_var="QA_FLAGS_IGNORED_${ARCH/-/_}"
  	eval "[[ -n \${!qa_var} ]] && QA_FLAGS_IGNORED=(\"\${${qa_var}[@]}\")"
diff --cc pym/portage/package/ebuild/doebuild.py
index 84e4494,9deed98..2db7900
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -152,11 -150,18 +152,15 @@@ def _doebuild_path(settings, eapi=None)
  	eprefix = settings["EPREFIX"]
  	prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x]
  	rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x]
 -
 -	prefixes = []
 -	if eprefix:
 -		prefixes.append(eprefix)
 -	prefixes.append("/")
 -
 +	# PREFIX LOCAL: use DEFAULT_PATH and EXTRA_PATH from make.globals
 +	defaultpath = [x for x in settings.get("DEFAULT_PATH", "").split(":") if x]
 +	extrapath = [x for x in settings.get("EXTRA_PATH", "").split(":") if x]
  	path = []
  
+ 	if eprefix and uid != 0 and "fakeroot" not in settings.features:
+ 		path.append(os.path.join(portage_bin_path,
+ 			"ebuild-helpers", "unprivileged"))
+ 
  	if settings.get("USERLAND", "GNU") != "GNU":
  		path.append(os.path.join(portage_bin_path, "ebuild-helpers", "bsd"))