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

svn path=/main/trunk/; revision=15050

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4e0d8cc830039b5be4265daf49f9852970dcfa82..e4ff736c52acefda693c6baabbd1dd5bb9030871 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)