gentoo auto-resync : 19:11:2024 - 03:03:00

38 files changed, 135 insertions, 738 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 0992efee5f5c..fa2aa416b0e7 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index f0ac80f1e07e..971e1be48b36 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,13 +1,12 @@
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
-AUX findlib-1.9.7-gentoo.patch 377 BLAKE2B 652155779d6ffeb4f99370668a416f5866fea8585819a361cee7bb66ddc773dda0957c599d8df3b1e3c4fde373f73866eab2f8863846934a92859835ef2193b4 SHA512 8fb3ed312ea2edcbd5d3e04a0a6be9dcefda4181c9e5847a0aad75fe6e7ffc5bd0988fcb332b5a1dcece6ba7a279a4bc254cf68f3c0e1d8b6bffbd697487f09a
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
 DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9baccce669f3785a9cd4a1a582302844019b69be14598ca807edecb26645d9d7b241e1d704c3f023ed039cad21f0 SHA512 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea
 DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715
 DIST findlib-1.9.6.tar.gz 271246 BLAKE2B c9c98b9e92c0cf690e2c8794a1ed606c0288d49a016dfa08592c9f617be1020385f52bf37345a7cbcbc7f0fcb19750a6617036cbf90afef231eccdbc7132baf8 SHA512 cfaf1872d6ccda548f07d32cc6b90c3aafe136d2aa6539e03143702171ee0199add55269bba894c77115535dc46a5835901a5d7c75768999e72db503bfd83027
-DIST findlib-1.9.7.tar.gz 274563 BLAKE2B c8cead9b51beb0798229c270705284d168b3c667f7eeade1a0187bf9024f41648764b520409c61dcb01f687fc037745dc9eb7361b097e8b4939cf877e12c7a94 SHA512 3aa1f06d5a230d7467b6f42257ba4b6a2481c8bd6cb5e51df87f86d652d47a08bd3efffe48edaeb9fcbb4b38a7aed65767f265901c5d6570acc131f7afce66bb
+DIST findlib-1.9.8.tar.gz 274668 BLAKE2B 2483d2b833d566508680a5b9b3949aef187c290ab5602ef423ede214cb57f4b8f61dfeb9cc712499d8c7d0590388bf5e481263bbc841488e1fb62e866f9b64d8 SHA512 64aa28ac27358e1bc5d118e283fb64757fb96329151860bb9c1e9352a9fa1728ebcb4320b8d2eeb57ed2eea83c9849ea89d06c0fa25e1884ececb431341f9f1a
 EBUILD findlib-1.8.1-r2.ebuild 1796 BLAKE2B 9ca2db077a6bf386d582477c28b1fb58659c75729995ef8ac49be50f44fa42aaf7f67df896b7ad9900525a25da9327baf5aaba0469b37c895121ce4d889c27c2 SHA512 7be270785b547643503ff2566d386b9bcd179003a348ab76624a2867bd0a66148af9400619e2e20853951e743eb1af14769132710e5fd96e75494bed6881fd6d
 EBUILD findlib-1.9.3.ebuild 1730 BLAKE2B 971bc2112e70e3e4575c093e357243751b61190a3644ac0d743f5410bb2a3eafb7229700377d4955efc1bfd2691990a8b2758563bba4a40b5f1b81fdc853a00a SHA512 040f16bb2012157edcee960259c5504c765a872128529f4a791dcac10116cb3755a9f1f6ec0ec1cb947bba16b5f329c4947ae6c3e39ad85bf4aa8aebd52273cc
 EBUILD findlib-1.9.5.ebuild 1757 BLAKE2B fc85cac1cd57fcfa77fb7aeac28862f52fcc06068c3187349c78476630644e19a738c0c77a56fc9e89758e5d5915ec251925fd62c8b2aa660675eb6c477502de SHA512 5703da0e4ebb9939832336355d1e6de662396401ca7a90af202bd9070c37a9e6ff50d80993950cd37abf24b51b225d8022c3e8cd651ffb26204fa44e22df3da9
 EBUILD findlib-1.9.6-r1.ebuild 1891 BLAKE2B 8123db7040ec61d7db6a85ae45c5d1e62cd40892841853661eea6ef58d2fae3de7fd57ba0d06449497f87180fc511465fea60f17b27db55ea23240ee439f5609 SHA512 f93cb7e10d2f23f978b0992d6d9820f6c4b1973ea286dc93c2fe873c20fb6ccc60d2b05d2d5228b4e0fea7d4ba8b727fdafdbb26c50dfc9895dbfd044afadf94
