From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 02:52:35 +0000 (-0000)
Subject: Source /etc/portage/bashrc after the profile.bashrcs, since user env should be able... 
X-Git-Tag: v2.1-r1~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c69443145f90fe469381c1115a0d7de489a5ee8b;p=portage.git

Source /etc/portage/bashrc after the profile.bashrcs, since user env should be able to override the profile env.  This patch is from trunk r3508.

svn path=/main/branches/2.1/; revision=3570
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 49cea8de8..db2aafe8a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -47,20 +47,6 @@ OCXX="$CXX"
 
 source /etc/profile.env &>/dev/null
 
-if [ -f "${PORTAGE_BASHRC}" ]; then
-	# If $- contains x, then tracing has already enabled elsewhere for some
-	# reason.  We preserve it's state so as not to interfere.
-	if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
-		source "${PORTAGE_BASHRC}"
-	else
-		set -x
-		source "${PORTAGE_BASHRC}"
-		set +x
-	fi
-fi
-[ ! -z "$OCC" ] && export CC="$OCC"
-[ ! -z "$OCXX" ] && export CXX="$OCXX"
-
 export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}"
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
 
@@ -116,6 +102,20 @@ for dir in ${PROFILE_PATHS}; do
 done
 restore_IFS
 
+if [ -f "${PORTAGE_BASHRC}" ]; then
+	# If $- contains x, then tracing has already enabled elsewhere for some
+	# reason.  We preserve it's state so as not to interfere.
+	if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
+		source "${PORTAGE_BASHRC}"
+	else
+		set -x
+		source "${PORTAGE_BASHRC}"
+		set +x
+	fi
+fi
+
+[ ! -z "$OCC" ] && export CC="$OCC"
+[ ! -z "$OCXX" ] && export CXX="$OCXX"
 
 esyslog() {
 	# Custom version of esyslog() to take care of the "Red Star" bug.