Revision bump to include patch for 'note' messages by Cyril42e in bug 291060

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

4 files changed, 130 insertions, 2 deletions

diff --git a/dev-util/colorgcc/ChangeLog b/dev-util/colorgcc/ChangeLog
index da3914799166..600a395e8fe5 100644
--- a/dev-util/colorgcc/ChangeLog
+++ b/dev-util/colorgcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/colorgcc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/ChangeLog,v 1.26 2009/09/06 05:34:09 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/ChangeLog,v 1.27 2009/12/25 03:19:56 darkside Exp $
+
+*colorgcc-1.3.2-r5 (25 Dec 2009)
+
+  25 Dec 2009; Jeremy Olexa <darkside@gentoo.org> +colorgcc-1.3.2-r5.ebuild,
+  +files/colorgcc-1.3.2-note.patch:
+  Revision bump to include patch for 'note' messages by Cyril42e in bug
+  291060
 
   06 Sep 2009; Jeremy Olexa <darkside@gentoo.org> colorgcc-1.3.2-r4.ebuild:
   update HOMEPAGE and SRC_URI to reflect reality, bug 280821
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
index 5a416cc46901..1234e13b0ba7 100644
--- a/dev-util/colorgcc/Manifest
+++ b/dev-util/colorgcc/Manifest
@@ -1,6 +1,8 @@
 AUX colorgcc-1.3.2-gentoo-one.patch 6576 RMD160 196d6be4649e56c013fbb9aff04e1790e530841d SHA1 7baf58dab6c0e3e4620cf2fb1ada0bfccdfa3362 SHA256 f3a55d51c1cde5e0c87b4b9725b06e476f068378509a6685b3f6b1b9395c3f2e
 AUX colorgcc-1.3.2-gentoo-two.patch 1953 RMD160 8f1e9f180760f974a133c8e2b5761593fcff1dad SHA1 b9fda68c54f255293cbbaa17e5d8521ab76dc247 SHA256 4b3fff00118653d4eb3b484748f7f97dc33c8afcdac3497fbf3b3ebfc2073a04
+AUX colorgcc-1.3.2-note.patch 1922 RMD160 b4afa460bc8f3eb5b397f384e145a6addd56af8e SHA1 b68fccc98b1f047bf21a7fbc51a84e61ae579d60 SHA256 d1d41b3aecc568a74c30ee3636f3da88ad0e1346b6c27c0628c31cab8eb14097
 DIST colorgcc-1.3.2.tar.gz 11076 RMD160 12920046c7b469642bef15ddfaf0b1d2f8ee4313 SHA1 c2944ecaaa58f41f37cc15304f4f9eae0c366cd9 SHA256 55d33a64628ff380626b864200cad72146d00f3dce0f6dc1f0e69dc5b7f1653e
 EBUILD colorgcc-1.3.2-r4.ebuild 2025 RMD160 e408c89e7fbbe8b541d879ff2d15622b6d7ee8c6 SHA1 aa1c75ff1eba98343e3b5cf4f6b5e342092a3b33 SHA256 cab8852711cddb8b4de5369b0693f0b1a0ddd53d3c3ba084a37563ae961abb1d
