gentoo auto-resync : 19:03:2025 - 00:30:03

9 files changed, 199 insertions, 4 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index f46b235a8af7..0d7b1d575b40 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index 2f373762f15b..134d08ef9afc 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -10,6 +10,7 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e SHA512 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818befdee20fd8bed4d2dc2c2c6f6f56451fd43d35ac03a0a5a406e142d22b25137999dc5b17471c196f8fcf79f20a8296832d900f6d SHA512 c7d63286d662707a9cd54758c9e3aaf52794a91900c484c4a6efa62d90bc719d5e7a345e4192feeb0c9fd11c82570d64677c781e5be1d645556b6aa018e47ec8
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
+DIST llvm-project-1c3a9a853ce68c3c539e7cab21380b9d8b18f426.tar.gz 229448743 BLAKE2B c1eacc2ed05c460f56cf83f16b982e3fa4ac530483d7cf003034239aff3b3dbffbdd3042a3f295a83ec94fcf32f802714e4937fd3761a5e03d4ed1b4093e81bf SHA512 98b7e9fa330a6fce33ca9757caf5d2e41d0b73117cb24b2aed880274c2d6f8a8c1a0028dd0e773fa42deb61dbe3b9dd4fb2f44e50814b966fcdeae8e5b417e6d
 DIST llvm-project-20.1.0.src.tar.xz 147206476 BLAKE2B 8e8bd8aa995a84d17ac7d634098a6b72a47c30f1752029b620f4541a2de4039edf09117286094ae7bc59c4e84374dcffb8e5ee6ef5feaf4ea7ddb58dd04ea803 SHA512 c90fbc43c40e148357912adc40d799a79cce3d3a929136c137421f6342ed7338659e651f1dedfa8e10b94b9f2897e25b2962e17709add02857f89f10615a2397
 DIST llvm-project-20.1.0.src.tar.xz.sig 566 BLAKE2B 98979ce89f3fe6e95eef6096066cf855245a585608e7d1fddb5bbb2c73077f3ee28204260e18d7e45e3051daae3639520c39bc3d0dc51524873ac213e2511456 SHA512 68da1c2a13aaa48a67bbb9e716f9f030cf372edc651bca2861453378a6a9172a207ff59e29b175001f042888bf1f9c118fbf938f757e1f4c966943baa7e2696a
 DIST llvm-project-cb7298f66d62a3548fcf3bd230304067ecf30d17.tar.gz 229200711 BLAKE2B 1910569812e7423cf566b0dec67269404ba8db8232ab293bc603a88914f2b756e3088bf2133c0fca612cc58d39691c7b813b3c5839a7ac9a3d177fe6bde766c6 SHA512 07c3f6ce34e7d32c5ebce1d2efb77e6a1dde49f9eedf7191733a20bdcb6ffd0c03f8fc8de85fd00bd9465b209f140639a68a367d2218c028bfa6e06067cc3e14
@@ -22,4 +23,5 @@ EBUILD llvm-19.1.7.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e
 EBUILD llvm-20.1.0.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
 EBUILD llvm-21.0.0.9999.ebuild 2543 BLAKE2B b553bdaa2193f304a661fad3ac8210d1beb66a37f2d1a29b8327b3c9e74d3f80b935927345c4852231979bc5c10cb4c08e18b5a575eac1710e2cc7a9a0b3ed4a SHA512 2192ec78a96dff5617e68f9534b5416db705e0d6f3eb13c250b21158376a87f4f88a6936f1737f479ffe2c5ef846c0cfbdceff4e8bd3cc8c8173d2b8441d91d7
 EBUILD llvm-21.0.0_pre20250311.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
+EBUILD llvm-21.0.0_pre20250317.ebuild 2543 BLAKE2B b553bdaa2193f304a661fad3ac8210d1beb66a37f2d1a29b8327b3c9e74d3f80b935927345c4852231979bc5c10cb4c08e18b5a575eac1710e2cc7a9a0b3ed4a SHA512 2192ec78a96dff5617e68f9534b5416db705e0d6f3eb13c250b21158376a87f4f88a6936f1737f479ffe2c5ef846c0cfbdceff4e8bd3cc8c8173d2b8441d91d7
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250317.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250317.ebuild
new file mode 100644
index 000000000000..3d0b7490e879
--- /dev/null
+++ b/dev-ml/llvm/llvm-21.0.0_pre20250317.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~llvm-core/llvm-${PV}:=[debug?]
+	!llvm-core/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# https://github.com/llvm/llvm-project/issues/131115
+	local -x LIT_XFAIL="Bindings/OCaml/debuginfo.ml"
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index c82515233120..4f38c17fb293 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,3 +1,4 @@
+AUX ocamlbuild-0.15.0-test.patch 1283 BLAKE2B ff89812cdb200b8a4b3b7482f7ca498670e93408d1698a2cc5f417df5e3178d285e7e63f799a94f1514e9c7635c28a60b7fb0094acf683ac092ce4ac6b9018e0 SHA512 b27bb2e3ef0f9303b2dc21815331489c03977a3d254cffc55cb4fed962281b8debe0e10e64c46ba2fc5661590394a99455f8ec68759430da3e878c6f89691078
 DIST ocamlbuild-0.15.0.tar.gz 201971 BLAKE2B 34c35c48d446d9c5297a9eabf6d4f134fbfdf01aad4eff15804ad7ecd9068527a70c2d9820ce3f7dba41aa88dda215e82074ad0c66df048c512afd60884ec7fd SHA512 c8311a9a78491bf759eb27153d6ba4692d27cd935759a145f96a8ba8f3c2e97cef54e7d654ed1c2c07c74f60482a4fef5224e26d0f04450e69cdcb9418c762d3
