From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Mar 2008 13:07:05 +0000 (-0000)
Subject: Bug #213629 - Use EAPI.incompatible in cases where EAPI=0 and a default
X-Git-Tag: v2.1.5~313
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5934a389dd13397baa88781bdc1221accb1ad26;p=portage.git

Bug #213629 - Use EAPI.incompatible in cases where EAPI=0 and a default
IUSE is encountered.

svn path=/main/branches/2.1.2/; revision=9577
---

diff --git a/bin/repoman b/bin/repoman
index cc558d691..38de132ed 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1679,8 +1679,15 @@ for x in scanlist:
 			for mypos in range(len(myuse)-1,-1,-1):
 				if myuse[mypos] and (myuse[mypos] in luselist[mykey]):
 					del myuse[mypos]
-		if default_use and myaux["EAPI"] == "0":
-			myuse += default_use
+
+		if default_use and eapi == "0":
+			for myflag in default_use:
+				stats['EAPI.incompatible'] += 1
+				fails['EAPI.incompatible'].append(
+					(relative_path + ": IUSE defaults" + \
+					" not supported with EAPI='%s':" + \
+					" '%s'") % (eapi, myflag))
+
 		for mypos in range(len(myuse)):
 			stats["IUSE.invalid"]=stats["IUSE.invalid"]+1
 			fails["IUSE.invalid"].append(x+"/"+y+".ebuild: %s" % myuse[mypos])