gentoo auto-resync : 02:05:2023 - 05:22:02

3 files changed, 33 insertions, 2 deletions

diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 3ad1d7f5456f..45293928de99 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,4 +1,5 @@
 AUX julia-1.8.0-llvm-no-bindings.patch 703 BLAKE2B 2b67752b4e9519681a77eef7e96a8d0fa9eea5a703891b6497424dfb396ef70cfd00e41cea00329ac00bc96eb87823fe95bfabcd968faec41704d196d9babf45 SHA512 2969496dff1f2bed59b652cdd3295108f57f2fc16e9f6c6b63eb900ffa75436dbce3a438f9e2d451b929b21eafec0307e8af5cafb1f94d0bd1ef22a0651b8ec7
+AUX julia-1.8.3-gcc13.patch 303 BLAKE2B 104f1b47c2f010133aefe2cb05274057a7319ae6552bb76582caf9813dc18e0302f21c72f794eb63a10545b3cf508397ffffecbfde4a277451a4b5582859f126 SHA512 4748e0dad02d54970f98e9e7d984941819960137d1f7901d61c8a71052b8ad1ee535936a2a36aa244474182612448d3b779e42bb7e43292b11b962bc353dbe0b
 DIST julia-0b211609.patch 9574 BLAKE2B bf43f143b8873ad1812d95d5866a77f28b5dfeb05f41c9dd8f384109ec8cfab09f78bb7b891d5178d6c445ba58cdfe2bdf0cc4c5bf032910c42d4fd1b89883f7 SHA512 aaeeee2e96773589e4347af4df169ef3d241a4c7a22d28ec356a13062f7d11f043cebce8b79afbebb1fb411ad957d4d14880ae051924cb694b39283ccce1658b
 DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1
 DIST julia-1.8.0-0db596e6.patch 15029 BLAKE2B 2d5152436c2a7b0dcd60346c9fe9ea008f7672a68ae038762c5952c6c85173d28b3fd7335282e783cc1f91102e8dd58ae9967caa476ad8f93dd60f8f485fbbe3 SHA512 1f4eb42656bbaed3c85d520875c687f0dd98e9ef0d73f0d3a2b3ac4395020984effc03477c56ab6594cd15e87899923591f6cabeb4e2a43c26725ebe51dbf0be
@@ -18,5 +19,5 @@ DIST julia-1.8.3-full.tar.gz 275266765 BLAKE2B 2cd54e33cea5d53a93e8ec9c1cd44df4e
 DIST julia-1.8.5-full.tar.gz 275344455 BLAKE2B d51ee25e9c7dd54e3fcc35cd75c909686cc5e48c6b34371cd100bddb038b76e1ba8812bab554ffb8ca5b725cc30fec1a0fb4f58220de8917de35dc2d3a159d81 SHA512 3f92cdecdfc79194e1cde3ec96871bde984c2527d0cd3909c91a27a819d734e39260c5fe7129d958e88db1965f8b5d61ffe7e95c7cddac111aeafe844e29900d
 DIST julia-a48ad530.patch 2790 BLAKE2B 4f7b1a3baeadff597b8b7e0e55705ff09625457a7889179e2f7d7ec1370008a5329901c45ad038bd830276d120e35d87254fe55ea497b2632988254ddd591df2 SHA512 4222901d28b100a81743a4092fb78862160e5b1c23d1a7fd242df815703897b974c8aec79518f67f4cf33ccbc88f75bf6e10d1189b7163b94b5d347ef8db940b
 EBUILD julia-1.8.3-r4.ebuild 4739 BLAKE2B dc2938814b3360e6671b52f75f25ae9f2e96c336ca77d179b03ea2d1052831034d2b0baa8ced9c56270b0c8efbf6e5c862d5bfbfda8584615cea9d5d9a92d272 SHA512 9825cb9e172dcefea3cbe3f5d3e66685205e70aefae920993bc902448eace99a73efdf3e758b35b1cc094b9dadf26d17a9d9565b3e66a5778a0de1f481be19fa
