Various fixes, and x32 support.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

3 files changed, 139 insertions, 15 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index dd429f50c7fa..e07d66edd20e 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.163 2012/06/24 05:35:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.164 2012/07/03 19:49:46 vapier Exp $
+
+*sandbox-2.6 (03 Jul 2012)
+
+  03 Jul 2012; Mike Frysinger <vapier@gentoo.org> +sandbox-2.6.ebuild:
+  Various fixes, and x32 support.
 
   24 Jun 2012; Mike Frysinger <vapier@gentoo.org> sandbox-2.5.ebuild:
   Parallelize configure steps for multiple ABIs, and run tests in parallel.
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 27372e4181dc..d2c9e3bc6173 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -9,26 +9,28 @@ DIST sandbox-1.6.tar.lzma 307014 RMD160 abdcfbbf137304f87c2cb184a4650bf652555ef6
 DIST sandbox-2.3.tar.xz 344260 RMD160 929485e4fb51737dc2fc1fe656efc505c3b78eec SHA1 c1eff87f4f608aa613a6905d2111790ac57fe091 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5
 DIST sandbox-2.4.tar.xz 344664 RMD160 43593c13c27881ebe17ae47c6ea0c40870f8351c SHA1 8d8b7ccc61baa881a90071c4cdc533f6918d21f4 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e
 DIST sandbox-2.5.tar.xz 355680 RMD160 f6eb0d681d5280c6ced5cd6bfd4da74e25ce129f SHA1 bfa2456d3a8b9f35b460f733b97a1fe7f00c5ca5 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a
+DIST sandbox-2.6.tar.xz 366356 RMD160 6e8040c95a74112759241c46bd112594996a28d3 SHA1 b795c68212d0d38f99b1ba26584b550755802319 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d
 EBUILD sandbox-1.6-r2.ebuild 2676 RMD160 f67be130abbc60828aa47c76f14dca14c4a54445 SHA1 cbfcb74a299ccd2c1256f145dbf8764e176f3378 SHA256 23c2bae032fe62b4c2cc4beb906c75bd927f3b2c4cc10551ef2f7fb66b424601
 EBUILD sandbox-2.3-r1.ebuild 2713 RMD160 178286b857e23c52777207404b097efacec98c53 SHA1 4a5aae8a23d3c0ec2452c8248576e59f4e3d92de SHA256 58eb10e050f4321b703d71cfdd8d83de61ab76e748046dde724e64ca21dc253f
 EBUILD sandbox-2.4.ebuild 2639 RMD160 061703c6a84348cbe51c1e2ad3037e93151c2296 SHA1 e93d4767e9c50c4737527ae26c1b0529e743d8ce SHA256 d5b852481f07dbbf5b1f5f4761a4c16137aea8f4d8f047c27edd898cc713272e
 EBUILD sandbox-2.5.ebuild 2691 RMD160 f40b7c73e0d852220b240226813f3c9b2c1dd27a SHA1 cf3eb7a964a8f8fa724335f56daa52a3bda583c4 SHA256 3f0f988570641f22ad2072b66f68f7af15365de28d322c95d248d4cb74624938
-MISC ChangeLog 22657 RMD160 5da0253de6ed03f171e8ce2b42e1ac0c4959f4b3 SHA1 e949831f4169daa71329c799d610facd4bbb79e7 SHA256 3bdaabce1c63102f7fae12ed53b4b3287c3388a87479cc9000e096a0344cd498
+EBUILD sandbox-2.6.ebuild 2702 RMD160 8f2d7f46222749a024bb0ed28d17c4b1e5794a40 SHA1 fae073ae04b793e40bcba00519b55e5eda663284 SHA256 27df770363eb2a0777317a9d2781ac16d3971cb9fd393bafa9e1fb6f525c398b
+MISC ChangeLog 22791 RMD160 d7ca900a0ea297310aff3a1ae951858f3635391b SHA1 dea38d1b8a6cd49d544c718af20d081cea033529 SHA256 9595680365cb90105011ffd183aced8b1ac5a8c0e22239cfcfc18f054fc2b795
 MISC metadata.xml 316 RMD160 7a59e0a8ebd42e830f5ec1b52f58855a78fddd3f SHA1 b86a1426d32e1a47371f1c21545aab672987bef1 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP5qcwAAoJELEHsLL7fEFWTGkP/1aNeHpXUk0oujlhg+EBo18I
