@@ -, +, @@ 
---
 bin/ebuild.sh                          |   23 +++++++++++++----------
 pym/portage/const.py                   |    1 +
 pym/portage/package/ebuild/config.py   |    2 +-
 pym/portage/package/ebuild/doebuild.py |    6 ++++--
 4 files changed, 19 insertions(+), 13 deletions(-)
--- a/bin/ebuild.sh	
+++ a/bin/ebuild.sh	
@@ -1557,17 +1557,20 @@ source_all_bashrcs() {
 	# We assume if people are changing shopts in their bashrc they do so at their
 	# own peril.  This is the ONLY non-portage bit of code that can change shopts
 	# without a QA violation.
-	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
+	for x in "${PORTAGE_BASHRC}" "${PORTAGE_BASHENVDIR}"/${CATEGORY}/{${PN},${P},${PF}}; do
+		if [ -r "${x}" ]; 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 "${x}"
+			else
+				set -x
+				source "${x}"
+				set +x
+			fi
 		fi
-	fi
+	done
+
 	[ ! -z "${OCC}" ] && export CC="${OCC}"
 	[ ! -z "${OCXX}" ] && export CXX="${OCXX}"
 }
--- a/pym/portage/const.py	
+++ a/pym/portage/const.py	
@@ -34,6 +34,7 @@ MODULES_FILE_PATH        = USER_CONFIG_PATH + "/modules"
 CUSTOM_PROFILE_PATH      = USER_CONFIG_PATH + "/profile"
 USER_VIRTUALS_FILE       = USER_CONFIG_PATH + "/virtuals"
 EBUILD_SH_ENV_FILE       = USER_CONFIG_PATH + "/bashrc"
+EBUILD_SH_ENV_DIR        = USER_CONFIG_PATH + "/env"
 CUSTOM_MIRRORS_FILE      = USER_CONFIG_PATH + "/mirrors"
 COLOR_MAP_FILE           = USER_CONFIG_PATH + "/color.map"
 PROFILE_PATH             = "etc/make.profile"
--- a/pym/portage/package/ebuild/config.py	
+++ a/pym/portage/package/ebuild/config.py	
@@ -172,7 +172,7 @@ class config(object):
 		"PKGDIR",
 		"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
 		"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
-		"PORTAGE_BASHRC",
+		"PORTAGE_BASHRC", "PORTAGE_BASHENVDIR",
 		"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",
 		"PORTAGE_BINPKG_TMPFILE",
 		"PORTAGE_BIN_PATH",
--- a/pym/portage/package/ebuild/doebuild.py	
+++ a/pym/portage/package/ebuild/doebuild.py	
@@ -32,8 +32,8 @@ from portage import auxdbkeys, bsd_chflags, dep_check, \
 	eapi_is_supported, merge, os, selinux, StringIO, \
 	unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
 	_shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode
-from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \
-	INVALID_ENV_FILE, MISC_SH_BINARY
+from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
+	EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
 from portage.data import portage_gid, portage_uid, secpass, \
 	uid, userpriv_groups
 from portage.dbapi.virtual import fakedbapi
@@ -211,6 +211,8 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings,
 
 	mysettings["PORTAGE_BASHRC"] = os.path.join(
 		mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE)
+	mysettings["PORTAGE_BASHENVDIR"] = os.path.join(
+		mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_DIR)
 	mysettings["EBUILD_EXIT_STATUS_FILE"] = os.path.join(
 		mysettings["PORTAGE_BUILDDIR"], ".exit_status")
 
--