Now sandboxshell works again with >sys-apps/portage-2.1.1. Fixes bug #154105.

Package-Manager: portage-2.1.2_rc1-r3

6 files changed, 116 insertions, 13 deletions

diff --git a/app-shells/sandboxshell/ChangeLog b/app-shells/sandboxshell/ChangeLog
index 1131c905611b..43fb84073c87 100644
--- a/app-shells/sandboxshell/ChangeLog
+++ b/app-shells/sandboxshell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/sandboxshell
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/ChangeLog,v 1.9 2006/08/06 18:50:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/ChangeLog,v 1.10 2006/11/05 10:40:05 betelgeuse Exp $
+
+*sandboxshell-0.3-r2 (05 Nov 2006)
+
+  05 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/sandboxshell-r1.conf, +sandboxshell-0.3-r2.ebuild:
+  Now sandboxshell works again with >sys-apps/portage-2.1.1. Fixes bug #154105.
 
 *sandboxshell-0.3-r1 (06 Aug 2006)
 
diff --git a/app-shells/sandboxshell/Manifest b/app-shells/sandboxshell/Manifest
index 4a6df3dcf5e2..a2fda86d58d0 100644
--- a/app-shells/sandboxshell/Manifest
+++ b/app-shells/sandboxshell/Manifest
@@ -5,6 +5,10 @@ AUX sandboxshell 1331 RMD160 8a798de0a1b88a4289630e83332acac60349eeb7 SHA1 0a9f5
 MD5 0267cb95e99d6f7e5e9287e25c87fa16 files/sandboxshell 1331
 RMD160 8a798de0a1b88a4289630e83332acac60349eeb7 files/sandboxshell 1331
 SHA256 fd7c9a0506d33eaed9f22598161b380c0656c21e797a4b0057619727755292ff files/sandboxshell 1331
+AUX sandboxshell-r1.conf 2158 RMD160 e28776b78d8a4d6c3dc5c7f18234072c2085b7f1 SHA1 29e8141419cf470c90bfc553a5fd096d8f10850a SHA256 19e7571dcf5dd70ebecb703bec22067f3ad092a871e31c7ba7e0de1ba8e904cc
+MD5 bc7a42d5defaf18224dcd21ef9cdb100 files/sandboxshell-r1.conf 2158
+RMD160 e28776b78d8a4d6c3dc5c7f18234072c2085b7f1 files/sandboxshell-r1.conf 2158
+SHA256 19e7571dcf5dd70ebecb703bec22067f3ad092a871e31c7ba7e0de1ba8e904cc files/sandboxshell-r1.conf 2158
 AUX sandboxshell.1 3117 RMD160 ed079e1bb73a5ca1e93e0d7b5bae6f49f6463000 SHA1 5c90cd2c8998f6b0249aad776830b75d350b59bc SHA256 a284e3c5d4e355e4caf41bb614cc83f8cb5a3e13b730a8b0812d2cd84f1fb7aa
 MD5 89728cab133398dad145e13d92fff6b2 files/sandboxshell.1 3117
 RMD160 ed079e1bb73a5ca1e93e0d7b5bae6f49f6463000 files/sandboxshell.1 3117
@@ -17,21 +21,28 @@ EBUILD sandboxshell-0.3-r1.ebuild 675 RMD160 b1eb6d6d885c02c4c1ed9877403496f5106
 MD5 357203b81bf51dfa93ad69853c2847b9 sandboxshell-0.3-r1.ebuild 675
 RMD160 b1eb6d6d885c02c4c1ed9877403496f510604026 sandboxshell-0.3-r1.ebuild 675
 SHA256 db86b82133305f240d96131399b4392a1f8370f40f3b3c9b83c1da5c5eb9eb55 sandboxshell-0.3-r1.ebuild 675
