Don't install libsandbox.so if we don't need it.

Package-Manager: portage-2.0.51-r13

3 files changed, 16 insertions, 7 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index b1c80a2324d3..10d6e8902f5b 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.19 2005/01/18 01:18:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.20 2005/01/18 01:28:31 eradicator Exp $
+
+  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  emul-linux-x86-baselibs-1.2.2-r2.ebuild:
+  Don't install libsandbox.so if we don't need it.
 
 *emul-linux-x86-baselibs-1.2.2-r2 (17 Jan 2005)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 755dd7429d37..2cf676fac6ce 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e1241c14cf788794595426a6fa45d387 ChangeLog 3242
+MD5 95a0c3e2c532f7178b17b76cc4fed6c3 ChangeLog 3394
 MD5 41d7ed06d012ad8c70dcfd6158632332 emul-linux-x86-baselibs-1.0.ebuild 910
 MD5 c4be6e9cc14a3234d6bc321ec4a6d523 emul-linux-x86-baselibs-1.1-r3.ebuild 2550
 MD5 abdbdad1b967be646c378b3a1c7807a7 emul-linux-x86-baselibs-1.2.2-r1.ebuild 767
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 738a93e2bd2559770c1e2857b3cf1342 emul-linux-x86-baselibs-1.2.2-r2.ebuild 978
+MD5 c921257abd0782a1d349b298fa04a905 emul-linux-x86-baselibs-1.2.2-r2.ebuild 1108
 MD5 00b9e83e4f6ea15a4c2d4a697bc81f35 files/75emul-linux-x86-base 72
 MD5 df2a8724b2eeacedbc58d864f7a73e73 files/digest-emul-linux-x86-baselibs-1.0 82
 MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r3 82
@@ -15,7 +15,7 @@ MD5 da0bdfe31fa4eb39ad7e1a660f4844cf files/digest-emul-linux-x86-baselibs-1.2.2-
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB7GP3ArHZZzCEUG0RAtnvAJ9RlUzgtwwfsNWA+C0eqX5h+HWWcwCeNKtj
-pNWU8BzSBDjr2z5yzLO3Vs4=
-=8lA7
+iD8DBQFB7GZMArHZZzCEUG0RAmrBAJ9pCl0t1g4H8UiHA/+P2V3pKRHptACfXcIU
+Q79JOsWllEM21i69ukKHmVY=
+=0sO1
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.ebuild
index 2406569eaa53..7f81134dc96e 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.ebuild,v 1.1 2005/01/18 01:18:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r2.ebuild,v 1.2 2005/01/18 01:28:31 eradicator Exp $
 
 DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
 SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-baselibs-${PV}.tar.bz2"
@@ -23,6 +23,11 @@ src_install() {
 	cd ${WORKDIR}
 	cp -RPvf ${WORKDIR}/* ${D}/
 
+	# Don't want this anymore... it's provided by portage.
+	if [ -d "/lib32" ]; then
+		rm ${D}/emul/linux/x86/lib/libsandbox.so
+	fi
+
 	# oops. fix bug 65276
 	cd ${D}/emul/linux/x86/lib/
 	ln -s libz.so.? libz.so