From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 8 Sep 2010 17:36:12 +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=8fb168d46a2ca82e2e6dabd7f272517bef1dcf8a;p=portage.git

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

8fb168d46a2ca82e2e6dabd7f272517bef1dcf8a
diff --cc bin/ebuild.sh
index df9fc69be,cc3b4a142..291b3a1ab
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2318,9 -2314,10 +2330,10 @@@ elif [[ -n $EBUILD_SH_ARGS ]] ; the
  		# Save the env only for relevant phases.
  		if ! hasq "$EBUILD_SH_ARGS" clean help info nofetch ; then
  			umask 002
- 			save_ebuild_env | filter_readonly_variables > "$T/environment"
+ 			save_ebuild_env | filter_readonly_variables \
+ 				--filter-features > "$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
  		[[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"