Multilib friendly fix. Closes bug #80391.

Package-Manager: portage-2.0.51-r15

3 files changed, 25 insertions, 12 deletions

diff --git a/sys-libs/libsafe/ChangeLog b/sys-libs/libsafe/ChangeLog
index 5536b4dad172..e745fc7bd8be 100644
--- a/sys-libs/libsafe/ChangeLog
+++ b/sys-libs/libsafe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libsafe
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.4 2004/11/06 04:57:28 matsuu Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/ChangeLog,v 1.5 2005/02/03 10:08:17 eradicator Exp $
+
+  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  libsafe-2.0_p16-r1.ebuild:
+  Multilib friendly fix.  Closes bug #80391.
 
 *libsafe-2.0_p16-r1 (06 Nov 2004)
 
diff --git a/sys-libs/libsafe/Manifest b/sys-libs/libsafe/Manifest
index 5d0e3eca035c..68275cc166f5 100644
--- a/sys-libs/libsafe/Manifest
+++ b/sys-libs/libsafe/Manifest
@@ -1,4 +1,14 @@
-MD5 22cf908c43d5f53727473092dd4ce85b libsafe-2.0_p16-r1.ebuild 1725
-MD5 74e5a864250794cb9157466f1536b6e9 ChangeLog 684
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 45136ab9fa6bb0f84d8fef8af04433a5 ChangeLog 820
+MD5 934c88be6562bbbab35376353acebf1c libsafe-2.0_p16-r1.ebuild 1760
 MD5 bb8d0a4581b8faf1798232a83d6b2553 metadata.xml 520
 MD5 4802aa342dde49b03cd59d85b07e801c files/digest-libsafe-2.0_p16-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCAfgoArHZZzCEUG0RAuGDAJ9sL9EfawTBmuUnpqZkjD+8JH1jrACcDhTT
+XVSwqTcOWNP90LjohTOwKgQ=
+=RVDe
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild b/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild
index b5f3fb587f4c..9b7e9ff42ba5 100644
--- a/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild
+++ b/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild,v 1.1 2004/11/06 04:57:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libsafe/libsafe-2.0_p16-r1.ebuild,v 1.2 2005/02/03 10:08:17 eradicator Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs multilib
 
 MY_P="${P/_p/-}"
 DESCRIPTION="Protection against buffer overflow vulnerabilities"
@@ -31,17 +31,16 @@ src_compile() {
 	# It safer not too assume it is. Uncomment the following if desired
 	# use mta && mycflags="${mycflags} -DNOTIFY_WITH_EMAIL"
 
-	emake CC="$(tc-getCC)" CFLAGS="${mycflags}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${mycflags}" libsafe || die
 }
 
 src_install() {
-
 	# libsafe stuff
 	into /
 	dolib.so src/libsafe.so.${PV/_p/.} || die
 	# dodir /lib
-	dosym libsafe.so.${PV/_p/.} /lib/libsafe.so || die
-	dosym libsafe.so.${PV/_p/.} /lib/libsafe.so.${PV%%.*} || die
+	dosym libsafe.so.${PV/_p/.} /$(get_libdir)/libsafe.so || die
+	dosym libsafe.so.${PV/_p/.} /$(get_libdir)/libsafe.so.${PV%%.*} || die
 
 	# Documentation
 	doman doc/libsafe.8
@@ -57,6 +56,6 @@ pkg_postinst() {
 	einfo "To use this you have to put the library as one of the variables"
 	einfo "in LD_PRELOAD."
 	einfo "Example in bash:"
-	einfo "export LD_PRELOAD=/lib/libsafe.so.${PV%%.*}"
+	einfo "export LD_PRELOAD=libsafe.so.${PV%%.*}"
 	einfo
 }