gentoo auto-resync : 24:07:2022 - 02:51:59

64 files changed, 48 insertions, 2212 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5fe35fef96f7..5586899e742e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index 1a7c15626826..c34f041244bf 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,7 +1,9 @@
 DIST alcotest-1.2.3.tar.gz 274177 BLAKE2B 1c38baf8932fe16ec3899cd1dd747099065cf93677271aad5ec33706ed7b6fd82dac84f9ed7518c56d178bf1f98a0b131d5e0f4745d47b07021f0fef932fde28 SHA512 0f3e2a5f56a17b6ddf5173d490b8a1aa2b23382bd0535d9d8be09fb8d4dd02dd1b92f9d00b957b11843d671262469e28b3be4f987538e373eb5e1f30c3a406a3
 DIST alcotest-1.4.0.tar.gz 279675 BLAKE2B 3cc50ab37a16948ceca9b5e6aa885fa50bbe0722c6132ed4991fb64c568253d9913287d1b9e5547f59a210d6803e2a83565f02950fb12cb91ed9f8e24d7864c1 SHA512 adb73c8b2be6f47cb406bbc49dba7dc86e990a60e2e68302592a24dcc24e11e76e2aa6fc2f003c1e4fdbb79744df6ab601daff9540cd7b0096ac9f9bff18098c
 DIST alcotest-1.5.0.tar.gz 288227 BLAKE2B 6af28f2516888273903bbb7750ba583778c54447157ece29ad8053323492dddfde9b901699be26c868f1f3835ad89d6f163176033f52ffdccc82fa2609e57b64 SHA512 9f496d1b14a78a9cba5dfde71cbda41d3090d2083bc9895dc9d9f54876b86630079219e678f13f6ffd382deb2a1a298b61b2a222fc65d25d4a242d8c280b4784
+DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdca06e9df03bf2ea5f0a6b7d5b8ae5a231dc92aca5ebc268e3fda93d448f6edd12333ad6c657ef5361921e31f838 SHA512 58079596334c193d00f22c5fc708952f01b40593eabb26cf9725d51250fc5b816d0bf40c70bab50e9b88a973008a9889f95601127731e8c1583e4ef17173fe9e
 EBUILD alcotest-1.2.3-r3.ebuild 669 BLAKE2B e79c8a3b452332fcd49d7a50644b8be752356e9301e634852191d521325c1af08787b50f79a38c38a37e7b4a0b23de3cd69716a1bad34a9f1320ceb164adc113 SHA512 dcfb8d3059e2754ddfd916838218c7769beaa468cc6c5c0f3b28d20052a9954632d9488ff34f634b64b2f192e103b7a890996b6768b6950800058190f1a868dc
 EBUILD alcotest-1.4.0.ebuild 669 BLAKE2B e79c8a3b452332fcd49d7a50644b8be752356e9301e634852191d521325c1af08787b50f79a38c38a37e7b4a0b23de3cd69716a1bad34a9f1320ceb164adc113 SHA512 dcfb8d3059e2754ddfd916838218c7769beaa468cc6c5c0f3b28d20052a9954632d9488ff34f634b64b2f192e103b7a890996b6768b6950800058190f1a868dc
 EBUILD alcotest-1.5.0-r1.ebuild 702 BLAKE2B 4654305316991c388a9842cc315e0b9815f4411b66ca042fc2742a0d35c989870b25ab0fa16871fe349deed76294e2548dc6aa5ca4d40390cfeb20d0a2ffee7e SHA512 669da814d6e766bb3801aa18a6ecf7394598523d77b8c1b97b60f14b4875af2b91a669dce1dd4a7afcd6d11c74b3276f01b1b5806729e2db360d109e57ef4c07
+EBUILD alcotest-1.6.0.ebuild 765 BLAKE2B 731ee9bec3ae3e2cadb8726951308181e01534b2adf6a4b9ca143c7482a3a839b6c21f9b1c55b14d01de017e4b06161db2016776e841d11da85a613f3ec97fb8 SHA512 be688ae8e6311253cde5e6f26fb10e9f277aaab07de1cb0e7042bde85d3113e7de3ea0b7032109602a25b94ef7b23acc4c77cf8897711857f7fc0a2ae2d0d9b8
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.6.0.ebuild b/dev-ml/alcotest/alcotest-1.6.0.ebuild
new file mode 100644
index 000000000000..f1dfe0368ff6
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-1.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/dune-2.8:=
+	dev-ml/astring:=
+	dev-ml/async_kernel:=
+	>=dev-ml/async_unix-0.15.0:=
+	dev-ml/base:=
+	dev-ml/cmdliner:=
+	>=dev-ml/core-0.15.0:=
+	>=dev-ml/core_unix-0.15.0:=
+	dev-ml/duration:=
+	>=dev-ml/fmt-0.8.9:=
+	dev-ml/mirage-clock:=
+	dev-ml/re:=
+	dev-ml/result:=
+	dev-ml/logs:=
+	dev-ml/uutf:=
+	dev-ml/uuidm:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 7d1a65111221..c64c31ea0858 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,11 +1,7 @@
-DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
-DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-EBUILD dune-configurator-2.8.2-r1.ebuild 3674 BLAKE2B a10101174b47a78f7d43b519a3f9c679195bf3018d9f5c10028193c1b336d7685dbfe165bbdd5808ee7f33afb6539355275bab1870b24fe79ffc1bc8e922959e SHA512 74c42ce3aeac5166b883c1d49e848e3bfc9aa4be55cec867aad5a13ff84072540cf3562c9738551667bb9679fca2952df25ce7712c7e3d50d70b4a50bf76c06d
 EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
