Newer sandboxes install into /usr/lib instead of /lib.

Package-Manager: portage-2.0.51.20-r4

5 files changed, 43 insertions, 9 deletions

diff --git a/app-shells/sandboxshell/ChangeLog b/app-shells/sandboxshell/ChangeLog
index 0a45b260c24e..8d5b7e720a01 100644
--- a/app-shells/sandboxshell/ChangeLog
+++ b/app-shells/sandboxshell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/sandboxshell
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/ChangeLog,v 1.5 2005/01/01 15:59:45 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/ChangeLog,v 1.6 2005/04/27 03:12:53 vapier Exp $
+
+*sandboxshell-0.1-r2 (27 Apr 2005)
+
+  27 Apr 2005; Mike Frysinger <vapier@gentoo.org> files/sandboxshell,
+  +sandboxshell-0.1-r2.ebuild:
+  Newer sandboxes install into /usr/lib instead of /lib.
 
 *sandboxshell-0.1-r1 (23 Jun 2004)
 
diff --git a/app-shells/sandboxshell/Manifest b/app-shells/sandboxshell/Manifest
index 34504a3fd58e..3dab9cd17de8 100644
--- a/app-shells/sandboxshell/Manifest
+++ b/app-shells/sandboxshell/Manifest
@@ -1,6 +1,6 @@
-MD5 ad2fd9e3bb8cec7dc845a0b0d892f094 ChangeLog 626
-MD5 d2afcb68525c8e0c23dccbc6a01aed26 sandboxshell-0.1-r1.ebuild 670
-MD5 d6e4c6f41b3e855aaee39685f06f0008 files/sandboxshell 1279
+MD5 e653bf3bd172bfcdbc6c7bda157f2920 ChangeLog 817
+MD5 1f47e99fa0142578b3e7dccefe8ff13f sandboxshell-0.1-r2.ebuild 666
+MD5 1cec5c8a112b832f3ed8c88f27f9a0da files/sandboxshell 1354
 MD5 89728cab133398dad145e13d92fff6b2 files/sandboxshell.1 3117
 MD5 e6a1ed3054d31d67233843e4624dbd98 files/sandboxshell.conf 1689
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sandboxshell-0.1-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sandboxshell-0.1-r2 0
diff --git a/app-shells/sandboxshell/files/digest-sandboxshell-0.1-r2 b/app-shells/sandboxshell/files/digest-sandboxshell-0.1-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-shells/sandboxshell/files/digest-sandboxshell-0.1-r2
diff --git a/app-shells/sandboxshell/files/sandboxshell b/app-shells/sandboxshell/files/sandboxshell
index 68bd3fb22cee..9ba530b05096 100644
--- a/app-shells/sandboxshell/files/sandboxshell
+++ b/app-shells/sandboxshell/files/sandboxshell
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Written by vapier@gentoo.org
 # public-domain code ... z0r ...
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/files/sandboxshell,v 1.1 2003/07/09 14:53:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/files/sandboxshell,v 1.2 2005/04/27 03:12:53 vapier Exp $
 
 . /sbin/functions.sh
 . /etc/profile
@@ -12,8 +12,11 @@ cd ${PWD} || {
 	exit 1
 }
 
-export LD_PRELOAD=/lib/libsandbox.so
-export SANDBOX_LIB=/lib/libsandbox.so
+for SANDBOX_LIB in /lib /usr/lib ; do
+	SANDBOX_LIB=${SANDBOX_LIB}/libsandbox.so
+	[ -e ${SANDBOX_LIB} ] && break
+done
+export LD_PRELOAD=${SANDBOX_LIB}
 export SANDBOX_LOG="/tmp/sandboxme-$(date '+%d.%m.%Y-%H.%M.%S').log"
 export SANDBOX_DEBUG_LOG="${SANDBOX_LOG}.debug"
 export SANDBOX_DENY=""
diff --git a/app-shells/sandboxshell/sandboxshell-0.1-r2.ebuild b/app-shells/sandboxshell/sandboxshell-0.1-r2.ebuild
new file mode 100644
index 000000000000..a2791771288e
--- /dev/null
+++ b/app-shells/sandboxshell/sandboxshell-0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/sandboxshell-0.1-r2.ebuild,v 1.1 2005/04/27 03:12:53 vapier Exp $
+
+DESCRIPTION="launch a sandboxed shell ... useful for debugging ebuilds"
+HOMEPAGE="http://wh0rd.org/"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/portage
+	app-shells/bash"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin ${FILESDIR}/sandboxshell || die
+	doman ${FILESDIR}/sandboxshell.1
+	insinto /etc
+	doins ${FILESDIR}/sandboxshell.conf
+}