Add multilib useflag for multilib building with ok from vapier

Package-Manager: portage-2.2_rc41-r1/cvs/Linux x86_64

3 files changed, 15 insertions, 19 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index 3db13ec987d4..ae814837b157 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.128 2009/08/25 12:37:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.129 2009/09/25 13:19:23 tommy Exp $
+
+  25 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  sandbox-2.1.ebuild:
+  Add multilib useflag for multilib building with ok from vapier
 
 *sandbox-2.1 (25 Aug 2009)
 
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index ebfd55c5b010..2ebb63b4e8b3 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -17,13 +14,6 @@ EBUILD sandbox-1.2.18.1-r2.ebuild 3060 RMD160 e9c70adcff5a8fcb6d2f859d3b94629f2d
 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
 EBUILD sandbox-1.6-r2.ebuild 2684 RMD160 bad88e734075d6c7316047dac19096b5dbc8a24a SHA1 799dbdcffcd7468329eccfb070b14e0b528182f2 SHA256 889e561b9e71a30867cb8f9abb543c5a220ea1870905c333a5ae003b54b35878
-EBUILD sandbox-2.1.ebuild 2481 RMD160 973b50ae9101215081184324b34e6af5b30fa68b SHA1 fe04af8bc439f054919e64c4f5807fd6b53a892b SHA256 c4b9bb92775f2d604594a7f476275a80739996e7f1186bd56b529b4f4a558c8c
-MISC ChangeLog 18257 RMD160 009fbd299e49b5aae27b24c8fef0255e1c015ab0 SHA1 2e0610bfae6761568088ebe751ab89543e095aaf SHA256 e1805b8c79fb4abccfd1cab48586ef112490ff4ac09610805a1cbfdd9998a241
+EBUILD sandbox-2.1.ebuild 2588 RMD160 42c8114d093ea452cb90dc898e1b24ffd85f625b SHA1 36d93ee240c0fddd5b41a9b9f87faa90fdb818d1 SHA256 d7ec5480ff69103bca701d2fb1d0bb5bb5943032ad855c753814e01f7ee3d0ea
+MISC ChangeLog 18403 RMD160 429c69c76d341589a9c9989930970f5aa7545e32 SHA1 af6864f94fa3a90cfeea94d8b2ce32d18df5bbdf SHA256 e14d5ffe12d2beeb8d8b4877718dbd781a55660e037d20d1c5d697d5c48bf18e
 MISC metadata.xml 337 RMD160 c70000494a436cc0f8256d428f86d42b0fdf6017 SHA1 d81a50fa4047e6c0ecf1ab16e4fa6214895c5e9c SHA256 575b378bf8db5526847e6839a3351ec72769d75ed1c5b392559d57f6e6b4294f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqmmScACgkQlPl3HsVfCDq0IQCfZ2hUa6YzjXl75+aHMq8K7xp6
-7fwAni43T/+2Zz1vd+4ce4y3N5fmA3Jl
-=NOl4
------END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-2.1.ebuild b/sys-apps/sandbox/sandbox-2.1.ebuild
index dd545fc48a1c..fc740f69ad64 100644
--- a/sys-apps/sandbox/sandbox-2.1.ebuild
+++ b/sys-apps/sandbox/sandbox-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.1.ebuild,v 1.2 2009/09/08 17:49:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.1.ebuild,v 1.3 2009/09/25 13:19:23 tommy Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.lzma
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd -x86-fbsd"
-IUSE=""
+IUSE="multilib"
 
 DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )
 	>=app-misc/pax-utils-0.1.19" #265376
@@ -31,15 +31,17 @@ sandbox_death_notice() {
 	ewarn "FEATURES=-sandbox emerge sandbox"
 }
 
+sb_get_install_abis() { use multilib && get_install_abis || echo $ABI ; }
+
 src_compile() {
 	filter-lfs-flags #90228
 
 	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
+	for ABI in $(sb_get_install_abis) ; do
 		mkdir "${WORKDIR}/build-${ABI}"
 		cd "${WORKDIR}/build-${ABI}"
 
-		multilib_toolchain_setup ${ABI}
+		use multilib && multilib_toolchain_setup ${ABI}
 
 		einfo "Configuring sandbox for ABI=${ABI}..."
 		ECONF_SOURCE="../${P}/" \
@@ -52,7 +54,7 @@ src_compile() {
 
 src_test() {
 	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
+	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}"
@@ -62,7 +64,7 @@ src_test() {
 
 src_install() {
 	local OABI=${ABI}
-	for ABI in $(get_install_abis) ; do
+	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}"