6 files changed, 25 insertions, 116 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9e9b707e00d0..3457488ce75a 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 69ead8b6bf2b..8f0d96788027 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -4,10 +4,12 @@ DIST base-0.14.3.tar.gz 385390 BLAKE2B e951fcf90f1181720346be0dc048bdb3d3f0b6417
 DIST base-0.15.0.tar.gz 414117 BLAKE2B 7df1e74fc74f7d58d8e3b524a95a8ea8750dfa39bd31271b84d47ab4a4c5c74f17b9ae9fbc5a352431b0b222ff9437d11f22eb6b846c74d9baac96cc770dc53b SHA512 1e9a507f66a44b53eb80c866a544263ae5811992866043cb626826de8a4b4c6086601554fbe93ec874773edd229fab052be9cdfa5b75ef3bc7eaff468b53bca6
 DIST base-0.15.1.tar.gz 414911 BLAKE2B 4f0955374213bed241214451cb930c939bfed7208668b2b6676786a37c60f14b671b50e9a8893555693068dc2272e21f63e4def938dbe064b4ecb143925a8aab SHA512 4ac43829229765c19d8af98d45783c098abffd026328b03f5dc4390911b26cf6b65879d4084d30dd4b0b4f5a1d23079270e9bb10b1aeccf575ee70c7e16021ec
 DIST base-0.16.1.tar.gz 442796 BLAKE2B 8ad6426bd32700e0d8bfdf0315d2113cbfcf69459b6b3a5997adc6e320885e2706f72cdecaeeafde2a77c089752f446c9d865c152cc3cc2ecb4f98b1ee19548e SHA512 347ccc68be09ef207f0ac793f1c472688855ba53c317a35c95f7124be4105985b54f866b604a66a9d2e54bc320f7b29ffa3eb224622b1cce6ca504e1ee4888ff
+DIST base-0.16.2.tar.gz 442593 BLAKE2B bf0de878e412719a370b17c741b3191bacb34416c7dce022a56944803db30699b40bd750d8290e40a817dbd4e0dc8d3298e816c8ce31ea2197fbaf1eefb368a3 SHA512 d5f00c411dbdffe6cabc7ec309550c4f947e79c9ff6c95cbb2d148fd0bbff060db8019c9544c1db56172a6d143f810e700d7092d404ba6cbcd756cbaa896813f
 EBUILD base-0.14.0-r1.ebuild 529 BLAKE2B 926397a17c47bca7fd76f073e2804928e2853c66c38678d7e65282ebc0d60f64f1af3bb8607bb73653992f0c68998e2a107bc48b195b4f12175f11f953622984 SHA512 ce5d3dd77c8e095841c9e0896a2a366c0bcb65eb540df0b24b6ed391758457191000f3477f8e87e66f1b529894957abde7f6233106fee35e90b3ce285230192a
 EBUILD base-0.14.1-r1.ebuild 512 BLAKE2B 31ad5cfcfdc7a58b7fd3343e17e18f579ffb41697979e2f0e9706cc3f5ca143b6d9b283348d5cd87dbf5087cf4d8e7ec8643391a8731adb7634b2d2e255944dd SHA512 9fde5670cdefdc4c36523fc63ad3d54528640f01deb97f0beedbf7f40f35df75ed31a596cb5925654f1dc3c6546b137d83aca7d34fdc4ff07676f8ac316c6cb0
 EBUILD base-0.14.3-r1.ebuild 519 BLAKE2B 47ec0987bb679f60f1ffeb09c83d71b21add88ddb7ebc73b2ffdf35478ac2cf7c8755c9af9f0a1206c57957c78c748e7e20c2e85c7cf0e02f9fe40403c27a996 SHA512 d6b621adac7f178d39cccf1e8653eed6b2177d2eaa2959fb2d33a0584da7b4dd7782c647b8f72fcd1c69cabe8bb87f65e3f7ecc3575a6676292dbda95c7c95de
 EBUILD base-0.15.0-r3.ebuild 525 BLAKE2B 3650bab4197be9ca9f88e085da93892d7a8237bce9134cee21d9c288f9c7e3eb31aee94cce4c5896eba81429c5d43c17a0d05dfe1ea4b63b07a8ccffa0b636bd SHA512 e59f607e7a0151786875d2ee107ecf2d1f424faf77bc704e12c324662a05eac9688c2afef76549f2dc776fd2e774dbc1965249056a75b8832b7df16a0dfae831
 EBUILD base-0.15.1-r1.ebuild 520 BLAKE2B f204c05f6eb0751e044eff605cd90fd72e21cb7b4e222514b2a14a4ada7a89a542e534b91953c003485835f711fbc329701e8c0b1de82d7fdecae68b2823cd83 SHA512 46eb0eb4f9efa20fa56432c927f5c1e26da242041ab8501782400aa28c1a9e2004e0b881e42e5c63d3b4cbbfcfab6ae3586b5ef1b7c814a963490d90606e12d7
 EBUILD base-0.16.1-r1.ebuild 525 BLAKE2B 26da91a762e713971a1b8f92e7164145cce2a755fd16b4b0547687953b2ff055428248be3e7b389afe2652891d9cbb9a37aae08debf99cb9b75db2814eb9dddd SHA512 bc642d7a019934f771db5335ebd1c5e278c2956b3cc8035974ddd9613b130e4f2c990b7318c80f414a594d6e8599a7d963cc1c242b319af4a7b2ad1217bb069f
