gentoo auto-resync : 10:06:2024 - 00:08:04

29 files changed, 96 insertions, 91 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d1fd23651822..2276cb2acde3 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 84883912761f..369fcf6ffcef 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -2,8 +2,10 @@ DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39
 DIST base-0.14.3.tar.gz 385390 BLAKE2B e951fcf90f1181720346be0dc048bdb3d3f0b6417c954106aa035d807bff4a8bb85e97b11efbb296be92b24c257e8c83284c5419842b2d2f587a7ceee214e31f SHA512 56499ffd630bc8d09a18f49851d950ad54c376d4441b50ce60141f58aadece16f175a5b57492e8ddd997a6289d8671368dc0a58b01b6bbd2374acf45e7882e66
 DIST base-0.15.1.tar.gz 414911 BLAKE2B 4f0955374213bed241214451cb930c939bfed7208668b2b6676786a37c60f14b671b50e9a8893555693068dc2272e21f63e4def938dbe064b4ecb143925a8aab SHA512 4ac43829229765c19d8af98d45783c098abffd026328b03f5dc4390911b26cf6b65879d4084d30dd4b0b4f5a1d23079270e9bb10b1aeccf575ee70c7e16021ec
 DIST base-0.16.3.tar.gz 442632 BLAKE2B 533a04b197bb1065a8b8772aa227bbe3be2c47d536722dfa7d1df366ad05e40fdd47f3a842654ee9bde1e3527ff34adaf155057af68596d4c02c8108505c9108 SHA512 69380ed392faf4495459f97f70a10a6959fce71d2e6ba093472fc272141646307fd7872407de855dfa48ef0435f6587eae5aa50f4a67eac40a9e1946d0c3c070
+DIST base-0.17.0.tar.gz 478225 BLAKE2B 5b3cef96b0b47c2e3b0b32bed00af1e43c1ec5ffc4e6b6a24591a69a1ba3ab0f74e8aeaddca1858fd755cd6c57b712ae597006d98a0c5ce0fd9021ec2867259b SHA512 5828bfdad7e80183c4aa8b52e6ab06cc17c9f15cfbffc88827db8f8973a064813236d60b01358f838e58f2fea1f4499e6a7676bf081da443c1fb8a019d9fe7be
 EBUILD base-0.14.0-r2.ebuild 551 BLAKE2B 61f5b53cc82227154b8e3403ec0731167593e8be9fa34c048c49f16e9396ddc55782768285f745faa0c923bde96d48b75752707f5e6843ad9084662d7e7f21a6 SHA512 d87c518813bed90e8d5fefd5c3f6d90ea61ba15b77131ef6320a6a8ed4341e44739041be32c1cc743029ef90a3764bf9b7580028627af2f9c891b81fe490dedb
 EBUILD base-0.14.3-r2.ebuild 541 BLAKE2B ddc0b055a9dcee7c21ed0274cb38b99b725374bff580bfd2c4541dd9e96ff83757c95db2d109279741e0f875539cd461ec509810dfb655e3d20be292652b5b5c SHA512 b65032fb17bd24d039f3a37c9199f99ca73591a9a2c9a648fd19d84c27127882fe4ff3acb23b85c49af3de9853a890ba8338d59e111af5ef227285e643f47274
 EBUILD base-0.15.1-r2.ebuild 542 BLAKE2B cc17a8d51a39dc5a58a53d6ce6a7b1965d16b69845b001b62ff291181726188e7a90f13d26ab0af062858e1c80db070db87ad0881142742fda739c49e18af2a5 SHA512 c597e15dfea4a9586dec285e511a7dc91cb6676f1493072e99d289dd4a6dfa085aafb55bd531ebd61e6c96e0fa5d27e82210a1bcd5a126f37ad385b05bd5633d
 EBUILD base-0.16.3-r1.ebuild 543 BLAKE2B 4b0e2821d9d473345e5df2d0e7a9e991e20752e8ae6c315ef143e760905aadebdfa2358dcf5c1a4820940888f0071b84ecae680c736e89790b58e6d4b5f7e90c SHA512 307d2aeb6851247343358daa39b73eb0bee2e4f29c8c7e44fd838f4f720278f7f1c683c7b886a1a4553c5e3ed0c47e376fe7d55efc29b71b8bb842b0dc56b66d
+EBUILD base-0.17.0.ebuild 604 BLAKE2B 171874ed4c5d6913d478a27fa5e482b0b86e7b15e8a60f31b808b85b81b3cd21ac1e13cafab1251a8b632565d2f7c089b96776c1eb7a4d7934ea120fac5cd901 SHA512 53371189b8d1b7bf82f96c710267fc8d312ee813f09a24d41766268bbd4cb51facbf2f5564c974a38c48ed526d6133e0bb7049c7005f78010e67458388dac4ee
 MISC metadata.xml 313 BLAKE2B 13f4eb00195c11bc9b1ee9a4a35903c30e47c28e6913d23ed7fb6700b139f65562fc991fbc23e26e28dfe59da6a2da053325fbf33200731b99d730d84117cb03 SHA512 11dfae973f32014f4cef738c456b6e32d762282a21bec90af5541fe67cfc0400d4889c077598e627c1098b05c655fc3f4682403d3614c40aec3b2aa321d8daf8
