Merge commit 'v2.2.0_alpha76' into prefix

diff --cc cnf/make.conf
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/package/ebuild/config.py
index aef3c5e8cfa0fae52338cc4be7fb86c3f1540fa0,835cd2385b1f64211c5d04aafa1a410f67c46b52..b7b23ae4619a8fb8fd7cbb3eb209883d2f47d3ae
--- 1/pym/portage/package/ebuild/config.py
--- 2/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

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