Version 1.0.5 removes the --no-banner option, so make the default in

/etc/colordiffrc be banner=no
Package-Manager: portage-2.0.51.22-r1

4 files changed, 25 insertions, 12 deletions

diff --git a/app-misc/colordiff/ChangeLog b/app-misc/colordiff/ChangeLog
index ec6d8a71799c..0ec47307d96c 100644
--- a/app-misc/colordiff/ChangeLog
+++ b/app-misc/colordiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/colordiff
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.36 2005/07/11 14:52:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/ChangeLog,v 1.37 2005/07/11 16:19:42 agriffis Exp $
+
+*colordiff-1.0.5-r2 (11 Jul 2005)
+
+  11 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -colordiff-1.0.5-r1.ebuild, +colordiff-1.0.5-r2.ebuild:
+  Version 1.0.5 removes the --no-banner option, so make the default in
+  /etc/colordiffrc be banner=no
 
   11 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   colordiff-1.0.5.ebuild:
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 596633f5e5b2..f3b41092539e 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 MD5 e828ba77577dcf00e3586a31c3194f25 colordiff-1.0.5.ebuild 820
 MD5 8114f79f8735648770d8f37c32861c88 metadata.xml 252
-MD5 59369e6cc21a622b22be0c3cf4634033 colordiff-1.0.5-r1.ebuild 900
-MD5 6debd60f9e133e2063d5b00e454453f6 colordiff-1.0.4.ebuild 784
+MD5 0604642cc0e169762e02167fb59fb7aa colordiff-1.0.5-r2.ebuild 1184
+MD5 da00032b5307a425d2bfdfffa29fcd5d ChangeLog 4542
 MD5 9c7a775b72ac9e8a0c69c4393c0412c0 colordiff-1.0.3.ebuild 694
-MD5 3dc0aa7d07efe71d2a0a69527d8ffb81 ChangeLog 4295
-MD5 bfff6fd1ace0929c4d81692c93b0eaee files/digest-colordiff-1.0.5-r1 66
+MD5 6debd60f9e133e2063d5b00e454453f6 colordiff-1.0.4.ebuild 784
 MD5 aacbfa4b314f437baac1ee478ff3996a files/digest-colordiff-1.0.4 66
 MD5 bfff6fd1ace0929c4d81692c93b0eaee files/digest-colordiff-1.0.5 66
+MD5 bfff6fd1ace0929c4d81692c93b0eaee files/digest-colordiff-1.0.5-r2 66
 MD5 c2d6494ef389461d2fdfdce78184e4da files/digest-colordiff-1.0.3 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC0oeBKRy60XGEcJIRApO7AJ9xj0ItV50lA/Am7v+KrLPKo/+ZOgCeMQhB
-wTJZ2wrkzAd0nwXmhmOYqa4=
-=iC3M
+iD8DBQFC0pw1BXaUFmZvwyMRAgI8AKCYVAUAyH2ch+bB/e0FjJbZC9mUVgCfcRFO
+cAL5HIJpd0tzoM+lu38bBdI=
+=oGpb
 -----END PGP SIGNATURE-----
diff --git a/app-misc/colordiff/colordiff-1.0.5-r1.ebuild b/app-misc/colordiff/colordiff-1.0.5-r2.ebuild
index 7cc40a31de66..1d4a55eb43ca 100644
--- a/app-misc/colordiff/colordiff-1.0.5-r1.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.5-r1.ebuild,v 1.1 2005/07/11 03:35:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.5-r2.ebuild,v 1.1 2005/07/11 16:19:42 agriffis Exp $
 
 DESCRIPTION="Colorizes output of diff"
 HOMEPAGE="http://colordiff.sourceforge.net/"
@@ -14,10 +14,16 @@ IUSE=""
 DEPEND="sys-apps/diffutils"
 
 src_compile() {
-	# By default colordiff-1.0.5 lowercases config values, so we need to
+	# 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/\<OFF\>/off/g' colordiff.pl
 	sed -i -e 's/^plain=.*/plain=off/' colordiffrc*
+	sed -i -e 's/\<OFF\>/off/g' colordiff.pl
 }
 
 src_install() {
diff --git a/app-misc/colordiff/files/digest-colordiff-1.0.5-r1 b/app-misc/colordiff/files/digest-colordiff-1.0.5-r2
index 9d25b34c0f85..9d25b34c0f85 100644
--- a/app-misc/colordiff/files/digest-colordiff-1.0.5-r1
+++ b/app-misc/colordiff/files/digest-colordiff-1.0.5-r2