Version bump #69446 by Stefan Schweizer.

4 files changed, 25 insertions, 23 deletions

diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog
index 19321c29acc0..a96620de92e3 100644
--- a/sys-fs/reiser4progs/ChangeLog
+++ b/sys-fs/reiser4progs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/reiser4progs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.15 2004/09/19 21:49:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.16 2004/10/31 00:07:32 vapier Exp $
+
+*reiser4progs-1.0.2_pre1 (30 Oct 2004)
+
+  30 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +reiser4progs-1.0.2.ebuild, -reiser4progs-1.0.2_pre1.ebuild:
+  Version bump #69446 by Stefan Schweizer.
 
   19 Sep 2004; Mike Frysinger <vapier@gentoo.org> :
   Version bump #64539 by Stefan Schweizer.
diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2
new file mode 100644
index 000000000000..283b7d307b50
--- /dev/null
+++ b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2
@@ -0,0 +1 @@
+MD5 da64ff2266d854ffab67faf18eb8f370 reiser4progs-1.0.2.tar.gz 865597
diff --git a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2_pre1 b/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2_pre1
deleted file mode 100644
index 4b08cd0ba742..000000000000
--- a/sys-fs/reiser4progs/files/digest-reiser4progs-1.0.2_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b8e9214a68d8fa70c0db8ef1cfc4266 reiser4progs-1.0.2-pre1.tar.gz 860863
diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.2_pre1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.2.ebuild
index 4d68bbe497d1..2ba9b026870a 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.0.2_pre1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.0.2.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.2_pre1.ebuild,v 1.2 2004/09/24 14:52:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.2.ebuild,v 1.1 2004/10/31 00:07:32 vapier Exp $
 
 inherit eutils
 
-MY_P="${PN}-${PV/_/-}"
-DATE="2004.09.17"
 DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
 HOMEPAGE="http://www.namesys.com/v4/v4.html"
-SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/pre/${DATE}/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.namesys.com/pub/reiser4progs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,8 +16,6 @@ IUSE="static debug readline"
 DEPEND=">=sys-libs/libaal-${PV}
 	readline? ( sys-libs/readline )"
 
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -31,18 +27,18 @@ 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-stand-alone \
+		$(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=/lib \
+		--libdir=/$(get_libdir) \
 		|| die "configure failed"
 	emake || die "make failed"
 }
@@ -52,11 +48,11 @@ src_install() {
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
 	# move stupid .a out of root
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	local l=""
-	for l in libreiser4-alone libreiser4 librepair ; do
-		mv ${D}/lib/${l}.{a,la} ${D}/usr/lib/
-		dosym ../usr/lib/${l}.a /lib/${l}.a
+	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
 }