summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-08 01:17:03 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-08 01:17:03 +0000
commitc28a75b16805a315bb60f805265775bad5e6d198 (patch)
tree22464becb51a94f507cea220882ff2c63c755733 /sys-fs/e2fsprogs
parentnew package (corrects a small bug in the way that TeX centers ellipses) (diff)
downloadgentoo-2-c28a75b16805a315bb60f805265775bad5e6d198.tar.gz
gentoo-2-c28a75b16805a315bb60f805265775bad5e6d198.tar.bz2
gentoo-2-c28a75b16805a315bb60f805265775bad5e6d198.zip
Fix running tests in different locales #99766 by Attila Stehr.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r--sys-fs/e2fsprogs/ChangeLog8
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.38-r1.ebuild9
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch26
3 files changed, 38 insertions, 5 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/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