5 files changed, 111 insertions, 2 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 7845ac6a4ce3..601cbfbe798d 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 0eb17be8ef90..31d7a8197e0e 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -16,6 +16,6 @@ DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837ee
 EBUILD labltk-8.06.10-r1.ebuild 1384 BLAKE2B 2268c70f73d91e5c5ee8bccf1ac36693b60ea2bfb683ebf7c5547b6076a1b5b72e58a114ee735b93ef1387a4a0f934f580896fb7d3e3ba01f6e04878cb627435 SHA512 14ad6218a654ac2f617b73829213ec31f0630a8bfc485e1c872ed4ac569613e0e6754888945fd0518804b401183b30d851cbcb57ae07de136b0bcd619eaa6361
 EBUILD labltk-8.06.11-r1.ebuild 1140 BLAKE2B de82a222c7bd37eca0bdfaff76ab13f13460fb229c54d713d84a1897e46fe4c92601c13f0f1c24a4e688f36eb5db3d9f407d78cd5dca7689cd9aebaaa65720dd SHA512 881a1a1a53dce9786fcd7742d66bc273d56b98b6b39409c968723af2772d866d720638fbc4cebc72784af52545173fca34190985ce5c34f5cc62cdf5c9724896
 EBUILD labltk-8.06.12-r2.ebuild 1293 BLAKE2B fe34d864a4232599c78b929794db5ce9ddfe0444fa2a2d1c7eb1d999517db747a2715467d18d06781855df0a1424d1518f29d7303fe17e182490da16ded17504 SHA512 b0786f51e8606f9f07dab7ef985350b8c07075027c80d83ce249a1a1dc64efab2eaa81bde142e467be17cbfbc2d89059625dfab818f2b4bb956d0d20e69ba36f
-EBUILD labltk-8.06.14.ebuild 1172 BLAKE2B 8dd5aa95ea11876f4c68b515444361e183a44feb11179bedad0365dcc897c4d4490f7eb0405e610462d64351938ccfded5cd3d8673d2fba44bf1b6ac6c7ff3b0 SHA512 eb49c1bd748fdb1f3d4c7a0075c1a2fb593718dc4602dbfc12c7e7abe32424dfecf854946442872784bba0d5b75bae09a2a2e9613857a9969a12b4d31d56fd52
+EBUILD labltk-8.06.14.ebuild 1169 BLAKE2B dcb78c56fa4c10745955155aeee3d95f790d933e5296d4abc97dc1c6f73873591e332f0bb9ac57eef4d430379dbd56d1fed947153558ce515c20326dfb15f5f1 SHA512 9c13a07afcc905de357e5621ca8ce77b7adb669af80a94a5f4d45cf91a00ae8d65b081c845cabfaae9b0536eb4f2d255eeb8dde85be824d4bdb7de0c8f5dbe6e
 EBUILD labltk-8.06.7-r1.ebuild 1211 BLAKE2B 370fc276c5df5f5a2ca902ee8c5d950b847cca5bde8e405c2cb8fd607784244cb9be4cc7bb779cb5b38cb2dd0c3425096c966a2aa4d1f2c7aa0c68a3cfa784cf SHA512 a5458fd08adee2cb8cf124a737b1092666a1ae600c440dcde5b21eff4209c00bc1ebe5f0f6355f20efb46d926e32a2aefdcbdaf36520ce5e47a5c44a8445d5b8
 MISC metadata.xml 313 BLAKE2B aae3866559a63cabfc03f6e436564e5592f62c910cce24c44f5b217ef51f6f391ae9499167df4399491d5c89132ce857edcd50354bc6ac1a2bc6db9c829c639c SHA512 07873e6c2cadaa8ae45983cba98116688a436cf5071b0ce39c3b3472783ab5b3ab32052a58df81a9e2e26b155bff0c5907f82c7408962380b4d31d2d8dd04d09
diff --git a/dev-ml/labltk/labltk-8.06.14.ebuild b/dev-ml/labltk/labltk-8.06.14.ebuild
index 20f88b5c971b..230eca287bba 100644
--- a/dev-ml/labltk/labltk-8.06.14.ebuild
+++ b/dev-ml/labltk/labltk-8.06.14.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~a
 IUSE="+ocamlopt X"
 
 RDEPEND="dev-lang/tk:=
-	>=dev-lang/ocaml-4.14:=[ocamlopt?,X(+)?]"
+	>=dev-lang/ocaml-5:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
 	dev-ml/findlib
 "
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index f3caaf789ac6..d907c0475449 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -6,6 +6,7 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
 DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
+DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
 DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
 DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
@@ -15,4 +16,5 @@ EBUILD llvm-ocaml-18.1.7.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f975
 EBUILD llvm-ocaml-19.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240608.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240615.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
+EBUILD llvm-ocaml-19.0.0_pre20240623.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240623.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240623.ebuild
new file mode 100644
index 000000000000..36b3716c0372
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240623.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 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:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/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
+	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
+}