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

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

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

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

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

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

diff --cc pym/portage/_sets/files.py
Simple merge

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

diff --cc pym/portage/dbapi/vartree.py
index 138cb86276ecd4a92c715fe3297ce10e4c5556c1,b76b669552fe819318d7aa7802d8f9a02f0c5b36..f1447c8abb132a40ce5ad8342613f3e8cdc1086a
--- 1/pym/portage/dbapi/vartree.py
--- 2/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@@ -35,9 -32,10 +35,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  )
  
  from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, \
 -      PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH
 +      PORTAGE_PACKAGE_ATOM, PRIVATE_PATH, VDB_PATH, EPREFIX, EPREFIX_LSTRIP, BASH_BINARY
  from portage.const import _ENABLE_DYN_LINK_MAP, _ENABLE_PRESERVE_LIBS
  from portage.dbapi import dbapi
+ from portage.dep import _slot_separator
  from portage.exception import CommandNotFound, \
        InvalidData, InvalidPackageName, \
        FileNotFound, PermissionDenied, UnsupportedAPIException

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

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

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