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

Conflicts:
	pym/portage/data.py
	pym/portage/package/ebuild/config.py

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/portageq
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc cnf/make.globals
Simple merge

diff --cc pym/_emerge/actions.py
index 1ea3e81a56f3efab659665bc149112cdb2058650,a379af8c4b5ec72bc77dfb5c68a314827e29c5d9..f36df517977a2d7c7060d6d97177acdde4efc64d
--- 1/pym/_emerge/actions.py
--- 2/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -25,9 -25,9 +25,9 @@@ from itertools import chai
  import portage
  from portage import os
  from portage import digraph
- from portage import _unicode_decode
+ from portage import _unicode_decode, _unicode_encode
  from portage.cache.cache_errors import CacheError
 -from portage.const import NEWS_LIB_PATH
 +from portage.const import NEWS_LIB_PATH, EPREFIX
  from portage.dbapi.dep_expand import dep_expand
  from portage.output import blue, bold, colorize, create_color_func, darkgreen, \
        red, yellow

diff --cc pym/portage/__init__.py
Simple merge

diff --cc pym/portage/const.py
Simple merge

diff --cc pym/portage/data.py
index 2d745ff167c314d431bb9cee8b8bc84fe5caae5f,a9ac62ddc233cd3c8cfb9e96282ebf0ba967c837..39686c7154fa638322a2a5c5f1691bd18f06e32c
--- 1/pym/portage/data.py
--- 2/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -78,10 -74,14 +78,14 @@@ try
  except KeyError:
        pass
  
 -_portage_uname = os.environ.get('PORTAGE_USERNAME', 'portage')
 -_portage_grpname = os.environ.get('PORTAGE_GRPNAME', 'portage')
+ # Allow the overriding of the user used for 'userpriv' and 'userfetch'
++_portage_uname = os.environ.get('PORTAGE_USERNAME', PORTAGE_USERNAME)
++_portage_grpname = os.environ.get('PORTAGE_GRPNAME', PORTAGE_GROUPNAME)
+ 
  #Discover the uid and gid of the portage user/group
  try:
-       portage_uid=pwd.getpwnam(PORTAGE_USERNAME)[2]
-       portage_gid=grp.getgrnam(PORTAGE_GROUPNAME)[2]
+       portage_uid = pwd.getpwnam(_portage_uname)[2]
+       portage_gid = grp.getgrnam(_portage_grpname)[2]
        if secpass < 1 and portage_gid in os.getgroups():
                secpass=1
  except KeyError:

diff --cc pym/portage/package/ebuild/config.py
index d16e7abf7b0d57a7ae2247efbad84d8d3015f5bd,4e735e35d7cdb9081a095c0b5a7f140f83df5f62..d0b37906b8601ba83b5514c0ad0dce9012b04c08
--- 1/pym/portage/package/ebuild/config.py
--- 2/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -24,8 -24,8 +24,9 @@@ from portage import bsd_chflags, eapi_i
  from portage.const import CACHE_PATH, CUSTOM_PROFILE_PATH, \
        DEPCACHE_PATH, GLOBAL_CONFIG_PATH, INCREMENTALS, MAKE_CONF_FILE, \
        MODULES_FILE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, \
-       PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, USER_VIRTUALS_FILE, \
+       PRIVATE_PATH, PROFILE_PATH, SUPPORTED_FEATURES, USER_CONFIG_PATH, \
 -      USER_VIRTUALS_FILE
++      USER_VIRTUALS_FILE, \
 +      EPREFIX, EPREFIX_LSTRIP, BPREFIX
  from portage.data import portage_gid
  from portage.dbapi import dbapi
  from portage.dbapi.porttree import portdbapi

diff --cc pym/portage/package/ebuild/doebuild.py
index d33c58a7367f8c9b7af8e0d3b59173f83fd91fb7,e9a29362829403f14ddf8c064c251078c212547b..e2537f03a2f09194b328033f86344efdf774c4a7
--- 1/pym/portage/package/ebuild/doebuild.py
--- 2/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -31,10 -31,9 +31,10 @@@ portage.proxy.lazyimport.lazyimport(glo
  from portage import auxdbkeys, bsd_chflags, dep_check, \
        eapi_is_supported, merge, os, selinux, StringIO, \
        unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \
-       _shell_quote, _split_ebuild_name_glep55, _unicode_decode, _unicode_encode
+       _shell_quote, _unicode_decode, _unicode_encode
  from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
 -      EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY
 +      EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY, \
 +      EPREFIX, EPREFIX_LSTRIP
  from portage.data import portage_gid, portage_uid, secpass, \
        uid, userpriv_groups
  from portage.dbapi.virtual import fakedbapi

diff --cc pym/portage/util/__init__.py
Simple merge