diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2011-04-23 12:10:31 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2011-04-23 12:10:31 +0000 |
| commit | 6a2c01c6575ba44a96d4dbede521cc616b832bb3 (patch) | |
| tree | 213c90d78739222fb60b5706e1680176128ddd38 /sys-apps/texinfo | |
| parent | alpha/ia64/s390/sh/sparc stable wrt #308017 (diff) | |
| download | gentoo-2-6a2c01c6575ba44a96d4dbede521cc616b832bb3.tar.gz gentoo-2-6a2c01c6575ba44a96d4dbede521cc616b832bb3.tar.bz2 gentoo-2-6a2c01c6575ba44a96d4dbede521cc616b832bb3.zip | |
Backport fix from upstream for accentenc test (bug #322151).
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/texinfo')
| -rw-r--r-- | sys-apps/texinfo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch | 17 | ||||
| -rw-r--r-- | sys-apps/texinfo/texinfo-4.13-r1.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog index 4cc66a11b1f4..208748fd7ef2 100644 --- a/sys-apps/texinfo/ChangeLog +++ b/sys-apps/texinfo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/texinfo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.112 2011/02/12 22:50:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.113 2011/04/23 12:10:31 dirtyepic Exp $ + + 23 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> texinfo-4.13-r1.ebuild, + +files/texinfo-4.13-accentenc-test.patch: + Backport fix from upstream for accentenc test (bug #322151). 12 Feb 2011; Mike Frysinger <vapier@gentoo.org> texinfo-4.13-r1.ebuild: Keep from regenerating man pages since their content is unchanged #354589 by diff --git a/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch new file mode 100644 index 000000000000..ad470faf0d47 --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-accentenc-test.patch @@ -0,0 +1,17 @@ +Fails in UTF-8 locales with grep-2.6 + +https://bugs.gentoo.org/322151 +https://savannah.gnu.org/bugs/index.php?31068 + +--- a/makeinfo/tests/accentenc ++++ b/makeinfo/tests/accentenc +@@ -1,7 +1,8 @@ + #!/bin/sh + # Test encoded accent info output. + +-unset TEXINFO_OUTPUT ++unset TEXINFO_OUTPUT LANG LANGUAGE ++LC_ALL=POSIX; export LC_ALL + : ${srcdir=.} + input=`basename $0`.txi + output=`basename $0`.info diff --git a/sys-apps/texinfo/texinfo-4.13-r1.ebuild b/sys-apps/texinfo/texinfo-4.13-r1.ebuild index 953592ee5ac4..25b42a6bf679 100644 --- a/sys-apps/texinfo/texinfo-4.13-r1.ebuild +++ b/sys-apps/texinfo/texinfo-4.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r1.ebuild,v 1.2 2011/02/12 22:50:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r1.ebuild,v 1.3 2011/04/23 12:10:31 dirtyepic Exp $ EAPI="2" @@ -27,6 +27,7 @@ src_prepare() { touch doc/install-info.1 #354589 epatch "${FILESDIR}"/${P}-texi2dvi-regexp-range.patch #311885 touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1 #354589 + epatch "${FILESDIR}"/${P}-accentenc-test.patch } src_configure() { |