gentoo resync : 31.03.2018

3 files changed, 25 insertions, 2 deletions

diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 41926cd642f1..415f4fba6d93 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -2,6 +2,7 @@ AUX mono-2.10.2-threads-access.patch 1156 BLAKE2B 4ab08f57fc4feeb8882890199166d2
 AUX mono-2.10.9-CVE-2012-3382.patch 564 BLAKE2B 0d9b2615ba78ee8ac1c8ed9961e7ca83da581f742f106c1ff932cfa6300de8b524281622acdd62ae6a4a92c4e9f4fd492d5ec5f9c56675e6def7c8302040e5f0 SHA512 044293dcea8c31046e6d771a3e15863fad152bc52dd1eb2cd010d581e5b695c42b09e6582eccc6d5b3e800263bacf61e70f731b1bf6145249ec682d830b855db
 AUX mono-2.10.9-CVE-2012-3543.patch 6960 BLAKE2B eb3e9796ccdec10c8d3751990ac9de4b8e50d97a565834afb27c5ec472e6e963aa91c5786260ca444316ccd1887b017d7150276a7b8bae169b192d2ef54b5534 SHA512 853c8c998f205e8862d4cbcb4979aeb557a8a2722b5586a1ba5975a9ef6c92ea280421a38dc4f75c9ecb0bb12dbd6fb0b416a18b1a42f5ab852722e60ffad730
 AUX mono-2.10.9-CVE-2012-3543_2.patch 1569 BLAKE2B ea9b9bcb01870d1708c92f8ea84405b035d47ffe67a70485ec5112567568d4e9f6c5e39e7fe9472c4391b45143115ed2dde8987d42db8bd089b17b67e8ed5cf7 SHA512 e574e8224d00c7636198c1c374163efca724b2b1058378080687b6d8d7f83d72d27b8db510af03eac9ac185a09eeed0467d59e2d1ca40f7cfa255b43c2a5a45a
+AUX mono-4.4.1.0-x86_32.patch 839 BLAKE2B bd0fc2ff2bc16cb0aa260e94f2f0a304348bf80e34ac9f3b7b4350661fa5f0f4095f26647d1ff88bce1c3d33b5a6a4f2803639c57ed4f42988ce46edff5ecd2d SHA512 af72d2f89d34e05e94cb02b6bb5a9238b6bb0d9056e520c863271d1dad9d999d1bf2478bfd8766fbb40714f4a2641e1844bddf3997fe6cb779ab6d97ea800867
 AUX mono-4.8.0.371-makedev.patch 900 BLAKE2B 9e79240ce38a06c375674123d8182f9b9db646f85b2140b1420ac465b19639b910674a1d6e5ce0cb1e9e74d099d338cf3395e95015de4bdf1c4a0dd1ccf63f68 SHA512 afdcb69c2de195bcc6d0a47cc5bad6b6679de6d1c8f0577f8a2f5716610f131e71a327540ba7e23353f35dfe7c552f16b98c9e88c3ecf91f2225a68a6d034971
 AUX mono-4.8.0.371-x86_32.patch 1033 BLAKE2B cfcd8163180de91aec85841ce6c129faba242aa54db0d99b45195b8474e83ce96da4c5111fbb28cf0cb23d2a9a4be6a3856a18ef8bfda35fd7365f87c88509ae SHA512 f12ffda9eddb8fbd51844a6cc7bd3d4d147a97ddde9e4a4435051da88eb72603303ba7d21124747ab23033eacb70ae75ee8e96bc5887d898cc21ac1904c36aab
 AUX mono-5.0.1.1-x86_32.patch 751 BLAKE2B 1a19219c5667715a9afb7dc74ba9714893eea684a0c48945bcb70bdd83e34138a77ca029bcc8341b58af93617b4eab3251885affb3d129e8bf072a0279b8d29b SHA512 8c3d3a65f9d9a9a51c4a01dfd14e32e01bcc7cb98bd4f6a196a2a166968521ff859ccb1efd689c612c8bab5d6a384b148039de5033235a2c0552bc455dd636b7
@@ -13,7 +14,7 @@ DIST mono-4.8.0.495.tar.bz2 87540431 BLAKE2B c067054c27e61fbd46cae962876afdf65fa
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
 DIST mono-5.4.1.6.tar.bz2 204934321 BLAKE2B 7aa3450a9bc4033f8084c4271b215af636e0df72d6349c97e0acd110d91e276d22b735d19bac2fb1e995ec34fa9e041831358a01d5c098b9c5e8b567d98350fe SHA512 d3618e9f127bc95b15feba5bf73317574872208770d83b8b545a9888df81a629e6fb14160db8a38526ffeb005f682e8dd9b8ced84bdb0cbb36dc9e7b28c240a4
 EBUILD mono-2.10.9-r2.ebuild 7372 BLAKE2B d4abcc9e0227ca18716686dc58791b2ded6e8bd8d9d87d615d693308404d0fea558c50013b9569c15dfab125e1b30b28ed762fbe643dd68a2f910929be91aa00 SHA512 e4b9f11f99343cefb489b818e777a0d948687513ffeca34083cb96af1cb83d08f2ee12af61f8e53eebbea24490c561f64dbae66d139ed67645ed13370dcc0f26
