From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 3 Sep 2010 15:37:28 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0385b326c6a1d9316edfd66bd2f6b4b3e8cc43b3;p=portage.git

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

Conflicts:
	bin/ebuild.sh
	pym/portage/package/ebuild/config.py
---

0385b326c6a1d9316edfd66bd2f6b4b3e8cc43b3
diff --cc bin/ebuild.sh
index 8bf22ea5b,6627c898d..33484278c
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2,9 -2,18 +2,18 @@@
  # Copyright 1999-2010 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
 -PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
 -PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
 +PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"
 +PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}"
  
+ if [[ $PORTAGE_SANDBOX_COMPAT_LEVEL -lt 22 ]] ; then
+ 	# Ensure that /dev/std* streams have appropriate sandbox permission for
+ 	# bug #288863. This can be removed after sandbox is fixed and portage
+ 	# depends on the fixed version (sandbox-2.2 has the fix but it is
+ 	# currently unstable).
+ 	export SANDBOX_WRITE="${SANDBOX_WRITE:+${SANDBOX_WRITE}:}/dev/stdout:/dev/stderr"
+ 	export SANDBOX_READ="${SANDBOX_READ:+${SANDBOX_READ}:}/dev/stdin"
+ fi
+ 
  # Don't use sandbox's BASH_ENV for new shells because it does
  # 'source /etc/profile' which can interfere with the build
  # environment by modifying our PATH.
@@@ -790,12 -799,8 +805,8 @@@ into() 
  		export DESTTREE=""
  	else
  		export DESTTREE=$1
- <<<<<<< HEAD
 -		if [ ! -d "${D}${DESTTREE}" ]; then
 -			install -d "${D}${DESTTREE}"
 +		if [ ! -d "${ED}${DESTTREE}" ]; then
 +			install -d "${ED}${DESTTREE}"
- =======
- 		if [ ! -d "${D}${DESTTREE}" ]; then
- 			install -d "${D}${DESTTREE}"
  			local ret=$?
  			if [[ $ret -ne 0 ]] ; then
  				helpers_die "${FUNCNAME[0]} failed"
@@@ -1740,8 -1741,20 +1750,22 @@@ filter_readonly_variables() 
  	local filtered_sandbox_vars="SANDBOX_ACTIVE SANDBOX_BASHRC
  		SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
  		SANDBOX_LOG SANDBOX_ON"
+ 	local misc_garbage_vars="_portage_filter_opts"
  	filtered_vars="$readonly_bash_vars $bash_misc_vars
- 		$READONLY_PORTAGE_VARS"
+ 		$READONLY_PORTAGE_VARS $misc_garbage_vars"
+ 
+ 	# Don't filter/interfere with prefix variables unless they are
+ 	# supported by the current EAPI.
+ 	case "${EAPI:-0}" in
+ 		0|1|2)
+ 			;;
+ 		*)
 -			filtered_vars+=" ED EPREFIX EROOT"
++			# PREFIX LOCAL MODIFICATION
++			#filtered_vars+=" ED EPREFIX EROOT"
++			# PREFIX LOCAL MODIFICATION
+ 			;;
+ 	esac
+ 
  	if hasq --filter-sandbox $* ; then
  		filtered_vars="${filtered_vars} SANDBOX_.*"
  	else
diff --cc pym/portage/package/ebuild/config.py
index e5eaf921a,2f0958e2d..88f0794dd
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -28,7 -28,8 +28,8 @@@ from portage.const import CACHE_PATH, 
  	DEPCACHE_PATH, INCREMENTALS, MAKE_CONF_FILE, \
  	MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \
  	PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \
 -	USER_VIRTUALS_FILE
 +	USER_VIRTUALS_FILE, EPREFIX, EPREFIX_LSTRIP, BPREFIX
+ from portage.const import _SANDBOX_COMPAT_LEVEL
  from portage.dbapi import dbapi
  from portage.dbapi.porttree import portdbapi
  from portage.dbapi.vartree import vartree