Added patch for the hard locale fix (codebase didn't seem to change too much, I just didn't look hard enough....)

5 files changed, 36 insertions, 11 deletions

diff --git a/dev-util/diffstat/ChangeLog b/dev-util/diffstat/ChangeLog
index 7ae1f94329f5..96037c2f084e 100644
--- a/dev-util/diffstat/ChangeLog
+++ b/dev-util/diffstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/diffstat
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/ChangeLog,v 1.7 2004/02/15 09:37:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/ChangeLog,v 1.8 2004/02/15 15:57:41 kumba Exp $
+
+  15 Feb 2004; Joshua Kinard <kumba@gentoo.org> diffstat-1.29.ebuild,
+  diffstat-1.34.ebuild, files/diffstat-1.34-hard-locale.patch:
+  Added patch for the hard locale fix (codebase didn't seem to change too much,
+  I just didn't look hard enough....)
 
 *diffstat-1.34 (15 Feb 2004)
 
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index c11eecb60c96..32dba49bae0a 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,7 +1,8 @@
-MD5 4cbdeb10ec8eb12d72c0b5eaee5d01e6 ChangeLog 1671
-MD5 456dd8b93c6fe044103f38d117657a8b diffstat-1.29.ebuild 1029
-MD5 568722f473bd156d6ab2b22f1ce97fdd diffstat-1.34.ebuild 708
+MD5 f2c9322723630a75ad710bf68a529c1d ChangeLog 1923
+MD5 8d680fbf4324f3bb209bea174f954974 diffstat-1.29.ebuild 1045
+MD5 8ddd6112961cff626a2b50c7d9492995 diffstat-1.34.ebuild 746
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 606bb7607a9bca7d057c43f5c356e43d files/diffstat-1.29-hard-locale.patch 503
 MD5 3b60d99acd06fa78e550d401a9b92877 files/digest-diffstat-1.29 59
 MD5 7a9c9a2f505ee2221fff4bdd6c5273ff files/digest-diffstat-1.34 61
+MD5 3b747948604effbe1ba7f4554ecc210f files/diffstat-1.34-hard-locale.patch 523
diff --git a/dev-util/diffstat/diffstat-1.29.ebuild b/dev-util/diffstat/diffstat-1.29.ebuild
index 056fb0300949..b19deb879159 100644
--- a/dev-util/diffstat/diffstat-1.29.ebuild
+++ b/dev-util/diffstat/diffstat-1.29.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.29.ebuild,v 1.11 2004/02/15 09:37:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.29.ebuild,v 1.12 2004/02/15 15:57:41 kumba Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="diffstat reads the output of diff and displays a histogram of the insertions, deletions, and modifications per-file"
diff --git a/dev-util/diffstat/diffstat-1.34.ebuild b/dev-util/diffstat/diffstat-1.34.ebuild
index 3b3fb63e9e9b..4d7776d59518 100644
--- a/dev-util/diffstat/diffstat-1.34.ebuild
+++ b/dev-util/diffstat/diffstat-1.34.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.34.ebuild,v 1.1 2004/02/15 09:37:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.34.ebuild,v 1.2 2004/02/15 15:57:41 kumba Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="diffstat reads the output of diff and displays a histogram of the insertions, deletions, and modifications per-file"
@@ -13,11 +15,10 @@ KEYWORDS="~x86 ~sparc ~ppc ~mips"
 
 DEPEND="sys-apps/diffutils"
 
-
-#src_compile() {
-#	econf || die
-#	emake || die
-#}
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-hard-locale.patch
+}
 
 src_install() {
 	dobin diffstat
diff --git a/dev-util/diffstat/files/diffstat-1.34-hard-locale.patch b/dev-util/diffstat/files/diffstat-1.34-hard-locale.patch
new file mode 100644
index 000000000000..5a95d2a3e018
--- /dev/null
+++ b/dev-util/diffstat/files/diffstat-1.34-hard-locale.patch
@@ -0,0 +1,16 @@
+--- diffstat-1.34/diffstat.c.orig	2004-02-15 12:03:37.000000000 +0100
++++ diffstat-1.34/diffstat.c	2004-02-15 12:04:47.000000000 +0100
+@@ -725,6 +725,12 @@
+ 			&& !version_num(b_fname)
+ 			&& !contain_any(b_fname, "*")
+ 			&& !edit_range(b_fname))
++		    || (sscanf(buffer,
++		    	       "*** %[^\t ]\t%d-%d-%d %d:%d:%d",
++			       b_fname,
++			       &year, &month, &day,
++			       &hour, &minute, &second) == 7
++			&& !version_num(b_fname))
+ 		    ) {
+ 		    s = do_merging(that, b_fname);
+ 		    that = new_data(s);
+