gentoo auto-resync : 18:07:2024 - 12:29:01

20 files changed, 29 insertions, 293 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5b4715c1fa7d..423f8043d037 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index a337ba904963..97335c17fdd6 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -1,6 +1,6 @@
 AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5
 DIST merlin-4.12-414.tbz 1991877 BLAKE2B d68a45efb29d7ed2dd8d2e377a7778fad5500064206e5ae27914a0be9f208f919f44f73f14be283aca653adf56462a782c4f5f895282e078478e60f13e9c09f1 SHA512 3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29
 DIST merlin-4.13-414.tbz 1993752 BLAKE2B 8b5704252f771ddac843340bf2aa24f62a2b490f6bb03c46a1daa2560fae72226b92fb5a9720b18c82f476571e7e6ffc7c30e695c8a0e1a3de6bd65ee58461e1 SHA512 cf7e292a515122756bd614eedbf11cc09108e6afab77cd5805428207b3ca5a98494ee43ad59fcfb667b48fe0874f0a8359882b3c14ee270769f99c41e176d455
-EBUILD merlin-4.12.ebuild 2155 BLAKE2B 4bcfa73e369ba022deb9537855cf5f5834bc193d4c79518b138ea2edfa0212a5a0330fbee37c95e10f4ebb655730add170c9f9c22d911400fdee44b5f3cfe731 SHA512 95275341c9fba0ed8bfd944b58995e2026102bf8a26dfa291680e1c1bbaf521d60070e201741e1bc1ff630b17cdf3338111aa08aee3fe930c3d4a7f3fe007687
-EBUILD merlin-4.13-r2.ebuild 2288 BLAKE2B b4c9d4da9fd0aa280447ba6c7f92bae30999faa0bce6239cc5e6b8563bce42713e3bc26a98dd5b8223afcaa1fe2e7e9c41e582f1468fd24f80d93c16e82d5d74 SHA512 0647a136c4a980e309b391087138845e3d3745ad4a54f64501f5d9744e8b74e9fe9fa05bf2dafa67a33cfedad4f2c6392f0a6e092cbee3ffc2a94be6daa4aee9
+EBUILD merlin-4.12-r1.ebuild 2174 BLAKE2B ee448ce796df926d0c7098fe76c8a13cc03ad8787f01fac289d0754bd4bf7c8f70932a2001ef1930e1eaf8ce4fa27a9a57901609403487f3d99d916f87d21bd5 SHA512 2dfae34c5a8557c9dee9dea6f0ea62a471d3b883fb0fb6713f01a398abaa9dfcf23259a9949f7df53e1da38d3dd98999f1f4ec2c4ee6847923b2e4284c821ce4
+EBUILD merlin-4.13-r3.ebuild 2304 BLAKE2B 3b1e908f6c7fc2b84c086ac6ee7cef4e9aa64edc89be3ae3acb43d7cbebf690cc59d91a0726522da57c1bbfa5c848d5499b8aaccd2ba2f0b2729c564fdda0274 SHA512 9f7dd36ec5c2b71c7e43eeee54184b0720165070b11b475e312d536b2cc95f295b1944b13bc63b9f96bf0806ffe1caf8cf0096384944024c6973290d49ad647a
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.12.ebuild b/dev-ml/merlin/merlin-4.12-r1.ebuild
index 3e4435149b42..fdaafaef2c57 100644
--- a/dev-ml/merlin/merlin-4.12.ebuild
+++ b/dev-ml/merlin/merlin-4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,10 @@ DEPEND="${RDEPEND}"
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
-	test? ( app-misc/jq )
+	dev-ml/findlib
+	test? (
+		app-misc/jq
+	)
 "
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-ml/merlin/merlin-4.13-r2.ebuild b/dev-ml/merlin/merlin-4.13-r3.ebuild
index a46713572004..18c16155ded7 100644
--- a/dev-ml/merlin/merlin-4.13-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.13-r3.ebuild
@@ -41,6 +41,7 @@ DEPEND="
 # https://github.com/ocaml/merlin/issues/1500
 BDEPEND="
 	!!<dev-ml/seq-0.3
