Bug #220341 - USE=multislot can make an installed package appear as if

it doesn't satisfy a slot dependency. Rebuilding the ebuild won't do
any good as long as USE=multislot is enabled since the newly built
package still won't have the expected slot. Therefore, assume that
such SLOT dependencies are already satisfied rather than forcing a
rebuild.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f7efbb6a9f4c0ea2d4eea68fa49ac87e307a3875..f245805cd63fbf8f2165e7aa48f0e72f3e795ea0 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2933,6 +2933,18 @@ class depgraph(object):
                                        cpv_list = db.xmatch("match-all", atom)
                                else:
                                        cpv_list = db.match(atom)
+
+                               # USE=multislot can make an installed package appear as if
+                               # it doesn't satisfy a slot dependency. Rebuilding the ebuild
+                               # won't do any good as long as USE=multislot is enabled since
+                               # the newly built package still won't have the expected slot.
+                               # Therefore, assume that such SLOT dependencies are already
+                               # satisfied rather than forcing a rebuild.
+                               if installed and not cpv_list and matched_packages \
+                                       and vardb.cpv_exists(matched_packages[-1].cpv) and \
+                                       portage.dep.dep_getslot(atom):
+                                       cpv_list = [matched_packages[-1].cpv]
+
                                if not cpv_list:
                                        continue
                                pkg_status = "merge"