From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Oct 2009 03:57:58 +0000 (-0000)
Subject: Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan Callen <abcd@g.o>
X-Git-Tag: v2.1.7.2~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77cbc5e38abb9ae17bb7f9d9216c1370a8cae574;p=portage.git

Bug #273643 - Don't export AA in EAPI 3. Thanks to Jonathan Callen <abcd@g.o>
for the initial patch (I moved the code from spawnebuild to  config.environ).
(trunk r14624)

svn path=/main/branches/2.1.7/; revision=14652
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2cacd9660..3beb618fc 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3699,6 +3699,7 @@ class config(object):
 		mydict={}
 		environ_filter = self._environ_filter
 
+		eapi = self.get('EAPI')
 		phase = self.get('EBUILD_PHASE')
 		filter_calling_env = False
 		if phase not in ('clean', 'cleanrm', 'depend'):
@@ -3743,6 +3744,10 @@ class config(object):
 		# Filtered by IUSE and implicit IUSE.
 		mydict["USE"] = self.get("PORTAGE_USE", "")
 
+		# Don't export AA to the ebuild environment in EAPIs that forbid it
+		if eapi not in ("0", "1", "2"):
+			mydict.pop("AA", None)
+
 		# sandbox's bashrc sources /etc/profile which unsets ROOTPATH,
 		# so we have to back it up and restore it.
 		rootpath = mydict.get("ROOTPATH")