gentoo resync : 25.01.2019

4 files changed, 115 insertions, 0 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 743a53f7b6cc..a57574fd9747 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,5 @@
+AUX texinfo-6.5-escape-braces-in-regex.patch 1082 BLAKE2B 3498fdc85f506d1107d1101304f4d7a3da69ebda3532f21b30d670dd2c968b2f13f8aedcd1e47a50f91b909d7d2847919e5d8325c991fb0e8910e701d31142c1 SHA512 250a33570834e5bc1557d600461d194fdc5c80e99d0a4eeecede8b6e21d235fd60d4bcd8e516ea4fa1940b01b7856ba2f1a6310dd24ac26f6d04f89e7dba8835
+AUX texinfo-6.5-perl-5.28-thread-safe-locales.patch 1239 BLAKE2B f42337e49d6530db6706e9867db9211b91be17a9e5744b350a124dbe95e7ea39e208b7a31a81f656b9a53d51dd4d7ea0b155924753288bbbf6db33d0d38a5b13 SHA512 aca40e7fa4acb9df90efa169d40c1d76b797c334a09472fb9d72e2f577f12628c5425b64b25c8d3940fa178254249de628f7ac84bae7fc887c4deaebe21c4602
 DIST texinfo-6.1.tar.xz 4520376 BLAKE2B 3b96ed431288815df4261fcd0266f2be01d27f82904f20169ab5c9dbecc26dbe817a36a41817868b3f44f1bea45b53e3da5703399cd8ae2ad098f5b1cb0b49d9 SHA512 ae47295f3bcfb728c3be59421cf830ecfa5fc7856a086e45da2bac89600d883aa4406a6ef62d7ee5dc2bab83a3efa1cec861a3b4b14b85bbecb53ebf3ebf7235
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
 DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006
@@ -5,5 +7,6 @@ DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3
 EBUILD texinfo-6.1.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
 EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
 EBUILD texinfo-6.4.ebuild 1119 BLAKE2B 3758a080518277f705a6d0726015e5bb9f1dfbeb3b14bdbee668f3641acbf564d4d41f147a827011f358b0e739307e2fd5994af3fa93210275e717e588c82382 SHA512 3cb88782ece710208c38b506fdb028e03390c6f798fc13a9bf8e2891d0096a8bea5531d16e454b091a6227b905ffc73f4d2d786f3fdef7102637fa3023de7530
+EBUILD texinfo-6.5-r1.ebuild 1268 BLAKE2B 3cc36fe001c216e0b460df0c948ecad98c7635efc35181b950a4ba65896ddd07f04203ff0680515a1ab19fd89e57623902744ab546885483c5a79569a716eed5 SHA512 dabac9043745739d956fc299c59ffca8555c17fe076a1b74cdf880bfdd75a1abb9f0081d812c8c396d0c720537ec6dcdd2c72e670f7001a92d9576e23f72aa99
 EBUILD texinfo-6.5.ebuild 1153 BLAKE2B 114c01323863fee4903830e36f798eff5b525f3d67618100cfd713ec06a3edc79d960e66ee2973622f5d11d711f7a35880185c103d8da40fa79fc21f8a17f3ad SHA512 5968b0d3b4455e5c6b32c52540c17014566a1a2f7604dcb26ecf01736da6077a002dbf3b17a5170909c26c4ac46ca48b85f07c66fe415c85fcc07d52d4adf991
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
new file mode 100644
index 000000000000..72f1288393ac
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
@@ -0,0 +1,28 @@
+From efde0da129154376bebcfff6a47424669bb849df Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Fri, 13 Jul 2018 15:31:28 +0000
+Subject: [PATCH] escape braces in regex
+
+git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8007 39fee189-59d7-47db-b5d4-205258b72aed
+
+diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
+index ba1cd423d..b5eece680 100644
+--- a/tp/Texinfo/Parser.pm
++++ b/tp/Texinfo/Parser.pm
+@@ -5531,11 +5531,11 @@ sub _parse_special_misc_command($$$$)
+     }
+   } elsif ($command eq 'clickstyle') {
+     # REMACRO
+-    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+       $args = ['@'.$1];
+       $self->{'clickstyle'} = $1;
+       $remaining = $line;
+-      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+       $has_comment = 1 if (defined($4));
+     } else {
+       $self->line_error (sprintf($self->__(
+-- 
+2.20.1
+
diff --git a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
new file mode 100644
index 000000000000..2d33abe78c72
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
@@ -0,0 +1,37 @@
+From a028ef47353b03177aab3facb4b2b74f7c3823e2 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Fri, 13 Jul 2018 15:39:29 +0000
+Subject: [PATCH] perl 5.28 thread-safe locales
+
+git-svn-id: svn://127.0.0.1/svn_repo/texinfo/trunk@8008 39fee189-59d7-47db-b5d4-205258b72aed
+
+diff --git a/tp/Texinfo/Convert/XSParagraph/xspara.c b/tp/Texinfo/Convert/XSParagraph/xspara.c
+index 51eea4a30..f2d6d1ccd 100644
+--- a/tp/Texinfo/Convert/XSParagraph/xspara.c
++++ b/tp/Texinfo/Convert/XSParagraph/xspara.c
+@@ -248,6 +248,11 @@ xspara_init (void)
+ 
+   dTHX;
+ 
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++  /* needed due to thread-safe locale handling in newer perls */
++  switch_to_global_locale();
++#endif
++
+   if (setlocale (LC_CTYPE, "en_US.UTF-8")
+       || setlocale (LC_CTYPE, "en_US.utf8"))
+     goto success;
+@@ -320,6 +325,10 @@ failure:
+     {
+ success: ;
+       free (utf8_locale);
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++      /* needed due to thread-safe locale handling in newer perls */
++      sync_locale();
++#endif
+       /*
+       fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
+       fprintf (stderr, "character encoding is: %s\n",
+-- 
+2.20.1
+
diff --git a/sys-apps/texinfo/texinfo-6.5-r1.ebuild b/sys-apps/texinfo/texinfo-6.5-r1.ebuild
new file mode 100644
index 000000000000..d42ea554e6d1
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-6.5-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:0=
+	dev-lang/perl:=
+	dev-perl/libintl-perl
+	dev-perl/Unicode-EastAsianWidth
+	dev-perl/Text-Unidecode
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.19.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-escape-braces-in-regex.patch
+	"${FILESDIR}/${P}"-perl-5.28-thread-safe-locales.patch
+)
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-external-libintl-perl
+		--with-external-Unicode-EastAsianWidth
+		--with-external-Text-Unidecode
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}