make sure 5005 multilib patch is excluded for older gentoo-libdir amd64 systems ...

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 68b5ae92d266378d1341a00c570e43198291d270..dc278751b1fcf1209f39f08fd653c032847ad043 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -129,7 +129,7 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 cdbe2c23324cb303ee28f52927bd64f2 glibc-2.3.4.20050125-r1.ebuild 39566
 MD5 bd5bf79d303a7365ff19d7021465369d glibc-2.3.5-r1.ebuild 40631
-MD5 71d2685ea28d944264202a902e1fb7ea glibc-2.3.5-r2.ebuild 38377
+MD5 73b162b73854e6bcd48b965ee109a8ec glibc-2.3.5-r2.ebuild 38609
 MD5 5939b81f0fa59cc654755058a684dee7 glibc-2.3.5.20050421.ebuild 40224
 MD5 c8b67d0b495ba2ccdc0e67c3f40c76c0 glibc-2.3.5.20050722.ebuild 39371
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
@@ -137,7 +137,7 @@ MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDTF19gIKl8Uu19MoRAt2qAJwKEs0n0etLH3EGLSsZdb7Ghb3psACeNJrY
-THaQrP0ocAXNtWa6Ve7j9Vk=
-=gWCp
+iD8DBQFDTY+jgIKl8Uu19MoRAhAwAJwMISvLEPtJzmqRygt4Dom4gP9QCACeIK7h
+SKcdge3v6Ptv1mjxq2Abvis=
+=dEFg
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild
index 663307d29900fbf35b67a9245d0cdbbdfab1c406..cd680221811e799f5b9148a6245c8042fdc7b687 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-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.5-r2.ebuild,v 1.13 2005/10/12 00:47:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.14 2005/10/12 22:33:12 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1079,6 +1079,12 @@ src_unpack() {
                                && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
                                || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
                ;;
+               amd64)
+                       if ! has_multilib_profile && ! is_crosscompile ; then
+                               # the gentoo-libdir patch hack conflicts with these
+                               GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
+                       fi
+               ;;
        esac
 
        GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch"