Unset prefix vars for depend phase (even if EAPI is known). (trunk r15050)

svn path=/main/branches/2.1.7/; revision=15084

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 04bbfdc877b10d6c1314a042f27e1c434d12a778..4a6f8fd85d9ab0ba274b29d5903d9c5c4a7074b9 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3777,8 +3777,7 @@ class config(object):
                        mydict.pop("AA", None)
 
                # Prefix variables are supported starting with EAPI 3.
-               # eapi is None for 'depend' phase
-               if eapi in (None, "0", "1", "2"):
+               if phase == 'depend' or eapi in (None, "0", "1", "2"):
                        mydict.pop("ED", None)
                        mydict.pop("EPREFIX", None)
                        mydict.pop("EROOT", None)