Adding metadata

34 files changed, 213 insertions, 105 deletions

diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
index 7c99ecdf7923..ae47bdca6b5e 100644
--- a/dev-ml/dune-build-info/Manifest
+++ b/dev-ml/dune-build-info/Manifest
@@ -1,5 +1,5 @@
 DIST dune-3.16.0.tar.gz 2999701 BLAKE2B 5e371fa1003cec31273aeeb1a830036f48d3734588bd7a980b57aaae30d4984a34dec6f9be0ee9985c72dee08c2c6d456a789eab83cfce42c142a3abc6951b2e SHA512 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23
-DIST dune-3.16.1.tar.gz 3000392 BLAKE2B 93de09c47fda95e1d83f10c9a4e7cfb7f801c7c4e47acbed7a20ef614ff3a6585d8a25b8617c8ee45d338006a99084d096990d1e8c3cbeb6613caa7f0e1a70b5 SHA512 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f
 DIST dune-3.18.1.tar.gz 2918737 BLAKE2B 38731cdc61d2944f27487e844c554d0085e9a1787e9ebe7fb92e53d74df6e5919aaefe361c171e129451c7a57b95efe2cc066c1e087bf4a082ca34f6b5a100de SHA512 e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208
 DIST dune-3.19.1.tar.gz 2917826 BLAKE2B 588a7d2195169ed1210a7126bd06cfdea4fa0e7735f23c346314c3cbbea1e76ec1286f1b56b337a151fc3246343c001794bde6a9eb85a4a05c6a1537ae2ae8bb SHA512 a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6
 DIST dune-3.20.2.tar.gz 3051854 BLAKE2B ce0ff1b7503d0b3bc72fc9c7e1c167c33cf071257066117c16ad24d2d2aeb9c3a84dccd2e24132eb3a95c6f0ee254810e8b1a9f39e8dc81752a97948be8438c3 SHA512 efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
+DIST dune-3.21.1.tar.gz 3431470 BLAKE2B cb0a155fff9e4c81438f31770856ab4a7107d78f5cca128aa675bb11ff62c66d4cffb4fb22e4a4f9eda8e9ec088cbf827b66a6511bd179a427bf16778cd42a0c SHA512 a304fc6bb854c3a1d5b86b3d3a942e140387ae82e52be240289ef89413d6e6017bc6869363aba3898d6a6be1cb31f4fe8b9264c735c87a1e18cad82a26054acb
diff --git a/dev-ml/dune-build-info/dune-build-info-3.16.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.19.1-r1.ebuild
index ca20151c926a..0999e52de171 100644
--- a/dev-ml/dune-build-info/dune-build-info-3.16.1.ebuild
+++ b/dev-ml/dune-build-info/dune-build-info-3.19.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-RDEPEND=">=dev-ml/dune-3.12"
+RDEPEND=">=dev-ml/dune-3.18"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/dev-ml/dune-build-info/dune-build-info-3.19.1.ebuild b/dev-ml/dune-build-info/dune-build-info-3.21.1.ebuild
index ca20151c926a..8ef9aa2d1f78 100644
--- a/dev-ml/dune-build-info/dune-build-info-3.19.1.ebuild
+++ b/dev-ml/dune-build-info/dune-build-info-3.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-RDEPEND=">=dev-ml/dune-3.12"
+RDEPEND=">=dev-ml/dune-3.21"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index bcb06dcc7dfa..06591ddd37b7 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -4,3 +4,4 @@ DIST dune-3.17.1.tar.gz 3011472 BLAKE2B 5bb6b33cf0961ab6e9276408b40498bf296327bd
 DIST dune-3.18.1.tar.gz 2918737 BLAKE2B 38731cdc61d2944f27487e844c554d0085e9a1787e9ebe7fb92e53d74df6e5919aaefe361c171e129451c7a57b95efe2cc066c1e087bf4a082ca34f6b5a100de SHA512 e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208
 DIST dune-3.19.1.tar.gz 2917826 BLAKE2B 588a7d2195169ed1210a7126bd06cfdea4fa0e7735f23c346314c3cbbea1e76ec1286f1b56b337a151fc3246343c001794bde6a9eb85a4a05c6a1537ae2ae8bb SHA512 a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6
 DIST dune-3.20.2.tar.gz 3051854 BLAKE2B ce0ff1b7503d0b3bc72fc9c7e1c167c33cf071257066117c16ad24d2d2aeb9c3a84dccd2e24132eb3a95c6f0ee254810e8b1a9f39e8dc81752a97948be8438c3 SHA512 efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
