New version, plus some cleanups to the older ebuild. See Changelog for details.

6 files changed, 59 insertions, 8 deletions

diff --git a/dev-util/diffstat/ChangeLog b/dev-util/diffstat/ChangeLog
index 1b5d252e2b93..7ae1f94329f5 100644
--- a/dev-util/diffstat/ChangeLog
+++ b/dev-util/diffstat/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/diffstat
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/ChangeLog,v 1.6 2003/10/30 12:34:39 brandy Exp $
+# 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 $
+
+*diffstat-1.34 (15 Feb 2004)
+
+  15 Feb 2004; Joshua Kinard <kumba@gentoo.org> diffstat-1.29.ebuild,
+  diffstat-1.34.ebuild:
+  Seems we're behind on our versions, so this is an ebuild for the newest
+  version, and the 1.29 ebuild has been cleaned up with a better method of
+  passing CFLAGS to the makefile. 1.34 doesn't need this makefile hack, however,
+  nor does the 1.29 hard-locale patch apply. This may cause Bug #31689 to reopen
+  if another patch is needed. The codebase looks to have changed far too much
+  between versions for the 1.29 patch to apply.
 
   31 Oct 2003; Brandy Westcott brandy@gentoo.org diffstat-1.29.ebuild:
   Added patch to allow diffstat to handle hard-locale time format. Thanks to
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index e56e49f9bc5e..c11eecb60c96 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,4 +1,7 @@
-MD5 7a6eac8b20ad736c9d8491a031963ebc diffstat-1.29.ebuild 866
-MD5 209bc0fa00306ee9c882fe7237c8f224 ChangeLog 1110
+MD5 4cbdeb10ec8eb12d72c0b5eaee5d01e6 ChangeLog 1671
+MD5 456dd8b93c6fe044103f38d117657a8b diffstat-1.29.ebuild 1029
+MD5 568722f473bd156d6ab2b22f1ce97fdd diffstat-1.34.ebuild 708
+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
diff --git a/dev-util/diffstat/diffstat-1.29.ebuild b/dev-util/diffstat/diffstat-1.29.ebuild
index c09b68777133..056fb0300949 100644
--- a/dev-util/diffstat/diffstat-1.29.ebuild
+++ b/dev-util/diffstat/diffstat-1.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.10 2003/10/30 12:34:39 brandy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.29.ebuild,v 1.11 2004/02/15 09:37:08 kumba Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="diffstat reads the output of diff and displays a histogram of the insertions, deletions, and modifications per-file"
@@ -21,8 +21,13 @@ src_unpack() {
 
 src_compile() {
 	econf || die
-	export CFLAGS="-Wshadow -Wconversion -Wstrict-prototypes -Wmissing-prototypes ${CFLAGS}"
-	make || die
+
+	# Fix CFLAGS
+	local oldcflags="-O -Wall -Wshadow -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+	mv ${S}/makefile ${S}/makefile.orig
+	sed -e "s:CFLAGS\t\t= ${oldcflags}:CFLAGS\t\t= ${oldcflags} ${CFLAGS}:g" ${S}/makefile.orig > ${S}/makefile
+
+	emake || die
 }
 
 src_install() {
diff --git a/dev-util/diffstat/diffstat-1.34.ebuild b/dev-util/diffstat/diffstat-1.34.ebuild
new file mode 100644
index 000000000000..3b3fb63e9e9b
--- /dev/null
+++ b/dev-util/diffstat/diffstat-1.34.ebuild
@@ -0,0 +1,26 @@
+# 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 $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="diffstat reads the output of diff and displays a histogram of the insertions, deletions, and modifications per-file"
+SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${PV}.tgz"
+HOMEPAGE="http://dickey.his.com/diffstat/diffstat.html"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc ~ppc ~mips"
+
+DEPEND="sys-apps/diffutils"
+
+
+#src_compile() {
+#	econf || die
+#	emake || die
+#}
+
+src_install() {
+	dobin diffstat
+	doman diffstat.1
+	dodoc README CHANGES
+}
diff --git a/dev-util/diffstat/files/digest-diffstat-1.34 b/dev-util/diffstat/files/digest-diffstat-1.34
new file mode 100644
index 000000000000..24bd911cbd5a
--- /dev/null
+++ b/dev-util/diffstat/files/digest-diffstat-1.34
@@ -0,0 +1 @@
+MD5 8cf39406d471722499b4d9dacdf367f5 diffstat-1.34.tgz 58633
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
new file mode 100644
index 000000000000..20ce219711a2
--- /dev/null
+++ b/dev-util/diffstat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+</pkgmetadata>