gentoo resync : 15.12.2019

3 files changed, 47 insertions, 4 deletions

diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index f49fc77806fe..bb0cd4a173a8 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -13,7 +13,8 @@ AUX a2ps-4.14-ja-cleanup.patch 3210 BLAKE2B 599c8bca7f599c3ffda2d1a071d9ca5c4d47
 AUX a2ps-4.14-psset.patch 616 BLAKE2B 1554f3ea640b1e44cecc6b0cb6a2f593f1dc1aeec36b5f9a9d1e98c847e431a0848d35a0139ce1541cba55eedf3de619f6b5dcfd4099641112d0f4fe3c8ee251 SHA512 3118d91519c81e5e9f46a5386e9db757936231e71047ba8579b3d969a7c824bad6325b54221a61a0b171bb87669b548704a068bc71a1cd3b48d3a32416fe0c0f
 AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4f1252ff83d4eb8ae09788aa0017a332847c9d4cb4a16096ecfe84197769ca6fca7cab239fc7da7b113e48d0d94 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5
 AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
+AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3576 BLAKE2B 66e1a0aabfd2032310af35ce798a5b5e21b2089a93ff5a5396246fdc2bb1c8f83d1ebf820cda8a9e512d219f6d99e9bc7268c3a7479fa58f25fc123bdb07bf98 SHA512 755386abe294f22aa129fb098b53fdf1e69c44d594268c41a6dc44f48cc9a7d9b9fd7ee80fdf1089efc2135212cf13f1e3480f58a6ef93ac5cd77741674921fa
+EBUILD a2ps-4.14-r6.ebuild 3628 BLAKE2B 9ff12ac976e3d26ce92f74e6d068cd1caa487acbcab917b6670c8bb780393d2dc2a44dede7751f75c6af6edc54fb4cab6f66035e7737eef9770f79ba6367c781 SHA512 9da8c75603b70b2ca8469a9ebf2a5ce099fc335875ff7ee5d702fce91aa4f633227a54ee40a74cc8d59396a10a94765a045186166b1744ffbbda9bea32734215
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 272fed2bb5cb..33b91a41bf4e 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
@@ -23,8 +23,7 @@ RDEPEND="app-text/ghostscript-gpl
 	emacs? ( virtual/emacs )
 	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )
-	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )"
+	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-2.7.2
 	virtual/yacc
@@ -77,6 +76,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