-MISC ChangeLog 1675 RMD160 024d27b9ee9c0e53661a64958a95634fecc85e46 SHA1 dd0a6b32821ee27d4d3f035b80681391a560144c SHA256 42d22d57abf385a2609bc116015b744a4cbd44ebc2f3a48132682a8340d73b7e
-MD5 f9603f0be7780507b6efcbf53d0808c0 ChangeLog 1675
-RMD160 024d27b9ee9c0e53661a64958a95634fecc85e46 ChangeLog 1675
-SHA256 42d22d57abf385a2609bc116015b744a4cbd44ebc2f3a48132682a8340d73b7e ChangeLog 1675
+EBUILD sandboxshell-0.3-r2.ebuild 783 RMD160 69649fb45b45ea33e1fbdd94bfeeb5247b57fe3f SHA1 01f8ddbaf1cfb7668aa0e45ffd4f5923fc683c8a SHA256 81f02efc9ca918fb8b92681aa51526b645b964ee0ca4b61cf45e032e0fc57948
+MD5 9bdad8520940c3ca0e3cb2e084b91c58 sandboxshell-0.3-r2.ebuild 783
+RMD160 69649fb45b45ea33e1fbdd94bfeeb5247b57fe3f sandboxshell-0.3-r2.ebuild 783
+SHA256 81f02efc9ca918fb8b92681aa51526b645b964ee0ca4b61cf45e032e0fc57948 sandboxshell-0.3-r2.ebuild 783
+MISC ChangeLog 1910 RMD160 4b7af97efe973a240ed1b2835de57d7baab3246a SHA1 1751f0db9120951c26291b80b6d48409f5e9863e SHA256 67a01052dd9b94da8d683a0aa32743390ca9c25a2370bdf08d81e11975539527
+MD5 4f5c56aa02dbf9d6115d8fcdd9d26f8e ChangeLog 1910
+RMD160 4b7af97efe973a240ed1b2835de57d7baab3246a ChangeLog 1910
+SHA256 67a01052dd9b94da8d683a0aa32743390ca9c25a2370bdf08d81e11975539527 ChangeLog 1910
 MISC metadata.xml 221 RMD160 2699c0059639536eb7befa077a27e437569a26ba SHA1 4bef3741184af2e2d984fec094cd0ab39ae2e624 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627
 MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
 RMD160 2699c0059639536eb7befa077a27e437569a26ba metadata.xml 221
 SHA256 1d72b91d3ef79fdff0049c23a645d8595a5fb72ea7e5d5b6fa43cfc18e9a4627 metadata.xml 221
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-sandboxshell-0.3-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-sandboxshell-0.3-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-sandboxshell-0.3-r1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sandboxshell-0.3-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-sandboxshell-0.3-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-sandboxshell-0.3-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sandboxshell-0.3-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-sandboxshell-0.3-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-sandboxshell-0.3-r2 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE1joSamhnQswr0vIRAtArAJ4jl2nSswAqJqVK8MmPsCOzy5MKCQCfd5We
-7KEBRFRz81ZTvC2TEhf8Npc=
-=SJVK
+iD8DBQFFTb+OcxLzpIGCsLQRAiDCAJkB+L9NQmaYs4sSrokqSfV0RrxhpQCZAQpp
+4Xy827N5b9lozV9Ft5L/ssY=
+=3fKs
 -----END PGP SIGNATURE-----