-5+CaRM7CPznbbJfgva6kVubRK/HS8EXBljQ7UrQFSHDrlccv8osxnyVQdWTqm/N6
-D3fMparyB3c+ViRYNqseT29K6mrdgmen3JlNJdqCElw+pMxcqHjGUqYRserSb8kM
-1YXMgTJd6LaWlVktoMwaxfhPxxkUQXl7ChLnrJfi+ccNQwld8KTpQm9L7PXVLkV+
-3jv2NNkUz3NeiCpOb/eNCglkiJSFTn+ivbvUNgJTcYn5M03axeBvGXNridyyYm1G
-b57OxWgM3IDlwW9PoBwZ4D0CpO7rb/2LCF2+hSJfiv8vu/XTWV0+vDhOaRdmrcEW
-+vqVMX7wCS5SfNSk7CQkR5NSCcreeYeDsGK57Ml8mb4L0zWkbLG70hnqjXbklPop
-pJoMujLgkD08eaC7NXG3rU4Wbu22PUxIksNj3b5/8MiKaORV9vU+HesxcPSr7l/4
-2+yXMH1iIYxqS8wl3vZm3fA8Q6k3YpXd6j4uJnDsQSNWRCxnXo6EZ4w7pKXX/fSH
-D2k3Xf0R+i5ep56l73U09rPHvhp8SoRd6zezG0hVtE+a9TiJTUIqUL1J8MZvDHzp
-QmGh9RFdxm4w3Q3RzjiOkrfr6Uxsr7C+6W4JuZhzJslYTfwQsJY53G+jm6uJsr2T
-7bGOCYW4NNWzLx8F8rwS
-=22kn
+iQIcBAEBAgAGBQJP80ziAAoJELEHsLL7fEFW7LwP/ikj54ar5J/ALHC2v3dCHnyv
+uI47O4ij5+GWcx8hNmC3YxQI1DWVvkZ33vFjEHTUA0H2utiisY0vd1KRluFBw2u2
+e466fNsdtyAmkLAGX3PuoWc8fKeWtXiTswm5RFIGMhPM5wrQPqHQVMI2+KV+DIo8
+ahrMYoYrwgApZv4k7NaQDcivDRfuLlZc97CF39Ko0kSVm2PZCbBVpFobf4h3PXn4
+lRCWrdSdv/Aa6GAO/4/ijLysl8P8MzBRn15jqBhwdVJSWXpkWscpjIDmGPoKAT23
+DZ46d/8WOkZ9hK/3I6GpSd7bHbmWzD+/IeMbR9gK0x+KYP9/RhhSlsBRk3GgiBYy
+21q9QyFGAYeH10T7jgxQlQCasjy2+IUJOv82KP4vqp+NZ08f7vbQjC/Ti955kNxM
+2UIYWLTBnfTJWo930izly4nUwUCHrwElA4xwSzdJjTFN+MT8kWZo0V5Y2O7yzZu/
+/Lyn7kgSjKt6Q6dU/5oC5/GxLcRboJl3aecDAREs6y+QyZW/Vnp0p1Hovs2znGkA
+gndwimaIf5el/h3G+Z7zLcG66LkvLKq2EIC5L8NBfv35KuOrI6IBffLRS06UcZD7
+3RWj2JzDynIZ/rqfOdWMW8dqWq8cYqEw5PYtuUQy/gM2QbDinEnNnFPj93hCRwdM
+J1zzY05M4JTf+9J9mNWD
+=XHVd
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-2.6.ebuild b/sys-apps/sandbox/sandbox-2.6.ebuild
new file mode 100644
index 000000000000..664545ff880c
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6.ebuild,v 1.1 2012/07/03 19:49:46 vapier Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd -x86-fbsd"
+IUSE="multilib"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+EMULTILIB_PKG="true"
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+}
+
+sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
+
+sb_foreach_abi() {
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Running $1 for ABI=${ABI}..."
+		"$@"
+	done
+	ABI=${OABI}
+}
+
+sb_configure() {
+	mkdir "${WORKDIR}/build-${ABI}"
+	cd "${WORKDIR}/build-${ABI}"
+
+	use multilib && multilib_toolchain_setup ${ABI}
+
+	einfo "Configuring sandbox for ABI=${ABI}..."
+	ECONF_SOURCE="../${P}/" \
+	econf ${myconf} || die
+}
+
+sb_compile() {
+	emake || die
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	# Run configures in parallel!
+	multijob_init
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		multijob_child_init sb_configure
+	done
+	ABI=${OABI}
+	multijob_finish
+
+	sb_foreach_abi sb_compile
+}
+
+sb_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+}
+
+src_test() {
+	sb_foreach_abi sb_test
+}
+
+sb_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /etc/sandbox.d #333131
+	doins etc/sandbox.d/00default || die
+}
+
+src_install() {
+	sb_foreach_abi sb_install
+
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${D}"/var/log/sandbox
+	chmod 0770 "${D}"/var/log/sandbox
+
+	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+	if [[ -n ${old} ]] ; then
+		elog "Removing old sandbox libraries for you:"
+		elog ${old//${ROOT}}
+		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
+	fi
+}
+
+pkg_postinst() {
+	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
+}