gentoo auto-resync : 17:03:2025 - 00:29:37

24 files changed, 247 insertions, 151 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 578422a8de0a..a9b547cf8ea7 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/core_unix/Manifest b/dev-ml/core_unix/Manifest
index 0d24b1d1c54d..dd4ce6503a78 100644
--- a/dev-ml/core_unix/Manifest
+++ b/dev-ml/core_unix/Manifest
@@ -1,10 +1,11 @@
 AUX core_unix-0.15.2-musl.patch 1043 BLAKE2B a1adab0960e9fedf4b6408d65138f34167110eedb36db28c155eedc326805939b987fa7cdbbe0998198a58c08d3f924af84d54952de04cd9c3606baad02a1d43 SHA512 bd74fb453cc3da7bf554d01bd3a3af1be323b352aee3b5625fd867cd078bd90f1e26ba9924aaac16f4d7f013044b1ef7c7f848c74ed90f04aee2bd700d43dd1e
 AUX core_unix-0.16.0-musl.patch 1039 BLAKE2B 8e169a4effc405f04c4f0e66992cf45d1146a07372e6446dcd221ce617c3f89c28de4820abcf87a581859c522b26721d27a178afc6057c25e12855519a053173 SHA512 8aa25f42f232e3b95a0ea94ee75f21377c73fa9e2d41fd1519789a60f3798a266b57e7fae8f26183683d6a832eca1f152aef257a2445db1662ca0bb8e2c26e82
+AUX core_unix-0.17.0-atomic.patch 1070 BLAKE2B ae0708fb3e891632e464cd885bb91998485687ef6e81d04fb3ac8e5a71ce0b1b3074189c1bdaac33faa1033847729a94e2e2444a0ca71b57c61ae0b363386048 SHA512 db1d4bfdc0c4c09382f975c85183dd727147b9ee30a87c0323076661668bb1828fb2169ba3ac2184dd47ed995e03cdffe9fb19085a4b366f2208414bc7e5f3a9
 AUX core_unix-0.17.0-musl.patch 510 BLAKE2B f134f1ce3520862b1421cdb424f06546eae4fbf2d2556a04185c7bcb42e169874db03cb5a860d817a41e83f713d2b135d89ec19c3ea7bb19a7f558913eb7befa SHA512 23d74c953e35725f489ebd0780510385cba9caccf0a31c7fe74cf1189ad86a5ea63420fe67ac5b8cc4ded743859282a82eb3f6becca8bb37956755d792fb8606
 DIST core_unix-0.15.2.tar.gz 377836 BLAKE2B 56551ab1509bfecc59ae4b45aaaa4d336415cffe9339932239c884bc86207bdb4066aace35144618509b78b461164bdfaaaa04030ecb1b3619de6f8fe5c3a7b9 SHA512 6d59c52111235f952f3052fb86af1d7380ff3d8d89b5c8d59a66d530a14d462fa4b06cdf29f2ee2b4356a574dbefef33b82f60f9fba512942bc0e6aad07f2b6f
 DIST core_unix-0.16.0.tar.gz 391719 BLAKE2B 29105ee1b8342241dbea136207d221af04d9412a74412fb4fd532f08b22b842125a72e69a47d36129a99c04cd3a83e605bc42b970d79a52420b3e273bd9915d5 SHA512 e38a126af832360f0e0079919b930f3fa99b02935c35372b1ed8c7e174af335de2f4dcb8da90be8f9f524542752dd5c62ec6192eb327d7cc6313b7402b0f7f65
 DIST core_unix-0.17.0.tar.gz 403348 BLAKE2B 9afc07343427e84dc71df23b2d3a4e02780dcb75b4969d06a7d06d47b7dfe17e464223258733673265491cecfbea07f92f429167b81ead226319c452e4b895db SHA512 15472af90b0dda207eec57701f7e4f796b3aa35ae81491ffaff5611e3e5ff0532c80464c92528d970b5d651774d4a89fd3ab619b53f4871cf1ffd7741625f6e3
 EBUILD core_unix-0.15.2-r1.ebuild 816 BLAKE2B 375a2b52b415d107c97ea6cae04594747ecaf6eea7c08e94de8ca8debc33bb7d9f91ed723bdbc57c8c09b13a2c6315ece82af9690aaf4a64872d8a26324734c6 SHA512 6499e9c897b923200a23ca9eb642b618d69b4236f41c128bf63abc4e768364c7d121e502daed2282b470be32c2b4bbd8d9e3a6358a8179a60eb76f74efb2aa27
 EBUILD core_unix-0.16.0-r1.ebuild 824 BLAKE2B da50bad2977df7c075e6e8e7a7e44cc871d7cac0910c79bddfb0a3d5837639ffbc2b277c8d920a07c7783271a5680dc9fa130cf01695a949402ed2880f32470a SHA512 f38fa760a0e0311cbf5e76c0c489cb540ef50493088223a95090753bb557e96b4a022815abe98297fef898d3f3d06bc95e448ed4b878907d13f174828584aa08
-EBUILD core_unix-0.17.0.ebuild 1087 BLAKE2B 75febe3b039f0f707c279598de0e8bc9a2053ac7ddfafab0837ea4822051a1b5bcd265729fbe78f31436060e5702ec488ab69ae11fc3d71f4de329ffb0303c34 SHA512 960ecfd7462b190f3d056e29c75d18a9eaf2c091b41353bf2eac63d7a3e7cd9e5c2a9cb5495afde31222f65e9264857ce1112256e18222eee228848cb1894bbc
+EBUILD core_unix-0.17.0.ebuild 1121 BLAKE2B 42ea0f78d21348e741851c7f7d1b1acd2a3b8b025882600227d0ec51c07eef66736f08cc8922d54a88edf33096b9019661dd2b528d4bb550de7f0a33fbb50b4d SHA512 d54a2f41eff944ac27b6d134590df939f9c6cef2f8ebd72fbfb2cc81e28a0dda82064439ff8fd585b80fc7d82976abfcc00705a1567951486ce3d1a6e4161b32
 MISC metadata.xml 318 BLAKE2B 2179bfab915d936189f80d0c10ee6367fe5ad711df66647da644fa05d8b1b9778d83d2862228955fc11621368a523fa904b639c47a4d8843b42e561127f94baf SHA512 66ae67f04d4f63ed5940c7164f0bfb27097e066c30d07a01c3d773b8b40a7ff6c8f0632e1103b952d310120cc0111690b93495fd0ac6c582652c627006e24bae