+	dev-ml/findlib
 	test? (
 		app-misc/jq
 	)
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index 5342169dcc7c..71fbd9be2a7a 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-client-2.0.10.ebuild 954 BLAKE2B f62db0baf48eec429f611d67064aecbadf22fa5cb359c3e53ec46dc43c07b2a91cc33115c063c6d5303ef203c9640e6dc757dd35515f336d06ff7ede0d218934 SHA512 091d8bc3488071479bb846adfd828778af68ca4a53e755380bab6e9a5160ae0f057171d0eff4b2ee7f19ded494d7038c88c64856b295f186f6ffe993e2e535ad
 EBUILD opam-client-2.0.9.ebuild 1026 BLAKE2B 0a42c8dc6f43666139de6c41f2e17d9ea60af9578d240af6eb5732a6cdf020a32231c10befb77ad86f9788afe798d534a8823789b22681bb71f4de547417b17e SHA512 d85a87f097ceaaad5254796d9547ee916faa277419504ff58d77076696588435cb0ac7610297d6dd76edf9c23fe3c6ec29bdb80cb83535051ed33cac273433d8
 EBUILD opam-client-2.1.2.ebuild 1019 BLAKE2B 12b0b6f8cdfd3a0d083c64e0d65212229e342305c4cf202c7c8117dc0106ec44d4c76b39a1672e7d7cfa66437689e96ece2b8aeabbb314b5336ac5ac7446ab16 SHA512 79292ade60ec2985ec1cbcc3e788b3018a280ff4a30da096816da5170d6b0909c09554a8ffe46d3a176f0d26129af3aaa7a5190f0270d55717ef1508e39bd0ec
 EBUILD opam-client-2.1.3.ebuild 1034 BLAKE2B fa8367adf57efa4bda6b1c3f114f1d2e2bf3556ccc393af8df86acf2edeaa1068b70db81872b35f183831d5486e3cfd146d2c93fc7073e6502f3dbf1b1c34060 SHA512 dba4b755f0c0ed80df5ac7174fc0b5ea4a269e8e724a1d5cfe4a0c17f8d47910d0072f328975c80260547142dae57c72556ab95d6cd4c4aeea3cf17303a16c3e
-EBUILD opam-client-2.1.5.ebuild 999 BLAKE2B 2d75f2a9eb07abf900b10e65a6b8f80242e921a30f07d259f9d11262db992f19eb8a85369589cb3d831073bb4e01d5a05fdd5bc141c7d5ae298cd82af3e6abc7 SHA512 faf1919d6b9354b2e08c1991785812b5e4c7a4629c7a23fed37e06efd1c5a77fe094ce3e6497a80d23a447a4e6bf13880eefd3f2f8a965eae16cb355c2758e79
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-client/opam-client-2.1.5.ebuild b/dev-ml/opam-client/opam-client-2.1.5.ebuild
deleted file mode 100644
index 19e091b78f8d..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-RDEPEND="
-	dev-ml/cmdliner:=[ocamlopt?]
-	~dev-ml/opam-repository-${PV}:=[ocamlopt?]
-	~dev-ml/opam-state-${PV}:=[ocamlopt?]
-	~dev-ml/opam-solver-${PV}:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-"
-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
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index f241250ece51..8e3a29bfec5b 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -3,10 +3,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-core-2.0.10.ebuild 862 BLAKE2B 4d866734fdc9884598ba98058d6ee117aa7b3c21a5ef73172f633e7270851ac8474cbf374d6d124b4fd73c8b79cc7e2dfa3573e055315a72f8ce69fffb466d1c SHA512 86266d41d881e6f7315477d12013dac00197586c6e9f10d7e575ea3bad319134baeeafe0beb03f226d06ba81bbf49942df85935e6aae9de78474174af54fb70e
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.1.2.ebuild 1010 BLAKE2B 4164aaeb2c582578120abab3a2e4891715403766932740b72a2aff08ef6627ec65a5357bf44f960e49efb6a9e8635bfa1de6aa514655d97a213b1c3efe9d65da SHA512 b87643fc55b9201c69b2d0f858aa7124ee314828b7e41a0da8970d8f7f131b084cc5ec05f231001297706d21dbdf7bf75b9a0e1d51fd469e646bb72ec72ad699
 EBUILD opam-core-2.1.3.ebuild 1130 BLAKE2B 4e438b3f72bddd0cf5a0f2ef9a1f53f641f7fd3dec64d66e48e03780c95372b8c4d913be2858a99e01bee43221720ab92d6797c45f8a55835a9ccef051a6c96b SHA512 483b43ee157d3ca74077fa0e5ebeb5f3613a14f027c025d7bf0d2045386c066d2049e19167c3165909fb05bc54741d453796afe378b074221c9bae31e8d768fe
