gentoo resync : 05.12.2021

5 files changed, 84 insertions, 4 deletions

diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 90bbfeba892b..09e71a82e43d 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,9 +1,12 @@
 AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297bc2cb5529b58943fcd13060f0b2b3f329571ebbd82208793651ac5120cd4ed19b6eca6c3d0c829509288460a9e0e78817b48 SHA512 70f5cf43261216e16001acc2c64e0bc1457e1fd48a918b218f8b0b21877a44c274f3aad81f68f7176665ec94c2d17f89a880e1c0a9332beae9d25668f9a85a25
 AUX julia-1.1.0-fix_llvm_install.patch 680 BLAKE2B ca0d95c503b8f6e76722d54147f7a64cda5781cefc6e05ed7cfc631b356c3131d43ce6703da6c61b791da08836d9a6b5b494556c2a0ecba8960f8a9395b2d66a SHA512 4d474c1ab1d74aeb98367d55ec557e22e43a3e3d35615b7cde20fb9a194b94f24237735ad431800ded6e120beae9d2d3706b778ea7f26409790e3649ba39117b
 AUX julia-1.4.0-no_symlink_llvm.patch 335 BLAKE2B 0df56ed45619df80b669bc790e0f93e475c94dac39fc8efcbdaa677a6ab02a6a3f832abf07990e8f50df8d900147f5e0ac9e2896edbbc4a015e49e74864315fa SHA512 563ed79132655b8c28a01d17fb8765ed774c069e00d29847f864152f7641b53758c6d8ba5544789e8d3aeb0e1686ea946c31837b1e1b0a6f4bce6d531d5511ed
+AUX julia-1.6.0-fix-hardcoded-libs.patch 1524 BLAKE2B 65e07624f908faeced4b90bc74bf67c8c21e36e172590d071f5bd1d2b74f50ce9f948eff41e9048a776d12d840b36a6f0e40c37972716ab5ab515c02da395d52 SHA512 acd51d0e61eb4241a5d8095f53fc28bd790990664df247027123d5602d7bf1b71b6aed10974087698d1e0d7d70c59a4e30f3565b8cf897f6f5028c8a9af560e0
 AUX julia-1.6.0-fix-system-csl.patch 11191 BLAKE2B 224ce4e2abe11c2b4d91b63e6f717080150baf45219d2c94f31d78d962db5b139d791ce8d2761b7ac4e22201d4b5770ac9211d354b24285da3ca7e0b78f00baf SHA512 bb32848b96b7933f11c9db2d52494576e4b669c375721e7715654370413733762077a670a1102cb27d177b6ee798e312c7388febfef98948bcb39fad67d815b9
+AUX julia-1.6.3-glibc-2.34.patch 1111 BLAKE2B 739af8b2b8c07113f7d5c6d0eaa92dc4bb9f6fc7968c6df00ef671ed89011bbb4ca232f3428fb3427067b28cceef350c1b42fb40b6eaca38304fbe2978f0ad99 SHA512 f09ff9e3ff163c9dc84c0b875b1caa74ccbf2fcc78719389e15dbd5b3fbac10f27f472e5d1f72890f8adb429b78e5ddff825a8637c5195e1952f497d8f5ea895
 DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
 DIST julia-1.6.0.tar.gz 7711314 BLAKE2B 135862347a7f3a954acb8d8e17350fbdda84b4813d8498b862e107836a0d29d6e70a26c39c0c29655e6348a5a3afd5b4d7e9824cb88c9e8d31c4515468f46d5b SHA512 41dea60c08882a8f8f9024eb2285c30dbbc68e2256ed6afd5bf956a1828239128b2f39b4ce733a438eafe3b2324ff06dec5c1eb7c9b0f838b2daa972f587d909
+DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
 DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
 DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
@@ -14,6 +17,6 @@ DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE
 DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
 DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
 EBUILD julia-1.5.3.ebuild 6132 BLAKE2B 3b810ee69e088d3efc193644b0aadd4d1cc9c92ebe86ae9e9aea4551b37b28868c228b96baf7007dd703db7ea1ea70003c33fa69812795afbcea48c546ea8d5b SHA512 30a16c894ac50cb763eaa97a4148dd105f61563d119ccaf47bbb36f0d2a392c5e10bbd2096bb19e8ed9022543adc861b57a1cf9718797e0bdfc953fc20f7ca6a
-EBUILD julia-1.6.0-r1.ebuild 4556 BLAKE2B 3ee45a92a55bec33a5d4c18e2e4fc6424e09a94e3cf88c01dc282e7db19c3231ff26b684e8052d0265fb1e3968a1dcda607ac491c8329399b3eaad46f08ad1cf SHA512 f97fe9d8b12f37c368415309190a06197c8fdb47e600441c0adcd0763cfe69c11996f8d95f72b5c63ddfd47faaedddf84a80b893dd146eecd1a4d3faddabe202
-EBUILD julia-1.6.0.ebuild 4550 BLAKE2B 1b16d447378afac015b1d38246556720af0fd9a987ff3710fcfe4791999fbe59c3296abaf4ca307ec580b3f221ab1edf8090d698decfdaa8b39cca02582faa52 SHA512 1bc67d11083af8324af94e1fcc774851689408488ea691422c09681588bcb32ec16ef5eaea121d9f2fe8b08f36263f78aa9f32376dd1076520d6152fa6e026cb
+EBUILD julia-1.6.0-r2.ebuild 4608 BLAKE2B 7d6c844e51454236b5f349fb70c6a40eb32bc2271c25fbe4c1fc15f7d70f0b926f8b054de2b86a0b5bf085ab034361920965f8dc608c320ce41958454f4d983d SHA512 b24280f4830169ce907868c6bf63e4560adc3ea7160c44f161b74088bdf3c7d40dc6e70894fe826c4dc5c4b1c37c7d16034de3314f05ec4ceb9346c022a0d28a
+EBUILD julia-1.6.3.ebuild 4604 BLAKE2B 8e5a273feaf93fa44aaf5f4e37ba429125006566184f65af6309e118799d9087a523317322dea5282c39c919a492fa28b24c8fedec5290bee6265cd50e145718 SHA512 2f06acbc40b6d081e15433d374ce268d0a4a290f1f720a690ee0d5bb94b6f99688ba996989b340f0b4801a70574c942ba93ea0ccd381cfe4cf0e5df75e3e89c7
 MISC metadata.xml 1530 BLAKE2B 776f8e2eaaebf6a0429b9019ec606c76f80828c5d27ec07f6503e855d44f681a476d9fe0631de0eb0f609b0256e063c172e8fbfacd3e37118e66c07ade2cb42d SHA512 d172e00e631a7a4e4b61c0f3ad90849b189c8b8aa8586fceb63c26ca407c4e477339f51b05d48681be37d06b873d6c2fce62b61efb4b9874323d92022d570288
