Backport fix from upstream for accentenc test (bug #322151).

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 31 insertions, 8 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/Manifest b/sys-apps/texinfo/Manifest
index 8480f312384a..08a567c122c7 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX texinfo-4.13-accentenc-test.patch 397 RMD160 b9543330e1e463f9b538b94cf83594e7944097d7 SHA1 05212702c639cc5d3eb0c9c755f475c65a36d59e SHA256 22bbe0e3339453e3ce1614b1b315cad65c2d83691378917519556b54e3408e22
 AUX texinfo-4.13-texi2dvi-regexp-range.patch 980 RMD160 64bf3d76c40a766c093ec56e487b7f9853ee4128 SHA1 81c0a4abe32c2b97f6514c554db18adfa1971a24 SHA256 7e243e2d1c5a7f7ce466d4a5a6448520fdb8e1a8ef8bf053afef1992855e489f
 AUX texinfo-4.13-xz.patch 4928 RMD160 d6cf5627f53f75585a4a9c212c98f020c002cc1e SHA1 06f1614b09f3ad31dca8c8a42bd5abfe2f2dc46f SHA256 58232da01f25341427ff3d2d47d6c62c76744d2935ea119131ce6ec21f2f876a
 DIST texinfo-4.13.tar.lzma 1563777 RMD160 31d68ab41fead86d473ecc1de183fd1629e01560 SHA1 676ec9aa25a97c05dff66fba5225f9e101160063 SHA256 6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5
-EBUILD texinfo-4.13-r1.ebuild 1323 RMD160 cf72995a20cebf6b46fa3f6be4a126aa174aa61e SHA1 4d109fe35c0f9e43db5cd0617d46f4e958faf6ae SHA256 539fc740225f4e7db78ada33d83b5a4fb797679d88f33ff0d890bde816981645
+EBUILD texinfo-4.13-r1.ebuild 1374 RMD160 69c06aca35fc62bc53f8897be2608679fffe9f4c SHA1 f72194398accf36fe6a155dfd5c30c57ddb5c27f SHA256 cbc6544ff1b43f02610f99f9bb62638243d975a6d458824046f241d52d820a74
 EBUILD texinfo-4.13.ebuild 1197 RMD160 1568a8de4f9227deea8ff1fb4bb0c20334a38476 SHA1 70a25792f56a4081b83bfd1ce07f3a072ceed2a7 SHA256 b5bf76bcd6bb71cd2e0053130ef35e62fded00c17bed45065a49c8bfc507cb36
-MISC ChangeLog 13408 RMD160 6133e6f50ac80c0013d6bb12a482d05fc99fbfb8 SHA1 2ca9138d05d142893a36525fc0f9c7f9084091f5 SHA256 7259e0bf3e6cca7eae4c1f1286b3b11c4a84eea1e89a729b262eaab0e0710047
+MISC ChangeLog 13591 RMD160 77008813e373884b6a62883df987d1890290d3b1 SHA1 4eed3854eabe4d77477cb8c861081a84e9b5ac7a SHA256 f6e00a6b764591943334776f65380a97622fb77809aaf2bfbacc14a67f034cef
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1XDq4ACgkQaC/OocHi7JYiFAEAnPkwQo5UD+aAOdcWFCpUWsXY
-X8dXFvgd3TdXp3yjk0sA/RNeA0TLQh7tYdIi35rLaJPfHQGpbgVKN7XjwmCxgiP5
-=RehW
+iEYEARECAAYFAk2yw0YACgkQiqiDRvmkBmK6cQCg7p1zCtJ6M8TM+Gz/WO9o95Qu
+nE8AnjmKPaRhuY5PjRulu+i/fi77H806
+=ZZz6
 -----END PGP SIGNATURE-----
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() {