touchup status output while building

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 341b1dfa58a80beb01814606bccfa8d651ac9278..d600b544e8236a11866e19e53ae64342854d69f0 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
 MD5 6726c272dd0883b0c6f06a920c7ef30a glibc-2.3.3.20040420-r2.ebuild 21726
 MD5 9db53eb2d0b552d650ccd326244198ee glibc-2.3.4.20041102-r1.ebuild 34301
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 6da1f2747661a3114f6b7835f5d877c5 glibc-2.3.5.ebuild 40000
+MD5 e7c7445aca1843f01b5eb304c437cd1a glibc-2.3.5.ebuild 40229
 MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 b6e5475c66c76daa09c449492a6dc28b glibc-2.3.5-r1.ebuild 39684
+MD5 42bb594b3897af220d0644ecb8961947 glibc-2.3.5-r1.ebuild 39913
 MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
-MD5 b7ec518e22b043065e534b8655849f0a glibc-2.3.4.20041102-r2.ebuild 41131
-MD5 5922324cb5fe3ba612cbd56190273c95 glibc-2.3.5.20050722.ebuild 40376
+MD5 b2386efc8afc41494eceea5e8cbf3e8f glibc-2.3.4.20041102-r2.ebuild 41367
+MD5 dd4fa120212a036dcad3affa7c7345ae glibc-2.3.5.20050722.ebuild 40605
 MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
 MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
-MD5 ca3686fdba935bc6cd4d5793460b637b glibc-2.3.5.20050421.ebuild 40017
-MD5 5b0d7b02c5be0df7cc27ec2aebe63800 glibc-2.3.4.20050125-r1.ebuild 39324
+MD5 f6e6c956f3cd8f629bfee45b1dbc64a5 glibc-2.3.5.20050421.ebuild 40246
+MD5 ad138005f2ca1414c3820735e6003853 glibc-2.3.4.20050125-r1.ebuild 39560
 MD5 a372415b48e3d01c0c39f5d79c947de2 ChangeLog 82055
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
 MD5 6d49cf08909f89da5748956452bebb03 files/nscd 1339
@@ -135,7 +135,7 @@ MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDKlI0gIKl8Uu19MoRAmonAJ9g6Bon9IHYcn0Gtlfr7hj3zy5idACeIZkY
-2RJXI2RlXjrEm9RkNnNHLDU=
-=l5bu
+iD4DBQFDKl2YgIKl8Uu19MoRApoBAJiNZig52aLeuNSU5i+0edrzinbrAJwM+sb8
+oHP3idJPfRqwRPOrjCs7mQ==
+=AKGf
 -----END PGP SIGNATURE-----

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 18205539ea3b4ef4cb9c7d9d68b059049de50e4a..8be73075ac861fe71ae60fea1fec1d1f6fa70726 100644 (file)
--- 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 3c83f540ed8b22cea0d34514251ba5c01a6f7a2e..7183fc028b71fb6525376d56fdab450f048f3217 100644 (file)
--- 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 bcb63eb6df8d6f282393af1dfc88211b6a59c225..19218d03b0486ae2e6245239caf95d9613216425 100644 (file)
--- 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 d50cb72cf1e5b1eb2845fa7a299f5c72f4bf9dd1..b180f58bc8ceb0801aaf31098e6bcc9ab58d817c 100644 (file)
--- 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 2bb1780e4dea6e60a4b65cd1cf7af3903ad14782..181c71b7a5d04e815678805131c97b8514c38604 100644 (file)
--- 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 4ba9d41ef570832b37ef4505cd7ce0b3b1d1d2af..b3e83e05c446a754f22c9a6e68a2616c05572c06 100644 (file)
--- 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}