diff --git a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
new file mode 100644
index 000000000000..1d184c3dbb54
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
@@ -0,0 +1,43 @@
+diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+index a7ca666b23..b84a42f4e7 100644
+--- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
++++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+@@ -31,9 +31,9 @@ elseif Sys.isapple()
+     const libmbedtls = "@rpath/libmbedtls.13.dylib"
+     const libmbedx509 = "@rpath/libmbedx509.1.dylib"
+ else
+-    const libmbedcrypto = "libmbedcrypto.so.5"
+-    const libmbedtls = "libmbedtls.so.13"
+-    const libmbedx509 = "libmbedx509.so.1"
++    const libmbedcrypto = "libmbedcrypto.so"
++    const libmbedtls = "libmbedtls.so"
++    const libmbedx509 = "libmbedx509.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+index fa45e754e5..b51812e3a8 100644
+--- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
++++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+@@ -23,7 +23,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+     const libLLVM = "@rpath/libLLVM.dylib"
+ else
+-    const libLLVM = "libLLVM-11jl.so"
++    const libLLVM = "libLLVM.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+index 8b98c76ac5..77ad9e3800 100644
+--- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
++++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+@@ -22,7 +22,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+     const libnghttp2 = "@rpath/libnghttp2.14.dylib"
+ else
+-    const libnghttp2 = "libnghttp2.so.14"
++    const libnghttp2 = "libnghttp2.so"
+ end
+
+ function __init__()
diff --git a/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch b/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch
new file mode 100644
index 000000000000..3e3146529aea
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch
@@ -0,0 +1,32 @@
+https://github.com/JuliaLang/julia/commit/09a49c6b57fbde109f0f0c2aa9aa05cef2c1dd40
+https://bugs.gentoo.org/824486
+
+From: t-bltg <13423344+t-bltg@users.noreply.github.com>
+Date: Thu, 12 Aug 2021 21:36:18 +0200
+Subject: [PATCH] MINSIGSTKSZ is no longer constant in glibc (#41860)
+
+MINSIGSTKSZ is redefined to sysconf(_SC_MINSIGSTKSZ) starting from glibc 2.34
+
+Co-authored-by: t-bltg <t-bltg@users.noreply.github.com>
+(cherry picked from commit f19b9a20dde2688c642b7dd709b5d9446e4df2f6)
+--- a/src/task.c
++++ b/src/task.c
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <inttypes.h>
+ #include "julia.h"
+@@ -75,8 +76,8 @@ static inline void tsan_switch_to_ctx(jl_ucontext_t *ctx) {}
+ 
+ // empirically, jl_finish_task needs about 64k stack space to infer/run
+ // and additionally, gc-stack reserves 64k for the guard pages
+-#if defined(MINSIGSTKSZ) && MINSIGSTKSZ > 131072
+-#define MINSTKSZ MINSIGSTKSZ
++#if defined(MINSIGSTKSZ)
++#define MINSTKSZ (MINSIGSTKSZ > 131072 ? MINSIGSTKSZ : 131072)
+ #else
+ #define MINSTKSZ 131072
+ #endif
diff --git a/dev-lang/julia/julia-1.6.0-r1.ebuild b/dev-lang/julia/julia-1.6.0-r2.ebuild
index 15b9d0a0324a..2a26d027f3e6 100644
--- a/dev-lang/julia/julia-1.6.0-r1.ebuild
+++ b/dev-lang/julia/julia-1.6.0-r2.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
 	"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
 	"${FILESDIR}/${PN}"-1.6.0-fix-system-csl.patch
+	"${FILESDIR}/${PN}"-1.6.0-fix-hardcoded-libs.patch
 )
 
 pkg_setup() {
diff --git a/dev-lang/julia/julia-1.6.0.ebuild b/dev-lang/julia/julia-1.6.3.ebuild
index ae323aa7ab36..096876a7c5a3 100644
--- a/dev-lang/julia/julia-1.6.0.ebuild
+++ b/dev-lang/julia/julia-1.6.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-libs/libgit2:0
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
-	dev-libs/libutf8proc:0=
+	dev-libs/libutf8proc:0=[-cjk]
 	dev-util/patchelf
 	>=net-libs/mbedtls-2.2
 	net-misc/curl[http2,ssh]
@@ -66,7 +66,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
 	"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
-	"${FILESDIR}/${PN}"-1.6.0-fix-system-csl.patch
+	"${FILESDIR}/${PN}"-1.6.0-fix-hardcoded-libs.patch
+	"${FILESDIR}/${PN}"-1.6.3-glibc-2.34.patch
 )
 
 pkg_setup() {