--- profiles/base/profile.bashrc.old	2010-04-22 19:45:23.000000000 +0200
+++ profiles/base/profile.bashrc	2010-04-22 19:46:09.000000000 +0200
@@ -2,10 +2,12 @@
 # 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 $
 
-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
+if [ -z "${PORTAGE_BASHENVDIR}" ]; 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() {