Index: bin/emerge
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/emerge,v
retrieving revision 1.340
diff -u -r1.340 emerge
--- bin/emerge	11 Oct 2004 15:03:58 -0000	1.340
+++ bin/emerge	13 Oct 2004 01:30:06 -0000
@@ -16,7 +16,7 @@
 import portage_util
 import portage_locks
 import portage_exception
-
+import portage_metadata
 
 spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")",
                 "Thank you for using Gentoo. :)",
@@ -24,17 +24,17 @@
                 "How many times have you stared at this?",
                 "We are generating the cache right now",
                 "You are paying too much attention.",
-								"A theory is better than its explanation.",
-								"Phasers locked on target, Captain.",
-								"Thrashing is just virtual crashing.",
-								"To be is to program.",
-								"Real Users hate Real Programmers.",
-								"When all else fails, read the instructions.",
-								"Functionality breeds Contempt.",
-								"The future lies ahead.",
+		"A theory is better than its explanation.",
+		"Phasers locked on target, Captain.",
+		"Thrashing is just virtual crashing.",
+		"To be is to program.",
+		"Real Users hate Real Programmers.",
+		"When all else fails, read the instructions.",
+		"Functionality breeds Contempt.",
+		"The future lies ahead.",
                 "3.1415926535897932384626433832795028841971694",
-								"Sometimes insanity is the only alternative.",
-								"Inaccuracy saves a world of explanation.",
+		"Sometimes insanity is the only alternative.",
+		"Inaccuracy saves a world of explanation.",
                ]
 
 
@@ -194,6 +194,7 @@
 myopts=[]
 myfiles=[]
 edebug=0
+verbose_level=0
 
 # process short actions
 tmpcmdline=sys.argv[1:]
@@ -204,8 +205,11 @@
 		for y in x[1:]:
 			if shortmapping.has_key(y):
 				if shortmapping[y] in cmdline:
-					print
-					print "*** Warning: Redundant use of",shortmapping[y]
+					if shortmapping[y]=="--verbose":
+						verbose_level += 1
+					else:
+						print
+						print "*** Warning: Redundant use of",shortmapping[y]
 				else:
 					cmdline.append(shortmapping[y])
 			else:
@@ -1503,6 +1507,25 @@
 						else:
 							iuse=blue("-"+ebuild_iuse)
 						verboseadd+=iuse+usechange+" "
+					if (verbose_level > 0):
+						# show herd/maintainers.
+						metadata_file=portage.settings["PORTDIR"] + "/" + portage.pkgsplit(x[2])[0] + "/metadata.xml"
+	        				if not os.path.exists(metadata_file):
+							verboseadd += red("(Missing metadata.xml) ")
+						else:
+							parser = portage_metadata.make_parser()
+							handler = portage_metadata.Metadata_XML()
+							handler._maintainers = []
+							parser.setContentHandler(handler)
+							parser.parse( metadata_file )
+
+							if len(handler._herd) > 0:
+								verboseadd += "("+ teal("H:" + handler._herd) + ")"
+								if len(handler._maintainers) < 1:
+									verboseadd += " (" + teal("M:" + handler._herd) + ") "
+								else:
+									verboseadd += " ("+ teal("M:" + ", ".join(handler._maintainers) )+") "
+
 
 					# size verbose
 					mysize=0