gentoo auto-resync : 13:07:2024 - 12:26:41

21 files changed, 305 insertions, 219 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index cd1fabb3bb95..b997fdca6a8e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index ba8e45d8351e..2e9889197b72 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,8 +1,10 @@
+AUX alcotest-1.7.0-time_float_unix.patch 1758 BLAKE2B 1a4b36da6fa408eb124ca042cc54115c80fa7c4fb1c740949df4a1d1e2faa9961314e9481b4dbed2107d94822ce3198d078aecef6db7ea1664df6c8cf35ff654 SHA512 259ba6333a4e4257870c7255dc6be07c7bb46f9362916e9b18d23adf649eff240778de83327dacb17bc386aae4acaee97e7ba12c6ac1001978918b3ef2f17da9
 AUX unknown_option.processed 149 BLAKE2B ceba6d06805d28310bef8f8b098a83b5e87c7ae412ec597c13b61a157e685bd1c6e8bd74b31296116b24b38e3de7e88267f48dd1bed7bcef1400442ef0dfef6a SHA512 8bcec43869fc2748011f252396546479f7f0a87c97fc5b144fee9199156820129bd10b30c74db6ce2a7d5e3f4087546ac66d85922effe85f45a2bb6c1c523e9a
 DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
 DIST alcotest-1.5.0.tar.gz 288227 BLAKE2B 6af28f2516888273903bbb7750ba583778c54447157ece29ad8053323492dddfde9b901699be26c868f1f3835ad89d6f163176033f52ffdccc82fa2609e57b64 SHA512 9f496d1b14a78a9cba5dfde71cbda41d3090d2083bc9895dc9d9f54876b86630079219e678f13f6ffd382deb2a1a298b61b2a222fc65d25d4a242d8c280b4784
 DIST alcotest-1.7.0.tar.gz 293433 BLAKE2B 83a9b1bb3a6d9ec09de739e77a6e1085bbca328f5be39f6ab28931a7bc16d223d571917f924598ddcc399910f986df95eb72ae61f28512221d9de6174ffe3988 SHA512 6e29cc39109f5d83a175578f48ff1b48fdf13913b7cdd332823a660c681ab0cd5dec41b10322226102b023d7c74620decf964458926abed56ae835e4e565014e
 EBUILD alcotest-1.4.0-r1.ebuild 689 BLAKE2B ddbe8a6530a28029dff4e5c3a5125e657683a7397f122c3db00bafee0707d82aa6e016cfd9a1e26cc956ae7463f848d6fc7a3262d45db138c4284ad98c140463 SHA512 2e678ac915d567ab8f7c4de7846cbeecdc77844da8b343ed05f8829011976f732d57fc286c11edd62a24f922e0fd769ce091289d85a638d709f2c9850672a81b
 EBUILD alcotest-1.5.0-r3.ebuild 941 BLAKE2B c8fd6547fdec1e0f834a09039136f1f1a5d368d1260da23fc1deece5c256241f885145d3e42dc242354e37bc647ee62c5e073733833ecd91681245c0249663ac SHA512 b30f27da81bf0d5a7ca3b3b4e69a86e24fc04bb50db8d5a6d4b84b410aceee78349f69355836f342037976f934358bb73f1b8f470b53b7bfc47524ca59cddbba
+EBUILD alcotest-1.7.0-r1.ebuild 1097 BLAKE2B a101b6e330341a4f455d2cc34dd074f7c1ca096b5ae69ab9a1da5ffada4ba8226fa4297928d55636915efba28fb111f01676f8bb526bb696691b9ad2e7b7dd87 SHA512 0b984cf0a0e6aef57070154826858f3d3d8f3f9fc787abd65ee3d34b370db7ddf7ba724b5e069b42fce7e1c9e8f321e8dbfe44c641997a86e1c4ba8a22ced20c
 EBUILD alcotest-1.7.0.ebuild 780 BLAKE2B 791dfcb90027dca4489f3dd5d5bc8aa170f7f076c07a20f7ddaf303d8864fe7720ed5a34792b55ecb467dcc3b3adec9c98877dcb729c12ba193efcd20943718d SHA512 81ef9bd3ddb5e933029901ba5414ed0bba389c38d935f648de7c69aaf3c8994729b89df143a9b5731efd04f98c9312b1d1b09761e091ac863074dec98ac9c2ab
-MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
+MISC metadata.xml 438 BLAKE2B d0888aadaa7f4d98611a78383f54bc73627162059cfdb3d03d279ac707af7784952d148d8e2c17a41a763ccd6de0f5466bf09a79b254f4a33c30e5219183b97c SHA512 6bfb4c69324723a05f9b30151166dae2399826a15811b53ea6b7b8b614d6a34a51c57b13de2e38ed1285d62e87a90ac7e582965faa04bd1265752c9202d90bf1
diff --git a/dev-ml/alcotest/alcotest-1.7.0-r1.ebuild b/dev-ml/alcotest/alcotest-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..d4859697c59c
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.7.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/astring:=
+	dev-ml/async:=[ocamlopt?]
+	dev-ml/async_kernel:=[ocamlopt?]
+	>=dev-ml/async_unix-0.15.0:=[ocamlopt?]
+	dev-ml/base:=[ocamlopt?]
+	dev-ml/cmdliner:=[ocamlopt?]
+	>=dev-ml/core-0.15.0:=[ocamlopt?]
+	>=dev-ml/core_unix-0.15.0:=[ocamlopt?]
+	dev-ml/duration:=[ocamlopt?]
+	dev-ml/fmt:=[ocamlopt?]
+	dev-ml/lwt:=[ocamlopt?]
+	dev-ml/mirage-clock:=[ocamlopt?]
+	dev-ml/re:=[ocamlopt?]
+	dev-ml/result:=[ocamlopt?]
+	dev-ml/logs:=[ocamlopt?]
+	dev-ml/uutf:=[ocamlopt?]
+	dev-ml/uuidm:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-ml/dune-3.0"
+
+src_prepare() {
+	default
+
+	if has_version '>=dev-ml/core_unix-0.16.0' ; then
+		eapply "${FILESDIR}"/${P}-time_float_unix.patch
+	fi
+}
diff --git a/dev-ml/alcotest/files/alcotest-1.7.0-time_float_unix.patch b/dev-ml/alcotest/files/alcotest-1.7.0-time_float_unix.patch
new file mode 100644
index 000000000000..cb54fb280a43
--- /dev/null
+++ b/dev-ml/alcotest/files/alcotest-1.7.0-time_float_unix.patch
@@ -0,0 +1,49 @@
+This fixes the following errors:
+Error: The module Time_unix.Span is an alias for module Time_float_unix.Span, which is missing
+Error: Unbound module Time_float_unix
+---
+diff --git a/src/alcotest-async/alcotest_async.ml b/src/alcotest-async/alcotest_async.ml
+index 97ed610..b6a826f 100644
+--- a/src/alcotest-async/alcotest_async.ml
++++ b/src/alcotest-async/alcotest_async.ml
+@@ -7,7 +7,7 @@ let run_test timeout name fn args =
+   | `Timeout ->
+       Alcotest.fail
+         (Printf.sprintf "%s timed out after %s" name
+-           (Time_unix.Span.to_string_hum timeout))
++           (Time_float_unix.Span.to_string_hum timeout))
+ 
+ module Promise = struct
+   include Deferred
+@@ -24,7 +24,7 @@ module V1 = struct
+ 
+   let test_case_sync n s f = test_case n s (fun x -> Deferred.return (f x))
+ 
+-  let test_case ?(timeout = Time_unix.Span.of_sec 2.) name s f =
++  let test_case ?(timeout = Time_float_unix.Span.of_sec 2.) name s f =
+     test_case name s (run_test timeout name f)
+ end
+ 
+diff --git a/src/alcotest-async/alcotest_async_intf.ml b/src/alcotest-async/alcotest_async_intf.ml
+index 27df58c..baa55cd 100644
+--- a/src/alcotest-async/alcotest_async_intf.ml
++++ b/src/alcotest-async/alcotest_async_intf.ml
+@@ -2,7 +2,7 @@ module type V1 = sig
+   include Alcotest_engine.V1.Cli.S with type return = unit Async.Deferred.t
+ 
+   val test_case :
+-    ?timeout:Time_unix.Span.t ->
++    ?timeout:Time_float_unix.Span.t ->
+     string ->
+     Alcotest.speed_level ->
+     ('a -> unit Async.Deferred.t) ->
+diff --git a/src/alcotest-async/dune b/src/alcotest-async/dune
+index 9497c26..52ab50c 100644
+--- a/src/alcotest-async/dune
++++ b/src/alcotest-async/dune
+@@ -9,4 +9,4 @@
+   async_unix
+   base
+   core
+-  core_unix.time_unix))
++  core_unix.time_float_unix))
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
index 33063c514b9c..f6ce5fdda9c8 100644
--- a/dev-ml/alcotest/metadata.xml
+++ b/dev-ml/alcotest/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>fogti+devel@ytrizja.de</email>
+		<name>Alain Emilia Anna Zscheile</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ml@gentoo.org</email>
 		<name>ML</name>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 3a8ebcba4abc..5fc46df3eabc 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,4 +1,3 @@
-DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
 DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
@@ -8,13 +7,10 @@ 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.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
 EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
 EBUILD llvm-ocaml-16.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
 EBUILD llvm-ocaml-17.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
 EBUILD llvm-ocaml-18.1.8.ebuild 2466 BLAKE2B 7480f9140cbdd2ec337cd08924013f1f9751bc34c3223b3f5be441e4d06d131f74aca0cb0115c71ebacb3909240e42d4608dddf98bb6f69e371d5e86e19141f5 SHA512 b7c05d3be29399eb9fb4267537a450daf00b7d8f6bd2be472e5802d4072e3a805db8d5f4fa2830ec46655170a7f2fc1119825327b2d4008af8364772fc215f65
 EBUILD llvm-ocaml-19.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-19.0.0_pre20240623.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
-EBUILD llvm-ocaml-19.0.0_pre20240630.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-19.0.0_pre20240706.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
deleted file mode 100644
index 36b3716c0372..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240623.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240630.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240630.ebuild
deleted file mode 100644
index 36b3716c0372..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-19.0.0_pre20240630.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
-}
diff --git a/dev-ml/ocaml-crunch/Manifest b/dev-ml/ocaml-crunch/Manifest
new file mode 100644
index 000000000000..39c924e06502
--- /dev/null
+++ b/dev-ml/ocaml-crunch/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-crunch-3.3.1.tar.gz 60602 BLAKE2B 8218c8ca3e0791c5e2857fae4f11b9f9bd1d6687f3b21812762de8fb11c523eceb2bb3470c637509466963bd3c7df5edc6075e79ed900449c03b7fce2b771991 SHA512 9e3fb95d9b592c6463a8c4743419bd100b06727404310089f308705b38a0d3eaa06f58eeaf8b9feef2ec506e4d7035481b3c39b38374d6c1f24903e93aec660b
+EBUILD ocaml-crunch-3.3.1.ebuild 536 BLAKE2B 078e6f060f9d90fa9864adb27ac705b632eda356cb1847182d5497493442b50ef8248cb62cabb1f5c3b0b4cea64a81aa32b9826636f3891f3fbc94faca0d09ec SHA512 3f19acbe7f7365c26f2a601032fa7bc102d0a23ba22f1c90207177253558ec500fa823703e724a27d1ebddaa592ec30267b44eadbf75e620e3649eb515dfa312
+MISC metadata.xml 317 BLAKE2B c4b2283029e5668d511c233bebf0ff097519934cde63e5909645903e187a8b123977112d5fca00be3c8cb36b7dd5076b2c72fb366a16d52850f127b86224c3db SHA512 2f1a99cd82e494d35f8ab3bef6b240eaf79cf5c493b9a5924df5643ad5924a00e129675fd92728f3da4f2e34d1c5667c6768c06c91760885e757fdcd3cb61f7c
diff --git a/dev-ml/ocaml-crunch/metadata.xml b/dev-ml/ocaml-crunch/metadata.xml
new file mode 100644
index 000000000000..52be4be3f2fa
--- /dev/null
+++ b/dev-ml/ocaml-crunch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mirage/ocaml-crunch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-crunch/ocaml-crunch-3.3.1.ebuild b/dev-ml/ocaml-crunch/ocaml-crunch-3.3.1.ebuild
new file mode 100644
index 000000000000..02a2c8bbce48
--- /dev/null
+++ b/dev-ml/ocaml-crunch/ocaml-crunch-3.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DUNE_PKG_NAME=crunch
+inherit dune
+
+DESCRIPTION="Convert a filesystem into a static OCaml module"
+HOMEPAGE="https://github.com/mirage/ocaml-crunch"
+SRC_URI="https://github.com/mirage/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+DEPEND="
+	dev-ml/cmdliner:=[ocamlopt?]
+	dev-ml/ptime:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-ml/dune-2.5"
diff --git a/dev-ml/odoc-parser/Manifest b/dev-ml/odoc-parser/Manifest
index 5339d38d4026..c0119999d490 100644
--- a/dev-ml/odoc-parser/Manifest
+++ b/dev-ml/odoc-parser/Manifest
@@ -1,3 +1,5 @@
+DIST odoc-2.4.2.tar.gz 1251791 BLAKE2B 13071bb4deca73fa16731e32e43238d1604f94d889d5fb8fdf2c29c8fb241abda61e2c108b83925fb6671598cced7b916803cbc015bd277646c0a3768b1c3fae SHA512 44086ad906e7e1a620d0f635e0e3e89d4bf5bb4f20e6c8de76c54493de8555916bdae314b473fa3b6041fe3e1c0d96dc47016c7e6d589517101c7282583efdae
 DIST odoc-parser-2.0.0.tbz 34826 BLAKE2B 0d167fa7d768dfac3b45740707b0a84d300999ef4334ade70286675d906cd7d8c70fcd27e563fb0ab4450f6a0ff8097884af267b376b51e7a91ccfbecb8ac06c SHA512 d2bffa3e9f30471045682e390dcee7a2c1caf3831bca4bd57c16939e782c2e23434e6f1c9887580a1804800b3629ef4c4311a9d418fca5a939f324650d54006e
 EBUILD odoc-parser-2.0.0.ebuild 539 BLAKE2B 5988b2af483221657d38abc71bb409cbc9716ea636a871401d2392269f406d54d7ba65f8f8d7056543f6f8bdc913dde0437701b46bfbd1d1d83bd8c3be761e2c SHA512 ea55d6b39244166f72e2844abc3dd79e93a5ee4ed1d0619f0b9038d8dcc08fc63870732a09f12b96ba69d7011f094b1035e38471af92500c73715d131fcc4671
+EBUILD odoc-parser-2.4.2.ebuild 723 BLAKE2B cb838a7039673ec88528331a7d9870c3b06a3444767b1aa64a2296f02e4073f1d36793e418658256f0b1324f508d573f0efe9b01541201d480f0d85722730623 SHA512 97d6c69831435dafa3b090e00266d28f5a774e65c0770f728c617f4c6f1489636c16f5c9c56f80bebdcb838a1c2e961758e6e2a0b3751910c9430d55c004e112
 MISC metadata.xml 601 BLAKE2B 18f8ae412797bedb9b3d12ebefa7da5c7fefb00181e0c9392cc2f62ab76c2ad4153392c903a6a2221e208b0916fc9d727d840b09dcce3278f1985c6b0b968022 SHA512 bfd7ea44b990f8e20829b4b6a7a64e49bde353c0d4158ff95273c672fd803429c3b81c2c926f9c1a12d433ea704a757f6d9eb520512e074d83cd52bf257ff817
diff --git a/dev-ml/odoc-parser/odoc-parser-2.4.2.ebuild b/dev-ml/odoc-parser/odoc-parser-2.4.2.ebuild
new file mode 100644
index 000000000000..8f5e20147d25
--- /dev/null
+++ b/dev-ml/odoc-parser/odoc-parser-2.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME="odoc-parser"
+inherit dune
+
+MYP=odoc-${PV}
+
+DESCRIPTION="Parser for ocaml documentation comments"
+HOMEPAGE="https://github.com/ocaml-doc/odoc-parser"
+SRC_URI="https://github.com/ocaml/odoc/archive/refs/tags/${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+S="${WORKDIR}"/${MYP}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/astring:=
+	dev-ml/result:=[ocamlopt?]
+	dev-ml/camlp-streams:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-ml/dune-3.7
+	test? (
+		dev-ml/ppx_expect
+	)
+"
+
+src_compile() {
+	dune-compile ${PN}
+}
+
+src_test() {
+	dune-test ${PN}
+}
diff --git a/dev-ml/odoc/Manifest b/dev-ml/odoc/Manifest
index b8e7e6f197e1..daddbf8100cb 100644
--- a/dev-ml/odoc/Manifest
+++ b/dev-ml/odoc/Manifest
@@ -1,5 +1,7 @@
 DIST odoc-2.2.0.tbz 1548871 BLAKE2B 251c823e5f93e8080d52486e9d048a0c31651b6ea9d4bfdc3202488d7bcd750f9c2899189b943500253bf1e6041cf0283ed5e57c34d1a7d538c7c3710fb9a260 SHA512 9f8fc2ee6b25629474e8aa69dd460becab9277261578af0f7b97f7f779cc5f1056d1b5f14ab583b9b94ea097e5df2d6e35040f2a4887021209705486f9d44a22
 DIST odoc-2.2.1.tbz 1548027 BLAKE2B 846890375debd70519879de261ab829b34dc4f7754ef9d32c2cf6fa07d86ed721a828987398549021ca7805a4e298fef516b5c6e0691e083f8849ccaa6d4184e SHA512 044e37eb3dcc77d9cc8124be558cce77a438723b90225273fb3401d3315c57c8c2f395a48ebd1b6aacc01b00cbfa4bd0be1923d2bd9bd3cc92d0604eadaabc4f
+DIST odoc-2.4.2.tbz 1761532 BLAKE2B d690b94eae406b66ec5bc6ea44d0bf006eea534861e8a457f0355cee50b3908173c249f69c59726b867ee38c21715c05217b409fb2d6a74d26c782e8357bc8ad SHA512 8d48c99e0c253791177dd65287ce5cee47e7c6805e33f3ae0cf6c8e7d349128f26eebbe36459c31429c11519ad5979dbe36fbcb9403a5fde199a69976a3fb3a6
 EBUILD odoc-2.2.0-r2.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
 EBUILD odoc-2.2.1.ebuild 584 BLAKE2B 663ac5582b30ad58555bf5bd69a0b2c60fe7f1b0be4eaa844926fbbc0ce96d3ec992097949e19b73d6582e0bd1290fd6f37fe588732f815b7b5e71979c692999 SHA512 bcc972d027c14203daf7f2c05ca1633618642973d9b7bfc71e39fa616721577ead3c6b2f262fb371eaf3139bdaaa4a0d15d6f3f44fa4e6442afd1aa7c094580a
+EBUILD odoc-2.4.2.ebuild 711 BLAKE2B 19428f75b5f91da04c054eb618f741680a9c84f1c43ee67591263283aa760cf03fd373d1fb89e964c56f1a5770c97f3ed6076389ac3a9c8262bdd14b6736755b SHA512 d64c3f351639c2b15fb8522a26c34ef0e3bfdb173c40f90bd1820d49534724ab7685fa6eb71d9bc71186de579ab62fef63b7e2aee5e43e8ad033cdc087748815
 MISC metadata.xml 522 BLAKE2B 04acd17984b96b5fdf41120b46c1f15ab1a2b9ccac7312ee27e41da5985cbed08786aa9349cec268f224bc660ea3fd902874bd029f37355685b2fcc8b7093b07 SHA512 d969745657f9335411b45ca5efe110da0d017dac7efe5d5357bdc6f99852c279d116aaa02101b443ef45229c1b9c809db65cfcd719ae48ddf198d5b2923b9f57
diff --git a/dev-ml/odoc/odoc-2.4.2.ebuild b/dev-ml/odoc/odoc-2.4.2.ebuild
new file mode 100644
index 000000000000..084faf30fa68
--- /dev/null
+++ b/dev-ml/odoc/odoc-2.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 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-ml/astring:=
+	dev-ml/cmdliner:=[ocamlopt?]
+	~dev-ml/odoc-parser-${PV}:=[ocamlopt?]
+	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}
+}
diff --git a/dev-ml/pp/Manifest b/dev-ml/pp/Manifest
index 662aa464d3c7..e4affb6e8651 100644
--- a/dev-ml/pp/Manifest
+++ b/dev-ml/pp/Manifest
@@ -1,3 +1,5 @@
 DIST pp-1.1.2.tbz 9586 BLAKE2B 36bf09c2623c28215f2d4d3260681dacf7041919e09eb5e53ee04f90706b037784c0f7d5cbdfee58ce2808f28df09638fa4d15b82d8542badc05c06c0d8cce96 SHA512 58f78b083483006b40814be9aac33c895349eb1c6427d2762b4d760192613401262478bd5deff909763517560b06af7bf013c6a6f87d549aafa77b26345303f2
+DIST pp-1.2.0.tbz 10959 BLAKE2B 92d9ca14a9c6370cdd2ccadacfe74cd44fd260a5c0c8ae757354ebbde9a41be14c4af88636e8cd8221cea3a7b4bb3eb584e51a220055473462ed8c43a5d3e0e7 SHA512 912164c2aa7241d73f735dadfbefe8ed0138d241579d2e885440e068fac78eb9f0b3d782c2420e757e313168c1725daff6ab91800dd315b1e05288456998b40a
 EBUILD pp-1.1.2.ebuild 459 BLAKE2B d1221e9a924da2f884f2eec7bdcff515faecc9ddb8d523666267f0acc3e9b8cecde082570d7ae1781c505f63c308a94b9869a032dc8efab8025d32b884389693 SHA512 c017a1d89a782b9092e1d8c517dc35046c90dfc0a79f5de9b83c69a957ddeb070ffcfee13ae8e0bd605a279d9a272adfb1aa42b60f1c8d38da28ba19f8adbb97
+EBUILD pp-1.2.0.ebuild 451 BLAKE2B cf78880940d4cf96e1248f93ade19b80f22c22098348ad1634c6bdbd7a0b99f8d41ba24f3a98b09de3ad8e8703006f53991d65124f85234572f664e27a1bb882 SHA512 3494db9ef59f1f547251f132ec00533517b11c87a5750085c10c1d78da3b40124a3fc504fa6ce2ca05d3ebf2481bcd82c03c54dca7d6ed8652b42f1bcb6f051e
 MISC metadata.xml 311 BLAKE2B 186c7e33d7f49e9833a705df8f1d1e55af53322a65a71e7a14828929ff71f661f7e0bd8f69d3fa21851a58d24273108d94f789491e9e9c65021f90d2798f1164 SHA512 c936324d80846839c2d209666f8ecbb54556bff77dd198da029944321d0344a70c16c7fecb699449f29b600d68d249a3b9ee829c53e2eee9c5b51320668cd952
diff --git a/dev-ml/pp/pp-1.2.0.ebuild b/dev-ml/pp/pp-1.2.0.ebuild
new file mode 100644
index 000000000000..b9cb6b75d1b6
--- /dev/null
+++ b/dev-ml/pp/pp-1.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Pretty-printing library"
+HOMEPAGE="https://github.com/ocaml-dune/pp"
+SRC_URI="https://github.com/ocaml-dune/pp/releases/download/${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index c217fa1f5720..4f73d87e605c 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -2,8 +2,10 @@ DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c
 DIST ppx_js_style-0.14.1.tar.gz 10587 BLAKE2B a77868e692180a386622fc19f696a24a9cd33863289a673d142c63003e5345a9cbe8921a7c1cf163db97f21da45c4940978f4e5d6960abc1fbc44b4283f09b42 SHA512 7c96d0e21c68956f3c94d6b6f02d70451d7e041104975171c8fb1c0f5dbcdf5b2111c5d05b247a47523abc7cf30b9d20cac267e542db459154edfe77516d2c46
 DIST ppx_js_style-0.15.0.tar.gz 10647 BLAKE2B d7cf2efa261383084a8f4bfc2508d8c345415b50e6ea83128bd40cffbcbe7eabc8fbb3037176ba73c303de199ca3cc96925e077c123a7f3a68e0a5c7470d56eb SHA512 10e4e9d737551538cdd89466acf76df04e87669f00236bc89fcad318b862efcee94f59a687d07fe5a559c00a59954b07185dd39e034d4a15869c281eea2bec4e
 DIST ppx_js_style-0.16.0.tar.gz 10782 BLAKE2B f8d2cf691792240bb88094e3f3e09a82d2f947ac0fc2dafbf99351943e069cb237fcf17c45d1d097f3d78bafe4ef286acc931578180695cd7c237f4f45ddf7e8 SHA512 5a77fb8d8f7f4713a30d202d8edc16f11509cc9a6b4fb54609c774bb78f0dc1bb22d7064b5a2ea0c080aea32b626acae7a20af8e16913607c01e285134bead2d
+DIST ppx_js_style-0.17.0.tar.gz 10758 BLAKE2B db3710441f75cfa0e9af4589bd061896cdc384d5abcf255e46ea67846df0c18290257b5fb17e57790ad8bc8543832ca95be425e918aa8a5175440236ee0fecaa SHA512 e5abb24b5a445a1f8e30ade007f2b44e7f0dd0151b2a902943f056d338d8dbb9c17f614e270797f6fe52362a24b4fb56787ba891e5aadec673afde5c46dbd8a5
 EBUILD ppx_js_style-0.14.0.ebuild 663 BLAKE2B 69001a5da84453d4e7b15c6308259278452932120b809c6a9c2bb95e2b16e95a57ac269220496a376915e567c8f4f32ba78d2e14aef61d62ae57c145862cb7ea SHA512 9aa87ab4a22725f6ec9934acac59542e8c2da5e876d5e67393aab0414af640a3c49163a401f2923c8c1f7e41742319f6249c52e2bdcf8017285aa10e8f3f5212
 EBUILD ppx_js_style-0.14.1.ebuild 647 BLAKE2B b5b58ca5c0da6fc51e603e93c51d0cf83efeb7741c0038c079897b6290a654e6687e05a2e3498b26317d0003eeefff9d22da02dd8a4dbb334dde0776fe148b30 SHA512 210b9254d1c2cae99ef32c30be5bfbc200f934aa95a75e7b926fa19b5a5d4c17f9612be03c02cbf2ec4685d00cf1dcf701cd886266ecf63847337a795a0faf2a
 EBUILD ppx_js_style-0.15.0.ebuild 589 BLAKE2B 834f47faf4906360f14cffe70bbff2b856e3282142904ecebc060a7f3c8a1696fea5d96c3c6df9b90f747977698b0868f71158aa8cc7aab913d219be69eff231 SHA512 7ef84eb9e7b158a4ea0286af3689f0c263a01b81aff5c465a861bc5137c798439f07505e35ac9c117ce0ca7270c7aa1bd8fd6c06ae93e43c84aa8e555aac1b0b
 EBUILD ppx_js_style-0.16.0.ebuild 613 BLAKE2B 5738b4a97cc1a98532b799fc5776b4611c3062d0a8599fa2acca57f9cb4b79d198a7d9fcc00ad1cdff7861bec72ccff54cc1fc622f741ad71202c07dd8955604 SHA512 79716e71c3fb6f02370e88cf61a13bd4cb8ab1d28ecd8decea893171d955e04dd156fc0c314c95d9bc94edd491ce29ea979cc3b68b6dcde312307ae58c407a41
+EBUILD ppx_js_style-0.17.0.ebuild 586 BLAKE2B 34876f4ad25bc74970ddf8a6e5549a9c6ee936e9b0abdcaea0a0fb1d52da4bff8d753b64ed55d6c30774f2fb6b41263a273250043c9f2a281786a6d0a304c83f SHA512 f1ad4257a2b07b33cdce9f967fc547eb11d30850135343cf58294bd3d5a231a94bf5f3ab906aa06c0efc0a94c00c7fa380b7d2ee32929944f228ccf716f8df8f
 MISC metadata.xml 321 BLAKE2B 87895afeafa0ff751e59f8dfae1b5056632d7e72c2eb9e80c87fb983b953138a47213f675252294dab1e85e878636bc2a0327ea2cbd2d3312c19a73c1a058f41 SHA512 3afafe5c1cf470c4ec528b4fb0efaaf912e72a83b0f4c35e5b3292bc4eb9e7e0571baed3485be331b28f01b0e849eac7a1e5640e46791fb21eb5e2286192bfee
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.17.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.17.0.ebuild
new file mode 100644
index 000000000000..697f367db194
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.17.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Code style checker for Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/ppx_js_style"
+SRC_URI="https://github.com/janestreet/${PN}/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"
+
+DEPEND="
+	>=dev-lang/ocaml-5
+	dev-ml/base:${SLOT}
+	dev-ml/octavius:=
+	>=dev-ml/ppxlib-0.28.0:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
index 35845ac21eb3..4213abd7d886 100644
--- a/dev-ml/qcheck/Manifest
+++ b/dev-ml/qcheck/Manifest
@@ -1,5 +1,7 @@
 DIST qcheck-0.18.tar.gz 105588 BLAKE2B 1c785815ed2d016852ebea3cdbfd1002bcc1054dba95db9290185d1283c9af9a3461fa66f24d43437789b7f361050a227ceed5c45327c694ae3a2846688f195e SHA512 08da783ca991dcee26f88b8d6db2fcf2589d3e753ce355d5e3c8944b58ce43b444c6cde054971a557d7d345b4386e6e976111d4c537840a1269c7e361340fcfe
 DIST qcheck-0.20.tar.gz 205616 BLAKE2B af693ccc2830a70e3ab783a05da828b54ff9ac357fa01cb2ddc3db29901c120a9c48b0c6090e5324aecaf4b8455001883c62e5e39963172aa5e0b124294169d9 SHA512 1fb178bee5353b870fe55e5c5379982345c2e1b7f417733be4168e8a58d448d26464d73f8a4470655ddea2701a2a44bc5b08b0de422c0f88f229d8a1ed9c3e87
+DIST qcheck-0.22.tar.gz 229755 BLAKE2B f7a2a377b0798fba1f3049cd6e8a313f5f0e3c35bb599c5e61eb819fff5f20aa63718454a104e0d378fa5cbd9b5d712741b0e8edbf68b403e4c649bb8a517810 SHA512 2bc273d73b9732564eadb78a2ab390b85c6f9ffb7ba46d3ec8725384631f199e17937740264c550ef4f06df62ffe655f2be19259f8f4cf4c2e81010a9c1a19e3
 EBUILD qcheck-0.18.ebuild 727 BLAKE2B ca4ed46b96c98ff1908a51456e4a54c6adb3b57cb2922d07258f51c4f99d5fc8cb1f619d867363652ce55193c38bd990b9cf3e5e60dac4b839d4727b2c053699 SHA512 224e8c127acfa7e4247fa96485637687afd0e5680de79f84a0c097508894edee809e762a2632c2d747b5d114b770abc7be758afe168daeaf8b22665a4ec62e0f
 EBUILD qcheck-0.20.ebuild 727 BLAKE2B 96ca6a3156a67aee718a3bb6d62b2716564440821979815f8a7e7b26cb9dfff88ea9b193e4e3f7d23a0b3416c2ee4c542a2dec7d0e849e78cc1aa5b271364b63 SHA512 4715bafdc10aed34375216e13050595cb879d1a23b96010402db220c4bcd35552283401e926ca59db8d4de54d2f83820b7ddd0ca8a217a09ad86384ab145b60d
+EBUILD qcheck-0.22.ebuild 749 BLAKE2B 3e5ce8f2a2f306e04760f04a50c5b0f43fe4f2bc71c6d8e472a6c6790c06433e8fbf8438f1948833c45c7e16642f2b2a0a5c688f3ed59e6a41238050a0652538 SHA512 9720144001843ca9d1218dddad800b65c84f0d68574460c9952486d2b8e4dd0039f083117c1691284921dfc7b023ca123898ab209f6d981dcaacf3db353d8179
 MISC metadata.xml 386 BLAKE2B f81a52a0af6e27be6c9f1f4626e9e5cab4c0c94d80b37c0207fa5dfe6b649bd97d59f6c6a3287a5daa4cc992e2522611281bf275545bd0a8def330454898e3af SHA512 1890b50086763886883300812dd149c55df6af5d60117ca8331ebd6ee5d7874e4f7d729de0a8a959dd28a0bda92d4eec55b3aa2fc9e08d36cbd739b5dc9e5d5e
diff --git a/dev-ml/qcheck/qcheck-0.22.ebuild b/dev-ml/qcheck/qcheck-0.22.ebuild
new file mode 100644
index 000000000000..1d95e6791a9e
--- /dev/null
+++ b/dev-ml/qcheck/qcheck-0.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
+HOMEPAGE="https://github.com/c-cube/qcheck"
+SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # tests fail
+
+RDEPEND="
+	dev-ml/alcotest:=[ocamlopt?]
+	dev-ml/ounit2:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# "ppx_deriving_qcheck" does not install but only "ppx_pbt" depends on it
+	local i
+	for i in qcheck qcheck-alcotest qcheck-core qcheck-ounit ; do
+		dune_src_install ${i}
+	done
+
+	einstalldocs
+}
+
+src_test() {
+	emake test
+}