diff --git a/dev-ml/core_unix/core_unix-0.17.0.ebuild b/dev-ml/core_unix/core_unix-0.17.0.ebuild
index cec4ce0037dc..e8f5f1522617 100644
--- a/dev-ml/core_unix/core_unix-0.17.0.ebuild
+++ b/dev-ml/core_unix/core_unix-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND=">=dev-ml/dune-3.11"
 
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+	"${FILESDIR}"/${P}-atomic.patch
+)
 
 src_prepare() {
 	sed -i \
diff --git a/dev-ml/core_unix/files/core_unix-0.17.0-atomic.patch b/dev-ml/core_unix/files/core_unix-0.17.0-atomic.patch
new file mode 100644
index 000000000000..64d9d28e50f5
--- /dev/null
+++ b/dev-ml/core_unix/files/core_unix-0.17.0-atomic.patch
@@ -0,0 +1,33 @@
+From ebce389ac68e098f542e34400e114ac992f415af Mon Sep 17 00:00:00 2001
+From: public-release <as-public-release@janestreet.com>
+Date: Tue, 8 Oct 2024 20:31:01 +0100
+Subject: [PATCH] v0.18~preview.130.00+55
+
+---
+ bigstring_unix/src/bigstring_unix_stubs.c     |    7 +-
+
+diff --git a/bigstring_unix/src/bigstring_unix_stubs.c b/bigstring_unix/src/bigstring_unix_stubs.c
+index 0d4c7df..785ff10 100644
+--- a/bigstring_unix/src/bigstring_unix_stubs.c
++++ b/bigstring_unix/src/bigstring_unix_stubs.c
+@@ -46,6 +46,10 @@
+ #define bswap_64 bswap64
+ #endif
+ 
++#define CAML_INTERNALS
++#include <caml/io.h>
++#undef CAML_INTERNALS
++
+ #include "ocaml_utils.h"
+ #include "unix_utils.h"
+ #include <caml/socketaddr.h>
+@@ -309,9 +313,6 @@ CAMLprim value bigstring_recvfrom_assume_fd_is_nonblocking_stub(value v_sock, va
+ 
+ /* I/O of bigstrings from channels */
+ 
+-#define CAML_INTERNALS
+-#include <caml/io.h>
+-
+ CAMLprim value bigstring_input_stub(value v_min_len, value v_chan, value v_pos,
+                                     value v_len, value v_bstr) {
+   CAMLparam2(v_chan, v_bstr);
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index f158791f3462..250e2b16f2a7 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -2,8 +2,10 @@ DIST cppo-1.6.7.tar.gz 29032 BLAKE2B cc02666ca5fbc903cf6a749ee08f7fe34bad4604635
 DIST cppo-1.6.8.tar.gz 29063 BLAKE2B 503c9dcc5f25cf69caa5057753ece9e107383a94d191a15f8056f7f417fa252147f2b2d3011493b80728aeca6979c0097e42b1d1af174784528959870366f5f9 SHA512 069bbe0ef09c03b0dc4b5795f909c3ef872fe99c6f1e6704a0fa97594b1570b3579226ec67fe11d696ccc349a4585055bbaf07c65eff423aa45af28abf38c858
 DIST cppo-1.6.9.tar.gz 31210 BLAKE2B 4e2d9bea57d705bb59de6d7ec990cdd44d2492b7d104d95c9f947172e7e46f5302a0a55f981ce19e5a2fd4b2de2209b4adae478235aca0729920dcba11c07b9b SHA512 26ff5a7b7f38c460661974b23ca190f0feae3a99f1974e0fd12ccf08745bd7d91b7bc168c70a5385b837bfff9530e0e4e41cf269f23dd8cf16ca658008244b44
 DIST cppo-1.7.0.tar.gz 41051 BLAKE2B 880a9775d1da3c459bd43720615d264beed0d0ffa775c58aab21f3fe56346bd959a81f73825a0c1349dd9da48d46f9827ff0f9447d19938fd32870945a23ad19 SHA512 cafa2f7add42912b413f39e1d9fb7a2a42a9be134128c179dfe353f35a6c32840720d2166a77d985941300cb945b9c424b38401d20027d814b25f3bac534506d
+DIST cppo-1.8.0.tar.gz 43588 BLAKE2B 932d6340cd190f781290895ab697d2c7a0b97ecfaaad3f52299e3ccb8df8c10f1f59f266186a6325d14ab07d19e9e6e457c9c3f01ee1b5a79c234eca19926a9b SHA512 3840725b767a0300bdc48f11d26d798bdcae0a764ed6798df3a08dfc8cc76fe124b14a19d47c9b5ea8e229d68b0311510afce77c0e4d9131fbda5116dc2689a2
 EBUILD cppo-1.6.7-r1.ebuild 493 BLAKE2B cf7c4cab4a5c85e20390ad1ace4db9a35194648b838eb04d73d2ee55b410543abe24b041491b67b98414cf01a0db67cc136703fc7c05e7b934c849225a8639ea SHA512 fd6765bd172fe6b9e114ac74e9e2940a298f032aac54b1767f7af23af6e753fd995f8e4b0ed1b9a978072f6602cfce6e53b9dc9d2a42c9895ed590099e4a7fd4
 EBUILD cppo-1.6.8-r1.ebuild 505 BLAKE2B 2e44862122fd5fa062bd431237ce5a39d0e21b0a57c2cad5c41ce91af734156b156170aff0620caa6141a90e9b67b5fa691b9e7a13c728a01526de31f42412f1 SHA512 1f058635a80b74825699a2f1e35c672a72348ec79e0461df0aa49e2ce2a81df52a08acfeb6c4b4871273dd47aead7a38e6a0f156a5dead12439f0cbeb1aefef6
 EBUILD cppo-1.6.9-r1.ebuild 504 BLAKE2B 31c2f924c09aa1dfecb84b57806ef44b312d8db1c43a13f45198d6bf9dbffc6abbb1cabeeaebac72e55a521058d5e71e9424491a1a00c6b9ef1320fb2f6ab3f4 SHA512 d35218a2c671b483a56a2cc50f49c5c611886bd993b7f9e3632c55abbeab7f1d10d5574a6cb7435d82509d729034d92e4ce321bcec3af58d7143dac3c6d17850
 EBUILD cppo-1.7.0.ebuild 500 BLAKE2B 4b5e35f9104eddaf7545d1d0f8fb8abb8a4f5c584895872fb7e6bf1d7e037b67a5e2f9ac56041a66773d835d8bc223ac27e172b158761505933717ed593f95d5 SHA512 fb98f935ed216e1bf3dab82171f68487216877f1302b09477cfcad141fa7e460f6f63ac0f487c10202bd8e34fd6013cf4426cf9b4987646f44518cf4c7afe736
+EBUILD cppo-1.8.0.ebuild 505 BLAKE2B 83333956338e886a130ef8ca1d86fab510ebaa963377589ce269dea8a1d036ab809b69d263051f3f48d012f8138b9062a0c2cd74def6cd9157418c1c5df68530 SHA512 7fb6d2fd4894e3a151602f711b53b0287c98f7eec22feddd45e78aa801bc70987a6a86dc94a606382f7ae5fd3eda084ec6f1fdcc5d2a780e72fea21de9a19da2
 MISC metadata.xml 318 BLAKE2B b749af34f0aca960fb2f0f158035dc451626c9f67540ac4e8365e963da03eb36ea4dc47aa3c3b3469082c0d3d882ef92fd79e76b9bc5fbe82788c2ee38cc4876 SHA512 e7c9ca6ec268f3b53413a167df959e45107be540246dc991ddec0eb71d1d21c59c963a47107e3450003374fc36323d826f6b45f83577cc8ab995073c509e3d86
diff --git a/dev-ml/cppo/cppo-1.8.0.ebuild b/dev-ml/cppo/cppo-1.8.0.ebuild
new file mode 100644
index 000000000000..c166bc47d4b9
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild:=
+	dev-ml/findlib:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
index 5afabc1d3653..552ba56b6447 100644
--- a/dev-ml/easy-format/Manifest
+++ b/dev-ml/easy-format/Manifest
@@ -1,5 +1,5 @@
 DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
 DIST easy-format-1.3.4.tbz 16075 BLAKE2B cab5c3d76ac77bfcf4a993b4bf07f6577edd60ed148931912af8c2319368569cebe51c5626c80a2d02e06a19e1d0d5d08406acfdafc917006eeae7f20b30ef66 SHA512 90264864dde4cbf51f60fb5c21cf033e11bdeb662e76b62ce27b496c298ca9102174885ed7a6d29a6b8e43089e27d5bb5be247f88d9739c15cfd8470fec29d33
-EBUILD easy-format-1.2.0.ebuild 678 BLAKE2B c408b8c6d2d6dd219cb09cff5d221b12e773e7a060ca7d1c9f0b6a8cf3f799774a74a5881d1ea627b6fd3aa68a0dc39c0dbe2102127052b8c4f6c3adb0e17f3c SHA512 11ffc1f9d9ef9e400f44dac33d592d598ceb928b1bc3715cfde02d045676f4a4ed79f4bd9fd5d2f18da353d97dbf5e60f3e02a2a7b1b219fea20fc719c5d5464
+EBUILD easy-format-1.2.0-r1.ebuild 681 BLAKE2B 79c959988caad0ced6835d593ce4dce0370ab63ed3b0b3d5fcfe09e3de61e16bfab70c138348d62a5c8b75a6f09147e6e2736e270fc432bc695127abab5d1fe3 SHA512 b4665e9b5a84c2f47718e7f25b981e233e5f5d0f7aaff1d6aa419dcbddcf4e170b409bf5ddc00a270097b536bf39ea0150d68c3236464df1fd6dfed8ff5208bb
 EBUILD easy-format-1.3.4.ebuild 382 BLAKE2B 77d65135a470fbae24aed200adb0044f80f948559460e65b0a6e8360ebdf0261846aac5e0906170d4f7446dde183ee24543c404ee3c0e5e49a0664c640e7b6fd SHA512 5337c21579fbd46c6eadddd4606f9721b75a4b43e0829880eba3b04859e7fc760455e92913d28f6f5e8d92be505db985f130bbb14c53041d1cf4ff43bccfc044
 MISC metadata.xml 325 BLAKE2B 43cf16a5f69e78b5c1b46a84e5e7ad227b6757c933c1825db9daa5e775c3e4e0c814d84ad5ee49fb580e9308d6e558a1b08e3b9ce9c7c48bacc58c8cc245c985 SHA512 8630572e30dd6b68e3d2d7774852ffe0c0bc54730e83ef433b40c33fd5234dedabf89f9a9c7112e93c3c675d7bbf115c646003b442c0e89713f44a7b962ba6f5
diff --git a/dev-ml/easy-format/easy-format-1.2.0.ebuild b/dev-ml/easy-format/easy-format-1.2.0-r1.ebuild
index d04158aa9caf..13addc0be922 100644
--- a/dev-ml/easy-format/easy-format-1.2.0.ebuild
+++ b/dev-ml/easy-format/easy-format-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,12 +9,12 @@ DESCRIPTION="Pretty-printing library for OCaml"
 HOMEPAGE="https://github.com/ocaml-community/easy-format"
 SRC_URI="https://github.com/ocaml-community/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0/${PV}"
 LICENSE="BSD"
+SLOT="0/${PV}"
 KEYWORDS="amd64"
 IUSE="examples +ocamlopt"
 
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="<dev-lang/ocaml-5:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
 
 src_compile() {
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index da4317a5190f..874677278ae5 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,5 +1,5 @@
 DIST extlib-1.7.9.tar.gz 91092 BLAKE2B 6d5f0dc01813357fd9b3efcbe0e4c4308eb538deb924cbff2919bc6e24b72e3fc631b428c1e67f90ea32005b87c16147265c80d61d8feb97df0223bc9b14736b SHA512 859cf5b9743589037f9e1b5f00ea77ae2401657b3dfc6897d21c89d5f8a1d7e7ac901eb6eaa16722e6b6a0266fa634c40320d13fcf7bdfad2863512b5f79e591
 DIST extlib-1.8.0.tar.gz 90132 BLAKE2B e890a13f3d32c7c25a5fbe9dda9d85139e2d54f3275d1236f575aab88a615718a343bfcf6f0f3832d14855ac720f99c6a45a28a3aec84f2a4e27098eb648863e SHA512 f82892bcd9b3098a313c8f130c4926a093a5cbbb098f509f80d6c176c9ff3a7b345daa1c6298bd4d6da0b41b98c681aed50c68b066eba2de1fd5fc07f99dc487
-EBUILD extlib-1.7.9.ebuild 875 BLAKE2B 0008b03562cb470ab2c8ee5be87e43ead6cbe6bf6cb66d30eb207b2d3bfc9c02bce095173bb17a0321e66ea3d077ac111a37503d8b26ceafcd8cc24be1504685 SHA512 c977767b9027c19baec4a60e9081f5993eb251352ef33dc11900b6c9106a8c91e1e5a281a01cad56a5900413a19342df52075a9180976804e5eb0e99c86ac290
+EBUILD extlib-1.7.9-r1.ebuild 880 BLAKE2B bac5b3d276bd3343f4f8332087ba5eb0e0416249266c953a82812ae4417e58f2d8d8b52ce1696141a49413ad6933a512b01325e20a7b6b2ced5107115a1e05d8 SHA512 277f99bfe2895e755f53b953f14f3f8beec3aac018bdd75c92f90d56d0261f3612026c4bc4702154180084612a9d0c8f80c452b4cb70c78e3cd88e6e24bd24fe
 EBUILD extlib-1.8.0.ebuild 791 BLAKE2B a75eb56e6072061e1b2813e249e0d1adae232dd2e090ccfa0dc0115de2643b139fd7e35d6932f900aeb6a18254a54aca65c955bb84534a7920361b23f803c062 SHA512 93832cb77d4cd62fd85e90275eb2c6b00f6506d9880443cf6aac72e15c3703c1112c288de5850aaa27b96a4f107dee6d4cf304dc8ef1b4acb731fbf421533e2e
 MISC metadata.xml 373 BLAKE2B 4cbf2907ba5e56a5eeb76875cf300f8b85e394b93ed79d2b13eb14db35931f7b25a7ee2ab5d5973d4345f4912c47d46d7b5432800afcba2d63ccc0b6fb02aea7 SHA512 80f2b54c2e5935f54ed177cfddbfad752e06d71218a41da6e796e81d2f5af4de3487c28d36242437263b4eb275343596979ab117ce311032faf3a7ff91aa9f00
diff --git a/dev-ml/extlib/extlib-1.7.9.ebuild b/dev-ml/extlib/extlib-1.7.9-r1.ebuild
index 841d9be0a9d8..35cc6c7e8262 100644
--- a/dev-ml/extlib/extlib-1.7.9.ebuild
+++ b/dev-ml/extlib/extlib-1.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ IUSE="doc +ocamlopt"
 
 # See bug #704146
 BDEPEND=">=dev-ml/cppo-1.6.6"
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="<dev-lang/ocaml-5.3:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 5b82dbcebf6c..1c3dd2aef7fd 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,4 +1,6 @@
 AUX lablgl-1.06-makefile.patch 354 BLAKE2B e50b0b731b50331d286d19509eb76a84a5978d5c8db1a7f91251e5a3640fdaa57480e10beb40e366db1f5b2e7d4d1631342ddcf53358bc838122cb8b93174532 SHA512 1b6a6d3f5eda6713e5627ca95590e2126837693eb68464bb67eb24bb9299021bebc027b685f5b03552fb2d15540c5b1791c7de55e23c6d1c5149c2e4f22f7f6a
 DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
+DIST lablgl-1.07.tar.gz 567464 BLAKE2B f5943883d5c3ab34f094d5e6f3254eb5728d662acf07afb10ab0561094bed867a93c4709b32e348b3dfbd6a86f55931bb545c71a927f4c10ea2a232a4176bdb2 SHA512 8091bd79dcb42ea29ad67f8f2da2cc75c640d72b0a5a4bb6a8548a6bfff4e7c1c6412903403b0916a0a5db918aed56a4979881456668d283d2fe4faaf9b4ec9e
 EBUILD lablgl-1.06-r2.ebuild 2141 BLAKE2B 89f6870a6fc9c3567ffa62e9bc856868537581d633a7e708277230de75652b084d136287670b87d0da38d5b7864b01a7e5c39d9807ba8e769afbebc962235ca4 SHA512 1215c6de1a654f3bb9ed90c3254b936fa7a66b022ca55183de23e40cecdbd3d39e5cd7cb52eba9d4d37121c0b4aa6cd30e54243ae6fb0a940915d1efb2e01b13
+EBUILD lablgl-1.07.ebuild 2154 BLAKE2B 977eb9d23f4ec9849b4ac40bbccdec361561081080b9083bdbe471bbba96ad27c8bbd853404aa50b9c919fe69d1c1fb72d4d611a640756fae77a746bfed0f4ff SHA512 fc9a1094cb67608ddb87e0c464ea0d3514546e1879117ceedac7540041920fe35d86477e0494c7d384318d5dc0aa0a6b1f9b3bf580a810a795853663e23503d3
 MISC metadata.xml 248 BLAKE2B bfeb84ab824000a880290862c70d5a940e31896451425d4d38034106c3355d384d41eb1ba01e275f297ebae83f180b7168a99f0c134152e72c0b4e750ab71463 SHA512 bc6b2d2e299ae13f4dfeee4d3105adca30cbe3ec4a587ac445eb9e35bf663626176d87a42548947242413561d12551b650a675e18529b0631bc996fed8175db0
diff --git a/dev-ml/lablgl/lablgl-1.07.ebuild b/dev-ml/lablgl/lablgl-1.07.ebuild
new file mode 100644
index 000000000000..0f941c2e7fad
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.07.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="https://github.com/garrigue/lablgl"
+SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc glut +ocamlopt tk"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.14:=[ocamlopt?]
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libX11
+	virtual/opengl
+	virtual/glu
+	glut? ( media-libs/freeglut )
+	tk? (
+		>=dev-lang/tcl-8.3:0=
+		>=dev-lang/tk-8.3:0=
+		dev-ml/labltk:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.06-makefile.patch )
+
+src_configure() {
+	# make configuration file
+	echo "BINDIR=/usr/bin" > Makefile.config || die
+	echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
+	if use glut; then
+		echo "GLUTLIBS = -lglut" >> Makefile.config || die
+	else
+		echo "GLUTLIBS = " >> Makefile.config || die
+	fi
+	echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
+	echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
+	echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
+	echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
+}
+
+src_compile() {
+	# Workaround for bug #834870
+	MAKEOPTS+=" -j1"
+
+	if use tk; then
+		emake togl
+		if use ocamlopt; then
+			emake toglopt
+		fi
+	fi
+
+	emake lib
+	if use ocamlopt; then
+		emake libopt
+	fi
+
+	if use glut; then
+		emake glut
+		if use ocamlopt; then
+			emake glutopt
+		fi
+	fi
+}
+
+src_install() {
+	# Makefile do not use mkdir so the library is not installed
+	# but copied as a 'stublibs' file.
+	dodir /usr/$(get_libdir)/ocaml/stublibs
+
+	# Same for lablglut's toplevel
+	if use tk ; then
+		dodir /usr/bin
+	fi
+
+	BINDIR="${ED}/usr/bin"
+	BASE="${ED}/usr/$(get_libdir)/ocaml"
+	emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
+
+	dodoc README CHANGES
+
+	if use doc ; then
+		mv Togl/examples{,.togl} || die
+		dodoc -r Togl/examples.togl
+
+		mv LablGlut/examples{,.glut} || die
+		dodoc -r LablGlut/examples.glut
+	fi
+}
diff --git a/dev-ml/llvm/Manifest b/dev-ml/llvm/Manifest
index 873a3f3f3586..2f373762f15b 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -12,7 +12,6 @@ DIST llvm-project-19.1.7.src.tar.xz 141249332 BLAKE2B 1259ed7f9aca7b35e89d818bef
 DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf6f30e75705123d067ea97175d91d7a5b6a75008df01d99ae7aa16aaa3b101f3f41e38d01f04158f95a261d617b3ede0254cd SHA512 195797b06ac80a742e0ccbc03a50dc06dd2e04377d783d5474e3e72c5a75203b60292b047929312a411d22b137a239943fba414a4d136a2be14cbff978eb6bda
 DIST llvm-project-20.1.0.src.tar.xz 147206476 BLAKE2B 8e8bd8aa995a84d17ac7d634098a6b72a47c30f1752029b620f4541a2de4039edf09117286094ae7bc59c4e84374dcffb8e5ee6ef5feaf4ea7ddb58dd04ea803 SHA512 c90fbc43c40e148357912adc40d799a79cce3d3a929136c137421f6342ed7338659e651f1dedfa8e10b94b9f2897e25b2962e17709add02857f89f10615a2397
 DIST llvm-project-20.1.0.src.tar.xz.sig 566 BLAKE2B 98979ce89f3fe6e95eef6096066cf855245a585608e7d1fddb5bbb2c73077f3ee28204260e18d7e45e3051daae3639520c39bc3d0dc51524873ac213e2511456 SHA512 68da1c2a13aaa48a67bbb9e716f9f030cf372edc651bca2861453378a6a9172a207ff59e29b175001f042888bf1f9c118fbf938f757e1f4c966943baa7e2696a
-DIST llvm-project-7e8a06cfa4a2951b8ee77e19e34926e6e535b4d1.tar.gz 228792296 BLAKE2B cd9357bdca9342770820f9fadfbd0b129a83324847f18e2ebac1fed8df4afb101aba2dc19d90264ae1e2d5692e34149ca24ef82a4973e7aeddb157268bb411b6 SHA512 9821a34a559e1db596940d76ce9388360baea43c1a9de814f567bfcf1428a0c6e3ced61b1e07537058454785d9c3aa3f443cbcf742a01fb40dd20b476a906442
 DIST llvm-project-cb7298f66d62a3548fcf3bd230304067ecf30d17.tar.gz 229200711 BLAKE2B 1910569812e7423cf566b0dec67269404ba8db8232ab293bc603a88914f2b756e3088bf2133c0fca612cc58d39691c7b813b3c5839a7ac9a3d177fe6bde766c6 SHA512 07c3f6ce34e7d32c5ebce1d2efb77e6a1dde49f9eedf7191733a20bdcb6ffd0c03f8fc8de85fd00bd9465b209f140639a68a367d2218c028bfa6e06067cc3e14
 EBUILD llvm-15.0.7.ebuild 2576 BLAKE2B 077f5cee93e3f92e808856559add99b5fb94c03316493329fcc5067065c44d2216420fb411c9a52fb303fd33c9d4a4edb19d4b6f20ee10ac2e86d518f3ff500a SHA512 ca1d7158d86040261105d93632a2e0f23753990e8a0a268aef2b103c1c2cc81f0497bf243301839ab7c5b00051337bc20d7d9bb1f35c844a7a06d5b02603c72a
 EBUILD llvm-16.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
@@ -21,7 +20,6 @@ EBUILD llvm-18.1.8.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334
 EBUILD llvm-19.1.4.ebuild 2466 BLAKE2B daa9646cc6b01f6de1ca0dfb13f8851b179985334b80cb5610fe11eb87be08129bc81ea6ab424e319c4eeca69bb9b29da19a36225eb79a1d6d9121e4c878b6b4 SHA512 30321d67dc080c88cc351959ec5b8ae63f1201559b0101c555420afada30ba21927f79907019ed6550242f613d2bc27668a4ff750e89f569fd200e1bb9c475ea
 EBUILD llvm-19.1.7.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
 EBUILD llvm-20.1.0.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e194920221480530493e72808f5d43907ef9a520e5c4501e8f8b744712a407d106739de7ff313bce774ab4f9 SHA512 5faba05a88385260585b1e41a69d329efba70bfc836e5e3ba1dac89ed52e48567891cc8c399485b9322a8f8fc038a908ea09bac0fb8e3db6275d4c91434fad80
-EBUILD llvm-21.0.0.9999.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
-EBUILD llvm-21.0.0_pre20250301.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
+EBUILD llvm-21.0.0.9999.ebuild 2543 BLAKE2B b553bdaa2193f304a661fad3ac8210d1beb66a37f2d1a29b8327b3c9e74d3f80b935927345c4852231979bc5c10cb4c08e18b5a575eac1710e2cc7a9a0b3ed4a SHA512 2192ec78a96dff5617e68f9534b5416db705e0d6f3eb13c250b21158376a87f4f88a6936f1737f479ffe2c5ef846c0cfbdceff4e8bd3cc8c8173d2b8441d91d7
 EBUILD llvm-21.0.0_pre20250311.ebuild 2439 BLAKE2B e980cfeebc7324b180115fa4a8ecf6ab005c554bbc4d15a99e9ecbc8a22f1061193ffb02fd376f1be3cfc812e51124afd81e438e9da1e81a6cf1ab672e8beb51 SHA512 b9ef630e6c6513883ff57ba9f8a3a0c117588fa72d170dde29d5b06e39e8e322aff99d183835bfae2048d09572ed2b2a80279ba452766d8cc088e3b212b3ecce
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm/llvm-21.0.0.9999.ebuild b/dev-ml/llvm/llvm-21.0.0.9999.ebuild
index bacc5c89fa79..3d0b7490e879 100644
--- a/dev-ml/llvm/llvm-21.0.0.9999.ebuild
+++ b/dev-ml/llvm/llvm-21.0.0.9999.ebuild
@@ -96,6 +96,8 @@ src_compile() {
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
+	# https://github.com/llvm/llvm-project/issues/131115
+	local -x LIT_XFAIL="Bindings/OCaml/debuginfo.ml"
 	cmake_build check-llvm-bindings-ocaml
 }
 
diff --git a/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild
deleted file mode 100644
index bacc5c89fa79..000000000000
--- a/dev-ml/llvm/llvm-21.0.0_pre20250301.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-utils python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-IUSE="+debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~llvm-core/llvm-${PV}:=[debug?]
-	!llvm-core/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-src_configure() {
-	llvm_prepend_path "${LLVM_MAJOR}"
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	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-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index b9d29f579ba6..024fd74ad0f6 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1,6 +1,8 @@
 AUX ocaml-fileutils-0.6.4-dune.patch 197 BLAKE2B 20a94f2f61f1bcdae26aca2f4f82671bf3d77fdb90103f3a862680610b6c1b4ee51f13f42c3ff84524c87faae58cd4cd101cc2e4ad1b9555d0347c4331e9b83e SHA512 98eade34cd7b4c30719567dc2ecfd8e19d33caf9615e8099181830638c79196eb27d298862637f884381f8efe18b23de7ecbea9cea33f40f5307a728387b6690
 DIST ocaml-fileutils-0.6.3.tar.bz2 43157 BLAKE2B a9adf17d028abd664dbdec3fefa301a6b502941a6da4ef9c3ef02b876f187d224e404f6a9ffb5460035ba475154c60109a5218cb8b9bb36153ca791f8d218e7d SHA512 2c5e75b894e9f5e3b003d61977a87f5c6964a89d844949eedc55f97c5875cc52052182420bbb4e73925d306479c66400df74e4adfccc5b2102347d13e99505cf
 DIST ocaml-fileutils-0.6.4.tar.bz2 43144 BLAKE2B e0024b93c17d11c9c3068da3141c7676bf70feb21fc886d79f793396194f6d5052be887734decd29fbd524d127e0b8afcd41790c9f378e000fcb92cd73e0a2ce SHA512 7053f8d92655d5631f1ec61ab7f9e3f6e3afedbe435038858dd9a026b9c769c6182afaa436491a398e7c4513b384a609e016718e030855996b2d9d54b461bd19
+DIST ocaml-fileutils-0.6.6.tar.bz2 43979 BLAKE2B 2b0ad5ccaddec79a741a7e3cb3eb362eee47c094d8e40b5e0a0b0ca3bfdc4eca9d0e385e720f9e170751ea430d8a5634cd6be3ae8516e3b76325d8faae909613 SHA512 ecc38b1577ab108bd24d1e9f0e83596254e542eefb37020dedcff7ca0109e562411cbb9806fbc6f88f4166569bf061a444971388c26950ec02dfc48b35daed90
 EBUILD ocaml-fileutils-0.6.3-r1.ebuild 770 BLAKE2B 27a839c7ac88b1b2d6e932d713da45efddf31441654c854444bc7ed2e219c649ae73ee61db06490243cb3d0b24d2484f0c5dd1c19f6dbed262fe7f327c4dfbbe SHA512 c914caa02335b2b76663c6ca8a6428c95b4dbcff68b2c51ddbfc6e3f30c7c4eb9e4b82ea233c4a8b2ce59182c9af320e0c3f9ec2728b21fee2a1958a0d1a2374
 EBUILD ocaml-fileutils-0.6.4-r1.ebuild 746 BLAKE2B ec39f70a6c27e8f836ae86174a9814fc3a6c7c639069ad53465bbcf47ae967c10b6a4a295ceda08e74da12f8825746ab37a62fd98c6936d41174cd03ffd69432 SHA512 7767c78f1ed38e4a3338f52c520b53d2240f5d015ac6464260adc31ed55523f1e1da45f158329b235814bf25911b48ad9679fb881194d46452e5f8e9e063117e
+EBUILD ocaml-fileutils-0.6.6.ebuild 704 BLAKE2B e340333d9b41854f65ed6533025219d5e66714aea5d5884125b110977a3af03eaefa9b6f3a3a278264adb96e03cd7a12b7a123a2ce1a17707248c1c0c7acf279 SHA512 bb2dceb8578a029ccbb87458d716fcd4ecd7ec621e6ddb846d99716afc19af710b3e69626f191de779668cf93066ec45e5fdea07240ff9db2c47a7f3b06e784d
 MISC metadata.xml 841 BLAKE2B 32a80d7ffc608de8e8ab0631ae867739de449825bbd2fdf814fe2d41ccc87cce3f6831faf3288ab1dee5e5ee8b71502679b769067f7663a6122bb6555c7a9a5d SHA512 c4e7e187c24d34c756e4bfd37d8d277c62d726e53871f306cfbe6f1eab83a6f0db0c23948c61ff856b2704b3524632b405ee9c821c067c49b982e350d7130174
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.6.ebuild b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.6.ebuild
new file mode 100644
index 000000000000..e2243812323a
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME=fileutils
+
+inherit dune
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and filename"
+HOMEPAGE="https://github.com/gildor478/ocaml-fileutils"
+SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-${PV}.tbz -> ${P}.tar.bz2"
+S="${WORKDIR}"/${DUNE_PKG_NAME}-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-ml/stdlib-shims:="
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-ml/ounit2 )"
+
+DOCS=( CHANGES.md LICENSE.txt README.md )
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index ccca8e6d4c78..1764113f520e 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,5 +1,5 @@
+DIST ocaml-gettext-0.4.2.1.tar.gz 110349 BLAKE2B 8156d4962838ec752d17844e50f332c03e0de966b7f15a18f740039a5cc7faf4b42733129353f0bb24b9922d61dce078e77f64356a1c587d9f80d8a65cab602d SHA512 659e3b4891ec7bc17f33de072d5625df62e1d522e70ccb912969c0b87145d7d44e20b8547c6513065ca4b87e314b31f4cf8057543d2c9b40f8ee2227df5d1e67
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-DIST ocaml-gettext-0.5.0.tar.gz 113204 BLAKE2B c103e461da446eb65adbde33de2c37caf920d08cb334c4889364cbd54043fc88c366be67c424ad901819b6688d11c91f3d3a328fdb04ddf5cf0eab363512a412 SHA512 f55505bbe0da2a06053d94ee895a3e610a8d4ab5a2283ccff6a5a0c6a8ec011f5f286ab93e117cc340f55f056c7cdcb5752cc798e9d8e18fb5ab17f27f4a64c2
 EBUILD ocaml-gettext-stub-0.4.2-r2.ebuild 1114 BLAKE2B aad75080a258d2f99d1c6ccb5684d4a2af87c3e2d2b3f372b155405ceda9990cb5e7cf77cc1e39d23dcb4cbad5ae7dd9846066fe34557d5db904cc193de8e53a SHA512 5a23d57bf12e1eb6519cb35ebd1632da87e04e2ed8d53023e4ef329638ca83ea09547a3842923d28f9ad52eb62e50aa05835fea0ca769d2a8a1e52dcb94387f4
-EBUILD ocaml-gettext-stub-0.5.0.ebuild 905 BLAKE2B 8f01a02a5407da931d3d765904bd58a0f730280fea55a1e27c6d234df464c7be2518f754e885b7e095a0d700b362c01d461b973f0bece4dfa6b46d72f6e6b551 SHA512 a6e52ca95be83f32b6d6c0d654363ef8b63189f7136cd6e062d44a5b7ec0fb081256053c06bc895522080219519d3d39639392d5c543155365aeede74156f331
+EBUILD ocaml-gettext-stub-0.4.2.1.ebuild 925 BLAKE2B 2fec154cb1bc6c6cd86fee45ac3974e90c9d35f831b56463a20645bf9eb89d1fe5572420010e03644b61c511efbe1d28955427b55966a830be3c7116c20d6437 SHA512 398741211a9f2021501d90c205fb51924fa8ec5851be253e1ec340a3e1e9bd8b5ba695f5d8509e1b5cedc380b74ea6f7ec28990383465136927fa85776934267
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.5.0.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.1.ebuild
index 83a5d260bb3a..f592818b0a3b 100644
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.5.0.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2.1.ebuild
@@ -9,12 +9,13 @@ MY_P=${P/-stub/}
 DUNE_PKG_NAME="gettext-stub"
 
 inherit dune
+comId=d566551bc2e2f5e6e61d24e05d314ff57eaea6bf
 
 DESCRIPTION="Support for internationalization of OCaml programs using native gettext library"
 HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${comId}.tar.gz
 	-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}"/${MY_PN}-${comId}
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
@@ -23,23 +24,18 @@ IUSE="+ocamlopt test"
 RESTRICT="test"  # Tests fail.
 
 RDEPEND="
-	~dev-ml/ocaml-gettext-${PV}:=[ocamlopt?]
+	>=dev-lang/ocaml-4.14.0:=[ocamlopt?]
+	~dev-ml/ocaml-gettext-${PV}:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=dev-ml/dune-3.17
-	dev-ml/cppo
-	dev-ml/dune-configurator
+	>=dev-ml/dune-configurator-3.17.0
 	test? (
+		>=dev-ml/ocaml-fileutils-0.6.6
 		dev-ml/ounit2[ocamlopt=]
-		dev-ml/seq[ocamlopt=]
 	)
 "
 
 src_compile() {
 	dune-compile ${DUNE_PKG_NAME}
 }
-
-src_test() {
-	dune-test ${DUNE_PKG_NAME}
-}
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 2dfed88ea91e..2d919e3b6e2a 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,8 +1,8 @@
 AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
+DIST ocaml-gettext-0.4.2.1.tar.gz 110349 BLAKE2B 8156d4962838ec752d17844e50f332c03e0de966b7f15a18f740039a5cc7faf4b42733129353f0bb24b9922d61dce078e77f64356a1c587d9f80d8a65cab602d SHA512 659e3b4891ec7bc17f33de072d5625df62e1d522e70ccb912969c0b87145d7d44e20b8547c6513065ca4b87e314b31f4cf8057543d2c9b40f8ee2227df5d1e67
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-DIST ocaml-gettext-0.5.0.tar.gz 113204 BLAKE2B c103e461da446eb65adbde33de2c37caf920d08cb334c4889364cbd54043fc88c366be67c424ad901819b6688d11c91f3d3a328fdb04ddf5cf0eab363512a412 SHA512 f55505bbe0da2a06053d94ee895a3e610a8d4ab5a2283ccff6a5a0c6a8ec011f5f286ab93e117cc340f55f056c7cdcb5752cc798e9d8e18fb5ab17f27f4a64c2
 EBUILD ocaml-gettext-0.3.7-r3.ebuild 1595 BLAKE2B a36e1429b377cc63ec4a94323cb10daacc105e0962e73336e4a3d46434e720eccfeec2e4b954cee27e5a179134f3d4847617cab42456011c7e0bc71a77a5d6e1 SHA512 360e9429a63483ee6a6d13b83f227a738b61ad0cab307814ec812da3b843b7b7dffd7bb46acca9f416b82214b585a9ed2007ea53376145c708278c2f6b09c0b7
 EBUILD ocaml-gettext-0.4.2-r2.ebuild 1025 BLAKE2B a783f1b70de99e0881a3d8592b36fa8b9ceff6112c32b736e36873b8d7084a376b0e8b8b36ec74db6cf300d760ca079a17e81245615d4e0fbf7d2e4e853afd19 SHA512 c5e0a1b0760bad59ef8f889bab47ca0cb395332106806e12fe9763bd66ea0216d6ea3eb3383db8ebf9c2434d9862b91a659c35f561e658f5a871eb0b13a1f116
-EBUILD ocaml-gettext-0.5.0.ebuild 856 BLAKE2B e524cb976ede413edaec66c868169a38ee5124d0b317af70eaf4a6b2b0de2568f7f37f6edd45d7786a57167cddb860066f574e58e27d62034ff092d6d3804d01 SHA512 921e17ad1015ba58e7449f4a89b277ab13fd966d2997c6d40714ba367bd6df102f032f2057bf02565cb8807dc4589c8e9abcd922f0b3cbd8757101ea9e193671
+EBUILD ocaml-gettext-0.4.2.1.ebuild 858 BLAKE2B 21fb6eef43ed7b3aa83ac3b66526048d4f9aabc8b7a8604044cc81f0155071b3b97aa34ddd7fa34e25763be3a004d858e9799ae77b9e9b7f2f053a917fc5b7aa SHA512 17976892a95cb2bea62f6f968000cc02d623a44c46782690259f17a219d5bb27f716fe6d43a1a28b5ff4a48589542f5189f75a5400fcdbe409f9236303bf434a
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.5.0.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.1.ebuild
index b384d413d9a4..f5b6abfb19d4 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.5.0.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.1.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DUNE_PKG_NAME="gettext"
 inherit dune
+comId=d566551bc2e2f5e6e61d24e05d314ff57eaea6bf
 
 DESCRIPTION="Provides support for internationalization of OCaml program"
 HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${comId}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${comId}
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
@@ -17,25 +21,17 @@ IUSE="+ocamlopt test"
 RESTRICT="test"  # Tests fail
 
 RDEPEND="
-	dev-ml/ocaml-fileutils:=[ocamlopt?]
-	dev-ml/dune-site:=[ocamlopt?]
+	>=dev-lang/ocaml-4.14.0:=[ocamlopt?]
+	dev-ml/base:=
+	>=dev-ml/ocaml-fileutils-0.6.6:=[ocamlopt=]
 	sys-devel/gettext
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=dev-ml/dune-3.17
-	dev-ml/cppo
-	dev-ml/dune-configurator
-	test? (
-		dev-ml/ounit2[ocamlopt=]
-		dev-ml/seq[ocamlopt=]
-	)
+	>=dev-ml/cppo-1.8.0
+	test? ( dev-ml/ounit2[ocamlopt=] )
 "
 
 src_compile() {
 	dune-compile ${DUNE_PKG_NAME}
 }
-
-src_test() {
-	dune-test ${DUNE_PKG_NAME}
-}
diff --git a/dev-ml/ppxlib_jane/Manifest b/dev-ml/ppxlib_jane/Manifest
index 689d45f36eb5..e7d735184be5 100644
--- a/dev-ml/ppxlib_jane/Manifest
+++ b/dev-ml/ppxlib_jane/Manifest
@@ -1,3 +1,5 @@
 DIST ppxlib_jane-0.17.0.tar.gz 46439 BLAKE2B 97b8040571e0641ebc6a67d9ee394cba2388be0993eac5f8255b3358225533d7813ad7a9fd7af8f87007348badfb7a51a73af44365c87c1a70b0c74b8401e71c SHA512 0907a5c9dfce17dab6df86bc8b04b20c1f809c45a89e947c1da57092851489c618c741aabb853fdc6ca48f4737a74ee2a8c8fc1abfbd85939fd003991adccc09
-EBUILD ppxlib_jane-0.17.0.ebuild 583 BLAKE2B f42b70d3939f424ab8b54b9faad56873453f3d93cde040309a3222353845fa5a27c6832633d4b5737c99f90a3dad2234e5bdee6065f4e7142657d2910a9caf4a SHA512 c094d78f42b7e3f2c42c3da070fa7d872ba1cccada34c93fc23a150ee42720dfa8e39f8212a84076c71f065d9d3365dc941f0648f3b8fb8951754f9fbe789b61
+DIST ppxlib_jane-0.17.2.tar.gz 46492 BLAKE2B 6bad78b03c1769d21f62acbf1c88e1a1e41db11bb942b8286d0ea195f3b6272f64203572d151b7a6b13d916a0a79ffa7a51bd2bec3fca31f6c3dad9ee827a628 SHA512 342e034d44d14958869e643befb0e749d4de3ca0040891ab51592e2583bc5bb827bdaa5bd06966ac536151d160997aef79baa090247d1649a6b5849a359744d8
+EBUILD ppxlib_jane-0.17.0-r1.ebuild 609 BLAKE2B 4adf522a83397f49a811257f38f1702926c408ac6f30241da5d78fd470fa3e0bca0b698f5c3e3a768ca623d4b559b49a42a243aa9f565f577850ba40e5ca7ca6 SHA512 57628c905c8a90edc56f3745b3d5fdcdc5acc6bdd60a9a16e33a3945c131f46e90ceb1d46392014d6247382cdbfc2d2f249c08869fe80695b42cf8920454fbaf
+EBUILD ppxlib_jane-0.17.2.ebuild 590 BLAKE2B 9ca9ffa634553f9004518e0132d1d9699c89bf5721398f50a06ba1640e5093fcaf7a9bf17beb373deba82849125120ddcc99b07138c1caba3c17c648bf9d36bf SHA512 7b75eacd8152aa65e5934330505e8ebea1fb13c9e0238db89781a289c31408819c73429e5303b3266be36f0e07413e5cb81443c7364c53434a454d5e19c53d14
 MISC metadata.xml 320 BLAKE2B 297bc8fb8cf4c90a9767ad92eb8143e08b0ff7e5e8bc71c641f8fa390a052f9da402d4fe58a8dd3053c379cabb9449900bf49b62c8fb442b31ed87b7c3ca85f1 SHA512 b92e4f81295699a6a794ee524c8d9939cb4fa7c8813c81d5e1a1afe9a64e918daabfe992c52d4a48b6a562cde1153fbe3c788392094b18faf9a2b98b5cf8f82e
diff --git a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0.ebuild b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0-r1.ebuild
index 3d4cb81767a5..07f03db970a3 100644
--- a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0.ebuild
+++ b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	>=dev-lang/ocaml-5
+	<dev-lang/ocaml-5.3
 	dev-ml/stdlib-shims:=[ocamlopt?]
 	>=dev-ml/ppxlib-0.32.1:=[ocamlopt?]
 "
diff --git a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2.ebuild b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2.ebuild
new file mode 100644
index 000000000000..212b4b65119e
--- /dev/null
+++ b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Utilities for working with Jane Street AST constructs"
+HOMEPAGE="https://github.com/janestreet/ppxlib_jane"
+SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-5.3
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	>=dev-ml/ppxlib-0.32.1:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-ml/dune-3.11"