From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 3 Feb 2007 02:02:57 +0000 (+0000)
Subject: merge superh header fix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a834decb7658e9220950579a1ba6a5778435e30;p=gentoo.git

merge superh header fix
Package-Manager: portage-2.1.2-r6
---

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c01cde684e8c..a334a4827b91 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -444,7 +444,7 @@ DIST glibc-2.3.6-patches-1.19.tar.bz2 216069 RMD160 1998c521c3799f5baa8cfa2510e2
 DIST glibc-2.3.6.tar.bz2 14014977 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 SHA1 82d0487419f1bdbf2dee439c344e89d6af47e558 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
 DIST glibc-2.4-patches-1.19.tar.bz2 132880 RMD160 6df74db9b9e85220fba82658036ced5cdc16ae28 SHA1 b42dfd587fdf4df58c5f95853fc3dc4f8f51bee7 SHA256 9ec4cd3df3b8e7f294b3c93138d2f0fd7e8213b4981cfcc9cb58c25f934a23fa
 DIST glibc-2.4.tar.bz2 15202445 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 SHA1 35c636e4b474cda0f06e361d5e9caec092fd73d3 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd
-DIST glibc-2.5-patches-1.3.tar.bz2 173857 RMD160 3e4dc97f1ec57177084937ce85895efd225e859d SHA1 046b7077544bc2a4155c7ecacfa7b93418ce45be SHA256 ab6deb5ed782551651931381334486feb829f19ae395374c1961f1e9be10130c
+DIST glibc-2.5-patches-1.3.1.tar.bz2 182061 RMD160 47de64e40452b42e43ab6d736ed9794668d38ad2 SHA1 87d2df7115141d04062a2f17c0df0caa2ed278bb SHA256 e0028abaa2b97cb4dbf4217ba66ebc110f74e04ae05703b5ddda0b3f53a28df0
 DIST glibc-2.5.tar.bz2 15321839 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2 SHA1 ec9a007c4875062099a4701ac9137fcdb5a71447 SHA256 9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
 DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec
 DIST glibc-infopages-2.3.5.tar.bz2 1273846 RMD160 14a587e5df98ad113fa1499d2a958efbb47c437a SHA1 bb974b6dacd02161532717a9d8f97248acd6da14 SHA256 79a602955e3cf4288fa9967240b397281594acab18c263d2ef864e7d71aa54e1
@@ -492,10 +492,10 @@ EBUILD glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676
 MD5 f7e1022963b4ac00d04110ef57c1a0eb glibc-2.4-r4.ebuild 39210
 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 glibc-2.4-r4.ebuild 39210
 SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df glibc-2.4-r4.ebuild 39210
-EBUILD glibc-2.5.ebuild 37253 RMD160 e9a605193c11e4d792f7760966b2c8ac59bc524e SHA1 5370665c6c81b249cb570662528071aafd4ca897 SHA256 9b5fdef125a59a3b9bdc198b81b32bac7fbaebb5ef98a4eea3a75d515b180836
-MD5 ab6b7af04bb598c0fa66241a339bb56a glibc-2.5.ebuild 37253
-RMD160 e9a605193c11e4d792f7760966b2c8ac59bc524e glibc-2.5.ebuild 37253
-SHA256 9b5fdef125a59a3b9bdc198b81b32bac7fbaebb5ef98a4eea3a75d515b180836 glibc-2.5.ebuild 37253
+EBUILD glibc-2.5.ebuild 37255 RMD160 bb499c5dee4839ec811ce2517ef39ea625b12c79 SHA1 532d4a6fce4666ca8e5e9e92238196752edf2833 SHA256 d723dd5772ae5d6d70b00ebb34d88b3fb452ffa6e34fe75dfb7d8d4eabdcb7c2
+MD5 139e699674a1df2c8acf7da031f6ecfd glibc-2.5.ebuild 37255
+RMD160 bb499c5dee4839ec811ce2517ef39ea625b12c79 glibc-2.5.ebuild 37255
+SHA256 d723dd5772ae5d6d70b00ebb34d88b3fb452ffa6e34fe75dfb7d8d4eabdcb7c2 glibc-2.5.ebuild 37255
 MISC ChangeLog 98068 RMD160 7d9632b48fc3ee9ce65572e0ee9a632421caf17d SHA1 db9caa5037b02cc7621adff3a0b7157cc444f066 SHA256 5db0447a68aeba3fcb8cd7d88cff4bbb7682ba26c223d3f07ea53231ecb287b2
 MD5 bdc17ca9d074735eeda1da78567c7b0a ChangeLog 98068
 RMD160 7d9632b48fc3ee9ce65572e0ee9a632421caf17d ChangeLog 98068
