Version bump. Removed old ebuild.

diff --git a/dev-util/diffstat/ChangeLog b/dev-util/diffstat/ChangeLog
index 0cce3d924c8d1ac52c6b6dfa0ea2db8c36645e05..e42082548312ce5150b9051105cc288368169da3 100644 (file)
--- a/dev-util/diffstat/ChangeLog
+++ b/dev-util/diffstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/diffstat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/ChangeLog,v 1.12 2004/11/03 20:14:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/ChangeLog,v 1.13 2004/12/18 01:17:11 swegener Exp $
+
+*diffstat-1.37 (18 Dec 2004)
+
+  18 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/diffstat-1.29-hard-locale.patch,
+  +files/diffstat-1.37-hard-locale.patch, -diffstat-1.29.ebuild,
+  +diffstat-1.37.ebuild:
+  Version bump. Removed old ebuild.
 
   05 Nov 2004; Aron Griffis <agriffis@gentoo.org> diffstat-1.34.ebuild:
   add alpha and ia64 keywords

diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index b9ef819c03b715814f9bd37b251a10697397f902..9defd3301fe6b620416b7111ce8fedc0fc086b1d 100644 (file)
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,8 +1,18 @@
-MD5 daa663933b77caa3f95e2e42c8ef558c ChangeLog 2186
-MD5 80a9b1fdaf60c6a76e909cb903fa7748 diffstat-1.29.ebuild 1029
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47a6afb4a1201f8659ce030f09202c29 diffstat-1.37.ebuild 809
 MD5 cc2f9487e827f0580da9a48142607097 diffstat-1.34.ebuild 744
+MD5 ed23ac03de66678c66724d5cc9b7607a ChangeLog 2435
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 606bb7607a9bca7d057c43f5c356e43d files/diffstat-1.29-hard-locale.patch 503
 MD5 3b747948604effbe1ba7f4554ecc210f files/diffstat-1.34-hard-locale.patch 523
-MD5 3b60d99acd06fa78e550d401a9b92877 files/digest-diffstat-1.29 59
+MD5 aaf2c4b7f099958647cad46682bb37eb files/diffstat-1.37-hard-locale.patch 578
 MD5 7a9c9a2f505ee2221fff4bdd6c5273ff files/digest-diffstat-1.34 61
+MD5 168d13b92334db83f0a5d8bd367f8e4a files/digest-diffstat-1.37 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBw4UfI1lqEGTUzyQRAubTAKDBk6YBBDLAuDATrRK4NKIe5pIwEQCfbwrW
+BRfIOkrNZmDHwlql/vXNx50=
+=1XDf
+-----END PGP SIGNATURE-----

diff --git a/dev-util/diffstat/diffstat-1.29.ebuild b/dev-util/diffstat/diffstat-1.37.ebuild
similarity index 51%
rename from dev-util/diffstat/diffstat-1.29.ebuild
rename to dev-util/diffstat/diffstat-1.37.ebuild
index 2c020032cdda98c0a36346a4ed56e03468293981..eb515c651a63d9f9df337b0b6b61305c1267ea27 100644 (file)
--- a/dev-util/diffstat/diffstat-1.29.ebuild
+++ b/dev-util/diffstat/diffstat-1.37.ebuild
@@ -1,39 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.14 2004/07/14 23:19:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.37.ebuild,v 1.1 2004/12/18 01:17:11 swegener Exp $
 
 inherit eutils
 
 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}.tar.gz"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
 HOMEPAGE="http://dickey.his.com/diffstat/diffstat.html"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64 ~ia64 ~alpha"
 IUSE=""
 
 DEPEND="sys-apps/diffutils"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
        epatch ${FILESDIR}/${P}-hard-locale.patch
 }
 
-src_compile() {
-       econf || 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() {
-       dobin diffstat
-       doman diffstat.1
-       dodoc README CHANGES
+       dobin diffstat || die "dobin failed"
+       doman diffstat.1 || die "doman failed"
+       dodoc README CHANGES || die "dodoc failed"
 }

diff --git a/dev-util/diffstat/files/diffstat-1.29-hard-locale.patch b/dev-util/diffstat/files/diffstat-1.29-hard-locale.patch
deleted file mode 100644 (file)
index 8fd51e9..0000000
--- a/dev-util/diffstat/files/diffstat-1.29-hard-locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- diffstat-1.29/diffstat.old 2003-10-21 22:44:18.325067400 -0700
-+++ diffstat-1.29/diffstat.c   2003-10-21 22:46:30.279007352 -0700
-@@ -528,6 +528,12 @@
-                       && !version_num(fname)
-                       && !contain_any(fname, "*")
-                       && !edit_range(fname))
-+                  || (sscanf(buffer,
-+                             "*** %[^\t ]\t%d-%d-%d %d:%d:%d",
-+                             fname,
-+                             &year, &month, &day,
-+                             &hour, &minute, &second) == 7
-+                      && !version_num(fname))
-                   ) {
-                   s = merge_name(that, fname);
-                   that = new_data(s);

diff --git a/dev-util/diffstat/files/diffstat-1.37-hard-locale.patch b/dev-util/diffstat/files/diffstat-1.37-hard-locale.patch
new file mode 100644 (file)
index 0000000..1110c23
--- /dev/null
+++ b/dev-util/diffstat/files/diffstat-1.37-hard-locale.patch
@@ -0,0 +1,16 @@
+diff -Nur diffstat-1.37.orig/diffstat.c diffstat-1.37/diffstat.c
+--- diffstat-1.37.orig/diffstat.c      2004-12-18 02:08:07.707933653 +0100
++++ diffstat-1.37/diffstat.c   2004-12-18 02:10:48.519539631 +0100
+@@ -805,6 +805,12 @@
+                       && !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))
+                   ) {
+                   prev = that;
+                   s = do_merging(that, b_fname);
+                   that = new_data(s);

diff --git a/dev-util/diffstat/files/digest-diffstat-1.29 b/dev-util/diffstat/files/digest-diffstat-1.29
deleted file mode 100644 (file)
index b21e645..0000000
--- a/dev-util/diffstat/files/digest-diffstat-1.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28101d2ed8edf87de11150c27f95fede diffstat.tar.gz 25959

diff --git a/dev-util/diffstat/files/digest-diffstat-1.37 b/dev-util/diffstat/files/digest-diffstat-1.37
new file mode 100644 (file)
index 0000000..8fd647d
--- /dev/null
+++ b/dev-util/diffstat/files/digest-diffstat-1.37
@@ -0,0 +1 @@
+MD5 b8f61dcc1a509a8cc89190bbc802d50a diffstat-1.37.tgz 70856