Make locale-gen upgrade path a little smoother for people who want *all* locales generated #137538.

Package-Manager: portage-2.1.1_pre1-r1

6 files changed, 40 insertions, 35 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 4743280bdbd8..6ce6aad40814 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.462 2006/06/21 15:02:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.463 2006/06/22 05:44:45 vapier Exp $
+
+  22 Jun 2006; Mike Frysinger <vapier@gentoo.org> glibc-2.3.6-r4.ebuild,
+  glibc-2.4-r3.ebuild:
+  Make locale-gen upgrade path a little smoother for people who want *all*
+  locales generated #137538.
 
   21 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> glibc-2.3.6-r4.ebuild:
   Stable on sparc wrt #137121
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a7616a28d623..00fc5ae94bbe 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -447,10 +447,10 @@ DIST glibc-2.3.4.tar.bz2 13213560 RMD160 bb2bc1669de7c7b08903be5767753f75709e98c
 DIST glibc-2.3.5-patches-1.13.tar.bz2 24793 RMD160 1940f068e05222738a95baa566a0da78ca8eb3ab SHA256 167da2eba108780b54e6f6ec8e9c2f4caf30eb65121e916c6d8813bbb46a2216
 DIST glibc-2.3.5-patches-1.16.tar.bz2 28401 RMD160 ef56df1c2ed60df01b027f805755463a834f3760 SHA1 bf72729c0b2c7deda2314e88d3b619d28a3d3b95 SHA256 371dfd8f8dfc90be4fdd8057fb58090119db95d26aa550ac1a7b3bcc828e754b
 DIST glibc-2.3.5.tar.bz2 13583139 RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 SHA1 465cb1f4708dfa88606379cc1ebecb724c65f027 SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5
-DIST glibc-2.3.6-patches-1.13.tar.bz2 154397 RMD160 6e9acce08b4de3a353e7483b19fc5c7eb99b2db2 SHA1 36cbad545c558b5cc659b8b0774885fe78e078b2 SHA256 4ec39d275f73fe7cfb44be99b8abd69bcd0017df4a587548b0c4c2ae25578c35
+DIST glibc-2.3.6-patches-1.15.tar.bz2 154688 RMD160 46247c4b55a12d3e82d666564217e06f7ef772f4 SHA1 77e3a3e9fe6649edebc82254aa69968c3324183b SHA256 ec4f09e040820b9c77efe4347ff6f12a24df777a179af2618a6c3abe059c148e
 DIST glibc-2.3.6-patches-1.8.tar.bz2 132799 RMD160 fe94d79a0cd6ca8e860924fc3daafe550faa4244 SHA1 06e2242274a338821f327b4921b94988006685a6 SHA256 8a96a2fcd6800ab47f23d669fc9752978e0bfc0ff5f634351ae49a33c7a0060e
 DIST glibc-2.3.6.tar.bz2 14014977 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 SHA1 82d0487419f1bdbf2dee439c344e89d6af47e558 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
-DIST glibc-2.4-patches-1.15.tar.bz2 121247 RMD160 dfb7e90ee02a8162393c3d3c0ddbae81a1e56ff8 SHA256 fca9951f5fb10ac85507f1b636a15549c00aebc1af7342887c183d843cc8f670
+DIST glibc-2.4-patches-1.16.tar.bz2 119684 RMD160 50113638e5a00da169862fb44b3d5d5cc6288cf7 SHA1 2fbe74b656d569fc05b3a91b5aff69ea55332eb4 SHA256 8ac49492575e66c037629ee3f23c2c1729b700a05f28d55565c946ccf18e840a
 DIST glibc-2.4.tar.bz2 15202445 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 SHA1 35c636e4b474cda0f06e361d5e9caec092fd73d3 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd
 DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec
 DIST glibc-fedora-20060501T0751.tar.bz2 727641 RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d SHA1 2efa5c82e7aaa6c381664cc308db2f3cee5ddb73 SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec
@@ -521,18 +521,18 @@ EBUILD glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b6
 MD5 c2e89fc966f597b9a2fc19e0168e28f4 glibc-2.3.6-r3.ebuild 42710
 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 glibc-2.3.6-r3.ebuild 42710
 SHA256 8965552b0fe2b092bb26ea191c89c8704ca3943a5c523377befb69f9a4c9d2e5 glibc-2.3.6-r3.ebuild 42710
