Fix --newuse so that it works correctly with --usepkg. (trunk r5859)

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

diff --git a/bin/emerge b/bin/emerge
index 620fda4340e7254e6b81aff8b2d57bd2306614e4..8688cbfb0e3d3f71cd5eadc5d12b190dd1b6f101 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1129,9 +1129,8 @@ class depgraph:
                            If the package has new iuse flags or different use flags then if
                            --newuse is specified, we need to merge the package. """
                        if merging==0 and "--newuse" in self.myopts and \
-                               mytype == "ebuild" and \
                                vardbapi.cpv_exists(mykey):
-                               pkgsettings.setcpv(mykey, mydb=portdb)
+                               pkgsettings.setcpv(mykey, mydb=mydbapi)
                                forced_flags = set()
                                forced_flags.update(pkgsettings.useforce)
                                forced_flags.update(pkgsettings.usemask)