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

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

diff --cc pym/_emerge/Package.py
Simple merge

diff --cc pym/_emerge/actions.py
index 6e15b0490aead0190c7076987640e065b114d6bb,2c6ce87d54301eb747355075c64f18aa29705309..b19259a81f47be88d5dcb2709db0c8503edc352f
--- 1/pym/_emerge/actions.py
--- 2/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -28,8 -28,8 +28,8 @@@ from portage import o
  from portage import digraph
  from portage import _unicode_decode
  from portage.cache.cache_errors import CacheError
 -from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH
 +from portage.const import GLOBAL_CONFIG_PATH, NEWS_LIB_PATH, EPREFIX
- from portage.const import _ENABLE_DYN_LINK_MAP
+ from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_SET_CONFIG
  from portage.dbapi.dep_expand import dep_expand
  from portage.dep import Atom, extended_cp_match
  from portage.exception import InvalidAtom

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/__init__.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
index 1600eb18f6f91da590ee5ec8cc6bb01c4e562e65,254ed021d134dd31fb710294e47363379bebf6fc..fa6565416a739c514521d738fcf4cc5c4e05a3eb
--- 1/pym/portage/dbapi/bintree.py
--- 2/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@@ -243,7 -241,7 +242,7 @@@ class binarytree(object)
                                ["BUILD_TIME", "CHOST", "DEPEND", "DESCRIPTION", "EAPI",
                                "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES",
                                "PROVIDE", "RDEPEND", "repository", "SLOT", "USE", "DEFINED_PHASES",
-                               "REQUIRED_USE", "EPREFIX"]
 -                              "REQUIRED_USE", "BASE_URI"]
++                              "REQUIRED_USE", "BASE_URI", "EPREFIX"]
                        self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
                        self._pkgindex_use_evaluated_keys = \
                                ("LICENSE", "RDEPEND", "DEPEND",

diff --cc pym/portage/package/ebuild/_config/MaskManager.py
Simple merge

diff --cc pym/portage/package/ebuild/config.py
Simple merge