more color baby !

4 files changed, 108 insertions, 7 deletions

diff --git a/app-misc/grc/ChangeLog b/app-misc/grc/ChangeLog
index 7685c6dd764a..7c34bed64b34 100644
--- a/app-misc/grc/ChangeLog
+++ b/app-misc/grc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/grc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/ChangeLog,v 1.6 2004/06/24 22:14:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/ChangeLog,v 1.7 2004/08/26 03:35:07 vapier Exp $
+
+  25 Aug 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.0.6-support-more-files.patch, +files/conf.configure,
+  grc-1.0.6.ebuild:
+  Add support for some more files #43046 by Tim Burrell.
 
   14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> grc-1.0.2.ebuild,
   grc-1.0.6.ebuild:
diff --git a/app-misc/grc/files/1.0.6-support-more-files.patch b/app-misc/grc/files/1.0.6-support-more-files.patch
new file mode 100644
index 000000000000..57f60a74ae13
--- /dev/null
+++ b/app-misc/grc/files/1.0.6-support-more-files.patch
@@ -0,0 +1,60 @@
+diff -ur grc-1.0.6.orig/conf.gcc grc-1.0.6/conf.gcc
+--- grc-1.0.6.orig/conf.gcc	2004-08-25 23:23:15.898638944 -0400
++++ grc-1.0.6/conf.gcc	2004-08-25 23:26:54.297437280 -0400
+@@ -1,10 +1,10 @@
+ # 
+-regexp=\bgcc\b
+-colours=yellow
+-count=more
++regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
++colours=white bold
++count=once
+ .........
+ # 
+-regexp=^.*?:
++regexp=^\S*:
+ colours=red
+ count=once
+ .........
+@@ -12,6 +12,10 @@
+ regexp=\`\w+\'
+ colours=green
+ .........
++# compilation method modifiers
++regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
++colours=yellow
++.........
+ # -O
+ regexp=\-O\d 
+ colours=green
+@@ -24,10 +28,10 @@
+ # stderr to grcat 
+ #
+ # warning
+-regexp=warning
++regexp=[Ww]arning[:\b]
+ colours=yellow
+ .........
+ # error
+-regexp=error
++regexp=[Ee]rror[:\b]
+ colours=red blink
+ count=stop
+diff -ur grc-1.0.6.orig/grc.conf grc-1.0.6/grc.conf
+--- grc-1.0.6.orig/grc.conf	2004-08-25 23:23:15.870643200 -0400
++++ grc-1.0.6/grc.conf	2004-08-25 23:23:57.814266800 -0400
+@@ -15,9 +15,13 @@
+ conf.traceroute
+ 
+ # gcc command
+-(^|[/\w\.]+/)g?cc\s
++(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
+ conf.gcc
+ 
++# configure command
++(^|[/\w\.]+/)configure
++conf.configure
++
+ # make command
+ (^|[/\w\.]+/)g?make\s?
+ conf.gcc
diff --git a/app-misc/grc/files/conf.configure b/app-misc/grc/files/conf.configure
new file mode 100644
index 000000000000..8f26c601eba8
--- /dev/null
+++ b/app-misc/grc/files/conf.configure
@@ -0,0 +1,27 @@
+# cache functions
+regexp=\b(loading|updating|creating) cache\b
+colours=yellow bold
+.........
+# checking
+regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
+colours=yellow
+.........
+# result is complex
+regexp=\.\.\. .*$
+colours=cyan
+.........
+# check succeeded
+regexp=\.\.\.( \(cached\))? yes$
+colours=blue bold
+.........
+# check did not succeed
+regexp=\.\.\.( \(cached\))? no$
+colours=magenta
+.........
+# ... should be normal
+regexp=\.\.\.
+colours=default
+.........
+# creating stuff
+regexp=\bcreating\b
+colours=green
diff --git a/app-misc/grc/grc-1.0.6.ebuild b/app-misc/grc/grc-1.0.6.ebuild
index 495bf6ef866c..d0d362ec6416 100644
--- a/app-misc/grc/grc-1.0.6.ebuild
+++ b/app-misc/grc/grc-1.0.6.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.0.6.ebuild,v 1.6 2004/06/24 22:14:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grc/grc-1.0.6.ebuild,v 1.7 2004/08/26 03:35:07 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Generic Colouriser is yet another colouriser for beautifying your logfiles or output of commands"
-SRC_URI="http://melkor.dnp.fmph.uniba.sk/~garabik/grc/grc_${PV}.tar.gz"
 HOMEPAGE="http://melkor.dnp.fmph.uniba.sk/~garabik/grc.html"
+SRC_URI="http://melkor.dnp.fmph.uniba.sk/~garabik/grc/grc_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,12 +15,19 @@ IUSE=""
 
 RDEPEND="dev-lang/python"
 
-src_install()  {
+src_unpack() {
+	unpack ${A}
+	cp -rf ${S}{,.orig}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-support-more-files.patch
+}
+
+src_install() {
 	insinto /usr/share/grc
-	doins conf.*
+	doins conf.* ${FILESDIR}/conf.* || die "share files"
 	insinto /etc
-	doins grc.conf
-	dobin grc grcat
+	doins grc.conf || die "conf"
+	dobin grc grcat || die "dobin"
 	dodoc README INSTALL TODO CHANGES CREDITS
 	doman grc.1 grcat.1
 }