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

Conflicts:
	bin/ebuild-helpers/emake
	pym/_emerge/EbuildBuild.py
	pym/_emerge/EbuildFetcher.py

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild-helpers/emake
index 78582da9d44022f996fdf0526e7b4545ad595b63,b019bfe97b51f36541318e18a27134535dbee6bc..1b47c041ca46a3241d60185c70be7e5a99099b50
--- 1/bin/ebuild-helpers/emake
--- 2/bin/ebuild-helpers/emake
+++ b/bin/ebuild-helpers/emake
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2006 Gentoo Foundation
+ # Copyright 1999-2010 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  #
  # emake: Supplies some default parameters to GNU make. At the moment the
@@@ -10,6 -10,8 +10,8 @@@
  #        /etc/make.globals here because emake is only called from an
  #        ebuild.
  
 -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
++source "${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}"/isolated-functions.sh
+ 
  if [[ $PORTAGE_QUIET != 1 ]] ; then
        (
        for arg in ${MAKE:-make} $MAKEOPTS $EXTRA_EMAKE "$@" ; do

diff --cc bin/portageq
Simple merge

diff --cc bin/repoman
Simple merge

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

diff --cc pym/_emerge/EbuildBuild.py
index 092da80a470c2780792b06c2d33fcab5027ae557,b8694df96911b57178267c421627880dc6f345da..42868ee4e42b1c23486936ab55d6e9d200daf97a
--- 1/pym/_emerge/EbuildBuild.py
--- 2/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@@ -17,7 -17,9 +17,10 @@@ from portage import _encoding
  from portage import _unicode_encode
  import codecs
  from portage.output import colorize
+ from portage.package.ebuild.digestcheck import digestcheck
+ from portage.package.ebuild.doebuild import _check_temp_dir
 +from portage.const import EPREFIX
+ 
  class EbuildBuild(CompositeTask):
  
        __slots__ = ("args_set", "config_pool", "find_blockers",

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

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

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

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

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

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

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

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