From c192360e121c3b652d25f907b29d5174842a253d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 28 Mar 2008 13:02:47 +0000
Subject: [PATCH] Bug #209418 - Add a new KEYWORDS.dropped check that compares
 keywords against the keywords of earlier ebuild versions within a slot.
 (trunk r9522)

svn path=/main/branches/2.1.2/; revision=9575
---
 bin/repoman   | 32 +++++++++++++++++++++++++++++++-
 man/repoman.1 |  3 +++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/bin/repoman b/bin/repoman
index f1cb3016e..cb6c7efc9 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -166,6 +166,7 @@ qahelp={
 	"file.size":"Files in the files directory must be under 20k",
 	"file.name":"File/dir name must be composed of only the following chars: %s " % allowed_filename_chars,
 	"file.UTF8":"File is not UTF8 compliant",
+	"KEYWORDS.dropped":"Ebuilds that appear to have dropped KEYWORDS for some arch",
 	"KEYWORDS.missing":"Ebuilds that have a missing or empty KEYWORDS variable",
 	"KEYWORDS.stable":"Ebuilds that have been added directly with stable KEYWORDS",
 	"KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask", 
@@ -234,6 +235,7 @@ qawarnings=[
 "DEPEND.badindev","RDEPEND.badindev","PDEPEND.badindev",
 "DEPEND.badmaskedindev","RDEPEND.badmaskedindev","PDEPEND.badmaskedindev",
 "DESCRIPTION.toolong",
+"KEYWORDS.dropped",
 "KEYWORDS.stupid",
 "KEYWORDS.missing",
 "RESTRICT.invalid",
@@ -1157,7 +1159,19 @@ for x in scanlist:
 				fails["EAPI.unsupported"].append(os.path.join(x, y))
 				continue
 			ebuild_metadata[pf] = myaux
-	ebuildlist.sort()
+
+	# Sort ebuilds in ascending order for the KEYWORDS.dropped check.
+	pkgsplits = {}
+	for i in xrange(len(ebuildlist)):
+		ebuild_split = tuple(portage.pkgsplit(ebuildlist[i]))
+		pkgsplits[ebuild_split] = ebuildlist[i]
+		ebuildlist[i] = ebuild_split
+	ebuildlist.sort(portage.pkgcmp)
+	for i in xrange(len(ebuildlist)):
+		ebuildlist[i] = pkgsplits[ebuildlist[i]]
+	del pkgsplits
+
+	slot_keywords = {}
 
 	if len(ebuild_metadata) != len(ebuildlist):
 		# If we can't access all the metadata then it's totally unsafe to
@@ -1508,6 +1522,22 @@ for x in scanlist:
 					x + "/" + y + ".ebuild added with stable keywords: %s" % \
 						" ".join(stable_keywords))
 
+		ebuild_archs = set(kw.lstrip("~") for kw in keywords \
+			if not kw.startswith("-"))
+
+		previous_keywords = slot_keywords.get(myaux["SLOT"])
+		if previous_keywords is None:
+			slot_keywords[myaux["SLOT"]] = set()
+		else:
+			dropped_keywords = previous_keywords.difference(ebuild_archs)
+			if dropped_keywords:
+				stats["KEYWORDS.dropped"] += 1
+				fails["KEYWORDS.dropped"].append(
+					relative_path + ": %s" % \
+					" ".join(sorted(dropped_keywords)))
+
+		slot_keywords[myaux["SLOT"]].update(ebuild_archs)
+
 		# KEYWORDS="-*" is a stupid replacement for package.mask and screws general KEYWORDS semantics
 		if "-*" in keywords:
 			haskeyword = False
diff --git a/man/repoman.1 b/man/repoman.1
index be0150aa1..e10f2fd48 100644
--- a/man/repoman.1
+++ b/man/repoman.1
@@ -111,6 +111,9 @@ Ebuilds that have a missing or empty HOMEPAGE variable
 .B IUSE.invalid
 This build has a variable in IUSE that is not in the use.desc or use.local.desc file
 .TP
+.B KEYWORDS.dropped
+Ebuilds that appear to have dropped KEYWORDS for some arch
+.TP
 .B KEYWORDS.invalid
 This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for which no valid profile was found
 .TP
-- 
2.26.2