-EBUILD glibc-2.3.6-r4.ebuild 37077 RMD160 99cbca1c6f81cf4f6d3b8a26b0eede5ced783139 SHA1 4888f31bcdb3551290a1099360d5a703802bd783 SHA256 1f5e37d5916391acfdc8c2e8a0762ad9ec079a98944204948ebf2e61cb64fc1f
-MD5 8d597b9d0f09999e5992cddf9c05af26 glibc-2.3.6-r4.ebuild 37077
-RMD160 99cbca1c6f81cf4f6d3b8a26b0eede5ced783139 glibc-2.3.6-r4.ebuild 37077
-SHA256 1f5e37d5916391acfdc8c2e8a0762ad9ec079a98944204948ebf2e61cb64fc1f glibc-2.3.6-r4.ebuild 37077
-EBUILD glibc-2.4-r3.ebuild 38578 RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 SHA1 755749d0d70d93fa67545ff22b154219f6da5ecb SHA256 49300f7b832ff77a48de2c3d5fd229580df05ec106bfba2be0b434a863270389
-MD5 2fd02d9f0101a90f5557da55e35a2d88 glibc-2.4-r3.ebuild 38578
-RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 glibc-2.4-r3.ebuild 38578
-SHA256 49300f7b832ff77a48de2c3d5fd229580df05ec106bfba2be0b434a863270389 glibc-2.4-r3.ebuild 38578
-MISC ChangeLog 93965 RMD160 89c9ed74f437f6588f9a8ff060f250143366e38e SHA1 5e718383d7d27553d9e80287b65b5aeff397383b SHA256 c0bbdb78fae01de9c0ab52182dda47c59d18c5d5a003adb6de1be384dd2c4d79
-MD5 81efee2d996f56f8fca8f87e61716099 ChangeLog 93965
-RMD160 89c9ed74f437f6588f9a8ff060f250143366e38e ChangeLog 93965
-SHA256 c0bbdb78fae01de9c0ab52182dda47c59d18c5d5a003adb6de1be384dd2c4d79 ChangeLog 93965
+EBUILD glibc-2.3.6-r4.ebuild 37075 RMD160 fe2bccfb9bb43ea8877b6938922a1209e32e78c4 SHA1 ba2058e5cce7799a5e8c881dec5faba3ff9c507d SHA256 1c5ba4a43130f7c3d98c4f82071557e896906e9bd31ebb570bcd946d5e2f0d0e
+MD5 01d3f909f4bb97c1768fa16ae97d38db glibc-2.3.6-r4.ebuild 37075
+RMD160 fe2bccfb9bb43ea8877b6938922a1209e32e78c4 glibc-2.3.6-r4.ebuild 37075
+SHA256 1c5ba4a43130f7c3d98c4f82071557e896906e9bd31ebb570bcd946d5e2f0d0e glibc-2.3.6-r4.ebuild 37075
+EBUILD glibc-2.4-r3.ebuild 38578 RMD160 cbdd825bd9bdaee824cfa23a702907427338d9fd SHA1 5f3cb0b6402ac8b52e0b23642b8411cb98538c7b SHA256 c515550eaf2e6642108b2f3b4c1017488de0f1320a12afe5763807718dda8b11
+MD5 2c8bbda2d2f6bda1c0107b2cdfc8f8ff glibc-2.4-r3.ebuild 38578
+RMD160 cbdd825bd9bdaee824cfa23a702907427338d9fd glibc-2.4-r3.ebuild 38578
+SHA256 c515550eaf2e6642108b2f3b4c1017488de0f1320a12afe5763807718dda8b11 glibc-2.4-r3.ebuild 38578
+MISC ChangeLog 94164 RMD160 3e3a728ea0aedf71a30d7d982a8bcef11301d719 SHA1 5b108f863bf0db582673d53562dbc29a7784640a SHA256 8eae8757a5804c6e1838915c57b6c1cfde18be8cf5ebba975e0acefb138cc782
+MD5 c8f640be8c8333bcd6a7008830d017f9 ChangeLog 94164
+RMD160 3e3a728ea0aedf71a30d7d982a8bcef11301d719 ChangeLog 94164
+SHA256 8eae8757a5804c6e1838915c57b6c1cfde18be8cf5ebba975e0acefb138cc782 ChangeLog 94164
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -570,16 +570,16 @@ SHA256 77ccc09d56cf5a8b4a7c2d847eb28074668e0319777e632be7a1c29e33a7db5c files/di
 MD5 a9b2d44d0396a4996c59e30664cd3643 files/digest-glibc-2.3.6-r3 1876
 RMD160 cc9d6cfcd8541c7dc518560eb50dfd8c61f98ab8 files/digest-glibc-2.3.6-r3 1876
 SHA256 8ec9b852e961654f255e4ae73c2fcc51482fb1b0519834688dba4614f8353216 files/digest-glibc-2.3.6-r3 1876
