Build sandbox properly with -DSB_HAVE_64BIT_ARCH on multilib archs.

Package-Manager: portage-2.0.51-r12

4 files changed, 30 insertions, 30 deletions

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d4029f6a76c5..921217bf1ea6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 838be491686bbc8355f44e91020e425c portage-2.0.51-r3.ebuild 12549
-MD5 e2e3e43e53e88fb43869c3d0245c6055 portage-2.0.51-r10.ebuild 13223
-MD5 8c5ea2cf8e02fc8c426fc3b216083354 portage-2.0.51-r12.ebuild 13223
-MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
-MD5 892d2dd5257c16f25ac4f2f085feffff portage-2.0.51-r11.ebuild 13223
-MD5 4db139ef78ff65c537654f5f7e512dfd files/digest-portage-2.0.51-r10 71
-MD5 7ce81e80c07f03c034055c586114b750 files/digest-portage-2.0.51-r11 71
-MD5 ded45fee9effe9096a69c8be02263a7a files/digest-portage-2.0.51-r12 71
-MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
+MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
+MD5 838be491686bbc8355f44e91020e425c portage-2.0.51-r3.ebuild 12549
+MD5 9a5354e137c41471c03e50fa1288f99f portage-2.0.51-r12.ebuild 13272
+MD5 741d5ea32d4b3a6bf4e8dc8f7c78e43f portage-2.0.51-r11.ebuild 13272
+MD5 d84660d651e2621b448cf70f7bfa2023 portage-2.0.51-r10.ebuild 13272
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
+MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
+MD5 ded45fee9effe9096a69c8be02263a7a files/digest-portage-2.0.51-r12 71
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
+MD5 7ce81e80c07f03c034055c586114b750 files/digest-portage-2.0.51-r11 71
+MD5 4db139ef78ff65c537654f5f7e512dfd files/digest-portage-2.0.51-r10 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5riQBDOEqLMd+jQRAih/AJ9/50ZxVxpLKhHiMssADCaoak62+QCdHz8p
-inOHAk9vItweTfckTbrnbeI=
-=feiP
+iD8DBQFB59gdArHZZzCEUG0RAoSIAJ99AT8Hgja/xcohUeza+Wk4CxnmGwCfTxbY
+8+s5Ec3ZwQUYZbums9IJ190=
+=7/32
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51-r10.ebuild b/sys-apps/portage/portage-2.0.51-r10.ebuild
index 9adcad2782ed..b2a4f6d75aab 100644
--- a/sys-apps/portage/portage-2.0.51-r10.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r10.ebuild,v 1.4 2005/01/13 04:18:09 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r10.ebuild,v 1.5 2005/01/14 14:32:51 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PF}
 DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-RESTRICT="nosandbox sandbox"
+RESTRICT="nosandbox sandbox multilib-pkg-force"
 
 # Contact carpaski with a reason before you modify any of these.
 #KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
@@ -62,17 +62,17 @@ src_compile() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "NOT BUILDING SANDBOX ON ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ] && ! hasq ${FEATURES}; then
+	elif [ -n "${MULTILIB_ABIS}" ]; then
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_abi_order); do
 			export ABI
 			make clean
-			make CFLAGS="-O1 -pipe" libsandbox.so || die
+			make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" libsandbox.so || die
 			mv libsandbox.so libsandbox.so.${ABI}
 		done
 		make clean
 		export ABI="${DEFAULT_ABI}"
-		make CFLAGS="-O1 -pipe" || die
+		make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" sandbox || die
 		ABI="${OABI}"
 	elif [ "${ARCH}" == "amd64" ]; then
 		check_multilib
diff --git a/sys-apps/portage/portage-2.0.51-r11.ebuild b/sys-apps/portage/portage-2.0.51-r11.ebuild
index 316ee6ef160b..738078d65563 100644
--- a/sys-apps/portage/portage-2.0.51-r11.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r11.ebuild,v 1.1 2005/01/13 04:18:09 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r11.ebuild,v 1.2 2005/01/14 14:32:51 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PF}
 DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-RESTRICT="nosandbox sandbox"
+RESTRICT="nosandbox sandbox multilib-pkg-force"
 
 # Contact carpaski with a reason before you modify any of these.
 #KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
@@ -62,17 +62,17 @@ src_compile() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "NOT BUILDING SANDBOX ON ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ] && ! hasq ${FEATURES}; then
+	elif [ -n "${MULTILIB_ABIS}" ]; then
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_abi_order); do
 			export ABI
 			make clean
-			make CFLAGS="-O1 -pipe" libsandbox.so || die
+			make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" libsandbox.so || die
 			mv libsandbox.so libsandbox.so.${ABI}
 		done
 		make clean
 		export ABI="${DEFAULT_ABI}"
-		make CFLAGS="-O1 -pipe" || die
+		make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" sandbox || die
 		ABI="${OABI}"
 	elif [ "${ARCH}" == "amd64" ]; then
 		check_multilib
diff --git a/sys-apps/portage/portage-2.0.51-r12.ebuild b/sys-apps/portage/portage-2.0.51-r12.ebuild
index 106f4e341946..50859caf2007 100644
--- a/sys-apps/portage/portage-2.0.51-r12.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r12.ebuild,v 1.1 2005/01/13 18:05:47 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r12.ebuild,v 1.2 2005/01/14 14:32:51 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PF}
 DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-RESTRICT="nosandbox sandbox"
+RESTRICT="nosandbox sandbox multilib-pkg-force"
 
 # Contact carpaski with a reason before you modify any of these.
 #KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sh  sparc  x86"
@@ -62,17 +62,17 @@ src_compile() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "NOT BUILDING SANDBOX ON ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ] && ! hasq ${FEATURES}; then
+	elif [ -n "${MULTILIB_ABIS}" ]; then
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_abi_order); do
 			export ABI
 			make clean
-			make CFLAGS="-O1 -pipe" libsandbox.so || die
+			make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" libsandbox.so || die
 			mv libsandbox.so libsandbox.so.${ABI}
 		done
 		make clean
 		export ABI="${DEFAULT_ABI}"
-		make CFLAGS="-O1 -pipe" || die
+		make CFLAGS="-O1 -pipe -DSB_HAVE_64BIT_ARCH" sandbox || die
 		ABI="${OABI}"
 	elif [ "${ARCH}" == "amd64" ]; then
 		check_multilib