-EBUILD dune-configurator-2.9.0.ebuild 4101 BLAKE2B 8bb4f675f20f90488fc5a1a0091bd7460d41750994e2d0a6f12d167ae28a58358c50aeb67b797330269531c410a3ece9e9578dc3cfd59fdec3abb34f95edf2e7 SHA512 6d3aae408b0a8f25af446f03bfdb0a49a6ff661a211aec5d85cdecf7bc2f5fb71feebe69f9422c78d8666af78d0e03d0e28fd33717d61a2972c9b6b74cd3a9d8
 EBUILD dune-configurator-2.9.1.ebuild 4097 BLAKE2B 00fd8af27ed27321fc506d177f4ac3f822783f30fc612bb97891192ca4cc046aed50da0a87878a5a7dfd8dee1ad24b68acada59a55ed7b733290222723e4c86a SHA512 dae9de72741c9f5e1e3c48e32727d4779e9ccc739df6c6d2fbfd3b526406eff78fa2cf42217d0b99ee0fae6109abee0cc71990619fa56ab5b5f8ae039bc29a4e
 EBUILD dune-configurator-2.9.3.ebuild 4108 BLAKE2B b8a4f5272c4233c2240c45cd9b91cd24ed090a05c8ab86c119c9451c4b145517db3fb32760cdf5610a578a2d8afd88702183fd9a9c81ac08cd99f0c245e1ea7b SHA512 03087f5418c27bc21d1785c943ba44356c0b90d565ef24a9734e300c0ff74c1b7ce4842fe5eb7321f503a443a80460fd3276630af5a7a68ca3161927dde96823
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
deleted file mode 100644
index 7e06d1ff65d3..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A composable build system for OCaml"
-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 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt?]
-	dev-ml/csexp:=[ocamlopt?]
-	dev-ml/result:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-private-libs
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		test/blackbox-tests/test-cases/coq/ml-lib.t
-		test/blackbox-tests/test-cases/coq/extract.t
-		test/blackbox-tests/test-cases/coq/compose-plugin.t
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
-
-src_configure() {
-	:
-}
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
deleted file mode 100644
index 9872ea859a4f..000000000000
--- a/dev-ml/dune-configurator/dune-configurator-2.9.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A composable build system for OCaml"
-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 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/dune-private-libs-${PV}:=[ocamlopt=]
-	dev-ml/csexp:=[ocamlopt?]
-	dev-ml/result:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-private-libs
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Strange failures about opam not being initialised
-		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
-		test/blackbox-tests/test-cases/merlin/symlinks.t
-		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
-		test/blackbox-tests/test-cases/merlin/per-module-pp.t
-		test/blackbox-tests/test-cases/merlin/server.t
-		test/blackbox-tests/test-cases/github1946.t
-		test/blackbox-tests/test-cases/github759.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		test/blackbox-tests/test-cases/coq/ml-lib.t
-		test/blackbox-tests/test-cases/coq/extract.t
-		test/blackbox-tests/test-cases/coq/compose-plugin.t
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
-
-src_configure() {
-	:
-}
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index d83fa7f4e519..8317e894d966 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,11 +1,7 @@
-DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
-DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-EBUILD dune-private-libs-2.8.2-r1.ebuild 3692 BLAKE2B 3caa65aff8a2dd76617da19bd8fce451e40edb14c2032c30e28146477f908818928bdf5b360812e040bb5ac549838eaddf8e1aad82eee1cf9778c905027ad8b7 SHA512 57756b54dd487210cb39c089aea6485e5fb2cf0be186b2569a170bcf17157f9722a705b10e6aaf17c3f78a38b9b58a885804fb5639150ba75729ab02f18aa53b
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
-EBUILD dune-private-libs-2.9.0.ebuild 4119 BLAKE2B 045bfdc56dc597cf9e44cf28bbbc2945caec36d4b6488522485f1bf21dc874bb7c8840a809f4b1fb1667b19d55960b876752a631e2f1ca391fdde32d64c6598c SHA512 e5188bb3e2f4041510dab4d185cdab9318cf5b900be90a42a219b0793343a976b14173acca68e9f2429643e0ff0b440a77251f3e2c0113975a7afc7066f9b629
 EBUILD dune-private-libs-2.9.1.ebuild 4115 BLAKE2B 6af9fcd40c24f75a11decb2f5d51250af5ab97b50449989910e3248cb3e4b4ef0196b1c9d2f0a9c2ac4b9ddf90f09b4179d763caf60ea7ac7fe6dc84140860f6 SHA512 5d4c3930f84b78f4ca45de2f220cf3dda10eb818decb7cc8a6fb0fb75988a763adfb036c8d8dc834254d733faad506f3be5662d6dcba581af4278205b296ee12
 EBUILD dune-private-libs-2.9.3.ebuild 4126 BLAKE2B 973f7b286d6dd062c716ef178b65f17c6fd0d2dbad3dfd025238a2ad3510509de5b77fa9d084ccf94f2d334460787fa917a48496000962d46ba63660af6e77d0 SHA512 54a424e4c581273613cfd198721687a9d70bda83dd63a4aa6bc86959ef4d3c44e3fd4138387ab4b67fdb7ac74c06a23956beaf3d8aaa8087fe9401c9d2313ade
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
deleted file mode 100644
index 60315eb2cadf..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A composable build system for OCaml"
-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 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-ml/dune-${PV}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-	dev-ml/findlib:=[ocamlopt?]
-	>=dev-lang/ocaml-4.09:=
-"
-RDEPEND="${DEPEND}"
-
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-configurator
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		test/blackbox-tests/test-cases/coq/ml-lib.t
-		test/blackbox-tests/test-cases/coq/extract.t
-		test/blackbox-tests/test-cases/coq/compose-plugin.t
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
-
-src_configure() {
-	:
-}
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
deleted file mode 100644
index ab2072885f70..000000000000
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A composable build system for OCaml"
-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 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	~dev-ml/dune-${PV}
-	test? (
-		dev-ml/core_bench
-		dev-ml/menhir
-		dev-ml/opam
-		dev-ml/ppx_expect
-	)
-"
-DEPEND="
-	dev-ml/csexp:=[ocamlopt?]
-	dev-ml/findlib:=[ocamlopt?]
-	>=dev-lang/ocaml-4.09:=
-"
-RDEPEND="${DEPEND}"
-
-# TODO for test deps:
-# Add cram?
-# Add dev-ml/js_of_ocaml once dev-ml/ocaml-base64 is ported to Dune
-# Add coq?
-
-src_prepare() {
-	default
-
-	# Keep this list in sync with dev-ml/dune-configurator
-	local bad_tests=(
-		# List of tests calling git, mercurial, etc
-		test/blackbox-tests/test-cases/dune-project-meta/main.t
-		test/blackbox-tests/test-cases/meta-template-version-bug.t
-		test/blackbox-tests/test-cases/subst/project-name-restriction.t
-		test/blackbox-tests/test-cases/subst/with-opam-file.t
-		test/blackbox-tests/test-cases/subst.t
-		test/blackbox-tests/test-cases/subst/unicode.t
-		test/blackbox-tests/test-cases/subst/from-project-file.t
-		test/blackbox-tests/test-cases/trace-file.t
-		otherlibs/build-info/test/run.t
-		test/expect-tests/vcs_tests.ml
-
-		# Strange failures, seemingly from newer versions of deps
-		test/blackbox-tests/test-cases/merlin/allow_approximate_merlin_warn.t
-		test/blackbox-tests/test-cases/merlin/merlin-tests.t
-		test/blackbox-tests/test-cases/merlin/github4125.t
-		test/blackbox-tests/test-cases/install-dry-run.t
-		test/blackbox-tests/test-cases/c-flags.t
-		test/blackbox-tests/test-cases/install-libdir.t
-		test/blackbox-tests/test-cases/dune-cache/trim.t
-
-		# Strange failures about opam not being initialised
-		test/blackbox-tests/test-cases/merlin/merlin-from-subdir.t
-		test/blackbox-tests/test-cases/merlin/symlinks.t
-		test/blackbox-tests/test-cases/merlin/src-dirs-of-deps.t
-		test/blackbox-tests/test-cases/merlin/per-module-pp.t
-		test/blackbox-tests/test-cases/merlin/server.t
-		test/blackbox-tests/test-cases/github1946.t
-		test/blackbox-tests/test-cases/github759.t
-
-		# Wants nodejs!
-		test/blackbox-tests/test-cases/jsoo/simple.t
-		test/blackbox-tests/test-cases/jsoo/inline-tests.t
-		test/blackbox-tests/test-cases/jsoo/github3622.t
-		# Wants js_of_ocaml (can't include yet b/c of ocaml-base64 porting)
-		test/blackbox-tests/test-cases/jsoo/explicit-js-mode-specified.t
-
-		# Wants coq which doesn't build for me right now
-		test/blackbox-tests/test-cases/coq/rec-module.t
-		test/blackbox-tests/test-cases/coq/compose-sub-theory.t
-		test/blackbox-tests/test-cases/coq/native-compose.t
-		test/blackbox-tests/test-cases/coq/base-unsound.t
-		test/blackbox-tests/test-cases/coq/base.t
-		test/blackbox-tests/test-cases/coq/native-single.t
-		test/blackbox-tests/test-cases/coq/compose-simple.t
-		test/blackbox-tests/test-cases/coq/ml-lib.t
-		test/blackbox-tests/test-cases/coq/extract.t
-		test/blackbox-tests/test-cases/coq/compose-plugin.t
-
-		# Unpackaged dependencies (a rabbit hole for now)
-		# utop -> lambda-term, zed
-		test/blackbox-tests/test-cases/utop/github3188.t
-		test/blackbox-tests/test-cases/utop/utop-simple.t
-		test/blackbox-tests/test-cases/utop/utop-default.t
-		test/blackbox-tests/test-cases/utop/utop-default-implementation.t
-		test/blackbox-tests/test-cases/utop/utop-ppx-rewriters.t
-		# ocamlformat
-		test/blackbox-tests/test-cases/formatting.t
-		# mdx
-		test/blackbox-tests/test-cases/mdx-stanza.t
-		# odoc
-		test/blackbox-tests/test-cases/odoc/odoc-simple.t
-		test/blackbox-tests/test-cases/odoc/odoc-package-mld-link.t
-		test/blackbox-tests/test-cases/odoc/multiple-private-libs.t
-		test/blackbox-tests/test-cases/odoc/odoc-unique-mlds.t
-		test/blackbox-tests/test-cases/odoc/github717-odoc-index.t
-		test/blackbox-tests/test-cases/odoc/warnings.t
-	)
-
-	rm -r ${bad_tests[@]} || die "Failed to remove broken/inappropriate tests"
-}
-
-src_configure() {
-	:
-}
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 1f708612fa78..e3fb8d961dec 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,18 +1,8 @@
 AUX 50dune-gentoo.el 203 BLAKE2B 0b99f29b2a5abe1ce28fb10db5a282b4fbc355dba94ed8692df6a4b8c0e0c4c21a1df71ed56fe676b9a6f2cfd9eedd11b1579aa440d39d74d753a922a9427c40 SHA512 2065beb91777c9bd4f637d1cdbbe3ea8c1f0a910faa3b1ebd35e8a351c3d489462c9887eeff38a3b9d1d424801f193a868f0a535aaaefc7bb0bfaa895e1fa4d6
