Version bump #80536 by Heikki Orsila.

(Portage version: 2.0.51-r15)

7 files changed, 36 insertions, 150 deletions

diff --git a/app-arch/cksfv/ChangeLog b/app-arch/cksfv/ChangeLog
index 203c31e9981a..1e361cb81951 100644
--- a/app-arch/cksfv/ChangeLog
+++ b/app-arch/cksfv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/cksfv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/ChangeLog,v 1.12 2005/01/01 11:42:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/ChangeLog,v 1.13 2005/02/06 09:13:45 vapier Exp $
+
+*cksfv-1.3.3 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/cksfv-1.3-64bit-fix.patch, +cksfv-1.3.3.ebuild, -cksfv-1.3.ebuild:
+  Version bump #80536 by Heikki Orsila.
 
   18 Dec 2004; Simon Stelling <blubb@gentoo.org> cksfv-1.3.ebuild:
   was testing for a long time, marking stable on amd64
diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest
index f367be828e00..bbd07f1f7814 100644
--- a/app-arch/cksfv/Manifest
+++ b/app-arch/cksfv/Manifest
@@ -1,4 +1,5 @@
 MD5 d6dc8a68621ee91e2f006c0f1ac1e4e7 ChangeLog 1235
-MD5 47478c01a69ab9ee5cf282a5836ac25e cksfv-1.3.ebuild 696
-MD5 f72b0ebd2532d65ef4b3008017731802 files/cksfv-1.3-64bit-fix.patch 3705
+MD5 6c5d75cf30a43f8c0e3a569c7f67c8ec cksfv-1.3.3.ebuild 723
 MD5 428cbd9a2a41c250d23662113bee5828 files/digest-cksfv-1.3 60
