From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-411792-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Re1mk-0002cl-Mn
for garchives@archives.gentoo.org; Fri, 23 Dec 2011 09:51:31 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1813521C204;
Fri, 23 Dec 2011 09:51:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id C9D6E21C1FC
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2011 09:51:22 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 359C91B403A
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2011 09:51:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id A229280042
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Dec 2011 09:51:21 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <d32995adfc27f2a5bd4d85f951c3e828dc867600.grobian@gentoo>
Subject: [gentoo-commits] proj/portage:prefix commit in: /
X-VCS-Repository: proj/portage
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: d32995adfc27f2a5bd4d85f951c3e828dc867600
Date: Fri, 23 Dec 2011 09:51:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 9ae54555-f2ba-478f-9a4b-f1c4c754e2a6
X-Archives-Hash: 4321c6df99017d36e25ea061c20913f3
commit: d32995adfc27f2a5bd4d85f951c3e828dc867600
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 09:44:26 2011 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 09:44:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dd32995ad
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
bin/ebuild-helpers/newbin | 5 +-
bin/ebuild-helpers/newconfd | 5 +-
bin/ebuild-helpers/newdoc | 5 +-
bin/ebuild-helpers/newenvd | 5 +-
bin/ebuild-helpers/newexe | 5 +-
bin/ebuild-helpers/newinitd | 5 +-
bin/ebuild-helpers/newins | 3 +
bin/ebuild-helpers/newlib.a | 5 +-
bin/ebuild-helpers/newlib.so | 5 +-
bin/ebuild-helpers/newman | 5 +-
bin/ebuild-helpers/newsbin | 5 +-
bin/ebuild.sh | 2 +-
bin/misc-functions.sh | 77 ++++++++------
bin/phase-functions.sh | 17 ++--
man/ebuild.5 | 11 +-
man/make.conf.5 | 7 +-
pym/portage/dbapi/vartree.py | 3 +
pym/portage/package/ebuild/config.py | 5 +-
pym/portage/package/ebuild/fetch.py | 25 +++--
pym/portage/tests/ebuild/test_pty_eof.py | 26 -----
pym/portage/util/_pty.py | 162 ++----------------------=
------
21 files changed, 138 insertions(+), 250 deletions(-)
diff --cc bin/ebuild-helpers/newbin
index bf5def8,bf98744..f3deef1
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newconfd
index 284de97,fa3710d..d9462f6
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newdoc
index 0ca1e52,df6fb1d..d26aec9
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newenvd
index 02ad10e,c54af05..0688425
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newexe
index 0877d20,9bcf64b..334096c
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newinitd
index aa7955c,03bbe68..ad6d773
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newlib.a
index d14ea0e,7ff8195..699c2c6
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newlib.so
index 3349900,fd4c097..7e6e7cd
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newman
index d15abc0,889e0f9..dc4962e
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/ebuild-helpers/newsbin
index f8e79df,9df0af2..c02124b
--- 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
=20
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.s=
h
diff --cc bin/misc-functions.sh
index 8b58bda,dcfdceb..436a50b
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
diff --cc bin/phase-functions.sh
index 493bb54,2167853..c002a34
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -126,17 -126,18 +126,18 @@@ filter_readonly_variables()=20
LC_CTYPE LC_MESSAGES LC_MONETARY
LC_NUMERIC LC_PAPER LC_TIME"
fi
- if [[ ${EMERGE_FROM} !=3D binary ]] && ! has --allow-extra-vars $* ; t=
hen
- filtered_vars=3D"
- ${filtered_vars}
- ${PORTAGE_SAVED_READONLY_VARS}
- ${PORTAGE_MUTABLE_FILTERED_VARS}
- "
- elif ! has --allow-extra-vars $* ; then
- filtered_vars+=3D" ${binpkg_untrusted_vars}"
+ if ! has --allow-extra-vars $* ; then
+ if [ "${EMERGE_FROM}" =3D binary ] ; then
+ # preserve additional variables from build time,
+ # while excluding untrusted variables
+ filtered_vars+=3D" ${binpkg_untrusted_vars}"
+ else
+ filtered_vars+=3D" ${PORTAGE_SAVED_READONLY_VARS}"
+ filtered_vars+=3D" ${PORTAGE_MUTABLE_FILTERED_VARS}"
+ fi
fi
=20
- "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash=
-environment.py "${filtered_vars}" || die "filter-bash-environment.py fai=
led"
+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}" "${PORTAGE_BIN_PATH}"/fil=
ter-bash-environment.py "${filtered_vars}" || die "filter-bash-environmen=
t.py failed"
}
=20
# @FUNCTION: preprocess_ebuild_env