-EBUILD opam-core-2.1.5.ebuild 990 BLAKE2B ec239ec9087ff35ee8077b6941387d5b912f584d1577f9c19fb0fee6a75e9ac37c59e0bd0569cb7d9a0fd3dc042d57b4efc85cb3012c0ae78a0addcf49b4d0c2 SHA512 2efeadb7e2d717a362f3fba0f9a5b4ffd263e96efff4881be5dce700d59106e475e428365143cec3c9638373de4c6de63a40678bd8e48d8174992b2f20e7fc1c
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-core/opam-core-2.1.5.ebuild b/dev-ml/opam-core/opam-core-2.1.5.ebuild
deleted file mode 100644
index 0d41c1a9eb72..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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 ~riscv ~x86"
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	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
-
-	# HACK: Probably bug in Makefile? Magic. See: https://bugs.gentoo.org/933845
-	touch opam-installer.install || die
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 830723964e97..b94e85d6e938 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-format-2.0.10.ebuild 1065 BLAKE2B 23e1dafc040ea96781cb6d17e5f84f5ae7a31cb559f4bedd9dafd6672cdcf8cbb37df2af5a43111ac242c5632153794f683f7a07e8b38abf7c805ffe109e3822 SHA512 a24da24c30e80665cf7804fe04f78ee38f8683a96494c51090e2f85823941943ef8ce5c1075118390f6fd07827f582dfca8c7b3e9c95aa9194dc5dc3bc1dfc99
 EBUILD opam-format-2.0.9.ebuild 1065 BLAKE2B 55af5160782551247fb58afb43ef6408de421baa017e33fd4aec31a7bd959245c8b6da5d557901095d2a30acc92259de485c5d075c7be9252f3d2334e9c21296 SHA512 38c93e93fea82728fc34ddd3b4d38accc34630277ffdba99317c7a78d0df4d755b18fe9114dac161bcd384d59d9172113a48f99cadf3d779b98a60d129c47e11
 EBUILD opam-format-2.1.2-r1.ebuild 1220 BLAKE2B 69460ea9e2d477f0a45455c7a01ff6fcd89afc12ccbfe7d3bdaa6b6030e313d296dce01f20a0869d96ce46a4ece03af70abccca6fa7285f57f9d88cf1151cf1e SHA512 ac4d3e0030fa005cab8d5659ed3d605b516a97001ad8b4b5f742d85791cc1d676f3e153f91bbdb1f1bcbac0da8093048d1a48035ba8864f7e59b69f158999ca4
 EBUILD opam-format-2.1.3.ebuild 1234 BLAKE2B 8583ca15bdd549166bfd0fac5fa415e6c7220e9aea21f31e5bff36ff35fb7236d565c4fdde1825818d37e9b874349050283ebd1c9790ec58a2f050ede5032078 SHA512 486d0229d01bc1c6fe23986adf2852d4bc6b145543b4eac3201fe49fb3cb7dc8c80b31c61b059a92ae81f54beff658a9db4c498bbe84275bf30cf56d70ade3ce
