Index: ebuild.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v
retrieving revision 1.199
diff -u -b -B -w -p -r1.199 ebuild.sh
--- ebuild.sh	10 Oct 2004 10:07:20 -0000	1.199
+++ ebuild.sh	14 Oct 2004 00:45:07 -0000
@@ -980,7 +980,8 @@ dyn_install() {
 						#uncomment this line out after developers have had ample time to fix pkgs.
 						#UNSAFE=$(($UNSAFE + 1))
 						echo -ne '\a'
-						echo "QA Notice: Security risk ${x:${#D}:${#x}}. Please consider relinking with 'append-ldflags -Wl,-z,now' to fix."
+						echo "QA Notice: ${x:${#D}:${#x}} is setXid, dynamically linked and using lazy bindings."
+						echo "This combination is generally discouraged. Try: LDFLAGS='-Wl,-z,now' emerge ${PN}"
 						echo -ne '\a'
 						sleep 1
 					fi
Index: emerge
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/emerge,v
retrieving revision 1.340
diff -u -b -B -w -p -r1.340 emerge
--- emerge	11 Oct 2004 15:03:58 -0000	1.340
+++ emerge	14 Oct 2004 00:45:08 -0000
@@ -16,7 +16,7 @@ from output import *
 import portage_util
 import portage_locks
 import portage_exception
-
+import portage_metadata
 
 spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")",
                 "Thank you for using Gentoo. :)",
@@ -194,6 +194,7 @@ myaction=None
 myopts=[]
 myfiles=[]
 edebug=0
+verbose_level=0
 
 # process short actions
 tmpcmdline=sys.argv[1:]
@@ -204,6 +205,9 @@ for x in tmpcmdline:
 		for y in x[1:]:
 			if shortmapping.has_key(y):
 				if shortmapping[y] in cmdline:
+					if shortmapping[y]=="--verbose":
+						verbose_level += 1
+					else:
 					print
 					print "*** Warning: Redundant use of",shortmapping[y]
 				else:
@@ -1503,6 +1507,26 @@ class depgraph:
 						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 = []
+							handler._herds = []
+							parser.setContentHandler(handler)
+							parser.parse( metadata_file )
+
+							if len(handler._herds) > 0:
+								verboseadd += "("+ teal("H:" + ", ".join(handler._herds) ) + ")"
+								if len(handler._maintainers) < 1:
+									verboseadd += " (" + teal("M:" + ", ".join(handler._herds) ) + ") "
+								else:
+									verboseadd += " (" + teal("M:" + ", ".join(handler._maintainers) ) + ") "
+
 
 					# size verbose
 					mysize=0