+EBUILD base-0.16.2.ebuild 525 BLAKE2B 26da91a762e713971a1b8f92e7164145cce2a755fd16b4b0547687953b2ff055428248be3e7b389afe2652891d9cbb9a37aae08debf99cb9b75db2814eb9dddd SHA512 bc642d7a019934f771db5335ebd1c5e278c2956b3cc8035974ddd9613b130e4f2c990b7318c80f414a594d6e8599a7d963cc1c242b319af4a7b2ad1217bb069f
 MISC metadata.xml 418 BLAKE2B 897b294ee364c5eedb4f7417bff0258fb271ea431dad1bd77482df74529ee883f5ef39e6c50554b670a344ab3d0ee8f5e19e83ccf2670346defde1a64af413b1 SHA512 6fc42ca5665bf4689ba65be528532fdbaee51371e98b58be70f56479ad0c1822e6f78ddd7a11ab0451f49b885151ab80c651c884a136e24603c9564b43443d81
diff --git a/dev-ml/base/base-0.16.2.ebuild b/dev-ml/base/base-0.16.2.ebuild
new file mode 100644
index 000000000000..500f481d48ff
--- /dev/null
+++ b/dev-ml/base/base-0.16.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.14.0
+	=dev-ml/sexplib0-0.16*:=
+	dev-ml/dune-configurator:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 9870d81df86e..deed144f2768 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,14 +4,11 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
-DIST llvm-project-3cd3f11c174baa001b337b88c7a6507eb5705cf2.tar.gz 194446197 BLAKE2B ba2ac8334f90fddfd9b8f97abd2f77bd1f1ad00c97f2b7daf6b799fe49755a9bd07e017e93cc634163ad7499e70d886556715e26e9d7ed9017018861c3522735 SHA512 b12d02a7b4df08e8decf99ac86875bef72ff2fa546699e7a94bfd2b2ad1e1256aec66185f9e2f7c2f5d06b1eeb3faae44a2c457b33e5c7416d3bd9921759b39d
-DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc
 DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.6.ebuild 2533 BLAKE2B 598e42d89fce0b0a85a01b41166de25343dd6da9a6b422ff9f35f0cf515b759f85a180c25108df9ffbd8b773daad310851f05a11489e0af423c13a09b16c4585 SHA512 10809b6cdc64d70d9976a694123102de10804f65a5a9ea1e051638929c31e343f64388340307b500acd760ebbc2187ac6340336c39d6ae1280c34c5de5ce386d
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-17.0.0_pre20230705.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
-EBUILD llvm-ocaml-17.0.0_pre20230717.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 EBUILD llvm-ocaml-17.0.0_pre20230722.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
+EBUILD llvm-ocaml-18.0.0.9999.ebuild 2518 BLAKE2B 73efb3edd502e713d1ed57d5387532ed7b4dd10831b705339eecd8c5df936ee31ff02f877ad36e0b30564f9837ec8c9535bfcbfc41af01ccaae1e4149e5a574e SHA512 42f7cbba2c706ae1c8198d1e2c1ef4771baa631d2cae65ce957c7ad726a7c43d79ce278c39813781ac72ee7c527543514c1b895b5db24f172893b8796210877f
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230717.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230717.ebuild
deleted file mode 100644
index 7499a8afc1dd..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230717.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-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
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	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
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230705.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0.9999.ebuild
index 7499a8afc1dd..7499a8afc1dd 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230705.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-18.0.0.9999.ebuild