3 files changed, 8 insertions, 64 deletions
diff --git a/sys-libs/libaal/files/digest-libaal-1.0.2 b/sys-libs/libaal/files/digest-libaal-1.0.2
deleted file mode 100644
index a545ebdccbf7..000000000000
--- a/sys-libs/libaal/files/digest-libaal-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b064c6e15d98eabd0cf45e88665c80b1 libaal-1.0.2.tar.gz 328443
diff --git a/sys-libs/libaal/libaal-1.0.2.ebuild b/sys-libs/libaal/libaal-1.0.2.ebuild
deleted file mode 100644
index fe2cbf186450..000000000000
--- a/sys-libs/libaal/libaal-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.2.ebuild,v 1.2 2004/10/31 19:25:08 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="library required by reiser4progs"
-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 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	cat << EOF > run-ldconfig
-#!/bin/sh
-true
-EOF
-}
-
-src_compile() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
-		--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 silly .a libs out of /
-	dodir /usr/$(get_libdir)
-	local l=""
-	for l in libaal libaal-minimal ; do
-		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
-		dosym /usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
-		gen_usr_ldscript ${l}.so
-	done
-}
diff --git a/sys-libs/libaal/libaal-1.0.3.ebuild b/sys-libs/libaal/libaal-1.0.3.ebuild
index 9ea4f8123f50..a965a4448a9d 100644
--- a/sys-libs/libaal/libaal-1.0.3.ebuild
+++ b/sys-libs/libaal/libaal-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.3.ebuild,v 1.1 2004/12/16 17:21:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.3.ebuild,v 1.2 2005/05/22 06:44:16 vapier Exp $
 
 inherit eutils
 
@@ -33,20 +33,17 @@ src_compile() {
 	econf \
 		--enable-libminimal \
 		--enable-memory-manager \
-		--libdir=/$(get_libdir) || die "configure failed"
+		|| die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
-	# move silly .a libs out of /
-	dodir /usr/$(get_libdir)
-	local l=""
-	for l in libaal libaal-minimal ; do
-		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
-		dosym /usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
-		gen_usr_ldscript ${l}.so
-	done
+	# move .so into / (need for fsck)
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/libaal*.so* "${D}"/$(get_libdir)/
+	gen_usr_ldscript libaal.so
+	gen_usr_ldscript libaal-minimal.so
 }