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

Conflicts:
	bin/emerge-webrsync
	pym/portage/data.py
	pym/portage/package/ebuild/doebuild.py

diff --cc bin/ebuild
index e415ca38d045127cdfb5c0f967b907859345e019,7d543a1090af2443f95e844379cbb3426e6d51b5..f9854483e44630f310e32c7ea8b439a9282d2bc6
--- 1/bin/ebuild
--- 2/bin/ebuild
+++ b/bin/ebuild
@@@ -62,16 -62,18 +62,20 @@@ if "merge" in pargs
        os.environ["FEATURES"] = os.environ.get("FEATURES", "") + " -noauto"
  
  os.environ["PORTAGE_CALLER"]="ebuild"
 -try:
 -      import portage
 -except ImportError:
 -      from os import path as osp
 -      sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 -      import portage
 +# for an explanation on this logic, see pym/_emerge/__init__.py
 +from os import environ as ose
 +from os import path as osp
 +if ose.__contains__("PORTAGE_PYTHONPATH"):
 +    sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
 +else:
 +    sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.                    realpath(__file__))), "pym"))
 +import portage
  
  from portage import os
+ from portage import _encodings
+ from portage import _shell_quote
+ from portage import _unicode_decode
+ from portage import _unicode_encode
  
  if not opts.ignore_default_opts:
        default_opts = portage.settings.get("EBUILD_DEFAULT_OPTS", "").split()

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/emerge-webrsync
index 20681a8f6c7986cfd49397bc016720518381541d,6964168b6b8d000ec44177e10baacd8c9a6c02fd..2cd3efccc41fa16454aa52d342289e9fcc3a1e8a
--- 1/bin/emerge-webrsync
--- 2/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@@ -34,7 -34,7 +34,8 @@@ f
  eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \
        PORTAGE_BIN_PATH PORTAGE_GPG_DIR \
        PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \
-       http_proxy ftp_proxy EPREFIX PORTAGE_USER PORTAGE_GROUP)
 -      SYNC http_proxy ftp_proxy)
++      SYNC http_proxy ftp_proxy \
++      EPREFIX PORTAGE_USER PORTAGE_GROUP)
  DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
  export http_proxy ftp_proxy
  

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

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/Package.py
Simple merge

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/_emerge/main.py
Simple merge

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

diff --cc pym/portage/data.py
index ebe8e39911ca68bf2d15ad0607121bdc8bdc8257,debf419dd74a40eb85aa7557d230ca3143b55f56..2d745ff167c314d431bb9cee8b8bc84fe5caae5f
--- 1/pym/portage/data.py
--- 2/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -80,8 -76,8 +80,8 @@@ except KeyError
  
  #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")[2]
 -      portage_gid=grp.getgrnam("portage")[2]
++      portage_uid=pwd.getpwnam(PORTAGE_USERNAME)[2]
++      portage_gid=grp.getgrnam(PORTAGE_GROUPNAME)[2]
        if secpass < 1 and portage_gid in os.getgroups():
                secpass=1
  except KeyError:

diff --cc pym/portage/dbapi/bintree.py
Simple merge

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

diff --cc pym/portage/package/ebuild/doebuild.py
index 5ef950f0ad593402fefe826959ee187ee4046b96,531cb2386d38ef56bd9cad9aedab7208493300ea..d33c58a7367f8c9b7af8e0d3b59173f83fd91fb7
--- 1/pym/portage/package/ebuild/doebuild.py
--- 2/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -32,8 -32,8 +32,9 @@@ from portage import auxdbkeys, bsd_chfl
        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
- from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_BINARY, \
-       INVALID_ENV_FILE, MISC_SH_BINARY, EPREFIX, EPREFIX_LSTRIP
+ 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