-EBUILD opam-format-2.1.5.ebuild 1171 BLAKE2B 3fa8fe9aa1ca5876e444932bef8ecbe6261a5d1a41617eaa7b2f0a600c240e84ab6d6ef25c8dc5cd9a9eb38d289d4a44461ce4beddef9f4637ef913ba2734b7b SHA512 314c41f96c9f4f00e2823801232cde958860d54345ce74e17564bafb6291a558ab9991ed92b3d13520219ccbd61244fe1f4fd72026434f51f9a2189efe627918
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-format/opam-format-2.1.5.ebuild b/dev-ml/opam-format/opam-format-2.1.5.ebuild
deleted file mode 100644
index b64a2e35da75..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" #sandbox not working
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/mccs:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-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
-	sed -i \
-		-e '/wrap-build-commands/d' \
-		-e '/wrap-install-commands/d' \
-		-e '/wrap-remove-commands/d' \
-		tests/reftests/opamroot-versions.test \
-		|| die
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index c22169087dcd..43c3a31efdf4 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -4,10 +4,10 @@ DIST opam-full-2.0.10.tar.gz 8173617 BLAKE2B 6bf7a52835512b3de5bcf0de24f5ba3a322
 DIST opam-full-2.0.9.tar.gz 8029605 BLAKE2B c2ae06bdbbdbe9db270ec0027ec8d13a228f0af2ae5089476fa3a698d27e1f47abf2e3a15ecc9ca610717ba6b979b4ca76cce56c52f6592ae789b88fb5e5b68d SHA512 9f44d878a2599a876f5e5b9b7457b6f446a5e59156ed3d449dcc29e40c44df8b69da619eabdf030e45526fba4bd9a00c65dec2c36552d2e03788596b0aceee85
 DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950e2944f6f501545bdccf6d989de2da90106938efb6a12c1b9454ecefed5be9906d65a15a4d0244302ad7ccff170db SHA512 fe12aaa27168435a978c472926d40697af0a7619a529c4bfacd0b71469dfcd534f43164bc74f60f740a735d38a869ae5e87e2414119f4f3fc1826315e8a075cd
 DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
-DIST opam-full-2.1.5.tar.gz 10801367 BLAKE2B 5e6b1140e279931dfb61f68d0c4888cb14d05ff610e2b151115efe6b6420d74e7079894b6f4360f377b155008530ba4ace9708bc9d1e1d8c13950c0a5be4de11 SHA512 e4e33fcee0a9f922f8b43c6b095554a946559a2c50341326d21cca0f24fc7105c0de01db204b408240b12b267c9929435e2c511adf140618c91873f10444ae90
+DIST opam-full-2.1.6.tar.gz 11704198 BLAKE2B 20e74551760cadf1d911e72c34502e1e7e62003f8ebc83f3b9cb46c712e13fb5f85f41421cc74b051c2e348e0c0a17f4ea34bf655f7ec48cfcdab1e0d8a57a11 SHA512 2bb24db05dc39d6e8294c10b5a6bb2dd8f675a4d56e1dc9a2e9bc576f54d14a1709005219c25586df9382897ab7ba5ea0636765410f01c06958ec59be9f14b4c
 EBUILD opam-installer-2.0.10-r1.ebuild 1194 BLAKE2B 8067ca76998c8e4b38f065139096cc92dca4bb71ea31df5e5b1b79268f45865ecb172cf7c30ce762867ff3b831b8c206f5bb4cbef507d09ee09447aabc968093 SHA512 4ba15ce0bb8ded4783b536c8c0578562f21b2790172800a4d83ccbdc192051e8cc59c1f263f61ee382cc2adf8d7502161934dc1a4d63804b44a5ccea1b345c06
 EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
 EBUILD opam-installer-2.1.2-r1.ebuild 1033 BLAKE2B c368b2cae6a3b3ae2b4f19ecd498243066b019752b6c8ed812fde3deb8d6de30328c46c0aa839434a56330fc10b08feb4e22d163fbb40b23876a37091098dfe2 SHA512 ade9467d022b3650745efffa22fd6c4eca879878c951f89d1e7fd2e8ed4a237402535e1b7e8382dfeacbffa7bb75c8c0e63f95eb24de90bb7d082ff87a21fc7b
 EBUILD opam-installer-2.1.3.ebuild 1075 BLAKE2B 8c6eebaf2033a0418bde752c99ba35276d7a089b2773c8eba45c99ed78ca15b635029711bd44d5325fe5b2392563a91acd0ce5d038f287624e35c47599aaea46 SHA512 26a298278a703cfbe8e9267c6bcba2a17a22333aff459bd9abfbeddb1a929d571dbc7d6487d58c8d11ac92cb2b58448a694170001abd8134d7830d371f4a2224
