Fix building in some locales #131462 by Andres Toomsalu.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 52 insertions, 41 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 7c786b48c470..ac76f4d160ae 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.90 2006/09/09 10:28:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.91 2006/11/11 09:22:33 vapier Exp $
+
+  11 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.38-locale.patch, e2fsprogs-1.39.ebuild:
+  Fix building in some locales #131462 by Andres Toomsalu.
 
   09 Sep 2006; Mike Frysinger <vapier@gentoo.org>
   +files/e2fsprogs-1.39-parse-types.patch, e2fsprogs-1.39.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 5f14696965af..43bdb9ab49d0 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -9,30 +9,14 @@ AUX e2fsprogs-1.36-makefile.patch 3546 RMD160 e3192ce562e534f75fd22679b7d222611f
 MD5 c5e6ed46f8a6b9f75273863110887b22 files/e2fsprogs-1.36-makefile.patch 3546
 RMD160 e3192ce562e534f75fd22679b7d222611f7d031d files/e2fsprogs-1.36-makefile.patch 3546
 SHA256 6c6880203317d881cec66a8862baf998b0a8f8e0d62ea45e2efc1ba867ccca6c files/e2fsprogs-1.36-makefile.patch 3546
-AUX e2fsprogs-1.38-blkid-ext23.patch 714 RMD160 3f3a0f85feb1b8a2d1b8a2c86b98d7628b14f50d SHA1 066dfa93f329ddf4e2b8fcc064dda7cfe10a6eab SHA256 39e46cecab03e91a8af0ada31474354604e475d48615f95189aefce4a5e0455e
-MD5 ebeacdb9470e8d7ad33a259a71164672 files/e2fsprogs-1.38-blkid-ext23.patch 714
-RMD160 3f3a0f85feb1b8a2d1b8a2c86b98d7628b14f50d files/e2fsprogs-1.38-blkid-ext23.patch 714
-SHA256 39e46cecab03e91a8af0ada31474354604e475d48615f95189aefce4a5e0455e files/e2fsprogs-1.38-blkid-ext23.patch 714
-AUX e2fsprogs-1.38-blkid-swsuspend.patch 1772 RMD160 fa309cb7d99f27f4f3d863a0a2dd2c49ad198045 SHA1 5e9525b6264131a650d31fff3942c0a71dae2676 SHA256 423509aa13c0a63438cff5e120dfe2cbcea25211e8a0776a65ff06c7f4fbd673
-MD5 478cd49f138b6b047fb1c465c9d05c80 files/e2fsprogs-1.38-blkid-swsuspend.patch 1772
-RMD160 fa309cb7d99f27f4f3d863a0a2dd2c49ad198045 files/e2fsprogs-1.38-blkid-swsuspend.patch 1772
-SHA256 423509aa13c0a63438cff5e120dfe2cbcea25211e8a0776a65ff06c7f4fbd673 files/e2fsprogs-1.38-blkid-swsuspend.patch 1772
-AUX e2fsprogs-1.38-disconnected-inodes.patch 2881 RMD160 67d0fba3c12e88d7f9dadff84d263593e857cc0e SHA1 0687149739afdee3cad3a34d81157762d4756f9f SHA256 50f810077d6422848df327535ceeae14d6d91299aca36604fda2b7fbb8d34c17
-MD5 e85d057f99af6c980acf9a8697da9dd7 files/e2fsprogs-1.38-disconnected-inodes.patch 2881
-RMD160 67d0fba3c12e88d7f9dadff84d263593e857cc0e files/e2fsprogs-1.38-disconnected-inodes.patch 2881
-SHA256 50f810077d6422848df327535ceeae14d6d91299aca36604fda2b7fbb8d34c17 files/e2fsprogs-1.38-disconnected-inodes.patch 2881
-AUX e2fsprogs-1.38-libintl.patch 470 RMD160 9104175f1eb21209fe754c9cad0f088ec5161d3d SHA1 946561b77786a064d82c3c7dbe926a7c5cbd9b2f SHA256 ca55f1be5d5dd3d46fcb9d316e63f28ac2cd13c79459644dadf4b6d8b35a3a91
-MD5 bafe5afeafcb558958527f12baf5c815 files/e2fsprogs-1.38-libintl.patch 470
-RMD160 9104175f1eb21209fe754c9cad0f088ec5161d3d files/e2fsprogs-1.38-libintl.patch 470
-SHA256 ca55f1be5d5dd3d46fcb9d316e63f28ac2cd13c79459644dadf4b6d8b35a3a91 files/e2fsprogs-1.38-libintl.patch 470
+AUX e2fsprogs-1.38-locale.patch 550 RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 SHA1 15a2d3759f6309a188d82b21282ca50f738ebc27 SHA256 49909ebdaa316687c97c8b78d7485f0868167021f4c07f3d25fd984be2b0c600
+MD5 1a4c6e9e6476e4ed8c419a0a98e1a97c files/e2fsprogs-1.38-locale.patch 550
+RMD160 0c31fce2f16fa8057fa2d2d11797483876afbfb0 files/e2fsprogs-1.38-locale.patch 550
+SHA256 49909ebdaa316687c97c8b78d7485f0868167021f4c07f3d25fd984be2b0c600 files/e2fsprogs-1.38-locale.patch 550
 AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598
 MD5 f199f07604566fda4f2a4dabac83a535 files/e2fsprogs-1.38-tests-locale.patch 656
 RMD160 16c625c16144ed16942fa19988524b7b5727c583 files/e2fsprogs-1.38-tests-locale.patch 656
 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 files/e2fsprogs-1.38-tests-locale.patch 656