-DIST dune-1.11.4.tar.gz 849090 BLAKE2B 4dace2d998dd00dd8fd51fef6bf0048fd7d0c7941794b4c775f8a1a6c8f694af52ebae2bee17fb531b3f4332fe49167422508a91efcbda61f5420ffee7e89750 SHA512 0afd7ba4d66ba742b6485546d6b7e07096f38f516c12c4fc506a151b6fc97805859d736fee3a0a5dcf8008af0e2a678f1fe7286f6d0a941c999f7d3d5b9a9ccb
-DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
-DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
-DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
-DIST dune-2.9.0.tar.gz 1385143 BLAKE2B c973e4b2c5780a3e4902c31c030b2560fe5be313338a5188edc9b7ff97b63968baba267966d095076bed4f1527a8b8b5a0f980e74f53476d70ec53f20dc661a6 SHA512 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24
 DIST dune-2.9.1.tar.gz 1385381 BLAKE2B 27224f803547d02f7110dcfc486ef41f9a4586f6f862ef7f8bbf05cc1f3f6dc8ea03fca99c01842f4226ea3d08f4127daa0e5811dd46cc00f1b96ad7eaafe43d SHA512 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77
 DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7cb5aa5d70ef1dc20a217b95a66149ca5f99f07f3a20450577d622e0cda149f656f06f5a42231b89667c1152 SHA512 df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494
-EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
-EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
-EBUILD dune-2.7.1.ebuild 790 BLAKE2B dc6da6e8c58e7780416dc4b6280f9faa0a08fb1880b94f32c0862b4bd0b5a71c418d72a921f43c78aec8cc7757de8611dfad568680c8d7916b8f9f4eda5fa74e SHA512 231135cfd8327e2e98fd41b8b50e3ff7950a6800968869ae3bb8d322e370b5f16127c543f7488a5d6fcc9d44f87f92e9cda9e5705f66db8d72d509f095caf914
-EBUILD dune-2.8.2.ebuild 919 BLAKE2B 6202e7bccf61f8213fc8c6c3c289065e963f7cf05842c877a613a2321bc1bcc133737c1e9c98d1cfd4223c9d5edf4429bb7c1ae316bc1d13b0908d3d64ddfecd SHA512 33a010fe148fcdd9bb3e992a8d9a5a3f74ea94c0138fc0acdbca80a16932fa10a5f11f503edaaf8deb0f0a1af50e136b57819cfb81f2e29eafc9651f99f9ad37
 EBUILD dune-2.8.4.ebuild 919 BLAKE2B 6202e7bccf61f8213fc8c6c3c289065e963f7cf05842c877a613a2321bc1bcc133737c1e9c98d1cfd4223c9d5edf4429bb7c1ae316bc1d13b0908d3d64ddfecd SHA512 33a010fe148fcdd9bb3e992a8d9a5a3f74ea94c0138fc0acdbca80a16932fa10a5f11f503edaaf8deb0f0a1af50e136b57819cfb81f2e29eafc9651f99f9ad37
-EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 EBUILD dune-2.9.1.ebuild 899 BLAKE2B b2c0ccba4c16e614eb4f4381955c5b615b5cbe2943e7e2c04863f00e85b580d91e56e1526af65c72e8388b3b2b6253883e9bbc1857785ed8ed4b103e8845f815 SHA512 69976a1641eca9a00b35efe8663f8a2e8073bef7b290a553730bbf180d43248e16fad5a92e3483ec9b0f19a5ce7a86659e80ac3b4e05ed76169ea4e8b4d480ca
 EBUILD dune-2.9.3-r2.ebuild 1262 BLAKE2B 8a84c4e99fe54755304cf6acf16db6e3cd0c668f314d65ee5cfeff5a47a45bbc8f5615901c2052ba771dd77d317f43f83262d9907fa3190eb98756fb7b5cc3a8 SHA512 9cd8726bc5ce93a8ed93d48aea9f7e59c65ec9c60bab9f575b70c9557b55de1284d42baa8d898178ee51fdc98eef4977a95062e3c1cf35e4e87f94ab2606832c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-1.11.4.ebuild b/dev-ml/dune/dune-1.11.4.ebuild
