Version bump, closes bug #82865. Patch porting by Halcy0n.

(Portage version: 2.0.51.19)

5 files changed, 106 insertions, 11 deletions

diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index 06d7ae0700be..975650745934 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/reiser4progs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.18 2005/03/10 20:25:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.19 2005/03/12 20:16:13 chainsaw Exp $
+
+*reiser4progs-1.0.4 (12 Mar 2005)
+
+  12 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/reiser4progs-1.0.4-gcc4.patch, +reiser4progs-1.0.4.ebuild:
+  Version bump, GCC4 patch ported by Mark Loeser. Closes bug #82865.
 
   10 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
   +files/reiser4progs-1.0.3-gcc4.patch, reiser4progs-1.0.3.ebuild:
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 3d98c858b718..7fab581685b6 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bb6867c28b848abb431b7500c4b4e0c2 reiser4progs-1.0.4.ebuild 1521
 MD5 564631952eab971c18ab4de2b5b721bd metadata.xml 267
 MD5 ad80b5655415dd18fbf33e4ac293589e ChangeLog 2555
 MD5 bb6867c28b848abb431b7500c4b4e0c2 reiser4progs-1.0.3.ebuild 1521
@@ -8,12 +6,7 @@ MD5 f56ecec74dd7a0a4f508b8c68243c9c5 reiser4progs-1.0.1.ebuild 1425
 MD5 bbd503ec1d2b0180ec17ac897d95d86e reiser4progs-1.0.2.ebuild 1486
 MD5 b3f5916be6210dc4da7fc0fdb1cd6fe5 files/reiser4progs-1.0.3-gcc4.patch 1632
 MD5 9f7f4fa128d3f50bb4b4918d05c62a60 files/digest-reiser4progs-1.0.3 70
+MD5 07fa3b6440989daa4321554aa71c6d49 files/digest-reiser4progs-1.0.4 70
+MD5 8a656ab347c811888b5cbc45b09a9d2d files/reiser4progs-1.0.4-gcc4.patch 1612
 MD5 990967545588c86e92fb0afbb2f77834 files/digest-reiser4progs-1.0.1 70
 MD5 9bb40bf49c081afe6951054366ff7e20 files/digest-reiser4progs-1.0.2 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCMK3Dp5vW4rUFj5oRAthhAJ9wr3V6wzb6zBUzp/Hu6yrcKj6loACglF9i
-ZtgKVhif5mMU2nb+PSICBB4=
-=dr1A
------END PGP SIGNATURE-----
diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4
new file mode 100644
index 000000000000..c8232379686f
--- /dev/null
+++ b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4
@@ -0,0 +1 @@
+MD5 b2cbc8eb9429b50e0e99ba4eeda4801e reiser4progs-1.0.4.tar.gz 870901
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch
new file mode 100644
index 000000000000..7c7f5ef0a0f3
--- /dev/null
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch
@@ -0,0 +1,36 @@
+diff -ur reiser4progs-1.0.4-orig/plugin/key/key_large/key_large.h reiser4progs-1.0.4/plugin/key/key_large/key_large.h
+--- reiser4progs-1.0.4-orig/plugin/key/key_large/key_large.h	2005-03-12 14:12:04.000000000 -0500
++++ reiser4progs-1.0.4/plugin/key/key_large/key_large.h	2005-03-12 14:14:16.000000000 -0500
+@@ -43,7 +43,7 @@
+ 
+ typedef union key_large key_large_t;
+ 
+-extern reiser4_plug_t key_large_plug;
++static reiser4_plug_t key_large_plug;
+ 
+ typedef enum {
+ 	/* Major locality occupies higher 60 bits of the first element */
+diff -ur reiser4progs-1.0.4-orig/plugin/key/key_short/key_short.h reiser4progs-1.0.4/plugin/key/key_short/key_short.h
+--- reiser4progs-1.0.4-orig/plugin/key/key_short/key_short.h	2005-03-12 14:12:04.000000000 -0500
++++ reiser4progs-1.0.4/plugin/key/key_short/key_short.h	2005-03-12 14:14:04.000000000 -0500
+@@ -42,7 +42,7 @@
+ 
+ typedef union key_short key_short_t;
+ 
+-extern reiser4_plug_t key_short_plug;
++static reiser4_plug_t key_short_plug;
+ 
+ typedef enum {
+ 	/* Major locality occupies higher 60 bits of the first element */
+diff -ur reiser4progs-1.0.4-orig/plugin/oid/oid40/oid40.h reiser4progs-1.0.4/plugin/oid/oid40/oid40.h
+--- reiser4progs-1.0.4-orig/plugin/oid/oid40/oid40.h	2005-03-12 14:13:18.000000000 -0500
++++ reiser4progs-1.0.4/plugin/oid/oid40/oid40.h	2005-03-12 14:10:57.000000000 -0500
+@@ -30,7 +30,7 @@
+ 
+ typedef struct oid40 oid40_t;
+ 
+-extern reiser4_plug_t oid40_plug;
++static reiser4_plug_t oid40_plug;
+ 
+ #define oid40_get_next(area)            LE64_TO_CPU(*((d64_t *)area))
+ #define oid40_set_next(area, val)       (*((d64_t *)area) = CPU_TO_LE64(val))
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild
new file mode 100644
index 000000000000..9b5ae9f9ae15
--- /dev/null
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild,v 1.1 2005/03/12 20:16:13 chainsaw Exp $
+
+inherit eutils
+
+DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
+HOMEPAGE="http://www.namesys.com/v4/v4.html"
+SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="static debug readline"
+
+DEPEND=">=sys-libs/libaal-${PV}
+	readline? ( sys-libs/readline )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	cat << EOF > run-ldconfig
+#!/bin/sh
+true
+EOF
+}
+
+src_compile() {
+	econf \
+		$(use_enable static full-static) \
+		$(use_enable static mkfs-static) \
+		$(use_enable static fsck-static) \
+		$(use_enable static debugfs-static) \
+		$(use_enable static measurefs-static) \
+		$(use_enable static cpfs-static) \
+		$(use_enable static resizefs-static) \
+		$(use_enable debug) \
+		$(use_with readline) \
+		--enable-libminimal \
+		--sbindir=/sbin \
+		--libdir=/$(get_libdir) \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
+
+	# move stupid .a out of root
+	dodir /usr/$(get_libdir)
+	local l=""
+	for l in libreiser4-minimal libreiser4 librepair ; do
+		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
+		dosym ../usr/lib/${l}.a /lib/${l}.a
+		gen_usr_ldscript ${l}.so
+	done
+}