gentoo resync : 15.12.2017

10 files changed, 20 insertions, 770 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index cf86a415301c..1da242d5c0c0 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,15 +1,12 @@
-AUX bison-1.32-extfix.patch 1170 BLAKE2B 31539222a3cb46877073e16c16939b37e4999f2ddd4503d4ca576b4b87c3e3e0696f12efde38d9d22ce8a2fac7e948f7897c40df7eaa23368248e5ee47ff2722 SHA512 6f98d6ea4d6564c3890ede54994654af87d79a87e615e03856a71f3470876fe42768deeabe31f9393531a35619a7e00844ff2a3d87214754cfd04a25d591cc57
-AUX bison-2.4.3-no-gets.patch 780 BLAKE2B 69acae2a3e8f17d6718d9ebcd6bbd52f84bcd5885ea0c99f24ccda48f3d95c8aa264a43268af9d11b45a48d43083c07289c6b87f8296ca0745d17275b62269f4 SHA512 cf7d60c143bf27a546c6fa04f08b58b0c297996f25fe28e85863795f51040772a85316ca1464204a84630322df16893d636331b7e4953f6c1718d680a5bc827b
-AUX bison-2.4.3-uclibc-sched_param-def.patch 580 BLAKE2B 51a149123e1980f696ffd56ae956c404dcc87dc8f78b06d8fdf9d43c36e97412fc3124dfe56515a2ab66697c4c7314ca01f249e09ccab485090b894116e7fbb2 SHA512 87a49e69aec0b36313132fc7a9fb520016e4dc4399a9af9a91636a588326825de3a65dd6bcdda8de20e364ec163afcb41b0453f09ce4102d179ce04279c8654d
-AUX bison-3.0.4-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf
-AUX bison-3.0.4-fix-tests-gcc-7.patch 4338 BLAKE2B bab62075a9f1ed28c5c672473417be0cbdeca212b39dc3431acbec5753edfab6506c0a127067b541aca2508d6d668ed439b8a90d0f1ab923b88c0c063c548ed9 SHA512 694d3178674fc1ad171c6148c5d610c869033464320e03421e1fdc26918b507a3236a9b6f186468690a395e696ab77c0242e3269b759aa97dd3b2c39f7e8e548
-AUX bison-3.0.4-optional-perl.patch 21963 BLAKE2B 82f6f5898d99f692428ecf130823d8e2e132bf9324b3cc4b82d9b10243a7a6eb844cf7fc7f43ca6cc3ab9c78e0809b0673ce5bf4ad77e9b9943029769c6baec8 SHA512 d118dcf8a104edf5d81b7f96254b15f6fef1332c7957c5cc3a484d3295436afa166c249acf4fa8834c5f194daa3fbfae79c0168b0fa980a4cb8de537c5b3e3cf
+DIST bison-1.875d-patchset.tar.bz2 698 BLAKE2B a68e6009c24437a36c81e7fb97112f8ad721217b65a03531e5375e7310988f81d8c868485bdfc9b4ea99d4285ead91ad8f4670fb358abe92dc206cf6df4c80a1 SHA512 ac650b6f1b2b26057eda0d9ceae6f36604c88a67419b6190e423a08f863c460ded2a58040a71ce79b5e0b85ab3ede1b7a2ebd204c9bd8eb53f6551f39b160beb
 DIST bison-1.875d.tar.bz2 882745 BLAKE2B c85ce71986ae095e9dcfa24c1a9c7c484b3663994c1e394b7cc78a0ec1cc95df60369ff9878ef82edb4be144298d8648e336e861de98152bf79f6d66369c6dd4 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126
+DIST bison-2.4.3-patchset.tar.bz2 1102 BLAKE2B 3615841400ba984e563933d31e59a4810e17aed48b8314a3ceb66b47b2ad432e287cf9588b632594311f68d28d2bcce3c6a4f2c4be527c676fcbfd2a4480d04a SHA512 a36cf45b475e55e8baae265e43a151d3324026878d4bb4c119b9fccfc7be3c26ed183632bf210fdb587e2741d298df1e9d4ebb6c3d440f6ae33f40a29949f7a0
 DIST bison-2.4.3.tar.bz2 1652612 BLAKE2B 712444aec9898d2dc5dabd5008363f22f6beeb37e119edbdecb119965652e707d827e621c061b13be2206e29da59d661f1466c976c200ce749cf24062dbb5cf1 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055
 DIST bison-2.7.1.tar.xz 1781068 BLAKE2B bd3161bcf4d2a9f046073280a8d751eb770147f942d48326a9ac869cf31fd8f127759167dced662b826fa54a24cd0cf87b0c096814c84e34afed8078368828a1 SHA512 ac0c7ca57142bcb84af498f606acb86091984a00359294fbf721a4ca8112f9fcf26497f7dd2e65f527e04a6e1de94142ecb76602d407e548475970e5a566d370
+DIST bison-3.0.4-patchset.tar.xz 8216 BLAKE2B dd059a7a24faf351fa28bc72b6e183935d4409f91b5dcd8640a14d01b480a3e5b28ddb8f5660f16300a3cf1639d67bd3436d016fa304bb4666c9a43fd7897bd7 SHA512 87b62c5848360fee5b566c664c378ff08bb81d2b6c07b0d385ebd4dfd6b1a687af1da96ed43ca120695877cfc5e30a149ef35424c7a332e9223179dab6665d0b
 DIST bison-3.0.4.tar.xz 1973796 BLAKE2B 6320424a5fece04734325226981af287e5745c898df7f0f79c26207599227f40e9ef54f93b2e231e20766ab9a19c0b266545bc5d0bfeabbb958e3e2f6686386c SHA512 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
