From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 2 Feb 2011 16:49:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=de976a11529d4810ed382eac7c6cdf963a848934;p=portage.git

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

Conflicts:
	pym/_emerge/EbuildBuild.py
---

de976a11529d4810ed382eac7c6cdf963a848934
diff --cc pym/_emerge/EbuildBuild.py
index cbb3ea5ab,afd6399cb..a6fed37ff
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@@ -16,7 -16,7 +16,8 @@@ from portage import o
  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
+ from portage.package.ebuild._spawn_nofetch import spawn_nofetch
  
  class EbuildBuild(CompositeTask):