deleted file mode 100644
index f6d5ce200b8a..000000000000
--- a/dev-ml/dune/dune-1.11.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-
-DEPEND="dev-lang/ocaml"
-RDEPEND="${DEPEND}
-	!dev-ml/jbuilder"
-
-RESTRICT="test"
-
-src_configure() {
-	ocaml configure.ml --libdir "${EPREFIX}/usr/$(get_libdir)/ocaml" || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
deleted file mode 100644
index dc4c0613e50b..000000000000
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="test"
-
-DEPEND=">=dev-lang/ocaml-4.07:="
-RDEPEND="${DEPEND}
-	!dev-ml/jbuilder"
-
-RESTRICT="test"
-
-src_configure() {
-	ocaml configure.ml --libdir "${EPREFIX}/usr/$(get_libdir)/ocaml" || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
deleted file mode 100644
index 9d729d98b8a9..000000000000
--- a/dev-ml/dune/dune-2.7.1.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 multiprocessing
-
-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="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="test"
-
-DEPEND=">=dev-lang/ocaml-4.08:=
-	<dev-lang/ocaml-4.12"
-RDEPEND="${DEPEND}
-	!dev-ml/jbuilder"
-
-RESTRICT="test"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	ocaml bootstrap.ml || die
-	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
deleted file mode 100644
index 146db1958245..000000000000
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-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 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	<dev-lang/ocaml-4.13
-	!dev-ml/jbuilder
-"
-DEPEND="
-	${RDEPEND}
-	dev-ml/findlib
-	test? (
-		dev-ml/core_bench
-		dev-ml/ppx_bench
-		dev-ml/ppx_expect
-	)
-"
-
-QA_FLAGS_IGNORED=/usr/bin/dune
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	ocaml bootstrap.ml || die
-	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/dune/dune-2.9.0.ebuild b/dev-ml/dune/dune-2.9.0.ebuild
deleted file mode 100644
index 47084c42bd00..000000000000
--- a/dev-ml/dune/dune-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-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 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	!dev-ml/jbuilder
-"
-DEPEND="
-	${RDEPEND}
-	dev-ml/findlib
-	test? (
-		dev-ml/core_bench
-		dev-ml/ppx_bench
-		dev-ml/ppx_expect
-	)
-"
-
-QA_FLAGS_IGNORED=/usr/bin/dune
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	ocaml bootstrap.ml || die
-	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/expect_test_helpers_core/Manifest b/dev-ml/expect_test_helpers_core/Manifest
index b08f581b69cd..2793fc2edb5b 100644
--- a/dev-ml/expect_test_helpers_core/Manifest
+++ b/dev-ml/expect_test_helpers_core/Manifest
@@ -1,3 +1,3 @@
 DIST expect_test_helpers_core-0.15.0.tar.gz 19807 BLAKE2B aca6103a7a50d7cf666ff6acb7b5430a5b0667efe039d200bc9ed2e430b91c4ed9a75378ceb0142e5d8d419ca6b3be508dc75c8e7fb5ff23101ebc012c70a9c0 SHA512 c08bda03c3bbc5c7ee1e970b5ba03e319826b7dd550d073f69b373bfa429c489ae1fcd388a2629f3d81729a96aac5614b4b1bcadd4040a290ffaab55b26bb9d6
-EBUILD expect_test_helpers_core-0.15.0.ebuild 503 BLAKE2B eb80afa797beaacff41c6f6356d0b90e2db7e90d3537437548abd4f2b4ed5523bfa65afcec84fbb89b4cdbaa59c897514bcd6a12aa1a50d37a3dcc8c2496cbf5 SHA512 8d8af0322b6185376b4de834e0eb1f0410d54fc25572fa2560562d6c6faad569f357cd2640c611cb04d535ff29e7fc61882a3414ad188626284c3874c34c399e
+EBUILD expect_test_helpers_core-0.15.0-r1.ebuild 568 BLAKE2B 98303ca4a64a92823c676ab69cdceac02fd2eb7ce3642e7c3fa81fe5abd883f32f41de13366f2e1566adadd0f5ee572c358ddc7e093099d38f157b0f45d1125e SHA512 f05e98bd2376a908d9f910ea88ca40b35585f6a6248340ae82d3c491db046a0eaf756344885337ca6821f42e7bcb4a136a431291c532fdbf83f83f51f2bc3d4f
 MISC metadata.xml 333 BLAKE2B 050b0539a697bcb91bf635dd9a2fb6ee2daadd6e69a43ba4c0a70f84e5e76e083c6acb93a3628cd04415beebd5f78701e66932ad71111c39b3411a76c563cc65 SHA512 fdfb97d9c46e137d73de63c5ae1a998964ee51e9803352b88228b075c3d72b40d7baad760dc66efaf908cfca12a62ea2c697a6c52f0e1e6500715bc3244f5cb9
diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
index d31c5f3d9df4..e161e379ff4d 100644
--- a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0.ebuild
+++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit dune
 
 DESCRIPTION="Helpers for writing expectation tests"
@@ -15,7 +16,10 @@ KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 DEPEND="
+	dev-ml/base:${SLOT}
+	dev-ml/core:${SLOT}
 	dev-ml/ppx_jane:${SLOT}
+	dev-ml/stdio:${SLOT}
 	dev-ml/sexp_pretty:${SLOT}
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index c427423df441..614713b758d7 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,7 +1,5 @@
-DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
 DIST mtime-1.2.0.tbz 16272 BLAKE2B 317201f8d5e7a55636e58748ffd269db5e88aed012e8dd7ed269d1f128f8d21ed0e707679b030b9c822bac98c9b76033e8d2402171c4ee758d8c936fbeee7ee9 SHA512 0f0ed220cd0f899643930814010f8592e1f47b6dc6c4dce8eebfb17a81b0abed093a3dbf9c02490af99bf81ea640372f73b4ab88fd8ef0e0c7c66920692a8778
-DIST mtime-1.3.0.tbz 17308 BLAKE2B f943ccb5d4c9ae28ae4620d1dbe897434d4d828091c8d0f17060a0fa40dde7fdcb73c6f85f7dd6fac8099d9608d6246613e2fc954bedb3d5b05b26149bd24260 SHA512 5b998ef803020de4771525adaa448623d348fa079800e72ba2ba78ff2d76a7d89da6200fe8bbc435d1355ad2c571c029398150d618912e58b5765fcf2210a5d0
-EBUILD mtime-1.1.0.ebuild 718 BLAKE2B 2be384d73659fe626b5306df55b7544ab604c9359c1e63b12ef2bcee92614e9e9284f79357a47f33da9bd1d19ea594b0d0bd1946711671bd53b50bf476c1b85f SHA512 f8b26c028751b67abf9d8a1d786cb81aba9ef7dfdbd2dba5c76b587c0fa4ab8d99ab2d23f302e8633c0ee48ab2ad8ab686412ca2a732f9a1eebf38adba48e7f3
+DIST mtime-1.4.0.tbz 15909 BLAKE2B 3c49deaf72d3873c8447f4a6d8ce89d55f3df60df108132ec078d81702a6fb9d532266efdf5290fe396d57a84de2d1912b48ad92f84db6d573d977492407b95b SHA512 0492fa5f5187b909fe2b0550363c7dcb8cffef963d51072272ef3d876b51e1ddf8de4c4e221cffb0144658fccf6a0dc584a5c8094a4b2208156e43bad5b269d4
 EBUILD mtime-1.2.0.ebuild 718 BLAKE2B 2be384d73659fe626b5306df55b7544ab604c9359c1e63b12ef2bcee92614e9e9284f79357a47f33da9bd1d19ea594b0d0bd1946711671bd53b50bf476c1b85f SHA512 f8b26c028751b67abf9d8a1d786cb81aba9ef7dfdbd2dba5c76b587c0fa4ab8d99ab2d23f302e8633c0ee48ab2ad8ab686412ca2a732f9a1eebf38adba48e7f3
-EBUILD mtime-1.3.0.ebuild 730 BLAKE2B 3297042cd5c7f305afade5db16b680a58458bf4faaaa7a21fda20e7f985799d623d26b7c5eda2f6514132c71e00e5eddf7c7421d2cf0853928fdaed59f5b41ec SHA512 23ea2f2d9a81697fbe605a7ecac17e4a59de1c703ce0d7bfdafb0a11ed7c166389fd67effdd6fb506035cc7347c82bc1d2cc3897aace594cffcf8b0a30f49f2f
+EBUILD mtime-1.4.0.ebuild 695 BLAKE2B 68731ecfbe62d7ed6396cd4577f2174c6f5004697dfaedf5eafc94a88c712ef58b7b2e0d049cdee63c9379d9dd9b4eaec12f1e417cf0004c3f80d3bf643c066a SHA512 ee7b077467074e0d563c24156025f37cf9a2ea12024dc55d1d5c427292c2c6f742c0acdd4dc2ccdfa16c97ba55c75f6f0fec842140138ffc612fa328a3d381b6
 MISC metadata.xml 312 BLAKE2B aad4e2756300a7fdc494215d874c8a754ddee0f94fb24788b8b7ba17d0062f266790d8bc74954c7c21ed481782ed9ddb2b007284266f92f707078a7466f961dd SHA512 aabba72b993e6d70b4d1d1ef3eba7d8adb37ace4afc51c4f9a067f6176bd525716118d225518b00ddc28aa31150b4c558b64d1a43b3a3db2319e02f03afef338
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
deleted file mode 100644
index 70153205a2bd..000000000000
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit opam
-
-DESCRIPTION="OCaml module to access monotonic wall-clock time"
-HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
-SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt]"
-DEPEND="${RDEPEND}
-	dev-ml/topkg
-	dev-ml/ocamlbuild
-	dev-ml/findlib"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--with-js_of_ocaml false \
-		--tests $(usex test true false) \
-		|| die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
diff --git a/dev-ml/mtime/mtime-1.3.0.ebuild b/dev-ml/mtime/mtime-1.4.0.ebuild
index adbb8faab32b..c3bc91ca7fd8 100644
--- a/dev-ml/mtime/mtime-1.3.0.ebuild
+++ b/dev-ml/mtime/mtime-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit opam
+inherit edo opam
 
 DESCRIPTION="OCaml module to access monotonic wall-clock time"
 HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
@@ -22,12 +22,10 @@ DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
 src_compile() {
-	ocaml pkg/pkg.ml build \
-		--with-js_of_ocaml false \
-		--tests $(usex test true false) \
-		|| die
+	edo ocaml pkg/pkg.ml build \
+		--tests $(usex test true false)
 }
 
 src_test() {
-	ocaml pkg/pkg.ml test || die
+	edo ocaml pkg/pkg.ml test
 }
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index d29334b6eb9a..dc8feedb567a 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -1,16 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-client-2.0.10.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
-EBUILD opam-client-2.0.8-r1.ebuild 1026 BLAKE2B 0a42c8dc6f43666139de6c41f2e17d9ea60af9578d240af6eb5732a6cdf020a32231c10befb77ad86f9788afe798d534a8823789b22681bb71f4de547417b17e SHA512 d85a87f097ceaaad5254796d9547ee916faa277419504ff58d77076696588435cb0ac7610297d6dd76edf9c23fe3c6ec29bdb80cb83535051ed33cac273433d8
-EBUILD opam-client-2.0.8.ebuild 893 BLAKE2B 5cdb293edb19c6520ad72abdbba4406c73bd147271c1cc692de6710e62d31e6911c7e326cccadeabc99e899365e2b02fa25c44f6e08012f968f35e440ece1ca2 SHA512 c2eb4d2320bb6d8d4991588e0484168269ac4c4c6b447170d95ad8743fd83e117e5525482fea492b022eef0658bf673c28c3243e4a7a0fd3a723d55ebb5f8596
 EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 0a42c8dc6f43666139de6c41f2e17d9ea60af9578d240af6eb5732a6cdf020a32231c10befb77ad86f9788afe798d534a8823789b22681bb71f4de547417b17e SHA512 d85a87f097ceaaad5254796d9547ee916faa277419504ff58d77076696588435cb0ac7610297d6dd76edf9c23fe3c6ec29bdb80cb83535051ed33cac273433d8
-EBUILD opam-client-2.1.0.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
-EBUILD opam-client-2.1.1.ebuild 1017 BLAKE2B 5bdf29c53f616cd61f05ae492292b769e32410f3958801ff3999dda29a78e6a37d23c9295af22166fd6d75058bebb9756e17904b17e83b52b698c491a6fbd8ab SHA512 e4218a25b093bdd7ef05eb69365ec852ddde889734c322df39c53b9c84392539c90b97dad5efbc56dd637f12fe821d3b7a66bcbec5a7c356598936eef15f8fb7
 EBUILD opam-client-2.1.2.ebuild 1024 BLAKE2B 5f75e9afadb419dbf56d00cfc32cd4fded81a3c552703a7b4183f29801399e5de6119911629f48bd1c37fd9a901b79bf6057759412ad920d4c448a83973f2927 SHA512 e6a7607b55af49992a8d7039ac7c32f9949d02dc5377c887013fe09837eb5d2d791bd0b1557e7d9d4fe407976e521da3c87342ccf5bf5217008c6aff38eeecdc
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild b/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
deleted file mode 100644
index f9f4e4a70902..000000000000
--- a/dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	~dev-ml/opam-repository-${PV}:=
-	~dev-ml/opam-state-${PV}:=
-	~dev-ml/opam-solver-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/bubblewrap )"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
deleted file mode 100644
index bd82acdfd482..000000000000
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-lang/ocaml-4.12
-	dev-ml/cmdliner:=
-	~dev-ml/opam-repository-${PV}:=
-	~dev-ml/opam-state-${PV}:=
-	~dev-ml/opam-solver-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/bubblewrap )"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-client/opam-client-2.1.0.ebuild b/dev-ml/opam-client/opam-client-2.1.0.ebuild
deleted file mode 100644
index e27961dead03..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	~dev-ml/opam-repository-${PV}:=
-	~dev-ml/opam-state-${PV}:=
-	~dev-ml/opam-solver-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/bubblewrap )"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-client/opam-client-2.1.1.ebuild b/dev-ml/opam-client/opam-client-2.1.1.ebuild
deleted file mode 100644
index e27961dead03..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam client libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	~dev-ml/opam-repository-${PV}:=
-	~dev-ml/opam-state-${PV}:=
-	~dev-ml/opam-solver-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( sys-apps/bubblewrap )"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index 8a3900dbf442..ec222dddfac6 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -1,14 +1,8 @@
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-core-2.0.10.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
-EBUILD opam-core-2.0.8-r1.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
-EBUILD opam-core-2.1.0.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
-EBUILD opam-core-2.1.1.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.1.2.ebuild 1015 BLAKE2B 53557c7566a6c0424447f6262e13e85886a47abee646b8a09f817ab08bc29c4a756e977bd6310d37c4ca1f426fa801bbaaca9afe105d018ea08c047d94291270 SHA512 fa07ed1409e4bcba8ccf7e18a74f4667b36998ddc971fc2f409fcda9882111dce629729bf1b7cc7f26a5ae53c2603fa834b03bbfac73626af22de15f71c229fb
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
deleted file mode 100644
index 0628e243fadd..000000000000
--- a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	<=dev-ml/dune-2.9
-	dev-ml/cppo"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-core/opam-core-2.1.0.ebuild b/dev-ml/opam-core/opam-core-2.1.0.ebuild
deleted file mode 100644
index 200b36c8bd17..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-core/opam-core-2.1.1.ebuild b/dev-ml/opam-core/opam-core-2.1.1.ebuild
deleted file mode 100644
index 200b36c8bd17..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
index c4ffbacd6efd..00c89238a726 100644
--- a/dev-ml/opam-file-format/Manifest
+++ b/dev-ml/opam-file-format/Manifest
@@ -1,7 +1,3 @@
-DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
-DIST opam-file-format-2.1.2.tar.gz 32120 BLAKE2B 3756ae2e2ad8e60d9611f1879ee07179e5f98ce4bd9f0fa9759e723446aac60f811e282903a57803fdb1c742f7027fb3a4b0d018dee74762645f5f0ec28aaeda SHA512 24fcc8a89dd79fee4fb54cfcd3a9b392819eb8214c97f43e226d44f1bc98111effade15f21f1e13aa5d3555cb458cbe269ba78ee4a1470c554f479446012d7ee
 DIST opam-file-format-2.1.3.tar.gz 36255 BLAKE2B eabd343d1ebb5708e57a125cf6f15105e263d0cc0885717df58249313de77cf1063efa2fc0f9b92d67a83649f3bdd8fa65c13077ca4b3814182ec750701570a1 SHA512 90da53a2b19eb97c17ec71d3ac00969863ef3458f421189413b3ec2d96f8822da9fba51ef95f55064bbb17f1729104a1fe4fed1d61d5006568b53165f0c6931f
