gentoo resync : 15.11.2017

3 files changed, 39 insertions, 1 deletions

diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index e563a77950a7..2bef471bacd1 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,8 +1,9 @@
 AUX m4-1.4.17-posix_spawn.patch 3302 SHA256 7034930fea8163d0822c5b9ffc4d7c45827196b55a11c4c5d3997d1e8d5d7d03 SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8 WHIRLPOOL a8dddbbf8a2d67c2b04315bb176ae0c8446bfe226c2d2afc3c15b63180b7242efb39bf4430d555ee79ba9a965df3d5d61affd9b7981e6541832a13cf0000debe
+AUX m4-1.4.18-darwin17-printf-n.patch 1386 SHA256 6e000129fb9c4554a1aee084e2cba384ae54e91e2ef3ec3f78788500466073ad SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf WHIRLPOOL 5eb88e1b9cdacda019fdf262c3896a25f060b38f762399576b63907f7898eb46fd412d90e5b06fdc94d98b59296a34fb4b944b84548d16e11b7ccc17d6dd75b9
 DIST m4-1.4.17.tar.xz 1149088 SHA256 f0543c3beb51fa6b3337d8025331591e0e18d8ec2886ed391f1aade43477d508 SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389 WHIRLPOOL 69a9f9129dd2f2fd0f5d61771cbac2208f10aa83e0d42fe4213eb10283cc68ce1a96717aece99e92890a4135eb7e201c638d4d9bc17ac10026b0989f3a64940e
 DIST m4-1.4.18.tar.xz 1207688 SHA256 f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174 WHIRLPOOL bed79746e774e17c8487e0e1c02e62d961dfcdeb3ed0852fb948b77b5baf7b7d35bcf69d6d0d01ff5e8f873fffd0dadc92ebdfcf31bf87ac302e3cfb0e6ce497
 EBUILD m4-1.4.17.ebuild 1643 SHA256 c5773e0d2a9b7be3f114416197fb99e05361b6f6990efd3e0f7157b40fe59774 SHA512 223ec6c3666c28c0e96457ad7589733266d97022049d43e9b55066061b518b36701e90d4dd24b8e1b1b5cbc386e788e1f0596361587fc34faf3e7d7679378db4 WHIRLPOOL 7fd76ba1e67484ac739f19e605e51e1d9cf770a6ad43eb5d6a542ad7af9542aa260f12bc9584c75bb769c7db77b8bdbe96aea0bc28ca193032352faeaa79d3fb
-EBUILD m4-1.4.18.ebuild 1330 SHA256 bc0575ba5d70bbdf337f6dd3192da516f9c7ea9ec51e9f7a3455aa37771bdc42 SHA512 f586369b9e09566f6b8391891426171d8d04367afe046a894c477c7b2dc00e4679d4fa02a5b96d1dc627a59a3dc858d610add7d19019c3f371874101b7a99662 WHIRLPOOL 2461e37da43030dbdb598fb1fc94103bd0628af8d4f895b68bc78cb8cbb36238f7a416a5239e5ec299b340ec61916bbe34835885ccc7752a6410271de09b3650
+EBUILD m4-1.4.18.ebuild 1425 SHA256 2a253adb755ed5140e6a37d2b08f8cc4a9bae72de3155fe6ea231ce6cb053f56 SHA512 18be33c49542353bb56aee2522288d5ba3b9c0702b72fa25bdf7ff05bee3781655e9267e43d364370ef41a0dfefec8ec7c83cfc12067539d77f68d205798226f WHIRLPOOL 57c1610751a64a1ec3b488d6049b278f5aeaf2462f0bd99fd66992ce6a13acfece6466bbf31b7cbc2a4ebcfe5a6f299a456e0bc16cc201f72cbe5337defe1e6a
 MISC ChangeLog 5193 SHA256 cd67f5c0f2818f57843c1314f9439d96e443a5b6f80b227a82d5fa90765f6df9 SHA512 382d2c6c156cc769de049ef701c3e89da0f992f69c1a08c43f0d350726773018846cf22702bd04babac13e76965062c02ff6c1cb2e96798d952a07ae5869a7f9 WHIRLPOOL acca90d60c552c5df77d7b89a857957c10a32762ef01f700cdc1ce43d63f276aa70a73321ba0280bf239186cabda192dbe41643b5f17d092a06ce6b07ac0b9a1
 MISC ChangeLog-2015 18924 SHA256 3d1673cdcb3eec99cc4dcf8b76223b51d4e92eb56b077ef52b476a4b43c06e1f SHA512 17ad92e1511ef447887505dd070d59538db0cb2dd9f06b4bb8ca956c5a5e80330a78bfe991939c4b519b8d099f978d91a9469cc02f41f599f386a374faab24a8 WHIRLPOOL 00448515d37ecf62b8961eb0a03c04e5325803fce673a8c7cc621a1343498e6375fcd4170dac82c71ff3fa02a44cd865ecd3fe8528cde753b54379a4669d85b1
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch b/sys-devel/m4/files/m4-1.4.18-darwin17-printf-n.patch
new file mode 100644
index 000000000000..1c77ed773c28
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.18-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';
diff --git a/sys-devel/m4/m4-1.4.18.ebuild b/sys-devel/m4/m4-1.4.18.ebuild
index 1bb440ec6f2a..f249374d1d2b 100644
--- a/sys-devel/m4/m4-1.4.18.ebuild
+++ b/sys-devel/m4/m4-1.4.18.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="5"
 
+inherit eutils
+
 DESCRIPTION="GNU macro processor"
 HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
@@ -16,6 +18,11 @@ IUSE="examples"
 DEPEND="app-arch/xz-utils"
 RDEPEND=""
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin17-printf-n.patch
+	default
+}
+
 src_configure() {
 	# Disable automagic dependency over libsigsegv; see bug #278026
 	export ac_cv_libsigsegv=no