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

Conflicts:
	bin/ebuild-helpers/newbin
	bin/ebuild-helpers/newconfd
	bin/ebuild-helpers/newdoc
	bin/ebuild-helpers/newenvd
	bin/ebuild-helpers/newexe
	bin/ebuild-helpers/newinitd
	bin/ebuild-helpers/newlib.a
	bin/ebuild-helpers/newlib.so
	bin/ebuild-helpers/newman
	bin/ebuild-helpers/newsbin
	pym/portage/util/_pty.py

diff --cc bin/ebuild-helpers/newbin
index bf5def80ca79acfb36e0824cafd64f2637e7ce23,bf9874472e0882376f44ff1400c61a39ff3028c8..f3deef11e85dec50a93af430720321806fa70d87
--- 1/bin/ebuild-helpers/newbin
--- 2/bin/ebuild-helpers/newbin
+++ b/bin/ebuild-helpers/newbin
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newconfd
index 284de97374931603fcfef3f59c844ccef6186ab4,fa3710d8f3c9c2d4fe66730bf91df2b907cc94ff..d9462f64b62e04d8d915ea424dc457265b9e21a1
--- 1/bin/ebuild-helpers/newconfd
--- 2/bin/ebuild-helpers/newconfd
+++ b/bin/ebuild-helpers/newconfd
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newdoc
index 0ca1e52b250b1b61faa64262ef48cbf6a5f8162d,df6fb1d5818d99e80fe0d5f39f32f23bfdc68f09..d26aec97535355a7088240fb3669474a004c5868
--- 1/bin/ebuild-helpers/newdoc
--- 2/bin/ebuild-helpers/newdoc
+++ b/bin/ebuild-helpers/newdoc
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newenvd
index 02ad10eb1e4e0c3ea0d4f4881ebd4052cb944de4,c54af05204b8d469642b228776fd0874a449ed02..06884252402f50fda1f6dd8112074972c8868f06
--- 1/bin/ebuild-helpers/newenvd
--- 2/bin/ebuild-helpers/newenvd
+++ b/bin/ebuild-helpers/newenvd
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newexe
index 0877d201acd5b454f8d2a25277ade9fa0d74a303,9bcf64b31e6b61d6934a5f8671a04848d24151d6..334096c5af1c7e8d581b8442bc53c92ca6169c8d
--- 1/bin/ebuild-helpers/newexe
--- 2/bin/ebuild-helpers/newexe
+++ b/bin/ebuild-helpers/newexe
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newinitd
index aa7955c63b8ae6b4d2194223ea852a5867fcea0f,03bbe68a76620cfd565979b668609508f349cb77..ad6d773c6df6b8e071de4386f29cb3628801a7ff
--- 1/bin/ebuild-helpers/newinitd
--- 2/bin/ebuild-helpers/newinitd
+++ b/bin/ebuild-helpers/newinitd
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newins
Simple merge

diff --cc bin/ebuild-helpers/newlib.a
index d14ea0ef11a0bc73856d59c65faae69efb073079,7ff8195473ff98aef4a601e60afd462b1c1835f4..699c2c68fc7a9f6286c8986e3f50718ad3d8eb23
--- 1/bin/ebuild-helpers/newlib.a
--- 2/bin/ebuild-helpers/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newlib.so
index 3349900ff97376f6b257c441be1bf480b585cce7,fd4c097d734800a52382bd23c616595cbad052ef..7e6e7cd25d7a23bd06183c3f4f615a23baabfb97
--- 1/bin/ebuild-helpers/newlib.so
--- 2/bin/ebuild-helpers/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newman
index d15abc04c3065e860c2e67c3219a9dca44511f91,889e0f98518a4c030a20b088d66aa286e3d77031..dc4962eca0d4333e1e545fe36a15a0dbd3efa67f
--- 1/bin/ebuild-helpers/newman
--- 2/bin/ebuild-helpers/newman
+++ b/bin/ebuild-helpers/newman
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild-helpers/newsbin
index f8e79df829ca01ff6e72a65e5a7934597128fa88,9df0af27515b3623d3103f1a68cd91261be9af43..c02124b35568653b66d00ad468621ba727c9dadc
--- 1/bin/ebuild-helpers/newsbin
--- 2/bin/ebuild-helpers/newsbin
+++ b/bin/ebuild-helpers/newsbin
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2010 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  
  source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/misc-functions.sh
index 8b58bda2eee64357f33812eecbaa66765d3256a3,dcfdceb948f45228b5347c364b847cc932474dac..436a50b3929fa5e2bc6c74ac0876206aec301140
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc bin/phase-functions.sh
index 493bb54fc5e1ebdf39774fec9e9059ae9c12c47b,2167853dc202bead09309158491c40c6eaed8eac..c002a34816cde10ebb3d6a40403baf4dfa4f0b1b
--- 1/bin/phase-functions.sh
--- 2/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -126,17 -126,18 +126,18 @@@ filter_readonly_variables() 
                        LC_CTYPE LC_MESSAGES LC_MONETARY
                        LC_NUMERIC LC_PAPER LC_TIME"
        fi
-       if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then
-               filtered_vars="
-                       ${filtered_vars}
-                       ${PORTAGE_SAVED_READONLY_VARS}
-                       ${PORTAGE_MUTABLE_FILTERED_VARS}
-               "
-       elif ! has --allow-extra-vars $* ; then
-               filtered_vars+=" ${binpkg_untrusted_vars}"
+       if ! has --allow-extra-vars $* ; then
+               if [ "${EMERGE_FROM}" = binary ] ; then
+                       # preserve additional variables from build time,
+                       # while excluding untrusted variables
+                       filtered_vars+=" ${binpkg_untrusted_vars}"
+               else
+                       filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}"
+                       filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}"
+               fi
        fi
  
 -      "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
 +      "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
  }
  
  # @FUNCTION: preprocess_ebuild_env

diff --cc man/make.conf.5
Simple merge

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/package/ebuild/config.py
Simple merge

diff --cc pym/portage/package/ebuild/fetch.py
Simple merge