-EBUILD opam-file-format-2.1.0.ebuild 723 BLAKE2B 7036014f3073e7d6731863d047f76cb6b0a2fbfbf9a71ac7d881dfc9be4503076fef9171ddbab38b9ec8a39ba3f034364a4d3919579eab2ff9420e434340341f SHA512 2405c56286b3b09621276f4103786b37c3fe439213d7a8ecb4b26afcda3989d6709d7c9383a16fe2440dbe27253714c5c5fd71ce56c566f768fd602651e2e62f
-EBUILD opam-file-format-2.1.2.ebuild 573 BLAKE2B cc47ae890b2939028b499c3bcf56a3702df5121297a672fd17001d2edd840ca5e201f2d0078948b485a5fdf87beb7cad682c5971778fdd5a7da9256f812ad853 SHA512 396d025ff982a63eb87f17b7d74e2070b9cc4b9a0342319fd739b876fc9a1f631a503aefdf1457f8c3800d58328b8b32ff5f60fdfa1b98162f7677d9c630c9f1
 EBUILD opam-file-format-2.1.3.ebuild 580 BLAKE2B fdc8257f8280dbaf353a7b7314a61d1c15bcf5c64a34984bbde2314565e931726a0a1c64e621747d182b2f53eb6313b6eecc36028905deb510618820e22e8c97 SHA512 f8c4bc341f8b4c3bdc6a7eee599be5af7c78ece36e8a805f8ec818c913ffab6b3b868d1e097ba7a89166314a7210b9c670e207f948c9cabe7c10b664dfbc5f80
 MISC metadata.xml 425 BLAKE2B 25f90cb0096de48ad7397ad960e1b3ae342abeb784e62e9a878d960cb6300fef998a303d9db88a99aa435be856a25d2221dc4046ddf776f40a5c6bba29981770 SHA512 d6961adf7d8b4517b5e10a344c3a373d925c76cfca0d80c854ae00f40c812095f257c2eb55dd9ea5dcca327ecd3a2bba560f64cbc56d5b208ddda0b6fea4951f
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
deleted file mode 100644
index 4de09a6c7d4f..000000000000
--- a/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-rc}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Parser and printer for the opam file syntax"
-HOMEPAGE="https://github.com/ocaml/opam-file-format"
-SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake byte $(usex ocamlopt native "")
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(ocamlc -where)" install
-}
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
deleted file mode 100644
index 45c1d11db101..000000000000
--- a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-rc}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Parser and printer for the opam file syntax"
-HOMEPAGE="https://github.com/ocaml/opam-file-format"
-SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-ml/alcotest )"
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 63e963e70f94..cbd39626333c 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -1,17 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-format-2.0.10.ebuild 1070 BLAKE2B 776112648930bfe3aef94f0d9a21229797d0493a22ab8872cfc34767e7e50fc17445498c3f587d866eed41ebbbaa71a067bed56c854968bfa1c6bf588abedd96 SHA512 acd72a194f3183f5b0396b6324ce3a892f222ed3f282f8b38392eca2c6d3c63bda14e65ac9578b01432c1ed8279a8619bbbbc1f63ef4fc9446ca5b060718db50
-EBUILD opam-format-2.0.8-r2.ebuild 926 BLAKE2B 84c13fb859c0882561eadb98abc6dfbc451e7e02510cdb62596960c5296b18b5539b1597b2b960f2a4e024a8617a6b9c67f9c46743074cf623eab2cc64100d7c SHA512 3e7f2281bea894a447d78e6d8b7cd41bf6573434b1dfca31661a818a73eb987b7cdcc39b88163ff650a503db50511ba181b2ca2238fbaabde8dffa1acc38d1e1
-EBUILD opam-format-2.0.8-r3.ebuild 1065 BLAKE2B 55af5160782551247fb58afb43ef6408de421baa017e33fd4aec31a7bd959245c8b6da5d557901095d2a30acc92259de485c5d075c7be9252f3d2334e9c21296 SHA512 38c93e93fea82728fc34ddd3b4d38accc34630277ffdba99317c7a78d0df4d755b18fe9114dac161bcd384d59d9172113a48f99cadf3d779b98a60d129c47e11
 EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 55af5160782551247fb58afb43ef6408de421baa017e33fd4aec31a7bd959245c8b6da5d557901095d2a30acc92259de485c5d075c7be9252f3d2334e9c21296 SHA512 38c93e93fea82728fc34ddd3b4d38accc34630277ffdba99317c7a78d0df4d755b18fe9114dac161bcd384d59d9172113a48f99cadf3d779b98a60d129c47e11
