From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 30 Jan 2011 21:00:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0d8fab0363aa1ebc1c5313140194f96dc0b0ea7;p=portage.git

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

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

f0d8fab0363aa1ebc1c5313140194f96dc0b0ea7
diff --cc pym/_emerge/actions.py
index 6e15b0490,2c6ce87d5..b19259a81
--- a/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/portage/dbapi/bintree.py
index 1600eb18f,254ed021d..fa6565416
--- a/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",