-EBUILD ocamlbuild-0.15.0.ebuild 1320 BLAKE2B 911a653884e1891d3b2a57fdce86563219f0c924a1e02758ef4184dca4ef3c7fabdc08a19e992a818b94a94c4e484eb5ad43ec62946d615b372836a210f70028 SHA512 fc289aeac6dc4bc9675403fe597bcac4aebe613161197381ad462fa57f4025d0e4184c1baadcc7da78cdcf4f9f32e35bbd3769eb97a1bd05a41f6d8f4b7e9fd8
+EBUILD ocamlbuild-0.15.0.ebuild 1396 BLAKE2B 11b9400898595a10d66fc378cf94ebe1937cfcee3dcf99c438915b7478a1ddabb41d925d00965ee1856a8662aec07258abf0c66f92ae8aa6651d5457b34b4049 SHA512 8b4b727370d02708580206e3da8c15d8ca54cdb4de21a3e6e0baa23005591142465c57d8efbf80d4474ad590829eff94a933fcc78e8886f0c7077375a73f1ef9
 MISC metadata.xml 314 BLAKE2B 6b6d5017c9d5ad7070b020fbfc85a313a8d89ff664b666504e0a9acc71e934bf5c28487c127846733dadb91fb657c71c70749955f4b713c41813c38336c0a7cf SHA512 6c4a92b198d2a2e52df3c6c223237e513b3eb681d06b2b6a15494c2ca9bf2ec6bfd0fb39cae1ed4e47088f87277fa35f1b959aa797cae4c59ccb764ac75de9e7
