[gentoo-commits] proj/portage:multilib commit in: bin/

[Thomas Sachau]

commit:     ea7212cfb57756e2e95d687cb1f2eda52cff934b
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 13:44:34 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 13:44:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea7212cf

phase-helpers.sh: Move multilib behind force-multilib FEATURE

---
 bin/phase-helpers.sh |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 8ede693..6e06044 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -196,11 +196,10 @@ use() {
 
 	# Make sure we have this USE flag in IUSE
 	elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
-		if [[ $u != multilib ]]; then
-		[[ $u =~ $PORTAGE_IUSE ]] || \
+		( [[ " ${FEATURES} " == *" force-multilib "* ]] && [[ $u == multilib ]] ) || \
+			[[ $u =~ $PORTAGE_IUSE ]] || \
 			eqawarn "QA Notice: USE Flag '${u}' not" \
 				"in IUSE for ${CATEGORY}/${PF}"
-		fi
 	fi
 
 	if has ${u} ${USE} ; then