gentoo resync : 15.11.2017

3 files changed, 33 insertions, 1 deletions

diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 71a6c264bffb..a086f3fd85f9 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,6 +1,7 @@
 AUX bison-1.32-extfix.patch 1170 SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4 SHA512 6f98d6ea4d6564c3890ede54994654af87d79a87e615e03856a71f3470876fe42768deeabe31f9393531a35619a7e00844ff2a3d87214754cfd04a25d591cc57 WHIRLPOOL 800744be43d9dc39ba4c7cba4342ee5c2360cf9792c0ff5971da91fe78df85358ac1b7cab5c32244898b69ced352ce159685daa80cf32317db4ab92610b2153d
 AUX bison-2.4.3-no-gets.patch 780 SHA256 aae4bb53fa827685a1005b48b3149cb96b83feb43ba104d5da6ef223676cef70 SHA512 cf7d60c143bf27a546c6fa04f08b58b0c297996f25fe28e85863795f51040772a85316ca1464204a84630322df16893d636331b7e4953f6c1718d680a5bc827b WHIRLPOOL 4415b7eebe6df47638df1c7f5c864a4296af0eddc18d56ccc24f926db48fb78699d3a864d08648867f06cfea88a3fc745bbd87865469c559f96b2b199cf24a75
 AUX bison-2.4.3-uclibc-sched_param-def.patch 580 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9 SHA512 87a49e69aec0b36313132fc7a9fb520016e4dc4399a9af9a91636a588326825de3a65dd6bcdda8de20e364ec163afcb41b0453f09ce4102d179ce04279c8654d WHIRLPOOL 5f0d690078d004231d31adcbdea98c3f3059c60265595ac46cbb0d4e45638ae9e54c9ee08040842d278a4ddadd5744a6bce19753475978cf7360ce8bf2be9d7b
+AUX bison-3.0.4-darwin17-printf-n.patch 1386 SHA256 6e000129fb9c4554a1aee084e2cba384ae54e91e2ef3ec3f78788500466073ad SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf WHIRLPOOL 5eb88e1b9cdacda019fdf262c3896a25f060b38f762399576b63907f7898eb46fd412d90e5b06fdc94d98b59296a34fb4b944b84548d16e11b7ccc17d6dd75b9
 AUX bison-3.0.4-optional-perl.patch 21963 SHA256 9fc611ebc3714aa9d517909f1ca49ada6786569e1a816cb2a71991f122033dbb SHA512 d118dcf8a104edf5d81b7f96254b15f6fef1332c7957c5cc3a484d3295436afa166c249acf4fa8834c5f194daa3fbfae79c0168b0fa980a4cb8de537c5b3e3cf WHIRLPOOL 3207d2396ef2dbcb5eb0a283a45cc64e84f79443921260008de783693e84894a877ec1f073aebcb19586ce76eeffab5498a57441c4b5266b06ee680317b0d46b
 DIST bison-1.875d.tar.bz2 882745 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808 SHA512 f84c6cf41a289ea7e0805cf9b0da6fe2d77f2e03a35c3db7d2e36e5186bba7c0853c3d518bd89f6cfa1030e346e046aa03b33974bb892dbd8f040e5ea2de1126 WHIRLPOOL 213e02b33b4cd65c4c8ad5a37b77cce75a366e1d5ad0837887763c75c5e30eb3d85b7ba8eb71ed86bb86fb3e23624a7c627558f492778ec29e6e79fd30e7c902
 DIST bison-2.4.3.tar.bz2 1652612 SHA256 935302ef194c7f0974fed913eaac8100be512094eab573cf0b67bdf7db1d3a05 SHA512 b789f55d9cb95c1b4fba004691ed9f79b76da55020c9b202e1704a02aab1ba43b9fc1015e29843ed552e6df6165cef9c6ebc8a29d15a21c6e194cad8a42ab055 WHIRLPOOL 0e0e61970a791e53afc6cc85f53cebf0050d885077dd9b2394d79549bac389ffa7e477e003525556858b6fa64c11ce93653bba1c861bd2acd67f85181e167558
