Version bump.

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

3 files changed, 127 insertions, 11 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 6720200552b2..18e8385cab8f 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.152 2011/02/12 18:14:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.153 2011/02/14 06:20:12 vapier Exp $
+
+*sandbox-2.5 (14 Feb 2011)
+
+  14 Feb 2011; Mike Frysinger <vapier@gentoo.org> +sandbox-2.5.ebuild:
+  Version bump.
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org> sandbox-2.4.ebuild:
   sparc stable wrt #348549
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index e517925eaaa9..ed390bb27177 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,21 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-libsandbox-handle-more-at-functions.patch 1473 RMD160 ae83a5ce443be6845a48f79cda0c95756a9fb8d5 SHA1 3a85ce88b9846ccbec773f8fd68798b5c9d0c3f9 SHA256 7681e867bb4dea26d165f9a066dca798519e2fd57b49c7b31c0c2fc254037523
 AUX 09sandbox 37 RMD160 75e8b6114feb9c3186fe983e9cf7544b67519d37 SHA1 d1d52cd3076c632f8c7d88c8bcd45f045922bd4e SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe
-AUX sandbox-1.2.18.1-open-cloexec.patch 492 RMD160 01ea2af19e02d2c011a89bcbe3744bcb3804afd2 SHA1 4c3af0fe648ce52713b4fb52fb5ed85c73a4e298 SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf
-AUX sandbox-1.2.18.1-open-normal-fail.patch 3144 RMD160 8a4653312e5f22fcf6e08204536c911d492be28f SHA1 fe1cc6ad1e113109a957391a954bd89742051450 SHA256 9c3b6c4c5595b95f6a00fa9e94f72bbcb41cd5ba689a8a29ebf61c6024e73449
-AUX sandbox-1.2.18.1-rtld-validation.patch 1415 RMD160 760ddfaed30a526923292f294dae67c2431b4d2e SHA1 92de1391b17b51c00f7ad4b34fecfae1923eef7f SHA256 821c22ce76c4a75ad4e5bde186744811bbf73de341c16c5890edfd8b20c95cf5
-AUX sandbox-1.2.20_alpha2-parallel.patch 259 RMD160 97766f2a6aa6c2c57579b69d46e7a3280df4f570 SHA1 3bb4d5ad7b6a517005c8c489c63b13ec2d5e7aa6 SHA256 e14bf149853ae5d276a852b2aac66d0ec53ad9b0fc5babda61e112ca59a9b862
 AUX sandbox-1.6-disable-pthread.patch 959 RMD160 235fd844de2fa99bf1342af463934a710cb7429e SHA1 fa5087f0bc9efa0a939ef4c5a59499784f6393f4 SHA256 c4fefddab05d440b3b1c2df766c5b2abd7c543cd2aa4cf1e61c0d3c3dd905f0c
 AUX sandbox-1.6-disable-qa-static.patch 332 RMD160 5c57e59d49b6c9333d0575e4708354fa14d7bf49 SHA1 fc84e3ab9e0aaea8b34e0771595f4dd3666ae7ba SHA256 060afa33dcfb6836676dc0febd5bc272b66b55e3753f739b56664e9ebce0eb20
-DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 SHA1 d48220a0d52556daca029aa370c0d29c09dd6a92 SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0
-DIST sandbox-1.2.20alpha2.tar.bz2 278323 RMD160 ebb3ca0963878810f3ac86633f848576fddb225e SHA1 3cd2262e9de3ad642b6e021eab26b50d6202ef41 SHA256 19f7148e259cf5212b8e587789b61c33cd4053c1947219a22749e7fb750b21d3
 DIST sandbox-1.6.tar.lzma 307014 RMD160 abdcfbbf137304f87c2cb184a4650bf652555ef6 SHA1 e1041d764e3fb326fe195ab39c8676227500f292 SHA256 52cfd286da3d5d51f3b6e012e409e931b21e32b4f2f16ba5677e46328680f4f4
 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
