From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 27 May 2010 18:00:17 +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=5914c0578bbcc9aeaaf77209cc75af2c003f63be;p=portage.git

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

Conflicts:
	bin/ebuild.sh
---

5914c0578bbcc9aeaaf77209cc75af2c003f63be
diff --cc bin/ebuild.sh
index 3c32cfcae,b46d14a63..3b925e704
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2173,7 -2185,8 +2178,8 @@@ elif [[ -n $EBUILD_SH_ARGS ]] ; the
  		if ! hasq "$EBUILD_SH_ARGS" clean help info nofetch ; then
  			umask 002
  			save_ebuild_env | filter_readonly_variables > "$T/environment"
+ 			assert "save_ebuild_env failed"
 -			chown portage:portage "$T/environment" &>/dev/null
 +			chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} "$T/environment" &>/dev/null
  			chmod g+w "$T/environment" &>/dev/null
  		fi
  		exit 0
diff --cc bin/misc-functions.sh
index 8a3cb4e24,16d3016d5..e11991f00
mode 100644,100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh