From ef0fedb39c21a343a3f316726f272bad9005b22c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 12 Mar 2025 01:49:51 +0000
Subject: gentoo auto-resync : 12:03:2025 - 01:49:51

---
 dev-ml/Manifest.gz                                 | Bin 39957 -> 39974 bytes
 dev-ml/batteries/Manifest                          |   8 +-
 dev-ml/batteries/batteries-3.5.1-r1.ebuild         |  34 +++++++
 dev-ml/batteries/batteries-3.5.1.ebuild            |  31 ------
 dev-ml/batteries/batteries-3.6.0-r1.ebuild         |  32 ------
 dev-ml/batteries/batteries-3.6.0-r2.ebuild         |  35 +++++++
 dev-ml/batteries/batteries-3.6.1-r1.ebuild         |  35 +++++++
 dev-ml/batteries/batteries-3.6.1.ebuild            |  32 ------
 dev-ml/batteries/batteries-3.8.0-r1.ebuild         |  25 +++++
 dev-ml/batteries/batteries-3.8.0.ebuild            |  24 -----
 dev-ml/calendar/Manifest                           |   2 +-
 dev-ml/calendar/calendar-2.04-r1.ebuild            |  37 +++++++
 dev-ml/calendar/calendar-2.04.ebuild               |  37 -------
 dev-ml/camldbm/Manifest                            |   2 +-
 dev-ml/camldbm/camldbm-1.2-r1.ebuild               |  37 +++++++
 dev-ml/camldbm/camldbm-1.2.ebuild                  |  37 -------
 dev-ml/facile/Manifest                             |   2 +-
 dev-ml/facile/facile-1.1.4.ebuild                  |  14 ++-
 dev-ml/gsl-ocaml/Manifest                          |   2 +-
 dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild        |  26 -----
 dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r2.ebuild        |  26 +++++
 dev-ml/lablgl/Manifest                             |   2 +-
 dev-ml/lablgl/lablgl-1.06-r1.ebuild                |  97 -------------------
 dev-ml/lablgl/lablgl-1.06-r2.ebuild                |  97 +++++++++++++++++++
 dev-ml/llvm/Manifest                               |   2 +
 dev-ml/llvm/llvm-21.0.0_pre20250311.ebuild         | 107 +++++++++++++++++++++
 dev-ml/ocaml-compiler-libs/Manifest                |   4 +-
 .../ocaml-compiler-libs-0.12.3-r1.ebuild           |  17 ----
 .../ocaml-compiler-libs-0.12.3-r2.ebuild           |  17 ++++
 .../ocaml-compiler-libs-0.12.4-r1.ebuild           |  17 ----
 .../ocaml-compiler-libs-0.12.4-r2.ebuild           |  17 ++++
 dev-ml/ocaml-gettext/Manifest                      |   2 +-
 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild |  44 ---------
 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r2.ebuild |  45 +++++++++
 dev-ml/ocamlnet/Manifest                           |   4 +-
 dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild           |  78 ---------------
 dev-ml/ocamlnet/ocamlnet-4.1.8-r2.ebuild           |  78 +++++++++++++++
 dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild           |  92 ------------------
 dev-ml/ocamlnet/ocamlnet-4.1.9-r2.ebuild           |  92 ++++++++++++++++++
 dev-ml/ocamlsdl/Manifest                           |   2 +-
 dev-ml/ocamlsdl/ocamlsdl-0.9.1-r1.ebuild           |  71 ++++++++++++++
 dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild              |  71 --------------
 dev-ml/ocamlweb/Manifest                           |   2 +-
 dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild            |  39 --------
 dev-ml/ocamlweb/ocamlweb-1.41-r2.ebuild            |  39 ++++++++
 dev-ml/ppx_tools/Manifest                          |   4 +-
 dev-ml/ppx_tools/ppx_tools-6.5-r1.ebuild           |  22 +++++
 dev-ml/ppx_tools/ppx_tools-6.5.ebuild              |  21 ----
 dev-ml/ppx_tools/ppx_tools-6.6-r1.ebuild           |  22 +++++
 dev-ml/ppx_tools/ppx_tools-6.6.ebuild              |  21 ----
 dev-ml/stdcompat/Manifest                          |   2 +-
 dev-ml/stdcompat/stdcompat-19-r1.ebuild            |  34 -------
 dev-ml/stdcompat/stdcompat-19-r2.ebuild            |  34 +++++++
 dev-ml/typerep/Manifest                            |   6 +-
 dev-ml/typerep/typerep-0.14.0-r1.ebuild            |  19 ++++
 dev-ml/typerep/typerep-0.14.0.ebuild               |  18 ----
 dev-ml/typerep/typerep-0.15.0-r1.ebuild            |  19 ++++
 dev-ml/typerep/typerep-0.15.0.ebuild               |  18 ----
 dev-ml/typerep/typerep-0.16.0-r1.ebuild            |  19 ++++
 dev-ml/typerep/typerep-0.16.0.ebuild               |  18 ----
 60 files changed, 964 insertions(+), 827 deletions(-)
 create mode 100644 dev-ml/batteries/batteries-3.5.1-r1.ebuild
 delete mode 100644 dev-ml/batteries/batteries-3.5.1.ebuild
 delete mode 100644 dev-ml/batteries/batteries-3.6.0-r1.ebuild
 create mode 100644 dev-ml/batteries/batteries-3.6.0-r2.ebuild
 create mode 100644 dev-ml/batteries/batteries-3.6.1-r1.ebuild
 delete mode 100644 dev-ml/batteries/batteries-3.6.1.ebuild
 create mode 100644 dev-ml/batteries/batteries-3.8.0-r1.ebuild
 delete mode 100644 dev-ml/batteries/batteries-3.8.0.ebuild
 create mode 100644 dev-ml/calendar/calendar-2.04-r1.ebuild
 delete mode 100644 dev-ml/calendar/calendar-2.04.ebuild
 create mode 100644 dev-ml/camldbm/camldbm-1.2-r1.ebuild
 delete mode 100644 dev-ml/camldbm/camldbm-1.2.ebuild
 delete mode 100644 dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild
 create mode 100644 dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r2.ebuild
 delete mode 100644 dev-ml/lablgl/lablgl-1.06-r1.ebuild
 create mode 100644 dev-ml/lablgl/lablgl-1.06-r2.ebuild
 create mode 100644 dev-ml/llvm/llvm-21.0.0_pre20250311.ebuild
 delete mode 100644 dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r1.ebuild
 create mode 100644 dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r2.ebuild
 delete mode 100644 dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r1.ebuild
 create mode 100644 dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r2.ebuild
 delete mode 100644 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
 create mode 100644 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r2.ebuild
 delete mode 100644 dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
 create mode 100644 dev-ml/ocamlnet/ocamlnet-4.1.8-r2.ebuild
 delete mode 100644 dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
 create mode 100644 dev-ml/ocamlnet/ocamlnet-4.1.9-r2.ebuild
 create mode 100644 dev-ml/ocamlsdl/ocamlsdl-0.9.1-r1.ebuild
 delete mode 100644 dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
 delete mode 100644 dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
 create mode 100644 dev-ml/ocamlweb/ocamlweb-1.41-r2.ebuild
 create mode 100644 dev-ml/ppx_tools/ppx_tools-6.5-r1.ebuild
 delete mode 100644 dev-ml/ppx_tools/ppx_tools-6.5.ebuild
 create mode 100644 dev-ml/ppx_tools/ppx_tools-6.6-r1.ebuild
 delete mode 100644 dev-ml/ppx_tools/ppx_tools-6.6.ebuild
 delete mode 100644 dev-ml/stdcompat/stdcompat-19-r1.ebuild
 create mode 100644 dev-ml/stdcompat/stdcompat-19-r2.ebuild
 create mode 100644 dev-ml/typerep/typerep-0.14.0-r1.ebuild
 delete mode 100644 dev-ml/typerep/typerep-0.14.0.ebuild
 create mode 100644 dev-ml/typerep/typerep-0.15.0-r1.ebuild
 delete mode 100644 dev-ml/typerep/typerep-0.15.0.ebuild
 create mode 100644 dev-ml/typerep/typerep-0.16.0-r1.ebuild
 delete mode 100644 dev-ml/typerep/typerep-0.16.0.ebuild

(limited to 'dev-ml')

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 582a9ba777e4..728594435c46 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
index 265513d3085d..febeaef0a1ca 100644
--- a/dev-ml/batteries/Manifest
+++ b/dev-ml/batteries/Manifest
@@ -2,8 +2,8 @@ DIST batteries-3.5.1.tar.gz 835112 BLAKE2B 29602093e5d3789a2b80e1c36e2d5b29d9c28
 DIST batteries-3.6.0.tar.gz 796298 BLAKE2B a8d9b6f57019ff80367047393fb53014bd32bdcc87d93650eae2939210d90fe4a7977b3502d0ffed25e0e0cb4aa072b8174f01f08c6728d0536589b9abff0f35 SHA512 2a56611b09a5f1cba6457539f8b6bc87a5f2a5454b36cdb39f6e0d6a5dac6db179aab1ba87c74dd49cc41df31a9a96feb349028ea41df7371ecb47f4d9dfafc4
 DIST batteries-3.6.1.tar.gz 797562 BLAKE2B e50ffa073ee4bf0028f4fbe4eac1bfcc0bbbc43fbe17d711350c7ae403a3943a3a8a79356323eb0f3bb0e0b4d2b589dcd33ecb8ba0768f0ac9895d425caa95b1 SHA512 16fd3b541f2b9504d26e1387b1d8b7279746221136391857c90193d3cc5b2814535d87ce54abfa2f50856a26f69e1a7a67f9574d208ba2f8a39630de59bf3a64
 DIST batteries-3.8.0.tar.gz 794001 BLAKE2B 44df53b93df1c2db235604a97633fde1b060deb9189c752c7e19db455abc4529dce7c7ae61cbde740835254132f9b5f49c5e1fd85bd407929926a71c3fed1031 SHA512 3b0643ff337cd70da8c4b77887d212e82d043a7163fca36588be12186bc86bbcf0d56b13349325f12eabb96c846204c88560786342f50af7bf4e20b9480d3964
-EBUILD batteries-3.5.1.ebuild 723 BLAKE2B bb0409c946dcd301ea50c9156138854eb4201db961bb67a6582289c7b47e4428ff00903440f6892c1ff49ed8ca0c7f4ff6a8e8d1392ab76b13d74d86bf605c41 SHA512 f2b163efe285ecd2b90a055619b29b38c966ca29ebe1acf12f982740695a37b0fbfa3fec18f9fda5af84cb5b4379c1814c847816153f6bf6609c3eb5cb3c1354
-EBUILD batteries-3.6.0-r1.ebuild 756 BLAKE2B b76f52cc93bfa681e836f7ccc817fb817772867a5d331d6fbb9b1846c98c9b53e2352e10038bcafb665c6844d2af298613a240878c2a3d012a1a450ca0ea8bdd SHA512 7f5b892429d42b25d6645b1bdd806b7a732a87dfcfea4d9b19351e066d906737470560412ab2de48ca901381ad365a263ebd41c9dd9422789cd8eee14c8eef14
-EBUILD batteries-3.6.1.ebuild 756 BLAKE2B 4b94bb6a91ddcb50045160ea98bea329ede49877b703f36a70ea2599bf77de881cee6f9ae42d75c994e66edf16b45e74d3788e13b11a8887813e7ad3bfba692e SHA512 ae9044db7d96cddf08c6932e70925d7897389bb398aeedbb5735901a1cfcfc2f3e53ffcd91fbd05e941116e999259c39a61edeb8c81272f674770ac71697986c
-EBUILD batteries-3.8.0.ebuild 616 BLAKE2B ba0b30f1d94912c825469aca301835c99d121f18c7c05fe5df4ec3fe053a0741a8362c5e86e01717e518b2fffb79889fef2b9b9208942b2aa7e8486e5a9e0ced SHA512 8ad7bd9b354057428b466a7e6e6335cf0f42fdfbecd4a82f06ba47146dcb67ee3e2745fa6dd1dab7d5120dc62fc2ab012faa9edad2a327f3a50faebb9562e10f
+EBUILD batteries-3.5.1-r1.ebuild 745 BLAKE2B 5c70b16983a932ad0c2869a3bd79b45f5c03048723b2789807b8df2b8625b2f1776f2eef6206f3fab3533e5aa7ed3973c0dec15a643dcfbd424083a9c2fd5ca0 SHA512 2819fba04dfb3f11b817d6e27b521082f7c264256e6c0e4f37d691e1a67a00b9706708a301ead797a4cb1ce092ee3f0c0a778b836d1be561e428a96e1b2311ec
+EBUILD batteries-3.6.0-r2.ebuild 778 BLAKE2B ceb8c8da9f93bcc92f0181f904209987515d90b4c215263604c975b49109fdb64eeb5647524a35626606ec9677fcb5cdae6aa7b889befb5f7614674b5e6d5b79 SHA512 2b3c92176e66f708c3536839edd9d6780ee8e4458c31d013a1e82f436d24b4eb08a59581bbabb85051da04660ddc73230d86f2ae5108bb87e42aef29b3a574a8
+EBUILD batteries-3.6.1-r1.ebuild 778 BLAKE2B ceb8c8da9f93bcc92f0181f904209987515d90b4c215263604c975b49109fdb64eeb5647524a35626606ec9677fcb5cdae6aa7b889befb5f7614674b5e6d5b79 SHA512 2b3c92176e66f708c3536839edd9d6780ee8e4458c31d013a1e82f436d24b4eb08a59581bbabb85051da04660ddc73230d86f2ae5108bb87e42aef29b3a574a8
+EBUILD batteries-3.8.0-r1.ebuild 646 BLAKE2B ee0b9965d4cb9c7c11798cec2b8c74c241e09578b542c1bf8f5d30a0afe57b842adaab9ad22e846c73d8c8594fea9bdbcf1cbf4a14d18f734f0b8b56f1e115d5 SHA512 18d49e037f797174755a31b75a5d5f15b62a231f22d81db7fb499467b737270a3acf7be709fbcd7cd991b63cad2582f11726f5ee78973efd38d3e91ad046975f
 MISC metadata.xml 337 BLAKE2B 2cb7f9b54ec498c0b25f3f6cb2011046c38c0103341f22dea799e2fe501c46336950040fcfb8fe3fd4723aa5f499e00e6b0dae364a8fc06b84aa348ddebea0c2 SHA512 88a13f02eead4f3c06bdfa1850ee53ee6d309181d89a0625a89dfa3e421f3f7cb3d896cc2f69f4ddf6cef05f1bff932b6c2d79b791d69b65a21afed822637ded
diff --git a/dev-ml/batteries/batteries-3.5.1-r1.ebuild b/dev-ml/batteries/batteries-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..a7abff76c3c7
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.5.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/batteries-included-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	${DEPEND}
+	dev-ml/num:=
+"
+BDEPEND="
+	dev-ml/ocamlbuild
+	<dev-lang/ocaml-5
+"
+
+src_compile() {
+	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
+
+src_install() {
+	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
diff --git a/dev-ml/batteries/batteries-3.5.1.ebuild b/dev-ml/batteries/batteries-3.5.1.ebuild
deleted file mode 100644
index 3ba6fc834d33..000000000000
--- a/dev-ml/batteries/batteries-3.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit findlib
-
-DESCRIPTION="A community-maintained standard library extension"
-HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
-SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/batteries-included-${PV}
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	${DEPEND}
-	dev-ml/num:=
-"
-BDEPEND="dev-ml/ocamlbuild"
-
-src_compile() {
-	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
-
-src_install() {
-	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
diff --git a/dev-ml/batteries/batteries-3.6.0-r1.ebuild b/dev-ml/batteries/batteries-3.6.0-r1.ebuild
deleted file mode 100644
index f9dfcf4e2fb0..000000000000
--- a/dev-ml/batteries/batteries-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit findlib
-
-DESCRIPTION="A community-maintained standard library extension"
-HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
-SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/batteries-included-${PV}
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/camlp-streams:=
-	dev-ml/num:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ml/ocamlbuild"
-
-src_compile() {
-	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
-
-src_install() {
-	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
diff --git a/dev-ml/batteries/batteries-3.6.0-r2.ebuild b/dev-ml/batteries/batteries-3.6.0-r2.ebuild
new file mode 100644
index 000000000000..fa10a8e6b2f8
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.6.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/batteries-included-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/camlp-streams:=
+	dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/ocamlbuild
+	<dev-lang/ocaml-5
+"
+
+src_compile() {
+	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
+
+src_install() {
+	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
diff --git a/dev-ml/batteries/batteries-3.6.1-r1.ebuild b/dev-ml/batteries/batteries-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..fa10a8e6b2f8
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.6.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/batteries-included-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/camlp-streams:=
+	dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/ocamlbuild
+	<dev-lang/ocaml-5
+"
+
+src_compile() {
+	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
+
+src_install() {
+	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
diff --git a/dev-ml/batteries/batteries-3.6.1.ebuild b/dev-ml/batteries/batteries-3.6.1.ebuild
deleted file mode 100644
index 620523f69008..000000000000
--- a/dev-ml/batteries/batteries-3.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit findlib
-
-DESCRIPTION="A community-maintained standard library extension"
-HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
-SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/batteries-included-${PV}
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/camlp-streams:=
-	dev-ml/num:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-ml/ocamlbuild"
-
-src_compile() {
-	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
-
-src_install() {
-	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
-}
diff --git a/dev-ml/batteries/batteries-3.8.0-r1.ebuild b/dev-ml/batteries/batteries-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..b6380c19199c
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.8.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/batteries-included-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	dev-ml/camlp-streams:=[ocamlopt?]
+	dev-ml/num:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="<dev-lang/ocaml-5.3"
diff --git a/dev-ml/batteries/batteries-3.8.0.ebuild b/dev-ml/batteries/batteries-3.8.0.ebuild
deleted file mode 100644
index 873203851413..000000000000
--- a/dev-ml/batteries/batteries-3.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="A community-maintained standard library extension"
-HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
-SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/batteries-included-${PV}
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/camlp-streams:=[ocamlopt?]
-	dev-ml/num:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/calendar/Manifest b/dev-ml/calendar/Manifest
index 1eac5f6a1e2e..be085123ebdc 100644
--- a/dev-ml/calendar/Manifest
+++ b/dev-ml/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-2.04.tar.gz 271522 BLAKE2B e69d129324687cbee55c2217c1c7a89ce0817b60aff3eba8e26d94736e4cc771cf031c66857bc3f6438b9b389030e6f6ff54fd55d6734bef4c5ece0bc45ae419 SHA512 3941768428eda47f47912846cc2921ee82c722bda7cf6095c1c8bdcfebc19bb8f64ebb1a25475396d2a49c186b83421af63602a54a261684117b1c036a66cf3d
-EBUILD calendar-2.04.ebuild 656 BLAKE2B cfdf4fe99d160bef10b9bd229f1bf2039a0144b5d398b2d42a75c104219803b9107189f5a42a72fd8173da3b5eb93f5b4f44f573fb4013d1730f675f23ea1597 SHA512 32c1fe79f26881a19673023e553d39723c61d88e7faeb0e080c09561c9d92c816744f57e979cb2f3c3a68a9000e25d528200bcc9ab82c2f998353a760402dbf4
+EBUILD calendar-2.04-r1.ebuild 652 BLAKE2B 0080f5ea496ee6a8af502226b15cf8cc5bec94c9ae40930ca875aa558592b1b24c65547b39b9782d9978ac0e954b78efeef714abdeb30fcc0caa9efcb600fc8e SHA512 bbd85e9c11089d849747111554576039ccd63824d8fde9e6ada42f8462e38e32837fdc81f6869cdcf825398c0648b248b7eb84e54cb61df8b1e25f66742df0df
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-ml/calendar/calendar-2.04-r1.ebuild b/dev-ml/calendar/calendar-2.04-r1.ebuild
new file mode 100644
index 000000000000..ee9f5e211003
--- /dev/null
+++ b/dev-ml/calendar/calendar-2.04-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Ocaml library to handle dates and time"
+HOMEPAGE="https://forge.ocamlcore.org/projects/calendar/"
+SRC_URI="https://download.ocamlcore.org/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="<dev-lang/ocaml-5:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake
+	use doc && emake doc
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README CHANGES
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild
deleted file mode 100644
index d1bf98476f13..000000000000
--- a/dev-ml/calendar/calendar-2.04.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="Ocaml library to handle dates and time"
-HOMEPAGE="https://forge.ocamlcore.org/projects/calendar/"
-SRC_URI="https://download.ocamlcore.org/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README CHANGES
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
index 6c71bb9ade99..c0d3e09658ba 100644
--- a/dev-ml/camldbm/Manifest
+++ b/dev-ml/camldbm/Manifest
@@ -1,3 +1,3 @@
 DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0
-EBUILD camldbm-1.2.ebuild 838 BLAKE2B 99e572a2ac1f99619091a3e9df95ae0ec1b6a123555c56ac84bdb4ae70f9510ac180511f946200049f6a364906a642e82ced5520547cb7208b0d8209c0ebb6fd SHA512 0593ebf07c5bf68b725639f1954322f65ce7f312d1412a6e9210b12ed3241998b5d95303c0bb2536d5b73a94d1414c67672610b92a4f5882ed046904fabfe9ad
+EBUILD camldbm-1.2-r1.ebuild 834 BLAKE2B 79921524eb2242dbbe50bc733de04ae8f56571922c484a4f0e171e820f2aaf57bf866dab672e950519bc1dc6627261846a66a049e56cd09fece178c5c641f735 SHA512 0b92fdb2f2c2beaf89bea3aadca7d270c181e5355446e361591c586aee3ff4869a12be513dca1e9358c327049fb044f76392a6d7ba8f3f04ff7ef64b1ad354fa
 MISC metadata.xml 307 BLAKE2B 8c1950a08842fa7930a11e6d2efcb424c220a2fcc8e1d5f4e909f2b77e7573ee506f1dcf89a65148165a79ae3f62ac6c5301d6e9a9c20358e9bc9c1c11ab371c SHA512 8f42ea1ae2a4b8ed8ce97bd5333b1b91c3c44a0d3a8de3411afe7abb96734a86162c31ee4922dd86d6d8d5d2d5131c33f240c6d151717c7ff07f4befe0eb1030
diff --git a/dev-ml/camldbm/camldbm-1.2-r1.ebuild b/dev-ml/camldbm/camldbm-1.2-r1.ebuild
new file mode 100644
index 000000000000..c89a9f993656
--- /dev/null
+++ b/dev-ml/camldbm/camldbm-1.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
+HOMEPAGE="https://github.com/ocaml/dbm"
+SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz"
+S="${WORKDIR}/dbm-${P}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm ~ppc x86"
+
+DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
+	<dev-lang/ocaml-5:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED=(
+	/usr/'lib.*'/ocaml/dbm.cmxs
+	/usr/'lib.*'/ocaml/stublibs/dllcamldbm.so
+)
+
+src_prepare() {
+	sed -i \
+		-e "s|ranlib|$(tc-getRANLIB)|g" \
+		Makefile \
+		|| die
+	default
+}
+
+src_install() {
+	dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
+	emake LIBDIR="${D}/$(ocamlc -where)" install
+}
diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
deleted file mode 100644
index 5708dbeea498..000000000000
--- a/dev-ml/camldbm/camldbm-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="OCaml binding to the NDBM/GDBM Unix databases"
-HOMEPAGE="https://github.com/ocaml/dbm"
-SRC_URI="https://github.com/ocaml/dbm/archive/${P}.tar.gz"
-S="${WORKDIR}/dbm-${P}"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~ppc x86"
-
-DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
-	>=dev-lang/ocaml-3.12:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED=(
-	/usr/'lib.*'/ocaml/dbm.cmxs
-	/usr/'lib.*'/ocaml/stublibs/dllcamldbm.so
-)
-
-src_prepare() {
-	sed -i \
-		-e "s|ranlib|$(tc-getRANLIB)|g" \
-		Makefile \
-		|| die
-	default
-}
-
-src_install() {
-	dodir "$(ocamlc -where)/stublibs" # required and makefile does not create it
-	emake LIBDIR="${D}/$(ocamlc -where)" install
-}
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 5d1ac95f7b1d..7e4761bdfebd 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,4 +1,4 @@
 AUX facile-1.1.4-dune.patch 883 BLAKE2B d563aff52eda151c9579c378253b74811759a8e66cae9dc775ebf3bed3717d6289ec40a107610032de3c575a8c98cd45651fe7d26c7a08e55887b1d2c61ad613 SHA512 df90e73916b2e42d20bae837c24be96633ef34fe731bac07307ade12fb10fbf5c575658ee295c5003f28aa989574fe323c7a3040b6063bf8522d0691a5255a5e
 DIST facile-1.1.4.tbz 83874 BLAKE2B a0921615425124b6f1ba51a939bd4c89bcab71a0341e5b866f2c44d89863c077c42f269fcee2a8e302c580ce618c4e765f826fd9c4855f9e992c35cbdc8660db SHA512 b4484275ebf7f0bd271d865c6745bd1784e2260060470f64f86a18833a9663efbf56b089ae668c51f57bc8473281af4e92d461b87eefb2c62162fa7da60838f9
-EBUILD facile-1.1.4.ebuild 538 BLAKE2B ce4637c9c11347d92998c6e92753906d2606cba755799aedf268fd562e4afb61e410dba39e51ae76e1e86e11d1a92ca08bfc2ca91f61db4892b8bb3c16fe5053 SHA512 cd4b404eaea4c022dddbf06b05aced5a83253b06d1ac0da85379809401b6a9d247419bf0f157dbb54e576a2bb1e3c677b4e7536e3714aa0316273bdd462e3277
+EBUILD facile-1.1.4.ebuild 727 BLAKE2B f2c64090e8550339ae2c48b89a339f4f040ac5a44ae3d9be53040fe48d074c03e6ffacec3399729d8bc5303b461db0298a3beaf5138526b512a1aaa08c4e9b31 SHA512 cd7099a0cd35f75ec6adfac3482222600a06d920a7e20ad5aebd413f40ccc9ab61828831ba2d65599ab96b79e7e729f31ec7f3998ea77aa4235fead01997ba3a
 MISC metadata.xml 427 BLAKE2B 5d2175a32c7c2005d4f7ce47d7c775053f4b0c2d4e707138669db582d5239356ae8a53c5b48b3751580a72db52d256250fc4aec98cfc17b40ed7567571f954df SHA512 a5add2382c31da550a44168738d8d0b10711f5d225320dac43f67e07ab443ce345b79ba027822d3e29845325a8cc0b70c20894deea260e7fad4081bbe86b6724
diff --git a/dev-ml/facile/facile-1.1.4.ebuild b/dev-ml/facile/facile-1.1.4.ebuild
index 41a016660704..43e94e694256 100644
--- a/dev-ml/facile/facile-1.1.4.ebuild
+++ b/dev-ml/facile/facile-1.1.4.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
@@ -19,3 +19,15 @@ RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-dune.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:Pervasives:Stdlib:g" \
+		lib/fcl_misc.ml \
+		lib/fcl_cstr.ml \
+		lib/fcl_fdArray.ml \
+		lib/fcl_nonlinear.ml \
+		lib/fcl_sorting.ml \
+		|| die
+}
diff --git a/dev-ml/gsl-ocaml/Manifest b/dev-ml/gsl-ocaml/Manifest
index 2e70d366b538..d0f5abbad4da 100644
--- a/dev-ml/gsl-ocaml/Manifest
+++ b/dev-ml/gsl-ocaml/Manifest
@@ -1,3 +1,3 @@
 DIST gsl-1.24.3.tbz 100642 BLAKE2B cf1bd63593901ba41ec33a8d073d923351e8cd6021f0402ce337242dd6b378408e740f2904a1c53f123453444dc08a05971921ab53e683b2ecf1e8a869f28e46 SHA512 c6e2578618591d1bef428693b69026cdea0f1606cd25d9f02d637a90256a5685eee70ecd0259d2595a1cd7b292c34e3c913c007e2706aa125af045d37e55d9c4
-EBUILD gsl-ocaml-1.24.3-r1.ebuild 608 BLAKE2B eb371c74edf93e360b53e4cc8debcbcdffdfd721c51f6eb5e523ffe014b6002964148bde1e4e1fa630d7204d1cc8cdb2adb1ca23dfac1fcd008a96627711c9cb SHA512 33f9043cd6639296180d4540eef2bfe6780ea2c23e7eaccb9bbb4349d1c174e559de8d053e9a14812774abaa68076ec389ccc304523eaaf2efd090a1ea8627ef
+EBUILD gsl-ocaml-1.24.3-r2.ebuild 618 BLAKE2B b1f72af8c51ac13e51a48cb51021b9189ca9d69f2d286e074d56b9af7d3d2b5c06d9e8e2074e77be4fef20ab6fbc553736d61b11f372024701526873b0554d80 SHA512 6b6ac418938a1819eba9e9eef61c642872ca22e49fef75ab936c04de25eb178ad47a3eb3514157b6c0c3085681f39dc6a713a8060166afb28000b3f870b737d4
 MISC metadata.xml 406 BLAKE2B 9c19f91fd9fb101b8375474775674f65733b22262be1c46f38ea436638b77b0fea69136f7550d8fe02eb523af8a13620b9c7e153c9a8927c7bbd2780ac4c340c SHA512 8df3f5674567e542938e9120e0e71b3077456ac78c4886d7a87aa70841be471fb48ac49a27b856d147389dc14e635d8746f417fbcfd9fb7fa3b83e3ccf6bbb72
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild
deleted file mode 100644
index c72639216ff3..000000000000
--- a/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DUNE_PKG_NAME="gsl"
-inherit dune
-
-MY_P=${P/-ocaml/}
-DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
-HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
-SRC_URI="https://github.com/mmottl/${PN}/releases/download/${PV}/${MY_P}.tbz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	dev-ml/dune-configurator
-	>=sci-libs/gsl-1.19:="
-RDEPEND="${DEPEND}
-	!dev-ml/ocamlgsl"
-
-# DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r2.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r2.ebuild
new file mode 100644
index 000000000000..e3060e6255dc
--- /dev/null
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="gsl"
+inherit dune
+
+MY_P=${P/-ocaml/}
+DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
+HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
+SRC_URI="https://github.com/mmottl/${PN}/releases/download/${PV}/${MY_P}.tbz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/dune-configurator
+	>=sci-libs/gsl-1.19:="
+RDEPEND="${DEPEND}"
+BDEPEND="<dev-lang/ocaml-5"
+
+# DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 33f299da13ad..5b82dbcebf6c 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,4 +1,4 @@
 AUX lablgl-1.06-makefile.patch 354 BLAKE2B e50b0b731b50331d286d19509eb76a84a5978d5c8db1a7f91251e5a3640fdaa57480e10beb40e366db1f5b2e7d4d1631342ddcf53358bc838122cb8b93174532 SHA512 1b6a6d3f5eda6713e5627ca95590e2126837693eb68464bb67eb24bb9299021bebc027b685f5b03552fb2d15540c5b1791c7de55e23c6d1c5149c2e4f22f7f6a
 DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
-EBUILD lablgl-1.06-r1.ebuild 2147 BLAKE2B 1de098d6efacefe83d64049fe38c0e63288d3996b3fee8e45163bf0822bda3b7f077072dee041c64ddc96a09f6c45d3f8aba2eeb70aa45ead2aa07bfe7f11c05 SHA512 e2003e49227dabf1025337b4d5ca9bd5f4d474d2bf9666db67c4676021edbf4e868bee7b572d2fbd2ecb54461e6ed28ec3ac45dc35841eae9690f193ec2fe590
+EBUILD lablgl-1.06-r2.ebuild 2141 BLAKE2B 89f6870a6fc9c3567ffa62e9bc856868537581d633a7e708277230de75652b084d136287670b87d0da38d5b7864b01a7e5c39d9807ba8e769afbebc962235ca4 SHA512 1215c6de1a654f3bb9ed90c3254b936fa7a66b022ca55183de23e40cecdbd3d39e5cd7cb52eba9d4d37121c0b4aa6cd30e54243ae6fb0a940915d1efb2e01b13
 MISC metadata.xml 248 BLAKE2B bfeb84ab824000a880290862c70d5a940e31896451425d4d38034106c3355d384d41eb1ba01e275f297ebae83f180b7168a99f0c134152e72c0b4e750ab71463 SHA512 bc6b2d2e299ae13f4dfeee4d3105adca30cbe3ec4a587ac445eb9e35bf663626176d87a42548947242413561d12551b650a675e18529b0631bc996fed8175db0
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
deleted file mode 100644
index 02fdc47b1948..000000000000
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-3.10.2:=[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}"/${P}-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/lablgl/lablgl-1.06-r2.ebuild b/dev-ml/lablgl/lablgl-1.06-r2.ebuild
new file mode 100644
index 000000000000..7a6b227cba26
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.06-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-5:=[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}"/${P}-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 abc0bee66859..873a3f3f3586 100644
--- a/dev-ml/llvm/Manifest
+++ b/dev-ml/llvm/Manifest
@@ -13,6 +13,7 @@ DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf
 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
 EBUILD llvm-17.0.6.ebuild 2510 BLAKE2B a1877c6ac0e8e2063ab386eb063224b0059a1b8c956e26f5ac1b5daf4902a7bf221b1591be144df618a3598e5634ca80fa43ed3b734b8c096845f34649e9f125 SHA512 cfefe80cf361a5e98be33cdf75b1fc4c226496a68caf7ab19dc47bac3c2b91bbbb5c09c2447b0271e2149d2c5aded7a28e14e57f072ee8abc04cabef11a7fabc
@@ -22,4 +23,5 @@ EBUILD llvm-19.1.7.ebuild 2466 BLAKE2B 095155ffec474c2b2c6d7a241f7e8026f316d5e7e
 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_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_pre20250311.ebuild b/dev-ml/llvm/llvm-21.0.0_pre20250311.ebuild
new file mode 100644
index 000000000000..bacc5c89fa79
--- /dev/null
+++ b/dev-ml/llvm/llvm-21.0.0_pre20250311.ebuild
@@ -0,0 +1,107 @@
+# 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-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index f103bd05e142..16ab2b656a0c 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,7 +1,7 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
 DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d
 DIST ocaml-compiler-libs-0.17.0.tar.gz 5006 BLAKE2B c5f5f3e257167fad012135a76a82d6c2609a7ba6956f2380c8d19fc5f8360a2110b1cfcec9eecbe779c5c155d3b593791a084f588c6c105246adf30e2d1a1d63 SHA512 c5cd418b0eb74e00c3f63235754bbdb3a3328ac743d6ae885424d8c50b4edaa7068572e689cb3456d222793283927f2984a1ff840b1bc3817f810b5314faf897
-EBUILD ocaml-compiler-libs-0.12.3-r1.ebuild 497 BLAKE2B d589f4d7a53467373a49087132a7deec7eb1d993039da00082386c9b6c92f4de52e24e2ce38dc12a5b742e306d1f1991178981aa4d7c2f486bb2841e09cd2f7a SHA512 1bd64543e0b4a3358b1e2860886b1f5541fc3b4fabdc453d181ff9a8394b6c2f66398ef1283a2e4c44abf5b023feb9489da69aefd4a1ff4857ea17dc0ea63980
-EBUILD ocaml-compiler-libs-0.12.4-r1.ebuild 504 BLAKE2B 229a6f8d65601d4c67f7a332c72729e9139d1a7540f9f898e01c1b4c07ce3c1844a46e76cdefaf686b60c253704b4ce0c864bd05838fc6d75dee502699055bc7 SHA512 f07ff9000f1ae3bd2d18fad3c1e7c8537fa5ce2d97cf858aff5b78c6724ec6f0daca29d4f23b17b950a981d7a63599544172f3e68144ad78ab8979b4d1ee084e
+EBUILD ocaml-compiler-libs-0.12.3-r2.ebuild 496 BLAKE2B f5ecaac0f5dea1a3a141b8faed201840da5164a7f085d3644142dca21017cf4df64fc3e9fa4c46479064c13cf15c2944e5078bb85c13c69ece62f3fb62e2c14d SHA512 cdeec372530bdedda02f596c37fc6fa1fefd93adbc68d8e50e83491c6c5646184ce66cc15d608898cf221bdb30d6c87e76765985054e39ced142e5108bc3c129
+EBUILD ocaml-compiler-libs-0.12.4-r2.ebuild 503 BLAKE2B 7d23fce2ff1c1e1443e37ddfaf2c372072ec9122b9dc3d6f8b23b434a18db0d87c4fe51f0e6bac8e926c2e9b335448ebe2e5a7c9397161d6779da8aa47d29a96 SHA512 2b139218e9c361323b0e6ba2ac567611b2e1d25ea7445055e3f61f44ce4ecdeffd34bde1ebaa226a4c9de6145c4c27335c42ecc56f5dcc18fa427acaa7f62883
 EBUILD ocaml-compiler-libs-0.17.0.ebuild 533 BLAKE2B 2efeb66eebc5e65e8b65eb0af22dc308a5ad3e09f3f46b99743dff17453c44e655f8811ed6d1aeb3b38357c133db11be1e0edde07672107d7edf92429ae37a5c SHA512 c8526dd84513dc0216aea0f2f5cc22d02dae98854ef02ef0122ccf12d5422490b69aab955c12cd8bd06a4833fbde6019d6f8ae7a020c9920b7ddbbc3b9a1dc84
 MISC metadata.xml 328 BLAKE2B ea0e73ca0f6a7056e334fe09e349083a6ea531df238098f312466782f5aff013810e1c7ea691bf907798160e5f7a6e3656eddac62a99f35a829166fca01985fd SHA512 fc5230a35d7511461d1a0be41527914bf8107a21e5cffa70b88d434943af824f13278af08fe0c48320f07c049b6e165e239bd90443ecd36e9abc82096884de64
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r1.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r1.ebuild
deleted file mode 100644
index 91bfffeca6aa..000000000000
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
-HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
-SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="<dev-lang/ocaml-15"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r2.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r2.ebuild
new file mode 100644
index 000000000000..9592659c2a9f
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+IUSE="+ocamlopt"
+
+RDEPEND="<dev-lang/ocaml-5"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r1.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r1.ebuild
deleted file mode 100644
index 25b0036b9083..000000000000
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
-HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
-SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-
-RDEPEND="<dev-lang/ocaml-15"
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r2.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r2.ebuild
new file mode 100644
index 000000000000..ec7d5ce7925a
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="+ocamlopt"
+
+RDEPEND="<dev-lang/ocaml-5"
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 0023fe1e72d9..67493eafc5c9 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -2,5 +2,5 @@ AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca0
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-0.3.7-r3.ebuild 1595 BLAKE2B a36e1429b377cc63ec4a94323cb10daacc105e0962e73336e4a3d46434e720eccfeec2e4b954cee27e5a179134f3d4847617cab42456011c7e0bc71a77a5d6e1 SHA512 360e9429a63483ee6a6d13b83f227a738b61ad0cab307814ec812da3b843b7b7dffd7bb46acca9f416b82214b585a9ed2007ea53376145c708278c2f6b09c0b7
-EBUILD ocaml-gettext-0.4.2-r1.ebuild 1006 BLAKE2B d71f20ddc79f709ee035ba8cf9e044f479bfcc2ac3ed228b27c4f1b25d114be2434a3ff83a6dc5252b9b78fcd90503bb610e4f7c9e8a6e36265f00b5d02e07ba SHA512 05064145aaa4df4e8e521df440ed83a050ce04995360952c6f5de1f8f8b114ac8ea82631779880b011d7f7db18dd8c6fcdb47c6023e7f5e535003151dccc5f9c
+EBUILD ocaml-gettext-0.4.2-r2.ebuild 1025 BLAKE2B a783f1b70de99e0881a3d8592b36fa8b9ceff6112c32b736e36873b8d7084a376b0e8b8b36ec74db6cf300d760ca079a17e81245615d4e0fbf7d2e4e853afd19 SHA512 c5e0a1b0760bad59ef8f889bab47ca0cb395332106806e12fe9763bd66ea0216d6ea3eb3383db8ebf9c2434d9862b91a659c35f561e658f5a871eb0b13a1f116
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
deleted file mode 100644
index 1f12d2b9d7a0..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DUNE_PKG_NAME="gettext"
-inherit dune
-
-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"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test"  # Tests fail
-
-BDEPEND="
-	>=dev-ml/cppo-1.6.6
-	dev-ml/dune-configurator
-"
-
-RDEPEND="
-	dev-ml/base:=
-	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
-	sys-devel/gettext
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-ml/ounit2[ocamlopt=] )
-"
-
-src_prepare() {
-	default
-
-	# Remove dependency on camomile (see
-	# https://github.com/gildor478/ocaml-gettext/issues/14)
-	rm -r src/lib/gettext-camomile || die
-	rm -r test/test-camomile || die
-
-	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
-}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..f465c89828e4
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DUNE_PKG_NAME="gettext"
+inherit dune
+
+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"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="test"  # Tests fail
+
+BDEPEND="
+	>=dev-ml/cppo-1.6.6
+	dev-ml/dune-configurator
+"
+
+RDEPEND="
+	dev-ml/base:=
+	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
+	sys-devel/gettext
+	<dev-lang/ocaml-5
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit2[ocamlopt=] )
+"
+
+src_prepare() {
+	default
+
+	# Remove dependency on camomile (see
+	# https://github.com/gildor478/ocaml-gettext/issues/14)
+	rm -r src/lib/gettext-camomile || die
+	rm -r test/test-camomile || die
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
+}
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index b3d0743f8157..77bb5a86eeff 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -3,6 +3,6 @@ AUX ocamlnet-4.1.9-shuffle.patch 390 BLAKE2B 2cdb5c3674cf74df8d7a5f9b6aa2cdca3aa
 AUX ocamlnet-4.1.9-unboundLexer.patch 284 BLAKE2B 8d934f1aa24d19f3065dd4501c6656c78e53f373028e315b2fb969bab495e3f94fb80af33cac6f5da92ab0c185d7537d0d9d07be0abd8cd618708e9b400323a4 SHA512 9110449c98975c5894fffad28372a0daae48de7cf7a775b43ad14989e99840a49d1b5170317b36fb9ed303a2c1fa9ff0a52d569d1bdd74879c8ee1f29bdfdbc3
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
-EBUILD ocamlnet-4.1.8-r1.ebuild 1636 BLAKE2B 96ff9aeb5b1012aa0544a36ac7c3cccb24cf23e79911118b2fe0d7cabd3fd6ad435503ffe43e05e1d1ecedb8821649b2720b2040c9b074fd6ac8017c3167336e SHA512 ff2b81572d3dd298af654bd9bc43d55c951b0f8f6a417521b1cec8d489cbd6d0b1f407194d93b2d8176b08fdc374051557bc47c1df6e4d2040be3e7a633373e6
-EBUILD ocamlnet-4.1.9-r1.ebuild 1855 BLAKE2B 94608e27cdbc5d2dbbf2dd96a879f32d8eaea8623124ee54b5691c720bdec390da270dd5f890ac33ac829119d2b15401d71bcf12a12cfad35cc5d66b9d2a616c SHA512 89545783277a2d54a08ee9438ae3bece58af71431d2cc52eb244b78914bfee5f8cc1721c8ed1859b186f4180b05c86054370ccc636d0973a5a2f560523f2cb79
+EBUILD ocamlnet-4.1.8-r2.ebuild 1630 BLAKE2B 7fa2366e6eae245b1cdfe01bc08d0e9aa4a0cfc8d22f2fe7c606cd0b0279b6ff06560eaa57f8b9928074b91d4d3864d4b65467220491fa85b3e14d2b6d4b589d SHA512 6d2d3b7aa606e935c2019b2c444b97958f0ece7a155075497207284157378db89302b679e679689293cd18bbf9ab3a1e1e59a346abd69454fc0bc21bc420f0aa
+EBUILD ocamlnet-4.1.9-r2.ebuild 1849 BLAKE2B d43d9911691b0a06f091d9d1114a8832b0527216c2eddca9146a309c8c04fa8786049c49c281ac998f467b9a67f4af0b99daed804db9550a29c3f41012aea138 SHA512 088209afac4ccc5a282b1493ff18ce0e0776a18d69556bd1e60a675c0137ba7454240c5414ba8c4b95abe758f97cf46ecccc5339ba7115c912a8417225d7fab3
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
deleted file mode 100644
index 5eb163cf9132..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib toolchain-funcs
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-BDEPEND="
-	dev-ml/cppo
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-ml/findlib-1.0
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	pcre? ( >=dev-ml/pcre-ocaml-5:= )
-	tk? ( dev-ml/labltk:= )
-	ssl? ( net-libs/gnutls:= )
-	kerberos? ( virtual/krb5 )
-	zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		-cpp "$(tc-getPROG CPP cpp)" \
-		-equeue-tcl-libs -ltcl \
-		|| die "Error: econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r2.ebuild
new file mode 100644
index 000000000000..e79e1f7d0784
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib toolchain-funcs
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources strip"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+BDEPEND="
+	dev-ml/cppo
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-ml/findlib-1.0
+	<dev-lang/ocaml-5:=[ocamlopt?]
+	pcre? ( >=dev-ml/pcre-ocaml-5:= )
+	tk? ( dev-ml/labltk:= )
+	ssl? ( net-libs/gnutls:= )
+	kerberos? ( virtual/krb5 )
+	zip? ( dev-ml/camlzip:= )
+"
+DEPEND="${RDEPEND}"
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		-cpp "$(tc-getPROG CPP cpp)" \
+		-equeue-tcl-libs -ltcl \
+		|| die "Error: econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
deleted file mode 100644
index 791b193f2a11..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib toolchain-funcs
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-BDEPEND="
-	dev-ml/cppo
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-ml/findlib-1.0
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	pcre? ( >=dev-ml/pcre-ocaml-5:= )
-	tk? ( dev-ml/labltk:= )
-	ssl? ( net-libs/gnutls:= )
-	kerberos? ( virtual/krb5 )
-	zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unboundLexer.patch
-	"${FILESDIR}"/${P}-shuffle.patch
-	"${FILESDIR}"/${P}-noWhich.patch
-)
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:^version.*$:version=${PV}:" \
-		configure \
-		|| die
-	default
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		-cpp "$(tc-getPROG CPP cpp)" \
-		-equeue-tcl-libs -ltcl \
-		|| die "Error: econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9-r2.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r2.ebuild
new file mode 100644
index 000000000000..94f8c4880f36
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib toolchain-funcs
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources strip"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+BDEPEND="
+	dev-ml/cppo
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-ml/findlib-1.0
+	<dev-lang/ocaml-5:=[ocamlopt?]
+	pcre? ( >=dev-ml/pcre-ocaml-5:= )
+	tk? ( dev-ml/labltk:= )
+	ssl? ( net-libs/gnutls:= )
+	kerberos? ( virtual/krb5 )
+	zip? ( dev-ml/camlzip:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unboundLexer.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+	"${FILESDIR}"/${P}-noWhich.patch
+)
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:^version.*$:version=${PV}:" \
+		configure \
+		|| die
+	default
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		-cpp "$(tc-getPROG CPP cpp)" \
+		-equeue-tcl-libs -ltcl \
+		|| die "Error: econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index 969986f98176..d6bef37901f6 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,5 +1,5 @@
 AUX ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch 794 BLAKE2B 7a24e2c817b53464c8f1391084b8be3e58f3f95d22da746fbf1a1ee6abdfde8b5198a299ee8ea2fe009a6216890887548cfebf9d3e7de76dcd963a3cb2e81fbf SHA512 3e078c9fa3d22bc7d1471afe93342a5594d8128b6de6097ee67ef0762ca3827f4412fa730c066eb47c1cd25268044905b16e8805945ced2c980ff5ffc2d5b799
 AUX ocamlsdl-0.9.1-ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
 DIST ocamlsdl-0.9.1.tar.gz 226085 BLAKE2B 30ee2f12cdc83344d3a8a9d1e187415b30d5ea83cfed4ac4709a0b4350e386961123e9504fc94a2b5643bb161c65d065298e3d6d8904cb55ab5436d243dfe588 SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a
-EBUILD ocamlsdl-0.9.1.ebuild 1514 BLAKE2B 681a0047c4130749f2d89010cabdf0ab6e1771e05551a587650415b080017aefb486c22f5f773e0dd8d3297194455766d85af7088da5d20b4052f82c6e435c4a SHA512 c21b6f60c93b55d174d835b5f756ef44e12deb8710860994d0a61ae12b89108340f9338e36e218ad850136ac06c271d97cc6c4fa43540ca91084172cbe4fbc87
+EBUILD ocamlsdl-0.9.1-r1.ebuild 1510 BLAKE2B fb1cd4effb538fe3ce4b35502614af1dbbe603cd30f2c16605998504318ce338c35964e1427ca23d2c7c6ac5c54e4f5feae9d9ccfea753a3ee660ec1df092f5d SHA512 a4dc2f86e7ba3957984ba831deb6efee2d084b6240d74cec32d6d63a25b93d0a98fb688da5b222d6793dd2c5a92a1ef529d6e1936f577f93c48be147e2f725b6
 MISC metadata.xml 311 BLAKE2B 9eee7d8c5a6887eea15ad62c5bb9aee7df24d4082b8f47d76d378ff0f3c57bba99d54480b2305e49031fe0dd17f9e02fd5ceed03f12a6df705fb81c773871f2c SHA512 48fc533b64c92486d85f711cd9bc9dad8f3211be908e5ea41fc9bd6fc57dbb57936f7c3140a5699542a9251d61cdf3fe7f6bcf2cbbf0078bfd1fb6ed78a0bb25
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1-r1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..3cb93607525a
--- /dev/null
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="OCaml SDL Bindings"
+HOMEPAGE="http://ocamlsdl.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/ocamlsdl/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="doc +ocamlopt opengl truetype" #noimage nomixer
+
+RDEPEND="
+	<dev-lang/ocaml-5:=[ocamlopt=]
+	>=media-libs/libsdl-1.2
+	opengl? ( >=dev-ml/lablgl-0.98:= )
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-image-1.2
+	truetype? ( >=media-libs/sdl-ttf-2.0 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-ocamlopt.patch"
+	"${FILESDIR}/${PN}-0.9.1-fix-ocaml-4.09.0-compilation.patch"
+)
+
+src_configure() {
+	myconf=""
+	if use opengl; then
+		destdir=$(ocamlfind printconf destdir)
+		lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
+		if [ -z "${lablgldir}" ]; then
+			destdir=$(ocamlc -where)
+			lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
+		fi
+
+		if [ ! -z "${lablgldir}" ]; then
+			myconf="--with-lablgldir=${lablgldir}"
+		fi
+	fi
+
+	#use noimage && myconf="${myconf} --without-sdl-image"
+	#use nomixer && myconf="${myconf} --without-sdl-mixer"
+
+	econf \
+		$myconf \
+		$(use_enable truetype sdl-ttf)
+	if ! use opengl; then
+		sed -i \
+			-e 's:LABLGLDIR:FALSE:' \
+			src/Makefile \
+			|| die
+	fi
+}
+
+src_install() {
+	findlib_src_install
+
+	dodoc AUTHORS NEWS README
+	doinfo doc/*.info*
+
+	if use doc; then
+		docinto html
+		dodoc doc/html/*
+	fi
+}
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
deleted file mode 100644
index ae6b805fe014..000000000000
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-DESCRIPTION="OCaml SDL Bindings"
-HOMEPAGE="http://ocamlsdl.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/ocamlsdl/${P}.tar.gz"
-LICENSE="LGPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="doc +ocamlopt opengl truetype" #noimage nomixer
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt=]
-	>=media-libs/libsdl-1.2
-	opengl? ( >=dev-ml/lablgl-0.98:= )
-	>=media-libs/sdl-mixer-1.2
-	>=media-libs/sdl-image-1.2
-	truetype? ( >=media-libs/sdl-ttf-2.0 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-ocamlopt.patch"
-	"${FILESDIR}/${PN}-0.9.1-fix-ocaml-4.09.0-compilation.patch"
-)
-
-src_configure() {
-	myconf=""
-	if use opengl; then
-		destdir=$(ocamlfind printconf destdir)
-		lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
-		if [ -z "${lablgldir}" ]; then
-			destdir=$(ocamlc -where)
-			lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
-		fi
-
-		if [ ! -z "${lablgldir}" ]; then
-			myconf="--with-lablgldir=${lablgldir}"
-		fi
-	fi
-
-	#use noimage && myconf="${myconf} --without-sdl-image"
-	#use nomixer && myconf="${myconf} --without-sdl-mixer"
-
-	econf \
-		$myconf \
-		$(use_enable truetype sdl-ttf)
-	if ! use opengl; then
-		sed -i \
-			-e 's:LABLGLDIR:FALSE:' \
-			src/Makefile \
-			|| die
-	fi
-}
-
-src_install() {
-	findlib_src_install
-
-	dodoc AUTHORS NEWS README
-	doinfo doc/*.info*
-
-	if use doc; then
-		docinto html
-		dodoc doc/html/*
-	fi
-}
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index 92d6445ba73f..12a38aa77803 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1,5 +1,5 @@
 AUX ocamlweb-1.41-ocaml-4.08.0.patch 1798 BLAKE2B 3bd06439f093dd25195070b41bfc59af9f0b54ad5d6dd0a705926961a1e60f49a64b62d11ffaa56f40bcd9cb0260344a8cd66f1c9b713b7238a2a83d710e06e5 SHA512 b9019c0377e24f719c086ce3ecc1117a2a96375f608d63a5267e0e6c466e60d43db2a714659201d2c74da7c0d7499c8c8982e31f5f87d7f6229a77f7ceb3dadf
 AUX ocamlweb-1.41-strip.patch 705 BLAKE2B 207e1771412bdba7985cebcb349e5c8fca09218dcee0ec78183bcb3160dc039e7ea7f81fbbdc2ef80dda05c1130faa24a3d09f4546262c4dbb832ed2b532b982 SHA512 54c211cb3b78b04bd4212acee0065e3c8614729a841691e1e29b8c553b73df20114bfcee4191ea519597c37a3c7344651647263fe6463829b780d7cc17710491
 DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
-EBUILD ocamlweb-1.41-r1.ebuild 850 BLAKE2B 143d30f012613a36fcc31109d9a9ac7118fb9af13cdc0a668614f721c395f2ed0d2f5f37997bf5de8db03a4b493099824fe017bbdfdecafbd8592e09d7d5ab89 SHA512 0d28be09267da6689a34d723d55cd79a73622bd46bf0a9716150d8d3cdc83d889e724bfdd82ae924e7c1bf35016473cb77d853631fa6582742aaaf3d9405ad98
+EBUILD ocamlweb-1.41-r2.ebuild 844 BLAKE2B 2b8fc3b582e643c5a4312b5e283be7d1c6c871541faf516a643a44cb91ca1c0decb755bc0f38b33802a8efa16bacf2bb806e8e2dd1e01bf912cf7354682be06f SHA512 66e7248f24c7b0bd98bc53316dc30f8129fa33efe387547cc324952f0de43f061a39011c203b01dbdbad3690b446ca178bee55fd4244997e8676836d7789dbc9
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
deleted file mode 100644
index 50d07a216410..000000000000
--- a/dev-ml/ocamlweb/ocamlweb-1.41-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="O'Caml literate programming tool"
-HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
-SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/ocaml-4.08.0:=
-	virtual/latex-base
-	dev-texlive/texlive-latexextra"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-tex/hevea )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.41-strip.patch"
-	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
-)
-
-QA_FLAGS_IGNORED=/usr/bin/ocamlweb
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
-	dodoc README CHANGES
-}
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41-r2.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41-r2.ebuild
new file mode 100644
index 000000000000..71e8467a476b
--- /dev/null
+++ b/dev-ml/ocamlweb/ocamlweb-1.41-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="O'Caml literate programming tool"
+HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="<dev-lang/ocaml-5:=
+	virtual/latex-base
+	dev-texlive/texlive-latexextra"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-tex/hevea )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.41-strip.patch"
+	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
+)
+
+QA_FLAGS_IGNORED=/usr/bin/ocamlweb
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
+	dodoc README CHANGES
+}
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 905dde0048a5..1efd36445ac0 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -6,6 +6,6 @@ DIST ppx_tools-6.6.tar.gz 19265 BLAKE2B f4f89eeb314ad76c0337ed9c782ff2bf1473172a
 EBUILD ppx_tools-6.2.ebuild 505 BLAKE2B 690649eab5fc48940936171e98bcf51edb1c0dafeebfe378a88b2c646f8df488270baed8845d480dfb47523819d6bc02daec4f9fd7265c4899cdd1bb4ffb5749 SHA512 c4cab13bb3694fad4c39300d31a9a81487f873eb45e0af9b243c891f646a505a2c33641cf25ddf084ae295f6577700cec8fcf478dce3c7f1b5391dee90d50b45
 EBUILD ppx_tools-6.3.ebuild 519 BLAKE2B 090073ee37b01219a2e098b8b81c7b67dacfafe2ffaf28b36aa336fe21a1c102f46ca5a3ebdb93ef5f52327f4d3ee6bce517581f000da2fd3e9702ba9ca62159 SHA512 eb42bda8bc1d545187448cf61b91d37652f1631b0d2e7619382f9ac6dd5f13d210a769f7e94904a084600fb3acb2cba3c5035eb3faac7376b80d53593333d7bd
 EBUILD ppx_tools-6.4.ebuild 521 BLAKE2B d2845934161c0d61e1ad4d3b9eceeb97c338cfbfa887e7e96bf60c1cdce2fee4966735074a11831a272db5718663cc9dc401d52b784c781abf2a6e2c073550c2 SHA512 d6c9660a6cd8982a87c2ef772a763fd631e642898c086e1eff63c050612a00eb864c438245db38dc99bcc272b534c4ae4bb897d9ff736d42751b100f07ca0374
-EBUILD ppx_tools-6.5.ebuild 497 BLAKE2B a4048f2190293001f30f45fae70d11956f506a261a379839044152135558b4b3122b9bea5f87dd8bfb988247ce3ed71ed5fcf1192afc981e5229ec9bd4a9304c SHA512 38049ff89408a072d55c90472f2e97f4db24433c0745525d48f486c482cc0e118a969a8e2fad3b08d1373e63c488eb81dd175507473f7b88faad7256b221593e
-EBUILD ppx_tools-6.6.ebuild 494 BLAKE2B f3b36b3d2ba34248a54617dfb88d73746040572425390d0c9afc9c67c90cfb3ea335e6ab9490a3c69484cc8981e5e9dd007ad40b50d33bae6f665f9703c57f39 SHA512 6b27c8c947a783590901a49baaf9e405e1b515ab2067453ca51ca52780203de0934963fac933ff8db48aa1e9c6c6481e0c4097a4005537e608acf0cc1525c005
+EBUILD ppx_tools-6.5-r1.ebuild 525 BLAKE2B e032bf2fb3e3293587b3e76f9b685b7f9ff042d829be85695271c963917180448e26cdce9fa3d0103bdff46e7a6e03f0e1a9fd6d67e7155d1159b20728e59624 SHA512 c72a030696501a2751d4bc55354422784b5ce841edf8f873d39157bca8cb03c5801a9669cdc833b4898d82f6f67aacf4ce3c54f153d3cb287f217de9401be39b
+EBUILD ppx_tools-6.6-r1.ebuild 522 BLAKE2B b1f96492bd3aa2f0a89f11b01c5660ce5daf687ba9b7be8d990bf6f474300d34f6dc965f7b7761fd767eff5d6ebaa4b66814dd9421d0c76a9f89e62f6b517646 SHA512 3c79bc5c646a9bea159d31364243ca4290caaf529c8459a1600deb530b5eb0efdb307ff0349131d6ea7465b2dadd49b0c6664a2e63f9dfc5397e2ad1b3de0e12
 MISC metadata.xml 319 BLAKE2B 5908d81a0c9bcf26274852145d87b0b42ccb7b8f4ea233eec27875951e30b958fcc8c34b66c6f33fcf92cdd7b35d4592ffb0a23b2bf86930991fbb0782d2eb91 SHA512 06e9b9e6a3e6fe00232833652e04ac0e2a4a482c78c8d08ad225c1b535fe7c62e0e203aa3677fcb8d394f2eea87c87e7fdef89c7feb4083575d93bc08b7dbb11
diff --git a/dev-ml/ppx_tools/ppx_tools-6.5-r1.ebuild b/dev-ml/ppx_tools/ppx_tools-6.5-r1.ebuild
new file mode 100644
index 000000000000..6bd97174b615
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="<dev-lang/ocaml-5"
+BDEPEND="
+	dev-ml/cppo
+"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.5.ebuild b/dev-ml/ppx_tools/ppx_tools-6.5.ebuild
deleted file mode 100644
index 374fa202c924..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV=$(ver_rs 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-BDEPEND="
-	dev-ml/cppo
-"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.6-r1.ebuild b/dev-ml/ppx_tools/ppx_tools-6.6-r1.ebuild
new file mode 100644
index 000000000000..a58223e94180
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+IUSE="+ocamlopt"
+
+RDEPEND="<dev-lang/ocaml-5"
+BDEPEND="
+	dev-ml/cppo
+"
diff --git a/dev-ml/ppx_tools/ppx_tools-6.6.ebuild b/dev-ml/ppx_tools/ppx_tools-6.6.ebuild
deleted file mode 100644
index 37dc6f31db05..000000000000
--- a/dev-ml/ppx_tools/ppx_tools-6.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-MY_PV=$(ver_rs 2 '+')
-DESCRIPTION="Tools for authors of ppx rewriters"
-HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
-SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="+ocamlopt"
-
-BDEPEND="
-	dev-ml/cppo
-"
diff --git a/dev-ml/stdcompat/Manifest b/dev-ml/stdcompat/Manifest
index 7c7d91b62a81..8b9046249c2b 100644
--- a/dev-ml/stdcompat/Manifest
+++ b/dev-ml/stdcompat/Manifest
@@ -1,3 +1,3 @@
 DIST stdcompat-19.tar.gz 530511 BLAKE2B 4af97c355b98f63366d647a4a375bde43ffbf959a2c02132ab57457db4213b8f98a972bf99667dd53603b28235b4f853470c2117270ce42c6aa579a21dd148fb SHA512 25582731170f2f80eed281c48af4904d1d00ef88a38d1b17853395c19a326d7b11e42c17b69f639402c467ff6f9b83a2e9d4dbab7255ac25d466b85a55674bd0
-EBUILD stdcompat-19-r1.ebuild 768 BLAKE2B 2c8ed35940b06a515b0be0d4ff5e88b35274fa135ebd9419af2971651eef25c10223898f387369070fb67b7b17de9a0935f8f97460b9ae5b0231f5044c1163cf SHA512 954802b363192cb4ec9bf006b12298e238c24ecbf074cc7006456c59ccbb2b24a2be20aa1466488ec7b21d21b602dfccf9c748314b97103b1e7bb0abdab9cdfc
+EBUILD stdcompat-19-r2.ebuild 771 BLAKE2B de397cfaa01022b495992d1a74178dc35d6d5ef891ca77b1a86046ca3905e89d0e0e5591d1271ec3a595f89f702e61e9ba238785fae1480bf6418394cc8a0252 SHA512 d330d9f28e5b474ba332b6f4cd2c61c6c11819643f13909470a8982bfc99996c4790a14631ab781f27e540dca3a56001173437886ad8bd7e8105e1fb02d7840f
 MISC metadata.xml 577 BLAKE2B b6857bd7760fbdc5988d1a545e2f128c9d13ea18d43a341af0757a227958594ed314b9472c9994fae54f7aba2f57ebee06b6f9cc4bb5a1428218dcdda2745507 SHA512 859f88d95b52a4e159fb4241ccaca2ba7777eda999623e281fd36e6b1ab2273407931f9ca89971f86b7563889bb704d7e353605f808aab868cb09a0468687419
diff --git a/dev-ml/stdcompat/stdcompat-19-r1.ebuild b/dev-ml/stdcompat/stdcompat-19-r1.ebuild
deleted file mode 100644
index 731c0bed6669..000000000000
--- a/dev-ml/stdcompat/stdcompat-19-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Compatibility module for OCaml standard library"
-HOMEPAGE="https://github.com/thierry-martinez/stdcompat"
-SRC_URI="https://github.com/thierry-martinez/stdcompat/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt]
-	dev-ml/result:=[ocamlopt]
-	dev-ml/uchar:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-ml/dune
-	dev-ml/findlib[ocamlopt]"
-
-# Do not complain about CFLAGS etc since ml projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure () {
-	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/ocaml
-}
diff --git a/dev-ml/stdcompat/stdcompat-19-r2.ebuild b/dev-ml/stdcompat/stdcompat-19-r2.ebuild
new file mode 100644
index 000000000000..fd7184f8ab04
--- /dev/null
+++ b/dev-ml/stdcompat/stdcompat-19-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Compatibility module for OCaml standard library"
+HOMEPAGE="https://github.com/thierry-martinez/stdcompat"
+SRC_URI="https://github.com/thierry-martinez/stdcompat/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="<dev-lang/ocaml-5:=[ocamlopt]
+	dev-ml/result:=[ocamlopt]
+	dev-ml/uchar:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-ml/dune
+	dev-ml/findlib[ocamlopt]"
+
+# Do not complain about CFLAGS etc since ml projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure () {
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/ocaml
+}
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index 8c6d8857c89d..1cef1b778edd 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -3,9 +3,9 @@ DIST typerep-0.15.0.tar.gz 22737 BLAKE2B f94587cd3b4bb9efb117c1ce228663fe91ad115
 DIST typerep-0.16.0.tar.gz 23002 BLAKE2B d0ec7176b8354a2734b13317f2084eaac154a46567f2286ed33702908afcbe7ceeacbf15cc6fe6fb03ceae4f975d32ff4eeaafe05477abbf11849a0a70e61dd9 SHA512 1a93552b3ba83d0b1fee155a083cf929949089372dc21419a62a0f3ef0ea0171b6294833e3ff06cc718e2cfd761072f1c835f5026a17bb3fb17a0dfc7a23718e
 DIST typerep-0.17.0.tar.gz 23074 BLAKE2B 52548d976d9580acc3b31a39fd6ce1fdeb543a32ae6453537d5e5fbf4f31293ad15312c768a95c3d998eef54efa45bfab2a2bf36e2baef98588e34270efa370e SHA512 f66630350ada7838d7fd4ff83a155c2b942d1ae94b07914e40494b710e4bef83265fc6740fc4d231f00ce4505ba01f4a8d1e0a7c835c328647fd9a2e64795419
 DIST typerep-0.17.1.tar.gz 23072 BLAKE2B 2d904f1416c34631fe583343095639148dc2454aec3a08590ce41b3702dee935ef958cd3b8aa0b1d90ad0d345c1ee350cc5a36657469469b2107f2a7b9c52bc2 SHA512 e81434ced58ab1cf3cb61d0e2c2106d81c81fe040130cfe07bb79dc3dcc834b1f51dec0faf50e06ccf8cac831e39f31a2ff4ca3dabef7bbaa61f85f13d7f44f5
-EBUILD typerep-0.14.0.ebuild 479 BLAKE2B efbf5219d78d3854764470687f4489ff5ffeb0d7c06d41373acf356c92fac981e3572878e02c2cef1e1daa58caf6c56cc8ffa029553f1fc4affbaa6a43872e29 SHA512 86e107cdb761bcc042132e27dd3ebbe960429c7587fac9c067acd9a7b3dd5664fc8896fc34429a2c589c1156f1773058c10658d4171c0aeb0ab9a62d45148f12
-EBUILD typerep-0.15.0.ebuild 494 BLAKE2B 6888131fb6cf7e7eaa7b4b26ee23f49b6627983583dd40fe3b71cc28a15d271ad8c2a17d07107a8666db6332a99c7aa614488df384d164779f12d165f00c5785 SHA512 ba825c815630e7ec15b14f98b2cd921a64bd8dd3ea73f00fed546b48ece5b269e3eb15422275769e2a5dce59131c263939ec6158e43426f52998f42456c80400
-EBUILD typerep-0.16.0.ebuild 494 BLAKE2B c411b2e123b76549d3a5ae808d1b0edfdcf3b91b5bc0a77e5aea474e2d145d8e8635f34ac0ab70618458e3e3156dba98ae16d60f7154c3d9fc15d88d7cb0a8cf SHA512 4194a8c8e5c8dfdec26945dd1ebc6cfb7c61c81eeda16e14086ec7d9ed2e443e71e440f7f92b82532efc9ee389ff54baa670a0c07223f156323cff3d528118c5
+EBUILD typerep-0.14.0-r1.ebuild 507 BLAKE2B 4f72a2ea3dbea7180786108cf6f081c9ec241ee1ad6b5ad5fbea33a22267c04c6d8a9c87dfadce072a22b8f9a7d1948b004ca949f96fa142c506241363651ab4 SHA512 d83085f8e7ce2f033ddf0821888304fdfb61fd1831ba0eed3860d0c2e59c549f4693b6feedfdf28fcd945038f596da09bd938abd1226a4e48cb05b400469ceed
+EBUILD typerep-0.15.0-r1.ebuild 522 BLAKE2B f4e9d03e9e06255d0052f7cd33a91ab5af077cfd3d9470792ca0bc1a13f6a8ae43ffb904d63cd7400912bc3fd7e99f13eadb2988204de84ef6bca869615fde7c SHA512 1032781e855c10125744f40ca0c1ca99db21a1681bc505d4485b695b8ddf903acd29f39dd951dc0cb60d262053bdec97e18b6cb2aa8f543b348c3c7e1ebd1b07
+EBUILD typerep-0.16.0-r1.ebuild 522 BLAKE2B f4e9d03e9e06255d0052f7cd33a91ab5af077cfd3d9470792ca0bc1a13f6a8ae43ffb904d63cd7400912bc3fd7e99f13eadb2988204de84ef6bca869615fde7c SHA512 1032781e855c10125744f40ca0c1ca99db21a1681bc505d4485b695b8ddf903acd29f39dd951dc0cb60d262053bdec97e18b6cb2aa8f543b348c3c7e1ebd1b07
 EBUILD typerep-0.17.0.ebuild 553 BLAKE2B 1e33a7d399acf551cc876ce8febf1e7a4e7f97f16ed99de4a158271a55f5ef50d93859e9b0b44d0d3b969ecb81e68ead2303c13658355e33b01d9db5b871fc6f SHA512 5c39566e2a0ab2a46f0827182d6f5be180e861110dcafb626c29ccc61243783ff6e639e9208844999c61bcbe2bd313bb855ade67480ba560c2359022ebf5d109
 EBUILD typerep-0.17.1.ebuild 553 BLAKE2B 1e33a7d399acf551cc876ce8febf1e7a4e7f97f16ed99de4a158271a55f5ef50d93859e9b0b44d0d3b969ecb81e68ead2303c13658355e33b01d9db5b871fc6f SHA512 5c39566e2a0ab2a46f0827182d6f5be180e861110dcafb626c29ccc61243783ff6e639e9208844999c61bcbe2bd313bb855ade67480ba560c2359022ebf5d109
 MISC metadata.xml 316 BLAKE2B 52c8e9305438751e99ca3df54e49896a80d206885090142ea0d219b6184cf0ccbabaf95e0ce7bc1dc06ba397c33e87bdc4ef9c9f4db47bcc0d14472df967a8df SHA512 9063d1b227f10e42ebfe37ea4c2040ceac27afe7e2f972a7d0aa0b3461e9966450c7e82ad6ea297cd7a2813996e9fd275e8e297d75340550b4284a548da3d39c
diff --git a/dev-ml/typerep/typerep-0.14.0-r1.ebuild b/dev-ml/typerep/typerep-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..14bd4cedbd68
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.14.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/base:="
+RDEPEND="${DEPEND}"
+BDEPEND="<dev-lang/ocaml-5"
diff --git a/dev-ml/typerep/typerep-0.14.0.ebuild b/dev-ml/typerep/typerep-0.14.0.ebuild
deleted file mode 100644
index 07af2c0a2dc2..000000000000
--- a/dev-ml/typerep/typerep-0.14.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Library for creating runtime representation of OCaml types"
-HOMEPAGE="https://github.com/janestreet/typerep"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-IUSE="+ocamlopt"
-
-DEPEND="dev-ml/base:="
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/typerep/typerep-0.15.0-r1.ebuild b/dev-ml/typerep/typerep-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..ee7cd26d8555
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.15.0-r1.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="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+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-ml/base:${SLOT}"
+RDEPEND="${DEPEND}"
+BDEPEND="<dev-lang/ocaml-5"
diff --git a/dev-ml/typerep/typerep-0.15.0.ebuild b/dev-ml/typerep/typerep-0.15.0.ebuild
deleted file mode 100644
index 0a92b498627c..000000000000
--- a/dev-ml/typerep/typerep-0.15.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Library for creating runtime representation of OCaml types"
-HOMEPAGE="https://github.com/janestreet/typerep"
-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-ml/base:${SLOT}"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/typerep/typerep-0.16.0-r1.ebuild b/dev-ml/typerep/typerep-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..ee7cd26d8555
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.16.0-r1.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="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+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-ml/base:${SLOT}"
+RDEPEND="${DEPEND}"
+BDEPEND="<dev-lang/ocaml-5"
diff --git a/dev-ml/typerep/typerep-0.16.0.ebuild b/dev-ml/typerep/typerep-0.16.0.ebuild
deleted file mode 100644
index a19840a68389..000000000000
--- a/dev-ml/typerep/typerep-0.16.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Library for creating runtime representation of OCaml types"
-HOMEPAGE="https://github.com/janestreet/typerep"
-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-ml/base:${SLOT}"
-RDEPEND="${DEPEND}"
-- 
cgit v1.2.3