-EBUILD opam-format-2.1.0.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
-EBUILD opam-format-2.1.1.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
 EBUILD opam-format-2.1.2-r1.ebuild 1225 BLAKE2B 57da4e35a8cb0e47240623853b140141690b9d3fc5c8c1d00bda28b6a92a6eaefe36cd1adf4cc3592b9f4d7f30fafeb3f7fa2ba097a087f7cacd8c07a521f419 SHA512 1c3ba301d6c7269f433289ceeb69b9d947deb64ed513536bbe4768381fc71a5a7f27206458bb8cd2bf5a42352331dc23c67848469e328f3d704b7e883afbf622
-EBUILD opam-format-2.1.2.ebuild 1216 BLAKE2B 0e755181807e1baf84eec4417116a966c337f8604ba97387c85685abdd1c228f2618f726e82f6270620fc3d04271b3a0ca12d86b3adbed53e83b738963f9f640 SHA512 229d65c3d644d0d91a9d61b87cee0191e71d474412ee7ab9b5864391a6fd8f5c3eb3bd8c9a75013535647cd7c6fa21e361ebc3af189c8a68dcad24e5e8e1603c
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
deleted file mode 100644
index 6906d1f9e78b..000000000000
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-lang/ocaml-4.12
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/dose3:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-	dev-ml/mccs
-)"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
deleted file mode 100644
index e9c7e673404f..000000000000
--- a/dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	>=dev-ml/dose3-6.0:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-	dev-ml/mccs
-)"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-format/opam-format-2.1.0.ebuild b/dev-ml/opam-format/opam-format-2.1.0.ebuild
deleted file mode 100644
index 4c2a08d6886d..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	>=dev-ml/dose3-6.0:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-	dev-ml/mccs
-)"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-	sed -i \
-		-e '/wrap-build-commands/d' \
-		-e '/wrap-install-commands/d' \
-		-e '/wrap-remove-commands/d' \
-		tests/reftests/opamroot-versions.test \
-		|| die
-}
diff --git a/dev-ml/opam-format/opam-format-2.1.1.ebuild b/dev-ml/opam-format/opam-format-2.1.1.ebuild
deleted file mode 100644
index 4c2a08d6886d..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	>=dev-ml/dose3-6.0:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-	dev-ml/mccs
-)"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-	sed -i \
-		-e '/wrap-build-commands/d' \
-		-e '/wrap-install-commands/d' \
-		-e '/wrap-remove-commands/d' \
-		tests/reftests/opamroot-versions.test \
-		|| die
-}
diff --git a/dev-ml/opam-format/opam-format-2.1.2.ebuild b/dev-ml/opam-format/opam-format-2.1.2.ebuild
deleted file mode 100644
index 4c2a08d6886d..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-inherit dune
-
-DESCRIPTION="Core libraries for opam"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	>=dev-ml/dose3-6.0:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-BDEPEND="test? (
-	sys-apps/bubblewrap
-	dev-ml/mccs
-)"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-	sed -i \
-		-e '/wrap-build-commands/d' \
-		-e '/wrap-install-commands/d' \
-		-e '/wrap-remove-commands/d' \
-		tests/reftests/opamroot-versions.test \
-		|| die
-}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index cc5c4780769e..06f045d37fc2 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,17 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322f718e6b590902add5ca162e449e40fa3c27cff7b042240441c031303b24cf6b1a100d7f7c3c0cc275d47e60c0bce1 SHA512 05c6bd7e08f131c910871867590a6eb95b488d943ebbb0f93212f2101f09f54dcffd5d6492c9e2edf0485e3ee681815c6353d43ef185bc934fc8afb84d02cf5f
-DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
-DIST opam-full-2.1.0.tar.gz 9136886 BLAKE2B 3d51159568b6e85834f70a3545fe37d82470d4253bf9db6fef32b4314fd0a82182737bba6be62a9dd04b6d8fb8d7468b2e23ac39fa475f467adfdb0ec8d52181 SHA512 2c4955e450cde7211dbab507cbdc5d6e67805353e384df525d77ebf5561d6a4de91f7e5691567b2dc61146fc29df6fa5dc8aa8562330a4746db3a52b7487811a
-DIST opam-full-2.1.1.tar.gz 9275192 BLAKE2B b5729bc938633073efdf979f8e160c42aee682fe311b613d4d82be7add64b42506d1b6c107f3770fd8de4dc9eed7076f7774a34482d1956b8bd6315f551aea6d SHA512 7876a015fc2a421f70f9e8fa35c7ce56397dde7b679f3aba73c2a38f4967afc410c707a00f0a107baf353efe8bb6d4eee0601a5e205dc05a0f9c3d2a0c4d44d8
 DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 EBUILD opam-installer-2.0.10-r1.ebuild 1199 BLAKE2B e082712e04eb382437e3ae6c776821812a33571d8fb364280e404424b9c8b110c85cddda236175a2df77ad85146560a7ace9214a720c8999fa4daf7823975757 SHA512 c00e68043415d74221a839580a53b43fa47fe33867f705df4084bfb8cc72262036064199a6bd7265a2ecc6672a3f107a5b73abce6f5b329e0858a40c8bc6e873