diff --git a/dev-ml/ocamlbuild/files/ocamlbuild-0.15.0-test.patch b/dev-ml/ocamlbuild/files/ocamlbuild-0.15.0-test.patch
new file mode 100644
index 000000000000..db02dd5de732
--- /dev/null
+++ b/dev-ml/ocamlbuild/files/ocamlbuild-0.15.0-test.patch
@@ -0,0 +1,37 @@
+From c70704cc301cfd826cc3950f26af674b3b3bfab4 Mon Sep 17 00:00:00 2001
+From: Hugo Heuzard <hugo.heuzard@gmail.com>
+Date: Mon, 10 Mar 2025 10:53:27 +0100
+Subject: [PATCH] Testsuite: fix for OCaml 5.3
+
+---
+ testsuite/internal.ml | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/testsuite/internal.ml b/testsuite/internal.ml
+index 0b9ac319..eb221cb1 100644
+--- a/testsuite/internal.ml
++++ b/testsuite/internal.ml
+@@ -314,7 +314,7 @@ Error: This expression has type int but an expression was expected of type
+          unit
+        because it is in the left-hand side of a sequence
+ Command exited with code 2.|}
+-else
++else if Sys.ocaml_version < "5.3.0" then
+ {|File "hello.ml", line 1, characters 9-10:
+ 1 | let () = 1; ()
+              ^
+@@ -322,6 +322,14 @@ Error: This expression has type "int" but an expression was expected of type
+          "unit"
+        because it is in the left-hand side of a sequence
+ Command exited with code 2.|}
++else
++{|File "hello.ml", line 1, characters 9-10:
++1 | let () = 1; ()
++             ^
++Error: The constant "1" has type "int" but an expression was expected of type
++         "unit"
++       because it is in the left-hand side of a sequence
++Command exited with code 2.|}
+ )
+   ~targets:("hello.byte",[]) ();;
+ 
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
index 1fbdfe7dc118..a56cc131cd0e 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,9 @@ DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
 QA_FLAGS_IGNORED='.*'
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
 src_prepare() {
 	sed -i \
 		-e "/package_exists/s:camlp4.macro:xxxxxx:" \
@@ -48,3 +51,7 @@ src_install() {
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
 }
+
+src_test() {
+	emake -j1 test
+}
diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest
index 5ba7fa2eaa2e..1ae6c581670a 100644
--- a/dev-ml/odoc/Manifest
+++ b/dev-ml/odoc/Manifest
@@ -1,3 +1,5 @@
 DIST odoc-2.4.3.tbz 1764166 BLAKE2B b9de37c767e9c17367a0105afda75803c75e2b40c6c40c4bd63f99b503d0686224e74523c4c2f3214220d019fc6890df56c7e599d2b402f0c3e212178eea486e SHA512 e78faa68c726db3034c12f0cbf76efb87e73f03430a734f82eeea4fb8813e5ebb8ad176012ed20cc1d56a874c601489ca3f02c929474f925eec6d51ce6bdb856
-EBUILD odoc-2.4.3.ebuild 739 BLAKE2B c230126b85255de3100b3e15557c664c434b84d845c23a150d0d9a8fb89590aa1ea9f2b4c000f9c7ded25f5ac7318afe2635ec1e19ce196ee20390bd54b7bc61 SHA512 1bdd781cf75288c9ac5c2f91608198ce5572631d94176ef1e40142a30d1707dbd2507136081695bc104f39ad086eabbc2274ac1efe2b4290951ca2e9beceb3cd
+DIST odoc-2.4.4.tbz 1764509 BLAKE2B 2fd12fc56057dae91eabf9006fb8b299e3e05d9ff74d51be2457fa3c8972b5e5059c10731a80d6c5c4c8eb76b0130617254b33c1fd3b7bdbc473306c16a0ed44 SHA512 d5b1e6786c9cb371cb207da91728336a4746c8f3f07d817bb8259b32404445cd99ba2455ad51cbaffedf98e24cec68743fb7b02ad44643b1718d3d875b5580ee
+EBUILD odoc-2.4.3-r1.ebuild 760 BLAKE2B 58330b0a91cf4fd85611abe868b9e3a9e1fd7c83f79b385600f26abd4e8d8a52bcb8df8c47b588b27c3d147060f6733b7568cfeff0c691e60e016babe107dd98 SHA512 3c019d3e297c09140271c2728e0af4557d8c2b8753a1a601f23a090e9aa34428e4a3731e01ebdeabc36e2bedea5a4c5a078cb214d4912c8c7a8bb887fcd157a4
+EBUILD odoc-2.4.4.ebuild 739 BLAKE2B 84b4c30e0d635286aec1d46f5477b10329c9b4c588b63c05953e716095c93d1d249d310452e1a446ef6936378d3e643b5a9fdb0c67c6057d0696bb844e7f051a SHA512 a1ff7768dbd6c9b3f62116c828504b31a45b988847bbdb713fc561a11ab47f6f3041aeb07713a38f6df53b8b5b378be8fffa511e7d730961b12fb61a26813fa2
 MISC metadata.xml 522 BLAKE2B 04acd17984b96b5fdf41120b46c1f15ab1a2b9ccac7312ee27e41da5985cbed08786aa9349cec268f224bc660ea3fd902874bd029f37355685b2fcc8b7093b07 SHA512 d969745657f9335411b45ca5efe110da0d017dac7efe5d5357bdc6f99852c279d116aaa02101b443ef45229c1b9c809db65cfcd719ae48ddf198d5b2923b9f57
diff --git a/dev-ml/odoc/odoc-2.4.3-r1.ebuild b/dev-ml/odoc/odoc-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..52520401ed6c
--- /dev/null
+++ b/dev-ml/odoc/odoc-2.4.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="OCaml documentation generator"
+HOMEPAGE="http://github.com/ocaml/odoc/"
+SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+RESTRICT="test"
+
+RDEPEND="
+	<dev-lang/ocaml-5.3
+	dev-ml/astring:=
+	dev-ml/camlp-streams:=[ocamlopt?]
+	dev-ml/cmdliner:=[ocamlopt?]
+	!dev-ml/odoc-parser
+	dev-ml/fmt:=[ocamlopt?]
+	dev-ml/fpath:=
+	dev-ml/ocaml-crunch:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
+	dev-ml/tyxml:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo:=[ocamlopt?]
+"
+BDEPEND=">=dev-ml/dune-3.7"
+
+src_compile() {
+	dune-compile ${PN} odoc-parser
+}
diff --git a/dev-ml/odoc/odoc-2.4.3.ebuild b/dev-ml/odoc/odoc-2.4.4.ebuild
index 5954f689daba..4018948e7302 100644
--- a/dev-ml/odoc/odoc-2.4.3.ebuild
+++ b/dev-ml/odoc/odoc-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8