Add new ** for package.keywords token to bypass keyword visibility layer

svn path=/main/trunk/; revision=5759

diff --git a/NEWS b/NEWS
index c24b5ecc355c0ab617d02aeccdd63a2d8e5cd2cc..b8667c70e3858f4688f5ab67ec67483c0c966994 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,13 @@
 News (mainly features/major bug fixes)
 
+portage-2.1.3
+-------------
+
+* Allow per-module setting of PORTAGE_ELOG_CLASSES
+* Add ** as new token for package.keywords to bypass the keyword visibility layer
+
 portage-2.1.2
-------------
+-------------
 
 * Ebuilds support default USE flags via +flag in IUSE.
 * New-style virtuals are now usable for packages that depend on themselves for
@@ -32,7 +38,7 @@ portage-2.1.2
 * FEATURES="test" automatically implies USE="test".
 
 portage-2.1.1
-------------
+-------------
 
 * Profiles support use.force, package.use.force, and package.use.mask files.
 

diff --git a/pym/portage.py b/pym/portage.py
index c4dce04ac9c27baf85119d214be79d1b48b65da1..b434b338ef1391a92a15bfbe7b64dc02a1983a7a 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6211,6 +6211,8 @@ class portdbapi(dbapi):
                                if matches:
                                        inc_pgroups = []
                                        for x in pgroups:
+                                               # The -* special case should be removed once the tree 
+                                               # is clean of KEYWORDS=-* crap
                                                if x != "-*" and x.startswith("-"):
                                                        try:
                                                                inc_pgroups.remove(x[1:])
@@ -6235,7 +6237,7 @@ class portdbapi(dbapi):
                                        hastesting = True
                                elif gp[0] != "-":
                                        hasstable = True
-                       if not match and ((hastesting and "~*" in pgroups) or (hasstable and "*" in pgroups)):
+                       if not match and ((hastesting and "~*" in pgroups) or (hasstable and "*" in pgroups) or "**" in pgroups):
                                match=1
                        if match and eapi_is_supported(eapi):
                                newlist.append(mycpv)