-EBUILD opam-installer-2.0.8-r1.ebuild 1030 BLAKE2B 58a573e6cabd9001efa24981141d561322f999c5c4942fe870a3b928c31233aeb6479a89915b787618eb7b87bf41c5ee7642bfb2abfeb9bd68ff59a46a090a55 SHA512 7135b391733c94d278e8df176f2fcbf9165533fcfe11c91f816f13ddd5698e5522218d684feae42ae9b2eb6befc6a99a933b1ab5dfec34bdf378103f51c98d07
-EBUILD opam-installer-2.0.8-r2.ebuild 1015 BLAKE2B b5be0a1d265bd99160997483dcee74fd0557a638f21a1c1e7d3d5a270739d5d5dcec8a09dc2ac96ad820ad8b3a7d61a890c70598eae89768677545fb9824e4cb SHA512 02c254156c176a322ea4005e1572e552cd56b75ce4b2c629ae861855dd0dab343f88490b02e6f9ffd43ec40b7a994da13bf641207553be8e161863cf75bcda51
-EBUILD opam-installer-2.0.8-r4.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
 EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
-EBUILD opam-installer-2.1.0-r1.ebuild 1031 BLAKE2B d8c1da56c2e4b4adf0a5160ea4a73d4fb87101e78edd2c5d119856cc42a5aeae89dfdc65cd1683d249b14bc04165a8b92036ec03ea4b442f7cbcb7698c2745b3 SHA512 abcb3330ba91a356e93871f3f1a3d3d4765dbced7cd0987ee22ca675a06cc4332931309d6c27ea35da62ba30e229904830dee890a1c92216132e06aadc0d172d
-EBUILD opam-installer-2.1.1-r1.ebuild 1031 BLAKE2B d8c1da56c2e4b4adf0a5160ea4a73d4fb87101e78edd2c5d119856cc42a5aeae89dfdc65cd1683d249b14bc04165a8b92036ec03ea4b442f7cbcb7698c2745b3 SHA512 abcb3330ba91a356e93871f3f1a3d3d4765dbced7cd0987ee22ca675a06cc4332931309d6c27ea35da62ba30e229904830dee890a1c92216132e06aadc0d172d
 EBUILD opam-installer-2.1.2-r1.ebuild 1038 BLAKE2B 63f726695b49d87862a4aee6bb91b294791c9ec7f9df0377789cdc30af2410ab0012d36b0f71bbdaaac2ea4383dc87799430ff615496a733b1f3cafea7ec7289 SHA512 ee0d0e933264ad38d88ac99b2f16c3caaf25849fb743baa0eba05a78923bb08cf47d23bd0a7ca28cb6a6b61718ebb71487d64b07bfd3631be058a142012220af
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
deleted file mode 100644
index ca1a04c87a15..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
-	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
-	emake lib-ext
-	#passing -jX to the dune build leads to errors
-	#see: https://github.com/ocaml/opam/issues/3585
-	emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
deleted file mode 100644
index 5b0c79226fb0..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
-	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
-	#passing -jX to the dune build leads to errors
-	#see: https://github.com/ocaml/opam/issues/3585
-	emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild
deleted file mode 100644
index eab5b13a534a..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}:=
-	>=dev-ml/dose3-6:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
-	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
-	#passing -jX to the dune build leads to errors
-	#see: https://github.com/ocaml/opam/issues/3585
-	emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild
deleted file mode 100644
index f8f6bf709969..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit dune
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}:=
-	>=dev-ml/dose3-6:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild
deleted file mode 100644
index f8f6bf709969..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-OPAM_SKIP_VALIDATION=yes
-inherit dune
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}:=
-	>=dev-ml/dose3-6:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 67b4362a0a6c..892cfcc121eb 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -1,16 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-repository-2.0.10.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
-EBUILD opam-repository-2.0.8-r1.ebuild 916 BLAKE2B 17608649a756ac8f0bb0503eab8f612e4465f4cee3d2b26a4edf65d7e5d521931bbc43970944e4ee00c98d526fea360bc35438bc317924fff4cdd66b82cb7e3c SHA512 a4f78eacafa63f350a16b00bd4fcf5b4ba5318541e01f75400c10c262bc6fcd1e4df3156ed2da602142a5230799f8f852b7710f5fd25f734f89e158f6157d163
-EBUILD opam-repository-2.0.8.ebuild 777 BLAKE2B 00f313509166d63f116f8245ef678a0871ff6381ff76040fdc5fc9b090b82929ea06cf132144bb5fc4e287bf22c2d0106b6f99a73565e110696bd0d689927fcc SHA512 0aaf0008c472cfb9069ac93b352d4c82cef764fe4eec8fa8ec508e7012cfc1bbe36fe09ef8243a34ca9fdb4677dd1ec9ada561d80a7c4c820c918bf8d8d6c0d6
 EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B 17608649a756ac8f0bb0503eab8f612e4465f4cee3d2b26a4edf65d7e5d521931bbc43970944e4ee00c98d526fea360bc35438bc317924fff4cdd66b82cb7e3c SHA512 a4f78eacafa63f350a16b00bd4fcf5b4ba5318541e01f75400c10c262bc6fcd1e4df3156ed2da602142a5230799f8f852b7710f5fd25f734f89e158f6157d163
-EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
-EBUILD opam-repository-2.1.1.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 EBUILD opam-repository-2.1.2.ebuild 914 BLAKE2B 5b5af3cd61eddff7c8d8ff73e0715dc4dcbce581ccce6dca794322eb627a6b29dc1d3c8bbdd449d8b2489ce2d00c960418119c75f079332fccb09f4b8a97e63e SHA512 b27ec5e99b3cc23b377ec9b6f079f56e5b77f31d45c4ac4fef1ee9b4e928e04e4779efd3460bcb78056f1c408228dcb67915e9f45bda67619dd2a5e37363acfa
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
deleted file mode 100644
index 588a5744eb82..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.0.8-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 dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/re:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
deleted file mode 100644
index d6ce93bdc6b3..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.0.8.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 dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	<dev-lang/ocaml-4.12
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/re:=
-	dev-ml/dose3:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-repository/opam-repository-2.1.0.ebuild b/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
deleted file mode 100644
index b7f297cca04b..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/re:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-repository/opam-repository-2.1.1.ebuild b/dev-ml/opam-repository/opam-repository-2.1.1.ebuild
deleted file mode 100644
index b7f297cca04b..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam repository libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/re:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/opam-file-format:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 30bb3f9ed462..1b67f9eb4ca7 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,16 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-solver-2.0.10.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
-EBUILD opam-solver-2.0.8-r1.ebuild 986 BLAKE2B 57c598370564e05ec39ba314a2f8254e7d884fde07460c9e00053424ae8e20096e1c802757463b0c9453945fc26fa783647ad2f67d5b68a48a1c83912f382a33 SHA512 da509b77f479f4eb06364e0408595eb4555f1aaa5519ef72d0fcf656493a725cbb683a4eb4e8777ccd88cc138521e2b03e87b17aca678a8746ce6dbcfd5ffff6
-EBUILD opam-solver-2.0.8.ebuild 825 BLAKE2B 3a385173a2383ee1acd5d80b082a729b66c1ee9bf3729b310e566091c6ce22320cc3da744e4c79a941ae9666ad7b99513e6145ded17f39df4982519f4bb8717e SHA512 1a533618fe0ff8b2aa187c1ffd82544483b531a46b92d58f6616c2c41049b6f059300f80501a3dee0fa2077a7b1509b0fabaf7ed057d5aaba32d7b749e325c10
 EBUILD opam-solver-2.0.9.ebuild 986 BLAKE2B 57c598370564e05ec39ba314a2f8254e7d884fde07460c9e00053424ae8e20096e1c802757463b0c9453945fc26fa783647ad2f67d5b68a48a1c83912f382a33 SHA512 da509b77f479f4eb06364e0408595eb4555f1aaa5519ef72d0fcf656493a725cbb683a4eb4e8777ccd88cc138521e2b03e87b17aca678a8746ce6dbcfd5ffff6