-EBUILD sandbox-1.2.18.1-r2.ebuild 3060 RMD160 e9c70adcff5a8fcb6d2f859d3b94629f2dd43392 SHA1 6a97f8384cf8a8dfa09ac86610464c831c9ba154 SHA256 24b164abace873d2483cb95fcafc6ef0cd47e356d9fbabbc2a23641dd2e8c167
-EBUILD sandbox-1.2.18.1-r3.ebuild 3219 RMD160 3b3a08f69aaf4b09458ddad1196ccbda14b2f57c SHA1 f01b174bf4055ff414a009c2b8fbb100713f39cb SHA256 c8ad82468d13716809f8c4667c316da5b9784e92100a6e7fe483d948bd8da85e
-EBUILD sandbox-1.2.20_alpha2-r1.ebuild 2638 RMD160 e0b26ffd54aa036168678bac8388a326de51deac SHA1 9a4e6f3b05d17e4d2893bbfe427ef3a2840f34c5 SHA256 7f64e7626f9d197c2d0d54254f19e902e8bf49561e2fb5d332e4ff727a69bad5
+DIST sandbox-2.5.tar.xz 355680 RMD160 f6eb0d681d5280c6ced5cd6bfd4da74e25ce129f SHA1 bfa2456d3a8b9f35b460f733b97a1fe7f00c5ca5 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a
 EBUILD sandbox-1.6-r2.ebuild 2807 RMD160 34f50316548b2e9d98b5dfb70d99e3e380302672 SHA1 bba36e5a8fa8ea20c1e45febc5aeb56296d12cc9 SHA256 0d9c59cc9c328ad90f1ca93130b7975f09c827f55910a590ff2b2c314661b287
 EBUILD sandbox-2.3-r1.ebuild 2877 RMD160 9c1335c54192c0214a6eac9e4e9da649f16450d6 SHA1 b6cd28f55b2f69168fb789c5f542fa7056e12c71 SHA256 0b95ed925d80aa116e1ea6a9f261aa8c005326988d9ab3a1559ad799abd9d9cb
 EBUILD sandbox-2.4.ebuild 2807 RMD160 2b063c92a9e0d42239f30aa507651d05000e9056 SHA1 dcd224bafa68998a0e4f0ef9dad05769336fa3e5 SHA256 a099016d34a2eb2ab983d41052d0dde9b0f5039dbd504066dfff54e465356602
-MISC ChangeLog 21182 RMD160 b60288bb3d10296360169a4d3872d7f85691d20a SHA1 69696fe45344fba619b6060fd1109c1cb085f63b SHA256 5a25f622f62ebf99fc5b0581afb8c1ec3ac97c7b2bbfd8c87fe2a85d59d84050
+EBUILD sandbox-2.5.ebuild 2818 RMD160 ae6486894616248f94070a3c380f3ea782c76422 SHA1 5e08ff52c039c717ec3427dd35cd3266fabe5c20 SHA256 ec85ae48f04223c431a78e32224555e373f5c60dd94fc16de44026b78c71ff5d
+MISC ChangeLog 21297 RMD160 3ba9ef1c59c2e84059e0ac9a487613cc8f8b35d4 SHA1 82614e47bb1157ac6bc04cd5f99f252d9f387e85 SHA256 2fb23e1edc36e73189c6b4e80bc7b02b18b583dd2695790e31177f63f2cf12b0
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1YyaIACgkQaC/OocHi7JZdIQD9HqBMdNmbVsMiO62l4tNAUU6j
+mbbMSxuU/oJnAYPLDIoA/iqLEYq/dkdVKrL9mkyjLMrDxQltBtrjxMTwA+OJv9bv
+=zDeZ
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild
new file mode 100644
index 000000000000..26a9aa8eb95b
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.1 2011/02/14 06:20:12 vapier Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+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} ; }
+
+src_unpack() {
+	unpack ${A}
+	if [[ ! -d ${S} ]] ; then
+		# When upgrading from older version, xz unpack may not work #271543
+		xz -dc "${DISTDIR}/${A}" | tar xf - || die
+	fi
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		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
+		einfo "Building sandbox for ABI=${ABI}..."
+		emake || die
+	done
+	ABI=${OABI}
+}
+
+src_test() {
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Checking sandbox for ABI=${ABI}..."
+		emake check || die "make check failed for ${ABI}"
+	done
+	ABI=${OABI}
+}
+
+src_install() {
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Installing sandbox for ABI=${ABI}..."
+		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
+		insinto /etc/sandbox.d #333131
+		doins etc/sandbox.d/00default || die
+	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 "${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
+}