-EBUILD opam-installer-2.1.5.ebuild 974 BLAKE2B 157482c1caee0b9124fc9a382bab732307944140be6f458eeb9a6dcf6730787a7fa98a2e4600662afdd3b981e2911268d3b3c2d54de78aaa2ddcc8f736ae5603 SHA512 cdfedb9021e90542b19eb42bd19450e505d2474a8cae9e14c3050259c53b7af6995b50617cc5298d4d987a4b817be1d6eed4f376bafa49c5becbf6c2ba5c6dcb
+EBUILD opam-installer-2.1.6.ebuild 969 BLAKE2B 13ea9467b2781130c1cfbde139df1da64351893fd6feae1a58b92229e6fa16130bbedacbc0e6d47d36c110b4d3ee692ff261764cfbd5ca09b06c4b6ab0b000b0 SHA512 12c385e3b8f8b1a179a5e41e1f551bef9fc4140f37a4794c45e16bde1feb3adc5d5bf260c85cb57262457a5174f9884916e9a4218eb04f9a0dd4bb736b3e9921
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-installer/opam-installer-2.1.5.ebuild b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
index 58de5666dc7c..c8d56c6f4111 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.5.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.6.ebuild
@@ -21,10 +21,9 @@ IUSE="+ocamlopt"
 RESTRICT="test" # sandbox not working
 
 RDEPEND="
-	>=dev-lang/ocaml-4.02.3:=
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}:=
-	>=dev-ml/dose3-6:=
+	dev-ml/cmdliner:=[ocamlopt?]
+	~dev-ml/opam-${PV}:=[ocamlopt?]
+	dev-ml/dose3:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index 2efcbdb1e442..9b05d2b17d3e 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-repository-2.0.10.ebuild 916 BLAKE2B 8f79e20d1df6a48e64aa701bb7d4bcfd2e73bdfe79dab65473c51aa869427423b561d27b01917e05c049f2b52ab217b573c413d2c13b09dd9174a98773d2a3a5 SHA512 ddadb0fb7a7e9ea1bb197906d10592b5dbf711e12c8cb3fd3dce0dbd3014c204f31cb98f93f401632112b93066428a39b876b4c622377cde3f38158fe6cdf543
 EBUILD opam-repository-2.0.9.ebuild 916 BLAKE2B 17608649a756ac8f0bb0503eab8f612e4465f4cee3d2b26a4edf65d7e5d521931bbc43970944e4ee00c98d526fea360bc35438bc317924fff4cdd66b82cb7e3c SHA512 a4f78eacafa63f350a16b00bd4fcf5b4ba5318541e01f75400c10c262bc6fcd1e4df3156ed2da602142a5230799f8f852b7710f5fd25f734f89e158f6157d163
 EBUILD opam-repository-2.1.2.ebuild 909 BLAKE2B a168662ad969499964910f0b94f2fd98e6db767c27217a8ccf32470e756d285d52136cdc816c053597dfdd3a46f861e036dcce3356b780438c825a309be67cb3 SHA512 9842b22570bec6cc8da2cdaa3c9f9ea92eb169c13d941aa529e97620bc31440ed87578984c831c80d88e004d93ad17357218681cedba9f95a51ddfa9aa200aff
 EBUILD opam-repository-2.1.3.ebuild 913 BLAKE2B 07a3984a18f159b3f3987425140b80f62d14b93785092e74fb7c12da27a28d21155469fc919756c2e8aa9bee49df0ffb8b0ca6635caf1733ac0b6c5b038abf7f SHA512 6e4196d69f7a4df5c7e5cbf4b81b2e0b38723ea6ef16850d804e188df1d34c60b6ca40d367cd6c4fe7aa939c9d4cec2fc90cf4d9b2dc5e7faf2651aa244f3569