diff --git a/dev-ml/base/base-0.17.0.ebuild b/dev-ml/base/base-0.17.0.ebuild
new file mode 100644
index 000000000000..2221f41b5dfb
--- /dev/null
+++ b/dev-ml/base/base-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="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 ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-5
+	dev-ml/sexplib0:${SLOT}[ocamlopt?]
+	dev-ml/dune-configurator:=[ocamlopt?]
+	dev-ml/ocaml_intrinsics_kernel:${SLOT}[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index f9c8411c4dad..4c0a573bf805 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -4,13 +4,11 @@ DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
 DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
 DIST camlp4-4.13.tar.gz 650642 BLAKE2B 5bf70b21f47eefe4631227d0d30fdd08ab965020026d0183fc94b9dbfd1eee45626afbe62bf9507b1a887217cf9245901d40f25cce9430155eb9ec1ddc577554 SHA512 d3307bd11b813540d126719c0afe7e75a7740d0851b272be9bd1a28e8b1ab1ed9a7576109000c8d6cee7ece7f777122aa83917a48147d42ed8f4d72994397819
-DIST camlp4-4.14.tar.gz 653205 BLAKE2B 52978c3fc67ddc1ecf8f6e4fa956823bd1bca41f7a317e4a17936ec774171fd566e49140da69930750dceb5519657912cc2490ca725838c27bbe5ec987596d67 SHA512 1f06a5db82f556da8bfb2c7a699acb007173d4e685aa07a8349b1da91a8ac1a460bf9f98ac8f920357961c1da78ccc27814e178d466e270a4f00a1a9f00ea776
 DIST camlp4-4.14_p1.tar.gz 641790 BLAKE2B 3e1054a924956e9c23d43fb4ef00cf99fe09f6d2a5eb4216cb3d5079a439159d36703b6ae268789d73e51e87ed0329531b25c2e846df03c4ae99b1a6403b84c3 SHA512 1853ae0465a1366cf73d7aa9de56c037ef3d4bb5b341fe3eeb39677b5b08bda44316634b93d5d35d917a98dff8eb40da974937f714ab609818e7d25f716de811
 EBUILD camlp4-4.09_p1-r2.ebuild 1088 BLAKE2B 834b60524d28f42e2900655ac1221b5ebce8c7df78586bdbd5b4c94f4e0a0c7b2b3952b8b4fcc5035929d6e9d9b2d329aeddd81517ac9d17435e582e4eee669d SHA512 8b472470f27c1815ede6aa4afe3c75656c4d3fa3af59ab410b155ffcaa1da1ba20cecb9024f9535b12a89e82656875c611146fef1d63993e7ce9ccc327d93c79
 EBUILD camlp4-4.10_p1-r3.ebuild 1103 BLAKE2B 59bc6d34a2876d2b7e272a393edf547dbc510338f0e65e0ba2629a1358588f5c3591629d668e50d8b00d55b44c9f7e9f1e30bd53246335d02d79a8f2d7377e74 SHA512 236c074b0c2c0a031e2932bcca507f57a8e0108daf0db239fdb056e0e7371f545d1bffbc4fb8c0ee9bf800feeb5857dd4fcafbd119eb7b92b06e90893fbedce7
 EBUILD camlp4-4.11_p1-r3.ebuild 1098 BLAKE2B 6a28fb79832f1328b162f6f49ed6c179162b845679f22cf675f0ef71f89b4a2cf5e676380bb49e218a8d7985ce35fa95adf925e1df36664fe2e3e081a399274d SHA512 94ecc0ec717f1bb6b470c4bcb290973a97da5a5d7c5669bc7f7de634477f4df99251520bc2b1196ea0bdb95332021d23c33227c1e726cdc1ea7f8c55f66da9e1
 EBUILD camlp4-4.12-r2.ebuild 1103 BLAKE2B 59bc6d34a2876d2b7e272a393edf547dbc510338f0e65e0ba2629a1358588f5c3591629d668e50d8b00d55b44c9f7e9f1e30bd53246335d02d79a8f2d7377e74 SHA512 236c074b0c2c0a031e2932bcca507f57a8e0108daf0db239fdb056e0e7371f545d1bffbc4fb8c0ee9bf800feeb5857dd4fcafbd119eb7b92b06e90893fbedce7
 EBUILD camlp4-4.13-r2.ebuild 1103 BLAKE2B 59bc6d34a2876d2b7e272a393edf547dbc510338f0e65e0ba2629a1358588f5c3591629d668e50d8b00d55b44c9f7e9f1e30bd53246335d02d79a8f2d7377e74 SHA512 236c074b0c2c0a031e2932bcca507f57a8e0108daf0db239fdb056e0e7371f545d1bffbc4fb8c0ee9bf800feeb5857dd4fcafbd119eb7b92b06e90893fbedce7
-EBUILD camlp4-4.14-r1.ebuild 1112 BLAKE2B 8b585fe3576d3ccf4331457f34ff7b5d5fbd535f7c498b14b17677c97cd3e1eaa256217951267d750e6d3561e1dbb7eff81e77ed953411aa9ee8b828b510e5dd SHA512 0d24fef305299d239ea8da73fd4287c7a6e004e6bc5566fd33fb22c1125e780146a1df0801a07958db4327be4a1d15425675e490fe7a6b9a9e58d5d303778905
 EBUILD camlp4-4.14_p1-r2.ebuild 1269 BLAKE2B a882d125f425e42742b2c8a69bd714230135970121b2c49c21e56be55a61afe5a6ca9fc1056ee72cb6a58ad4ef63d9ece5e264ff6b6b0f047131e5ffaeee1370 SHA512 7efc80916115559b9ea33b5f0902a953715706eb3fbe98f0f5775b6a80f7248e178d66c3c78f708052955bd7e77723f8c3c603b320253cdc0e306e36b0e1319d
 MISC metadata.xml 311 BLAKE2B df7b6782aa51573cacb68804c03a7041d38121431bf08768497e9dafb904c3aef215665fff86c636a6040d0e6bea4912153f5e7adce8b5e5b55084dd740e158a SHA512 27e477a667e95796be69cb2648c09d364236b3962338754e3f27d9ca8c64612e4e24a519dc62c4da65881efd751db229f1cfbee6ca89446a4997e13241d448a9
diff --git a/dev-ml/camlp4/camlp4-4.14-r1.ebuild b/dev-ml/camlp4/camlp4-4.14-r1.ebuild
deleted file mode 100644
index 7d638e7619a8..000000000000
--- a/dev-ml/camlp4/camlp4-4.14-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-inherit edo
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4"
-SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_p/-}
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild[ocamlopt?]
-	dev-ml/findlib:="
-
-QA_FLAGS_IGNORED='.*'
-
-PATCHES=( "${FILESDIR}/reload.patch" )
-
-src_configure() {
-	edo ./configure \
-		--bindir="${EPREFIX}/usr/bin" \
-		--libdir="$(ocamlc -where)" \
-		--pkgdir="$(ocamlc -where)"
-}
-
-src_compile() {
-	# Increase stack limit to 11GiB to avoid stack overflow error.
-	ulimit -s 11530000
-
-	emake byte
-	use ocamlopt && emake native
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-META
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 1be5c0a7024f..d94a7a8eb4b1 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -3,5 +3,5 @@ DIST cmdliner-1.1.1.tbz 58054 BLAKE2B 1c3d3c836d390490d0470cae1545a8ea6bd3ee2b10
 DIST cmdliner-1.2.0.tbz 58504 BLAKE2B bc5be67fff2d83408b8537fbb7472c3811452df5cf89dd3d175fa052629339ac960d12e751cca3d8f750c6bd8bb43df645f976477597b9a5609577a73bbb00e0 SHA512 6fcd6a59a6fbc6986b1aecdc3e4ce7a0dc43c65a16b427d6caa5504b10b51384f6b0bc703af646b09f5f1caeb6827b37d4480ce350ca8006204c850785f2810b
 EBUILD cmdliner-1.0.4.ebuild 1066 BLAKE2B 39c29fe18bdeb8851cce528f0cfb81dc29e9e02b6ac6b344617273659bab2d683195f48e70b29b1500c61c558c137a167afce8af2638014584a8758cba3b2dcb SHA512 f49b74f362cb8da22cbc7f869a4118458bc4cd4456c70c8496411bf047b76b5366bdeb4651cce1e1d5d1e6abc26900ca9548103efbec30595222a0367efb4026
 EBUILD cmdliner-1.1.1.ebuild 1003 BLAKE2B 8984058ede56dab67f18322cf7a2de1afad381b1eefcefb13672204beaa623b6c02799f44819d9677354e8342a70b6a59396540d7a4e3989fcd3b5470aff9be3 SHA512 8fce94a0c82ec8ab75318df738bdb7ed8cacc3b1d64864d28a53c87492b3324ab3c6dc9b9afd48beec7ae586a2eb8196317c0dc59a4df764f75b56fcb918c990
-EBUILD cmdliner-1.2.0.ebuild 1008 BLAKE2B 80a6a1524b1ec82bd46e48a337077e6beb3ae3f2d20a832c6a406225149b14cc4f6c7d7fb894a8f9e2f44819c9c2f1bd8f7ab0b53c387eaa20910e93f3a51a27 SHA512 cdc5cfcb796a19ef21157d0e739c1be6216129f031e599586f91a95e926dea18904aee94699ffe8c740ac2c34038e73361baf4af8e84dbc4983ccb332280bfc6
+EBUILD cmdliner-1.2.0.ebuild 1004 BLAKE2B d9fc98e01eecbd6638deaf5034358c892e28e7e2c27f5c09960ea23347dfdb996b7ac10c3636b2658a5f05083ec725cab5b204df492e124e101322c594076b17 SHA512 44a6c3351bc63f44592a0880ada314b1c222f33969b03ad332c6e239f03c2ce6c1aaed70a8598f20d3848d90d029ccf8a39efe504e88b7986ab4a06150ac5e29
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/cmdliner/cmdliner-1.2.0.ebuild b/dev-ml/cmdliner/cmdliner-1.2.0.ebuild
index b8b42c2d8a4e..985c4a64b881 100644
--- a/dev-ml/cmdliner/cmdliner-1.2.0.ebuild
+++ b/dev-ml/cmdliner/cmdliner-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index f83e866b713e..138ec2067fdd 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -3,5 +3,5 @@ DIST core_bench-0.15.0.tar.gz 46920 BLAKE2B 44ca0845abc8a593c5685305e2175b04dff3
 DIST core_bench-0.16.0.tar.gz 47258 BLAKE2B 04ffc46994549e04f3ed8e6dfde72abfee8df6818cd42b5139aaaf5107a697a86167864cf0189be5708ed2a0148e3a810e562f89e27c4409530dc1f3bd566f01 SHA512 46fc0316dc345eb469bf0a5e2468fbf19babba76ed90bf90d74fa6de3d326b9a3f1b4f3949492c6b487aabce4b5f001d1db661069e15ca7c05b55eaeb9c382a7
 EBUILD core_bench-0.14.0.ebuild 565 BLAKE2B 717a3bf0e112fe61764e3e5de4b33a46f52a420dbd677013dac60017ebb4dc9cc93ba28860b3ec6f6dcc1aa552cd3e40a7b9c95480f1f33df0af5f15103d0d16 SHA512 55dab1511d335ef61a2721c83d89304f32621430b388da7158db6cc7226099cb5543b758296370828eca612def3afe53af6efbd084b75fcd2cb450c2d51200f1
 EBUILD core_bench-0.15.0.ebuild 467 BLAKE2B 1f09a51163ec47f93ad4bf92a719fbd03bf317c82c6ad2eb2005f25d4a4b683d43433eefe415c65c72d69841f45dc50ecbe94a91f6d0dbe85bb5498c9b69dbd3 SHA512 0fc6d3ee8528f8b4de65abe59b24683c857d662c4bf013c768b6422f7e9c6448576ac4bb3f388b3d1461bb2090f65b6a78b794580da91b57aa0a244b08f1f237
-EBUILD core_bench-0.16.0.ebuild 649 BLAKE2B 7fe15b5805c67c6b07ba963a4209ba24a417c76f29bc0b187b4fe9fb0674f9ca79272fbe2dcfe1fdcc9dc26d0c6e05f1cc7eacf7e7091b94b8778c955cd75bae SHA512 47a68d3c326ea918e8957727ba4ea688f3e84cd4829ec432a37e12f855931c0b8a432ee18cff3bc151dc5c9672c84cff3a1c5e485674f615af861323e386a4b6
+EBUILD core_bench-0.16.0.ebuild 645 BLAKE2B e72aa5f4c4224af7c8a5e184d90fd02a938655fb1a37d8d8bdc22aabe663a44463f1ec1460f003d991903616a0c4cd9bb4cdef2654c9b69b7f656b159b892ed7 SHA512 e0172318c32b04322287f35c7d0e6a5361207526620a22cbba7269b56cc3817bd6d4eef53a46cb5846fdd37ccafcd9ee02e5788841cd31b574b35038c5636665
 MISC metadata.xml 319 BLAKE2B e07f2c98a308c50d4037dd942b1a82a4b4a8c71d4be94f96611d8e2955b22c0b78a7bb729030a6ed595fc4ed65f6072bc536f03db4a8a08b43af9d75a65432f6 SHA512 32d64cd410459106199ad3d57a2ddce9651bf95be3b8334632235f9ba3963a0a3fe24142f523889ccd591fa0536b90574e9129fc594c7a7905588978b3aa886d
diff --git a/dev-ml/core_bench/core_bench-0.16.0.ebuild b/dev-ml/core_bench/core_bench-0.16.0.ebuild
index 4e7da1d6882d..93be193d543d 100644
--- a/dev-ml/core_bench/core_bench-0.16.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index 7443fb702914..1fce95e5644c 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1,7 +1,9 @@
 DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c
 DIST fieldslib-0.15.0.tar.gz 3680 BLAKE2B fc6f2ed845906c7956a202d60c49a3ec919a94cf1b8091a925dabceee4c76e22e74768f8c6f83d6f42369aa4ac0a035cc4f8be3828db24313cdb6777853eaadd SHA512 9bba75a93cd55f798f830409579092f96edbdb739808cbeb9c35b99d74baf7ebade5d0e95005cde550a80f337da13e4d088ba5eb26e597b7fc81b80a91037190
 DIST fieldslib-0.16.0.tar.gz 3711 BLAKE2B faf1ee760fb04f643bfb6d80a5f3ab1ac4b4aa2edb112f516fede7e0a6e66bbf48951615faf0aa9b86ce1f518ef24bedef77d7486ac22a24404ca4b009a8b8a0 SHA512 73a6d9fdd921eddbe766e933ef3dbb2d3866bf454a79a260c81406e069e0c1db689676e070214b38190ee1ddb369d0edd704a474186aec44eeabc8b0adee0f86
+DIST fieldslib-0.17.0.tar.gz 3744 BLAKE2B 56acfc888521b2a541f763b7073b32f3dc2d91e3009d09c3dc4b67955ee7a69bffc25952de7e4597db01019e98094bc415342765aadeb1a6263e5f39fcbfd06f SHA512 54ceba943a8a09678c5cc7909bd3814c1a78683e0fe3f69c740b5352fb8f14013827c311c0e71cc56b35a04b57ec131805d4b6b4332448fe885b10a9c6282ecf
 EBUILD fieldslib-0.14.0.ebuild 473 BLAKE2B 894cb61564c6d278d31ecbd2c4d502f44d41631030b912553d69242edb9b33f5ece397ea384b1ae44fee2ddb315b0efc48af2c18adf59de62be2eec6d3634122 SHA512 1decd4330b340d0f92e8035521d7f953d3f2940a0969445dc9d9213a1aaa865b32639f9bc16024b1ccf1cae83a79303548378ceb67c40f8a1d54ef94c0242f49
 EBUILD fieldslib-0.15.0.ebuild 480 BLAKE2B 60e38f4b1ef12df7c9cd47dd89304ef4ae18e662816b109a3836fe3fade18424e7969f355f7e31ab09ccbeea90fa84110520b2e1423ecc3ab18851913a531100 SHA512 d2be4b63bd7d919fa0b2682f6e67c607aaba5ea01f98471908717f9329598607edce3a0ad5cf6eee3d844ad07ffbc894fe8abc5eb0a777e640ee0a205835aac3
 EBUILD fieldslib-0.16.0.ebuild 510 BLAKE2B 0c9fe73ce827f53d25fc7f1da863c55f62d3da07b5a1887b6f80d6b7ea633d557641af29abf094563d63df9859f71e1d85bf93a86dc1b1a51e3cbb11bcbf2d51 SHA512 ad302b42eb04ed87b4f1b8364f99403dc9f94847bfaec659cf00bbae2d189a10743abf82f9eaeaf7f092f8145ce3672245514fe6802efa4e00a591337b5d7138
+EBUILD fieldslib-0.17.0.ebuild 505 BLAKE2B f211092ea00b44f87367a5bbe48224d1f100887bb32a49ff736c34977c9d2a88ed2462ee0150f5afdc0d59c48717b9b1ff859c165963eadbf68fe1d5c53e0dd4 SHA512 319a9014cce3a98937fd991741c7a5a8833a22d0dd232e27816f56bbe9e8858226d8cb31a9f8c686d33c4f40486a7d65b909fe1dbbf58f40e1853351741a939d
 MISC metadata.xml 642 BLAKE2B f10a2ccfaba12724bdb081e6010ad8c1b214af5255ebea65fd7a910abb5245a82157f427b787d1e528f5b6865ceee37a69d395da898e7cf689c13967d4f511d4 SHA512 da170e90a7a9aa9bb26d512ce3a8bc282a6f738281fe3333d0765fe439db0936639a9c4c336d3ca56fa091df737cf33b8dd3d30b6b7a0b3790230e207129e386
diff --git a/dev-ml/fieldslib/fieldslib-0.17.0.ebuild b/dev-ml/fieldslib/fieldslib-0.17.0.ebuild
new file mode 100644
index 000000000000..93c6bc7f9243
--- /dev/null
+++ b/dev-ml/fieldslib/fieldslib-0.17.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Folding over record fields"
+HOMEPAGE="https://github.com/janestreet/fieldslib"
+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 ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-5
+	dev-ml/base:${SLOT}
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index 557058bd014f..a337ba904963 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -2,5 +2,5 @@ AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
 EBUILD merlin-4.12.ebuild 2155 BLAKE2B 4bcfa73e369ba022deb9537855cf5f5834bc193d4c79518b138ea2edfa0212a5a0330fbee37c95e10f4ebb655730add170c9f9c22d911400fdee44b5f3cfe731 SHA512 95275341c9fba0ed8bfd944b58995e2026102bf8a26dfa291680e1c1bbaf521d60070e201741e1bc1ff630b17cdf3338111aa08aee3fe930c3d4a7f3fe007687
-EBUILD merlin-4.13.ebuild 2174 BLAKE2B 1386fedcb793f621d76df5c22055c662df2ca8e65df4ab1fd5c50d6399ab0df3b2d88159c6e6641dd9dbe4f93f4c2bafabe8dc34c656c2166e9b92785f5f6f31 SHA512 73de2bdcdfeb47a2c48babeee47fd8957f7fc0f5234b1964843f844308aabf9cb5c0183358899bdfecf54c6d32de3a482e323db1bc5c512a058d77245a2f7390
+EBUILD merlin-4.13-r2.ebuild 2288 BLAKE2B b4c9d4da9fd0aa280447ba6c7f92bae30999faa0bce6239cc5e6b8563bce42713e3bc26a98dd5b8223afcaa1fe2e7e9c41e582f1468fd24f80d93c16e82d5d74 SHA512 0647a136c4a980e309b391087138845e3d3745ad4a54f64501f5d9744e8b74e9fe9fa05bf2dafa67a33cfedad4f2c6392f0a6e092cbee3ffc2a94be6daa4aee9
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.13.ebuild b/dev-ml/merlin/merlin-4.13-r2.ebuild
index 80b96bc1404a..a46713572004 100644
--- a/dev-ml/merlin/merlin-4.13.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # TODO: vim-plugin, although it's not clear how to make it work here
-inherit elisp-common dune
+inherit elisp-common dune edo
 
 DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
 HOMEPAGE="https://github.com/ocaml/merlin/"
@@ -14,25 +14,28 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
+
+# Tests fail unexpectedly on Tinderbox. See https://bugs.gentoo.org/933857
+# RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
+	<dev-lang/ocaml-5
+	>=dev-lang/ocaml-4.14.1
 	dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/csexp:=
+	>=dev-ml/dune-2.9:=
 	>=dev-ml/yojson-2.0.0:=
+	dev-ml/csexp:=
 	dev-ml/menhir:=
-	>=dev-ml/dune-2.9:=
-	|| (
-		dev-lang/ocaml:0/4.14
-		dev-lang/ocaml:0/4.14.1
-	)
 	emacs? (
 		>=app-editors/emacs-23.1:*
 		app-emacs/auto-complete
 		app-emacs/company-mode
 	)
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+"
 # NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
 # because it breaks merlin builds.
 # https://github.com/ocaml/merlin/issues/1500
@@ -48,10 +51,10 @@ SITEFILE="50${PN}-gentoo.el"
 src_unpack() {
 	default
 
-	if has_version "dev-lang/ocaml:0/4.14" ; then
-		mv ${P}-414 "${S}" || die
-	elif has_version "dev-lang/ocaml:0/4.14.1" ; then
-		mv ${P}-414 "${S}" || die
+	if has_version "=dev-lang/ocaml-4.14*" ; then
+		edo mv "${P}-414" "${S}"
+	elif has_version "dev-lang/ocaml" ; then
+		die "Currently installed version of OCaml is not yet supported"
 	fi
 }
 
diff --git a/dev-ml/ocaml-base64/Manifest b/dev-ml/ocaml-base64/Manifest
index 552a68618626..3ac796875302 100644
--- a/dev-ml/ocaml-base64/Manifest
+++ b/dev-ml/ocaml-base64/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-base64-3.5.0.tar.gz 18888 BLAKE2B e35d6331f163a066169455ea3dac304cedd7ca47fac0a2cbda26b8bd9620b4e49e144d5a06a8a2c6085501e531b2be98f6b24002880d83d6d57025ee055e0887 SHA512 a3886701943a9b165a74e45f66c3d8279b381927774217f5e042494811bc17a08f8933292335d4b76f01c6b1d3c496b4cfca650faa5848ddbf6150ac87386038
 DIST ocaml-base64-3.5.1.tar.gz 18986 BLAKE2B 797ace8ad35099dd56871564862804a492551b580f46d561abce8a18812296e3f3629f1845007660c388291cf3d420144dfdce556ccf5c50e0b169efd680d586 SHA512 d1d4e2403cf4f58bfe87150c7cc444a431f0ac53ee9fc85a4d64983e2d85f99e0bd35b9267231b1a40eaf5e4312797460dd1f6dcfc38e3b391e3dfe746878125
 EBUILD ocaml-base64-3.5.0.ebuild 537 BLAKE2B 8b3a1a6580e2c6da69e55483ed19052fdaa0084a3aa83768cdb8d4377e5f202db2dfe8a827dbb53b10f14a17fa9d585ed3867553b0015e7a50d5687847c25b74 SHA512 452a5b59a4d6218e0de1abbb560cfd66525ae025429aeb73d0aa04a006ffdab9a0ea0d34219a43516e9033cda36959efd81b28d251b823dd1af44da3f2599edf
-EBUILD ocaml-base64-3.5.1.ebuild 542 BLAKE2B 4e7297c02f107c090acaafc73d3759cc74e68932e9e0fff21f7506e18de6d1b0e22afe39029055450dee4056fd0b22bf95468a56849b88661e5a32461bfb8338 SHA512 fc3bd45878f7e1d60484e0b6c8158fd62f415c092f41d6f983e7da4cc396c6d72442c101865bddeb264c4944968f575e3568c07a59a02ca4a4ec8daefd89e866
+EBUILD ocaml-base64-3.5.1.ebuild 538 BLAKE2B 3253a17a46a23ee71ac983d58a738c023baa40dca7bcb6c1d6f7778d91cee6d5b2243110ffdf8843295c48a31a468c1ab5379d0214e0938cfd02c17fd9f669bf SHA512 3102f3bb78b64e510cba5f7e25fbb1815a8efcdaf2ce3063ba3bc78f15ef248bdbc255e26c1cb85b0fb6c13fa7e4465ff5d9d6ec7ae1b9fc39af460e32a59299
 MISC metadata.xml 327 BLAKE2B 8c6793a0aedb17700d928b0c30d92298db13be50e6b7f520a7838fd76f4331c28a1787585cbc13999c125d39dd49698a3adab5b2822e2a7fe3b7204dc5f224f6 SHA512 3c806541652650a16615df0a83510a97f82ab3eb3208b47f341842ffbbd16984660b22d99c678896eb82e0c278e8a82824d17574ed4b7cf31291793d1bbbb78b
diff --git a/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild b/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild
index 98e4de02eba4..7802eb2e1c36 100644
--- a/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild
+++ b/dev-ml/ocaml-base64/ocaml-base64-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/ocaml-base64/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index c9a9c0192d86..b58596148295 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -7,5 +7,5 @@ DIST ocaml-ctypes-0.21.1.tar.gz 200264 BLAKE2B c4539c8856c1919194f11ecaeb1b0649d
 EBUILD ocaml-ctypes-0.17.1-r1.ebuild 814 BLAKE2B 3a5bab91cdb4045286fd81c2fa5e6665eee9563de65008100d1f12c7930763ce0c32829cc908d1d9fe58ce6384267378a70a413b8c66368c89a0b9d21c9f4626 SHA512 b855d0975c4faef9516d0ea261f53cd913c314ce58a2dc18183686f2de17e8ec8e33be7b5529b933d070c8c6afaf00561fa5011e406688367be782ddbf555dfe
 EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851fba9b3e871e1bdb50305977c40cb0e8304a021f4965dd9a0a832a3fc19841a368ec5cb84c885812680351fcf588ec5 SHA512 bd6fcc9f8b186bea5313451f4ecba179f9b28ca079cc29e1ad9c90f6fe9447f40424575684bf7dd326dfa65434d70125bafdba7e9e061c6dd1530a9c56597562
 EBUILD ocaml-ctypes-0.20.1.ebuild 947 BLAKE2B 20f4f138e0f69d5b2bf8ad5677f64202cf2b03ffb448129bbf112c36d86b02f1e14a078a489d612264d8f76f415518f72f5017b1afa7b2e9429beb9872cbfb4f SHA512 9a6ccfa155adc9f218587e8963c57c347ecab86a70df337aa22a38dd3cad108e22d19d24f79d7c119e924d5269a0da630e377a7c910e5ae1c6df06a3149a1e63
-EBUILD ocaml-ctypes-0.21.1-r2.ebuild 758 BLAKE2B d80cabac94facb42a8350f176a5b3a34847756f3d9bdec85b7711f987fb2305fbb8c6d005f331d4d38235ac7510bc19c3bad8310cde2143b5fbd736e7c76fcc8 SHA512 712d71fdf81e6ffaa8710041f4515d68660e441349fa3ae3dddb13a827b82882b2a66b0ce86aef8b873e52f69741f8ac4e686f9fa4ccabf3d73e77f03b238641
+EBUILD ocaml-ctypes-0.21.1-r2.ebuild 754 BLAKE2B 61cd4e94a777bf3935343eb3a69a51ae63e5c58d5753bf80ab82d5999ae96c380ef45c2f645ffbdd107f98781e63974e501ac9d8e79859f0f20c3d9ed51fcf89 SHA512 21a78ec51d10ded59a411cb8dd3be18cfa65bdcff19ffb41d47dc4c6c4aa471d7c96137ebdc502f4a82f22628c93ec9e0aa84061d8a004a7e9ba9ba4bd1f8f3f
 MISC metadata.xml 317 BLAKE2B f25c1f9fc2dea5d1afe9f1cc03667a70564a3134b5211b494adb1c9bb0be9d77ca4f7bbd9ceda2a81458476e06c9cfcaaeceacd338e40b898b4454d518fae025 SHA512 7262b7766342484afc74b5c30fe4a7a719219c759eec469b86c1926dcd6deb61f0ba0ab5c71e37e4a1f921ef268433f9f4166eee5955f515142fdfdde2c968c9
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild
index c837e0b3461e..f2652224b3d2 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.21.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yallop/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 6cab65b46d59..32c0c7b5a531 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ssl-0.5.13.tar.gz 40604 BLAKE2B 289f631e360581ddfe2fa6572d1b8883853e65c438542593f5f0be5c23b1c8056c10fe6397ba8df577ebf7a9e22cbe4723d8fccabeb373de3efebee310293653 SHA512 ca1106642cb536672dba00ff4421ade2293de6f79c94a47df27520ce6f2ff4555f8e9794736afe4ce37e131a518658d0f8c57f3b106b0187216db1a461f99867
 DIST ocaml-ssl-0.7.0.tar.gz 56102 BLAKE2B b3e41eb91c3948dcd2396de0fee0b737e40a5ca076942908e6801e8ae333174ccc6068f201e69cab88989233407f3e1a690bf4635b304f89637a0460dd80d926 SHA512 969c4d64828449a49bdef26ca5f8faa72d2fe2a2304ccbf589a3ff097c2bf8ae9eb83ae1c90216f6b4d6f359e462ea47e0106a7386e26848d14910138fcb07f8
 EBUILD ocaml-ssl-0.5.13.ebuild 657 BLAKE2B 91b0ace900b0b6046fb04f4b2609da36555c4b907548bdfebdc86b32a25ab54cccbefe575865ea0e2b06fa2873a9ea3fb4f0506b7748b5a34d4efe6dd75868b2 SHA512 dbabc3a44ab4e478933b5bc82a8468a98785033f4dfff256a0b5c9874e7d29e4ea207ddbc05a6ab5e8d7127f8b90e42782a8d0bffe12c6b5cd3163cee38c6db7
-EBUILD ocaml-ssl-0.7.0.ebuild 775 BLAKE2B f3bee6b90b9d8a5fed731a95bd22c1eccaf59d0c60961869f3ac8ce21674eea0d51fa82040dc1cdb0314d8d0024491c4756ecf3785ddc196f6e8b067d5a1a76b SHA512 9127baae9167ab02cc93137589df155347b366da92601acd6f8d7c35f2c22654d483a370f8f462a256c276c2db799e020c4283adf2a43c52cfbe33c7a7369566
+EBUILD ocaml-ssl-0.7.0.ebuild 771 BLAKE2B bb14dbcc113b1b711e5da952ff80bf948975c039800a4ae7fe7236c8fe85f367e1bf2cd9faae5ed51a61ce5b554f12793e322e416863b7cb7c962426af669e5e SHA512 18f7d346014efbf56511f5f8f83b4a1eb0c8865ea7c268e9f9ba8ccc018b8388365686f8f8438c3e53dc21113f323b9ff7ae7c218d101bd41b69bf2745b41763
 MISC metadata.xml 367 BLAKE2B 0bc326df65e040b3b8455a303406bbf29e05dc3ec0b49a7c9234f2fa15915e2090cbfa41479902b6ec1b34127d682a7187f8ce57bc4fb29c4cfb0312fb8b6bdf SHA512 88c18fd9615f4031bd4802625cd2f5ba4deca671fd27c60737de4f9217734a091feb27bb3bbbc1f17ed2245365e8c83b3240cab0bf240580cb44c7ac0ec1c56b
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild
index 62d40f51f91d..6c472e89e69e 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/savonet/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-ml/ocaml_intrinsics_kernel/Manifest b/dev-ml/ocaml_intrinsics_kernel/Manifest
index a40dd24a3bb8..0e4caaacc984 100644
--- a/dev-ml/ocaml_intrinsics_kernel/Manifest
+++ b/dev-ml/ocaml_intrinsics_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml_intrinsics_kernel-0.17.0.tar.gz 11929 BLAKE2B eacf460acb0df8728347efe6f2c271a4f6e055b4a22638834d7742a9e07b172d822cd37cf7417782adfb079c17214889b86d882e50b91e4496f38eaa70953b64 SHA512 e197202f6af364caf864efda5d7496416c30bdc3ade9bf0e81e17014f1a046daee21897fc9d47fc4fa44408b1466cf8cff38831b5df45468f3f4a15723d75aac
-EBUILD ocaml_intrinsics_kernel-0.17.0.ebuild 539 BLAKE2B 837159967c35c4d4166c46681bcb75fa648d8a7b0d60c8cd7f841632a01f6b586333a15b31682b2261120d152ed16e96cd902dda9a484d27dfc706cb3c31a927 SHA512 401b3724765a51d32db22bb79b1fdde1fe8ddc3982c1faaf0545fc576d850ba518e5328ac9bf97233477ff3fc3cc2b9901bfbda88d5ee9e0bf1e2c17037b9abc
+EBUILD ocaml_intrinsics_kernel-0.17.0.ebuild 523 BLAKE2B e888f090f0d7747f9153f03ea1240fe5b982b07d9c8cff4b9ac5205c1ae89a60cd8ca3132bda0b878bd64a069720370094f0451a5e125e0e80c73b39b6c93487 SHA512 f12ba26a8ef18ef56fa798da434e3fafe10f8ab30625a2b6bce18a6163c51ee50fe5c022d8a16a2b5fe6d633a0f7564a273e420db1c58ca78fa6e89ae342ce59
 MISC metadata.xml 332 BLAKE2B a20b8bef99c1f99839fb37f0ed586ac7403e538304b66215c5e22ca30e8a402b7058dee82b1ab6b12dcc265c3bc9b0caf224abd4afeacea5f35060943a0854ba SHA512 5b77d404f169f3ac71041612b842f210b534f1abd6c82dbdda732373a8fa77bc203eea52be11b2516680b36877bda30ed3a9236f022f90928e17a2af9f8551a0
diff --git a/dev-ml/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel-0.17.0.ebuild b/dev-ml/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel-0.17.0.ebuild
index 21254d0c70ff..66bc76fea889 100644
--- a/dev-ml/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel-0.17.0.ebuild
+++ b/dev-ml/ocaml_intrinsics_kernel/ocaml_intrinsics_kernel-0.17.0.ebuild
@@ -14,7 +14,6 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
 IUSE="+ocamlopt"
-RESTRICT="test"
 
 BDEPEND="
 	>=dev-ml/dune-3.11
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index ca46bd40c09d..8e3a29bfec5b 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -6,5 +6,5 @@ DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432
 EBUILD opam-core-2.0.10.ebuild 862 BLAKE2B 4d866734fdc9884598ba98058d6ee117aa7b3c21a5ef73172f633e7270851ac8474cbf374d6d124b4fd73c8b79cc7e2dfa3573e055315a72f8ce69fffb466d1c SHA512 86266d41d881e6f7315477d12013dac00197586c6e9f10d7e575ea3bad319134baeeafe0beb03f226d06ba81bbf49942df85935e6aae9de78474174af54fb70e
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.1.2.ebuild 1010 BLAKE2B 4164aaeb2c582578120abab3a2e4891715403766932740b72a2aff08ef6627ec65a5357bf44f960e49efb6a9e8635bfa1de6aa514655d97a213b1c3efe9d65da SHA512 b87643fc55b9201c69b2d0f858aa7124ee314828b7e41a0da8970d8f7f131b084cc5ec05f231001297706d21dbdf7bf75b9a0e1d51fd469e646bb72ec72ad699
-EBUILD opam-core-2.1.3.ebuild 1014 BLAKE2B 2400948969997f89b6cd0f69d6370b2b6d62b5fc30965098574c2fe330b49e2e9b407b52604b4224c42a82523f2e6f5f367fbaa8242a40c9ff7cf9850c26432b SHA512 4661c6fc73f991a7bb732cb95e496757b38625aad86877b248916b79cce31ce1dc7503c77c9d509421f3d8160f8ab526578866c9bce421d1ac317af29eb59dee
+EBUILD opam-core-2.1.3.ebuild 1130 BLAKE2B 4e438b3f72bddd0cf5a0f2ef9a1f53f641f7fd3dec64d66e48e03780c95372b8c4d913be2858a99e01bee43221720ab92d6797c45f8a55835a9ccef051a6c96b SHA512 483b43ee157d3ca74077fa0e5ebeb5f3613a14f027c025d7bf0d2045386c066d2049e19167c3165909fb05bc54741d453796afe378b074221c9bae31e8d768fe
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-core/opam-core-2.1.3.ebuild b/dev-ml/opam-core/opam-core-2.1.3.ebuild
index d24631cb0935..404e055d648e 100644
--- a/dev-ml/opam-core/opam-core-2.1.3.ebuild
+++ b/dev-ml/opam-core/opam-core-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,6 +38,9 @@ src_prepare() {
 		 (release
 		  (flags (:standard -warn-error -3-9))))
 	EOF
+
+	# HACK: Probably bug in Makefile? Magic. See: https://bugs.gentoo.org/933845
+	touch opam-installer.install || die
 }
 
 src_compile() {
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index 4cadd19fd0dc..7e7e146f76d4 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -3,5 +3,5 @@ DIST opam-file-format-2.1.5.tar.gz 36682 BLAKE2B 3766497f930db4f72e2c7968684b530
 DIST opam-file-format-2.1.6.tar.gz 36809 BLAKE2B 0e6356d0515b1af6e11fbc3ba3c5c594f101c112b7bb9228a79ed1fc6042e2b363ba95605a387b571b6bd16bd57ac416aa7703f0298c8e21851ba278ff47f0bd SHA512 89148dceacc523bcd3b65ecc60cbef2270a9618f7d97c5655060adef5c99986fa37910c9622d328a6371a0409a371158cec919f5100cf6d85110cd7cfdf2bb85
 EBUILD opam-file-format-2.1.3.ebuild 580 BLAKE2B fdc8257f8280dbaf353a7b7314a61d1c15bcf5c64a34984bbde2314565e931726a0a1c64e621747d182b2f53eb6313b6eecc36028905deb510618820e22e8c97 SHA512 f8c4bc341f8b4c3bdc6a7eee599be5af7c78ece36e8a805f8ec818c913ffab6b3b868d1e097ba7a89166314a7210b9c670e207f948c9cabe7c10b664dfbc5f80
 EBUILD opam-file-format-2.1.5.ebuild 584 BLAKE2B 59552e6837cfe878bb1788cd8995d82eed5cbef9b47c4dd299cbe37497ea65e20de32953ea143bef2150560c4a09e886ceb17907c7b89bb0b90cb56389e24195 SHA512 a79df1f2dd4d7e6a42bf271faa1b586e761f727c69b51a5d22a9a853222fab28be8cedd0836ac55b9b339fe7b886d5b72f9e3a691b0802d58988c33276b69aa6
-EBUILD opam-file-format-2.1.6.ebuild 585 BLAKE2B 707b5d69affbc21ff58da69ea460089af3d0478a8df2c7b7eaeebcf557470b2ec5aad4818858c5c637672989ca9f89fe66883b96c80474e19a11506acdfce2a0 SHA512 81bd96a3105b4cd452e36936f869428929f0da49339b728b37284dc1c31687dcb77b611b377895ed12fc432482aac6bc2c1386566861d1d5c26678f277776701
+EBUILD opam-file-format-2.1.6.ebuild 581 BLAKE2B 709e88199692d325434ffd151658e1cbd85ce8f6d1a528071aa06dbf6d3ced56c84908a58749de0920d83026430f41061e3c13a102e87a62a419e06ea94da2d3 SHA512 2646b5cf5a5bba7516415a9742c4db66d69de48418d018430932683c7eaac4ed22b18386ff991f117ca623923ebac4fbf24bf629034176ad81d734725dcf7b50
 MISC metadata.xml 320 BLAKE2B ed1c8d7123e20da930e809b16e405e5a342804abfafc2e7abff6c2b3559d14c7c98ff7d3192d4dd915b293e3c96b0785e0553a1569560cd6f007d4e369efbcdc SHA512 6cd980c116c719de4a36f927c53949b46bb11ed933aa695c318df4665782a9fe68a9f91da503aa6294859a0d2931aa3c1d587b4fdafeb0c4d450a9284904359d
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild
index d5bd655ecace..755741a3fae9 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index 07ca588b88e6..c217fa1f5720 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -5,5 +5,5 @@ DIST ppx_js_style-0.16.0.tar.gz 10782 BLAKE2B f8d2cf691792240bb88094e3f3e09a82d2
 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 617 BLAKE2B 2b45e3a4d08f89b7e74d1c548a6fe357ae2d81c93f00624d951fd0d8dcd812091856d9071959f3e936be716e3e8fac756f65be73667d2589a1a8ee52448cbfa7 SHA512 037107b632fa5e30931d7e6977ee14700c80595d67dc4e818ec4515eba34363c4a1ab60eab7f0a73b1a155a3669d7fe7ae4e1b24644e6969d855f6d7adc6aec8
+EBUILD ppx_js_style-0.16.0.ebuild 613 BLAKE2B 5738b4a97cc1a98532b799fc5776b4611c3062d0a8599fa2acca57f9cb4b79d198a7d9fcc00ad1cdff7861bec72ccff54cc1fc622f741ad71202c07dd8955604 SHA512 79716e71c3fb6f02370e88cf61a13bd4cb8ab1d28ecd8decea893171d955e04dd156fc0c314c95d9bc94edd491ce29ea979cc3b68b6dcde312307ae58c407a41
 MISC metadata.xml 321 BLAKE2B 87895afeafa0ff751e59f8dfae1b5056632d7e72c2eb9e80c87fb983b953138a47213f675252294dab1e85e878636bc2a0327ea2cbd2d3312c19a73c1a058f41 SHA512 3afafe5c1cf470c4ec528b4fb0efaaf912e72a83b0f4c35e5b3292bc4eb9e7e0571baed3485be331b28f01b0e849eac7a1e5640e46791fb21eb5e2286192bfee
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild
index cde70552f4a2..1797befead51 100644
--- a/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index 81f76beb62bf..b8e4131ae928 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -7,5 +7,5 @@ EBUILD sexplib0-0.14.0.ebuild 455 BLAKE2B 5760d5f430d84eab8049fc4f0ca7419e70ccbd
 EBUILD sexplib0-0.15.0-r2.ebuild 460 BLAKE2B 3fe35afc0eb118bddd871fd59d67d36c83e0e10b59de6e6f607a872be712b0da1e47b09f6f3a09c8f57d90f65e6581dd5e7646a6d371ab5568f5b11844d6767c SHA512 fe1402826025c65eaba821ee075b13329f0e0e0d8aefb3a984893f45d4fe6b9a1b108fc4ba249506e5b41b652e7ddef0db14894483f9dd175b2b0b37184cabe8
 EBUILD sexplib0-0.15.1-r1.ebuild 456 BLAKE2B 78affd477ee8d0d59dcb142b7a71f079686af6902aed1bc5fbcb6aeb11125ffcb15245a4fe99e5d531933e1cefe8d9cddbb9d02973413470100fdf37d8b72d5d SHA512 986217acb121025641b69190a9832373254a39e66bd47fa6032ca4a17592d7a2e338bc28cee5da98e3ae898cf735f82f84f2843ae936d3cc7a8dc375186500e6
 EBUILD sexplib0-0.16.0.ebuild 457 BLAKE2B d1a897e9d87dca58fb999b62eff82031425556751caab9eaa71984767fed34fd83a1e3f2a87f51598c2569b9f59576d916c5241483d4d1c248c2e58d046c371f SHA512 b74c11e6f3eac1d6271f0e1949041691e8b74c4f4acd4a908c164ed37bca9ffc85799c754bf8dfabb152147d1e5730230f848cf0ee13c084b9816138307152b1
-EBUILD sexplib0-0.17.0.ebuild 517 BLAKE2B ea3defc83566c342ee927a32c3565e5b5b66c798fcbc858846b17e2769dc6b49bc1b1a13d09981bc61f674f2b1617927f8b499e7960a5079824fc7f9c337f1cb SHA512 07a6a805c5202ffa3289a171d92317371bc2e7e7ecef0f6832bc3a1daf1a8fd271178622678778eaf195b74ae89a0ebff7075e9edddcb30dc66b7cf8f525325e
+EBUILD sexplib0-0.17.0-r1.ebuild 526 BLAKE2B f55e5cedbb091c2e325a3a11cc15a1daeb908543caa2b7f324119407471b0c22b70d74ea950b0cc0ced4308fd61acb4e95aaa4adeff06087c97d2b720904f069 SHA512 3e51a7348a5d2e1c62872f4a3fbf584849557647d19b75a80730cf372912f15f31962c13d5a906cd9b00f16c94a23b4166903e68f815d7919d5b12fb7932721a
 MISC metadata.xml 317 BLAKE2B 86967cedfe93a25621cf87096708aa5ec5c842bb502cac40f3d2bf1d3388e44b54bed673c7b7570dc0a22178493ea27e1c6303b9c973c46fdc9cc7ab687b9436 SHA512 9b76c0680ff0776a20613497e3eba8f8af66694f78f9933e03c99156fff44fac055bc7f0c2fc4ec8a08ccd88da7fe632e9e9d5e60b1b0196477bf1e62d928cc1
diff --git a/dev-ml/sexplib0/sexplib0-0.17.0.ebuild b/dev-ml/sexplib0/sexplib0-0.17.0-r1.ebuild
index 12a0a73d9cf9..8ed62f9c1d0a 100644
--- a/dev-ml/sexplib0/sexplib0-0.17.0.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.17.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"