-EBUILD bison-1.875d.ebuild 1678 BLAKE2B fca4d82beb5bbb8ac572c12dfa9008eb393d6c6f8e257e6d36452537765766f13a397cd9a92578b28da12715150137cbc59a1489d6ac3c11e9d9cd149533f4d2 SHA512 5990adcb955692a75ef33de6b2699cd4d4577ffb002886ce09f6eafcb45cff25da5ef3e3e0940b0e3b160314cccf3ceb750883a448874cab0c58283a724591fd
-EBUILD bison-2.4.3.ebuild 1132 BLAKE2B f69cc27f2d5808f49cc12c1a6073eed2b046cb04ffdedb1cb064e8af53bd6aee5deb5183864b0159cc86e43c8c9e54b0555d2e059ffe1b0c3782b80a7c337e29 SHA512 c51aa2d4be14a3b1cff50a751ae842c80f1e8d7d1959e99e58f56ee66506628a5acce5a320273b66bcd32fc6ed559e9cb1141c010fc2279222b0b89ee9963fad
+EBUILD bison-1.875d.ebuild 1750 BLAKE2B a5ffd48b64d81d0c64ad403a34228a6d8e2a269f8234f4fc6e9d52d6edb619cfa3f1fb2a382701c52a063f86c3a2961f316b228f74a6b11293a2e3a742343743 SHA512 0a836ccca259f9825325b26d6fe8cae2a83cb4111d0228f4657a2ad048816571abce84bb40c46c734f07a2eb830cb9070d1508976420d2f8352702b6ec7de222
+EBUILD bison-2.4.3.ebuild 1217 BLAKE2B 6b1816221134bf356151e971a34d18af2573c31f9d84f57065224f4bb23b4e0abafa948039d5236a6a4156c60399b3c62784fac3488f560a1d4208ddd386872e SHA512 244afc9c8781c3351fe701400bf5df9531209167dc3525f0b7b47a69c863fdd8b954ceb29ac4c8058d778f292b80e1da21f010ed4d78ef5c1ebaa51cebd1fdd4
 EBUILD bison-2.7.1.ebuild 1653 BLAKE2B 8c0072136a86ab5501826d826b59168a5348161db76a8b872428881c59ae62c5b2b5505775fa29167b8f7145e8bb36d1ec900b19adede4ad44339409c4b2fd62 SHA512 44a30f63ea6f1fb40eea64932c1aa1abf1dc84523fb3e9cdba9d57ee47f3ca986a45684f5849e471964096e1454ba431fdddc06509a5a4db34f95afc9c9c65b6