-EBUILD opam-repository-2.1.5.ebuild 850 BLAKE2B e71e40991096e78ef064d4bc3f35eeeeb6b8eb6a79b4259f713cea45043b914f55bd372112715f9827681373769048e5fb5b095678368bb6336ed9b415f792cf SHA512 5b9fdd2dcd528e195fc6dc7f7a9db6e18cac6897a4bbf870626ea2ad856a92dc2e5a74eebaf9faf3f47d3f813b86a7ee006c4771fcba93a70caec13044400c2d
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-repository/opam-repository-2.1.5.ebuild b/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
deleted file mode 100644
index ac92c2b7ab83..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-"
-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
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 4993dd290ecb..b8c72b0403e9 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-solver-2.0.10.ebuild 986 BLAKE2B 5501cb38e2ac9d0c78ed4e4adf85be8ddfb959af9a75d54ce0b9932234aab907e833860e9cc37806687b2c204f226f99b23a6002a3bd1aa9209b59da0f6b04f1 SHA512 229a098cdcffbbdc50e1d9754749669dcd7874c35b0761eb741cf952bc7d379a2b776148574ff8319e9a8c8ee369c1e722e0f25bb492aef7096317cb5262ba56
 EBUILD opam-solver-2.0.9.ebuild 986 BLAKE2B 57c598370564e05ec39ba314a2f8254e7d884fde07460c9e00053424ae8e20096e1c802757463b0c9453945fc26fa783647ad2f67d5b68a48a1c83912f382a33 SHA512 da509b77f479f4eb06364e0408595eb4555f1aaa5519ef72d0fcf656493a725cbb683a4eb4e8777ccd88cc138521e2b03e87b17aca678a8746ce6dbcfd5ffff6
 EBUILD opam-solver-2.1.2.ebuild 979 BLAKE2B 14be2073691add350e7d4e9a2c2d00ccf4d533efeeb55bc5d98cf3f1f634efd450db9971a2ee26db2d50262d217a89f4def4162538b5367335ab17c5ee2ab102 SHA512 0b8ff4b9a509c8d6f7d7be1bcaceed8d7490b8437b9b082c59dc4e4165bbbaa5baeed86b2ab72f87bfa126e833d044a0607401b6e2080e7395e80836957dcf49
 EBUILD opam-solver-2.1.3.ebuild 994 BLAKE2B 3be7fcec3cd09b1be4e66df093a855ea0debd0e1a83fa6088c4d89ea29df6a539945f4e52cdf72b3b0901613a90525a756688114dcd7b32bfa97b86207de3531 SHA512 74b8307c1922e45876d260ecb2e408a145d384c1ed62f24dcc7aa4278d67463d90877b81caedb61b905ced5857b5870906727d56dd34bb18cacf209b3b2d9a0e
-EBUILD opam-solver-2.1.5.ebuild 945 BLAKE2B 9f20191a428155971eaecf97939463184b429849aeb7ac806962fab474651237bfddb75b395ca358a4f635a18480f01a90e86684499ca36477ff39a4c2bfbcb7 SHA512 752b9109ed9b7f083e1535c6ff9a401c27e16a3046f78f3eedb9dbcd27df3eb5019a4c608c08ded646dd93878921728431f0e13d671850af9bba3a6eb415a5d9
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-solver/opam-solver-2.1.5.ebuild b/dev-ml/opam-solver/opam-solver-2.1.5.ebuild
deleted file mode 100644
index f1356ca7d7cf..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/mccs:=[ocamlopt?]
-	dev-ml/dose3:=[ocamlopt?]
-	dev-ml/cudf:=[ocamlopt?]
-"
-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
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index db8ffd336a5f..007ec086299c 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -4,10 +4,8 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
 EBUILD opam-state-2.0.10.ebuild 893 BLAKE2B a8c3a159b441a579c2f69eec37b00c280495c28763f435540b75bf99dda3084adbb2ca6f519f721aa459ad8353d99143c2599609337298b004b10622ea778c8a SHA512 c6182c6546dd1ab5361a75ec6cedaff9c8d6c743c5c2d120755840097f4742c58e7c5ed230976700f64f2ade80c080a031fe3bad541c32f75836649b869b68f7
 EBUILD opam-state-2.0.9.ebuild 893 BLAKE2B 8e1760f7eea15b611247e19cb438fbc411333402ffb6c28d2be301b7e5aa2befb3b45853ea556c30554fa1da8f6657c489ed0d818abb03dd8d8715f637599090 SHA512 717ec35c51b7298f8a6520a68cd46e4c74da1d5a2743a904fba5778fa4e8e77f38aae86424a84bb9b5cd5e5d6f72c44430c561557829bcf4972179b486989363
 EBUILD opam-state-2.1.2.ebuild 886 BLAKE2B edc9fdb776256415d9735e06296bf57bdebd3217ddfd8d229fbb9905dc4714371ecd220c879558e34ca73b6d20f78265d071f461825a0567e7a8e6ddd4b67a9e SHA512 795325ec954ec0e7227923e6839a7bc156a3b6380bb5e39d84956ddaa16e63952b025726e99e55bfe1d03166ef841b11e7fc135c92e2f11bdeb769549618f591
 EBUILD opam-state-2.1.3.ebuild 890 BLAKE2B fb0ccf6c0e5d7917ec77ee0bbe4e7141e91efdec53fc02df0702c511d2a818ab2114499ab76736d8e17289fc2342ef1be5b96b059200d47932a91fba98e9c1e1 SHA512 0d8d1e923ca1bfc81e41f2c3b500ded46a5069474f2af25f5603404cf86a2c3ad33bb47677167d55c06df78988391e7394be272888f9d934a1a81cfd4193cbb5
