gentoo resync : 08.06.2019

5 files changed, 39 insertions, 87 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 2c169d35e658..86cd4fa1dea2 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,9 +1,6 @@
-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.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
-DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 EBUILD texinfo-6.3.ebuild 1110 BLAKE2B d3bdfaa29efc4c4eb951f78c4cbf9de4d4259dfc769867ef75c243d768b6ccb226467229328d7b07f1fd50b12150a0d18fe659b621662375f68fa58b9a66d9ff SHA512 634274842a789f5d906c553f413a8775b3050a7fc9c86a9c0a8320c8fe5f342354522e56fa0cefb15b42169c9503d9e851182ad98b93b5c7351d388750a0f738
-EBUILD texinfo-6.5-r1.ebuild 1275 BLAKE2B d399088d9d49722b741100f467c74eed8c324dc7225b8480c2288e3a8c3729e59d8458cf17ecde7e3f2dad30c6d53d7dbd313fc6ff0d946776ee41fa5656f30b SHA512 d6a1a676d23d39e42f3054988b64bb6b02d024b8fc4579c6315214f7e2450084039d6f3ab22cba266b8ac908a304dc03be33c4b15b1a393573dcd3a474eebb69
 EBUILD texinfo-6.6-r1.ebuild 1367 BLAKE2B 716ff075cd4174f822d08f270086326f6c664078d152e146fab04c4fd05323f4a3fd78fadacd1dee801f1add66abc576d90e0cc2dcf742a52280ea40b0a15a4a SHA512 96f85073fc80f08a94a7a2ca8bf73ec20fd441e36bd158ad7336e39f919f6f8b52f851b6641b450167b35fd02d03fc4acfb840d735f987063d6543b78fa39d88
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD texinfo-6.6-r3.ebuild 1698 BLAKE2B f26539f4f66bbdd1a627ec0b3e3bc950c664eeb608bc0139e3a189bd77b9cf507a06e4aca81f723f78aaab5eae0a62d494e64ba29dd07096a427e8cae4534d44 SHA512 3f8ff94cd57d506654b352577f21737d0717f1d04cc268e39c8e7604f78a4fd1b9994fe6f7464ea9c0499305384c8929ae3d9df846242f2d516d9a9d0993cdc4
+MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
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
deleted file mode 100644
index 72f1288393ac..000000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-escape-braces-in-regex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 2d33abe78c72..000000000000
--- a/sys-apps/texinfo/files/texinfo-6.5-perl-5.28-thread-safe-locales.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/metadata.xml b/sys-apps/texinfo/metadata.xml
index 56c124413057..b4920fb24a29 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -5,4 +5,11 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<maintainer type="project">
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
+<use>
+	<flag name="standalone">Build standalone version that survives all Portage bugs</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/texinfo/texinfo-6.5-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r3.ebuild
index fb321453e23e..a7c47ef6f93a 100644
--- a/sys-apps/texinfo/texinfo-6.5-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r3.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=6
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU info program and utilities"
 HOMEPAGE="https://www.gnu.org/software/texinfo/"
@@ -16,32 +16,45 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="nls static"
+IUSE="nls +standalone 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
+	standalone? ( dev-lang/perl )
+	!standalone?  (
+		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() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
 	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-external-libintl-perl
-		--with-external-Unicode-EastAsianWidth
-		--with-external-Text-Unidecode
-		$(use_enable nls)
-	)
+	local myeconfargs
+	if use standalone ; then
+		myeconfargs=(
+			--without-external-libintl-perl
+			--without-external-Unicode-EastAsianWidth
+			--without-external-Text-Unidecode
+			$(use_enable nls)
+			--disable-perl-xs
+		)
+	else
+		myeconfargs=(
+			--with-external-libintl-perl
+			--with-external-Unicode-EastAsianWidth
+			--with-external-Text-Unidecode
+			$(use_enable nls)
+			--enable-perl-xs
+		)
+	fi
 	econf "${myeconfargs[@]}"
 }