-EBUILD bison-3.0.4-r1.ebuild 2257 BLAKE2B 8e163740b999585e839be02cbae0e2c13527abd121167aa88a33583cdad032f2b41549ebf591b329410d54ba70e2c272c5bb223b48667c407c26dff0a33f3daa SHA512 e68bccf6eb39d5061c873420b10b0aec6d5da55440dd1a03d0ed8e507c3e483356ccb7c3b5563b90efd2894e6cb337e0ad9c5206db564ccffb51651264996b0e
+EBUILD bison-3.0.4-r1.ebuild 2354 BLAKE2B 66c7ae8e9783204e03cfda61661c2a57dbfe92245f157d89b8c5739326b3882d7e6101084f63268c3805fd81659fb608a8da5c4af35e6b462e7742bd332acedb SHA512 66cf976a1a6128f952dce2bc3996171551f847945868e22e2eae6e9cb7a77005517193b57c94d219ee1d6b48ef493f8093121e89ba61bdf469de3fa6878ec71a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-1.875d.ebuild b/sys-devel/bison/bison-1.875d.ebuild
index 522e7d85706a..4afeb739bc8f 100644
--- a/sys-devel/bison/bison-1.875d.ebuild
+++ b/sys-devel/bison/bison-1.875d.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="A yacc-compatible parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2"
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/bison/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +19,7 @@ DEPEND="sys-devel/m4
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.32-extfix.patch
+	epatch "${WORKDIR}"/${P}-patchset/${PN}-1.32-extfix.patch
 }
 
 src_compile() {
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
index fde4389df171..faed48df0515 100644
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ b/sys-devel/bison/bison-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -7,7 +7,8 @@ inherit flag-o-matic eutils
 
 DESCRIPTION="A yacc-compatible parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/bison.html"
-SRC_URI="mirror://gnu/bison/${P}.tar.bz2"
+SRC_URI="mirror://gnu/bison/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,8 +20,8 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
-	epatch "${FILESDIR}"/${P}-no-gets.patch
+	epatch "${WORKDIR}"/${P}-patchset/${P}-uclibc-sched_param-def.patch
+	epatch "${WORKDIR}"/${P}-patchset/${P}-no-gets.patch
 }
 
 src_configure() {
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 3672e2275c1f..46bac9ecda73 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -7,7 +7,8 @@ inherit flag-o-matic eutils
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,9 +25,9 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-optional-perl.patch #538300
-	epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch #632500
-	epatch "${FILESDIR}"/${P}-fix-tests-gcc-7.patch #638308
+	epatch "${WORKDIR}"/${P}-patchset/${P}-optional-perl.patch #538300
+	epatch "${WORKDIR}"/${P}-patchset/${P}-darwin17-printf-n.patch #632500
+	epatch "${WORKDIR}"/${P}-patchset/${P}-fix-tests-gcc-7.patch #638308
 	# The makefiles make the man page depend on the configure script
 	# which we patched above.  Touch it to prevent regeneration.
 	touch doc/bison.1 #548778 #538300#9
diff --git a/sys-devel/bison/files/bison-1.32-extfix.patch b/sys-devel/bison/files/bison-1.32-extfix.patch
deleted file mode 100644
index 363d038d8a52..000000000000
--- a/sys-devel/bison/files/bison-1.32-extfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2002-02-15  Gwenole Beauchesne  <gbeauchesne@mandrakesoft.com>
-
-	* src/files (compute_exts_from_gf, compute_exts_from_src): Handle
-	the case where header_extension is the same as src_extension, aka
-	handle -d -o <file> where <file> doesn't have a known EXT to
-	transform. e.g. if <file> is <something>.yxx, set the
-	header_extension to <something>.yxx.h, as would do bison 1.28.
-
---- bison-1.32/src/files.c.extfix	Mon Jan 21 16:41:46 2002
-+++ bison-1.32/src/files.c	Fri Feb 15 15:40:43 2002
-@@ -288,6 +288,8 @@ compute_exts_from_gf (const char *ext)
-   src_extension = tr (src_extension, 'Y', 'C');
-   header_extension = tr (ext, 'y', 'h');
-   header_extension = tr (header_extension, 'Y', 'H');
-+  if (!strcmp (header_extension, src_extension))
-+	header_extension = concat2 (src_extension, ".h");
- }
- 
- /* Computes extensions from the given c source file extension. */
-@@ -300,6 +302,8 @@ compute_exts_from_src (const char *ext)
-   src_extension = xstrdup (ext);
-   header_extension = tr (ext, 'c', 'h');
-   header_extension = tr (header_extension, 'C', 'H');
-+  if (!strcmp (header_extension, src_extension))
-+	header_extension = concat2 (src_extension, ".h");
- }
- 
- 
diff --git a/sys-devel/bison/files/bison-2.4.3-no-gets.patch b/sys-devel/bison/files/bison-2.4.3-no-gets.patch
deleted file mode 100644
index a49a816f4761..000000000000
--- a/sys-devel/bison/files/bison-2.4.3-no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until bizon pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch b/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch
deleted file mode 100644
index 50652d8babc2..000000000000
--- a/sys-devel/bison/files/bison-2.4.3-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-
---- m4-1.4.14/lib/spawn.in.h
-+++ m4-1.4.14/lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch b/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
deleted file mode 100644
index 1c77ed773c28..000000000000
--- a/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://lists.gnu.org/archive/html/bug-gnulib/2017-07/txtmumXtpD69v.txt
-
-extract of only the relevant hunk to avoid irrelevant conflicts
-
-From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <address@hidden>
-Date: Fri, 7 Jul 2017 14:10:20 -0700
-Subject: [PATCH] vasnprintf: port to macOS 10.13
-
-Problem reported by comex in:
-http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
-* lib/vasnprintf.c (VASNPRINTF): Don’t use %n on macOS.
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index 9c2af0e..fecaf27 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
-                   *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-+# if ! (((__GLIBC__ > 2                                                 \
-+          || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))                  \
-+         && !defined __UCLIBC__)                                        \
-+        || (defined __APPLE__ && defined __MACH__)                      \
-+        || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
-                 fbp[1] = '%';
-                 fbp[2] = 'n';
-                 fbp[3] = '\0';
diff --git a/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch b/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch
deleted file mode 100644
index 89fc5f6c39ae..000000000000
--- a/sys-devel/bison/files/bison-3.0.4-fix-tests-gcc-7.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-commit 952416114729b95209dccfc4edacfc1ff13b4e82
-Author: Akim Demaille <akim@lrde.epita.fr>
-Date:   Mon Jan 26 18:23:12 2015 +0100
-
-    tests: c++: fix symbol lookup issue
-    
-    Sun C 5.13 SunOS_sparc 2014/10/20 reports errors on tests 430-432.
-    
-    Reported by Dennis Clarke.
-    <http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00087.html>
-    
-    * tests/c++.at (Variants): Be sure to emit operator<< before using it:
-    use "%code top" rather than "%code".
-    Prefer std::vector to std::list.
-    Do not define anything in std::, to avoid undefined behavior.
-
-diff --git a/tests/c++.at b/tests/c++.at
-index 55d7d40..60292f4 100644
---- a/tests/c++.at
-+++ b/tests/c++.at
-@@ -96,7 +96,7 @@ AT_SETUP([C++ Variant-based Symbols])
- AT_KEYWORDS([variant])
- 
- AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc" %debug $1])
--# Store strings and integers in a list of strings.
-+# Store strings and integers in a vector of strings.
- AT_DATA_GRAMMAR([list.y],
- [[%skeleton "lalr1.cc"
- %define api.value.type variant
-@@ -114,20 +114,20 @@ AT_DATA_GRAMMAR([list.y],
- }
- 
- %token <int> INT "int"
--%type < std::list<int> > exp
-+%type < std::vector<int> > exp
- 
- %printer { yyo << $$; } <int>
- %printer
-   {
--    for (std::list<int>::const_iterator i = $$.begin (); i != $$.end (); ++i)
-+    for (std::vector<int>::const_iterator i = $$.begin (); i != $$.end (); ++i)
-       {
-         if (i != $$.begin ())
-           yyo << ", ";
-         yyo << *i;
-       }
--  } < std::list<int> >
-+  } < std::vector<int> >
- 
--%code requires { #include <list> }
-+%code requires { #include <vector> }
- %code { int yylex (yy::parser::semantic_type* yylval); }
- 
- %%
-@@ -185,7 +185,7 @@ m4_pushdef([AT_TEST],
- [AT_SETUP([Variants $1])
- 
- AT_BISON_OPTION_PUSHDEFS([%debug $1])
--# Store strings and integers in a list of strings.
-+# Store strings and integers in a vector of strings.
- AT_DATA_GRAMMAR([list.y],
- [[%debug
- %define api.value.type variant
-@@ -194,29 +194,25 @@ AT_DATA_GRAMMAR([list.y],
- 
- %code requires // code for the .hh file
- {
--#include <list>
-+#include <vector>
- #include <string>
--typedef std::list<std::string> strings_type;
-+typedef std::vector<std::string> strings_type;
- }
- 
--%code // code for the .cc file
-+%code top // code for the .cc file.
- {
- #include <cstdlib> // abort, getenv
- #include <iostream>
-+#include <vector>
- #include <sstream>
-+#include <string>
- 
--  namespace yy
--  {
--    static]AT_TOKEN_CTOR_IF([[
--    parser::symbol_type yylex ()]], [[
--    parser::token_type yylex (parser::semantic_type* yylval]AT_LOCATION_IF([,
--                              parser::location_type* yylloc])[)]])[;
--  }
- 
--  // Printing a list of strings (for %printer).
--  // Koening look up will look into std, since that's an std::list.
--  namespace std
-+  typedef std::vector<std::string> strings_type;
-+
-+  namespace yy
-   {
-+    // Must be available early, as is used in %destructor.
-     std::ostream&
-     operator<<(std::ostream& o, const strings_type& s)
-     {
-@@ -230,16 +226,27 @@ typedef std::list<std::string> strings_type;
-       return o << ')';
-     }
-   }
-+}
- 
--  // Conversion to string.
--  template <typename T>
--    inline
--    std::string
--    to_string (const T& t)
-+%code // code for the .cc file.
-+{
-+  namespace yy
-   {
--    std::ostringstream o;
--    o << t;
--    return o.str ();
-+    static]AT_TOKEN_CTOR_IF([[
-+    parser::symbol_type yylex ()]], [[
-+    parser::token_type yylex (parser::semantic_type* yylval]AT_LOCATION_IF([,
-+                              parser::location_type* yylloc])[)]])[;
-+
-+    // Conversion to string.
-+    template <typename T>
-+      inline
-+      std::string
-+      to_string (const T& t)
-+    {
-+      std::ostringstream o;
-+      o << t;
-+      return o.str ();
-+    }
-   }
- }
- 
-@@ -252,10 +259,10 @@ typedef std::list<std::string> strings_type;
- // Using the template type to exercize its parsing.
- // Starting with :: to ensure we don't output "<::" which starts by the
- // digraph for the left square bracket.
--%type <::std::list<std::string>> list;
-+%type <::std::vector<std::string>> list;
- 
- %printer { yyo << $$; }
--  <int> <::std::string> <::std::list<std::string>>;
-+  <int> <::std::string> <::std::vector<std::string>>;
- %destructor { std::cerr << "Destroy: " << $$ << '\n'; } <*>;
- %destructor { std::cerr << "Destroy: \"" << $$ << "\"\n"; } <::std::string>;
- %%
diff --git a/sys-devel/bison/files/bison-3.0.4-optional-perl.patch b/sys-devel/bison/files/bison-3.0.4-optional-perl.patch
deleted file mode 100644
index ba0bf7b2d5b3..000000000000
--- a/sys-devel/bison/files/bison-3.0.4-optional-perl.patch
+++ /dev/null
@@ -1,500 +0,0 @@
-https://bugs.gentoo.org/538300
-
-From 3da25ddd011c169b9857ed2f6a2e82988f059ba5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 3 Apr 2015 02:39:21 -0400
-Subject: [PATCH] make perl & examples optional
-
-The normal bison program does not require perl to build or run, so lets
-soften that requirement in the configure script.  We now warn if its not
-found, and we make the examples logic depend on that.
-
-* configure.ac: Change AC_MSG_ERROR to AC_MSG_WARN for perl.
-Add an --enable-examples flag.
-* Makefile.am: Only include examples/local.mk when ENABLE_EXAMPLES.
----
- Makefile.am  |  2 ++
- configure.ac | 21 ++++++++++++++++++++-
- 2 files changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b6135cb..50ea0a0 100644
-#--- a/Makefile.am
-#+++ b/Makefile.am
-@@ -59,7 +59,9 @@ include data/local.mk
- include djgpp/local.mk
- include doc/local.mk
- include etc/local.mk
-+if ENABLE_EXAMPLES
- include examples/local.mk
-+endif
- include lib/local.mk
- include src/local.mk
- include tests/local.mk
-diff --git a/configure.ac b/configure.ac
-index 6f20040..e67249b 100644
-#--- a/configure.ac
-#+++ b/configure.ac
-@@ -179,12 +179,31 @@ AC_DEFINE_UNQUOTED([M4_GNU_OPTION], ["$M4_GNU"], [Define to "-g" if GNU M4
- supports -g, otherwise to "".])
- AC_PATH_PROG([PERL], [perl])
- if test -z "$PERL"; then
--   AC_MSG_ERROR([perl not found])
-+  AC_MSG_WARN([perl required for the testsuites])
- fi
- AM_MISSING_PROG([HELP2MAN], [help2man])
- AC_PATH_PROG([XSLTPROC], [xsltproc])
- AC_SUBST([XSLTPROC])
- 
-+AC_ARG_ENABLE([examples],
-+  [AC_HELP_STRING([--disable-examples],
-+     [do not build and install examples])])
-+# Enable the examles by default if perl is available.
-+case $enable_examples in
-+no) ;;
-+yes)
-+  if test -z "$PERL"; then
-+    AC_MSG_ERROR([perl required for the examples])
-+  fi
-+  ;;
-+*)
-+  if test -n "$PERL"; then
-+    enable_examples=yes
-+  fi
-+  ;;
-+esac
-+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "xenable_examples" = xyes])
-+
- # Checks for header files.
- AC_CHECK_HEADERS_ONCE([locale.h])
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -248,13 +248,29 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--check_PROGRAMS = $(am__EXEEXT_1) examples/mfcalc/mfcalc$(EXEEXT) \
--	examples/rpcalc/rpcalc$(EXEEXT)
-+check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
- @CROSS_COMPILING_FALSE@am__append_1 = $(top_srcdir)/doc/bison.help
--@FLEX_CXX_WORKS_TRUE@am__append_2 = examples/calc++/calc++
--@FLEX_CXX_WORKS_TRUE@am__append_3 = examples/calc++/calc++.test
--@FLEX_CXX_WORKS_FALSE@am__append_4 = examples/calc++/calc++.test
--@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_5 = lib/uniwidth/width.c
-+@ENABLE_EXAMPLES_TRUE@am__append_2 = $(extracted) \
-+@ENABLE_EXAMPLES_TRUE@	examples/extracted.stamp \
-+@ENABLE_EXAMPLES_TRUE@	$(calcxx_sources_generated) \
-+@ENABLE_EXAMPLES_TRUE@	examples/calc++/calc++-parser.output \
-+@ENABLE_EXAMPLES_TRUE@	examples/calc++/calc++-parser.stamp \
-+@ENABLE_EXAMPLES_TRUE@	examples/calc++/calc++-scanner.cc \
-+@ENABLE_EXAMPLES_TRUE@	examples/mfcalc/mfcalc.[ch] \
-+@ENABLE_EXAMPLES_TRUE@	examples/mfcalc/mfcalc.output \
-+@ENABLE_EXAMPLES_TRUE@	examples/rpcalc/rpcalc.[ch] \
-+@ENABLE_EXAMPLES_TRUE@	examples/rpcalc/rpcalc.output
-+@ENABLE_EXAMPLES_TRUE@am__append_3 = .yy .stamp
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@am__append_4 = examples/calc++/calc++
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@am__append_5 = examples/calc++/calc++.test
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_FALSE@am__append_6 = examples/calc++/calc++.test
-+@ENABLE_EXAMPLES_TRUE@am__append_7 = $(mfcalc_sources) \
-+@ENABLE_EXAMPLES_TRUE@	$(rpcalc_sources)
-+@ENABLE_EXAMPLES_TRUE@am__append_8 = examples/mfcalc/mfcalc \
-+@ENABLE_EXAMPLES_TRUE@	examples/rpcalc/rpcalc
-+@ENABLE_EXAMPLES_TRUE@am__append_9 = examples/mfcalc/mfcalc.test \
-+@ENABLE_EXAMPLES_TRUE@	examples/rpcalc/rpcalc.test
-+@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_10 = lib/uniwidth/width.c
- bin_PROGRAMS = src/bison$(EXEEXT)
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -356,7 +372,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
--	$(am__configure_deps) $(dist_noinst_SCRIPTS) \
-+	$(am__configure_deps) $(am__dist_noinst_SCRIPTS_DIST) \
- 	$(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \
- 	$(dist_doc_DATA) $(dist_m4sugar_DATA) $(dist_pkgdata_DATA) \
- 	$(dist_xslt_DATA) $(am__DIST_COMMON)
-@@ -473,15 +489,18 @@
- @ENABLE_YACC_TRUE@am_lib_liby_a_OBJECTS = lib/main.$(OBJEXT) \
- @ENABLE_YACC_TRUE@	lib/yyerror.$(OBJEXT)
- lib_liby_a_OBJECTS = $(am_lib_liby_a_OBJECTS)
--@FLEX_CXX_WORKS_TRUE@am__EXEEXT_1 = examples/calc++/calc++$(EXEEXT)
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@am__EXEEXT_1 = examples/calc++/calc++$(EXEEXT)
-+@ENABLE_EXAMPLES_TRUE@am__EXEEXT_2 = examples/mfcalc/mfcalc$(EXEEXT) \
-+@ENABLE_EXAMPLES_TRUE@	examples/rpcalc/rpcalc$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
--am__objects_2 = examples/calc++/examples_calc___calc__-calc++-driver.$(OBJEXT) \
--	examples/calc++/examples_calc___calc__-calc++-scanner.$(OBJEXT) \
--	examples/calc++/examples_calc___calc__-calc++.$(OBJEXT)
--am__objects_3 = examples/calc++/examples_calc___calc__-calc++-parser.$(OBJEXT)
--am__objects_4 = $(am__objects_2) $(am__objects_3)
--@FLEX_CXX_WORKS_TRUE@nodist_examples_calc___calc___OBJECTS =  \
--@FLEX_CXX_WORKS_TRUE@	$(am__objects_4)
-+@ENABLE_EXAMPLES_TRUE@am__objects_2 = examples/calc++/examples_calc___calc__-calc++-driver.$(OBJEXT) \
-+@ENABLE_EXAMPLES_TRUE@	examples/calc++/examples_calc___calc__-calc++-scanner.$(OBJEXT) \
-+@ENABLE_EXAMPLES_TRUE@	examples/calc++/examples_calc___calc__-calc++.$(OBJEXT)
-+@ENABLE_EXAMPLES_TRUE@am__objects_3 = examples/calc++/examples_calc___calc__-calc++-parser.$(OBJEXT)
-+@ENABLE_EXAMPLES_TRUE@am__objects_4 = $(am__objects_2) \
-+@ENABLE_EXAMPLES_TRUE@	$(am__objects_3)
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@nodist_examples_calc___calc___OBJECTS =  \
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@	$(am__objects_4)
- examples_calc___calc___OBJECTS =  \
- 	$(nodist_examples_calc___calc___OBJECTS)
- examples_calc___calc___LDADD = $(LDADD)
-@@ -490,17 +509,17 @@
- examples_calc___calc___LINK = $(CXXLD) \
- 	$(examples_calc___calc___CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--am__objects_5 =  \
--	examples/mfcalc/examples_mfcalc_mfcalc-mfcalc.$(OBJEXT)
--am__objects_6 = $(am__objects_5)
--nodist_examples_mfcalc_mfcalc_OBJECTS = $(am__objects_6)
-+@ENABLE_EXAMPLES_TRUE@am__objects_5 = examples/mfcalc/examples_mfcalc_mfcalc-mfcalc.$(OBJEXT)
-+@ENABLE_EXAMPLES_TRUE@am__objects_6 = $(am__objects_5)
-+@ENABLE_EXAMPLES_TRUE@nodist_examples_mfcalc_mfcalc_OBJECTS =  \
-+@ENABLE_EXAMPLES_TRUE@	$(am__objects_6)
- examples_mfcalc_mfcalc_OBJECTS =  \
- 	$(nodist_examples_mfcalc_mfcalc_OBJECTS)
- examples_mfcalc_mfcalc_DEPENDENCIES =
--am__objects_7 =  \
--	examples/rpcalc/examples_rpcalc_rpcalc-rpcalc.$(OBJEXT)
--am__objects_8 = $(am__objects_7)
--nodist_examples_rpcalc_rpcalc_OBJECTS = $(am__objects_8)
-+@ENABLE_EXAMPLES_TRUE@am__objects_7 = examples/rpcalc/examples_rpcalc_rpcalc-rpcalc.$(OBJEXT)
-+@ENABLE_EXAMPLES_TRUE@am__objects_8 = $(am__objects_7)
-+@ENABLE_EXAMPLES_TRUE@nodist_examples_rpcalc_rpcalc_OBJECTS =  \
-+@ENABLE_EXAMPLES_TRUE@	$(am__objects_8)
- examples_rpcalc_rpcalc_OBJECTS =  \
- 	$(nodist_examples_rpcalc_rpcalc_OBJECTS)
- examples_rpcalc_rpcalc_DEPENDENCIES =
-@@ -528,6 +547,7 @@
- src_bison_DEPENDENCIES = lib/libbison.a $(am__DEPENDENCIES_1)
- src_bison_LINK = $(CCLD) $(src_bison_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
-+am__dist_noinst_SCRIPTS_DIST = examples/extexi examples/test
- SCRIPTS = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) \
- 	$(nodist_noinst_SCRIPTS)
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -2145,7 +2165,7 @@
- 	djgpp/subpipe.h djgpp/testsuite.sed doc/refcard.tex \
- 	$(top_srcdir)/doc/bison.help $(dist_man_MANS:.1=.x) $(FIGS_GV) \
- 	$(FIGS_GV:.gv=.txt) $(FIGS_GV:.gv=.eps) $(FIGS_GV:.gv=.pdf) \
--	$(FIGS_GV:.gv=.png) doc/Doxyfile.in $(am__append_4) \
-+	$(FIGS_GV:.gv=.png) doc/Doxyfile.in $(am__append_6) \
- 	lib/alignof.h lib/alloca.in.h \
- 	$(top_srcdir)/build-aux/announce-gen lib/argmatch.h \
- 	lib/c-strcaseeq.h lib/calloc.c lib/cloexec.h lib/close.c \
-@@ -2249,27 +2269,20 @@
- # a developer might naively reference .version in a test case while the bison
- # executable still compiles with VERSION, and so the test case might fail or
- # pass incorrectly.
--BUILT_SOURCES = $(mfcalc_sources) $(rpcalc_sources) $(ALLOCA_H) \
--	lib/configmake.h $(ERRNO_H) lib/fcntl.h $(FLOAT_H) $(GETOPT_H) \
--	lib/inttypes.h lib/math.h $(SCHED_H) lib/signal.h \
--	lib/arg-nonnull.h lib/c++defs.h lib/warn-on-use.h lib/spawn.h \
--	$(STDBOOL_H) $(STDDEF_H) $(STDINT_H) lib/stdio.h lib/stdlib.h \
--	lib/string.h lib/sys/stat.h lib/sys/time.h lib/sys/types.h \
--	lib/sys/wait.h lib/time.h lib/unistd.h \
--	$(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) \
--	lib/wchar.h lib/wctype.h src/parse-gram.c src/parse-gram.h \
--	src/scan-code.c src/scan-gram.c src/scan-skel.c \
--	$(top_srcdir)/.version
-+BUILT_SOURCES = $(am__append_7) $(ALLOCA_H) lib/configmake.h \
-+	$(ERRNO_H) lib/fcntl.h $(FLOAT_H) $(GETOPT_H) lib/inttypes.h \
-+	lib/math.h $(SCHED_H) lib/signal.h lib/arg-nonnull.h \
-+	lib/c++defs.h lib/warn-on-use.h lib/spawn.h $(STDBOOL_H) \
-+	$(STDDEF_H) $(STDINT_H) lib/stdio.h lib/stdlib.h lib/string.h \
-+	lib/sys/stat.h lib/sys/time.h lib/sys/types.h lib/sys/wait.h \
-+	lib/time.h lib/unistd.h $(LIBUNISTRING_UNITYPES_H) \
-+	$(LIBUNISTRING_UNIWIDTH_H) lib/wchar.h lib/wctype.h \
-+	src/parse-gram.c src/parse-gram.h src/scan-code.c \
-+	src/scan-gram.c src/scan-skel.c $(top_srcdir)/.version
- CLEANFILES = doc/refcard.pdf $(FIGS_GV:.gv=.eps) $(FIGS_GV:.gv=.pdf) \
--	$(FIGS_GV:.gv=.png) doc/Doxyfile $(extracted) \
--	examples/extracted.stamp $(calcxx_sources_generated) \
--	examples/calc++/calc++-parser.output \
--	examples/calc++/calc++-parser.stamp \
--	examples/calc++/calc++-scanner.cc examples/mfcalc/mfcalc.[ch] \
--	examples/mfcalc/mfcalc.output examples/rpcalc/rpcalc.[ch] \
--	examples/rpcalc/rpcalc.output lib/configmake.h \
--	lib/configmake.h-t lib/charset.alias lib/ref-add.sed \
--	lib/ref-del.sed
-+	$(FIGS_GV:.gv=.png) doc/Doxyfile $(am__append_2) \
-+	lib/configmake.h lib/configmake.h-t lib/charset.alias \
-+	lib/ref-add.sed lib/ref-del.sed
- DISTCLEANFILES = tests/atconfig $(check_SCRIPTS)
- MOSTLYCLEANDIRS = lib/sys lib/sys
- MOSTLYCLEANFILES = $(top_srcdir)/doc/*.t lib/core lib/*.stackdump \
-@@ -2289,10 +2302,9 @@
- 	lib/unistd.h-t lib/unitypes.h lib/unitypes.h-t lib/uniwidth.h \
- 	lib/uniwidth.h-t lib/wchar.h lib/wchar.h-t lib/wctype.h \
- 	lib/wctype.h-t src/yacc
--SUFFIXES = .gv .eps .pdf .png .yy .stamp
-+SUFFIXES = .gv .eps .pdf .png $(am__append_3)
- TESTS = $(dist_TESTS)
--dist_TESTS = $(am__append_3) examples/mfcalc/mfcalc.test \
--	examples/rpcalc/rpcalc.test
-+dist_TESTS = $(am__append_5) $(am__append_9)
- noinst_LIBRARIES = lib/libbison.a
- dist_pkgdata_DATA = \
-   data/README                                   \
-@@ -2364,59 +2376,59 @@
- 	   -e 's,@top_srcdir\@,$(top_srcdir),g'
- 
- nodist_noinst_SCRIPTS = etc/bench.pl
--dist_noinst_SCRIPTS = examples/extexi examples/test
--TEST_LOG_COMPILER = $(top_srcdir)/examples/test
--AM_CXXFLAGS = \
--  $(WARN_CXXFLAGS) $(WARN_CXXFLAGS_TEST) $(WERROR_CXXFLAGS)
--
--doc = $(top_srcdir)/doc/bison.texi
--extexi = $(top_srcdir)/examples/extexi
--@ENABLE_GCC_WARNINGS_TRUE@extexiFLAGS = --synclines
--extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(extexiFLAGS) $(doc) --
--extracted = $(calcxx_extracted) $(mfcalc_extracted) \
--	$(rpcalc_extracted)
--calcxx_sources_extracted = \
--  examples/calc++/calc++-driver.cc                          \
--  examples/calc++/calc++-driver.hh                          \
--  examples/calc++/calc++-scanner.ll                         \
--  examples/calc++/calc++.cc
--
--calcxx_extracted = \
--  $(calcxx_sources_extracted)                   \
--  examples/calc++/calc++-parser.yy
--
--calcxx_sources_generated = \
--  examples/calc++/calc++-parser.cc                          \
--  examples/calc++/calc++-parser.hh                          \
--  examples/calc++/location.hh                               \
--  examples/calc++/position.hh                               \
--  examples/calc++/stack.hh
--
--calcxx_sources = \
--  $(calcxx_sources_extracted)                   \
--  $(calcxx_sources_generated)
--
--@FLEX_CXX_WORKS_TRUE@nodist_examples_calc___calc___SOURCES = \
--@FLEX_CXX_WORKS_TRUE@  $(calcxx_sources)
--
--@FLEX_CXX_WORKS_TRUE@examples_calc___calc___CPPFLAGS = -I$(top_builddir)/examples/calc++
--@FLEX_CXX_WORKS_TRUE@examples_calc___calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
--calcxxdir = $(docdir)/examples/calc++
--calcxx_DATA = $(calcxx_extracted)
--mfcalc_extracted = examples/mfcalc/calc.h examples/mfcalc/mfcalc.y
--mfcalc_sources = $(mfcalc_extracted)
--examples_mfcalc_mfcalc_LDADD = -lm
--nodist_examples_mfcalc_mfcalc_SOURCES = $(mfcalc_sources)
--examples_mfcalc_mfcalc_CPPFLAGS = -I$(top_builddir)/examples/mfcalc
--mfcalcdir = $(docdir)/examples/mfcalc
--mfcalc_DATA = $(mfcalc_extracted)
--rpcalc_extracted = examples/rpcalc/rpcalc.y
--rpcalc_sources = $(rpcalc_extracted)
--examples_rpcalc_rpcalc_LDADD = -lm
--nodist_examples_rpcalc_rpcalc_SOURCES = $(rpcalc_sources)
--examples_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/rpcalc
--rpcalcdir = $(docdir)/examples/rpcalc
--rpcalc_DATA = $(rpcalc_extracted)
-+@ENABLE_EXAMPLES_TRUE@dist_noinst_SCRIPTS = examples/extexi examples/test
-+@ENABLE_EXAMPLES_TRUE@TEST_LOG_COMPILER = $(top_srcdir)/examples/test
-+@ENABLE_EXAMPLES_TRUE@AM_CXXFLAGS = \
-+@ENABLE_EXAMPLES_TRUE@  $(WARN_CXXFLAGS) $(WARN_CXXFLAGS_TEST) $(WERROR_CXXFLAGS)
-+
-+@ENABLE_EXAMPLES_TRUE@doc = $(top_srcdir)/doc/bison.texi
-+@ENABLE_EXAMPLES_TRUE@extexi = $(top_srcdir)/examples/extexi
-+@ENABLE_EXAMPLES_TRUE@@ENABLE_GCC_WARNINGS_TRUE@extexiFLAGS = --synclines
-+@ENABLE_EXAMPLES_TRUE@extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(extexiFLAGS) $(doc) --
-+@ENABLE_EXAMPLES_TRUE@extracted = $(calcxx_extracted) \
-+@ENABLE_EXAMPLES_TRUE@	$(mfcalc_extracted) $(rpcalc_extracted)
-+@ENABLE_EXAMPLES_TRUE@calcxx_sources_extracted = \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-driver.cc                          \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-driver.hh                          \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-scanner.ll                         \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++.cc
-+
-+@ENABLE_EXAMPLES_TRUE@calcxx_extracted = \
-+@ENABLE_EXAMPLES_TRUE@  $(calcxx_sources_extracted)                   \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-parser.yy
-+
-+@ENABLE_EXAMPLES_TRUE@calcxx_sources_generated = \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-parser.cc                          \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/calc++-parser.hh                          \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/location.hh                               \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/position.hh                               \
-+@ENABLE_EXAMPLES_TRUE@  examples/calc++/stack.hh
-+
-+@ENABLE_EXAMPLES_TRUE@calcxx_sources = \
-+@ENABLE_EXAMPLES_TRUE@  $(calcxx_sources_extracted)                   \
-+@ENABLE_EXAMPLES_TRUE@  $(calcxx_sources_generated)
-+
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@nodist_examples_calc___calc___SOURCES = \
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@  $(calcxx_sources)
-+
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@examples_calc___calc___CPPFLAGS = -I$(top_builddir)/examples/calc++
-+@ENABLE_EXAMPLES_TRUE@@FLEX_CXX_WORKS_TRUE@examples_calc___calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
-+@ENABLE_EXAMPLES_TRUE@calcxxdir = $(docdir)/examples/calc++
-+@ENABLE_EXAMPLES_TRUE@calcxx_DATA = $(calcxx_extracted)
-+@ENABLE_EXAMPLES_TRUE@mfcalc_extracted = examples/mfcalc/calc.h examples/mfcalc/mfcalc.y
-+@ENABLE_EXAMPLES_TRUE@mfcalc_sources = $(mfcalc_extracted)
-+@ENABLE_EXAMPLES_TRUE@examples_mfcalc_mfcalc_LDADD = -lm
-+@ENABLE_EXAMPLES_TRUE@nodist_examples_mfcalc_mfcalc_SOURCES = $(mfcalc_sources)
-+@ENABLE_EXAMPLES_TRUE@examples_mfcalc_mfcalc_CPPFLAGS = -I$(top_builddir)/examples/mfcalc
-+@ENABLE_EXAMPLES_TRUE@mfcalcdir = $(docdir)/examples/mfcalc
-+@ENABLE_EXAMPLES_TRUE@mfcalc_DATA = $(mfcalc_extracted)
-+@ENABLE_EXAMPLES_TRUE@rpcalc_extracted = examples/rpcalc/rpcalc.y
-+@ENABLE_EXAMPLES_TRUE@rpcalc_sources = $(rpcalc_extracted)
-+@ENABLE_EXAMPLES_TRUE@examples_rpcalc_rpcalc_LDADD = -lm
-+@ENABLE_EXAMPLES_TRUE@nodist_examples_rpcalc_rpcalc_SOURCES = $(rpcalc_sources)
-+@ENABLE_EXAMPLES_TRUE@examples_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/rpcalc
-+@ENABLE_EXAMPLES_TRUE@rpcalcdir = $(docdir)/examples/rpcalc
-+@ENABLE_EXAMPLES_TRUE@rpcalc_DATA = $(rpcalc_extracted)
- 
- # Implementation of bitsets.
- 
-@@ -2441,7 +2453,7 @@
- 	lib/progname.c lib/quotearg.c lib/sig-handler.c lib/size_max.h \
- 	lib/spawn-pipe.h lib/spawn-pipe.c lib/w32spawn.h \
- 	lib/glthread/threadlib.c lib/unistd.c lib/dup-safer.c \
--	lib/fd-safer.c lib/pipe-safer.c $(am__append_5) \
-+	lib/fd-safer.c lib/pipe-safer.c $(am__append_10) \
- 	lib/wait-process.h lib/wait-process.c lib/wctype-h.c \
- 	lib/xmalloc.c lib/xalloc-die.c lib/xconcat-filename.c \
- 	lib/xsize.h lib/xsize.c lib/xstrndup.h lib/xstrndup.c \
-@@ -5328,31 +5340,31 @@
- # configure, because the former is way faster than the latter.
- doc/Doxyfile: $(top_srcdir)/doc/Doxyfile.in
- 	$(AM_V_GEN) $(edit) $(top_srcdir)/doc/Doxyfile.in >doc/Doxyfile
--examples/extracted.stamp: $(doc) $(extexi)
--	$(AM_V_GEN)rm -f $@ $@.tmp
--	$(AM_V_at)touch $@.tmp
--	$(AM_V_at)$(extract) $(extracted)
--	$(AM_V_at)mv $@.tmp $@
--
--$(extracted): examples/extracted.stamp
--	@test -f $@ || rm -f examples/extracted.stamp
--	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/extracted.stamp
-+@ENABLE_EXAMPLES_TRUE@examples/extracted.stamp: $(doc) $(extexi)
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_GEN)rm -f $@ $@.tmp
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)touch $@.tmp
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)$(extract) $(extracted)
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)mv $@.tmp $@
-+
-+@ENABLE_EXAMPLES_TRUE@$(extracted): examples/extracted.stamp
-+@ENABLE_EXAMPLES_TRUE@	@test -f $@ || rm -f examples/extracted.stamp
-+@ENABLE_EXAMPLES_TRUE@	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/extracted.stamp
- 
- # Don't depend on $(BISON) otherwise we would rebuild these files
- # in srcdir, including during distcheck, which is forbidden.
--examples/calc++/calc++-parser.stamp: $(BISON_IN)
--.yy.stamp:
--	$(AM_V_YACC)rm -f $@
--	$(AM_V_at)touch $@.tmp
--	$(AM_V_at)$(YACCCOMPILE) -o $*.cc $<
--	$(AM_V_at)mv -f $@.tmp $@
--
--$(calcxx_sources_generated): examples/calc++/calc++-parser.stamp
--	@test -f $@ || rm -f examples/calc++/calc++-parser.stamp
--	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/calc++/calc++-parser.stamp
-+@ENABLE_EXAMPLES_TRUE@examples/calc++/calc++-parser.stamp: $(BISON_IN)
-+@ENABLE_EXAMPLES_TRUE@.yy.stamp:
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_YACC)rm -f $@
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)touch $@.tmp
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)$(YACCCOMPILE) -o $*.cc $<
-+@ENABLE_EXAMPLES_TRUE@	$(AM_V_at)mv -f $@.tmp $@
-+
-+@ENABLE_EXAMPLES_TRUE@$(calcxx_sources_generated): examples/calc++/calc++-parser.stamp
-+@ENABLE_EXAMPLES_TRUE@	@test -f $@ || rm -f examples/calc++/calc++-parser.stamp
-+@ENABLE_EXAMPLES_TRUE@	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) examples/calc++/calc++-parser.stamp
- 
- # Avoid using BUILT_SOURCES which is too global.
--$(examples_calc___calc___OBJECTS): $(calcxx_sources_generated)
-+@ENABLE_EXAMPLES_TRUE@$(examples_calc___calc___OBJECTS): $(calcxx_sources_generated)
- 
- # We need the following in order to create <alloca.h> when the system
- # doesn't have one that works with the given compiler.
---- a/configure
-+++ b/configure
-@@ -1693,6 +1693,8 @@
- ALLOCA
- GL_COND_LIBTOOL_FALSE
- GL_COND_LIBTOOL_TRUE
-+ENABLE_EXAMPLES_FALSE
-+ENABLE_EXAMPLES_TRUE
- XSLTPROC
- HELP2MAN
- PERL
-@@ -1837,6 +1839,7 @@
- enable_threads
- enable_gcc_warnings
- enable_yacc
-+enable_examples
- enable_assert
- with_gnu_ld
- enable_rpath
-@@ -2493,6 +2496,7 @@
-                            Also, issue synclines from the examples/ to
-                            the corresponding source in the Texinfo doc.
-   --disable-yacc          do not build a yacc command or an -ly library
-+  --disable-examples      do not build and install examples
-   --disable-assert        turn off assertions
-   --disable-rpath         do not hardcode runtime library paths
-   --disable-nls           do not use Native Language Support
-@@ -8935,7 +8939,8 @@
- 
- 
- if test -z "$PERL"; then
--   as_fn_error $? "perl not found" "$LINENO" 5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl required for the testsuites" >&5
-+$as_echo "$as_me: WARNING: perl required for the testsuites" >&2;}
- fi
- 
- HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
-@@ -8982,6 +8987,34 @@
- 
- 
- 
-+# Check whether --enable-examples was given.
-+if test "${enable_examples+set}" = set; then :
-+  enableval=$enable_examples;
-+fi
-+
-+# Enable the examles by default if perl is available.
-+case $enable_examples in
-+no) ;;
-+yes)
-+  if test -z "$PERL"; then
-+    as_fn_error $? "perl required for the examples" "$LINENO" 5
-+  fi
-+  ;;
-+*)
-+  if test -n "$PERL"; then
-+    enable_examples=yes
-+  fi
-+  ;;
-+esac
-+ if test "xenable_examples" = xyes; then
-+  ENABLE_EXAMPLES_TRUE=
-+  ENABLE_EXAMPLES_FALSE='#'
-+else
-+  ENABLE_EXAMPLES_TRUE='#'
-+  ENABLE_EXAMPLES_FALSE=
-+fi
-+
-+
- # Checks for header files.
- 
- 
-@@ -38129,6 +38162,10 @@
-   as_fn_error $? "conditional \"FLEX_CXX_WORKS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${ENABLE_EXAMPLES_TRUE}" && test -z "${ENABLE_EXAMPLES_FALSE}"; then
-+  as_fn_error $? "conditional \"ENABLE_EXAMPLES\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-   as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
--- 
-2.3.4