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

/etc/colordiffrc be banner=no
(Portage version: 2.0.51.22-r1)

3 files changed, 17 insertions, 4 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/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