--- bin/emerge.orig	2006-07-12 00:56:19 -0400
+++ bin/emerge	2006-07-12 06:17:10 -0400
@@ -198,7 +198,8 @@ actions=[
 "sync",  "system", "unmerge",  "world",
 ]
 options=[
-"--ask",          "--alphabetical",
+"--ask",          "--alldeps",
+"--alphabetical",
 "--buildpkg",     "--buildpkgonly",
 "--changelog",    "--columns", "--cols",
 "--debug",        "--deep",
@@ -223,7 +224,7 @@ options=[
 
 shortmapping={
 "1":"--oneshot",
-"a":"--ask",
+"a":"--ask",       "A":"--alldeps",
 "b":"--buildpkg",  "B":"--buildpkgonly",
 "c":"--clean",     "C":"--unmerge",
 "d":"--debug",     "D":"--deep",
@@ -432,6 +433,13 @@ if ("--resume" in myopts):
 		print "* --tree is currently broken with --resume. Disabling..."
 		myopts.remove("--tree")
 
+# Allows user to control whether emerge factors in DEPEND when processing binpkgs
+if ("alldeps" in portage.settings.features) or ("--alldeps" in myopts):
+	portage.settings.unlock()
+	portage.settings["ALLDEPS"] = "true"
+	portage.settings.backup_changes("ALLDEPS")
+	portage.settings.lock()
+
 # Set color output
 if "--nocolor" in myopts or \
 portage.settings["NOCOLOR"] in ("yes","true"):
@@ -997,14 +1005,20 @@ class depgraph:
 				sys.exit(1)
 			if portage.db[portage.root]["bintree"].isremote(mykey):
 				edepend = portage.db[portage.root]["bintree"].remotepkgs[tbz2name]
-				edepend["DEPEND"] =""
+				if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
+					edepend["DEPEND"]=string.join(string.split(edepend["DEPEND"])," ")
+				else:
+					edepend["DEPEND"] =""
 				edepend["RDEPEND"]=string.join(string.split(edepend["RDEPEND"])," ")
 				edepend["PDEPEND"]=string.join(string.split(edepend["PDEPEND"])," ")
 				edepend["SLOT"]   =string.strip(edepend["SLOT"])
 				#portage.db[portage.root]["bintree"].gettbz2(mykey)
 			else: # It's local.
 				mytbz2=xpak.tbz2(portage.db[portage.root]["bintree"].getname(mykey))
-				edepend["DEPEND"] =""
+				if portage.settings["ALLDEPS"] or "alldeps" in portage.settings.features:
+					edepend["DEPEND"]=string.join(mytbz2.getelements("DEPEND")," ")
+				else:
+					edepend["DEPEND"] =""
 				edepend["RDEPEND"]=string.join(mytbz2.getelements("RDEPEND")," ")
 				edepend["PDEPEND"]=string.join(mytbz2.getelements("PDEPEND")," ")
 				edepend["SLOT"]   =mytbz2.getfile("SLOT",mypkgparts[2])
--- lib/portage/pym/emergehelp.py.orig	2006-07-12 01:19:00 -0400
+++ lib/portage/pym/emergehelp.py	2006-07-12 02:21:28 -0400
@@ -15,7 +15,7 @@ def shorthelp():
 	print "   "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >"
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
 	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("--sync")+" ] "
-	print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
+	print bold("Options:")+" "+green("-")+"["+green("AabBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
 	print      "                                          ["+green("--columns")+"] ["+green("--nocolor")+"] ["+green("--nospinner")+"]"
 	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
 	print
@@ -145,6 +145,9 @@ def help(myaction,myopts,havecolor=1):
 		print "              "+bold("emerge info")+" for more advanced information."
 		print
 		print turquoise("Options:")
+		print "       "+green("--alldeps")
+		print "              Tell emerge to factor in DEPEND atoms when merging binary packages."
+		print
 		print "       "+green("--alphabetical")
 		print "              When displaying USE and other flag output, combines the enabled"
 		print "              and disabled flags into a single list and sorts it alphabetically."