For emerge dep_check calls, use a config instance that has the correct state and...

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

diff --git a/bin/emerge b/bin/emerge
index 5bcb6eaa48606e2ad820dfb25adb774e7eb89050..e18aa779427a19d8cb7cd6b7a145cb7331f453fe 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1017,8 +1017,15 @@ class depgraph:
                        #processing dependencies
                        """ Call portage.dep_check to evaluate the use? conditionals and make sure all
                        dependencies are satisfiable. """
+                       if myparent:
+                               p_type, p_root, p_key, p_status = myparent.split()
+                               dep_settings = self.pkgsettings[p_root]
+                               dep_settings.setcpv(p_key)
+                       else:
+                               dep_settings = self.pkgsettings[self.target_root]
+                               dep_settings.reset()
                        mycheck = portage.dep_check(depstring, self.mydbapi[myroot],
-                               pkgsettings, myuse=myuse,
+                               dep_settings, myuse=myuse,
                                use_binaries=("--usepkgonly" in self.myopts),
                                myroot=myroot, trees=self.trees)