From ef2024a33be93a256beef28c1423ba1fb706383d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
Date: Thu, 22 Apr 2010 17:43:59 +0000
Subject: Support per-package bashrc files.

Support loading per-package bashrc files from the /etc/portage/env
directory. The invidual files should reside in a directory matching
${CATEGORY}, with names matching ${PN}, ${PN}:${SLOT}, ${P} and/or ${PF}
(which are applied in that order).
---
 bin/ebuild.sh             | 23 +++++++++++++----------
 bin/isolated-functions.sh |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 57ceb2848..968bf6bc5 100755
--- a/bin/ebuild.sh
+++ b/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}" "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${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}"
 }
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index fa23b6675..6bead30b2 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -553,7 +553,7 @@ save_ebuild_env() {
 			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
 			NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
 			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
-			PORTAGE_BASHRC PORTAGE_BASHRCS_SOURCED \
+			PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \
 			PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
 			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
 			PORTAGE_DEPCACHEDIR PORTAGE_GID \
-- 
cgit v1.2.3-1-g7c22