From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Fri, 23 Jul 2010 10:36:08 +0000 (+0200)
Subject: Make atoms with wildcards work in package.license
X-Git-Tag: v2.2_rc68~475
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0298465c7952c721ab8799736fa05bce87578482;p=portage.git

Make atoms with wildcards work in package.license
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 3ba8cc311..2c92f1546 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1873,7 +1873,13 @@ class config(object):
 		@return: A list of licenses that have not been accepted.
 		"""
 		accept_license = self._accept_license
-		cpdict = self._plicensedict.get(cpv_getkey(cpv), None)
+		cp = cpv_getkey(cpv)
+		c, p = catsplit(cp)
+		cpdict = {}
+		cpdict.update(self._plicensedict.get("*/*", {}))
+		cpdict.update(self._plicensedict.get(c+"/*", {}))
+		cpdict.update(self._plicensedict.get("*/"+p, {}))
+		cpdict.update(self._plicensedict.get(cp, {}))
 		if cpdict:
 			accept_license = list(self._accept_license)
 			cpv_slot = "%s:%s" % (cpv, metadata["SLOT"])