gentoo resync : 03.01.2018

3 files changed, 29 insertions, 2 deletions

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 01eaa203ccfc..7c66f4940ac9 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -5,6 +5,7 @@ AUX gmp-4.2.1-s390.diff 1848 BLAKE2B 9c7a36b5b203dd5c66084d42bbfb0800269a9c2f534
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
 AUX gmp-6.1.0-tune-printf.patch 1339 BLAKE2B 679ed2bf85e868898a64b79df13ac7ad0a43cd305215c0e8dbcb82d54784334da444d1513707a051a51a9724f2a51300cba8029aa9cb041e922650c65e17fe17 SHA512 da9dc4f6c63d5cc4b80899acacb23d7060b6042aa26dd80f5d5d73768a129360cb75efd6d2695c22958800776ba336b4c4bedd0839d4621ac3cea7ce0047ea07
 AUX gmp-6.1.0-udiv.patch 1737 BLAKE2B 4cedd0d06bbceba3bee7317d7353affd9f758b4fa0ef8d47909c902582bddf65fbdc4f1808c94898d9632ed1ec9788ce349ca69226107eadc01cd4c7d6ee4cfb SHA512 977966e5b3c21550c6bb148b3f0717e7a6cd86cfb0211a8ea1275c4b9368aa3275c9d71a5d4146da0ddd131570745e5037872c918f0b267c424e729227be432a
+AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
 DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdeabaca09f7971560fb0fd504ae8e405256913acbef1434146868885c98068ff59efec92c92fdb73b853cf9396 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
 DIST gmp-6.0.0a.tar.xz 1904112 BLAKE2B eabe9976a7c89e94d9b6aad3c4251f7cbad0f9b8ec597d270cf39d9abbc68207e47604e0ecc1840dbeefb3bd22312cd5451f80046d5a8c577781d2a264b40719 SHA512 50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816
 DIST gmp-6.1.0.tar.xz 1950316 BLAKE2B 81303b8c4dc02de202502d7d1e2df5a538ab2ea9bc36b0a0a8c8d030250bf26471e57ecee26144d0758366a8cec8b413dce88e7e1c89f32c7d1f9add1d833d7d SHA512 3647f07914e6c01b28d94f2d9783e50b0ca9f742a694f56d5759e79a057143ded578b71707ff909c6b0f5710862974606461608e73b33af3114b5338670d8630
@@ -18,5 +19,5 @@ EBUILD gmp-4.3.2-r1.ebuild 1709 BLAKE2B bb324827b9adfae3ee2487c750f6c719c4c17fbf
 EBUILD gmp-6.0.0a.ebuild 2898 BLAKE2B 686c7a179e4c99ad6d16102fe099f0cbe5e9b0eb332e78f2bab0af3bd2655b54164b923ecb2ef3b29271b2ee40906549226f56a0d8ad1478561a959e2a011e41 SHA512 ed70ec49d63d4f8ac3af1d36c197eaa5022e368018dc1516d771a94e0248d81192e49bdf4f78c80f1571683b8a00b4be63c4cbb76f883e8aebac7f2d8bcc766f
 EBUILD gmp-6.1.0.ebuild 3024 BLAKE2B 620c9736cff9449cb6c5797403c87ada6050958d7a87402569189c5d8a3b68704083c782634117d7612ecb603eb7c4845f3c2524f9df12f5c6fc801b6dfa5f1a SHA512 6b2aee7149e8fb461d9477f13a7377f14130c63bd28205f05862926aaa8925b6b229fcdd4a1de83c48b09f4b54fb2afd760503e990aab4e217bd3b745b6d7943
 EBUILD gmp-6.1.1.ebuild 3037 BLAKE2B 8cfc4baa641684d7924f28f63eb59d44e5b01e0fb554fde4712209a7edbc512dae2c87bc5deccc0f2a899b39ffb91f70f2b8058a362320ee234426a0bf3ff79c SHA512 6b5dc4ef6ca38c816274f104ce6a55e5bb938ab396ca9b98ce7d3263e51f78cad321a81ca7af166b0284c94d77c0b588ff75cad0f1e9a6d5069ded4971dd57e5
-EBUILD gmp-6.1.2.ebuild 3159 BLAKE2B c90cce284e0385d4d23b29aab321db96ee4b461a473ea6984ad5e129a902e18802a301394cf28cbce53fe630160b1315b6d3d0ccbea82f9d9e4256da767a2178 SHA512 bd8542c1252b857a8d4f3ac30b820cb5d673d19964d61de594b1a6846f3dd76f3245fa438341dcd4f2df9c978f01e0ad676fd713957fda8956dd5ac15ee8bb61
+EBUILD gmp-6.1.2.ebuild 3294 BLAKE2B e657ad818aab0d1f8d062af46f3085a4653f16b53b5d2d2a38da5a618579c6efc39e73f3e33c0fe44b272e99850824cdef46051f8ade2d496c392b1738082dbd SHA512 f504ddae4b5c6804697dd0c7e2b961937ac7fe14ed27591fd7870814fd7e799aa0f073e3a35be05988fec83d2762d80584c202a39494ccc563bae684e6f13b31
 MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
diff --git a/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch b/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch
new file mode 100644
index 000000000000..8960464ac4f4
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-6.1.2-gcc-apple-4.0.1.patch
@@ -0,0 +1,21 @@
+--- gmp-6.0.0/gmp-h.in.orig	2015-01-16 22:25:51.000000000 +0100
++++ gmp-6.0.0/gmp-h.in	2015-01-16 22:26:40.000000000 +0100
+@@ -360,14 +360,14 @@
+     GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+     inline semantics, unless -fgnu89-inline is used.  */
+ #ifdef __GNUC__
+-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) \
+-  || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
+ #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
+-#else
++#define __GMP_INLINE_PROTOTYPES  1
++#elif !(defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && __STDC_VERSION__ >= 199901L)
+ #define __GMP_EXTERN_INLINE      extern __inline__
+-#endif
+ #define __GMP_INLINE_PROTOTYPES  1
+ #endif
++#endif
+ 
+ /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
+    strict ANSI mode.  Inlining is done even when not optimizing (ie. -O0
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 266f6ce8b86a..9134d5cfa90e 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -39,6 +39,11 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
 
+	# https://bugs.gentoo.org/536894
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		epatch "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
+	fi
+
 	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
 	# So, to avoid patching the source constantly, wrap things up.
 	mv configure configure.wrapped || die