From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 2 Dec 2011 19:18:59 +0000 (+0100)
Subject: Merge commit 'v2.2.0_alpha76' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=50bc7775ba7b326c5f7dc384f9f01e2c3e0e4466;p=portage.git

Merge commit 'v2.2.0_alpha76' into prefix
---

50bc7775ba7b326c5f7dc384f9f01e2c3e0e4466
diff --cc pym/portage/package/ebuild/config.py
index aef3c5e8c,835cd2385..b7b23ae46
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -22,9 -22,9 +22,9 @@@ from portage import bsd_chflags, 
  	load_mod, os, selinux, _unicode_decode
  from portage.const import CACHE_PATH, \
  	DEPCACHE_PATH, INCREMENTALS, MAKE_CONF_FILE, \
- 	MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \
+ 	MODULES_FILE_PATH, \
  	PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \
 -	USER_VIRTUALS_FILE
 +	USER_VIRTUALS_FILE 
  from portage.const import _SANDBOX_COMPAT_LEVEL
  from portage.dbapi import dbapi
  from portage.dbapi.porttree import portdbapi