Testing release for feedback. Check package.mask for details.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 155 insertions, 12 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 3de582c13cd4..762180983cf2 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.66 2006/05/20 18:03:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.67 2006/07/07 15:15:30 azarah Exp $
+
+*sandbox-1.2.20_alpha1 (07 Jul 2006)
+
+  07 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +files/09sandbox,
+  +sandbox-1.2.20_alpha1.ebuild:
+  Testing release for feedback.  Check package.mask for details.
 
   20 May 2006; Bryan Østergaard <kloeri@gentoo.org> sandbox-1.2.17.ebuild:
   Stable on ia64.
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index dd8b58fc8660..e34c45f1ad0c 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,11 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe
+MD5 1e4d8cd352642245a1af233d6b9b4e2f files/09sandbox 37
+RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 files/09sandbox 37
+SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe files/09sandbox 37
 DIST sandbox-1.2.12.tar.bz2 222632 RMD160 aced23dace2aa126eff4e4696b4af729a4bf43d4 SHA256 000ffe824ae563a60df2ffeb17ff5855bb58ffdd762d809148a1eab456ce5c69
-DIST sandbox-1.2.16.tar.bz2 232260 RMD160 7f6a8b8e6eacebae69affc325ceceb5c0ca6e1c8 SHA256 301edf523cff0acc040cd2e7bd2ebcf9ef32776bb6634179e8c1193f0fe15862
-DIST sandbox-1.2.17.tar.bz2 233461 RMD160 ba050d0c972796b2096e2c623264b979fce134dd SHA256 1ed993eb4e34e75ac70a02df27056464b2b696c1d0fcf24a8d034923c79b3de8
-DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0
-DIST sandbox-1.2.18.tar.bz2 236474 RMD160 0a622de5801e775057e24eadd2894f5352a9aa09 SHA256 3e070150d08f054ae958a67fc1382e2ed0465a5f5ded61b8e34874d0297df8e8
+DIST sandbox-1.2.16.tar.bz2 232260 RMD160 7f6a8b8e6eacebae69affc325ceceb5c0ca6e1c8 SHA1 3690c61dd53f8f9197a835324efaf87b57901dbd SHA256 301edf523cff0acc040cd2e7bd2ebcf9ef32776bb6634179e8c1193f0fe15862
+DIST sandbox-1.2.17.tar.bz2 233461 RMD160 ba050d0c972796b2096e2c623264b979fce134dd SHA1 81980a91e09963b239ec18948eae57dcca4d0492 SHA256 1ed993eb4e34e75ac70a02df27056464b2b696c1d0fcf24a8d034923c79b3de8
+DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 SHA1 d48220a0d52556daca029aa370c0d29c09dd6a92 SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0
+DIST sandbox-1.2.18.tar.bz2 236474 RMD160 0a622de5801e775057e24eadd2894f5352a9aa09 SHA1 a6eed1e58ad627706f35f6a30dd0311f78029455 SHA256 3e070150d08f054ae958a67fc1382e2ed0465a5f5ded61b8e34874d0297df8e8
+DIST sandbox-1.2.20alpha1.tar.bz2 265714 RMD160 d645c64a8bb441a8660a79255574fa3ed16b263c SHA1 dd7e06f977c3982f3362da98fd05112042107139 SHA256 28f91f12c5a648a72d67e93d84a97666f313e4dd1b3159f5f5e54087718f9169
 EBUILD sandbox-1.2.12.ebuild 3149 RMD160 7499e5ab49ef422051d0945b345c3da0a023bb89 SHA1 7e2352f8da33ce8d6ef096e0d816001cd9b809c1 SHA256 a809812f6d2564df6737940f800dfcb3ae86c134479f175680d6d194f5daf5e6
 MD5 2a9cb52b6d5f510386df939b2e093678 sandbox-1.2.12.ebuild 3149
 RMD160 7499e5ab49ef422051d0945b345c3da0a023bb89 sandbox-1.2.12.ebuild 3149
