New bugfix release.

Package-Manager: portage-2.1_rc1-r3

4 files changed, 143 insertions, 9 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index a18ad64ec46b..f4b3a699875e 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.63 2006/05/11 03:29:52 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.64 2006/05/19 12:15:28 azarah Exp $
+
+*sandbox-1.2.18.1 (19 May 2006)
+
+  19 May 2006; Martin Schlemmer <azarah@gentoo.org>
+  +sandbox-1.2.18.1.ebuild:
+  New bugfix release.
 
   11 May 2006; Joshua Jackson <tsunam@gentoo.org> sandbox-1.2.17.ebuild:
   stable x86; bug #132025
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index dc8b72c41d62..c27f198fc57e 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 DIST sandbox-1.2.12.tar.bz2 222632 RMD160 aced23dace2aa126eff4e4696b4af729a4bf43d4 SHA256 000ffe824ae563a60df2ffeb17ff5855bb58ffdd762d809148a1eab456ce5c69 size 222632
 DIST sandbox-1.2.16.tar.bz2 232260 RMD160 7f6a8b8e6eacebae69affc325ceceb5c0ca6e1c8 SHA256 301edf523cff0acc040cd2e7bd2ebcf9ef32776bb6634179e8c1193f0fe15862 size 232260
 DIST sandbox-1.2.17.tar.bz2 233461 RMD160 ba050d0c972796b2096e2c623264b979fce134dd SHA256 1ed993eb4e34e75ac70a02df27056464b2b696c1d0fcf24a8d034923c79b3de8 size 233461
+DIST sandbox-1.2.18.1.tar.bz2 236755 RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0 size 236755
 DIST sandbox-1.2.18.tar.bz2 236474 RMD160 0a622de5801e775057e24eadd2894f5352a9aa09 SHA256 3e070150d08f054ae958a67fc1382e2ed0465a5f5ded61b8e34874d0297df8e8 size 236474
 EBUILD sandbox-1.2.12.ebuild 3149 RMD160 7499e5ab49ef422051d0945b345c3da0a023bb89 SHA1 7e2352f8da33ce8d6ef096e0d816001cd9b809c1 SHA256 a809812f6d2564df6737940f800dfcb3ae86c134479f175680d6d194f5daf5e6 size 3149
 MD5 2a9cb52b6d5f510386df939b2e093678 sandbox-1.2.12.ebuild 3149
@@ -17,14 +18,18 @@ EBUILD sandbox-1.2.17.ebuild 3044 RMD160 bfad4423beea0ffb06b12cbabda6ab03c80216f
 MD5 f2dff49b45221e8f9e22b22e6623d5dc sandbox-1.2.17.ebuild 3044
 RMD160 bfad4423beea0ffb06b12cbabda6ab03c80216fa sandbox-1.2.17.ebuild 3044
 SHA256 3871cdb0638e95d099f479f68d4758bb4f7f8c4f9e20ab0273b44e448a99fa37 sandbox-1.2.17.ebuild 3044
+EBUILD sandbox-1.2.18.1.ebuild 2962 RMD160 8ccc606ff77f6ca9959b11b97611ab4cbcae9adb SHA1 a43e655a7da7ca8b1807b929b907a22d86ff6426 SHA256 e9474b144aefdcee068f01d84ba86bd531215aa57c74166caa03fa0cc68df1f4 size 2962
+MD5 eb85b8b47e4a2005e226e1c9794a2d7f sandbox-1.2.18.1.ebuild 2962
+RMD160 8ccc606ff77f6ca9959b11b97611ab4cbcae9adb sandbox-1.2.18.1.ebuild 2962
+SHA256 e9474b144aefdcee068f01d84ba86bd531215aa57c74166caa03fa0cc68df1f4 sandbox-1.2.18.1.ebuild 2962
 EBUILD sandbox-1.2.18.ebuild 2975 RMD160 2984876d2e3abb8b670e4d51c4558dae11f8484e SHA1 d2a8da84efe705a21d101fbd41fb0697148421da SHA256 d138ab29359b28b7940559203785758fd7de768e22f5856d45a433d495b8e5d8 size 2975
 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 8244 RMD160 5a725208545f6d73e0f8adec1e1eebcd35cbf935 SHA1 802ea59f726495f7556a4c4d4c558d58a00a4c3c SHA256 29bde32f524204175a526a92cf659fcfe7c944bdcd5b67f71bc9286c40f8ac5f size 8244