+DIST dune-3.21.1.tar.gz 3431470 BLAKE2B cb0a155fff9e4c81438f31770856ab4a7107d78f5cca128aa675bb11ff62c66d4cffb4fb22e4a4f9eda8e9ec088cbf827b66a6511bd179a427bf16778cd42a0c SHA512 a304fc6bb854c3a1d5b86b3d3a942e140387ae82e52be240289ef89413d6e6017bc6869363aba3898d6a6be1cb31f4fe8b9264c735c87a1e18cad82a26054acb
diff --git a/dev-ml/dune-configurator/dune-configurator-3.19.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.19.1-r1.ebuild
index 665f4766bfc7..66643cbae872 100644
--- a/dev-ml/dune-configurator/dune-configurator-3.19.1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-3.19.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND=">=dev-ml/dune-3.12"
+BDEPEND=">=dev-ml/dune-3.18"
 DEPEND="
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
 "
diff --git a/dev-ml/dune-configurator/dune-configurator-3.21.1.ebuild b/dev-ml/dune-configurator/dune-configurator-3.21.1.ebuild
new file mode 100644
index 000000000000..ad5151d2c728
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-3.21.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Helper library for gathering system configuration"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+BDEPEND=">=dev-ml/dune-3.21"
+DEPEND="
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune-compile ${PN}
+}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.19.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.19.0-r1.ebuild
index 1e5ff0688ab4..fcd790a93769 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-3.19.0.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND=">=dev-ml/dune-3.12"
+BDEPEND=">=dev-ml/dune-3.18"
 DEPEND="
 	dev-ml/csexp:=[ocamlopt?]
 "
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
index 7c99ecdf7923..1d799a4e8f37 100644
--- a/dev-ml/dune-site/Manifest
+++ b/dev-ml/dune-site/Manifest
@@ -3,3 +3,4 @@ DIST dune-3.16.1.tar.gz 3000392 BLAKE2B 93de09c47fda95e1d83f10c9a4e7cfb7f801c7c4
 DIST dune-3.18.1.tar.gz 2918737 BLAKE2B 38731cdc61d2944f27487e844c554d0085e9a1787e9ebe7fb92e53d74df6e5919aaefe361c171e129451c7a57b95efe2cc066c1e087bf4a082ca34f6b5a100de SHA512 e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208
 DIST dune-3.19.1.tar.gz 2917826 BLAKE2B 588a7d2195169ed1210a7126bd06cfdea4fa0e7735f23c346314c3cbbea1e76ec1286f1b56b337a151fc3246343c001794bde6a9eb85a4a05c6a1537ae2ae8bb SHA512 a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6
 DIST dune-3.20.2.tar.gz 3051854 BLAKE2B ce0ff1b7503d0b3bc72fc9c7e1c167c33cf071257066117c16ad24d2d2aeb9c3a84dccd2e24132eb3a95c6f0ee254810e8b1a9f39e8dc81752a97948be8438c3 SHA512 efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
+DIST dune-3.21.1.tar.gz 3431470 BLAKE2B cb0a155fff9e4c81438f31770856ab4a7107d78f5cca128aa675bb11ff62c66d4cffb4fb22e4a4f9eda8e9ec088cbf827b66a6511bd179a427bf16778cd42a0c SHA512 a304fc6bb854c3a1d5b86b3d3a942e140387ae82e52be240289ef89413d6e6017bc6869363aba3898d6a6be1cb31f4fe8b9264c735c87a1e18cad82a26054acb
diff --git a/dev-ml/dune-site/dune-site-3.19.1.ebuild b/dev-ml/dune-site/dune-site-3.19.1-r1.ebuild
index c0c6ea5a5456..d5b7a869fdb0 100644
--- a/dev-ml/dune-site/dune-site-3.19.1.ebuild
+++ b/dev-ml/dune-site/dune-site-3.19.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ IUSE="+ocamlopt"
 RESTRICT="test"
 
 RDEPEND="
-	>=dev-ml/dune-3.12
+	>=dev-ml/dune-3.18
 	dev-ml/csexp:=[ocamlopt?]
 	!dev-ml/dune-private-libs
 	!dev-ml/stdune
diff --git a/dev-ml/dune-site/dune-site-3.21.1.ebuild b/dev-ml/dune-site/dune-site-3.21.1.ebuild
new file mode 100644
index 000000000000..9d632b2ca897
--- /dev/null
+++ b/dev-ml/dune-site/dune-site-3.21.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Embed locations informations inside executable and libraries"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+	-> dune-${PV}.tar.gz"
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-ml/dune-3.21
+	dev-ml/csexp:=[ocamlopt?]
+	!dev-ml/dune-private-libs
+	!dev-ml/stdune
+	!dev-ml/dyn
+	!dev-ml/ordering
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune-compile ordering dyn fs-io top-closure stdune dune-private-libs ${PN}
+}
+
+src_install() {
+	dune-install ordering dyn fs-io top-closure stdune dune-private-libs ${PN}
+}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 03b1151a2bf9..e431a806556e 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,3 +3,4 @@ DIST dune-3.17.2.tar.gz 3015019 BLAKE2B 8b79e0f6d878722529c21069de7975642351e9db
 DIST dune-3.18.1.tar.gz 2918737 BLAKE2B 38731cdc61d2944f27487e844c554d0085e9a1787e9ebe7fb92e53d74df6e5919aaefe361c171e129451c7a57b95efe2cc066c1e087bf4a082ca34f6b5a100de SHA512 e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208
 DIST dune-3.19.1.tar.gz 2917826 BLAKE2B 588a7d2195169ed1210a7126bd06cfdea4fa0e7735f23c346314c3cbbea1e76ec1286f1b56b337a151fc3246343c001794bde6a9eb85a4a05c6a1537ae2ae8bb SHA512 a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6
 DIST dune-3.20.2.tar.gz 3051854 BLAKE2B ce0ff1b7503d0b3bc72fc9c7e1c167c33cf071257066117c16ad24d2d2aeb9c3a84dccd2e24132eb3a95c6f0ee254810e8b1a9f39e8dc81752a97948be8438c3 SHA512 efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