diff --git a/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r1 b/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r1
index 8b137891791f..e69de29bb2d1 100644
--- a/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r1
+++ b/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r1
@@ -1 +0,0 @@
-
diff --git a/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r2 b/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-shells/sandboxshell/files/digest-sandboxshell-0.3-r2
diff --git a/app-shells/sandboxshell/files/sandboxshell-r1.conf b/app-shells/sandboxshell/files/sandboxshell-r1.conf
new file mode 100644
index 000000000000..aff373dab4d9
--- /dev/null
+++ b/app-shells/sandboxshell/files/sandboxshell-r1.conf
@@ -0,0 +1,60 @@
+#!/bin/bash
+# Written by vapier@gentoo.org
+# public-domain code ... z0r ...
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/files/sandboxshell-r1.conf,v 1.1 2006/11/05 10:40:05 betelgeuse Exp $
+
+trap ":" INT QUIT TSTP
+
+source /etc/profile
+
+# do ebuild environment loading ... detect if we're in portage
+# build area or not ... uNF uNF uNF
+#sbs_pdir=$(portageq envvar PORTAGE_TMPDIR)/portage/ #portageq takes too long imo
+if [[ -z ${PORTAGE_TMPDIR} ]] ; then
+	sbs_gpdir=$( source /etc/make.globals && echo $PORTAGE_TMPDIR 2> /dev/null)
+	sbs_cpdir=$( source /etc/make.conf && echo $PORTAGE_TMPDIR 2> /dev/null)
+	[[ -z ${sbs_cpdir} ]] \
+		&& sbs_pdir=${sbs_gpdir} \
+		|| sbs_pdir=${sbs_cpdir}
+else
+	sbs_pdir=${PORTAGE_TMPDIR}
+fi
+[[ -z ${sbs_pdir} ]] && sbs_pdir=/var/tmp
+sbs_pdir=${sbs_pdir}/portage/
+
+if [[ ${PWD:0:${#sbs_pdir}} == "${sbs_pdir}" ]] ; then
+	sbs_bdir=$(echo ${PWD:${#sbs_pdir}} | cut -d/ -f1,2)
+	sbs_tmpenvfile=${sbs_pdir}${sbs_bdir}/temp/environment
+	if [[ -e ${sbs_tmpenvfile} ]] ; then
+		echo "Found environment at ${sbs_tmpenvfile}"
+		printf " * Would you like to enter the portage environment ? "
+		read env
+		sbs_PREPWD=${PWD}
+		if [[ ${env} == "y" ]] ; then
+			# First try to source variables and export them ...
+			eval "$(sed -e '/^[[:alnum:]_-]*=/s:^:export :' -e '/^[[:alnum:]_-]* ()/Q' "${sbs_tmpenvfile}")" 2>/dev/null
+			# Then grab everything (including functions)
+			source "${sbs_tmpenvfile}" 2> /dev/null
+			export SANDBOX_WRITE=${SANDBOX_WRITE}:${sbs_pdir}${sbs_bdir}:${sbs_pdir}/homedir
+		fi
+		PWD=${sbs_PREPWD}
+	fi
+fi
+
+unset sbs_gpdir sbs_cpdir sbs_pdir sbs_bdir sbs_tmpenvfile sbs_PREPWD env
+
+cd "${PWD}"
+export PS1="[s]${PS1}"
+
+adddeny()    { export SANDBOX_DENY=${SANDBOX_DENY}:$1 ; }
+addpredict() { export SANDBOX_PREDICT=${SANDBOX_PREDICT}:$1 ; }
+addread()    { export SANDBOX_READ=${SANDBOX_READ}:$1 ; }
+addwrite()   { export SANDBOX_WRITE=${SANDBOX_WRITE}:$1 ; }
+sandboxon()  { export SANDBOX_ON="1" ; }
+sandboxoff() { export SANDBOX_OFF="0" ; }
+
+[[ -z ${CCACHE_DIR} ]] && export CCACHE_DIR=/root/.ccache
+for var in CCACHE_DIR DISTCC_DIR ; do
+	[[ ${!var+set} == "set" ]] && addwrite ${!var}
+done
+unset var
diff --git a/app-shells/sandboxshell/sandboxshell-0.3-r2.ebuild b/app-shells/sandboxshell/sandboxshell-0.3-r2.ebuild
new file mode 100644
index 000000000000..6c14080b1a64
--- /dev/null
+++ b/app-shells/sandboxshell/sandboxshell-0.3-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sandboxshell/sandboxshell-0.3-r2.ebuild,v 1.1 2006/11/05 10:40:05 betelgeuse 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 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+# Portage 2.1.1 changes the /var/tmp/portage structure from <pkg> to <cat>/<pkg>
+RDEPEND=">sys-apps/portage-2.1.1
+	app-shells/bash"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin "${FILESDIR}"/sandboxshell || die
+	doman "${FILESDIR}"/sandboxshell.1
+	insinto /etc
+	doins "${FILESDIR}"/sandboxshell-r1.conf
+}