-MD5 b06ea6fb70360d04b4e6cb974d07c30a files/digest-glibc-2.3.6-r4 1879
-RMD160 08e1af76c26de6e98c890071c7f9bf15fb0dd6c8 files/digest-glibc-2.3.6-r4 1879
-SHA256 c434f8b616864ec0cabb771aab0f7c481ef28a5693932585ee46b435c1e4da0f files/digest-glibc-2.3.6-r4 1879
-MD5 5524c1eed817c3bc0c2f372b7d4921f6 files/digest-glibc-2.4-r3 1858
-RMD160 3e86bb0d977e2bae59d448996978e725e34c38e6 files/digest-glibc-2.4-r3 1858
-SHA256 1a332288a00003f21a227e271cfda7c726007fdbe00b5fd66d7ec4fdb73378a8 files/digest-glibc-2.4-r3 1858
+MD5 ece73584aa4db4b63b0f6c2559e6d338 files/digest-glibc-2.3.6-r4 1879
+RMD160 94e7d5df3f008d67356ea35052d88423d60a8352 files/digest-glibc-2.3.6-r4 1879
+SHA256 97fb02c2d62a62f388a1163abbc48421d18e616c9d7f0b4958cb1cbe183eaa16 files/digest-glibc-2.3.6-r4 1879
+MD5 193e535eb948bafc6a5c18460c1bb77a files/digest-glibc-2.4-r3 1858
+RMD160 e076ff904f555d1ea36dfa12360ad9bc40fc4057 files/digest-glibc-2.4-r3 1858
+SHA256 82cd6a40536b3dbf5edaffbff0756504cb2729e671cdc167c9a77f0edb17bf25 files/digest-glibc-2.4-r3 1858
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmV94KRy60XGEcJIRAsrLAJsFfhuhg1Z88MP6WxUgUHaWpMm8sQCdGfcH
-UOkwuUAcihIS7GtFdXMZY/4=
-=BCSi
+iD8DBQFEmi+GamhnQswr0vIRAlukAJwPbGPVQM7SX95w842ut4cN3NmDJQCcCV48
+M9NpoMgRQ9BZcuppqzgQ7IY=
+=GBem
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r4 b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
index b13665a9e5ef..c3ea299b5b1c 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.6-r4
+++ b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
@@ -1,6 +1,6 @@
-MD5 ccf4fa68807607b00eb6f44f50c985c3 glibc-2.3.6-patches-1.13.tar.bz2 154397
-RMD160 6e9acce08b4de3a353e7483b19fc5c7eb99b2db2 glibc-2.3.6-patches-1.13.tar.bz2 154397
-SHA256 4ec39d275f73fe7cfb44be99b8abd69bcd0017df4a587548b0c4c2ae25578c35 glibc-2.3.6-patches-1.13.tar.bz2 154397
+MD5 a6815507e9262cbbd4e10ce437b40a53 glibc-2.3.6-patches-1.15.tar.bz2 154688
+RMD160 46247c4b55a12d3e82d666564217e06f7ef772f4 glibc-2.3.6-patches-1.15.tar.bz2 154688
+SHA256 ec4f09e040820b9c77efe4347ff6f12a24df777a179af2618a6c3abe059c148e glibc-2.3.6-patches-1.15.tar.bz2 154688
 MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977
 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977
 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977
diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r3 b/sys-libs/glibc/files/digest-glibc-2.4-r3
index e8ed85801a6b..d95e34e9bd13 100644
--- a/sys-libs/glibc/files/digest-glibc-2.4-r3
+++ b/sys-libs/glibc/files/digest-glibc-2.4-r3
@@ -1,6 +1,6 @@
-MD5 becf802f06618632cb7691ccdc55497d glibc-2.4-patches-1.15.tar.bz2 121247
-RMD160 dfb7e90ee02a8162393c3d3c0ddbae81a1e56ff8 glibc-2.4-patches-1.15.tar.bz2 121247
-SHA256 fca9951f5fb10ac85507f1b636a15549c00aebc1af7342887c183d843cc8f670 glibc-2.4-patches-1.15.tar.bz2 121247
+MD5 83f949baa2aca7066f895f7a88d05d21 glibc-2.4-patches-1.16.tar.bz2 119684
+RMD160 50113638e5a00da169862fb44b3d5d5cc6288cf7 glibc-2.4-patches-1.16.tar.bz2 119684
+SHA256 8ac49492575e66c037629ee3f23c2c1729b700a05f28d55565c946ccf18e840a glibc-2.4-patches-1.16.tar.bz2 119684
 MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445
 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445
 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445
diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
index 23e1aaf0d6c6..562f53c46904 100644
--- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.13 2006/06/21 15:02:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.14 2006/06/22 05:44:46 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="2.3.6-1"
 GLIBC_INFOPAGE_VERSION="2.3.6"
 
 # Gentoo patchset
-PATCH_VER="1.13"
+PATCH_VER="1.15"
 
 # Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm
 # http://download.fedora.redhat.com/pub/fedora/linux/core/
diff --git a/sys-libs/glibc/glibc-2.4-r3.ebuild b/sys-libs/glibc/glibc-2.4-r3.ebuild
index 5dfa88cdfcf4..361233da29e0 100644
--- a/sys-libs/glibc/glibc-2.4-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.7 2006/06/16 03:25:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.8 2006/06/22 05:44:45 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.15"
+PATCH_VER="1.16"
 
 # Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm
 # http://download.fedora.redhat.com/pub/fedora/linux/core/