touchup status output while building

(Portage version: 2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/ )

6 files changed, 290 insertions, 248 deletions

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
index 18205539ea3b..8be73075ac86 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r2.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-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.4 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.5 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -946,7 +946,7 @@ glibc_do_configure() {
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--disable-profile
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
@@ -958,7 +958,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1239,20 +1239,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1261,20 +1263,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1283,20 +1288,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 3c83f540ed8b..7183fc028b71 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.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-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.60 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.61 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -891,7 +891,7 @@ glibc_do_configure() {
 		--host=${CTARGET_OPT:-${CTARGET}}
 		--disable-profile
 		--without-gd
-		--with-headers=$(alt_headers)
+		--with-headers=${ROOT}$(alt_headers)
 		--prefix=$(alt_prefix)
 		--mandir=$(alt_prefix)/share/man
 		--infodir=$(alt_prefix)/share/info
@@ -903,7 +903,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1177,20 +1177,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1199,20 +1201,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1221,20 +1226,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index bcb63eb6df8d..19218d03b048 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.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-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.27 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.28 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -915,7 +915,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1185,20 +1185,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1207,20 +1209,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1229,20 +1234,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index d50cb72cf1e5..b180f58bc8ce 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.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-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.34 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.35 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -913,7 +913,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1194,20 +1194,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1216,20 +1218,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1238,20 +1243,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index 2bb1780e4dea..181c71b7a5d0 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.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-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.13 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.14 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -921,7 +921,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1208,20 +1208,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1230,20 +1232,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1252,20 +1257,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 4ba9d41ef570..b3e83e05c446 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.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-libs/glibc/glibc-2.3.5.ebuild,v 1.45 2005/09/16 05:03:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.46 2005/09/16 05:51:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -941,7 +941,7 @@ glibc_do_configure() {
 	GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
 	mkdir -p ${GBUILDDIR}
 	cd ${GBUILDDIR}
-	einfo "Configuring GLIBC for $1 with: ${myconf}"
+	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	${S}/configure ${myconf} || die "failed to configure glibc"
 }
 
@@ -1207,20 +1207,22 @@ src_unpack() {
 src_compile() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Compiling ${ABI} glibc"
-			src_compile
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Building multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI=${ABI}
+				src_compile
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_compile
@@ -1229,20 +1231,23 @@ src_compile() {
 src_test() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Testing ${ABI} glibc"
-			src_test
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				einfo "   Testing ${ABI} glibc"
+				src_test
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}
 	toolchain-glibc_src_test
@@ -1251,20 +1256,22 @@ src_test() {
 src_install() {
 	crosscompile_setup
 
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ] ; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			export ABI
-			einfo "Installing ${ABI} glibc"
-			src_install
-		done
-		ABI="${OABI}"
-		unset OABI
-		return 0
+	if [[ -z ${OABI} ]] && has_multilib_profile ; then
+		# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+		local MLTEST=$(type dyn_unpack)
+		if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then
+			OABI=${ABI}
+			einfo "Installing multilib glibc for ABIs: $(get_install_abis)"
+			for ABI in $(get_install_abis) ; do
+				export ABI
+				src_install
+			done
+			ABI=${OABI}
+			unset OABI
+			return 0
+		fi
+		unset MLTEST
 	fi
-	unset MLTEST
 
 	ABI=${ABI:-default}