From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 13 Dec 2010 17:51:57 +0000 (+0100)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ee198131306adf6775ea9af1b71eeb53ce3887e4;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix
---

ee198131306adf6775ea9af1b71eeb53ce3887e4
diff --cc pym/portage/package/ebuild/config.py
index c595017a3,664075197..40a175855
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -2073,12 -2063,14 +2075,15 @@@ class config(object)
  		if not eapi_exports_AA(eapi):
  			mydict.pop("AA", None)
  
+ 		if not eapi_exports_merge_type(eapi):
+ 			mydict.pop("MERGE_TYPE", None)
+ 
  		# Prefix variables are supported starting with EAPI 3.
 -		if phase == 'depend' or eapi is None or not eapi_supports_prefix(eapi):
 -			mydict.pop("ED", None)
 -			mydict.pop("EPREFIX", None)
 -			mydict.pop("EROOT", None)
 +		# but during transition, we just support them anywhere
 +#		if phase == 'depend' or eapi is None or not eapi_supports_prefix(eapi):
 +#			mydict.pop("ED", None)
 +#			mydict.pop("EPREFIX", None)
 +#			mydict.pop("EROOT", None)
  
  		if phase == 'depend':
  			mydict.pop('FILESDIR', None)