-MISC ChangeLog 3759 RMD160 8ec34e0fbead6d518849952c3c58771a58d440ff SHA1 f070d94f8aa8710d0a992b5d0148b15857fc1fe3 SHA256 7c7d02062ff1fa6aa9f6c22dfdfbdf2c02aa4c84a38a63265fe7cd0de33e03a7
+EBUILD colorgcc-1.3.2-r5.ebuild 2083 RMD160 39b14a814b76556116616b4478399a7d2e11c0c3 SHA1 a69623e4c8053336ef1dc0891f9355ea7949fa7d SHA256 976143a5b90617a8118bbb7eb7a293e140d5ceecdda7eda6cc385c730a3bf477
+MISC ChangeLog 3988 RMD160 18e9554f939eeac250d4cc8577ef17cf0b4efb92 SHA1 f38d4947b3a9f0c1b15e4c4db229f465728b7364 SHA256 9d871f1cb074bc97a7b78f74600f9b7d3b5874aaf9f038b6807660254a7f48ab
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild
new file mode 100644
index 000000000000..95531a642887
--- /dev/null
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/colorgcc-1.3.2-r5.ebuild,v 1.1 2009/12/25 03:19:56 darkside Exp $
+
+inherit eutils
+
+DESCRIPTION="Adds color to gcc output"
+HOMEPAGE="http://schlueters.de/colorgcc.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo-one.patch \
+		"${FILESDIR}"/${P}-gentoo-two.patch \
+		"${FILESDIR}"/${P}-note.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin colorgcc || die
+	dodir /etc/colorgcc /usr/lib/colorgcc/bin
+	insinto /etc/colorgcc
+	doins colorgccrc || die
+	einfo "Scanning for compiler front-ends"
+	into /usr/lib/colorgcc/bin
+	for a in gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ ; do
+		if [ -n "$(type -p ${a})" ]; then
+			dosym /usr/bin/colorgcc /usr/lib/colorgcc/bin/${a}
+		fi
+	done
+
+	dodoc CREDITS ChangeLog || die
+}
+
+pkg_postinst() {
+	echo
+	elog "If you have existing \$HOME/.colorgccrc files that set the location"
+	elog "of the compilers, you should remove those lines for maximum"
+	elog "flexibility.  The colorgcc script now knows how to pass the command"
+	elog "on to the next step in the PATH without manual tweaking, making it"
+	elog "easier to use with things like ccache and distcc on a conditional"
+	elog "basis.  You can tweak the /etc/colorgcc/colorgccrc file to change"
+	elog "the default settings for everyone (or copy this file as a basis for"
+	elog "a custom \$HOME/.colorgccrc file)."
+	elog
+	elog "NOTE: the symlinks for colorgcc are now located in"
+	elog "/usr/lib/colorgcc/bin *NOT* /usr/bin/wrappers.  You'll need to"
+	elog "change any PATH settings that referred to the old location."
+	echo
+	# portage won't delete the old symlinks for users that are upgrading
+	# because the old symlinks still point to /usr/bin/colorgcc which exists...
+	[ -d "${ROOT}"/usr/bin/wrappers ] && rm -fr "${ROOT}"/usr/bin/wrappers
+}
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
new file mode 100644
index 000000000000..026503e8f2c9
--- /dev/null
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
@@ -0,0 +1,57 @@
+--- /usr/bin/colorgcc	2009-10-29 20:24:46.717190000 +0100
++++ colorgcc	2009-10-29 20:27:42.614162888 +0100
+@@ -102,7 +102,8 @@
+    $nocolor{"dumb"} = "true";
+ 
+    $colors{"srcColor"} = color("cyan");
+-   $colors{"introColor"} = color("blue");
++   $colors{"introFileNameColor"} = color("blue");
++   $colors{"introMessageColor"} = color("blue");
+ 
+    $colors{"warningFileNameColor"} = color("yellow");
+    $colors{"warningNumberColor"}   = color("yellow");
+@@ -111,6 +112,10 @@
+    $colors{"errorFileNameColor"} = color("bold red");
+    $colors{"errorNumberColor"}   = color("bold red");
+    $colors{"errorMessageColor"}  = color("bold red");
++
++   $colors{"noteFileNameColor"} = color("green");
++   $colors{"noteNumberColor"}   = color("green");
++   $colors{"noteMessageColor"}  = color("green");
+ }
+ 
+ sub loadPreferences
+@@ -290,12 +295,18 @@
+ 	 print($colors{"warningNumberColor"}, "$field2:", color("reset"));
+ 	 srcscan($field3, $colors{"warningMessageColor"});
+       }
+-      else 
+-      {
++      elsif ($field3 =~ m/\s+error:.*/)
++	{
+ 	 # Error
+ 	 print($colors{"errorFileNameColor"}, "$field1:", color("reset"));
+ 	 print($colors{"errorNumberColor"}, "$field2:", color("reset"));
+ 	 srcscan($field3, $colors{"errorMessageColor"});
++      } else
++      {
++	 # Note
++	 print($colors{"noteFileNameColor"}, "$field1:", color("reset"));
++	 print($colors{"noteNumberColor"}, "$field2:", color("reset"));
++	 srcscan($field3, $colors{"noteMessageColor"});
+       }
+       print("\n");
+    }
+@@ -305,8 +316,11 @@
+    }
+    elsif (m/^(.*?):(.+):$/) # filename:message:
+    {
++      my $field1 = $1 || "";
++      my $field2 = $2 || "";
+       # No line number, treat as an "introductory" line of text.
+-      srcscan($_, $colors{"introColor"});
++	 print($colors{"introFileNameColor"}, "$field1:", color("reset"));
++	 print($colors{"introMessageColor"}, "$field2:\n", color("reset"));
+    }
+    else # Anything else.
+    {