-AUX e2fsprogs-1.38-vfat-labels.patch 6667 RMD160 f652ce374cfd1a019905f1e2f2582b50db66fa2f SHA1 625bc48e59cf021da407d2382a959ea0d4cb826f SHA256 2d8f1cc10a390a66b490e5e168c38e1d3bbdd79234b38ad926b34c34196ba6cf
-MD5 71ae8634de714335ebbc93dc0bbbd643 files/e2fsprogs-1.38-vfat-labels.patch 6667
-RMD160 f652ce374cfd1a019905f1e2f2582b50db66fa2f files/e2fsprogs-1.38-vfat-labels.patch 6667
-SHA256 2d8f1cc10a390a66b490e5e168c38e1d3bbdd79234b38ad926b34c34196ba6cf files/e2fsprogs-1.38-vfat-labels.patch 6667
 AUX e2fsprogs-1.39-libintl.patch 349 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 SHA1 93d8272d21c9afc7629243cf46660e67aefdda58 SHA256 d78ef6bc941230136b5b8e877364e7d8c5cdfa476b27d2931798bdfd485125f2
 MD5 f2055563a3d07e89731cb194126c6d66 files/e2fsprogs-1.39-libintl.patch 349
 RMD160 af61d02d49ca9653c01c3b318a22adcff5202746 files/e2fsprogs-1.39-libintl.patch 349
@@ -45,34 +29,26 @@ AUX e2fsprogs-1.39-parse-types.patch 1117 RMD160 5858224739c494ae2e31507b217594c
 MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117
 RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117
 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/e2fsprogs-1.39-parse-types.patch 1117
