29 Apr 2010; Zac Medico <zmedico@gentoo.org> profile.bashrc:

Skip /etc/portage/env code if PM_EBUILD_HOOK_DIR is set since this means
that /etc/portage/env is supported by the package manager:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef2024a33be93a256beef28c1423ba1fb706383d

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 48e6ad103f7b700fd19fa18904220e4c254d9296..fcbf4a4f520b1e01eac64f890ac4314cb26dc761 100644 (file)
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.140 2010/04/29 09:23:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.141 2010/04/30 00:01:05 zmedico Exp $
+
+  29 Apr 2010; Zac Medico <zmedico@gentoo.org> profile.bashrc:
+  Skip /etc/portage/env code if PM_EBUILD_HOOK_DIR is set since this means
+  that /etc/portage/env is supported by the package manager:
+  http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef202
+  4a33be93a256beef28c1423ba1fb706383d
 
   29 Apr 2010; Peter Volkov <pva@gentoo.org> make.defaults:
   Add XTABLES_ADDONS as discussed in -dev on 18.01.2010 (but dropped

diff --git a/profiles/base/profile.bashrc b/profiles/base/profile.bashrc
index c5a9580c1c98fb58c6bba19245c5aa9fe635ff61..d560dd0f6decd429b782e8be0bd47179186e531b 100644 (file)
--- a/profiles/base/profile.bashrc
+++ b/profiles/base/profile.bashrc
@@ -1,11 +1,17 @@
-# Copyright 2006-2009 Gentoo Foundation
+# Copyright 2006-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.5 2010/01/24 17:58:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.6 2010/04/30 00:01:05 zmedico Exp $
 
-for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do
-       [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \
-               && . ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf}
-done
+# Skip this if PM_EBUILD_HOOK_DIR is set since this means that
+# /etc/portage/env is supported by the package manager:
+# http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef2024a33be93a256beef28c1423ba1fb706383d
+if [[ -z $PM_EBUILD_HOOK_DIR && \
+       -d ${PORTAGE_CONFIGROOT}/etc/portage/env ]] ; then
+       for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do
+               [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \
+                       && . ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf}
+       done
+fi
 
 if ! declare -F elog >/dev/null ; then
        elog() {