From 0c38140e331c040530bf1d6c5716696162790bda Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 1 Jan 2013 15:50:21 -0800
Subject: use(): fatal missing IUSE in EAPI 5, bug #449708

---
 bin/phase-helpers.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 8a78f372b..383f9ff5e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -212,9 +212,15 @@ use() {
 
 	# Make sure we have this USE flag in IUSE
 	elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE ]] ; then
-		[[ $u =~ $PORTAGE_IUSE ]] || \
+		if [[ ! $u =~ $PORTAGE_IUSE ]] ; then
+			if [[ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
+				# This is only strict starting with EAPI 5, since implicit IUSE
+				# is not well defined for earlier EAPIs (see bug #449708).
+				die "USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}"
+			fi
 			eqawarn "QA Notice: USE Flag '${u}' not" \
 				"in IUSE for ${CATEGORY}/${PF}"
+		fi
 	fi
 
 	local IFS=$' \t\n' prev_shopts=$- ret
-- 
cgit v1.2.3-1-g7c22