-DIST e2fsprogs-1.38.tar.gz 3621193 RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c SHA1 aa8915fe43bc7cf5fba633df7041009ce9981551 SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
-EBUILD e2fsprogs-1.38-r1.ebuild 4471 RMD160 41bb370af6a8e35e58554823c7753e9b8687cbcc SHA1 d43b950c659f43f80df8bcfd5b9fd5785cca92e2 SHA256 283f4dd10a8cbd3b22a917be642055ec315cd9aa342b290dba30e5227384d8e2
-MD5 62b78b485b34b1e601e6dceb06bad8b5 e2fsprogs-1.38-r1.ebuild 4471
-RMD160 41bb370af6a8e35e58554823c7753e9b8687cbcc e2fsprogs-1.38-r1.ebuild 4471
-SHA256 283f4dd10a8cbd3b22a917be642055ec315cd9aa342b290dba30e5227384d8e2 e2fsprogs-1.38-r1.ebuild 4471
-EBUILD e2fsprogs-1.39.ebuild 4077 RMD160 5e98d84099f7b0010007bba62a21c2344c611f41 SHA1 1b9a2804c5a38adff696f5e51f9ea7f640b613cd SHA256 f5cd3c0c06c09fd8bdb2cc2582838de99ba7b3aeaae1d2e4c9cb81779cdd71c8
-MD5 d99ec9b2c6936b367da0485d1ca20539 e2fsprogs-1.39.ebuild 4077
-RMD160 5e98d84099f7b0010007bba62a21c2344c611f41 e2fsprogs-1.39.ebuild 4077
-SHA256 f5cd3c0c06c09fd8bdb2cc2582838de99ba7b3aeaae1d2e4c9cb81779cdd71c8 e2fsprogs-1.39.ebuild 4077
-MISC ChangeLog 15004 RMD160 42f47b454cee320e57e1cc6116e6143f71ad710a SHA1 8667d2d626f72bbe21ff65e92928f117c117cdae SHA256 57c7371024c12995b51d731b781d379eee3e52e0b2f9d2dd9ad202a7dc166666
-MD5 698f78eb222f80809874ffe1e3e7789b ChangeLog 15004
-RMD160 42f47b454cee320e57e1cc6116e6143f71ad710a ChangeLog 15004
-SHA256 57c7371024c12995b51d731b781d379eee3e52e0b2f9d2dd9ad202a7dc166666 ChangeLog 15004
+EBUILD e2fsprogs-1.39.ebuild 4131 RMD160 f02968eb79f7f1fb77553a08c9adff7d0befca9d SHA1 05d0eb9a01581beb33a5c2046ec45f06b35ad721 SHA256 40ea0736249ddd643342ea2b1414b20dfe043ea3cb035422f9a4216c69c8fc0a
+MD5 42b7c72ad96aad1e807c27d6351cd17c e2fsprogs-1.39.ebuild 4131
+RMD160 f02968eb79f7f1fb77553a08c9adff7d0befca9d e2fsprogs-1.39.ebuild 4131
+SHA256 40ea0736249ddd643342ea2b1414b20dfe043ea3cb035422f9a4216c69c8fc0a e2fsprogs-1.39.ebuild 4131
+MISC ChangeLog 15175 RMD160 b38da0a799d7eae4729359ce4e0e198baebccaa6 SHA1 2d823cd84fa9529e054a6803cee090f8a717e2af SHA256 584ac837571261bf818d4ec835ad3bdf449b6da10efc6cff545ee41d12235d7e
+MD5 13a3d59f3b02561863e33f5c4a006d19 ChangeLog 15175
+RMD160 b38da0a799d7eae4729359ce4e0e198baebccaa6 ChangeLog 15175
+SHA256 584ac837571261bf818d4ec835ad3bdf449b6da10efc6cff545ee41d12235d7e ChangeLog 15175
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 cf2928368b4cb4e71afb0a17b60a0061 files/digest-e2fsprogs-1.38-r1 247
-RMD160 75dc4dc256f36244cdf5c7c4e87ef67716bfbf66 files/digest-e2fsprogs-1.38-r1 247
-SHA256 ba5da1ec95bf8c47c4b79cf425db318b9c5bfa309c9f805aa63275b69728a5aa files/digest-e2fsprogs-1.38-r1 247
 MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39 247
 RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39 247
 SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFApdYamhnQswr0vIRAgOlAKCFtlsv//9KqBFCvanbRrLro47Z+ACgiPeA
-NofvPYWrmPOgCWUI3KRU7lw=
-=j0tv
+iD8DBQFFVZZiamhnQswr0vIRAttIAJ4xVHj9PQgkKeD7ZhI6F422eZU4HwCbBcAR
+Lf5oth+cuAKfZtE1BLAPTV4=
+=IGth
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
index 55e7ffe3a985..962f11caf3a4 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39.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-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.2 2006/09/09 10:28:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39.ebuild,v 1.3 2006/11/11 09:22:33 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -37,6 +37,7 @@ src_unpack() {
 	cd "${S}"
 	# Fix locale issues while running tests #99766
 	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch
+	epatch "${FILESDIR}"/${PN}-1.38-locale.patch #131462
 	# Fix a cosmetic error in mk_cmds's help output.
 	epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
 	chmod u+w po/*.po # Userpriv fix #27348
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.38-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-locale.patch
new file mode 100644
index 000000000000..2a0919cf44be
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-locale.patch
@@ -0,0 +1,30 @@
+Fix issues with non-C locales (like ee)
+
+http://bugs.gentoo.org/104116
+http://bugs.gentoo.org/131462
+
+--- e2fsprogs/lib/et/compile_et.sh.in
++++ e2fsprogs/lib/et/compile_et.sh.in
+@@ -1,6 +1,10 @@
+ #!/bin/sh
+ #
+ #
++
++# the awk scripts here use a-z and such
++export LC_ALL="C"
++
+ AWK=@AWK@
+ DIR="${DIR-@datadir@/et}"
+ ET_DIR="@ET_DIR@"
+--- e2fsprogs/lib/ss/mk_cmds.sh.in
++++ e2fsprogs/lib/ss/mk_cmds.sh.in
+@@ -2,6 +2,9 @@
+ #
+ #
+ 
++# the awk/sed scripts here use a-z and such
++export LC_ALL="C"
++
+ DIR="${DIR-@datadir@/ss}"
+ SS_DIR="@SS_DIR@"
+ AWK=@AWK@