From: Fabian Groffen Date: Fri, 23 Dec 2011 09:44:26 +0000 (+0100) Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d32995adfc27f2a5bd4d85f951c3e828dc867600;p=portage.git 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 --- d32995adfc27f2a5bd4d85f951c3e828dc867600 diff --cc bin/ebuild-helpers/newbin index bf5def80c,bf9874472..f3deef11e --- a/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 284de9737,fa3710d8f..d9462f64b --- a/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 0ca1e52b2,df6fb1d58..d26aec975 --- a/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 02ad10eb1,c54af0520..068842524 --- a/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 0877d201a,9bcf64b31..334096c5a --- a/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 aa7955c63,03bbe68a7..ad6d773c6 --- a/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/newlib.a index d14ea0ef1,7ff819547..699c2c68f --- a/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 3349900ff,fd4c097d7..7e6e7cd25 --- a/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 d15abc04c,889e0f985..dc4962eca --- a/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 f8e79df82,9df0af275..c02124b35 --- a/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/misc-functions.sh index 8b58bda2e,dcfdceb94..436a50b39 mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh diff --cc bin/phase-functions.sh index 493bb54fc,2167853dc..c002a3481 --- a/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