Version bump #100447 by Ingo Bormuth.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 90 insertions, 15 deletions

diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index cb53d367960e..5790a3beeb27 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/reiser4progs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.23 2005/06/27 07:34:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.24 2005/07/29 00:59:12 vapier Exp $
+
+*reiser4progs-1.0.4_p1 (29 Jul 2005)
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  files/reiser4progs-1.0.4-gcc4.patch, +reiser4progs-1.0.4_p1.ebuild:
+  Version bump #100447 by Ingo Bormuth.
 
   27 Jun 2005; Markus Rothe <corsair@gentoo.org> reiser4progs-1.0.4.ebuild:
   Stable on ppc64
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 375077b51c12..cc4c042b38b2 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -3,9 +3,11 @@ Hash: SHA1
 
 MD5 564631952eab971c18ab4de2b5b721bd metadata.xml 267
 MD5 bb6867c28b848abb431b7500c4b4e0c2 reiser4progs-1.0.3.ebuild 1521
+MD5 39e4ab67cc79bdce78ed19debe71b48c reiser4progs-1.0.4_p1.ebuild 1822
 MD5 992e0d9b6e37f31e8ecfab7bb286ef5e reiser4progs-1.0.4.ebuild 1800
-MD5 25fedcce4a5423df4ad2d560a9ecfada ChangeLog 3304
-MD5 8a656ab347c811888b5cbc45b09a9d2d files/reiser4progs-1.0.4-gcc4.patch 1612
+MD5 6783fc42c29fa465b47fa7f299cd123d ChangeLog 3502
+MD5 c0ba5d425b6b7135e1db2629d5cd87b6 files/digest-reiser4progs-1.0.4_p1 72
+MD5 bdde60179b4f017b28cf5d1399c9bbd9 files/reiser4progs-1.0.4-gcc4.patch 1047
 MD5 9f7f4fa128d3f50bb4b4918d05c62a60 files/digest-reiser4progs-1.0.3 70
 MD5 07fa3b6440989daa4321554aa71c6d49 files/digest-reiser4progs-1.0.4 70
 MD5 286eb792e1f7965d7e21569f5eff1186 files/reiser4progs-1.0.4.pset.patch 2676
@@ -13,7 +15,7 @@ MD5 b3f5916be6210dc4da7fc0fdb1cd6fe5 files/reiser4progs-1.0.3-gcc4.patch 1632
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCwIKmgIKl8Uu19MoRArw0AJ4ygXvlIbEYR6ygc3HCtN7r+xVezgCfWG85
-vUJS9mfXKr1pCORz5Z6nKIw=
-=sqQ6
+iD8DBQFC6X9wgIKl8Uu19MoRApVhAJsGvoAD4IePva0oBs5t+d2cIZ5LSgCdEiz5
+FgvUr79OjXm679VzMQhwfFc=
+=r+6g
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4_p1 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4_p1
new file mode 100644
index 000000000000..07df4b1f50a8
--- /dev/null
+++ b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4_p1
@@ -0,0 +1 @@
+MD5 6b1fd418815a52570fee4fb90c81380c reiser4progs-1.0.4-1.tar.gz 878078
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch
index 7c7f5ef0a0f3..45215df6625c 100644
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch
+++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.4-gcc4.patch
@@ -1,6 +1,8 @@
-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
+These variables are all static local so declaring them as 
+extern in their header file is pointless and just breaks.
+
+--- plugin/key/key_large/key_large.h
++++ plugin/key/key_large/key_large.h
 @@ -43,7 +43,7 @@
  
  typedef union key_large key_large_t;
@@ -10,9 +12,8 @@ diff -ur reiser4progs-1.0.4-orig/plugin/key/key_large/key_large.h reiser4progs-1
  
  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
+--- plugin/key/key_short/key_short.h
++++ plugin/key/key_short/key_short.h
 @@ -42,7 +42,7 @@
  
  typedef union key_short key_short_t;
@@ -22,9 +23,8 @@ diff -ur reiser4progs-1.0.4-orig/plugin/key/key_short/key_short.h reiser4progs-1
  
  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
+--- plugin/oid/oid40/oid40.h
++++ plugin/oid/oid40/oid40.h
 @@ -30,7 +30,7 @@
  
  typedef struct oid40 oid40_t;
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild
new file mode 100644
index 000000000000..ef50f53435e4
--- /dev/null
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild
@@ -0,0 +1,66 @@
+# 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_p1.ebuild,v 1.1 2005/07/29 00:59:12 vapier Exp $
+
+inherit eutils
+
+MY_P=${PN}-${PV/_p/-}
+DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
+HOMEPAGE="http://www.namesys.com/v4/v4.html"
+SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
+IUSE="static debug readline"
+
+DEPEND=">=sys-libs/libaal-1.0.4
+	readline? ( sys-libs/readline )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bundled libtool sucks, so rebuild autotools #74817
+	aclocal && libtoolize -c -f && autoconf && automake || die "autotools failed"
+	epatch "${FILESDIR}"/${PN}-1.0.4-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
+	#resizefs binary doesnt exist in this release
+	rm -f "${D}"/usr/share/man/man8/resizefs*
+
+	# 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
+}