-EBUILD mono-4.4.1.0.ebuild 3363 BLAKE2B 89c6dfedc8ed10c254458ec264bfb0d8b7c28b01315508d122e67a9829a02ee34675c40ca6be3be53c6ff24086f04462a92894c5b2032f2fb62f2a5fd08ca3e3 SHA512 478620383d1d8e6cd52c46cc2bed0ca8101f42f037454814f4c829e1a0ed52650e47a93f8449d4335b0be52c75c4590725ef58a96e20374b12651f38e7fea88d
+EBUILD mono-4.4.1.0.ebuild 3404 BLAKE2B f6a613190f7609f45300b6cc7a2affafa5ac5da5569f31b41f1b6e2e4a3e54ab9983671c49558d1e202eeb993e9e48d585c1127ce053a6e701996fab5389fadb SHA512 341352b48b970666a9eafb27dba34f1bdb1a994a0c2b9f8231e1c948b75505b4fd5e775199c0476d174d245273106e4205b25b40e97be322eadc3c4bc9f1fe3b
 EBUILD mono-4.6.1.5-r1.ebuild 3506 BLAKE2B a69d7954689ac665cd54f7283e6bf0e4a254d79f28d025a76c20929a5a948bc906bee87d1dc8c8313caea8c736f327bdfcbaa99adb5e08b9c341cb26d38a3f20 SHA512 453e1c30b2eb4edd3d7c3aa2e769cb31efff63f75ffde986b95ce14c7bffea7c005af16d8b4d9559c58a20ef200c2a4d2989fe5c65718a30b200f844af26688e
 EBUILD mono-4.6.1.5.ebuild 3366 BLAKE2B 61dcd126d3aff2b990c56361eb92905f3e389da5ec9cbe9645c4c29c60dad86263443d05b5b01f832d0e339ab6b3842ea495a4f8babe705de8641f78ee8d9d68 SHA512 7b40fd4fb50a705a521d8d4738da1c656dde3eb8f6593bd26c27491a65cb59fcd6034b3e8202c23ffc6b82369c790d91d337c3d5a4cb1b2a4bea9a8135f3b91f
 EBUILD mono-4.8.0.425.ebuild 3039 BLAKE2B b16e7de8dade445b3836e426ea6e1a1beb7286a5acca35e474982d74ce0479edc24a577e826e92a93a845bbc82548095660ea55250cc2e51ad4f81cad5d9521b SHA512 73c27f8263657fd2075a938756c79372eb1044a645a4b651cc4e469e8131e5108c2c46ea8ccc17c8d662121f2fcac75fe3c1ebc6fdfa273278c615b0ede4379c
diff --git a/dev-lang/mono/files/mono-4.4.1.0-x86_32.patch b/dev-lang/mono/files/mono-4.4.1.0-x86_32.patch
new file mode 100644
index 000000000000..751c057e6ce4
--- /dev/null
+++ b/dev-lang/mono/files/mono-4.4.1.0-x86_32.patch
@@ -0,0 +1,20 @@
+Native toolchain can default to different ABI (amd64 in bug case).
+Set target to i386.
+https://bugs.gentoo.org/600664
+diff -Naur a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
+--- a/mono/mini/aot-compiler.c	2016-06-22 04:31:58.000000000 -0500
++++ b/mono/mini/aot-compiler.c	2017-12-08 14:25:35.338251941 -0600
+@@ -9438,7 +9438,12 @@
+ 	const char *tool_prefix = acfg->aot_opts.tool_prefix ? acfg->aot_opts.tool_prefix : "";
+ 	char *ld_flags = acfg->aot_opts.ld_flags ? acfg->aot_opts.ld_flags : g_strdup("");
+ 
+-#if defined(TARGET_AMD64) && !defined(TARGET_MACH)
++#if defined(TARGET_X86)
++#define LD_OPTIONS "-m elf_i386"
++#if !defined(TARGET_MACH)
++#define AS_OPTIONS "--32"
++#endif
++#elif defined(TARGET_AMD64) && !defined(TARGET_MACH)
+ #define AS_OPTIONS "--64"
+ #elif defined(TARGET_POWERPC64)
+ #define AS_OPTIONS "-a64 -mppc64"
diff --git a/dev-lang/mono/mono-4.4.1.0.ebuild b/dev-lang/mono/mono-4.4.1.0.ebuild
index 328ec0684726..397235e7db59 100644
--- a/dev-lang/mono/mono-4.4.1.0.ebuild
+++ b/dev-lang/mono/mono-4.4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -79,6 +79,8 @@ src_prepare() {
 	#epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
 	#epatch "${FILESDIR}/fix-for-bug36724.patch"
 
+	epatch "${FILESDIR}/${P}-x86_32.patch"
+
 	default
 	#eapply_user
 	multilib_copy_sources