@@ -26,10 +31,14 @@ EBUILD sandbox-1.2.18.ebuild 2975 RMD160 2984876d2e3abb8b670e4d51c4558dae11f8484
 MD5 94b43cabf5da56c452e868e82e55d4b1 sandbox-1.2.18.ebuild 2975
 RMD160 2984876d2e3abb8b670e4d51c4558dae11f8484e sandbox-1.2.18.ebuild 2975
 SHA256 d138ab29359b28b7940559203785758fd7de768e22f5856d45a433d495b8e5d8 sandbox-1.2.18.ebuild 2975
-MISC ChangeLog 8571 RMD160 7353183e61e8bc64c3eaf9c8460564b8b31411e4 SHA1 4cea41dfea4250324545179a9c9c4e04693c438c SHA256 f8852f5fbed2afbd6d2e4a79489390b8be0fcf5e8825a5c28aa6328fb49391a3
-MD5 e3cdbab4d7c93f810c3b61e23899b1cc ChangeLog 8571
-RMD160 7353183e61e8bc64c3eaf9c8460564b8b31411e4 ChangeLog 8571
-SHA256 f8852f5fbed2afbd6d2e4a79489390b8be0fcf5e8825a5c28aa6328fb49391a3 ChangeLog 8571
+EBUILD sandbox-1.2.20_alpha1.ebuild 3047 RMD160 8204edcf086b4324c7eff46417226291177f3481 SHA1 e10e96ce57c3251835fd4c90f5d3cb9bd1d69ee6 SHA256 11e30aa7ec1fa32a6b543cba9349a57f137a092d50a9e997a03b2d1189f5bee4
+MD5 956f4996cf0cc9f007d7f3fcd5be41a2 sandbox-1.2.20_alpha1.ebuild 3047
+RMD160 8204edcf086b4324c7eff46417226291177f3481 sandbox-1.2.20_alpha1.ebuild 3047
+SHA256 11e30aa7ec1fa32a6b543cba9349a57f137a092d50a9e997a03b2d1189f5bee4 sandbox-1.2.20_alpha1.ebuild 3047
+MISC ChangeLog 8778 RMD160 962ea22e4e73361f5064225eb12ba52080b29a8f SHA1 5f2fc370c1a20383652b5da9aecf7ae15f0260fd SHA256 b5ed38520d45f62473a2d38443d1b19945972d22965c41d9d38813d985135592
+MD5 6f7b71b444186657276b21f49cd50815 ChangeLog 8778
+RMD160 962ea22e4e73361f5064225eb12ba52080b29a8f ChangeLog 8778
+SHA256 b5ed38520d45f62473a2d38443d1b19945972d22965c41d9d38813d985135592 ChangeLog 8778
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
 MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 metadata.xml 337
@@ -49,10 +58,13 @@ SHA256 6707c7c578ca80a4df0c073c7d7a12fd5a3cf85af072d96169e90941b29e69b4 files/di
 MD5 97542900fffd5ddceb03ac5cf7b9eb52 files/digest-sandbox-1.2.18.1 253
 RMD160 241481cf56ce1fb1f8cdbb07545f9055f0af9a65 files/digest-sandbox-1.2.18.1 253
 SHA256 0bab4b68b71b653265a17720073d927350749a95a482b8ae18a441efb8ee554d files/digest-sandbox-1.2.18.1 253