+DIST dune-3.21.1.tar.gz 3431470 BLAKE2B cb0a155fff9e4c81438f31770856ab4a7107d78f5cca128aa675bb11ff62c66d4cffb4fb22e4a4f9eda8e9ec088cbf827b66a6511bd179a427bf16778cd42a0c SHA512 a304fc6bb854c3a1d5b86b3d3a942e140387ae82e52be240289ef89413d6e6017bc6869363aba3898d6a6be1cb31f4fe8b9264c735c87a1e18cad82a26054acb
diff --git a/dev-ml/dune/dune-3.21.1-r1.ebuild b/dev-ml/dune/dune-3.21.1-r1.ebuild
new file mode 100644
index 000000000000..8cbc964d14a3
--- /dev/null
+++ b/dev-ml/dune/dune-3.21.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing elisp-common
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="emacs"
+RESTRICT="strip test"
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/pp:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# This allows `dune --version` to output the correct version
+	# instead of "n/a"
+	sed -i "/^(name dune)/a (version ${PV})" dune-project || die
+}
+
+src_configure() {
+	./configure \
+		--libdir="$(ocamlc -where)" \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--etcdir=/etc \
+		--datadir=/usr/share \
+		--sbindir=/usr/sbin \
+		--bindir=/usr/bin \
+		|| die
+}
+
+src_compile() {
+	ocaml boot/bootstrap.ml -j $(makeopts_jobs) --verbose || die
+	./_boot/dune.exe build @install -p "${PN}" --profile dune-bootstrap \
+		-j $(makeopts_jobs) --display short || die
+
+	use emacs && elisp-compile editor-integration/emacs/*.el
+}
+
+src_install() {
+	# OCaml generates textrels on 32-bit arches
+	if use arm || use ppc || use x86 ; then
+		export QA_TEXTRELS='.*'
+	fi
+	default
+
+	mv "${ED}"/usr/share/doc/dune "${ED}"/usr/share/doc/${PF} || die
+
+	if use emacs ; then
+		elisp-install ${PN} editor-integration/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
diff --git a/dev-ml/ppxlib_jane/Manifest b/dev-ml/ppxlib_jane/Manifest
index 528f7a609471..8bc2383c7ce0 100644
--- a/dev-ml/ppxlib_jane/Manifest
+++ b/dev-ml/ppxlib_jane/Manifest
@@ -1,3 +1,2 @@
-DIST ppxlib_jane-0.17.0.tar.gz 46439 BLAKE2B 97b8040571e0641ebc6a67d9ee394cba2388be0993eac5f8255b3358225533d7813ad7a9fd7af8f87007348badfb7a51a73af44365c87c1a70b0c74b8401e71c SHA512 0907a5c9dfce17dab6df86bc8b04b20c1f809c45a89e947c1da57092851489c618c741aabb853fdc6ca48f4737a74ee2a8c8fc1abfbd85939fd003991adccc09
 DIST ppxlib_jane-0.17.2.tar.gz 46492 BLAKE2B 6bad78b03c1769d21f62acbf1c88e1a1e41db11bb942b8286d0ea195f3b6272f64203572d151b7a6b13d916a0a79ffa7a51bd2bec3fca31f6c3dad9ee827a628 SHA512 342e034d44d14958869e643befb0e749d4de3ca0040891ab51592e2583bc5bb827bdaa5bd06966ac536151d160997aef79baa090247d1649a6b5849a359744d8
 DIST ppxlib_jane-0.17.4.tar.gz 42650 BLAKE2B 67da586b173350032d322aef8b1823b22a98a89cc8917c5e6d577af46b57cd869b5f2d4d9354762b73c374a190706555507e82a2ff465aa05cd8cc0da028cf40 SHA512 e2931de633d9dcce2ca121e1cf117e159af4ccc52a7e420c328021da0145b6b90194e4545f97afe9cd032c04c6bc2563faa2d852ad45b041b014c688153799d6
diff --git a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0-r1.ebuild b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0-r1.ebuild
deleted file mode 100644
index 07f03db970a3..000000000000
--- a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Utilities for working with Jane Street AST constructs"
-HOMEPAGE="https://github.com/janestreet/ppxlib_jane"
-SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-5
-	<dev-lang/ocaml-5.3
-	dev-ml/stdlib-shims:=[ocamlopt?]
-	>=dev-ml/ppxlib-0.32.1:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2-r1.ebuild b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2-r2.ebuild
index 977bf3df34e3..1882f418e512 100644
--- a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2-r1.ebuild
+++ b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024-2025 Gentoo Authors
+# Copyright 2024-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,4 +22,3 @@ RDEPEND="
 	<dev-ml/ppxlib-0.36.0
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.4.ebuild b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.4-r1.ebuild
index a585063f2b6b..e3600ccbef0f 100644
--- a/dev-ml/ppxlib_jane/ppxlib_jane-0.17.4.ebuild
+++ b/dev-ml/ppxlib_jane/ppxlib_jane-0.17.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024-2025 Gentoo Authors
+# Copyright 2024-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,4 +21,3 @@ RDEPEND="
 	>=dev-ml/ppxlib-0.36.0:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/record_builder/record_builder-0.17.0-r1.ebuild b/dev-ml/record_builder/record_builder-0.17.0-r2.ebuild
index b02b132bf480..92c8d4aebed9 100644
--- a/dev-ml/record_builder/record_builder-0.17.0-r1.ebuild
+++ b/dev-ml/record_builder/record_builder-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,4 +23,3 @@ RDEPEND="
 	=dev-ml/ppx_jane-${JSM}*:=[ocamlopt]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.17.0-r1.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.17.0-r2.ebuild
index f4c53e37cedd..4e4cf5bbafcf 100644
--- a/dev-ml/sexp_pretty/sexp_pretty-0.17.0-r1.ebuild
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2025 Gentoo Authors
+# Copyright 2023-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,4 +26,3 @@ RDEPEND="
 	dev-ml/re:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/sexplib/sexplib-0.17.0.ebuild b/dev-ml/sexplib/sexplib-0.17.0-r1.ebuild
index 3ead022724f6..97298e5639a2 100644
--- a/dev-ml/sexplib/sexplib-0.17.0.ebuild
+++ b/dev-ml/sexplib/sexplib-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,4 +21,3 @@ RDEPEND="
 	dev-ml/num:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/sexplib0/sexplib0-0.17.0-r1.ebuild b/dev-ml/sexplib0/sexplib0-0.17.0-r2.ebuild
index 8ed62f9c1d0a..4c1150459300 100644
--- a/dev-ml/sexplib0/sexplib0-0.17.0-r1.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,3 @@ LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
-
-BDEPEND="
-	>=dev-ml/dune-3.11
-	>=dev-lang/ocaml-4.12
-"
diff --git a/dev-ml/splittable_random/splittable_random-0.17.0-r1.ebuild b/dev-ml/splittable_random/splittable_random-0.17.0-r2.ebuild
index bd404a5a6af7..57e8383f12e6 100644
--- a/dev-ml/splittable_random/splittable_random-0.17.0-r1.ebuild
+++ b/dev-ml/splittable_random/splittable_random-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,4 +26,3 @@ RDEPEND="
 	=dev-ml/ppx_sexp_message-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/stdio/stdio-0.17.0-r1.ebuild b/dev-ml/stdio/stdio-0.17.0-r2.ebuild
index f48793d7d361..4bc58541a64d 100644
--- a/dev-ml/stdio/stdio-0.17.0-r1.ebuild
+++ b/dev-ml/stdio/stdio-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,4 +22,3 @@ RDEPEND="
 	=dev-ml/base-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/textutils/textutils-0.17.0.ebuild b/dev-ml/textutils/textutils-0.17.0-r1.ebuild
index 68031d823726..32b993c6e4de 100644
--- a/dev-ml/textutils/textutils-0.17.0.ebuild
+++ b/dev-ml/textutils/textutils-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,4 +23,3 @@ RDEPEND="
 	>=dev-ml/uutf-1.0.2:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.17.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.17.0-r1.ebuild
index 4e3ae019713d..497fdc1a261c 100644
--- a/dev-ml/textutils_kernel/textutils_kernel-0.17.0.ebuild
+++ b/dev-ml/textutils_kernel/textutils_kernel-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,6 +20,5 @@ DEPEND="
 	dev-ml/core:${SLOT}[ocamlopt?]
 	dev-ml/ppx_jane:${SLOT}[ocamlopt?]
 	>=dev-ml/uutf-1.0.2:=[ocamlopt?]
-	>=dev-ml/dune-3.11
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/time_now/time_now-0.17.0-r1.ebuild b/dev-ml/time_now/time_now-0.17.0-r2.ebuild
index be6aa17aee40..bbec8a37c3a0 100644
--- a/dev-ml/time_now/time_now-0.17.0-r1.ebuild
+++ b/dev-ml/time_now/time_now-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,4 +26,3 @@ RDEPEND="
 	=dev-ml/ppx_optcomp-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/timezone/timezone-0.17.0.ebuild b/dev-ml/timezone/timezone-0.17.0-r1.ebuild
index 8ef0e1db7183..5d6c76acf8d2 100644
--- a/dev-ml/timezone/timezone-0.17.0.ebuild
+++ b/dev-ml/timezone/timezone-0.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,4 +20,3 @@ RDEPEND="
 	dev-ml/ppx_jane:${SLOT}[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/typerep/typerep-0.17.1-r1.ebuild b/dev-ml/typerep/typerep-0.17.1-r2.ebuild
index 6025ea8c9789..bca06a5a9a23 100644
--- a/dev-ml/typerep/typerep-0.17.1-r1.ebuild
+++ b/dev-ml/typerep/typerep-0.17.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,4 +22,3 @@ RDEPEND="
 	=dev-ml/base-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/uopt/uopt-0.17.0-r1.ebuild b/dev-ml/uopt/uopt-0.17.0-r2.ebuild
index d0063e7b182a..3fdc86078f13 100644
--- a/dev-ml/uopt/uopt-0.17.0-r1.ebuild
+++ b/dev-ml/uopt/uopt-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024-2025 Gentoo Authors
+# Copyright 2024-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,4 +23,3 @@ RDEPEND="
 	=dev-ml/ppx_jane-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/variantslib/variantslib-0.17.0-r1.ebuild b/dev-ml/variantslib/variantslib-0.17.0-r2.ebuild
index 7c80ced14d2f..bcc0e98f8cf2 100644
--- a/dev-ml/variantslib/variantslib-0.17.0-r1.ebuild
+++ b/dev-ml/variantslib/variantslib-0.17.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,4 +22,3 @@ RDEPEND="
 	=dev-ml/base-${JSM}*:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-ml/dune-3.11"
diff --git a/dev-ml/xdg/Manifest b/dev-ml/xdg/Manifest
index 8d4a9a925982..8a7f871d795f 100644
--- a/dev-ml/xdg/Manifest
+++ b/dev-ml/xdg/Manifest
@@ -1,2 +1,3 @@
 DIST dune-3.16.1.tar.gz 3000392 BLAKE2B 93de09c47fda95e1d83f10c9a4e7cfb7f801c7c4e47acbed7a20ef614ff3a6585d8a25b8617c8ee45d338006a99084d096990d1e8c3cbeb6613caa7f0e1a70b5 SHA512 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f
 DIST dune-3.20.2.tar.gz 3051854 BLAKE2B ce0ff1b7503d0b3bc72fc9c7e1c167c33cf071257066117c16ad24d2d2aeb9c3a84dccd2e24132eb3a95c6f0ee254810e8b1a9f39e8dc81752a97948be8438c3 SHA512 efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
+DIST dune-3.21.1.tar.gz 3431470 BLAKE2B cb0a155fff9e4c81438f31770856ab4a7107d78f5cca128aa675bb11ff62c66d4cffb4fb22e4a4f9eda8e9ec088cbf827b66a6511bd179a427bf16778cd42a0c SHA512 a304fc6bb854c3a1d5b86b3d3a942e140387ae82e52be240289ef89413d6e6017bc6869363aba3898d6a6be1cb31f4fe8b9264c735c87a1e18cad82a26054acb
diff --git a/dev-ml/xdg/xdg-3.21.1.ebuild b/dev-ml/xdg/xdg-3.21.1.ebuild
new file mode 100644
index 000000000000..1b772311e4cc
--- /dev/null
+++ b/dev-ml/xdg/xdg-3.21.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="XDG Base Directory Specification"
+HOMEPAGE="https://github.com/ocaml/dune/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ocaml/dune.git"
+else
+	SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz
+		-> dune-${PV}.tar.gz"
+	S="${WORKDIR}/dune-${PV}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+# This is a part of dune, running tests would run them for dune, not this lib.
+RESTRICT="test"
+
+BDEPEND="
+	>=dev-ml/dune-3.21
+"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	dune-compile "${PN}"
+}
diff --git a/dev-ml/zed/Manifest b/dev-ml/zed/Manifest
index 610b3f9f49bf..3c26e6689cf7 100644
--- a/dev-ml/zed/Manifest
+++ b/dev-ml/zed/Manifest
@@ -1,2 +1 @@
-DIST zed-3.2.2.tar.gz 44565 BLAKE2B 28a9193e119f3462545e014ee7d02af16515abc3a09bbf05ce8f9588e5d01abd892731eed5d42d7967f91ccb4bd161084773661efa0dc0fea6872e36484b1732 SHA512 cb377ff972c8ef0501a8034c53f10d26a60c7735742945d930b26a8535de2fa36ecc9538518a26f2bed8d5e61a642408c1f0886c75945b50ad6a524ed8e1193b
 DIST zed-3.2.3.tar.gz 44745 BLAKE2B d013d1d3341f04ec7aa141abaa175d3db9e57e3966c5a8adef7efb416e7ec3ae0800f554b0d943fa55cd8bbb6bfe069e6b5d7d23d2a38bf7f1e55f7cafe52943 SHA512 637f75129550f6459417549d44bed16bdc62721d2e9e0c6bb5bfab30c5bc6478de15faece8c091b56f238375cb79a7bc176375400e543120bb31d7ea626b7c5b
diff --git a/dev-ml/zed/zed-3.2.2-r1.ebuild b/dev-ml/zed/zed-3.2.2-r1.ebuild
deleted file mode 100644
index 8e32cbb4d079..000000000000
--- a/dev-ml/zed/zed-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Abstract engine for text edition in OCaml"
-HOMEPAGE="https://github.com/ocaml-community/zed"
-SRC_URI="https://github.com/ocaml-community/zed/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-ml/dune-3
-	dev-ml/react:=
-	dev-ml/result:=
-	dev-ml/uchar:=
-	dev-ml/uucp:=
-	dev-ml/uuseg:=
-	dev-ml/uutf:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? (
-	dev-ml/alcotest
-)"
diff --git a/dev-ml/zed/zed-3.2.3.ebuild b/dev-ml/zed/zed-3.2.3.ebuild
index 8e32cbb4d079..fdfa9f51ccfd 100644
--- a/dev-ml/zed/zed-3.2.3.ebuild
+++ b/dev-ml/zed/zed-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,6 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-ml/dune-3
 	dev-ml/react:=
 	dev-ml/result:=
 	dev-ml/uchar:=