-EBUILD julia-1.8.5.ebuild 5729 BLAKE2B 0ac9e135cd6eb071268f9cc4c16932365f8bc3479d623b3d03e9a30e3f6adc7f1aafccfa6265bbe61f45fca10e81d583f33f0de057a179e7395ae7bfc29480ff SHA512 c73994d2b52792cf6d1cdd16dc6c328b8d2e4cbd5b39be6509af4c14cfa55ab72ab8a4bd2db34220d1d9301a4738dd1f3c82aca3ba209578d81a7c78feb1e5d3
+EBUILD julia-1.8.5-r1.ebuild 6229 BLAKE2B c3ae1ed3d9efe78cba7c7ec2de18f12ece20d849e9b3784bd4ac85a720c4996967af90ea558df89b1fbdc353203051735ec476652e3e28a249490c219eab1195 SHA512 2e158e9ae872749239d9c2a0f1d99769c8600f6f403205c4fd64dad2690638036b16ba8038c9871a1d633d0636ecb8c439a9654171115cf0bf400baab9757a7a
 MISC metadata.xml 1180 BLAKE2B 32bf6e513df1c656c4d59030e3bda12a756c6577562b5ced73c9e46f204c774b2411186e8a995687424d068fea83b6b379fe5c7ed9fd1f5d01949e66b95a164a SHA512 9ee29e001cb2306b430cccd11f742829c2e9f28030f9622bf2557e7789054b2d61f903422e6c4a789bf6fa5a86310f35a2e3f08f4b0faa4c812879012e8329d0
diff --git a/dev-lang/julia/files/julia-1.8.3-gcc13.patch b/dev-lang/julia/files/julia-1.8.3-gcc13.patch
new file mode 100644
index 000000000000..96e2e48ba78d
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.8.3-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h
++++ b/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h
+@@ -15,6 +15,7 @@
+ #define LLVM_SUPPORT_SIGNALS_H
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace llvm {
+ class StringRef;
diff --git a/dev-lang/julia/julia-1.8.5.ebuild b/dev-lang/julia/julia-1.8.5-r1.ebuild
index eff4ebe3ca0b..fbe4522110f4 100644
--- a/dev-lang/julia/julia-1.8.5.ebuild
+++ b/dev-lang/julia/julia-1.8.5-r1.ebuild
@@ -9,7 +9,9 @@ EAPI=8
 # >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184
 MY_LLVM_V=13.0.1
 
-inherit check-reqs flag-o-matic pax-utils toolchain-funcs optfeature
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/
@@ -56,6 +58,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/cmake
 	virtual/pkgconfig
 "
@@ -65,6 +68,7 @@ PATCHES=(
 	"${DISTDIR}"/${PN}-0b211609.patch
 	"${DISTDIR}"/${PN}-a48ad530.patch
 	"${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch
+	"${FILESDIR}"/${PN}-1.8.3-gcc13.patch
 )
 QA_FLAGS_IGNORED+='usr/.*/julia/sys.so'  # Julia sysimage generated by bootstrapping.
 
@@ -93,6 +97,11 @@ for archlinux_patch in ${archlinux_patches[@]} ; do
 	PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" )
 done
 
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-any-r1_pkg_setup
+}
+
 src_unpack() {
 	local -a tounpack=( ${A} )
 	# the main source tree, followed by deps
@@ -103,6 +112,10 @@ src_unpack() {
 	for i in "${tounpack[@]:1}"; do
 		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 	done
+
+	# Extract tarballs for patching.
+	cd "${S}/deps/srccache/" || die
+	tar xf llvm-julia-13.0.1-3.tar.gz || die
 }
 
 src_prepare() {
@@ -123,6 +136,13 @@ src_prepare() {
 
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+
+	# Blank the tarball checksum check script.
+	echo "#!/bin/sh" > deps/tools/jlchecksum || die
+
+	# Repack tarballs.
+	cd "${S}/deps/srccache/" || die
+	tar czf llvm-julia-13.0.1-3.tar.gz JuliaLang-llvm-project-8a2ae8c || die
 }
 
 src_configure() {