make multilib patches exclusive

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

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d9d463db647454361551b1b3da9ace6038224c68..977dcdc450d55d1172c7c76cd7a9db3aee93681b 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -6,7 +6,7 @@ MD5 53ca9d018c1156e40ae6b4aecfafc7c1 glibc-2.3.4.20041102-r1.ebuild 34314
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3eda9d663fe1a353baea5a53df6d6bbb glibc-2.3.5.ebuild 40235
 MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 269871cad4b94349d275862fcbfe533a glibc-2.3.5-r1.ebuild 39969
+MD5 1abf9d1b6d0882059b94d457ae163a5a glibc-2.3.5-r1.ebuild 40079
 MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
 MD5 b93ff1f1ad8baa0a062abb18f22d63f9 glibc-2.3.4.20041102-r2.ebuild 41373
 MD5 73fc10b9878bccc90533b031bbfb7996 glibc-2.3.5.20050722.ebuild 40400
@@ -135,7 +135,7 @@ MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDMkr8gIKl8Uu19MoRAk8WAJ9YtKH4NxEu4WuM6vE/kYFlIITKsgCeNdLC
-HoPkEbiAUKHnyJycE/p2M2A=
-=XnRg
+iD8DBQFDNJYrgIKl8Uu19MoRAnOHAJ9laVNQxXtZiNUG/+7ES2KWjZvWhQCdFOeQ
+0OQnnB7ecqzxG+KCPt+B53g=
+=0hp/
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index 79e99d068bc55028fb36431b412be029f2e30a8c..2a269ac584d4c3e59f051806e5ac40e34c46cdd6 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.32 2005/09/22 06:10:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.33 2005/09/23 23:55:45 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1120,7 +1120,9 @@ src_unpack() {
                ;;
                mips)
                        GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch"
-                       use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch"
+                       use_multilib \
+                               && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \
+                               || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch"
                ;;
        esac