Remove legacy "masked by: profile" support as per bug #149508. Profiles should use...

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

diff --git a/NEWS b/NEWS
index 0f8ef639db7fb3ba5a8b2ca7485fca52b303ade6..08f2669b755bb05061b8a368876ba090106a72b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ News (mainly features/major bug fixes)
 portage-2.1.3
 -------------
 
+* Legacy "masked by: profile" support has been removed.  Profiles should use
+  package.mask to mask unwanted versions of system packages.
 * Allow per-module setting of PORTAGE_ELOG_CLASSES
 * Add ** as new token for package.keywords to bypass the keyword visibility layer
 * Namespace sanitizing: move all portage related code into portage.* namespace,

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index be170fed8f55bf45d106ffff12bc3a5e90297257..08e6961492adf2463e7246ec31ec62cce423fd42 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -613,23 +613,6 @@ class portdbapi(dbapi):
                                                except ValueError:
                                                        pass
 
-               revmaskdict = self.mysettings.prevmaskdict
-               if revmaskdict.has_key(mycp):
-                       for x in revmaskdict[mycp]:
-                               #important: only match against the still-unmasked entries...
-                               #notice how we pass "newlist" to the xmatch() call below....
-                               #Without this, ~ deps in the packages files are broken.
-                               mymatches = self.xmatch("match-list", x, mylist=newlist)
-                               if mymatches is None:
-                                       #error in packages file; print warning and continue:
-                                       print "emerge: visible(): profile packages entry \""+x+"\" is invalid, ignoring..."
-                                       continue
-                               pos = 0
-                               while pos < len(newlist):
-                                       if newlist[pos] not in mymatches:
-                                               del newlist[pos]
-                                       else:
-                                               pos += 1
                return newlist
 
        def gvisible(self,mylist):