stabilize

(Portage version: 2.0.53_rc5)

8 files changed, 5 insertions, 272 deletions

diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.3 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.3
deleted file mode 100644
index 68915c2e705c..000000000000
--- a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b0bb224aa592809448390d4cf1b88e9 reiser4progs-1.0.3.tar.gz 871855
diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4
deleted file mode 100644
index c8232379686f..000000000000
--- a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2cbc8eb9429b50e0e99ba4eeda4801e reiser4progs-1.0.4.tar.gz 870901
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch
deleted file mode 100644
index e9d0b3d7259a..000000000000
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.3-gcc4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_large/key_large.c \
-                ./plugin/key/key_large/key_large.c
---- ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_large/key_large.c	2004-10-19 \
-                23:02:47.000000000 +0200
-+++ ./plugin/key/key_large/key_large.c	2005-01-03 17:13:29.425846752 +0100
-@@ -6,7 +6,7 @@
- #ifdef ENABLE_LARGE_KEYS
- #include "key_large.h"
- 
--extern reiser4_plug_t key_large_plug;
-+static reiser4_plug_t key_large_plug;
- 
- /* Returns minimal key */
- static reiser4_key_t *key_large_minimal(void) {
-diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_short/key_short.c \
-                ./plugin/key/key_short/key_short.c
---- ../tmp-orig/reiser4progs-1.0.3/plugin/key/key_short/key_short.c	2004-10-19 \
-                23:02:27.000000000 +0200
-+++ ./plugin/key/key_short/key_short.c	2005-01-03 17:13:12.000000000 +0100
-@@ -6,7 +6,7 @@
- #ifdef ENABLE_SHORT_KEYS
- #include "key_short.h"
- 
--extern reiser4_plug_t key_short_plug;
-+static reiser4_plug_t key_short_plug;
- 
- /* Returns minimal key */
- static reiser4_key_t *key_short_minimal(void) {
-diff -urN ../tmp-orig/reiser4progs-1.0.3/plugin/oid/oid40/oid40.c \
-                ./plugin/oid/oid40/oid40.c
---- ../tmp-orig/reiser4progs-1.0.3/plugin/oid/oid40/oid40.c	2004-12-02 \
-                17:13:27.000000000 +0100
-+++ ./plugin/oid/oid40/oid40.c	2005-01-03 17:09:38.000000000 +0100
-@@ -8,7 +8,7 @@
- #include "oid40.h"
- #include "oid40_repair.h"
- 
--extern reiser4_plug_t oid40_plug;
-+static reiser4_plug_t oid40_plug;
- 
- static uint32_t oid40_get_state(generic_entity_t *entity) {
- 	aal_assert("umka-2088", entity != NULL);
-
-
-
diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch
deleted file mode 100644
index 45852271fe1f..000000000000
--- a/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-===== include/reiser4/plugin.h 1.739 vs edited =====
---- 1.739/include/reiser4/plugin.h	2005-01-30 15:57:02 +03:00
-+++ edited/include/reiser4/plugin.h	2005-06-18 16:53:14 +04:00
-@@ -285,20 +285,23 @@ enum reiser4_opset_id {
- 	OPSET_DIRITEM		= 0x7,
- 	OPSET_CRYPTO		= 0x8,
- 	OPSET_DIGEST		= 0x9,
--	OPSET_COMPRES		= 0xa,
-+	OPSET_CPRESS		= 0xa,
-+	OPSET_CPRESS_MODE	= 0xb,
-+	OPSET_CLUSTER		= 0xc,
-+	OPSET_REGULAR		= 0xd,
- 	
--	OPSET_STORE_LAST        = (OPSET_COMPRES + 1),
-+	OPSET_STORE_LAST,
- 	
- 	/* These are not stored on disk in the current implementation. */
--	OPSET_CREATE		= 0xb,
--	OPSET_MKDIR		= 0xc,
--	OPSET_SYMLINK		= 0xd,
--	OPSET_MKNODE		= 0xe,
-+	OPSET_CREATE		= OPSET_STORE_LAST + 1,
-+	OPSET_MKDIR		= OPSET_STORE_LAST + 2,
-+	OPSET_SYMLINK		= OPSET_STORE_LAST + 3,
-+	OPSET_MKNODE		= OPSET_STORE_LAST + 4,
- 	
- #ifndef ENABLE_MINIMAL
--	OPSET_TAIL		= 0xf,
--	OPSET_EXTENT		= 0x10,
--	OPSET_ACL		= 0x11,
-+	OPSET_TAIL		= OPSET_STORE_LAST + 5,
-+	OPSET_EXTENT		= OPSET_STORE_LAST + 6,
-+	OPSET_ACL		= OPSET_STORE_LAST + 7,
- #endif
- 	OPSET_LAST
- };
-===== libreiser4/pset.c 1.19 vs edited =====
---- 1.19/libreiser4/pset.c	2004-11-24 12:09:22 +03:00
-+++ edited/libreiser4/pset.c	2005-06-18 17:00:27 +04:00
-@@ -111,7 +111,7 @@ opset_member_t opset_prof[OPSET_LAST] = 
- 		.ess = 1,
- #endif
- 	},
--	[OPSET_COMPRES] = {
-+	[OPSET_CPRESS] = {
- 		.type = INVAL_TYPE,
- #ifndef ENABLE_MINIMAL
- 		.group = INVAL_PID,
-@@ -119,7 +119,31 @@ opset_member_t opset_prof[OPSET_LAST] = 
- 		.ess = 1,
- #endif
- 	},
--	
-+	[OPSET_CPRESS_MODE] = {
-+		.type = INVAL_TYPE,
-+#ifndef ENABLE_MINIMAL
-+		.group = INVAL_PID,
-+		.prof = INVAL_PID,
-+		.ess = 1,
-+#endif
-+	},
-+	[OPSET_CLUSTER] = {
-+		.type = INVAL_TYPE,
-+#ifndef ENABLE_MINIMAL
-+		.group = INVAL_PID,
-+		.prof = INVAL_PID,
-+		.ess = 1,
-+#endif
-+	},
-+	[OPSET_REGULAR] = {
-+		.type = INVAL_TYPE,
-+#ifndef ENABLE_MINIMAL
-+		.group = INVAL_PID,
-+		.prof = INVAL_PID,
-+		.ess = 1,
-+#endif
-+	},
-+
- 	/* Note, plugins below are not stored on-disk. */
- 
- 	/* The 4 plugins below needs to be splited -- for now they are used for
-===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited =====
---- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c	2004-09-22 18:21:08 +04:00
-+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c	2005-06-18 17:00:16 +04:00
-@@ -22,7 +22,10 @@ char *opset_name[OPSET_STORE_LAST] = {
- 	[OPSET_DIRITEM] = "diritem",
- 	[OPSET_CRYPTO] =  "crypto",
- 	[OPSET_DIGEST] =  "digest",
--	[OPSET_COMPRES] = "compress"
-+	[OPSET_CPRESS] =  "compress",
-+	[OPSET_CPRESS_MODE] = "compress mode",
-+	[OPSET_CLUSTER] = "cluster",
-+	[OPSET_REGULAR] =  "regular"
- };
- 
- errno_t sdext_plug_check_struct(stat_entity_t *stat, repair_hint_t *hint) {
-
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild
deleted file mode 100644
index 6fbef4c6cb6c..000000000000
--- a/sys-fs/reiser4progs/reiser4progs-1.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3.ebuild,v 1.2 2005/03/10 20:25:05 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
-}
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild
deleted file mode 100644
index 0bb7d4cd3562..000000000000
--- a/sys-fs/reiser4progs/reiser4progs-1.0.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.7 2005/06/27 07:34:26 corsair 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 ppc64 -sparc x86"
-IUSE="static debug readline"
-
-DEPEND=">=sys-libs/libaal-${PV}
-	readline? ( sys-libs/readline )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# bundled libtool sucks, so rebuild autotools #74817
-	aclocal && libtoolize -c -f && autoconf && automake || die "autotools failed"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}.pset.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
-}
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild
index 240d7d7f5ff3..19697ae4fb52 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/09/03 21:07:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.4_p1.ebuild,v 1.4 2005/10/16 02:50:10 vapier Exp $
 
 inherit eutils
 
@@ -11,10 +11,10 @@ SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 -sparc x86"
+KEYWORDS="amd64 ppc ppc64 -sparc x86"
 IUSE="static debug readline"
 
-DEPEND=">=sys-libs/libaal-1.0.4
+DEPEND="~sys-libs/libaal-1.0.4
 	readline? ( sys-libs/readline )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild
index db9852c0dbf0..389489561d97 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.2 2005/08/14 13:12:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.5.ebuild,v 1.3 2005/10/16 02:50:10 vapier Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 -sparc x86"
 IUSE="static debug readline"
 
 DEPEND="~sys-libs/libaal-${PV}