Update x32 patchset #398895 by Chris Smith.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 23 insertions, 20 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cf741977208b..1b7d8376d163 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.817 2012/01/15 01:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.818 2012/01/16 07:56:56 vapier Exp $
+
+  16 Jan 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
+  Update x32 patchset #398895 by Chris Smith.
 
   15 Jan 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.15.ebuild:
   Post some fixes from upstrea/suse.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index af5ab3e42830..7c050ef6e8ae 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -42,7 +42,7 @@ DIST glibc-2.14.1-patches-2.tar.bz2 152871 RMD160 b5a24969009858e2988b04a46198b6
 DIST glibc-2.14.1-patches-3.tar.bz2 156339 RMD160 8174e9368f2dad6104371b2dd5275c82041d7878 SHA1 660a1b4b161521d075e3c82345e490c7d988218b SHA256 fdf7bb8df325e1c72c293e00083fcc6480f9873b250fc1d2cd8ca40ab6c94b20
 DIST glibc-2.14.1.tar.bz2 15650580 RMD160 f6efab63efdddefd7b868ffcba53885450064996 SHA1 f1945eea78bb30563d33c9e6a5f6f97f374135b4 SHA256 6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 DIST glibc-2.14.tar.bz2 15630590 RMD160 f2ba450342f353c7b0a9001ad375ff0adf3f86fc SHA1 2236a3530f83637c4338d81d9ac0f5b4c5e69820 SHA256 8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c
-DIST glibc-2.15-patches-2.tar.bz2 151584 RMD160 77d39ea4123e90d20327dde18451b4a07ee0e217 SHA1 d2d2562fd703e7e65ad05e1704539be3ffb689d7 SHA256 915f484c683aa992aecd145a139bb8e370c8545097a0c36d08d63af05d36fa43
+DIST glibc-2.15-patches-3.tar.bz2 149726 RMD160 0da77c68ccf66af7505c88cc6c76880711057d80 SHA1 385d9003026ce1c854717b01737ee2bd1d5b86cc SHA256 25e921cdf8d70d16d4b204c0da17e1a81a4c79b1595c447d537c9664eb03477b
 DIST glibc-2.15.tar.xz 10675188 RMD160 bc0f83611fa657d4c8cfa726bb54cfc70cab2d42 SHA1 58b038e2f184bbaac02dbfa41ed8c5851fedd5c9 SHA256 d94d85a27cac2a76ab263b7a130309a46c27ca725e39cd3260e83082366c9dd8
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
 DIST glibc-2.9-patches-8.tar.bz2 106638 RMD160 dbf343c0f2254674c6096fd65fe5dd33ad119248 SHA1 106452700e7a1a525266f79e77a49b443a8ed411 SHA256 5f1f8b569ac02c2f538bebd64d137bccb442ddfcb28b3ef17b86134edd8e3f6c
@@ -65,26 +65,26 @@ EBUILD glibc-2.14.1-r1.ebuild 8968 RMD160 10b3c60e52a60d05e0330b08d1eb513f86e278
 EBUILD glibc-2.14.1-r2.ebuild 8968 RMD160 5b2ded8b7e0e3647b57e4cdc17d59aa10b2d746b SHA1 f1539189460666a9b2f469a9937f95eb951067fd SHA256 e9521dc92f0dbf83b959cd21a1c42899be7275ee11a5034b4814a11dcf73f253
 EBUILD glibc-2.14.1.ebuild 8813 RMD160 aed9592045c2842511497c277c4c79a0043adef2 SHA1 759d2eda7ade9dd34d1e1cdfbb85b890b3d3d909 SHA256 c0a547a759ce09f3754b4cf40a8c5fdb85fcad28577d11c1a8c35d6f4a0e73af
 EBUILD glibc-2.14.ebuild 8812 RMD160 f756180e46e9a36d18728384398daa41b4a67fda SHA1 f8904de5b46867d45225215a40a9934aaa0e3929 SHA256 cdd85a673de42bfee3caf2b94f005899ed50e630b034d6447fb38ee390c3d9ea
-EBUILD glibc-2.15.ebuild 8585 RMD160 affcdda942c5077e21be377c5e9d1b86483a41db SHA1 5c70c1dc50aa1ba5d7960b5d5be5288ebde7b458 SHA256 44350ad59b500abb789080ca22e4e1ae160161b06b94e0a4e1dc32d45e6081a6
+EBUILD glibc-2.15.ebuild 8584 RMD160 61c984a7fb2e0695563030b5b83e42680e2c8d63 SHA1 7875bcce04212540ce0a448ca32f18bc3051fde6 SHA256 d8430edfa1279c9ff8c6fd0cd2be5419e07d8204b4736edcd94f84bd0b55bb53
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 7acecefa5c624837429358db505df5e863eaee90 SHA1 5494a83a774beb78d44e4e010e7c2e9af4c68dab SHA256 742005812b5a42b80a3ca4562b9b6b02661bcda6d77b5068a6e64bb6d20054bd
 EBUILD glibc-9999.ebuild 8412 RMD160 f9276abbc22e292c2a320305255b79640abead06 SHA1 e52ac36ce92000a17746f9f17651e27e757721c0 SHA256 cf715a05b552927634423b39c111bcac371d81ded6da2e9a67ed54bca3d2db6b
