From c03caf215cbcaf69693134351df44be1f32104e5 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 8 Dec 2019 18:05:05 +0000
Subject: app-text/a2ps: fix build against texinfo-6.7, bug #695918
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Toralf Förster
Fixed-by: Neil Bothwick
Closes: https://bugs.gentoo.org/695918
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 app-text/a2ps/a2ps-4.14-r6.ebuild                  |  5 ++-
 .../files/a2ps-4.14-texinfo-6.7-encoding.patch     | 40 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch

(limited to 'app-text')

diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 272fed2bb5cb..389c9f7e13d7 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,6 +77,9 @@ src_prepare() {
 	# fix CVE-2001-1593, bug 507024
 	eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
 
+	# specify encoding explicitly, bug #695918
+	eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
+
 	# fix building with sys-devel/automake >= 1.12, bug 420503
 	rm -f {.,ogonkify}/aclocal.m4 || die
 	sed -i \
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
new file mode 100644
index 000000000000..df2a60f395c5
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/695918
+
+The patchs fixes build failure against texinfo-6.7+:
+```
+Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb;
+need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+make[2]: *** [Makefile:472: a2ps.info] Error 25
+```
+
+Fixed-by: Neil Bothwick
+--- a/doc/a2ps.texi~	2019-11-24 18:51:07.000000000 +0000
++++ a/doc/a2ps.texi	2019-11-24 18:56:30.390438433 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo @c -*- texinfo -*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename a2ps.info
+ @settitle General Purpose PostScript Generating Utility
+ @c @setchapternewpage odd
+
+--- a/doc/regex.texi~	2002-03-04 18:46:24.000000000 +0000
++++ a/doc/regex.texi	2019-11-24 18:56:42.861052598 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename regex.info
+ @settitle Regex
+ @c %**end of header
+
+--- a/ogonkify/doc/ogonkify.texi~	2007-12-29 02:09:38.000000000 +0000
++++ a/ogonkify/doc/ogonkify.texi	2019-11-24 18:57:03.173424149 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename ogonkify.info
+ @settitle Ogonkify
+ @setchapternewpage off
-- 
cgit v1.2.3-65-gdbad