Revert previous commit since it doesn't properly calculate masked and forced

flags for the package being matched (it erroneously uses the masked and forced
flags from the parent package).

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

diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index 89810eb2f4e0858079d5af364a2baaf097bea94f..0900fcfa8013a430d3567e6afb3764ea8c54f2fe 100644 (file)
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -169,26 +169,6 @@ class dbapi(object):
                                        continue
                                if atom.use.disabled.intersection(use):
                                        continue
-                       else:
-                               # Check masked and forced flags for repoman.
-                               mysettings = getattr(self, "mysettings", None)
-                               if mysettings is not None and not mysettings.local_config:
-
-                                       usemask = mysettings.usemask
-                                       conditional = atom.use.conditional
-                                       if usemask.intersection(atom.use.enabled):
-                                               continue
-                                       if conditional is not None and \
-                                               usemask.intersection(conditional.enabled):
-                                               continue
-
-                                       useforce = mysettings.useforce.difference(usemask)
-                                       if useforce.intersection(atom.use.disabled):
-                                               continue
-                                       if conditional is not None and \
-                                               useforce.intersection(conditional.disabled):
-                                               continue
-
                        yield cpv
 
        def invalidentry(self, mypath):