@@ -9,7 +10,7 @@ DIST bison-3.0.4.tar.xz 1973796 SHA256 a72428c7917bdf9fa93cb8181c971b6e228341258
 EBUILD bison-1.875d.ebuild 1678 SHA256 a66818b08b6671d95c7acdf9e5f59f5899eae006831c820b6f6f6f62d201cdc6 SHA512 5990adcb955692a75ef33de6b2699cd4d4577ffb002886ce09f6eafcb45cff25da5ef3e3e0940b0e3b160314cccf3ceb750883a448874cab0c58283a724591fd WHIRLPOOL 44d6569fc6015fafca8cf1e88b45776085b80e6f5beeeb9024a1008c4f414ec9d3fe19e38d8eb8b70fb5aa9e6476631ccd791c2a0fcd91c26030585d67b4a988
 EBUILD bison-2.4.3.ebuild 1132 SHA256 868cd13f372b13570d13a0ade679ef182d415cf13f9e5568f11587b7568acb36 SHA512 c51aa2d4be14a3b1cff50a751ae842c80f1e8d7d1959e99e58f56ee66506628a5acce5a320273b66bcd32fc6ed559e9cb1141c010fc2279222b0b89ee9963fad WHIRLPOOL bcb365cee05343327c3ed423e80d0107a54e5af67093275b84e2f5ac3ec98b9f12baa27f124dbb8a55db4d68d6e841add281192673558ea0d4bb7cbbf21a3e50
 EBUILD bison-2.7.1.ebuild 1653 SHA256 466600836e5266c4dedf385d3234ac2d4454507da06a2fba027cffd6b3b60681 SHA512 44a30f63ea6f1fb40eea64932c1aa1abf1dc84523fb3e9cdba9d57ee47f3ca986a45684f5849e471964096e1454ba431fdddc06509a5a4db34f95afc9c9c65b6 WHIRLPOOL 44ef3807ae1ac876f4203c5010b1823a764cdb92b3e96d36ce68c83b3c6378a5dfac45f374a141bebe59c5127a6ffe17b799a37990bae5f4f0ffddd844f8f33c
-EBUILD bison-3.0.4-r1.ebuild 2141 SHA256 fc67bf4486a790b0a11ca1673550c640a2c668eab2cea126c3be83b0faffec2d SHA512 c647e4bf58c04f014734812308ceaae9882ea435f757988951c93c3e10a874cf92dc06bb1c9a6a3a4b3bc613dd02fc36d4cc7dba45b80a3fa85dc0c60d17cd93 WHIRLPOOL c67fcdba28876a99a79c63cc23ddc48127d2da3e3df11bbccd1d163bbf89a81cde536d134b1d213faef3e65375d1d5381ec3719a350945d8d4a9ad2e8aad16b6
+EBUILD bison-3.0.4-r1.ebuild 2200 SHA256 9ab54b02390a0c885fc9c8834e2837569f7bcd1524de06fcb2ebaaa4f42fe533 SHA512 387d05ecdfd1d70f0efa8bf2abbc319e460c14b152dfe14eb16d92d0770c529007ccca27c139edbf79a07795c5f4f2db7042392c65f47408aaaaf75600bcd865 WHIRLPOOL 3e659820ec0f2e16cfacab07c8cfa112c315d9928996ed48da72e91309d6eb0d2694947b2755a92bb71b0972c371b74374eb5f3c479d7e239bb3023bfbfcad6b
 MISC ChangeLog 7389 SHA256 78612d9f0bce63cbcd090179ea5608bacc2bc8bd041dc0486613cd9421725fc8 SHA512 2350932496a8ff0865dd37186fbfdf2200f96e1bf92905af9b95cdb60c62ffb8a5c29bfab2c039cfb442255e0056826f6b8a84f0ff0ced75c0870e5331020e89 WHIRLPOOL e8963ba97de2be11aae62a3fad736598e8ee1593231c07ded7dfa4797ea2b0858a134dd639f94e88a18f272cebe0e497814bced2e21cac2d04837856d83b73a8
 MISC ChangeLog-2015 18504 SHA256 4b44263ef1e0376eb0eeac6c870eeea6edc802ceaf8a7fdaca666243421826f2 SHA512 30f97a294909375d34890968330bf433eea7a160468c2b4281925d4d3697b5acb5616fd7398cc4b14652f68c3c1889ba2fb2605dbd931112ad1dc0aaf37c25d6 WHIRLPOOL c45485beb8745ba15fd261d9c25e548c9a2c1fe129e4e1614c59291d1b859a30221dadc1efb042220a47eb662ed75a3f9bd208e4fe8628178eceec595536c433
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index c20e7436f012..ab8dcc62aa61 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -25,6 +25,7 @@ DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGI
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-optional-perl.patch #538300
+	epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch #632500
 	# 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-3.0.4-darwin17-printf-n.patch b/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
new file mode 100644
index 000000000000..1c77ed773c28
--- /dev/null
+++ b/sys-devel/bison/files/bison-3.0.4-darwin17-printf-n.patch
@@ -0,0 +1,30 @@
+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';