Just a few more changes that do nothing on current profiles... Changed multilib-pkg...

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 6809699d30b356b24bc1b578195079096ab5950c..098a6e063f3bafe5454bb58b4aad2a23d440f998 100644 (file)
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.304 2005/01/12 05:17:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.305 2005/01/12 12:24:10 eradicator Exp $
+
+  12 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  Just a few more changes that do nothing on current profiles... Changed
+  multilib-pkg to multilib-pkg-force. Added prep_ml_includes. Added inherit
+  multilib.
 
   11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20040619-r2.ebuild, glibc-2.3.4.20040808-r1.ebuild,

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 323bcc62cad6e1cd81cf702b1dec0f89f292a290..a6a151f3fca94862504a412ef1dfefb508d37f9c 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7b98294531dddc123cc943ab7dfd160a ChangeLog 64536
+MD5 1a6f8cfe52c5ab95d7b9ed0fce880466 ChangeLog 64818
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 3b44d39389334d36b42c51887729dd4d glibc-2.3.2-r12.ebuild 21817
 MD5 39ac6b0f30c9c27a5cd04c4e0b6caadb glibc-2.3.3.20040420-r2.ebuild 21634
-MD5 96cbc820779b9cb49b6e8d872ae1ac8f glibc-2.3.4.20040808-r1.ebuild 26428
-MD5 517224351cbc845052accd75dea4ee28 glibc-2.3.4.20041102.ebuild 31408
+MD5 fbbf7177531bb4d7cc0e48c107241841 glibc-2.3.4.20040808-r1.ebuild 26597
+MD5 334beccd6dd452db582e2419a7921eb1 glibc-2.3.4.20041102.ebuild 31579
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 acdb3de3aea67da2c33bf5ae3ca10622 glibc-2.3.4.20040619-r2.ebuild 21116
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
@@ -139,7 +139,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5LMFArHZZzCEUG0RAiVoAJ98w/6VF6Ic08dVhz3mSj7PY12ZjACdHE9A
-J14e+1jPeQGS1042R2th1CU=
-=I0mQ
+iD8DBQFB5Rb1ArHZZzCEUG0RAj9dAJ9cA5y2Dr71X5CyS9zGda29Dy5RSwCfQqWX
+2hg/5g0c9QJhKANUDVv/ZYg=
+=DI1K
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index fd9f480b3fc03071bbe51da289d13017ddb8ad03..d1083396acf620809fc8c41dbfffbb3680e44558 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.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-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.31 2005/01/12 05:17:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.32 2005/01/12 12:24:10 eradicator Exp $
 
-inherit eutils flag-o-matic gcc versionator
+inherit eutils multilib flag-o-matic gcc versionator
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -54,7 +54,7 @@ LICENSE="LGPL-2"
 #        after ~2.3.3.20040420 break blackdown-jdk on sparc.
 KEYWORDS="x86 amd64 hppa ppc64 ~ppc -mips ~sparc"
 IUSE="nls pic build nptl erandom hardened multilib debug userlocales emul-linux-x86"
-RESTRICT="nostrip multilib-pkg" # we'll handle stripping ourself #46186
+RESTRICT="nostrip multilib-pkg-force" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 # We also need linux26-headers if using NPTL. Including kernel headers is
@@ -611,7 +611,8 @@ src_unpack() {
 
 
 src_compile() {
-       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then
+       local MLTEST=$(type dyn_unpack)
+       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
                local OABI="${ABI}"
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
@@ -622,6 +623,7 @@ src_compile() {
                unset OABI
                return 0
        fi
+       unset MLTEST
 
        setup_flags
 
@@ -677,7 +679,8 @@ src_compile() {
 }
 
 src_install() {
-       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then
+       local MLTEST=$(type dyn_unpack)
+       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
                local OABI="${ABI}"
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
@@ -720,7 +723,7 @@ src_install() {
                unset OABI
                return 0
        fi
-
+       unset MLTEST
        setup_flags
 
        # Need to dodir first because it might not exist (bad amd64 profiles)
@@ -833,6 +836,9 @@ EOF
        # This is our new config file for building locales
        insinto /etc
        doins ${FILESDIR}/locales.build
+
+       # Handle includes for different ABIs
+       prep_ml_includes
 }
 
 fix_lib64_symlinks() {

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 27dc2dfcb857955bdcbffd0fd9412bdf3e4a6e77..0caf7254b897751a636a777d15199092af7bc9d3 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.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-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.25 2005/01/12 05:17:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.26 2005/01/12 12:24:11 eradicator Exp $
 
-inherit eutils flag-o-matic gcc versionator
+inherit eutils multilib flag-o-matic gcc versionator
 
 # Branch update support.  Following will disable:
 #  BRANCH_UPDATE=
@@ -54,7 +54,7 @@ LICENSE="LGPL-2"
 #        samba-1.0.9 tarball.
 KEYWORDS="~amd64 ppc64 -hppa ~ia64 ~ppc ~x86 ~mips -sparc"
 IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales nomalloccheck emul-linux-x86"
-RESTRICT="nostrip multilib-pkg" # we'll handle stripping ourself #46186
+RESTRICT="nostrip multilib-pkg-force" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 # We also need linux26-headers if using NPTL. Including kernel headers is
@@ -695,7 +695,8 @@ glibc_do_configure() {
 
 
 src_compile() {
-       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then
+       local MLTEST=$(type dyn_unpack)
+       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
                local OABI="${ABI}"
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
@@ -706,7 +707,8 @@ src_compile() {
                unset OABI
                return 0
        fi
-
+       unset MLTEST
+       
        # do the linuxthreads build unless we're using nptlonly
        if use !nptlonly ; then
                glibc_do_configure linuxthreads
@@ -723,7 +725,8 @@ src_compile() {
 }
 
 src_install() {
-       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" ] && ! hasq multilib-pkg ${FEATURES}; then
+       local MLTEST=$(type dyn_unpack)
+       if [ -n "${MULTILIB_ABIS}" -a -z "${OABI}" -a "${MLTEST/set_abi}" = "${MLTEST}" ]; then
                local OABI="${ABI}"
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
@@ -766,6 +769,7 @@ src_install() {
                unset OABI
                return 0
        fi
+       unset MLTEST
 
        setup_flags
 
@@ -955,6 +959,9 @@ EOF
        doins ${FILESDIR}/locales.build
        # example host.conf with multicast dns disabled by default
        doins ${FILESDIR}/2.3.4/host.conf
+
+       # Handle includes for different ABIs
+       prep_ml_includes
 }
 
 must_exist() {