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

Conflicts:
	pym/_emerge/Package.py
	pym/portage/dbapi/bintree.py

EPREFIX var caused trouble in the various lists that DEFINED_PHASES is
now added to too.

diff --cc pym/_emerge/Package.py
index 87055ec716b253af42642df5e79de32e90253792,bce4e6cbec50d5ef6f5abce900a707e3da444030..f45ed39cc1b4fa5679a3fa0016b806653ac8993d
--- 1/pym/_emerge/Package.py
--- 2/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@@ -30,8 -29,8 +30,8 @@@ class Package(Task)
                "BUILD_TIME", "CHOST", "COUNTER", "DEPEND", "EAPI",
                "INHERITED", "IUSE", "KEYWORDS",
                "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND",
-               "repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_",
-               "EPREFIX" ]
+               "repository", "PROPERTIES", "RESTRICT", "SLOT", "USE",
 -              "_mtime_", "DEFINED_PHASES"]
++              "_mtime_", "DEFINED_PHASES", "EPREFIX"]
  
        def __init__(self, **kwargs):
                Task.__init__(self, **kwargs)

diff --cc pym/portage/dbapi/bintree.py
index 0e7c7f0655c49ef1cee1fcd4370c6c47a0521cf7,997d629a875bb40405cacea52d76001db2ea2119..db498083176226823ef0e0fba73efaf49c9dc822
--- 1/pym/portage/dbapi/bintree.py
--- 2/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -54,8 -53,7 +54,8 @@@ class bindbapi(fakedbapi)
                self._aux_cache_keys = set(
                        ["BUILD_TIME", "CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS",
                        "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE",
-                       "RDEPEND", "repository", "RESTRICT", "SLOT", "USE",
 -                      "RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES"])
++                      "RDEPEND", "repository", "RESTRICT", "SLOT", "USE", "DEFINED_PHASES",
 +                      "EPREFIX"])
                self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys)
                self._aux_cache = {}
  
@@@ -190,8 -188,7 +190,8 @@@ class binarytree(object)
                        self._pkgindex_aux_keys = \
                                ["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
                                "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
-                               "PROVIDE", "RDEPEND", "repository", "SLOT", "USE",
 -                              "PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES"]
++                              "PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
 +                              "EPREFIX"]
                        self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
                        self._pkgindex_use_evaluated_keys = \
                                ("LICENSE", "RDEPEND", "DEPEND",
@@@ -215,9 -212,10 +215,10 @@@
                                "RDEPEND" : "",
                                "RESTRICT": "",
                                "SLOT"    : "0",
-                               "USE"     : ""
+                               "USE"     : "",
+                               "DEFINED_PHASES" : ""
                        }
 -                      self._pkgindex_inherited_keys = ["CHOST", "repository"]
 +                      self._pkgindex_inherited_keys = ["CHOST", "repository", "EPREFIX"]
                        self._pkgindex_default_header_data = {
                                "repository":""
                        }

diff --cc pym/portage/dbapi/vartree.py
Simple merge