Fix running tests in different locales #99766 by Attila Stehr.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 70 insertions, 10 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 86c57a36a1be..b127692444c2 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.77 2005/12/19 03:15:33 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.78 2006/02/08 01:17:03 vapier Exp $
+
+  08 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.38-tests-locale.patch, e2fsprogs-1.38-r1.ebuild:
+  Fix running tests in different locales #99766 by Attila Stehr.
 
 *e2fsprogs-1.38-r1 (19 Dec 2005)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 87bf73ba17fb..a77842c969d7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,22 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 11dedec635601b2936af6de0badeb3bd ChangeLog 13407
-MD5 1c4b04910816f84c849789b214381c4f e2fsprogs-1.38-r1.ebuild 3854
+MD5 20410584ba6fc1173e76935140e29a72 ChangeLog 13593
+RMD160 9a8e0488a5fd41f5ae63eb8f2f4db9797fc6a661 ChangeLog 13593
+SHA256 d9feb05f375c15cb2570d454cd6e0233f8f31f4f7f8993e67f7a051b511828cd ChangeLog 13593
+MD5 3d130ba3c8078e4124e5a27e419aa164 e2fsprogs-1.38-r1.ebuild 3948
+RMD160 06baf5a99abf05469a50e1e8138b16a8770d483a e2fsprogs-1.38-r1.ebuild 3948
+SHA256 c2bf59a1f4aacae0be66438025425480ef2a169915b442d80518b5a5423b298c e2fsprogs-1.38-r1.ebuild 3948
 MD5 d73f86d05b5b726d16729639ccaa33b9 e2fsprogs-1.38.ebuild 3688
+RMD160 c50b9cdfee374cd63f4a14cbdb9ed0c02a1d3e72 e2fsprogs-1.38.ebuild 3688
+SHA256 f2c7420e9b0d1296312b0f27d9d945d68d33791e3aca594a5547b0bc8b687a6f e2fsprogs-1.38.ebuild 3688
 MD5 0911aedd4968aa4053139791a961e2a2 files/digest-e2fsprogs-1.38 67
+RMD160 fea673f4fa6081ae0e28b5c4111aed139af12390 files/digest-e2fsprogs-1.38 67
+SHA256 bf28fd56f8851a85654d0da5a23afeabe055c714f963ae7245e8516e61b1de6e files/digest-e2fsprogs-1.38 67
 MD5 0911aedd4968aa4053139791a961e2a2 files/digest-e2fsprogs-1.38-r1 67
+RMD160 fea673f4fa6081ae0e28b5c4111aed139af12390 files/digest-e2fsprogs-1.38-r1 67
+SHA256 bf28fd56f8851a85654d0da5a23afeabe055c714f963ae7245e8516e61b1de6e files/digest-e2fsprogs-1.38-r1 67
 MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+RMD160 42dae53c318fb52b39c8e1d357974111bf8712bf files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+SHA256 182da8741b852fdaf2d17a485da0451ec0c665adb83327b29b3372e2e43f712a files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
 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
 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
 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
 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
+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
 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
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyIjN2+ySkm8kpY0RApfBAJwN098jYTqLndsnQhNEfLd7ICFMbQCdEi6D
-5OydxnPVByMUKPvlweNpj5M=
-=NAmA
+iD8DBQFD6Uat2+ySkm8kpY0RAl2DAJ9GI0krx+ZESlyVQsxmv5TaVxdoaQCeN980
+iz28H5QPK9cwImBuVPZMLAI=
+=5rME
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
index 70bc3543e427..e476e122c539 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.38-r1.ebuild,v 1.2 2006/01/06 23:46:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild,v 1.3 2006/02/08 01:17:03 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -20,7 +20,10 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
 src_unpack() {
-	unpack ${A}; cd "${S}"
+	unpack ${A}
+	cd "${S}"
+	# Fix locale issues while running tests #99766
+	epatch "${FILESDIR}"/${P}-tests-locale.patch
 	# 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-tests-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch
new file mode 100644
index 000000000000..6c316ac2a38b
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch
@@ -0,0 +1,26 @@
+Since the tests analyze the output messages, force the default locale.
+
+http://bugs.gentoo.org/99766
+
+--- tests/test_script.in
++++ tests/test_script.in
+@@ -3,6 +3,19 @@
+ # Test script for e2fsck
+ #
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    unset $as_var
++  fi
++done
++
+ if test "$1"x = x ; then
+   TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | $EGREP -v "\.failed|\.new"`
+ else