@@ -525,13 +525,13 @@ SHA256 a288dbf9f069b3cff57d820d00991e2942c84683d8df5b12cfb3ff31ed6781c5 files/di
 MD5 e6c60ddb8b06199242d294f97f01c574 files/digest-glibc-2.4-r4 1575
 RMD160 49ff56b0209067c5313646df281c408956cdaa92 files/digest-glibc-2.4-r4 1575
 SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/digest-glibc-2.4-r4 1575
-MD5 0ef85c335e10127d3e21077ab8034f12 files/digest-glibc-2.5 1280
-RMD160 34e5f2b01652b2ae928c40fefe948ff971bb7851 files/digest-glibc-2.5 1280
-SHA256 f65c057f070beb912fdc31c87bdec28342093306c3387f73aa831178e3a8d875 files/digest-glibc-2.5 1280
+MD5 932be0453d928552fa24d590453bc0cd files/digest-glibc-2.5 1286
+RMD160 ffa1a53d76e1ffb602701f2919ecb63db3e36275 files/digest-glibc-2.5 1286
+SHA256 834a359d2717ef8252d541b9440c91681efc3248bb7f75a2abec96798d862359 files/digest-glibc-2.5 1286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFw+s/8bi6rjpTunYRAkijAJ9A9bMfbDDeO+Kjjov74LDK3wh3CQCgtMdj
-HyuPNV/UjzV+Kd0rQ0OIG4Q=
-=MQ50
+iD8DBQFFw+1j8bi6rjpTunYRAvbNAJ4s3vGxYg0Z7R3Aj/x1QNxcm2TjFwCgsWx4
+qgq8RbVyf/oag2MgzealXk0=
+=ftWh
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.5 b/sys-libs/glibc/files/digest-glibc-2.5
index 3ec7ab92e41c..f97bb90c7940 100644
--- a/sys-libs/glibc/files/digest-glibc-2.5
+++ b/sys-libs/glibc/files/digest-glibc-2.5
@@ -1,6 +1,6 @@
-MD5 76c2c086f3c6a98ee3e6fe4cf03bf25a glibc-2.5-patches-1.3.tar.bz2 173857
-RMD160 3e4dc97f1ec57177084937ce85895efd225e859d glibc-2.5-patches-1.3.tar.bz2 173857
-SHA256 ab6deb5ed782551651931381334486feb829f19ae395374c1961f1e9be10130c glibc-2.5-patches-1.3.tar.bz2 173857
+MD5 82875d233db221666b1abf26e7cf6e98 glibc-2.5-patches-1.3.1.tar.bz2 182061
+RMD160 47de64e40452b42e43ab6d736ed9794668d38ad2 glibc-2.5-patches-1.3.1.tar.bz2 182061
+SHA256 e0028abaa2b97cb4dbf4217ba66ebc110f74e04ae05703b5ddda0b3f53a28df0 glibc-2.5-patches-1.3.1.tar.bz2 182061
 MD5 1fb29764a6a650a4d5b409dda227ac9f glibc-2.5.tar.bz2 15321839
 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2 glibc-2.5.tar.bz2 15321839
 SHA256 9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529 glibc-2.5.tar.bz2 15321839
diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild
index f353ee98ca7a..e509f6b2aaff 100644
--- a/sys-libs/glibc/glibc-2.5.ebuild
+++ b/sys-libs/glibc/glibc-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.24 2007/02/02 04:55:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.25 2007/02/03 02:02:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="none"
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.3"
+PATCH_VER="1.3.1"
 
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"