Fix --newuse so that it works correctly with --usepkg.

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

diff --git a/bin/emerge b/bin/emerge
index 059140140bd0d45e6474bdab2a3579cff148b3a5..da873ed8324822da87801394a3ed449296dc9163 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1130,9 +1130,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)