Switch to using multilib.eclass rather than querrying profile variables directly to fix bug #82027.

Package-Manager: portage-2.0.51-r15

10 files changed, 64 insertions, 54 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 8f7d7c570950..79b1fe16dae3 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for sys-apps/portage
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.34 2004/08/16 08:35:24 carpaski Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.35 2005/02/18 11:43:28 eradicator Exp $
 
 # See the gentoo-src Portage ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/portage/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*portage-2.0.51-r15 (18 Feb 2005)
+
+  18 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  portage-2.0.51-r10.ebuild, portage-2.0.51-r11.ebuild,
+  portage-2.0.51-r12.ebuild, portage-2.0.51-r13.ebuild,
+  portage-2.0.51-r14.ebuild, portage-2.0.51-r15.ebuild,
+  portage-2.0.51.16.ebuild:
+  Switch to using multilib.eclass rather than querrying profile variables
+  directly to fix bug #82027.
+
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6b7aca6027b8..fe34ca02d9d7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 90ec97958f91e5bc1178fbfa251c0a16 portage-2.0.51.16.ebuild 13236
-MD5 23b5b11d8ca69de5550a81798b81f790 portage-2.0.51-r13.ebuild 13060
-MD5 838be491686bbc8355f44e91020e425c portage-2.0.51-r3.ebuild 12549
-MD5 b2ff3888ac07cc6233dd8748f0d5ce57 portage-2.0.51-r15.ebuild 13130
-MD5 6f86a4f3d81b824e937773dd0cea31d1 portage-2.0.51-r10.ebuild 13053
-MD5 57269743e4ba14aa6f2d587519c1e9c3 portage-2.0.51-r12.ebuild 13053
-MD5 1075379d8ce145a1506c4b0a8587759d portage-2.0.51-r14.ebuild 14016
-MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
+MD5 30d382e0a20f8b25e643e0e4ac60e949 ChangeLog 806
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
-MD5 b2431a7707c22f6e66790b7a90fda216 portage-2.0.51-r11.ebuild 13053
+MD5 a6d50ca56018cef63e28f964f38f36e3 portage-2.0.51-r3.ebuild 12551
+MD5 bc67f452d84011c03f424b4c41e44bba portage-2.0.51.16.ebuild 13240
+MD5 6878d64c11bfc3a0e7f6036806741007 portage-2.0.51-r15.ebuild 13132
+MD5 80f8b29af1d7d473cf331d98f4716982 portage-2.0.51-r14.ebuild 14018
+MD5 6a13b74143f2d0bb378637507613d666 portage-2.0.51-r13.ebuild 13062
+MD5 e95d319253e47156d4039a16ca39cca6 portage-2.0.51-r12.ebuild 13055
+MD5 570cac48d4d23a4f0ee90089bf6913e4 portage-2.0.51-r11.ebuild 13055
+MD5 f14fb1a769ead60e3d667ab66a813d8e portage-2.0.51-r10.ebuild 13055
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 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 d2e4e3afe0e6ca9708931542fb71cb17 files/digest-portage-2.0.51-r13 71
 MD5 720ac5e9cff2265fb89a747b97231911 files/digest-portage-2.0.51-r14 71
-MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
-MD5 0845d57e95d42341ba39cc64ed0b52a7 files/digest-portage-2.0.51.16 70
 MD5 5ea5d3ffe4a24cd1c719420cd0a2de11 files/digest-portage-2.0.51-r3 70
-MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163
+MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71
+MD5 0845d57e95d42341ba39cc64ed0b52a7 files/digest-portage-2.0.51.16 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCBhmdBDOEqLMd+jQRAv4lAJ0e3gn6aMhJwqpxpyX5/aK29fHNiQCg4RfS
-UAcaRUDzlYIbG55Mbe+drY0=
-=4gEn
+iD8DBQFCFdUrArHZZzCEUG0RApdoAJ47f9+NlRIgrlRUeeRNKDyu55iXJQCdH4Zg
+IKuoaf5c2eay9uDFMzI07NI=
+=P1sx
 -----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 d6a1e0edd200..459bdf83518b 100644
