Remove the installed package masking hack from bug #149816 since

installed packages should be able to satisfy dependencies whether
they are masked or not (matches current trunk behavior).

svn path=/main/branches/2.1.2/; revision=8441

diff --git a/bin/emerge b/bin/emerge
index 2c79af69e15cddfc7434d55931d08210d9ff2ab9..947096388cc00da0fc033b059a4711680e20fbef 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1960,11 +1960,6 @@ class depgraph:
                                        last resort because the metadata tends to diverge from that
                                        of the ebuild in the tree."""
                                        myeb_inst_matches = vardb.match(x)
-                                       if "--usepkgonly" not in self.myopts:
-                                               """ TODO: Improve masking check for installed and
-                                               binary packages. bug #149816"""
-                                               myeb_inst_matches = [pkg for pkg in myeb_inst_matches \
-                                                       if not portdb.cpv_exists(pkg)]
                                        myeb_inst = None
                                        if myeb_inst_matches:
                                                myeb_inst = portage.best(myeb_inst_matches)