gcc-3.1 fix, remove old versions, add SLOT KEYWORDS RDEPEND LICENSE

6 files changed, 65 insertions, 30 deletions

diff --git a/app-misc/colortail/ChangeLog b/app-misc/colortail/ChangeLog
index fa17f636e3d5..de2de4d02d97 100644
--- a/app-misc/colortail/ChangeLog
+++ b/app-misc/colortail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/colortail
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/ChangeLog,v 1.3 2002/05/14 21:27:03 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/ChangeLog,v 1.4 2002/07/15 03:23:23 lostlogic Exp $
+
+*colortail-0.3.0-r2 (14 Jul 2002)
+
+  14 Jul 2002; Brandon Low <lostlogic@gentoo.org> colortail-0.3.0-r2 :
+
+  Fixed for gcc-3, cleaned up made pretty added SLOT KEYWORD RDEPEND
+  LICENSE to ebuild.
+
+  Removed old versions.
 
 *colortail-0.3.0-r1 (14 May 2002)
 
diff --git a/app-misc/colortail/colortail-0.3.0-r1.ebuild b/app-misc/colortail/colortail-0.3.0-r2.ebuild
index 168d34f6b7bd..a69b92c9d2c5 100644
--- a/app-misc/colortail/colortail-0.3.0-r1.ebuild
+++ b/app-misc/colortail/colortail-0.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0-r1.ebuild,v 1.1 2002/05/14 21:27:03 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0-r2.ebuild,v 1.1 2002/07/15 03:23:23 lostlogic Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Colortail custom colors your log files and works like tail"
@@ -8,6 +8,17 @@ SRC_URI="http://www.student.hk-r.se/~pt98jan/colortail-0.3.0.tar.gz"
 HOMEPAGE="http://www.student.hk-r.se/~pt98jan/colortail.html"
 
 DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-gcc3.patch || die "Patching failed"
+}
 
 src_compile() {
 	./configure --prefix=/usr --host=${CHOST}
@@ -23,15 +34,17 @@ src_install()  {
 }
 
 pkg_postinst() {
+	einfo
 	if grep /usr/bin/wrappers /etc/profile > /dev/null
 	then
-		echo "/etc/profile already updated for wrappers"
+		einfo "/etc/profile already updated for wrappers"
 	else
-		echo "Add this to the end of your ${ROOT}etc/profile:"
-		echo
-		echo "#Put /usr/bin/wrappers in path before /usr/bin"
-		echo 'export PATH=/usr/bin/wrappers:${PATH}'
+		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
+	einfo
 }
 
 
diff --git a/app-misc/colortail/colortail-0.3.0.ebuild b/app-misc/colortail/colortail-0.3.0.ebuild
deleted file mode 100644
index 7e059bfe7607..000000000000
--- a/app-misc/colortail/colortail-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Colortail custom colors your log files and works like tail"
-SRC_URI="http://www.student.hk-r.se/~pt98jan/colortail-0.3.0.tar.gz"
-HOMEPAGE="http://www.student.hk-r.se/~pt98jan/colortail.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST}
-        make || die
-}
- 
-src_install()  {
-	
-	make DESTDIR=${D} install || die
-	dodoc README example-conf/conf*
-}
-  
diff --git a/app-misc/colortail/files/colortail-0.3.0-gcc3.patch b/app-misc/colortail/files/colortail-0.3.0-gcc3.patch
new file mode 100644
index 000000000000..d682638698c7
--- /dev/null
+++ b/app-misc/colortail/files/colortail-0.3.0-gcc3.patch
@@ -0,0 +1,36 @@
+diff -Nru colortail-0.3.0/CfgFileParser.cc colortailnew/CfgFileParser.cc
+--- colortail-0.3.0/CfgFileParser.cc	Tue Aug  3 14:40:44 1999
++++ colortailnew/CfgFileParser.cc	Sun Jul 14 22:08:05 2002
+@@ -19,12 +19,13 @@
+ 
+ #include "CfgFileParser.h"
+ 
+-#include <stdio.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <assert.h>
+-#include <string.h>
++#include <string>
+ #include <malloc.h>
+ 
++using namespace std;
+ 
+ // ## class SearchData ##
+ 
+diff -Nru colortail-0.3.0/Colorizer.cc colortailnew/Colorizer.cc
+--- colortail-0.3.0/Colorizer.cc	Tue Aug  3 14:41:17 1999
++++ colortailnew/Colorizer.cc	Sun Jul 14 22:10:42 2002
+@@ -22,9 +22,10 @@
+ #include "TailFile.h"
+ 
+ #include <assert.h>
+-#include <stdio.h>
+-#include <strstream.h>
++#include <iostream>
++#include <string>
+ 
++using namespace std;
+ 
+ Colorizer::Colorizer()
+ {
diff --git a/app-misc/colortail/files/digest-colortail-0.3.0-r1 b/app-misc/colortail/files/digest-colortail-0.3.0-r1
deleted file mode 100644
index 643425941152..000000000000
--- a/app-misc/colortail/files/digest-colortail-0.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2589d3e372080f4052d1cc0d6550508f colortail-0.3.0.tar.gz 54329
diff --git a/app-misc/colortail/files/digest-colortail-0.3.0 b/app-misc/colortail/files/digest-colortail-0.3.0-r2
index 643425941152..643425941152 100644
--- a/app-misc/colortail/files/digest-colortail-0.3.0
+++ b/app-misc/colortail/files/digest-colortail-0.3.0-r2