+MD5 c4e2f8e2c3813d6703428ba9cf3eaed5 files/digest-sandbox-1.2.20_alpha1 265
+RMD160 9bf0b5d6d48b9033a746374964b84a067e5e7c45 files/digest-sandbox-1.2.20_alpha1 265
+SHA256 ff420d4bb7e233e623db5e017488bc1e047d378ac4d0c44d6f22e271d4de252a files/digest-sandbox-1.2.20_alpha1 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqC5oamhnQswr0vIRAkw6AKCQWTYyjiPnA2HdFSX4+wqTbrv6jQCeKmqf
-U6jYsjXddzxDmT0MP9/dOfM=
-=1Gn6
+iD8DBQFErnr01ZcsMnZjRyIRAkccAKC432stPJZHrtLJExZ/yyGEcEQOIwCgsPo1
+gX9Hn/5OHA+sRe487K7KdWE=
+=gTV9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox
new file mode 100644
index 000000000000..9181eb068caf
--- /dev/null
+++ b/sys-apps/sandbox/files/09sandbox
@@ -0,0 +1 @@
+CONFIG_PROTECT_MASK="/etc/sandbox.d"
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1 b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1
new file mode 100644
index 000000000000..a403cb1f613c
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.20_alpha1
@@ -0,0 +1,3 @@
+MD5 90754fc1822e942bfc8c34d16b5611c5 sandbox-1.2.20alpha1.tar.bz2 265714
+RMD160 d645c64a8bb441a8660a79255574fa3ed16b263c sandbox-1.2.20alpha1.tar.bz2 265714
+SHA256 28f91f12c5a648a72d67e93d84a97666f313e4dd1b3159f5f5e54087718f9169 sandbox-1.2.20alpha1.tar.bz2 265714
diff --git a/sys-apps/sandbox/sandbox-1.2.20_alpha1.ebuild b/sys-apps/sandbox/sandbox-1.2.20_alpha1.ebuild
new file mode 100644
index 000000000000..f3c17208e39b
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.20_alpha1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.2.20_alpha1.ebuild,v 1.1 2006/07/07 15:15:30 azarah Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RESTRICT="multilib-pkg-force"
+
+DEPEND=""
+
+setup_multilib() {
+	if use amd64 && has_m32 && [[ ${CONF_MULTILIBDIR} == "lib32" ]]; then
+		export DEFAULT_ABI="amd64"
+		export MULTILIB_ABIS="x86 amd64"
+		export CFLAGS_amd64=${CFLAGS_amd64:-"-m64"}
+		export CFLAGS_x86=${CFLAGS_x86-"-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"}
+		export CHOST_amd64="x86_64-pc-linux-gnu"
+		export CHOST_x86="i686-pc-linux-gnu"
+		export LIBDIR_amd64=${LIBDIR_amd64-${CONF_LIBDIR}}
+		export LIBDIR_x86=${LIBDIR_x86-${CONF_MULTILIBDIR}}
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+abi_fail_check() {
+	local ABI=$1
+	if [[ ${ABI} == "x86" ]] ; then
+		echo
+		eerror "Building failed for ABI=x86!.  This usually means a broken"
+		eerror "multilib setup.  Please fix that before filling a bugreport"
+		eerror "against sandbox."
+		echo
+	fi
+}
+
+src_compile() {
+	local myconf
+	local iscross=0
+
+	setup_multilib
+
+	filter-lfs-flags #90228
+
+	has_multilib_profile && myconf="--enable-multilib"
+
+	ewarn "If configure fails with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+
+	[[ -n ${CBUILD} && ${CBUILD} != ${CHOST} ]] && iscross=1
+
+	OABI=${ABI}
+	OCHOST=${CHOST}
+	for ABI in $(get_install_abis); do
+		mkdir "${WORKDIR}/build-${ABI}-${OCHOST}"
+		cd "${WORKDIR}/build-${ABI}-${OCHOST}"
+
+		# Needed for older broken portage versions (bug #109036)
+		has_version '<sys-apps/portage-2.0.51.22' && \
+			unset EXTRA_ECONF
+
+		export ABI
+		export CHOST=$(get_abi_CHOST)
+		[[ ${iscross} == 0 ]] && export CBUILD=${CHOST}
+
+		einfo "Configuring sandbox for ABI=${ABI}..."
+		ECONF_SOURCE="../${MY_P}/" \
+		econf --libdir="/usr/$(get_libdir)" ${myconf}
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || {
+			abi_fail_check "${ABI}"
+			die "emake failed for ${ABI}"
+		}
+	done
+	ABI=${OABI}
+	CHOST=${OCHOST}
+}
+
+src_install() {
+	setup_multilib
+
+	OABI=${ABI}
+	for ABI in $(get_install_abis); do
+		cd "${WORKDIR}/build-${ABI}-${CHOST}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		make DESTDIR="${D}" install || die "make install failed for ${ABI}"
+	done
+	ABI=${OABI}
+
+	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 ${IMAGE}/var/log/sandbox
+	chmod 0770 ${IMAGE}/var/log/sandbox
+}