+MD5 f72b0ebd2532d65ef4b3008017731802 files/cksfv-1.3-64bit-fix.patch 3705
+MD5 143c9b1bab6c4bbe7851810ba2d05ddb files/digest-cksfv-1.3.3 63
diff --git a/app-arch/cksfv/cksfv-1.3.3.ebuild b/app-arch/cksfv/cksfv-1.3.3.ebuild
new file mode 100644
index 000000000000..ae994f7f778e
--- /dev/null
+++ b/app-arch/cksfv/cksfv-1.3.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/cksfv-1.3.3.ebuild,v 1.1 2005/02/06 09:13:45 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="SFV checksum utility (simple file verification)"
+HOMEPAGE="http://www.modeemi.fi/~shd/foss/cksfv/"
+SRC_URI="http://www.modeemi.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_test() {
+	make tests || die "make tests failed"
+}
+
+src_install() {
+	dobin src/cksfv || die
+	dodoc ChangeLog INSTALL README TODO
+}
diff --git a/app-arch/cksfv/cksfv-1.3.ebuild b/app-arch/cksfv/cksfv-1.3.ebuild
deleted file mode 100644
index cc88963cb01c..000000000000
--- a/app-arch/cksfv/cksfv-1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cksfv/cksfv-1.3.ebuild,v 1.16 2005/01/01 11:42:47 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="SFV checksum utility (simple file verification)"
-HOMEPAGE="http://www.fodder.org/cksfv/"
-SRC_URI="http://www.fodder.org/cksfv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	# patch for int size problems on 64bit systems
-	use amd64 && epatch ${FILESDIR}/${P}-64bit-fix.patch
-	emake || die
-}
-
-src_install() {
-	dobin src/cksfv || die
-	dodoc ChangeLog INSTALL README TODO
-}
diff --git a/app-arch/cksfv/files/cksfv-1.3-64bit-fix.patch b/app-arch/cksfv/files/cksfv-1.3-64bit-fix.patch
deleted file mode 100644
index 33e89e94201b..000000000000
--- a/app-arch/cksfv/files/cksfv-1.3-64bit-fix.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Only in ./src: cksfv
-diff -u -r ../cksfv-1.3-org/src/crc32.c ./src/crc32.c
---- ../cksfv-1.3-org/src/crc32.c	2001-07-06 09:33:08.000000000 +0300
-+++ ./src/crc32.c	2004-04-18 02:34:19.297962360 +0300
-@@ -16,14 +16,12 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
- 
--#include <sys/types.h>
--#include <stdio.h>
--#include <sys/types.h>
-+#include <stdint.h>
- #include <unistd.h>
- 
- #define BUFFERSIZE 16384   /* (16k) buffer size for reading from the file */
- 
--static const unsigned long crctable[256] = {
-+static const uint32_t crctable[256] = {
-   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
-   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-   0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-@@ -91,11 +89,11 @@
- };
- 
- 
--int crc32(register int fd, unsigned long *main_val, unsigned long *main_len)
-+int crc32(register int fd, uint32_t *main_val, unsigned long *main_len)
- {
-   char                  buf[BUFFERSIZE], *p;
--  int                   len = 0, nr;
--  unsigned long         crc = ~0, crc32_total = ~0;
-+  long                  len = 0, nr;
-+  uint32_t              crc = ~0, crc32_total = ~0;
- 	
-   while ((nr = read(fd, buf, sizeof(buf))) > 0)
-     for (len += nr, p = buf; nr--; ++p) {
-Only in ./src: crc32.c~
-diff -u -r ../cksfv-1.3-org/src/newsfv.c ./src/newsfv.c
---- ../cksfv-1.3-org/src/newsfv.c	2001-07-06 09:33:08.000000000 +0300
-+++ ./src/newsfv.c	2004-04-18 02:38:11.903600928 +0300
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
- 
-+#include <stdint.h>
- #include <fcntl.h>
- #include <stdio.h>
- #include <string.h>
-@@ -24,14 +25,15 @@
- 
- extern void pnsfv_head();
- extern void pfileinfo(char**);
--extern void pcrc(char*, unsigned long);
--extern int  crc32(int, unsigned long*, unsigned long*);
-+extern void pcrc(char*, unsigned long val);
-+extern int crc32(int, uint32_t *, unsigned long *);
- 
- int newsfv(char **argv)
- {
-   int           fd, rval = 0;
-   char          *fn;
--  unsigned long len, val;
-+  unsigned long len;
-+  uint32_t      val;
-   
-   pnsfv_head();
-   pfileinfo(argv);
-@@ -48,7 +50,7 @@
-       fprintf(stderr, "cksfv: %s: %s\n", fn, strerror(errno)); 
-       rval = 1;
-     } else
--      pcrc(fn, val);
-+      pcrc(fn, (unsigned long) val);
-     close(fd);
-   }
- 
-Only in ./src: newsfv.c~
-Only in ./src: print.c~
-diff -u -r ../cksfv-1.3-org/src/readsfv.c ./src/readsfv.c
---- ../cksfv-1.3-org/src/readsfv.c	2001-07-06 09:33:08.000000000 +0300
-+++ ./src/readsfv.c	2004-04-18 02:39:48.612898880 +0300
-@@ -17,6 +17,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
- 
-+#include <stdint.h>
- #include <stdio.h>
- #include <string.h>
- #include <sys/types.h>
-@@ -28,7 +29,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- 
--extern int  crc32(int, unsigned long*, unsigned long*);
-+extern int  crc32(int, uint32_t *, unsigned long*);
- extern void prsfv_head(char*);
- 
- int find_file(char*, char*);
-@@ -39,7 +40,9 @@
-   FILE          *fd;
-   char          buf[512], *end, filename[512], crc[9], path[256];
-   int           file, rval = 0;
--  unsigned long len, val, sfvcrc;
-+  unsigned long len, sfvcrc;
-+  uint32_t val;
-+
-   
-   if (quiet == 0) {
-     prsfv_head(fn);
-@@ -104,7 +107,7 @@
-           fprintf(stderr, "cksfv: %s: %s\n", filename, strerror(errno));
-         rval = 1;
-       } else {
--        if (val != sfvcrc) {
-+        if (((unsigned long) val) != sfvcrc) {
-           if (quiet == 0)
-             fprintf(stderr, "different CRC\n");
-           else if (quiet == 1)
-Only in ./src: readsfv.c~
diff --git a/app-arch/cksfv/files/digest-cksfv-1.3 b/app-arch/cksfv/files/digest-cksfv-1.3
deleted file mode 100644
index 598746133b37..000000000000
--- a/app-arch/cksfv/files/digest-cksfv-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e00cf6a80a566539eb6f3432f2282c38 cksfv-1.3.tar.gz 14925
diff --git a/app-arch/cksfv/files/digest-cksfv-1.3.3 b/app-arch/cksfv/files/digest-cksfv-1.3.3
new file mode 100644
index 000000000000..61320a7e6251
--- /dev/null
+++ b/app-arch/cksfv/files/digest-cksfv-1.3.3
@@ -0,0 +1 @@
+MD5 f3b69a7d65fb42323027fe21df375e3d cksfv-1.3.3.tar.bz2 18266