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 ) id 1SOE6u-0007Nh-EA for garchives@archives.gentoo.org; Sat, 28 Apr 2012 20:19:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79701E0851; Sat, 28 Apr 2012 20:19:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4E726E0851 for ; Sat, 28 Apr 2012 20:19:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D6761B400E for ; Sat, 28 Apr 2012 20:19:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4E8E4E5402 for ; Sat, 28 Apr 2012 20:19:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1335644257.7bf14ebd3feb75c368f32e06e1ac34e9ccbd35ed.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7bf14ebd3feb75c368f32e06e1ac34e9ccbd35ed X-VCS-Branch: master Date: Sat, 28 Apr 2012 20:19:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b7a8c3db-33ec-410f-aec2-04f9faa88c28 X-Archives-Hash: 8f100f5f0dd031f6435d71a9accf244f commit: 7bf14ebd3feb75c368f32e06e1ac34e9ccbd35ed Author: James Le Cuirot aura-online co uk> AuthorDate: Sat Apr 28 16:33:07 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Apr 28 20:17:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7bf14ebd ebuild.sh: source /etc/portage/env scripts after /etc/portage/bashrc This will fix bug #413895. --- bin/ebuild.sh | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b1d1df1..173865c 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -375,7 +375,19 @@ source_all_bashrcs() { for x in "${path_array[@]}" ; do [ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc" done + fi + + if [ -r "${PORTAGE_BASHRC}" ] ; then + if [ "$PORTAGE_DEBUG" !=3D "1" ] || [ "${-/x/}" !=3D "$-" ]; then + source "${PORTAGE_BASHRC}" + else + set -x + source "${PORTAGE_BASHRC}" + set +x + fi + fi =20 + if [[ $EBUILD_PHASE !=3D depend ]] ; then # The user's bashrc is the ONLY non-portage bit of code that can # change shopts without a QA violation. for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P}= ,${PF}}; do @@ -394,16 +406,6 @@ source_all_bashrcs() { done fi =20 - if [ -r "${PORTAGE_BASHRC}" ] ; then - if [ "$PORTAGE_DEBUG" !=3D "1" ] || [ "${-/x/}" !=3D "$-" ]; then - source "${PORTAGE_BASHRC}" - else - set -x - source "${PORTAGE_BASHRC}" - set +x - fi - fi - [ ! -z "${OCC}" ] && export CC=3D"${OCC}" [ ! -z "${OCXX}" ] && export CXX=3D"${OCXX}" }