-EBUILD findlib-1.9.7.ebuild 2066 BLAKE2B b786c0bde7d388b525b04c909afd79efaf4a8af785775bee937414c72f9b46ce7ffee3f35c9694671b5ac1d157af795b31c230335a69d3aff8d943153e0aff48 SHA512 69afbc3054bac31586a5960c8f7d4d8cd226a9469d3b3eefe2cc0d0d66337ad8db98842661c0eca92e0c45ddfe7afb3ed3a617548e50b15e643025d9cba7e1be
+EBUILD findlib-1.9.8.ebuild 2021 BLAKE2B 8d5bed38cb1f46cc6e0d93ecdde6147f97a92ffbb57a27d91f9c8f9c3259cbc8e20f2d03958a0e1a80b6ff9f8dd0ddb55d8859d51a3d0d817265dfe3baf55f56 SHA512 a2e7ef3deee68ff5aec61396d3eefba2240eabb4e451e622768a1fbd6465bde6390c073a4d0d450bfd6bd95a82993150e0230c356a55f3bc89c70a74c12dc48c
 MISC metadata.xml 313 BLAKE2B 5acfde6d665d53029692b476afe23035a6e2a4414d301dde6feba39d3738fe8382676bdb102758ad4d3fe01928576f35c82421317cd045ce37a9f86a5581342a SHA512 30d52375434c72938a3ffd81a9c2655cdbf5e9e2e0473beda90afb4deaf5b756eadece47a533a7ca2e4a263b83df29317f322d99a37b7022eefd01a485836b6b
