From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 25 Jan 2011 19:31:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbdb60f8e0a6b0ef86c20e94eab58e2eae080173;p=portage.git

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

bbdb60f8e0a6b0ef86c20e94eab58e2eae080173
diff --cc pym/_emerge/actions.py
index ce57d59a9,33a1f013f..6e15b0490
--- a/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")