-MD5 07317fa7dafdb335fb168d2b6c7c3d9f ChangeLog 8244
-RMD160 5a725208545f6d73e0f8adec1e1eebcd35cbf935 ChangeLog 8244
-SHA256 29bde32f524204175a526a92cf659fcfe7c944bdcd5b67f71bc9286c40f8ac5f ChangeLog 8244
+MISC ChangeLog 8380 RMD160 55148db58fc96853f22cf08f5683d35a69024642 SHA1 a2e68527f930c0fb4872069f53e6a03a8e2d2ca3 SHA256 35b0a6ec9de42c268e5e2180a28cbf6401f920a29324090b384e055aa5e0a09b size 8380
+MD5 8b5500c8d2b6596a91acbfdeaad4af96 ChangeLog 8380
+RMD160 55148db58fc96853f22cf08f5683d35a69024642 ChangeLog 8380
+SHA256 35b0a6ec9de42c268e5e2180a28cbf6401f920a29324090b384e055aa5e0a09b ChangeLog 8380
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f size 337
 MD5 4a6b419321a7e1ee609c8af41905ff1b metadata.xml 337
 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 metadata.xml 337
@@ -41,10 +46,13 @@ SHA256 ce285228a81cd36dcbe480a35dd477f1a586ae1924ea820b12dc5f2a9707a019 files/di
 MD5 11c5a0bbfe848568a9ca4a54cd24bc51 files/digest-sandbox-1.2.18 247
 RMD160 396310076b2e554ba65b1bdf4a3e0304b1d9fb37 files/digest-sandbox-1.2.18 247
 SHA256 6707c7c578ca80a4df0c073c7d7a12fd5a3cf85af072d96169e90941b29e69b4 files/digest-sandbox-1.2.18 247
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEYq+6SENan+PfizARAn3BAKCbhVrw78MiocOZPHYMSuA/5ufhdwCgm6Pg
-jjoIMXBZFYwEyKKIVzmwyBk=
-=lt6f
+iD8DBQFEbbkX1ZcsMnZjRyIRAktnAJ9PjX4PNMlBaT146TICHochLDaXqgCaAylC
+LR5K7eh1SExf1v3TPd0vCnk=
+=Hcgx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/files/digest-sandbox-1.2.18.1 b/sys-apps/sandbox/files/digest-sandbox-1.2.18.1
new file mode 100644
index 000000000000..f894e17eaa8e
--- /dev/null
+++ b/sys-apps/sandbox/files/digest-sandbox-1.2.18.1
@@ -0,0 +1,3 @@
+MD5 8637808ea8fa55fe10c57d335911e847 sandbox-1.2.18.1.tar.bz2 236755
+RMD160 62e1e33d7f64db14d9c34d103d50256934a6d253 sandbox-1.2.18.1.tar.bz2 236755
+SHA256 3404381bfdea3042e6ddb7c309eaef08201d8731d8e0a756c42cd389edda14c0 sandbox-1.2.18.1.tar.bz2 236755
diff --git a/sys-apps/sandbox/sandbox-1.2.18.1.ebuild b/sys-apps/sandbox/sandbox-1.2.18.1.ebuild
new file mode 100644
index 000000000000..77158d711a17
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-1.2.18.1.ebuild
@@ -0,0 +1,117 @@
+# 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.18.1.ebuild,v 1.1 2006/05/19 12:15:28 azarah Exp $
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~azarah/sandbox/${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="../${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}
+
+	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
+}