-EBUILD opam-state-2.1.5.ebuild 822 BLAKE2B 86fc52848171269e6a9d8db298789d8fe176c537e83011f8a1e67e72c1c8f38884facb22569d03e912b7f926baad66550f593d54dbd83b8bdfa2a5451fddf6b9 SHA512 0f6e445bd3d0c02eb355cf97df02c64c60aa8aee358619fd674c2642c43162c7f60e875bf0a9083d2385cf594fcc0ab6fb8fe0704845c7728af0f7db692e4709
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-state/opam-state-2.1.5.ebuild b/dev-ml/opam-state/opam-state-2.1.5.ebuild
deleted file mode 100644
index 044d439cdd5d..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv ~x86"
-IUSE="+ocamlopt"
-RESTRICT="test"
-
-RDEPEND="
-	dev-ml/re:=[ocamlopt?]
-	dev-ml/opam-file-format:=[ocamlopt?]
-	~dev-ml/opam-repository-${PV}:=[ocamlopt?]
-"
-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
-}
-
-src_compile() {
-	dune-compile ${PN}
-}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 16bc4da96391..fab72c3ec7d6 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -4,10 +4,10 @@ DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e5137
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
 DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-DIST opam-2.1.5.tar.gz 837005 BLAKE2B f2e58784959f0e47fbe5ae65112a030d8350b061d7b0d2676f40e22ec5bf62c136bc37fd3078403dab807705ce8a1c8b6bb0ecf00b68fdfbb5f3d5a9acb88c77 SHA512 4395defe7df1d03ca889718b8eafd8161ff009710475f62673f19f012e0bde8ad2a919bd9d02d7f96b4c5a9bbf38e0ba9a256531c24de15cafabd4ef11f7c8e8
