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

diff --cc pym/_emerge/actions.py
index ce57d59a9b3092095f6e1cc92903dd70663b9dd6,33a1f013fc4813c4628d69017573a67fc4dd39ff..6e15b0490aead0190c7076987640e065b114d6bb
--- 1/pym/_emerge/actions.py
--- 2/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -28,9 -28,11 +28,11 @@@ 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.dbapi.dep_expand import dep_expand
+ from portage.dep import Atom, extended_cp_match
+ from portage.exception import InvalidAtom
  from portage.output import blue, bold, colorize, create_color_func, darkgreen, \
        red, yellow
  good = create_color_func("GOOD")