diff --git a/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch b/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch
deleted file mode 100644
index 2267e4289b42..000000000000
--- a/dev-ml/findlib/files/findlib-1.9.7-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure	2024-11-17 15:38:27.712271339 +0100
-+++ b/configure	2024-11-17 15:40:42.865323210 +0100
-@@ -562,6 +562,10 @@
-     exit 1
- fi
- 
-+dynlink_subdir="+dynlink"
-+dynlink_dir="dynlink"
-+unix_dir="unix"
-+str_dir="str"
- check_library dynlink '' dynlink/dynlink.cmi dynlink.cmi
- check_library bigarray 'possible since 4.08'
- check_library compiler-libs '' 'compiler-libs'
diff --git a/dev-ml/findlib/findlib-1.9.7.ebuild b/dev-ml/findlib/findlib-1.9.8.ebuild
index aad9b4c55641..df488e936207 100644
--- a/dev-ml/findlib/findlib-1.9.7.ebuild
+++ b/dev-ml/findlib/findlib-1.9.8.ebuild
@@ -16,8 +16,6 @@ DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
 QA_FLAGS_IGNORED='.*'
 
 src_prepare() {
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 15e0ac122ad2..a2453962d34f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -10,6 +10,7 @@ DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b8577
 DIST llvm-project-19.1.3.src.tar.xz 141247864 BLAKE2B 4ccb30accd632a7d54eb065b724ff81ec8a50380fa527111d58acd728eecb798d42f680119b6d1cbc980523e2f39220921ca1f530daa7afea05ab27436dedb7e SHA512 0abaf158b373892d5afc184158600df17a0797547ad7238ca9018d6fcdd7310b0db803d158daa82a2e04bd42d9daebaa2c3e4b9024c0fa2df72a88596575df5c
 DIST llvm-project-19.1.3.src.tar.xz.sig 438 BLAKE2B 44717741ae13bb0c52382647352e52273d8401728dc5cc1cf0c11a8f08cd74b6e3d789e788793aad767030b36fdec62e3a05bdc0b7ff60556cec7ceac17fc239 SHA512 84ef22ee78dbaad4710becbcb02119d06063099f9102bb86f3cd44fbb7e2d87bafe239d8e0cbf22ab5a479f99a11a77125f22394d5006ed86262076ccbf1634d
 DIST llvm-project-3f4468faaa9525ad615118675c3c68938f4a8d5f.tar.gz 221860252 BLAKE2B 6c531df34163dc0879c79b029a13215d1bef2cd95bbaf4a6d5e10b81a8352236283d40f14b62e23a57cc1cf8edce138fb6e2720ced2397d6469c5863564c626d SHA512 4aa485f4547e210cf8f6f8147c4adab3e75afe77f1e4e1bc4718fe681b64bdcf8937f843964542f8ead90ceef52cc0fd4bd8275824d1a4c6961eddafc7d35115
+DIST llvm-project-a6385a3fc8a88f092d07672210a1e773481c2919.tar.gz 222866102 BLAKE2B 9346275b18dcd7eedb699ed3494c027f597f68ceb8ff902fbff9f805a2c423d4fb86619974b3bb6fea30c5fe948e3793fb5c499f9e206b61794e13908d830327 SHA512 ac507feeaba787c6df1ece65e03d065c4f8fbabef686b583f671745e09c9a585be8c9359aeb3aa77815711a2ff9621c1b36a4d24cfe9f8d04e3288b53d7c9c69
 DIST llvm-project-c7df10643bda4acdc9a02406a2eee8aa4ced747f.tar.gz 222622409 BLAKE2B 8b6b53e0d51a681ec2e3ea1c873df95357e1333a598d26921c72f4ce05872aa5fe00a046bfe8811e2c8c1a2ffced7a325a0399bd931e54cf2aeb23abe887bde7 SHA512 e78219c87f001c813844ff652bf065f7c1d1bbf09af801ed1e99e9f40b981896bcee699d2ab15c71478388987c4030750a7958265d374b9f568fdf7af3dd3a21
 EBUILD llvm-ocaml-15.0.7.ebuild 2576 BLAKE2B 19ad7bcc099299b50cee2551d0998ef748cf46081605459355a9d11b5882a3a26559892321f47d67f927a422ed1dc34332f9d9bee82da3e151dc9edec58f458a SHA512 3366ae720bb79421c253c28946c5281152d3573416fb9c7967327bd2d2b418f01887d63e00ccc1d5f5008d1f05280f270fe15be3e8d2b812c782d881778e8417
 EBUILD llvm-ocaml-16.0.6.ebuild 2510 BLAKE2B 129a25c76d02640a151bd2ba8b1542e34bc4b0adb5aac797f96f7f888b8939ae33dcda9eb1f2ec31eae81575ac3e32995b9e99de3540f3fdc8e085b0185200ec SHA512 250285a57be6d7cfbddd4a9ff4ab8bc25e2813441da263bfef1a7a4d11658b6ed9a3d280ada7b1e45c5cb472e6647eff260926672089e7e445a12be6a5344bdb
@@ -20,4 +21,5 @@ EBUILD llvm-ocaml-20.0.0.9999.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b69
 EBUILD llvm-ocaml-20.0.0_pre20241029.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-20.0.0_pre20241106.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 EBUILD llvm-ocaml-20.0.0_pre20241113.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
+EBUILD llvm-ocaml-20.0.0_pre20241118.ebuild 2439 BLAKE2B 78ec9994e7e03caf7e32e36c1c8b697039e1c8bcaaf89289ccfc53ccb286d8f3f855048162452782292c2f67e1c4476fa24898c595a55f89aabeef83283fc23a SHA512 b36e82afdfeff73650c86ee1ca59a6c1796a7445a34cc9711d65841380c5a023f661dfd723f4311b537ab5047d4a4bef497ca20e106b1cc0832851674677391b
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241118.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241118.ebuild
new file mode 100644
index 000000000000..36b3716c0372
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-20.0.0_pre20241118.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake llvm.org llvm-utils python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+IUSE="+debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+src_configure() {
+	llvm_prepend_path "${LLVM_MAJOR}"
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/luv/Manifest b/dev-ml/luv/Manifest
index bd134d2c05f3..dba9e0e9734e 100644
--- a/dev-ml/luv/Manifest
+++ b/dev-ml/luv/Manifest
@@ -5,5 +5,5 @@ DIST luv-0.5.14.tar.gz 849832 BLAKE2B 5fe04991fdf793d8981b5f978e41a7c170666e917e
 EBUILD luv-0.5.10-r3.ebuild 769 BLAKE2B a708d2d80c8c0e8bd6e1c2103096b77cbf72b1dfb69c0c920217adf7ff63bd6d43b7d7977cb1ad0978b1b8f775dd8833f8d81cb3e868922848465e2cadacaa0a SHA512 d00aff7e5a8bb84080ca886f004867470afe3d0c25523a3105932088551bd94f004d0f0328533c5dd2bcdd80bda03c0d57fb3b438915fed99b8d41fb16881db7
 EBUILD luv-0.5.11-r2.ebuild 846 BLAKE2B 975f0f69441c839b5aa73783436c0dcbdcebcd419e4b3190a07c4d6a4ce931d336e7016c68481c25d6b22e7d3292aaa88a57efbf2036b753d67f41b9b56e841a SHA512 9447033d5320012576e3e74067684c25b9200e11daee40f18a150358d374d4a0da732426ef5f9c83d1b580a38569ec5a1f3af949ba3bbba2c9fa1344090d8a93
 EBUILD luv-0.5.12.ebuild 965 BLAKE2B 0f2c2267585c3b7c0c0eefd6edbc2a45893f558d2b2c8f13ec920fb1569c45bddcad3f65830f18cdd9b802d09882bc0d17641ac74f8df28be92fef2610e154bb SHA512 da54efcff0b458b944306b5264492e9bfe621880fa1c66c208bbd865e342cc949e447bd70d67734869813df88c1ed9fbfeb4ae75561939ee054d491cb64c7e05
-EBUILD luv-0.5.14-r1.ebuild 953 BLAKE2B 06713607a0a8bb7473030fd2fc582b6227146200a3cb7855ced54b5ddc739c0e3ff3ef2eb83d5bdede0e1e78c7cc45680624a4fe897bba618c28ac754649606d SHA512 e1189e1ea1767732f665e1bacfe82323180a86c56ebac976cb7ece83dce47cdf7a88f4fd7506ab63ad5eae381430cf803b6b37d6de439af1690a0ad775804f7b
+EBUILD luv-0.5.14-r1.ebuild 951 BLAKE2B 7082921188e072240671ddb240370ecc2518881c587fb941f5e0683b09380e3d9b1e648b5eddb8b492b2555735dbf21a0053759817a7021041dd982bf9d8d2cd SHA512 de82f3c08a24eb67263b5f671b4f66f8b4457c9a0543908b7242f93550c11cf0145e8de3dbf3ce891ed0f564d5cbdffb65cb2b13170d376fb9dd195eb7b57287
 MISC metadata.xml 309 BLAKE2B 2571e139ee75123b88f05751d493805433dd5f22ac3f06e82adf97017f53fa54c1870ee947b4e98ed55d4f134b837e1850d86fb10e6db43f0c37f1d54a2a07db SHA512 a917d2ea07601ed6c8d9386ce92deb19dfa0a37e3cf42b7808cb9e6e47ad57b1a9495f4b5f43695bd13d1a09837e40ae265bcb1b6bac30e62fec39bee1728456
diff --git a/dev-ml/luv/luv-0.5.14-r1.ebuild b/dev-ml/luv/luv-0.5.14-r1.ebuild
index ab24b58c9fcc..7937342c3f10 100644
--- a/dev-ml/luv/luv-0.5.14-r1.ebuild
+++ b/dev-ml/luv/luv-0.5.14-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/aantron/${PN}.git"
 else
 	SRC_URI="https://github.com/aantron/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 2c61ea3eee44..cd04c9f01086 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -11,5 +11,5 @@ EBUILD ocaml-ctypes-0.20.0.ebuild 908 BLAKE2B 18279ce659d023b2c256ea7aef01220851
 EBUILD ocaml-ctypes-0.20.1.ebuild 947 BLAKE2B 20f4f138e0f69d5b2bf8ad5677f64202cf2b03ffb448129bbf112c36d86b02f1e14a078a489d612264d8f76f415518f72f5017b1afa7b2e9429beb9872cbfb4f SHA512 9a6ccfa155adc9f218587e8963c57c347ecab86a70df337aa22a38dd3cad108e22d19d24f79d7c119e924d5269a0da630e377a7c910e5ae1c6df06a3149a1e63
 EBUILD ocaml-ctypes-0.21.1-r2.ebuild 754 BLAKE2B 61cd4e94a777bf3935343eb3a69a51ae63e5c58d5753bf80ab82d5999ae96c380ef45c2f645ffbdd107f98781e63974e501ac9d8e79859f0f20c3d9ed51fcf89 SHA512 21a78ec51d10ded59a411cb8dd3be18cfa65bdcff19ffb41d47dc4c6c4aa471d7c96137ebdc502f4a82f22628c93ec9e0aa84061d8a004a7e9ba9ba4bd1f8f3f
 EBUILD ocaml-ctypes-0.22.0.ebuild 753 BLAKE2B b0b7f1f1161a3dc0fd33533880365ec0d720ddc50e81837fb3d695ff2393a65b912ee75dd37a421c9e0420b37093c528707d0e91e7da99c3fa91bc0c3563d3a9 SHA512 08c0446386229b8ae086eb13ee4b0856333c218dfbb7ae4dc56685121d8630dc17caa862936369af86b91c9096a373494a12a4f81753245847d395fcdc9f199b
-EBUILD ocaml-ctypes-0.23.0.ebuild 755 BLAKE2B bca6264db66e60f5f6ab482eedf34304b7de41d09b481115ff1cafdea4cc6a8f83c972c8de6df440e87010215d76e71d13396463609ba57b2d549d4ef286cf67 SHA512 cd44e28682785747bd319e61129fd60b2d36dce20be9e1b361cab5e53fae5c55ce99d7cd8b548d179061b07d58253cb567b27d028e5a4b3105b20741d046baee
+EBUILD ocaml-ctypes-0.23.0.ebuild 753 BLAKE2B b0b7f1f1161a3dc0fd33533880365ec0d720ddc50e81837fb3d695ff2393a65b912ee75dd37a421c9e0420b37093c528707d0e91e7da99c3fa91bc0c3563d3a9 SHA512 08c0446386229b8ae086eb13ee4b0856333c218dfbb7ae4dc56685121d8630dc17caa862936369af86b91c9096a373494a12a4f81753245847d395fcdc9f199b
 MISC metadata.xml 317 BLAKE2B f25c1f9fc2dea5d1afe9f1cc03667a70564a3134b5211b494adb1c9bb0be9d77ca4f7bbd9ceda2a81458476e06c9cfcaaeceacd338e40b898b4454d518fae025 SHA512 7262b7766342484afc74b5c30fe4a7a719219c759eec469b86c1926dcd6deb61f0ba0ab5c71e37e4a1f921ef268433f9f4166eee5955f515142fdfdde2c968c9
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
index 1334f4ccd087..7a6bc1d67716 100644
--- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.23.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yallop/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
deleted file mode 100644
index 32d3847f53ed..000000000000
--- a/dev-ml/opam-client/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD opam-client-2.1.2.ebuild 1019 BLAKE2B 12b0b6f8cdfd3a0d083c64e0d65212229e342305c4cf202c7c8117dc0106ec44d4c76b39a1672e7d7cfa66437689e96ece2b8aeabbb314b5336ac5ac7446ab16 SHA512 79292ade60ec2985ec1cbcc3e788b3018a280ff4a30da096816da5170d6b0909c09554a8ffe46d3a176f0d26129af3aaa7a5190f0270d55717ef1508e39bd0ec
-EBUILD opam-client-2.1.3.ebuild 1034 BLAKE2B fa8367adf57efa4bda6b1c3f114f1d2e2bf3556ccc393af8df86acf2edeaa1068b70db81872b35f183831d5486e3cfd146d2c93fc7073e6502f3dbf1b1c34060 SHA512 dba4b755f0c0ed80df5ac7174fc0b5ea4a269e8e724a1d5cfe4a0c17f8d47910d0072f328975c80260547142dae57c72556ab95d6cd4c4aeea3cf17303a16c3e
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-client/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-client/opam-client-2.1.2.ebuild b/dev-ml/opam-client/opam-client-2.1.2.ebuild
deleted file mode 100644
index 8146740b33f6..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.2.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 ~riscv 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.3.ebuild b/dev-ml/opam-client/opam-client-2.1.3.ebuild
deleted file mode 100644
index d0d95142c7ba..000000000000
--- a/dev-ml/opam-client/opam-client-2.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 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"
-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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-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
deleted file mode 100644
index 8e3a29bfec5b..000000000000
--- a/dev-ml/opam-core/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e579713c2b8672a5ea37cd7516a030367664823c75594a789136ffe5b313818fa120fb64e499b8276706700df776 SHA512 49218a14c3b7e2f47052c1fb6907b54086f5af4adb43d120065c77f2c573d72136ac64f55f577a613eb43ebe29fbe14f9ac0e25756209ca7a572aa35a4410a5d
-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.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
-DIST opam-2.1.3.tar.gz 832450 BLAKE2B c5e50c0a41b7197bc7645eaef0d8cba79c978b4432fc824aa6a4280df65ec7d59df52a22b76877da4949c8562a5fecb8da2a179ca67bd312bf9a514961bf4444 SHA512 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
-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
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-core/opam-core-2.0.10.ebuild b/dev-ml/opam-core/opam-core-2.0.10.ebuild
deleted file mode 100644
index 69c9be86d5be..000000000000
--- a/dev-ml/opam-core/opam-core-2.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 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/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.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild
deleted file mode 100644
index 0628e243fadd..000000000000
--- a/dev-ml/opam-core/opam-core-2.0.9.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.2.ebuild b/dev-ml/opam-core/opam-core-2.1.2.ebuild
deleted file mode 100644
index c53cccb0cafb..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.2.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=" "
-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 ~riscv 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.3.ebuild b/dev-ml/opam-core/opam-core-2.1.3.ebuild
deleted file mode 100644
index 404e055d648e..000000000000
--- a/dev-ml/opam-core/opam-core-2.1.3.ebuild
+++ /dev/null
@@ -1,49 +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"
-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 ~riscv ~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
-
-	# 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
deleted file mode 100644
index 90de368e8116..000000000000
--- a/dev-ml/opam-format/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-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
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-format/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild b/dev-ml/opam-format/opam-format-2.1.2-r1.ebuild
deleted file mode 100644
index bbcedda93726..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.2-r1.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 ~riscv 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:=
-	dev-ml/mccs:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-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
-	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.3.ebuild b/dev-ml/opam-format/opam-format-2.1.3.ebuild
deleted file mode 100644
index 52f318639125..000000000000
--- a/dev-ml/opam-format/opam-format-2.1.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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"
-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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" #sandbox not working
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	>=dev-ml/dose3-6.0:=
-	dev-ml/mccs:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/cppo"
-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
-	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-repository/Manifest b/dev-ml/opam-repository/Manifest
deleted file mode 100644
index 85b2a1905631..000000000000
--- a/dev-ml/opam-repository/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD opam-repository-2.1.2.ebuild 909 BLAKE2B a168662ad969499964910f0b94f2fd98e6db767c27217a8ccf32470e756d285d52136cdc816c053597dfdd3a46f861e036dcce3356b780438c825a309be67cb3 SHA512 9842b22570bec6cc8da2cdaa3c9f9ea92eb169c13d941aa529e97620bc31440ed87578984c831c80d88e004d93ad17357218681cedba9f95a51ddfa9aa200aff
-EBUILD opam-repository-2.1.3.ebuild 913 BLAKE2B 07a3984a18f159b3f3987425140b80f62d14b93785092e74fb7c12da27a28d21155469fc919756c2e8aa9bee49df0ffb8b0ca6635caf1733ac0b6c5b038abf7f SHA512 6e4196d69f7a4df5c7e5cbf4b81b2e0b38723ea6ef16850d804e188df1d34c60b6ca40d367cd6c4fe7aa939c9d4cec2fc90cf4d9b2dc5e7faf2651aa244f3569
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-repository/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-repository/opam-repository-2.1.2.ebuild b/dev-ml/opam-repository/opam-repository-2.1.2.ebuild
deleted file mode 100644
index bf653aac8dc9..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.2.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"
-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 ~riscv 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.3.ebuild b/dev-ml/opam-repository/opam-repository-2.1.3.ebuild
deleted file mode 100644
index 6e222bc9732d..000000000000
--- a/dev-ml/opam-repository/opam-repository-2.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 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"
-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 ~riscv ~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
deleted file mode 100644
index 3b1b30c14396..000000000000
--- a/dev-ml/opam-solver/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD opam-solver-2.1.2.ebuild 979 BLAKE2B 14be2073691add350e7d4e9a2c2d00ccf4d533efeeb55bc5d98cf3f1f634efd450db9971a2ee26db2d50262d217a89f4def4162538b5367335ab17c5ee2ab102 SHA512 0b8ff4b9a509c8d6f7d7be1bcaceed8d7490b8437b9b082c59dc4e4165bbbaa5baeed86b2ab72f87bfa126e833d044a0607401b6e2080e7395e80836957dcf49
-EBUILD opam-solver-2.1.3.ebuild 994 BLAKE2B 3be7fcec3cd09b1be4e66df093a855ea0debd0e1a83fa6088c4d89ea29df6a539945f4e52cdf72b3b0901613a90525a756688114dcd7b32bfa97b86207de3531 SHA512 74b8307c1922e45876d260ecb2e408a145d384c1ed62f24dcc7aa4278d67463d90877b81caedb61b905ced5857b5870906727d56dd34bb18cacf209b3b2d9a0e
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-solver/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-solver/opam-solver-2.1.2.ebuild b/dev-ml/opam-solver/opam-solver-2.1.2.ebuild
deleted file mode 100644
index c1e2675a92cc..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.2.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"
-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 ~riscv 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.3.ebuild b/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
deleted file mode 100644
index a6a362cb5691..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 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"
-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 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="test" # sandbox not working
-
-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
deleted file mode 100644
index ea31c7f2b2f7..000000000000
--- a/dev-ml/opam-state/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD opam-state-2.1.2.ebuild 886 BLAKE2B edc9fdb776256415d9735e06296bf57bdebd3217ddfd8d229fbb9905dc4714371ecd220c879558e34ca73b6d20f78265d071f461825a0567e7a8e6ddd4b67a9e SHA512 795325ec954ec0e7227923e6839a7bc156a3b6380bb5e39d84956ddaa16e63952b025726e99e55bfe1d03166ef841b11e7fc135c92e2f11bdeb769549618f591
-EBUILD opam-state-2.1.3.ebuild 890 BLAKE2B fb0ccf6c0e5d7917ec77ee0bbe4e7141e91efdec53fc02df0702c511d2a818ab2114499ab76736d8e17289fc2342ef1be5b96b059200d47932a91fba98e9c1e1 SHA512 0d8d1e923ca1bfc81e41f2c3b500ded46a5069474f2af25f5603404cf86a2c3ad33bb47677167d55c06df78988391e7394be272888f9d934a1a81cfd4193cbb5
-MISC metadata.xml 308 BLAKE2B 8063e47b40e4366ef330084a189eafbb580be1231caf276960a3c3a67a34f4cb60be369e2ae75b91b379feda07fc8d7b6d9ccc5fa14c296c9dc2e8bb92d10157 SHA512 0b05ce3d4265c65f2ba372a24a59bbb46b8daa80883501a61da35aa0a8a487cd5fe0cf24cd6c089139893eb1fa970c33ef207e51772583bb137ebd38ec58eca5
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
deleted file mode 100644
index 8ee8dbb51969..000000000000
--- a/dev-ml/opam-state/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/opam-state/opam-state-2.1.2.ebuild b/dev-ml/opam-state/opam-state-2.1.2.ebuild
deleted file mode 100644
index 474fe595cc07..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.2.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"
-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 ~riscv 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.3.ebuild b/dev-ml/opam-state/opam-state-2.1.3.ebuild
deleted file mode 100644
index 924b564ae78c..000000000000
--- a/dev-ml/opam-state/opam-state-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 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"
-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 ~riscv ~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/spawn/Manifest b/dev-ml/spawn/Manifest
index 03f398561b6d..624404780faf 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -1,7 +1,9 @@
 DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
 DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721cd9fa435c652e0605cc88bb545247e5a8284b7603e22ca5ab27d36042c6d8020742fc5e9e7b762167a9f864 SHA512 3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013
 DIST spawn-0.15.1.tar.gz 15861 BLAKE2B 95478f0f575688ba66dc69229463c6cf029c39e6edf8cead2d38dfa0fc01bacf85d63f09d6d084d96a2537c55b02184ce69166be12628a8046c7e007222f648c SHA512 efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4
+DIST spawn-0.17.0.tar.gz 18629 BLAKE2B 07e62ff3dba88132ab1ed1aeab168f6860e0cf50aa2fe6e6f07e495f07d4d1e237c017fd98ce93a613b7e43943d9edb98c51fabb3ad81a2ab1f10903d58f53a2 SHA512 929a45b87fa1066bfa768c51665ef475f6ecd4733f9dee2821d7d11d0161cc621d85aa1cec716840e58802e9eea8d0884b52e5e6989702b1999cc7ef7fb813e2
 EBUILD spawn-0.13.0.ebuild 454 BLAKE2B 1ac7c1ae0f9035e8a5ecd80ddfb8cd25dc89a3c9b993608fc1bf6cf6c84239657b10592256ad306b543aa81294187df78f04eb056d9825f7b2283c0f2c2c3df3 SHA512 89c3c6106eb3dcf4f913e67238c91b109ad45730c116d692988004df8401e38b929bd09327cf0b963b1780f2db395035a1d20de2f5ba684951b2607f879b62fb
 EBUILD spawn-0.15.0-r1.ebuild 475 BLAKE2B 2f5aa143ec534396b5bcd47a3b88598c088ec3738b1c9eca1d5edca48f51864a0352edc2f11411c979e11f1784270da004ed9a66acd80a499827f2db8cf55a5f SHA512 20f59b27ba7d9c32634b1aff137e8df2371afa62539b4f843bc8be1ad5842cba7656582b8779802c48b13f1e293cbc6ab25315fe0e9bce25bf8aeb7b8d0bde8e
 EBUILD spawn-0.15.1.ebuild 470 BLAKE2B cf763d541d31c0c814b18ebc7b772e05f1ef681df5a715323404deaf96a8a76366026cdeeb95471b1adc7e3681e156bc799497a4f86630eec2ee2608d8e4f6f1 SHA512 760381095979b721bdfd1c9d32c68f65babfb6c02e161d462454c8a091a2f0f20b7a17af7d3d0b91b97a0ed9e80df021425e6ec8401422b7cfd7150ce7790a93
+EBUILD spawn-0.17.0.ebuild 475 BLAKE2B d09302f23a11c77e6b659ebd111b2c118d1a39f3d62be12e6ed08bb0b27b7b190fde697e3aeaffd8916750d7c668c6712b506620c07bddf10f64e2a94b3e2666 SHA512 75045d67b1932f67aed84886c6241c23488305cca2dabb48ac8a9e8d80fda1df893c4396baa50a791f6964915369fc7456eb5b800a415cc5fa1d08be4600280f
 MISC metadata.xml 314 BLAKE2B 24e080f5ed71e296ae2f0009a34fbb934250f84a002dc06bb7ef471ef97bfe8c1a38ed518b04be7ac0321fee38aa4c5688661e5b635edcb4cd19b468a92582e7 SHA512 8d2d7910c38d0272244e16bc337c787f520786d22986904a736da319eaa2629b136c951147e190bbaeb8a161cd38578daedfcd3101fdc7376635ed3d2aa35417
diff --git a/dev-ml/spawn/spawn-0.17.0.ebuild b/dev-ml/spawn/spawn-0.17.0.ebuild
new file mode 100644
index 000000000000..a5956b926e0d
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.17.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"