Include masked flags in PORTAGE_IUSE to avoid more false positives

in the useq() IUSE check.

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1cdbda2c853f19c2b639b8534462267907ea36ec..f0f80c3f068cd51e05c3f4a8e9a1061e7c9f17b4 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2391,6 +2391,7 @@ class config(object):
                #
                #  * Flags derived from ARCH
                #  * Flags derived from USE_EXPAND_HIDDEN variables
+               #  * Masked flags, such as those from {,package}use.mask
                #  * Forced flags, such as those from {,package}use.force
 
                if self.mycpv:
@@ -2410,9 +2411,9 @@ class config(object):
                                        if use_expand_hidden.match(x):
                                                iuse_implicit.add(x)
 
-                       # Flags that have been forced.
-                       iuse_implicit.update(x for x in self.useforce \
-                               if x not in self.usemask)
+                       # Flags that have been masked or forced.
+                       iuse_implicit.update(self.usemask)
+                       iuse_implicit.update(self.useforce)
 
                        iuse_grep = iuse_implicit.copy()
                        if use_expand_hidden_raw: