[patch] add support for slot deps in package.keywords

pkeywords.patch (text/plain), 1.09 KB, created by Zac Medico on 2007-06-10 19:37:00 UTC

Index: pym/portage.py
===================================================================
--- pym/portage.py	(revision 6790)
+++ pym/portage.py	(revision 6791)
@@ -6299,13 +6299,14 @@
 
 		accept_keywords = self.mysettings["ACCEPT_KEYWORDS"].split()
 		pkgdict = self.mysettings.pkeywordsdict
+		aux_keys = ["KEYWORDS", "EAPI", "SLOT"]
 		for mycpv in mylist:
 			try:
-				keys, eapi = self.aux_get(mycpv, ["KEYWORDS", "EAPI"])
+				keys, eapi, slot = self.aux_get(mycpv, aux_keys)
 			except KeyError:
 				continue
 			except portage_exception.PortageException, e:
-				writemsg("!!! Error: aux_get('%s', ['KEYWORDS', 'EAPI'])\n" % \
+				writemsg("!!! Error: aux_get('%s', %s)\n" % (mycpv, aux_keys),
 					mycpv, noiselevel=-1)
 				writemsg("!!! %s\n" % str(e), noiselevel=-1)
 				del e
@@ -6316,7 +6317,8 @@
 			match=0
 			cp = dep_getkey(mycpv)
 			if pkgdict.has_key(cp):
-				matches = match_to_list(mycpv, pkgdict[cp].keys())
+				cpv_slot = "%s:%s" % (mycpv, slot)
+				matches = match_to_list(cpv_slot, pkgdict[cp].keys())
 				for atom in matches:
 					pgroups.extend(pkgdict[cp][atom])
 				if matches: