From c36023833c7b58812fba559f89e418ce7d24ac44 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Nov 2007 20:20:04 +0000
Subject: [PATCH] Don't call preprocess_ebuild_env() unless EBUILD_SH_ARGS is
 set since otherwise it can interfere with the environment for things like the
 "package" phase. (trunk r8603)

svn path=/main/branches/2.1.2/; revision=8604
---
 bin/ebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bf1ba9019..e03b18fa3 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1599,7 +1599,7 @@ fi
 if hasq ${EBUILD_SH_ARGS} clean ; then
 	true
 elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then
-	if [ "${PN}" == "portage" ] ; then
+	if [ "${PN}" == "portage" ] && [ -n "${EBUILD_SH_ARGS}" ] ; then
 		# When portage reinstalls itself, during inst/rm phases, the
 		# environment may have been saved by a different version of ebuild.sh,
 		# so it can't trusted that it's been properly filtered. Therefore,
-- 
2.26.2