+DIST opam-2.1.6.tar.gz 837526 BLAKE2B 1ee60691f4fcc1011f461505942f00ff5f5cc0f0bbfc97edb8e4c676d1e4cd28fed8b49ef341af51a750848be3110713cc97e93a9e63999e4b92e7c7f68d743e SHA512 f75d81b4eb19ef6603e7a2a18e1a281ea6f5eea47b820ae888593102db5b98ded5b593b176e70235611b63a07f4a406a57fe016386f4e921f51b55eb62b9864d
 EBUILD opam-2.0.10-r1.ebuild 979 BLAKE2B c7928c781293cfd1c051ca66f654d205dbc0090f38a5bd63fff9f02938c4834f63be604b39bca312cd6d5ba74b6eb682e055602e353670ad04cfd5a780175d30 SHA512 dde36aa23121633c80f85de0628168a2e30dc461a03b526bfa86aa7d586582a565fa4dc244d39ee313b8514ce504f5ca8460e6a3280f988bc4ffb6f8637bb598
 EBUILD opam-2.0.9.ebuild 979 BLAKE2B 2b1958809b66044de2df0ab0756e6ef99894a41a6f5228a7a176b38668b4fe0a039b25b3de9ddc9c9cce60b6f152cb5c90f340f2437d1a01b8e668a8c61fdbbf SHA512 77e418c673875c912f4551bf510f538079100f6840332e675847ec7cec2bac28667e1366ab3ac0a46a314376072fd3cec74e218ef2d626e0d2623acabd2c5026
 EBUILD opam-2.1.2-r1.ebuild 1005 BLAKE2B a38a88b5c6d78f214e0abc150da2e7d8f122860cef46355c38379ce2a286cef44eae88b4f33beee0c4ff07e58f123b25c5031d27af0e05054c08087c0ed01bea SHA512 8e3dfc0c0869528d82e5477ce8b9af33c06c63266f96306fc4c04d6ca5e19e30fa19456e015e8c7cd926eb7baf314c6bf61596f0b850172191424f90cc71eb54
 EBUILD opam-2.1.3.ebuild 1009 BLAKE2B 3228f8c555da2b103f18589d6491ae4e7eb50eccbb88b0bd4e2dad919132745a9fd0b018acc58db704b058e8cd6f63dc47f363ad1fcc7d0ef116cbfc10febf3f SHA512 0285c6dd9f256fe8f3b357f2ccefa62c93cdee91f2ace76a7ef6967399597383529c772cb76c5758ce1602176a2a386fa4c7726bf6aa55a37470771f89f5cc0e
-EBUILD opam-2.1.5.ebuild 979 BLAKE2B 59fb705757fdec8c1a1f9b2f830458fa65455442a513b332368a0bbd59c2702f1836d3d1049f49ee08d2440073410804ae1916cac6cf232b5ac5a397dfa5ccc2 SHA512 60bf0753e9f95f2fa756607b9047706dad0cc789438f19cd7cced2ed462252e42f7ed12aa5d9186e2275fce9a8d0ecd60b33d77c428fd547c1dcce44cd5a5506
+EBUILD opam-2.1.6.ebuild 1252 BLAKE2B 7918075f9f0467622ac18ba617ac46a8c2c5701dec8f0bae0ee4059ef6b1ec39e7ad26e76c9bbd6b16672f9a9c96e8330243f1ef4e8aa5fc01b96d0c8e1d1d42 SHA512 5ebaa75cc26904c83e07d8d1ead4a72310bc45ea8dc95f6777e68b2c68183d37e8b1e182251e7b6be1de819d40655e4610aa5184bad4b3b315c4e660b0b26884
 MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam/opam-2.1.5.ebuild b/dev-ml/opam/opam-2.1.6.ebuild
index 58c912386ed2..fa7540b2dd30 100644
--- a/dev-ml/opam/opam-2.1.5.ebuild
+++ b/dev-ml/opam/opam-2.1.6.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DUNE_PKG_NAME="opam opam-core opam-format"
 inherit dune
 
 DESCRIPTION="A source-based package manager for OCaml"
@@ -21,11 +22,20 @@ RDEPEND="
 	dev-ml/cudf:=[ocamlopt?]
 	dev-ml/dose3:=[ocamlopt?]
 	dev-ml/extlib:=[ocamlopt?]
-	~dev-ml/opam-client-${PV}:=[ocamlopt?]
+	>=dev-ml/mccs-1.1.17:=[ocamlopt?]
+	dev-ml/ocamlgraph:=[ocamlopt?]
+	!dev-ml/opam-client
+	!dev-ml/opam-core
 	dev-ml/opam-file-format:=[ocamlopt?]
+	!dev-ml/opam-format
+	!dev-ml/opam-state
+	!dev-ml/opam-solver
+	!dev-ml/opam-repository
 	dev-ml/re:=[ocamlopt?]
-	sys-apps/bubblewrap"
-DEPEND="${RDEPEND}"
+	sys-apps/bubblewrap
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
 
 src_prepare() {
 	default
@@ -40,5 +50,5 @@ src_prepare() {
 }
 
 src_compile() {
-	dune-compile ${PN}
+	dune-compile opam-solver opam-repository opam-state opam-client ${DUNE_PKG_NAME}
 }