--- a/sys-apps/portage/portage-2.0.51-r10.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r10.ebuild
@@ -1,8 +1,8 @@
 # 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.8 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r10.ebuild,v 1.9 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -62,7 +62,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -133,10 +133,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r11.ebuild b/sys-apps/portage/portage-2.0.51-r11.ebuild
index 66f240b4d6c7..5644f9fe4d16 100644
--- a/sys-apps/portage/portage-2.0.51-r11.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r11.ebuild
@@ -1,8 +1,8 @@
 # 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.5 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r11.ebuild,v 1.6 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -62,7 +62,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -133,10 +133,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r12.ebuild b/sys-apps/portage/portage-2.0.51-r12.ebuild
index 00328dadeca3..36bc941a4432 100644
--- a/sys-apps/portage/portage-2.0.51-r12.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r12.ebuild
@@ -1,8 +1,8 @@
 # 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.5 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r12.ebuild,v 1.6 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -62,7 +62,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -133,10 +133,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r13.ebuild b/sys-apps/portage/portage-2.0.51-r13.ebuild
index cb47dd2d38b8..2d799aff1ab9 100644
--- a/sys-apps/portage/portage-2.0.51-r13.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r13.ebuild
@@ -1,8 +1,8 @@
 # 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-r13.ebuild,v 1.3 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r13.ebuild,v 1.4 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -62,7 +62,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -133,10 +133,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r14.ebuild b/sys-apps/portage/portage-2.0.51-r14.ebuild
index 17007be211ad..5084d8062dec 100644
--- a/sys-apps/portage/portage-2.0.51-r14.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r14.ebuild
@@ -1,8 +1,8 @@
 # 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-r14.ebuild,v 1.4 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r14.ebuild,v 1.5 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -94,7 +94,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -165,10 +165,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r15.ebuild b/sys-apps/portage/portage-2.0.51-r15.ebuild
index e05ce494ce96..37389d78c420 100644
--- a/sys-apps/portage/portage-2.0.51-r15.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r15.ebuild
@@ -1,8 +1,8 @@
 # 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-r15.ebuild,v 1.3 2005/02/03 05:40:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r15.ebuild,v 1.4 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -64,7 +64,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -135,10 +135,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr
diff --git a/sys-apps/portage/portage-2.0.51-r3.ebuild b/sys-apps/portage/portage-2.0.51-r3.ebuild
index 03a8aa262cb4..2cea3a080089 100644
--- a/sys-apps/portage/portage-2.0.51-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r3.ebuild,v 1.12 2005/01/13 00:38:39 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r3.ebuild,v 1.13 2005/02/18 11:43:29 eradicator Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/sys-apps/portage/portage-2.0.51.16.ebuild b/sys-apps/portage/portage-2.0.51.16.ebuild
index aa18c6f8c04e..8024be1c4665 100644
--- a/sys-apps/portage/portage-2.0.51.16.ebuild
+++ b/sys-apps/portage/portage-2.0.51.16.ebuild
@@ -1,8 +1,8 @@
 # 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.16.ebuild,v 1.1 2005/02/06 13:20:02 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.16.ebuild,v 1.2 2005/02/18 11:43:29 eradicator Exp $
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic eutils toolchain-funcs multilib
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
@@ -62,7 +62,7 @@ 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}" ]; then
+	elif has_multilib_profile; then
 		OABI="${ABI}"
 		for ABI in $(get_install_abis); do
 			export ABI
@@ -139,10 +139,10 @@ src_install() {
 	cd ${S}/src/sandbox-1.1
 	if use ppc-macos || use x86-fbsd; then
 		ewarn "Not installing sandbox on ${ARCH}"
-	elif [ -n "${MULTILIB_ABIS}" ]; then
+	elif has_multilib_profile; then
 		into /
 		OABI="${ABI}"
-		for ABI in ${MULTILIB_ABIS}; do
+		for ABI in $(get_install_abis); do
 			newlib.so libsandbox.so.${ABI} libsandbox.so
 		done
 		into /usr