From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 17 Aug 2010 16:46:20 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=86e8de7f8f07c145170f2bdd2c81c40192b216bb;p=portage.git

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

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

86e8de7f8f07c145170f2bdd2c81c40192b216bb
diff --cc bin/ebuild-helpers/emake
index 78582da9d,b019bfe97..1b47c041c
--- a/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 pym/_emerge/EbuildBuild.py
index 092da80a4,b8694df96..42868ee4e
--- a/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",