-MISC ChangeLog 37718 RMD160 02120e7ec9822b27eb7f6df510bdea32fb8da686 SHA1 db3f4a7d1ba1d28f4a20296c2979075d1ff1e367 SHA256 64d2cc175c5e6fe971efc8c63622e49a37a4123f3f8b674c4ce79158d67d9bdc
+MISC ChangeLog 37834 RMD160 688473748ad17cdd66bfc5b08d21e8137ea69ebc SHA1 5cf31012eae1403ffa44deb97fa625bad5ffe21a SHA256 9f0504d5a59823fcdd2ff2b2c9789950bfe6e9bda028a3ffe6aa03d7614803d5
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPEimgAAoJELEHsLL7fEFW5tsQAKGNP+X0hCdfca+q2iytbEql
-ddEbmvE2HytCLC/Pokq/GmttUzsbLW5/j0/1X6+gR0mDg/j8WHUcB2V78NqXqwFn
-Fbzh2oLQfxhYqU9xNLQmw8W8eC59/jFzR6J9rVPZXHu4ZrVC8D9GQPHY4KGmDm4p
-P72f7yyCPFctVjIMesYLqrbj12OxWOhclHz99c0BM3hK7mczPeTgLq03HSqFB+ZG
-oCObHeWIpT2jEBIyWJvqsMeH0krX/YmvZra456pDUPY2S1kmstLWD/F17WzPqzJL
-tgqniOZ5VGawaL/HHNH3hZ6XPioY3TOO8B2cK4hXS/NGZ+nBwDosIPW1n4NVcW/4
-EFH0e1DucyWOzv26YFxNAoWfAaAlAna++MOv2ETrV7nEWcD9G0HsNP+YbnmWLPw+
-vmWGGkHY7CMmzNQu0wPgYELqtMsEfE/5bYYsJhyERAqTelsEhNXsAt2Z2F8/seZL
-ouV7S4QTEN2WP99IZ28btANc8ExzjOvWV+SpHCqaaOeaDg4B0Q2eF6jeElENpdlG
-QEz5AsDlKAUvMjuhAkPOWSatFNdgiJfLVinYnNxWfeNTdGbguYEftp3hBIEVF29x
-FEk1ijxnYqy1Df8aYzyfoq+8cNLdXoJn86EZ5DszaYOwNZgogfXmkJMBe4abA48r
-BFTf5q3vowofrAU38NB7
-=k6di
+iQIcBAEBAgAGBQJPE9hZAAoJELEHsLL7fEFWB60QAKh/Kpiqyg4Ljr61pQI4ktvh
+T7kVOWUiRujwvv8tQLu/ftvIYwDBbNrNX1A3d/XemWHDK10OVSJOqAd1aqxTeoo1
+G+dpcDQCVSCJHksZyPMQn5cGKsRIdjcLUwpCU+D08q8Lr2v0agndeDKqqDIRpZ0V
++8PlXBOb+AzKBaskMNVAmL65FAuPXRrDs0ztYUcbRnHDM1PSNeFWYyQ5UNZJoMhe
+szLU50x8R8bBwhDCPDD9Crgf0DfTqUfHYfAX54C85JFBsSp/mbbVkFHZRAwGWTt7
+KkmBreH6YXuoYCWGFLHCqx+qGwPGzDu0FofCZPbSP1S5Q4dE8zI4ug/rlXuS1jZc
+HKxUVvmlKEsomGOYAJ2pBM/MObUqNhwcQiDa8o9x9eWb8VKu/NI+qipO2pQCGLq5
+grv5dxdv6ze21cKGFTwGoGvuGiEqC3RbT1ryFTWP1OAAdLwT4i9m8EVM0Oq/qZ+r
+2Tno/1EXqlNcPICjByr3yQEoA9tE7o+a71Fy27ml1beipzr71iUPJlyLB/oykztS
+NxkJ7CqVcewr6Qg3+FbxMuuK8A/8n+iK+n66GVuaw8p+vqXohDcglnsS5fQjLNsf
+JYc6NsM+XVwGchzpHc9ECEbvvnKV3fp4uT9KrI32qNXdaAd0g4Z4k+GAqIod8WUF
+HY8qk8n+6I7rPoKZPN1F
+=UXdu
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.15.ebuild b/sys-libs/glibc/glibc-2.15.ebuild
index 24c0ab7ddd3d..be463a2d90bf 100644
--- a/sys-libs/glibc/glibc-2.15.ebuild
+++ b/sys-libs/glibc/glibc-2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.2 2012/01/15 01:19:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15.ebuild,v 1.3 2012/01/16 07:56:56 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -33,7 +33,7 @@ esac
 MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
-PATCH_VER="2"                                  # Gentoo patchset
+PATCH_VER="3"                                  # Gentoo patchset
 PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
@@ -195,7 +195,7 @@ done
 eblit-src_unpack-pre() {
 	case ${CHOST} in
 	x86_64*)
-		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-2.14.1-x32.patch"
+		has x32 $(get_all_abis) || GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch"
 		;;
 	esac
 }