--- emerge-orig	2006-06-02 12:44:56.000000000 +0100
+++ emerge	2006-06-02 13:25:46.000000000 +0100
@@ -190,7 +190,7 @@
 
 #number of ebuilds merged
 merged=0
-params=["selective", "deep", "self", "recurse", "empty"]
+params=["selective", "shallow", "self", "recurse", "empty"]
 actions=[
 "clean", "config", "depclean",
 "info", "metadata",
@@ -201,7 +201,7 @@
 "--ask",          "--alphabetical",
 "--buildpkg",     "--buildpkgonly",
 "--changelog",    "--columns", "--cols",
-"--debug",        "--deep",
+"--debug",        "--shallow",
 "--digest",
 "--emptytree",
 "--fetchonly",    "--fetch-all-uri",
@@ -226,7 +226,7 @@
 "a":"--ask",
 "b":"--buildpkg",  "B":"--buildpkgonly",
 "c":"--clean",     "C":"--unmerge",
-"d":"--debug",     "D":"--deep",
+"d":"--debug",
 "e":"--emptytree",
 "f":"--fetchonly", "F":"--fetch-all-uri",
 "g":"--getbinpkg", "G":"--getbinpkgonly",
@@ -263,8 +263,11 @@
 				else:
 					cmdline.append(shortmapping[y])
 			else:
-				print "!!! Error: -"+y+" is an invalid short action or option."
-				sys.exit(1)
+				if y=="D":
+					print "*** Warning: Deep is now the default update method. Use --shallow to revert."
+				else:
+					print "!!! Error: -"+y+" is an invalid short action or option."
+					sys.exit(1)
 	else:
 		cmdline.append(x)
 
@@ -291,8 +294,11 @@
 				sys.exit(1)
 			myaction=x[2:]
 		else:
-			print "!!! Error:",x,"is an invalid option."
-			sys.exit(1)
+			if x=="--deep":
+				print "*** Warning: Deep is now the default update method. Use --shallow to revert."
+			else:
+				print "!!! Error:",x,"is an invalid option."
+				sys.exit(1)
 	elif (not myaction) and (x in actions):
 		if x not in ["system", "world"]:
 			print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x))
@@ -681,8 +687,8 @@
 	sub.extend(["recurse"])
 if "--noreplace" in myopts:
 	add.extend(["selective"])
-if "--deep" in myopts:
-	add.extend(["deep"])
+if "--shallow" in myopts:
+	add.extend(["shallow"])
 if "--selective" in myopts:
 	add.extend(["selective"])
 if myaction in ["world","system"]:
@@ -1010,7 +1016,7 @@
 		# whatever the case, we need to add the node to our digraph so
 		# that children can depend upon it.
 		self.digraph.addnode(string.join(mybigkey),myparent)
-		if ("deep" not in myparams) and (not merging):
+		if ("shallow" in myparams) and (not merging):
 			return 1
 		elif "recurse" not in myparams:
 			return 1
@@ -3250,7 +3256,7 @@
 
 	print
 	print red("*** WARNING ***")+"  --depclean is known to be broken. It is highly recommended"
-	print red("*** WARNING ***")+"  that "+green("`emerge --update --newuse --deep world`")+" be ran before"
+	print red("*** WARNING ***")+"  that "+green("`emerge --update --newuse world`")+" be ran before"
 	print red("*** WARNING ***")+"  commencing. However, using --depclean may still break link"
 	print red("*** WARNING ***")+"  level consistency within your system. "+green("`revdep-rebuild`")
 	print red("*** WARNING ***")+"  from app-portage/gentoolkit can help to detect breakage."