Fix depgraph._wrapped_select_pkg_highest_available_imp() to check

USE settings for installed packages when --newuse is enabled in
cases when none of the packages match a given USE dep.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 94e55e173d22eba8e362a532daf72c9eb9f991ae..d2b64c4b0d97c589201ac62f2a22c623e34d9505 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2565,6 +2565,7 @@ class depgraph(object):
                portdb = self._frozen_config.roots[root].trees["porttree"].dbapi
                # List of acceptable packages, ordered by type preference.
                matched_packages = []
+               matched_pkgs_ignore_use = []
                highest_version = None
                if not isinstance(atom, portage.dep.Atom):
                        atom = portage.dep.Atom(atom)
@@ -2726,6 +2727,7 @@ class depgraph(object):
                                                        # since IUSE cannot be adjusted by the user.
                                                        continue
 
+                                               matched_pkgs_ignore_use.append(pkg)
                                                if allow_use_changes:
                                                        target_use = {}
                                                        for flag in atom.use.enabled:
@@ -2794,7 +2796,7 @@ class depgraph(object):
                                                break
                                        # Compare built package to current config and
                                        # reject the built package if necessary.
-                                       if built and (not installed or matched_packages) and \
+                                       if built and (not installed or matched_pkgs_ignore_use) and \
                                                ("--newuse" in self._frozen_config.myopts or \
                                                "--reinstall" in self._frozen_config.myopts or \
                                                "--binpkg-respect-use" in self._frozen_config.myopts):