From 20e02f6e332515de05bad174587114fceabd8a36 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 29 Nov 2005 03:53:35 +0000
Subject: [PATCH] touchup build so we dont install .a/.la files to /lib
 Package-Manager: portage-2.0.53_rc7

---
 sys-libs/libaal/Manifest            |  8 ++++----
 sys-libs/libaal/libaal-1.0.5.ebuild | 26 +++++++++++---------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index 276178e43e9d..d57c9a491abc 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -5,12 +5,12 @@ MD5 7316b9588533b80ebea8b25729670b72 ChangeLog 2591
 MD5 abb17580068f400e620e0699f645ffb1 files/digest-libaal-1.0.4 64
 MD5 cd25c6f6d3226ee68e58120be045de7b files/digest-libaal-1.0.5 64
 MD5 7205709d0f66b5dd36621324842a9e04 libaal-1.0.4.ebuild 1232
-MD5 d5a8e2d46d43346825d7530e2285dc0f libaal-1.0.5.ebuild 1231
+MD5 80b81a655397044204c0d717a535098d libaal-1.0.5.ebuild 1119
 MD5 e204859e37f5c66efadbae832356f236 metadata.xml 330
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUcA7gIKl8Uu19MoRAhsfAKCEL6SfKQznWOY4t65j4N876bZ/OACffCQO
-S4dPSYNL3AY+dCM/RtJnb0I=
-=uTlK
+iD8DBQFDi9FKgIKl8Uu19MoRAmvdAJ4nQu4zVNgjT/Ew286+HHU1D7gUqgCfV/ij
+BZM73gMb0oRWSVSkdd2eBzs=
+=FKVo
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libaal/libaal-1.0.5.ebuild b/sys-libs/libaal/libaal-1.0.5.ebuild
index a73cf6eda25a..691d96a987cf 100644
--- a/sys-libs/libaal/libaal-1.0.5.ebuild
+++ b/sys-libs/libaal/libaal-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-libs/libaal/libaal-1.0.5.ebuild,v 1.2 2005/10/16 02:49:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.5.ebuild,v 1.3 2005/11/29 03:53:35 vapier Exp $
 
 inherit eutils
 
@@ -23,30 +23,26 @@ src_unpack() {
 		-e "/GENERIC_CFLAGS/s:-O3::" \
 		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
 		configure || die "sed"
-	cat << EOF > run-ldconfig
-#!/bin/sh
-true
-EOF
+	cat <<-EOF > run-ldconfig
+		#!/bin/sh
+		true
+	EOF
 }
 
 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 shared libs to /
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
+	gen_usr_ldscript libaal.so libaal-minimal.so
 }
-- 
2.26.2