? ebuild.sh.diff ? emerge-metadata.diff ? emerge-metadata.patch 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 11 Oct 2004 00:55:15 -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.338 diff -u -b -B -w -p -r1.338 emerge --- emerge 10 Oct 2004 23:27:28 -0000 1.338 +++ emerge 11 Oct 2004 00:55:15 -0000 @@ -17,6 +17,7 @@ import portage_util import portage_locks import portage_exception +from portage_metadata import * spinner_msgs = ["Gentoo Rocks ("+os.uname()[0]+")", "Thank you for using Gentoo. :)", @@ -1476,6 +1477,25 @@ class depgraph: iuse=blue("-"+ebuild_iuse) verboseadd+=iuse+usechange+" " + # 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 = make_parser() + handler = 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 if x[0] == "ebuild" and x[-1]!="nomerge":