remove CDEPEND

ignore RDEPEND on --buildpkgonly

svn path=/main/branches/2.0/; revision=2046

diff --git a/bin/emerge b/bin/emerge
index 8f0971aa4dc33ee5fca238eb55a6f9617f457b5d..8f4edc75545c697d89e078681a38127599f5741e 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -985,7 +985,6 @@ class depgraph:
                                edepend["DEPEND"] =""
                                edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ")
                                edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ")
-                               edepend["CDEPEND"]=string.join(string.split(edepend["CDEPEND"])," ")
                                edepend["SLOT"]   =string.strip(edepend["SLOT"])
                                #portage.db[portage.root]["bintree"].gettbz2(mykey)
                        else: # It's local.
@@ -993,14 +992,16 @@ class depgraph:
                                edepend["DEPEND"] =""
                                edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
                                edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
-                               edepend["CDEPEND"]=string.join(mytbz2.getelements("CDEPEND")," ")
                                edepend["SLOT"]   =mytbz2.getfile("SLOT",mypkgparts[2])
                elif mytype=="ebuild":
                        try:
-                               mymeta = ["DEPEND","RDEPEND","PDEPEND","CDEPEND"]
+                               mymeta = ["DEPEND","RDEPEND","PDEPEND"]
                                myfoo = portage.portdb.aux_get(mykey, mymeta)
                                for index in range(0,len(mymeta)):
                                        edepend[mymeta[index]] = myfoo[index]
+                               if "--buildpkgonly" in myopts:
+                                       edepend["RDEPEND"] = ""
+                                       edepend["PDEPEND"] = ""
                        except (KeyError,IOError):
                                print "emerge: create(): aux_get() error on",mykey+"; aborting..."
                                sys.exit(1)