add gcc-config support, bug #12689

4 files changed, 99 insertions, 1 deletions

diff --git a/dev-util/colorgcc/ChangeLog b/dev-util/colorgcc/ChangeLog
index 6c9f54e6a72d..246d5371ce35 100644
--- a/dev-util/colorgcc/ChangeLog
+++ b/dev-util/colorgcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/colorgcc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/ChangeLog,v 1.4 2002/12/13 10:56:49 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/ChangeLog,v 1.5 2002/12/25 21:53:43 azarah Exp $
+
+*colorgcc-1.3.2-r2 (25 Dec 2002)
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> colorgcc-1.3.2-r2.ebuild,
+                                                    colorgcc-1.3.2-gcc_config.patch :
+
+  Add support for gcc-config enabled gcc's, closing bug #12689.  Note that
+  you need gcc-config-1.2.7 or later ...
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r2.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..90eb450fe1ac
--- /dev/null
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/colorgcc/colorgcc-1.3.2-r2.ebuild,v 1.1 2002/12/25 21:53:43 azarah Exp $
+
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Adds color to gcc output"
+HOMEPAGE="http://packages.debian.org/testing/devel/colorgcc.html"
+SRC_URI="http://ftp.debian.org/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
+http://ftp.debian.org/debian/pool/main/c/${PN}/${PN}_${PV}-4.1.diff.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
+
+DEPEND="sys-devel/perl"
+
+src_unpack() {
+	unpack ${PN}_${PV}.orig.tar.gz
+	
+	epatch ${DISTDIR}/${PN}_${PV}-4.1.diff.gz
+
+	# Add support for gcc-config enabled gcc.  You need gcc-config-1.2.7 or
+	# later for this ..
+	# <azarah@gentoo.org> (25 Dec 2002)
+	cd ${S}; epatch ${FILESDIR}/${P}-gcc_config.patch
+}
+
+src_compile() { 
+	echo "Nothing to compile" 
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe colorgcc
+	dodir /usr/bin/wrappers
+	dosym /usr/bin/colorgcc /usr/bin/wrappers/gcc
+	dosym /usr/bin/colorgcc /usr/bin/wrappers/g++
+	dosym /usr/bin/colorgcc /usr/bin/wrappers/cc
+	dosym /usr/bin/colorgcc /usr/bin/wrappers/c++
+	
+	dodoc COPYING CREDITS ChangeLog INSTALL colorgccrc
+}
+
+pkg_postinst() {
+	if grep /usr/bin/wrappers /etc/profile > /dev/null
+	then
+		einfo "/etc/profile already updated for wrappers"
+	else
+		einfo "Add this to the end of your ${ROOT}etc/profile:"
+		einfo
+		einfo "#Put /usr/bin/wrappers in path before /usr/bin"
+		einfo 'export PATH=/usr/bin/wrappers:${PATH}'
+	fi
+}
+
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gcc_config.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gcc_config.patch
new file mode 100644
index 000000000000..c1a8cbf7d959
--- /dev/null
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gcc_config.patch
@@ -0,0 +1,29 @@
+--- colorgcc.orig	2002-12-25 23:10:29.000000000 +0200
++++ colorgcc	2002-12-26 00:04:17.000000000 +0200
+@@ -93,10 +93,22 @@
+ 
+ sub initDefaults
+ {
+-   $compilerPaths{"gcc"} = "/usr/bin/gcc";
+-   $compilerPaths{"g++"} = "/usr/bin/g++";
+-   $compilerPaths{"cc"}  = "/usr/bin/cc";
+-   $compilerPaths{"c++"} = "/usr/bin/c++";
++
++   # We need gcc-config-1.2.7 or later for this
++   if ($ENV{"CCBINPATH"} ne "")
++   {
++      $compilerPaths{"gcc"} = $ENV{"CCBINPATH"}."/gcc";
++      $compilerPaths{"g++"} = $ENV{"CCBINPATH"}."/g++";
++      $compilerPaths{"cc"}  = $ENV{"CCBINPATH"}."/cc";
++      $compilerPaths{"c++"} = $ENV{"CCBINPATH"}."/c++";
++   }
++   else
++   {
++      $compilerPaths{"gcc"} = "/usr/bin/gcc";
++      $compilerPaths{"g++"} = "/usr/bin/g++";
++      $compilerPaths{"cc"}  = "/usr/bin/cc";
++      $compilerPaths{"c++"} = "/usr/bin/c++";
++   }
+ 
+    $nocolor{"dumb"} = "true";
+ 
diff --git a/dev-util/colorgcc/files/digest-colorgcc-1.3.2-r2 b/dev-util/colorgcc/files/digest-colorgcc-1.3.2-r2
new file mode 100644
index 000000000000..b8475b0bddd9
--- /dev/null
+++ b/dev-util/colorgcc/files/digest-colorgcc-1.3.2-r2
@@ -0,0 +1,2 @@
+MD5 9dab925e1102a7312fb1ac3a6be122f4 colorgcc_1.3.2.orig.tar.gz 11280
+MD5 2599b206a4709a4060adc4b3f74d3ea8 colorgcc_1.3.2-4.1.diff.gz 5506