More hackery to support ugly amd64 profiles who use lib32.

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index aa879e7a8661f3b252a6c8b9a3e298c15c4c1d1f..3630e3fd3a32d74b6493c73e90c4a990eded8e08 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -5,8 +5,8 @@ MD5 ec1c31d4c2e13a30a63d80c49520e950 ChangeLog 64311
 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 a8021622967aa449fc9b1f26525d10ae glibc-2.3.4.20040808-r1.ebuild 25893
-MD5 d0753f922ec347a65d7850182f35595b glibc-2.3.4.20041102.ebuild 30873
+MD5 fb1164e647c67c71636062c61f2df7cd glibc-2.3.4.20040808-r1.ebuild 26388
+MD5 a21f9597360062fd6e58bd4f34d2812b glibc-2.3.4.20041102.ebuild 31368
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 e4c399efc30efc54fb478b897cd37149 glibc-2.3.4.20040619-r2.ebuild 21078
 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)
 
-iD8DBQFB5FKAArHZZzCEUG0RAlflAJ9mpEAHqkVI+fA4JnYwpAWodtmReACdGw7g
-zSFUQDwycRpchX8dHvLoWXU=
-=AnyO
+iD8DBQFB5JM/ArHZZzCEUG0RAolrAJ9i0ma8ZdbcC7G5K268/47PHbqxYwCcCjJF
+87C8qclgDwlvo0//Mmj6Lgo=
+=xmZH
 -----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 2de7aabfb53b0874d466242b724a29219eeb4f51..85ce9547ca420970247dae8e8fc0eb687375c56e 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,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.20040808-r1.ebuild,v 1.29 2005/01/11 22:25:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.30 2005/01/12 03:00:37 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -682,15 +682,37 @@ src_install() {
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
                        mv ${WORKDIR}/build.${ABI} ${WORKDIR}/build
+
+                       # Handle stupid lib32 BS
+                       if use amd64 && [ "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ]; then
+                               OLD_LIBDIR="$(get_libdir)"
+                               LIBDIR_x86="lib"
+                       fi
+
                        src_install && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI}
 
                        # Handle stupid lib32 BS
-                       if use amd64 && [ "${ABI}" = "x86" -a "$(get_abi_LIBDIR x86)" != "lib" ]; then
-                               mv ${D}/lib ${D}/$(get_abi_LIBDIR x86)
-                               mv ${D}/usr/lib ${D}/usr/$(get_abi_LIBDIR x86)
+                       if use amd64 && [ "${ABI}" = "x86" -a -n "${OLD_LIBDIR}" ]; then
+                               LIBDIR_x86="${OLD_LIBDIR}"
+                               unset OLD_LIBDIR
+
+                               mv ${D}/lib ${D}/$(get_libdir)
+                               mv ${D}/usr/lib ${D}/usr/$(get_libdir)
                                mkdir ${D}/lib
-                               dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
-                               dosed "s:/lib/:/$(get_abi_LIBDIR x86)/:g" /usr/$(get_abi_LIBDIR x86)/libc.so /usr/$(get_abi_LIBDIR x86)/libpthread.so
+                               dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+                               dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/libc.so /usr/$(get_libdir)/libpthread.so
+
+                               rm -rf ${D}/usr/$(get_libdir)/misc ${D}/usr/$(get_libdir)/locale
+
+                               for f in ${D}/usr/$(get_libdir)/*.so; do
+                                       local basef=$(basename ${f})
+                                       if [ -L ${f} ]; then
+                                               local target=$(readlink ${f})
+                                               target=${target/\/lib\//\/$(get_libdir)\/}
+                                               rm ${f}
+                                               dosym ${target} /usr/$(get_libdir)/${basef}
+                                       fi
+                               done
                        fi
 
                done

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 6ff9f1f6ced247856e5725469fb98a972184ad65..81bcd3167fabb61fbe0eac9c076cc54b6c47f6c4 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.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.ebuild,v 1.23 2005/01/11 22:25:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.24 2005/01/12 03:00:37 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -728,15 +728,37 @@ src_install() {
                for ABI in ${MULTILIB_ABIS}; do
                        export ABI
                        mv ${WORKDIR}/build.${ABI} ${WORKDIR}/build
+
+                       # Handle stupid lib32 BS
+                       if use amd64 && [ "${ABI}" = "x86" -a "$(get_libdir)" != "lib" ]; then
+                               OLD_LIBDIR="$(get_libdir)"
+                               LIBDIR_x86="lib"
+                       fi
+
                        src_install && mv ${WORKDIR}/build ${WORKDIR}/build.${ABI}
 
                        # Handle stupid lib32 BS
-                       if use amd64 && [ "${ABI}" = "x86" -a "$(get_abi_LIBDIR x86)" != "lib" ]; then
-                               mv ${D}/lib ${D}/$(get_abi_LIBDIR x86)
-                               mv ${D}/usr/lib ${D}/usr/$(get_abi_LIBDIR x86)
+                       if use amd64 && [ "${ABI}" = "x86" -a -n "${OLD_LIBDIR}" ]; then
+                               LIBDIR_x86="${OLD_LIBDIR}"
+                               unset OLD_LIBDIR
+
+                               mv ${D}/lib ${D}/$(get_libdir)
+                               mv ${D}/usr/lib ${D}/usr/$(get_libdir)
                                mkdir ${D}/lib
-                               dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
-                               dosed "s:/lib/:/$(get_abi_LIBDIR x86)/:g" /usr/$(get_abi_LIBDIR x86)/libc.so /usr/$(get_abi_LIBDIR x86)/libpthread.so
+                               dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2
+                               dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/libc.so /usr/$(get_libdir)/libpthread.so
+
+                               rm -rf ${D}/usr/$(get_libdir)/misc ${D}/usr/$(get_libdir)/locale
+
+                               for f in ${D}/usr/$(get_libdir)/*.so; do
+                                       local basef=$(basename ${f})
+                                       if [ -L ${f} ]; then
+                                               local target=$(readlink ${f})
+                                               target=${target/\/lib\//\/$(get_libdir)\/}
+                                               rm ${f}
+                                               dosym ${target} /usr/$(get_libdir)/${basef}
+                                       fi
+                               done
                        fi
 
                done