From ecd5ec2c060f0cfeaf13965bba67aed31e2c9093 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 9 Jul 2011 17:51:06 -0700
Subject: [PATCH] slot_collision: be consistent with missing IUSE

Special handling for missing IUSE that was introduced in commit
9a193d42032005396800eb30e550691513529c79 is also useful in one
more spot.

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index d43b889..0042997 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -337,14 +337,21 @@ class slot_conflict_handler(object):
 							#are fewer possible solutions.
 							use = sub_type
 							for ppkg, atom, other_pkg in parents:
-								parent_use = None
-								if isinstance(ppkg, Package):
-									parent_use = _pkg_use_enabled(ppkg)
-								violated_atom = atom.unevaluated_atom.violated_conditionals( \
-									_pkg_use_enabled(other_pkg), other_pkg.iuse.is_valid_flag,
-									parent_use=parent_use)
-								if use in violated_atom.use.enabled.union(violated_atom.use.disabled):
+								missing_iuse = other_pkg.iuse.get_missing_iuse(
+									atom.unevaluated_atom.use.required)
+								if missing_iuse:
 									unconditional_use_deps.add((ppkg, atom))
+								else:
+									parent_use = None
+									if isinstance(ppkg, Package):
+										parent_use = _pkg_use_enabled(ppkg)
+									violated_atom = atom.unevaluated_atom.violated_conditionals(
+										_pkg_use_enabled(other_pkg),
+										other_pkg.iuse.is_valid_flag,
+										parent_use=parent_use)
+									if use in violated_atom.use.enabled or \
+										use in violated_atom.use.disabled:
+										unconditional_use_deps.add((ppkg, atom))
 								# When USE flags are removed, it can be
 								# essential to see all broken reverse
 								# dependencies here, so don't omit any.