In order to ensure correct merge order such that build time dependencies will really...

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

diff --git a/bin/emerge b/bin/emerge
index c0c82058d5c07573a75fc332c8c3e0a8628e17f1..eb3547c3537b5801dcf2719fd2d5980c57dba11d 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -858,8 +858,13 @@ class depgraph:
                        if not self.select_dep("/", edepend["DEPEND"], myparent=mp,
                                myuse=myuse):
                                return 0
+                       """RDEPEND is soft by definition.  However, in order to ensure
+                       correct merge order, we make it a hard dependency.  Otherwise, a
+                       build time dependency might not be usable due to it's run time
+                       dependencies not being installed yet.
+                       """
                        if not self.select_dep(myroot,edepend["RDEPEND"], myparent=mp,
-                               myuse=myuse, soft_deps=True):
+                               myuse=myuse, soft_deps=False):
                                return 0
                        if edepend.has_key("PDEPEND") and edepend["PDEPEND"]:
                                # Post Depend -- Add to the list without a parent, as it depends