Remove the color and banner hacks I introduced for the older versions; 1.0.6

doesn't need them. Mark stable on alpha/ia64
Package-Manager: portage-2.1.2_pre1

3 files changed, 26 insertions, 21 deletions

diff --git a/app-misc/colordiff/ChangeLog b/app-misc/colordiff/ChangeLog
index 0be3327075b9..fc8a637f57dc 100644
--- a/app-misc/colordiff/ChangeLog
+++ b/app-misc/colordiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/colordiff
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.50 2006/09/18 06:27:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.51 2006/10/24 22:40:40 agriffis Exp $
+
+  24 Oct 2006; Aron Griffis <agriffis@gentoo.org> colordiff-1.0.6.ebuild:
+  Remove the color and banner hacks I introduced for the older versions; 1.0.6
+  doesn't need them. Mark stable on alpha/ia64
 
   18 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   colordiff-1.0.5-r2.ebuild, colordiff-1.0.6.ebuild:
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 3b3ddb094852..9ea73c284357 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST colordiff-1.0.3.tar.gz 12384
 DIST colordiff-1.0.4.tar.gz 12906
 DIST colordiff-1.0.5.tar.gz 14243 RMD160 43e17101717f5b41e2d6f173544b56cd6dda8d8e SHA1 b36ff31fd9b0e470ae715cf5f7b251d55cde3224 SHA256 ae3cf22fc9e492976a9f1327b46c86d181c9e4e193eb8d18181eb25104661391
@@ -18,14 +21,14 @@ EBUILD colordiff-1.0.5.ebuild 797 RMD160 dd6db03703509e6aced0cd82a318d3d7ca60a5b
 MD5 06c176fda36c5a3ba6be8b4f380b43ed colordiff-1.0.5.ebuild 797
 RMD160 dd6db03703509e6aced0cd82a318d3d7ca60a5b6 colordiff-1.0.5.ebuild 797
 SHA256 d9e5a22d03cdb3e96df0f9509bf6f5645998672748987262d3116627a5fd00bd colordiff-1.0.5.ebuild 797
-EBUILD colordiff-1.0.6.ebuild 1197 RMD160 732bce138b14dd045412653ac7f6e71514d8ea03 SHA1 8f16564d641e827865e6ac008ffb8ee4a7fac46c SHA256 e85b370031518150fa3142ff8959a3563b794b1043493d52c1e4cd5a55d90658
-MD5 2971f4da3227ca37720eec9ce15dbadd colordiff-1.0.6.ebuild 1197
-RMD160 732bce138b14dd045412653ac7f6e71514d8ea03 colordiff-1.0.6.ebuild 1197
-SHA256 e85b370031518150fa3142ff8959a3563b794b1043493d52c1e4cd5a55d90658 colordiff-1.0.6.ebuild 1197
-MISC ChangeLog 6004 RMD160 0b80cdc124a60cea8deff6b7483492cc51cb1746 SHA1 fa819c44ac66b6683524ac9fef7ff5f75d371435 SHA256 1858107a9751736a6baeb2a3cf11c83b384913d23636323b882373b11dbbf669
-MD5 7c3cbdb18b2831cea8b143480b929d25 ChangeLog 6004
-RMD160 0b80cdc124a60cea8deff6b7483492cc51cb1746 ChangeLog 6004
-SHA256 1858107a9751736a6baeb2a3cf11c83b384913d23636323b882373b11dbbf669 ChangeLog 6004
+EBUILD colordiff-1.0.6.ebuild 712 RMD160 c393f02668a82037474bff8bf25b15ed1cb7e96b SHA1 9324e3d08ba13446cdec6326a461f9e0bc4c99d4 SHA256 be5586cd898080ce87c82d8eea7e6e924bacd25d439ae06ba674490d68c7b511
+MD5 0e65f492a4e982de84d3b95d3ffa4ef6 colordiff-1.0.6.ebuild 712
+RMD160 c393f02668a82037474bff8bf25b15ed1cb7e96b colordiff-1.0.6.ebuild 712
+SHA256 be5586cd898080ce87c82d8eea7e6e924bacd25d439ae06ba674490d68c7b511 colordiff-1.0.6.ebuild 712
+MISC ChangeLog 6204 RMD160 b231187bad6b4210d486dfdb2bb0cd5c565be22d SHA1 d1e08147ca20bde4861f97834b587b5f3b15990c SHA256 32d7f016dab67a966f7e240d953933ec273525a66b0266c92d4ad06294107550
+MD5 72e66eb027b4c3c62f0156410225b567 ChangeLog 6204
+RMD160 b231187bad6b4210d486dfdb2bb0cd5c565be22d ChangeLog 6204
+SHA256 32d7f016dab67a966f7e240d953933ec273525a66b0266c92d4ad06294107550 ChangeLog 6204
 MISC metadata.xml 252 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 SHA1 5f9d6137a829b96482aacd60baf98160b49dc514 SHA256 b3aaf1e941b12ded57dea3530d59b8db42716f5e805efb6338101c135beac506
 MD5 4f7fe0eacb3ba0ef618e04831e4a7517 metadata.xml 252
 RMD160 212f61f15769b523e0fa55ed5d872d85536b4043 metadata.xml 252
@@ -45,3 +48,10 @@ SHA256 ffd825301625e8d9d1d9edc29c31056da5f26cd06303f2d8dc09439cc8cb2e3d files/di
 MD5 6e93f4efbbbca4d8e7a4a01ef5a4a29d files/digest-colordiff-1.0.6 244
 RMD160 5aec6da0c10cedeb40d165fc2b11e28f47851e0d files/digest-colordiff-1.0.6 244
 SHA256 0a52edf19dbd2ccaffbb58df25bf5428bfdb3d1079d5ba31b5fe0be94895d647 files/digest-colordiff-1.0.6 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFPpZxJrHF4yAQTrARAiJhAJ9fc+4T2uuzz7XR6ArgUbCBJRbUKACgkUx4
+mQ8dxiaobsQMbLRjS5NDsXI=
+=oFnV
+-----END PGP SIGNATURE-----
diff --git a/app-misc/colordiff/colordiff-1.0.6.ebuild b/app-misc/colordiff/colordiff-1.0.6.ebuild
index 2767edcdae45..7e88262604eb 100644
--- a/app-misc/colordiff/colordiff-1.0.6.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.6.ebuild,v 1.2 2006/09/18 06:27:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.6.ebuild,v 1.3 2006/10/24 22:40:40 agriffis Exp $
 
 DESCRIPTION="Colorizes output of diff"
 HOMEPAGE="http://colordiff.sourceforge.net/"
@@ -8,22 +8,13 @@ SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-apps/diffutils"
 
 src_compile() {
-	# Version 1.0.5 removed the --no-banner option.  Few other programs show
-	# such information without requesting it, so make it default to off
-	sed -i -e 's/^banner=.*/banner=no/' colordiffrc*
-
-	# Make "plain" be the default foreground color instead of forcing black or
-	# white.
-	# NB: By default colordiff-1.0.5 lowercases config values, so we need to
-	# lowercase OFF in the executable as well
-	sed -i -e 's/^plain=.*/plain=off/' colordiffrc*
-	sed -i -e 's/\<OFF\>/off/g' colordiff.pl
+	true
 }
 
 src_install() {