-EBUILD opam-solver-2.1.0.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
-EBUILD opam-solver-2.1.1.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 EBUILD opam-solver-2.1.2.ebuild 984 BLAKE2B b57b0f96f7268b94d21f1a56558d03dfde1669fbe5f8519a0c4e89d2dd75d9a937c3ad4c1875714d0cad1fbfb06fde0e24fd3f13acfe776f84820b461b6a75a3 SHA512 5905a926918e00e84b9bdc86d51ce462799a5961760ed28552b887bd6c1e05f6c6b038a513574106146bf7607d55ae4f846670de7fc32326c83a7ba1a83b1f4e
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
deleted file mode 100644
index 5cd0e4230cb6..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
deleted file mode 100644
index df51e641a02f..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.0.8.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 dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	dev-ml/dose3:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.1.0.ebuild b/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
deleted file mode 100644
index 3ee659981fd5..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.1.1.ebuild b/dev-ml/opam-solver/opam-solver-2.1.1.ebuild
deleted file mode 100644
index 3ee659981fd5..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index 0706d5c1fec0..bb85ff13c7b0 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -1,16 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-state-2.0.10.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
-EBUILD opam-state-2.0.8-r1.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
-EBUILD opam-state-2.0.8.ebuild 760 BLAKE2B 0f9d0e13a48e484d8e8ee1994aab84f4191ee892d9b0e71eeeb77beeadfb5f9e18064b356c3371e04001ed5bd124c7a33db9c93d07d33bcb84d6ac8244e3ec34 SHA512 7d2a79e3d80fb874dae8abafd58ca81e5d6a68a133fd31a98fa9df9c34a002545ea9c6b780a5ecfe60cfcf4209f26a1445d0cc585077f1e1f801ae7e6ba376a0
 EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
-EBUILD opam-state-2.1.0.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
-EBUILD opam-state-2.1.1.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 EBUILD opam-state-2.1.2.ebuild 891 BLAKE2B 7fcd1e5abfb8dbf3d60f2f0b555c7c97a170bc6a879832fea7014aaa14919d829b7f1f72427f1987b140ec585366fe81aef338d132fa009a04dda8f40699c52b SHA512 d0445bf69ea9cc977621b44142269a608bb92e4b9a175475769e4d9f1322d6aa777238c39605f2609042f0cd170fa4e799c5dbf52f62cf25dcb631eab4384919
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild b/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
deleted file mode 100644
index 7ae602accc10..000000000000
--- a/dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
deleted file mode 100644
index 57207da55c17..000000000000
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	<dev-lang/ocaml-4.12
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-state/opam-state-2.1.0.ebuild b/dev-ml/opam-state/opam-state-2.1.0.ebuild
deleted file mode 100644
index 6c2a6cf8e81f..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-state/opam-state-2.1.1.ebuild b/dev-ml/opam-state/opam-state-2.1.1.ebuild
deleted file mode 100644
index 6c2a6cf8e81f..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="opam state libraries"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	~dev-ml/opam-repository-${PV}:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index b61e3ec556c2..bd76fdea966d 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,16 +1,9 @@
 AUX debian-Port-to-Dose3-6.0.1.patch 5223 BLAKE2B 8fada8b358cfae3aab9f6b8f0554894f55081197760a08b544229fdcc9d74434c1408cf72a8bb1d4280d11ef94d593ebb54a8f656617d99191d3576d02556793 SHA512 969c79a0552e0ea2388f732ca266d07b4c2a5a6945bd75daa2a435340ffbd8d87d2ada39dbab9cb364b2ad918f60600a59cf1fc06290a3dcbb68568c52fc9c7d
 DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
-DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d584039fe2f644fa1c3e99d175cc7047f32bda53599af4fb177d844970883125cebca823024d1bc43a34857f20c5 SHA512 c0060e609c49a12dc8f64accef990aa593db818b72df3984fb9b4b22d8678b46c515916c84134a62dab614c716b61788eadc954d295f32c1f27d38aec22b3edf
-DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 EBUILD opam-2.0.10.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
-EBUILD opam-2.0.8-r1.ebuild 819 BLAKE2B d3f067f6fb2a22ac81faa5f78f710610db5cfbb4433a190b0fad2602f391885ece538c2a2904921846d811c6142a2bc0078277d8eaaa41f482b3ee3eb75b9e35 SHA512 4039d011b6ae096d44bd1ea2ef06d4ddd53d1ce54f165e8ae9a201bb9e5770569dda019abe9c4092eafb3a8b87fb207593fbcb95658377a9410e308949c174a1
-EBUILD opam-2.0.8-r2.ebuild 958 BLAKE2B 7d9d50ffff8e19afe85f512dc0d4560087e9cbd214a0cfc4c4134d707d535dca10beecd0e1a9c3b3afe36368c6578977d3bfcae8b4a80c25c94ef06ab5ab2572 SHA512 42cf978593c8b37ad847b03e70d775d9582e14f86f0fd7cc65192cdd2eccb3b92740bc97b9da2db5d786c8e9dbaa818eac33f7ebc19f1afb4beb9273da4694fa
 EBUILD opam-2.0.9.ebuild 958 BLAKE2B 7d9d50ffff8e19afe85f512dc0d4560087e9cbd214a0cfc4c4134d707d535dca10beecd0e1a9c3b3afe36368c6578977d3bfcae8b4a80c25c94ef06ab5ab2572 SHA512 42cf978593c8b37ad847b03e70d775d9582e14f86f0fd7cc65192cdd2eccb3b92740bc97b9da2db5d786c8e9dbaa818eac33f7ebc19f1afb4beb9273da4694fa
-EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
-EBUILD opam-2.1.1.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 EBUILD opam-2.1.2.ebuild 989 BLAKE2B aca161fc7c1db43f350ee05fd0ce98636607a44b24bfeeeb0f482146e5069c9de92b0b4598887b94311f2f51ca84487c61677f3e8460b7a7b06b33cbe2b187da SHA512 5ce64d32ea049d1c81a0ffa75e5606509c4e742278db8f6dd98dcf12082d15b7a262b64e11192c9d8646897d9d0085864efeb902b107643cb79888501d86de50
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
deleted file mode 100644
index 33df680f688c..000000000000
--- a/dev-ml/opam/opam-2.0.8-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 dune
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	<dev-lang/ocaml-4.12
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	dev-ml/dose3:=
-	dev-ml/extlib:=
-	~dev-ml/opam-client-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam/opam-2.0.8-r2.ebuild b/dev-ml/opam/opam-2.0.8-r2.ebuild
deleted file mode 100644
index 8f762a4712ef..000000000000
--- a/dev-ml/opam/opam-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/extlib:=
-	~dev-ml/opam-client-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:="
-DEPEND="${RDEPEND}"
-
-# Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
-PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
-
-src_prepare() {
-	default
-
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam/opam-2.1.0.ebuild b/dev-ml/opam/opam-2.1.0.ebuild
deleted file mode 100644
index c123071f54ab..000000000000
--- a/dev-ml/opam/opam-2.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/extlib:=
-	~dev-ml/opam-client-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam/opam-2.1.1.ebuild b/dev-ml/opam/opam-2.1.1.ebuild
deleted file mode 100644
index c123071f54ab..000000000000
--- a/dev-ml/opam/opam-2.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="A source-based package manager for OCaml"
-HOMEPAGE="http://opam.ocaml.org/"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
-S="${WORKDIR}/opam-${PV/_/-}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/cmdliner:=
-	dev-ml/cudf:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/extlib:=
-	~dev-ml/opam-client-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
-src_prepare() {
-	default
-
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}