gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ml
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
219 files changed, 308 insertions, 2830 deletions
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 53ac947084a7..cf115c3a87a9 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
deleted file mode 100644
index ae57f9e66332..000000000000
--- a/dev-ml/batteries/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST batteries-2.7.0.tar.gz 768498 BLAKE2B ded30928d51bd6f6bc023803bb404a140a8bbc64d7dea3c6d63cd7ad4aacd470621a6179684772930c6e57530a57b3136711ca32df30332104db2081518f408c SHA512 ecb973c9cc535fce18db8efb1bfb9dfde73d7a7fc82cb6b0657547b6f7d173e9004015f698065ed5efeb9f89f1fcc1b548745b708139ce0d01eb6f63981421c9
-EBUILD batteries-2.7.0.ebuild 694 BLAKE2B f4e3dcbf3f72dd3972a4f62e3bb37896a7f32fd136651f5dc70908e0d078430746f852aab60e400d6327716cf5f323b26aea426ded1e7fe00a829041a73c3ab6 SHA512 56e7213a6d3e5f1930814025968bc910d53c92a52b1a6d517d5fa410cda37c806d1d80b8b46f4bc58abe89cfb483bb5dec548a58b90727f59653316cced05688
-MISC metadata.xml 271 BLAKE2B c59faa9eefadad377c5e83c8cc523ccf4f0db2659e51772891c235ee4bfd15a9a4499b0818e8333576b06259c467e1cf952fc8e8180ab5db787e2403b98d2e6a SHA512 1775ca46d7142cfaa2d9e4ab1f72da79f3ae8710ecc02a46a20f1211387132baf4623e332d1ecc63d805cd9ec7996ebdf336fde5309902ba298bf1867a7ea8a6
diff --git a/dev-ml/batteries/batteries-2.7.0.ebuild b/dev-ml/batteries/batteries-2.7.0.ebuild
deleted file mode 100644
index fd324bf579fd..000000000000
--- a/dev-ml/batteries/batteries-2.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit oasis eutils
-
-DESCRIPTION="The community-maintained foundation library for your OCaml projects"
-HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
-SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ml/camomile:="
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/iTeML )"
-
-DOCS=( "ChangeLog" "FAQ" "README.folders" "README.md" )
-
-S="${WORKDIR}/${PN}-included-${PV}"
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
deleted file mode 100644
index 98e1a6806aaa..000000000000
--- a/dev-ml/batteries/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/bin-prot/Manifest b/dev-ml/bin-prot/Manifest
deleted file mode 100644
index 2ede4c6a39de..000000000000
--- a/dev-ml/bin-prot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bin-prot-0.9.2.tar.gz 339008 BLAKE2B 3fcad0d5a88393b49b22d42b4669da485ddd9a61938cdda4183658eca5b0369265480005945bdaeb53cc8af5c324cc7cb158b4208e4a7a7f821db5c045502910 SHA512 a4aa453ff4d2037b8ed0e53186fafa876a96ecb970ef25e99cf133afa4615b8fc53de75234454519a4f7c11f771f98e8117f8fa37682dbb8f73d4fda8a1805f7
-EBUILD bin-prot-0.9.2.ebuild 963 BLAKE2B abf71b9621542821ebfc763e4fdb558f7fe7595c019aebc4397e2672f36b79e8b8f1c22ca224001027425246f19c83be149a2b68dcbd20182158f6fd6bf41a99 SHA512 a477691a125dcbc10fdd4d6fa0cee7315a4370e1b81bbc7823f25233c4d828a46fdbbfb5b97eeadb77212734b0a9b3c3a95ed1979acb7016c47f5c3369041024
-MISC metadata.xml 251 BLAKE2B 2d9aa56c6d280f06b11e24a52f9570b233f90932cb1d470a8f2ff98a70ebcada1b13bdb0ab2e0999e9f40ac51e9bb01c3181d16d97edbe00e699e9fa287977c8 SHA512 2c96165d825a9f4794ce265fd2d55bd3e4fd5e8fb0fa27ce7846b53cc181160bb77b96f3014157a4e405e30958330139afafc5faf34795061878116582b0fea2
diff --git a/dev-ml/bin-prot/bin-prot-0.9.2.ebuild b/dev-ml/bin-prot/bin-prot-0.9.2.ebuild
deleted file mode 100644
index 5c2d435fef0b..000000000000
--- a/dev-ml/bin-prot/bin-prot-0.9.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Binary protocol generator"
-HOMEPAGE="https://github.com/janestreet/bin_prot"
-SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/ppx_compare:=
-	dev-ml/ppx_custom_printf:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_fields_conv:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_type_conv:=
-	dev-ml/ppx_variants_conv:=
-	dev-ml/sexplib:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-S="${WORKDIR}/bin_prot-${PV}"
-
-src_test() {
-	jbuilder runtest || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN/-/_}.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin-prot/metadata.xml
deleted file mode 100644
index 01f7d1cb2110..000000000000
--- a/dev-ml/bin-prot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/bin_prot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
deleted file mode 100644
index 9eba12c62357..000000000000
--- a/dev-ml/cairo-ocaml/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch 769 BLAKE2B b41ebc707315f75a552e9e0614f7180bf773bbc4893f01996db08ee366da33852639d4a6b11c35467d28a2e3c3aa71aed005fbcdf18ca3451b4e5c17f7bad65c SHA512 8312d7371ed073def0454ffefb564158ccf009a09e10eca4a272f93c0936731fe887674d94a2687b0cd4c5da28195c5007da6e050b9a509673fc0071debeb178
-AUX 0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch 742 BLAKE2B a388b82271137f9d578cde618d63f52ddf93c5901ef892db143ce21469bfd9fcc0c45f4208aca10f6fe4556bec75fc18e4ccbe2782f2d4ba2d9a70f27a814c8c SHA512 8305da294c9e69ac56a9250afc3d70afe70ba9229ecde320767019df51b84fc9c09a753f10f0b189ab537b6e8fc5ef8c17d6179bca51fba3138122ccbae223a3
-AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63e77f294cbcec28c42a923aad1fd24a58f9a46739b23ce49038449e9f4618e608cb7bed721b0d9d3c67e3606c2d545a5a34380bb0b9ae2a4b SHA512 e4550c4c9315ce3c2a16361541ad2b3acccaa6d36d922c5361d1c26e1af22491e46713fe58291b6345d832fdf78466a1937c2327acfeaeb070508fddedfdb206
-AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
-AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
-DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
-EBUILD cairo-ocaml-1.2.0-r1.ebuild 1950 BLAKE2B fbe82ba03868919e71c3e55e20d38e443616458a3493a8a8ab598af78e481dde3ffd31c3aa0d347093961831ca05444f62c1eb4a58724207da812bdde928836a SHA512 a772d777572b0c7b17e416c636067718d2b71029a2c017ec7b8fa8c18c438b56f737742ef40b8ea2f0ac811de0893eb81c62f5af78c0facd480280b54b1aa304
-MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
deleted file mode 100644
index f05710bc7330..000000000000
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib autotools
-
-DESCRIPTION="Ocaml bindings for the cairo vector graphics library"
-HOMEPAGE="https://www.cairographics.org/cairo-ocaml/"
-SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gtk pango"
-
-RDEPEND="dev-lang/ocaml:=
-	x11-libs/cairo
-	gtk? ( dev-ml/lablgtk:2= )
-	pango? ( x11-libs/pango )"
-DEPEND="${RDEPEND}"
-
-# 3 patches from debian and one for automagic on libsvg-cairo
-PATCHES=(
-	"${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \
-	"${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \
-	"${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \
-	"${FILESDIR}"/0004-no-automagic.patch
-)
-
-src_prepare() {
-	default
-	has_version '>=dev-lang/ocaml-4.06.0' && eapply "${FILESDIR}"/ocaml406.patch
-	AT_M4DIR=support eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gtk) \
-		$(use_with pango pango-cairo) \
-		--without-svg-cairo
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README ChangeLog
-	if use examples; then
-		docinto examples
-		dodoc test/*.ml
-	fi
-	# ocamlfind support
-	cat <<-EOF > META
-		name = "${PN}"
-		description = "${DESCRIPTION}"
-		requires = "bigarray"
-		version = "${PV}"
-		archive(byte) = "cairo.cma"
-		archive(native) = "cairo.cmxa"
-	EOF
-	if use gtk; then
-		cat <<-EOF >> META
-			package "lablgtk2" (
-				requires = "cairo lablgtk2"
-				archive(byte) = "cairo_lablgtk.cma"
-				archive(native) = "cairo_lablgtk.cmxa"
-			)
-		EOF
-	fi
-	if use pango; then
-		cat <<-EOF >> META
-			package "pango" (
-				requires = "cairo"
-				archive(byte) = "pango_cairo.cma"
-				archive(native) = "pango_cairo.cmxa"
-			)
-		EOF
-	fi
-	insinto /usr/$(get_libdir)/ocaml/cairo
-	doins META
-}
diff --git a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch b/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
deleted file mode 100644
index 6b42f6d4fd52..000000000000
--- a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Sun, 27 Feb 2011 13:31:22 +0100
-Subject: Add missing libraries used by the stubs to CAIRO_LIBS
-
-The recent changes in DSO linking highlighted this, and were
-preventing ocaml-melt from building.
-
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6c8c4e9..0cf1f11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support)
- AC_PROG_OCAML()
- 
- # Check for cairo
--PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 freetype2)
-+PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 cairo-ft cairo-fc cairo-ps cairo-pdf freetype2)
- 
- # Optional GTK support (for the X11 backend)
- AC_ARG_WITH(gtk, 
--- 
diff --git a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch b/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
deleted file mode 100644
index fcb0f0583227..000000000000
--- a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 2 Aug 2011 15:34:21 +0200
-Subject: Fix Makefile to avoid recompiling files in /usr
-
-The "-I /path/to/lablgtk2" option should not be used when calling
-ocamldep, otherwise files there are considered as possible targets by
-the build system.
-
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- src/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 46a62f6..c9c64b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -117,7 +117,7 @@ clean :
- 
- .depend : $(wildcard *.ml *.mli)
- 	@echo "making deps"
--	@$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@
-+	@$(OCAMLDEP) $^ > $@
- 
- -include .depend
- -include .depend_c
--- 
diff --git a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch b/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
deleted file mode 100644
index 8882ce0a4da8..000000000000
--- a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 2 Aug 2011 21:35:59 +0200
-Subject: Fix FTBFS on bytecode architectures
-
-The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining
-it); adapt src/Makefile accordingly.
-
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- src/Makefile |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c9c64b7..bc223c7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS
- TARGETS += pangocairo
- endif
- 
--all : $(TARGETS) $(if $(OCAMLOPT),opt)
-+ifneq ($(OCAMLOPT),no)
-+OPT_TARGET = opt
-+endif
-+
-+all : $(TARGETS) $(OPT_TARGET)
- opt : $(addsuffix .opt,$(TARGETS))
- 
- cairo     : cairo.cma  libmlcairo.a
-@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
- install: all
- 	mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
- 	install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR)
--ifdef OCAMLOPT
-+ifneq ($(OCAMLOPT),no)
- 	install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR)
- endif
- 	install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR)
--- 
diff --git a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch b/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
deleted file mode 100644
index 46b70013fa3a..000000000000
--- a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- cairo-ocaml-1.2.0/configure.ac.orig	2012-06-17 20:58:38.000000000 +0100
-+++ cairo-ocaml-1.2.0/configure.ac	2012-06-17 21:05:49.000000000 +0100
-@@ -27,10 +27,20 @@
- fi
- 
- # Optional libsvg-cairo support
--PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
-+AC_ARG_WITH(svg-cairo, 
-+	    AS_HELP_STRING([--with-svg-cairo],[libsvg-cairo support]),
-+	    use_libsvg_cairo=$withval, use_libsvg_cairo=no)
-+if test x$use_libsvg_cairo != xno; then
-+   PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
-+fi
- 
- # Optional pango-cairo support
--PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
-+AC_ARG_WITH(pango-cairo, 
-+	    AS_HELP_STRING([--with-pango-cairo],[pangocairo support]),
-+	    use_libpangocairo=$withval, use_libpangocairo=no)
-+if test x$use_libpangocairo != xno; then
-+   PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
-+ fi
- 
- echo
- echo "  GTK+         support: $use_gtk"
diff --git a/dev-ml/cairo-ocaml/files/ocaml406.patch b/dev-ml/cairo-ocaml/files/ocaml406.patch
deleted file mode 100644
index 2ef9931463b0..000000000000
--- a/dev-ml/cairo-ocaml/files/ocaml406.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cairo-ocaml-1.2.0/src/cairo_png.ml
-===================================================================
---- cairo-ocaml-1.2.0.orig/src/cairo_png.ml
-+++ cairo-ocaml-1.2.0/src/cairo_png.ml
-@@ -7,13 +7,13 @@
- (**************************************************************************)
- 
- external image_surface_create_from_stream_unsafe : 
--  (string -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
-+  (bytes -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
- 
- let image_surface_create_from_channel ic =
-   image_surface_create_from_stream_unsafe
-     (fun s n ->
-       for i = 0 to n - 1 do
--	String.unsafe_set s i (input_char ic)
-+	Bytes.unsafe_set s i (input_char ic)
-       done)
- 
- let image_surface_create_from_file fname =
diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
deleted file mode 100644
index 0fedfcd6cbf8..000000000000
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-   This package contains all the development stuff you need to use Cairo in
-   your OCaml programs. The folowing backends are supported: PostScript,
-   PDF, PNG, In-memory images and X11.
-</longdescription>
-<use>
-  <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/dev-ml/calendar/Manifest b/dev-ml/calendar/Manifest
index e5d13f937085..1a500f723b34 100644
--- a/dev-ml/calendar/Manifest
+++ b/dev-ml/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-2.04.tar.gz 271522 BLAKE2B e69d129324687cbee55c2217c1c7a89ce0817b60aff3eba8e26d94736e4cc771cf031c66857bc3f6438b9b389030e6f6ff54fd55d6734bef4c5ece0bc45ae419 SHA512 3941768428eda47f47912846cc2921ee82c722bda7cf6095c1c8bdcfebc19bb8f64ebb1a25475396d2a49c186b83421af63602a54a261684117b1c036a66cf3d
-EBUILD calendar-2.04.ebuild 640 BLAKE2B fac0e5142eb51753186d27ad1565ce796466c98409b96e2500df25a37ad8e6ee5c2c8ad8b4c7d75ce5fb813e5e5b2ed7aef64828b0e033ed053f61c14e80617e SHA512 01711ce24b697e1362012c72aad43e78d20b479c1fd670bbd3e26c0cb6b3a9055d90a9da3fce11b7fbc957377330c975a778db0193384a9a16ad2ba38390118e
+EBUILD calendar-2.04.ebuild 658 BLAKE2B 4f0bd3d8914f330e10478680b6b2ea0c02e4369efc80d3421e054384d49552ad8781a92995844304b48bcb1b3be969ae982e40fc28b7f17e731f2441fd206605 SHA512 0e5a48a8f475d5949306bfee4ca5d5a2ffc8ea48f4a1caf609d6c8322be71a6ae233a6b5541824312e5dec1ebc5d5098417b01b4a7dc245b2e5fa394a34779ba
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/calendar/calendar-2.04.ebuild b/dev-ml/calendar/calendar-2.04.ebuild
index 234cd57645b7..22c0e7d10f18 100644
--- a/dev-ml/calendar/calendar-2.04.ebuild
+++ b/dev-ml/calendar/calendar-2.04.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 DESCRIPTION="An Ocaml library to handle dates and time"
 HOMEPAGE="http://forge.ocamlcore.org/projects/calendar/"
@@ -29,5 +29,9 @@ src_test() {
 src_install() {
 	findlib_src_install
 	dodoc README CHANGES
-	use doc && dohtml -r doc
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc
+	fi
 }
diff --git a/dev-ml/camldbm/Manifest b/dev-ml/camldbm/Manifest
index 5bc4f3ea080d..239b87dc453f 100644
--- a/dev-ml/camldbm/Manifest
+++ b/dev-ml/camldbm/Manifest
@@ -3,5 +3,5 @@ AUX include_fix.patch 512 BLAKE2B e99ff15b037c2db639f14ff234c51c2a34c7dc2a5c3395
 DIST camldbm-1.0.tgz 14397 BLAKE2B 9b6971e30815ad6984254591af793819beb3859ddbf7bbd95ee744a2b09ce04968ecad9c7ff954e1606776d82988b3499f2569154586a937a61eb6d5c7b9465b SHA512 d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf
 DIST camldbm-1.2.tar.gz 14823 BLAKE2B b9eda65c56440b1d13562e0d184474e585b13826038e77901961df475cbd73df39c9923e4f73c891252f17416e78acb3c3b42accf01dc5d6f51a72bafa930084 SHA512 56d317db420179f96a0f6a453f8a34ea16942f3ca5ed09dd6955517348dad281ad105b861378f1ebd01ec5c8a1c07d5e5db1ab4d255f9572ece64a86559705f0
 EBUILD camldbm-1.0.ebuild 723 BLAKE2B bdf2c174ea1dd59f20976b4e5efe6050d7bd28aac4b0324c4e79b02e6c1ef31f4437ce19b5f1cb3409b371ea197effc92ad7d6400e70682dae98715e736c2a0f SHA512 daeda32929c10a8b39d84a46d1d64bbd9fad534b065710a34cae0a19d06d8388dde5bf67d577507938ef65a5f73dcf0e64e4eaacd8d1ddd150b34521ea848d5f
-EBUILD camldbm-1.2.ebuild 720 BLAKE2B 02a8f38992abed19e2d6a7caf830f6376957bb86ee40779e512b1ecf2e8633b88feac21015963c6f3256ae29714c80ec6a73b42317722e9b66d07825846b4a29 SHA512 075eebcd51301d2bb36b900b48a4b76b00768e8a786fb15d8c09ccaf58c4b2082827b1ba9bbd9aed27d6a7f99b29f0ca2e191eaeb78920945ba4fd4f5f4b1e97
+EBUILD camldbm-1.2.ebuild 716 BLAKE2B fb3136fc365a06c75b16ff28f9b1da9925fcbc6808bc1f8c0d4cf90f1ee4e6548b85a16fecb4b8fcfce4e579231f77c95f064b14ebe9d684c468fa46f7a812fe SHA512 bcd2c88c451d3fac82bb9afd4a0e0c5f351f8b092e2016dbb6bc666cbaf7391ff08069d66b8cd4f17b93554a50e492e214480551e3eda56590879d4410ecb0fc
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/camldbm/camldbm-1.2.ebuild b/dev-ml/camldbm/camldbm-1.2.ebuild
index 4b6ad3aee3d6..e8ed8d0f97ef 100644
--- a/dev-ml/camldbm/camldbm-1.2.ebuild
+++ b/dev-ml/camldbm/camldbm-1.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/dbm-${P}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 arm ppc x86"
 
 DEPEND=">=sys-libs/gdbm-1.9.1-r2[berkdb]
 	>=dev-lang/ocaml-3.12:=[ocamlopt]"
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index 4c07bfe80157..9b58507bb820 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,7 +1,7 @@
 AUX META.camlidl 123 BLAKE2B ac345245b30f6df1f4ada64526e0f27b68c02311d8b426bee6eb62f91de34df868dacce3a7ba755c1924d5846790c9f90f6a46500b71fb347eea7828749f9476 SHA512 196727adb64e11b4f486419147c2d711a0d278f4f340dcec61318cd76fb816deea78e85c814f6fd4f14dae168a843fe41b0ecca3086d42387475f196519cb850
-AUX includes.patch 361 BLAKE2B 9e04253feb45286142c41bfa83482d9e85ed46a0e37d20f47d6d38f59c5cb5833a1aaa54cba0b241cc23efe497671d788960a294bb5305f5fa96aab4dc05a72c SHA512 e76690bba23d6ac3a4ef0f15feed6826cd203c38919b8fdf043c46c6f7311eef768c9c85b9855d217e1014b0b55086c7dfcea4c132320035aeafcb8e7de2bcd3
-AUX nowarn.patch 347 BLAKE2B 810cff7b2dbb40bac0b998a16684590747e6397195487ed4677a9dffdb778dfbc4a38599d54f5981226481fbf3e50b3f97bb4d88d7beda26a47f6b6da08fd604 SHA512 b436490d97b63ac428ddea2a473c3bf7c027331699234b875dd6215b5f39a3a6aaa5cc2ff7d841cf0ef8d012edcdff98a519437c857676fe6d8407c3610e3303
-AUX tests.patch 1061 BLAKE2B 45519125064c2be10be8e9b5e44b65c67fc70b58499d8cecb9abdcea2e312e03036c7a17861dd0a755d8773cf1b925b5a25ef962107cf6bb14a46c6dd8d6b036 SHA512 72234478b420edbebf48aaba4ab0078c35c3d8eced6634092b8ca605ba93a5791249e2f271ea656e86c62ac45561c25100a5e786f7827b8545ea4996e0f2850e
+AUX includes.patch 227 BLAKE2B 2ed714238126990a834808d8d7565e244bf942402188cc6ab93e05e1ba6e0c4de30304c7f2fb18ab52ac81aa00cd854938ebb8ca434af72c8ecdadf18b09248f SHA512 b8d27e7845706c16bcf07654b36ed17e452f4a9be0119741565977077085cf0fd43f5a69de84866b6b889dbd16432d46a34867f9b102e999d39ef438727f0cc1
+AUX nowarn.patch 214 BLAKE2B 00b4b63daefaea0d8ceb9ef919037567c2ac8a0b0aac8c6634d9656c8b4d93ae4a22edeff45dd3bbc857168119301d0ff8d04901d44c42ddd130b31f8a840340 SHA512 94f4b57f485239715b9f0478025dc0af192e815e6a03d696b47f910e786cfdb583e6205da9bead57a2a7e33e2e6f5d433095774e0e31c10949664693370ee761
+AUX tests.patch 931 BLAKE2B 0f18d35a22067f0189c413c1d52e8b8823b38bdc0024e35105b3074ace352bf47c50fa0ed3834447f7de90c7049d0bf6692c643e113d4e00cca2b1fa95103448 SHA512 436b047d232e0a8f65f87dc3a3da4ddcc4b629dab3475d8097ee29f7bf5219d5bb964407cc11ac7a9df6c31efea9e94d22dc66c4a2ad45dc1cb26938c3fb7400
 DIST camlidl-1.05.tar.gz 100640 BLAKE2B 38cbcebd43ced26c44803608aabdacfbd33734357097a542ee2558223b9699d89cf7be388feba59630b10e4dc3977bffd08c669d3cf676d2136f54a6a8d52aab SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18
-EBUILD camlidl-1.05-r1.ebuild 1292 BLAKE2B 21364af50b590384377442f95c58de1ce15e78b68cda2f52cdbf772ec5bcb9583c7698dd93a82447762e3f949470122329400dd17c73df66dde372e49499018c SHA512 21da9d939f6b867b786ca80b488e080ceb6c4e29a8b3b8b65fa4d2fbd72809317ad81886a2499c91d47ae7ac16f080431952fbe6b80e755ad08630a9bc3c2a8a
+EBUILD camlidl-1.05-r1.ebuild 1295 BLAKE2B e1ffeb1e2ac477d411959ac7a6117778204d7ffd8a55915b15a85568a78b9c2bc631dbb66b1f01f1cac55fed87ea193b4a266a20d346e64c281a6db53ce58ae6 SHA512 121a78ab1da9c9a90f968bf3bacfb838c096dbbea8220e017df7fd293d72dbb709c07ebcf09d128dd5c4aa93f4dcdefb70ecaaf04d25eb4bb25850528fb45807
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
index 6dd3e9f5d3d3..06fafb20cc46 100644
--- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild
+++ b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml"
 HOMEPAGE="http://caml.inria.fr/camlidl/"
 SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
+
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
+
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/tests.patch"
-	epatch "${FILESDIR}/includes.patch"
-	epatch "${FILESDIR}/nowarn.patch"
-}
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/includes.patch"
+	"${FILESDIR}/nowarn.patch"
+)
 
 src_compile() {
 	# Use the UNIX makefile
-	libdir=`ocamlc -where`
-	sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix
-	sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix
-	ln -s Makefile.unix config/Makefile
+	libdir=$(ocamlc -where || die)
+
+	sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix || die
+	sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix || die
+	ln -s Makefile.unix config/Makefile || die
 
 	# Make
 	emake -j1
@@ -34,13 +36,14 @@ src_compile() {
 
 src_test() {
 	einfo "Running tests..."
-	cd tests
+	cd tests || die
 	emake CCPP="$(tc-getCXX)"
 }
 
 src_install() {
-	libdir=`ocamlc -where`
+	libdir=$(ocamlc -where || die)
 	dodir ${libdir#${EPREFIX}}/caml
+
 	dodir /usr/bin
 	# Install
 	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install
diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch
index 060aceefd0a5..077ba21d93da 100644
--- a/dev-ml/camlidl/files/includes.patch
+++ b/dev-ml/camlidl/files/includes.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/runtime/comerror.c
-===================================================================
---- camlidl-1.05.orig/runtime/comerror.c
-+++ camlidl-1.05/runtime/comerror.c
+--- a/runtime/comerror.c
++++ b/runtime/comerror.c
 @@ -22,6 +22,7 @@
  #include <caml/callback.h>
  #include <caml/fail.h>
diff --git a/dev-ml/camlidl/files/nowarn.patch b/dev-ml/camlidl/files/nowarn.patch
index 8b457cf7ed1e..3d9a5bbbf8af 100644
--- a/dev-ml/camlidl/files/nowarn.patch
+++ b/dev-ml/camlidl/files/nowarn.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/compiler/Makefile
-===================================================================
---- camlidl-1.05.orig/compiler/Makefile
-+++ camlidl-1.05/compiler/Makefile
+--- a/compiler/Makefile
++++ b/compiler/Makefile
 @@ -29,7 +29,7 @@ PROG=camlidl$(EXE)
  all: $(PROG)
  
diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch
index f7272424be80..f8c4595f9fbd 100644
--- a/dev-ml/camlidl/files/tests.patch
+++ b/dev-ml/camlidl/files/tests.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/tests/unix.idl
-===================================================================
---- camlidl-1.05.orig/tests/unix.idl
-+++ camlidl-1.05/tests/unix.idl
+--- a/tests/unix.idl
++++ b/tests/unix.idl
 @@ -15,16 +15,16 @@ quote (C, "
  
    union process_status { int code; };
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
index f8fb73167620..7770882315d0 100644
--- a/dev-ml/cinaps/Manifest
+++ b/dev-ml/cinaps/Manifest
@@ -1,5 +1,5 @@
 DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
 DIST cinaps-0.15.0.tar.gz 9697 BLAKE2B b3c28b54269b7c35070b1a61b99087986aa5fead2792558597964a55d935544f09167aed269d6d68be65c1f588b7c0d645aabeed303885929a2f41628f6fabd9 SHA512 e69018c1b8ffc8895a5280c592bfbb0ac074b5a0367dc79392198819e751bf77dcbb67cf56e5f722e57939538a54b584bdb998cd8baedf6d01014a1f7d18a0c5
 EBUILD cinaps-0.14.0.ebuild 545 BLAKE2B 48b581375ac583904e5e91d7f8bf1b696ba77f9b67b434d107178eb56c2095168b99be2dd830d32a7dd42e2ec3e27d87afce1be8315a719fa8ae4a8571df3cf5 SHA512 2e79d9a29b94e1bb74c0988be7bd6320b4181d8607f8f9af2a2725b44b110a4e9968f32f2237c78c21a00fa2b72d7bd096118ca8faf8d21d4e8065ed01082ba5
-EBUILD cinaps-0.15.0.ebuild 510 BLAKE2B f85fb27821b015fa56a6264d629eff6641f91e4a6c6df27a6491f070a25dfdc5ce3e12d6304a72148ce96451f35514e7bcc8d8a1033b5f32208d44f3819ac158 SHA512 d9a6e88526dd9460c560c58a60aed0679d7d2e27875bad42eb269772fc78fc6d64eb5f3785b9f5fb30619f2510c5ec50910248ec372da6e38ab956523c403ecf
+EBUILD cinaps-0.15.0.ebuild 504 BLAKE2B 36834a92bb2b3d9ae4326dc0b88d28b701b47f461e6ca35b2034feba17c717bc8e8477ee946965d9b8f2b940148d378cac40891bf1c21572dcdd780d25b3e11f SHA512 61682db11933dd1a8409c5894f89613e3958a283da5d0c157f133182fc52d0784c0bba340c2599af1a36d2f33cb7154cde20666c84abfa69de5085287b7d5de3
 MISC metadata.xml 418 BLAKE2B 020f896b664f7d3ff2de0152579c4e1000ce701e70394d892a86e89e556ed6de3b7535fe1e8db08d249e7c370a6f1dd37b81aa5dc07cf5660098acc15ecbcfb2 SHA512 1753dad85161623bd0a7598a01266fcdd8441ab6d971b1012a6b9705afa210342e601b5feed0ed8f3d77d4005206285d7e08b0ac32a85b09de951a55badfbe14
diff --git a/dev-ml/cinaps/cinaps-0.15.0.ebuild b/dev-ml/cinaps/cinaps-0.15.0.ebuild
index beef48458589..52c200249b97 100644
--- a/dev-ml/cinaps/cinaps-0.15.0.ebuild
+++ b/dev-ml/cinaps/cinaps-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/configurator/Manifest b/dev-ml/configurator/Manifest
deleted file mode 100644
index edbc0f566010..000000000000
--- a/dev-ml/configurator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST configurator-0.9.1.tar.gz 10231 BLAKE2B e80deda7cf53a6fe2ef042696c5e815576a5f846e2cbe360b8b3e938ee2bd81b4e93f51141a1e10a18bb97a7b0ae41be64409bd85a9ad85eab4595ca36889ee2 SHA512 43d864d3317241dd66829747dd956ac42614cc687bbca23e2575cb1b3ab9d0c628dfbdd8f026bcd4d76cb87cf282d955d6a90f0e69543ee1ee1f01a1efa9b54b
-EBUILD configurator-0.9.1.ebuild 759 BLAKE2B 64a366966a07b283e36d366bb2d2f9586b077b6a6861c4e8f78ebdd2c48792f7cb4a53dccf2c70d48f462178502a9822605e8597710ed0fb22ce00213b188f9d SHA512 fe543f77813d1b892d379423199eff09b985a57b9b194f4827ddbb30312d3e04c00d1f312d82bc58148c5adf55436b7ed7d70bcc37daa31d060fe65e3becd922
-MISC metadata.xml 255 BLAKE2B fbfe94c93014a6ee987f6858b9e45dbecab66e145b6eaa81ec4031f5a9ddf148a6f561287263d932229cbe2033b2e0e41c082466ba9ba2a3a8641d89613c0c12 SHA512 a67a0569f9997b9e87ab58299d37e0c35fb17f0e95396ac27c745827d7cb967e9da36eb37aec646cfaa0c67f4ff3d94219263bcdeffd3d55ccbb31811a154153
diff --git a/dev-ml/configurator/configurator-0.9.1.ebuild b/dev-ml/configurator/configurator-0.9.1.ebuild
deleted file mode 100644
index 76c8abbab093..000000000000
--- a/dev-ml/configurator/configurator-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/janestreet/configurator"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/ppx_base:=
-	dev-ml/ppx_driver:=
-	dev-ml/stdio:=
-	dev-ml/ocaml-migrate-parsetree:=
-	"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-}
diff --git a/dev-ml/configurator/metadata.xml b/dev-ml/configurator/metadata.xml
deleted file mode 100644
index 2cebdea92b52..000000000000
--- a/dev-ml/configurator/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/configurator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/core_extended/Manifest b/dev-ml/core_extended/Manifest
deleted file mode 100644
index 3b2d85562b06..000000000000
--- a/dev-ml/core_extended/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST core_extended-0.9.0.tar.gz 234944 BLAKE2B 9c6985b2c9a34ca3fd3bd6016240140d09ccfad2cdf264923e826d1399ead3d827674b5438c90e75dee9511ed4005d945d2e4b73bb5778475b55871c59231a50 SHA512 16e64ba2e3bbe31a6bde03c0ca65d238445f19d8f2aa1f11157efd4f4fab76adb28607329e853eafab04de549f303b033522cc46c3e179094ac68071ce797a5e
-EBUILD core_extended-0.9.0.ebuild 875 BLAKE2B a23f1adf07cb937b216214aaa87ffb36b56c3969d9da01a28b121c49f3c9555873b36daa0c30739145840198eab10bc17d6b12cc40bc552ec6dc926404e1e642 SHA512 bed2b46dd4ac99c1fb0417d42422f61b0445d936c35ba69e161a079dafb8e4e6c57267452c3b181aae28d8acf0677461d3d80f9957640d48a9529f5235e7eee9
-MISC metadata.xml 256 BLAKE2B f1e970b50f43b76bb6e627593f75e28f29413abb88bf4b46f86468b0211d73daee5a8cae1056fdc84aff0e065da19dddd864fcd9b32fa5d65771f4c05e82550e SHA512 226404032d28448d86c494c3c10e39b0b3b804fa9edd82b9594127ea90d109ea524f51965c5ca0f2b8fdaec7ac921968ba3b414bf370de4e99b5ec43eead6b51
diff --git a/dev-ml/core_extended/core_extended-0.9.0.ebuild b/dev-ml/core_extended/core_extended-0.9.0.ebuild
deleted file mode 100644
index 4f17a7f52f95..000000000000
--- a/dev-ml/core_extended/core_extended-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Jane Street's alternative to the standard library"
-HOMEPAGE="https://github.com/janestreet/core_extended"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-lang/ocaml:=
-	dev-ml/bin-prot:=
-	dev-ml/core:=
-	dev-ml/core_kernel:=
-	dev-ml/fieldslib:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_jane:=
-	dev-ml/re2:=
-	dev-ml/sexplib:=
-	dev-ml/textutils:=
-	dev-ml/ocaml-migrate-parsetree:=
-	<dev-ml/ppx_jane-100
-	<dev-ml/ppx_driver-100
-	"
-DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-}
diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml
deleted file mode 100644
index 0eed67d03c73..000000000000
--- a/dev-ml/core_extended/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/core_extended</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/csv/Manifest b/dev-ml/csv/Manifest
deleted file mode 100644
index 83a4a4f5bb59..000000000000
--- a/dev-ml/csv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST csv-1.7.tar.gz 45160 BLAKE2B 2f51f927d9099382a227e20471e60075f8796d7753152e266c121f705e4dab7036659937630302f152cd8f28d6db1aee3d5c72c339a45477292ee03c4bc461ab SHA512 cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
-EBUILD csv-1.7.ebuild 737 BLAKE2B 5a7e4901f97dff8c2f4c5d25b8ecc6b872bde2c5e57302a726820a7cb7bd8bc86975ee4a541dc6a4ec550e4d7ff89a27e490b59523468797d61f3630abe871bd SHA512 20e561d88b7598be72c68870d38fc16b73d41f8c56563bd906917e4f5683d3880976ac35bd873c8082664c75b0959ad485676b8030aca822c528be3ed75d9598
-MISC metadata.xml 349 BLAKE2B 1e8e0b12edc39e2e71831655c46dc0a197cca25030b60a61600a021f0c1228a0bc7afb4829afc48c9ac874ac5730d2d59b4c1a29cbb4c95a4551e0ed828bd266 SHA512 143b12e66cad9bf4c9586e9c7a95743522291d8d99c1880b9ef580b4dfbdbe9b6ca81ec15694de5c764348a42a6f193ca9b499c8e6a43ccf3a4c4ca05dcd3011
diff --git a/dev-ml/csv/csv-1.7.ebuild b/dev-ml/csv/csv-1.7.ebuild
deleted file mode 100644
index 817e095edb27..000000000000
--- a/dev-ml/csv/csv-1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A pure OCaml library to read and write CSV files"
-HOMEPAGE="https://github.com/Chris00/ocaml-csv"
-SRC_URI="https://github.com/Chris00/ocaml-csv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+lwt"
-
-DEPEND="lwt? ( dev-ml/lwt:= )"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/oasis"
-
-DOCS=( "README.txt" "AUTHORS.txt" )
-
-S="${WORKDIR}/ocaml-${P}"
-
-src_prepare() {
-	default
-	oasis setup || die
-}
-
-src_configure() {
-	oasis_configure_opts="$(use_enable lwt)" \
-		oasis_src_configure
-}
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
deleted file mode 100644
index aad9c6c4d154..000000000000
--- a/dev-ml/csv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Chris00/ocaml-csv</remote-id>
-	</upstream>
-	<use>
-		<flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 9b36d3c23d07..1a14f6bf9348 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,4 +1,4 @@
 AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
-EBUILD cudf-0.9.ebuild 1659 BLAKE2B 2111fda5bfb9a1618a2773846f35baed5349390f68918077fa6e148cedab29e3bc03a47de482c5aaf209c55c97fc09fc72c024cdd56cf8ef6c97aeb2cb1c3616 SHA512 49494c73b8db9f3f9070eb27982faa704ff83e9797341d57f30681358ab0448fdbe5937ac2ce58c78e5ac424dccaa886a826eedc2e65324f0418530998d9b393
+EBUILD cudf-0.9.ebuild 1679 BLAKE2B 9620453c7b820c6b069edb0f052053ef005e15245ae3db2758687ff07953238f2c86632a0e23dbc7efb753acaaff4c86af7a6ea93ea9372b0fc545d0139ee983 SHA512 bad2642485af229d45b113a65634e338595f7fe5d74e531ee603f95cbf65a2ff48bc1dd6d4cc59a010085ea19e180111b13818301ff3e5157b7a70f6ab6d96e8
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
index 9557d7c35db5..815a1af28ef7 100644
--- a/dev-ml/cudf/cudf-0.9.ebuild
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
 HOMEPAGE="http://www.mancoosi.org/cudf/"
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	dev-ml/ocamlbuild
 	dev-lang/perl
 "
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=( "${FILESDIR}/ounit2.patch" )
 
 QA_FLAGS_IGNORED='.*'
diff --git a/dev-ml/deriving/Manifest b/dev-ml/deriving/Manifest
deleted file mode 100644
index b1d122e860b2..000000000000
--- a/dev-ml/deriving/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deriving-0.7.1.tar.gz 68550 BLAKE2B ded445dbc7f1b8402ae89742abd4f581754a6513aaeb0edcd08f3b0866e531e1731c235bcb50e587314929343fa6a4cfdd11aa9bd8527c03b0813c0a27949d98 SHA512 d4c4b38321f2fc5ed1a9ea7910ec4fae15b08485ae9067048a609d5b9d76188da02995cd18a034c561494cdd3aa8dbb57a1a1c69918b1f79d70f89c96a26d342
-EBUILD deriving-0.7.1.ebuild 664 BLAKE2B 95d4b81fb673975ea389f41a237870dc0fb5a4c6bd048e334e034527359cfd099abbaa1b51c369a095d6fffb4ddfec6dcfef42b0ad32e07966c1ce48c8634531 SHA512 aeb4b864a55a1e12ee23fd1f92c2c2422b02f681acc430f4d12d95ad3d7131870bc13e6b927f74fe8b91c8a93a4c413cd087981585eba03a8293f9b6a0bd049e
-MISC metadata.xml 253 BLAKE2B 74b72bebdafc15cd394de58a34f84bcf61846ed78474035c1ac67af887209b44619ba16201d597b023cfe28077045d70e74859c1840a8e8d729f0b2cf67e16fd SHA512 24853418cf5481c94d0b91fb1cff62bc90efe56095d3b32ee1933442bd8e564f3a0f1b8ef6f7d18e95f2de668de53bd8a33dc02ccc0c00b1728c3d49d9253765
diff --git a/dev-ml/deriving/deriving-0.7.1.ebuild b/dev-ml/deriving/deriving-0.7.1.ebuild
deleted file mode 100644
index 845c827a8b68..000000000000
--- a/dev-ml/deriving/deriving-0.7.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A deriving library for Ocsigen"
-HOMEPAGE="https://github.com/ocsigen/deriving"
-SRC_URI="https://github.com/ocsigen/deriving/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-ml/type-conv-108:=
-	dev-ml/optcomp:=
-	dev-ml/findlib:=
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/oasis"
-
-DOCS=( CHANGES README.md )
-oasis_configure_opts="--enable-tc"
-OASIS_SETUP_COMMAND="./setup.exe"
-
-src_configure() {
-	emake setup.exe
-	oasis_src_configure
-}
diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml
deleted file mode 100644
index c29d7a46bfb0..000000000000
--- a/dev-ml/deriving/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocsigen/deriving</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/dns/Manifest b/dev-ml/dns/Manifest
deleted file mode 100644
index 2247a9ebe0db..000000000000
--- a/dev-ml/dns/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-dns-1.0.0.tar.gz 99161 BLAKE2B f0fa068296ac7eb5331ff7f5f88ee60a3010ac146f4b5bfeeffc8db014e6e5563da4f516ee1090365d290fb50b2754576b14167d55b2a33e125046103d485c1e SHA512 199653605e985851dcaafc94f1efeba5c261c29cd5e5f8eaebc9f7d25a05c43adcf7620efb291b22f9549f7c05f8ac3f6abfbcf40e0d7762bd2f7cd623ebcb1c
-EBUILD dns-1.0.0-r1.ebuild 855 BLAKE2B 107eb93134c2fb258da3f3870429f57a48db14639d859b6d00ab55eec0f4cac80b53538409cc5e53dd21aeb033d72d97c5ccc9f334ec0e8bdd77a9ca20ef2c7c SHA512 d33339565f30f64a2c63a79099e18096c8d8358ea3cbdd87e2ea69d1acd94ac3808d7ddb7c4f7306ae63cbd70cd8fd0b75fbcbc48ebdcd5f3948600a83161c66
-MISC metadata.xml 313 BLAKE2B a288ca0f7cbe6e169335ee1eceb61af6b49144721e3466e9f529e81d0d0ef662db1700219275ea0b5307d103f9e9591a4a625cbcb78500cd2810dbcc6a27ff86 SHA512 d0e0467f77bae53ae8c0974d4d1499410bf33272619c95893e1d27ec76de44c572b146bfa863fe045c80c6353d645a219cc56fa8c40c024228a48e2ef25ecf58
diff --git a/dev-ml/dns/dns-1.0.0-r1.ebuild b/dev-ml/dns/dns-1.0.0-r1.ebuild
deleted file mode 100644
index 02a29c7096f8..000000000000
--- a/dev-ml/dns/dns-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib opam
-
-DESCRIPTION="A pure OCaml implementation of the DNS protocol"
-HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-ml/ocaml-base64-2.0.0:=
-	>=dev-ml/ocaml-cstruct-3.0.2:=[ppx]
-	dev-ml/ocaml-hashcons:=
-	>=dev-ml/ocaml-ipaddr-2.6.0:=
-	dev-ml/re:=
-	>=dev-ml/ocaml-uri-1.7.0:=
-	dev-ml/result:=
-	!dev-ml/odns
-"
-DEPEND="
-	dev-ml/jbuilder
-	${RDEPEND}
-"
-
-# Do not work
-RESTRICT="test"
-
-S="${WORKDIR}/ocaml-${P}"
-
-src_compile() {
-	jbuilder build @install -p dns || die
-}
-
-src_test() {
-	jbuilder runtest -p dns || die
-}
diff --git a/dev-ml/dns/metadata.xml b/dev-ml/dns/metadata.xml
deleted file mode 100644
index f66f6b2c6b53..000000000000
--- a/dev-ml/dns/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-dns</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index 2cd8883caf8b..1576785b7f2a 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,4 +1,4 @@
 DIST dose3_5.0.1-16.debian.tar.xz 39448 BLAKE2B a5ae8c74ee1a5a89bf3594cbaf0b37703fcf03a03e336c6b91626fcb6767518c517bf28ec4a24f6cbeb40e1544b34e95855507f39aacca110e8daa6e6e5d3994 SHA512 52d14a45bc0b0a66c4cf3acc05b479b1456c78fa8cb0e453a01dd2f0d849dfcf959bd9e8ff8d505272ad7ad542ff402013746816ead3ccd2dbd0bed572ee2930
 DIST dose3_5.0.1.orig.tar.gz 297433 BLAKE2B 74ae954604f26398f091b4f14d2a633132ae62102f52af13284af27e41cd7c47afb1b533b0821a8921ba33fa6658e94b3bb6bf5f104f48881a50e14517cd65e2 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
-EBUILD dose3-5.0.1_p16-r2.ebuild 2264 BLAKE2B b91216ce6df7fe918529560c02850505cfcbf1fdbf99ad42ed6ec8b802381b815917cb738ae88b6060f48c3757d458f4a2eef68d808f537f7e0d4b7a3de17e53 SHA512 e989a1397ec4eb4b40d75c46ea2c5227e8589657ecfae2715b15218ba8072807f0b616bec3aa17b0fcfa5fb82fb1db14584027c452c473cd867aeeeb419f82a6
+EBUILD dose3-5.0.1_p16-r2.ebuild 2257 BLAKE2B 7fc8cf9ce79d9f692c0cfa2f3afbb8072ce1467c2c5eceae04e5c32160cbd8c9488bebe52d8df46b6650d52e4e2cfc53f0ecc0a16ebeb51e2f28f6db802a7f5f SHA512 d46c94ddbd9226422025536a090c54f6800825d01745099c138242c3177208e7993cdd96399519868d9d4378f6b3584e5dd5f378af36a9488fa839f625b62bea
 MISC metadata.xml 567 BLAKE2B edf392175ce748915b9584ba1bb3885338c52f2c85f0beaa7695ecc556319af95d3485ab8bf94d97975e4cea2b30ddd47e31fe5df8a97911ddca0e720903c760 SHA512 254fd968a79b76a7ee792091a1106d20e76d168f57afa415aace3d150c793613c73d3bbd9d8a150d99595445ade1966da0dc059cb61dfae084478a5aeddb7fc8
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
index e8cf0a7bf4fb..b869201b21ed 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
@@ -77,6 +77,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
+	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install
 	dodoc CHANGES CREDITS README.architecture TODO
 }
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 779fff7323c4..d9f295cd0f08 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -1,5 +1,5 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 EBUILD dune-configurator-2.8.2-r1.ebuild 3690 BLAKE2B 9924f03dfcb3aea4d18f6aad506875adcac52853279895dd02d334e9453a813cda55d9dd03ef75cf4f28c26a985644f16e359c31f1b4344d0a0d0d63280e71ab SHA512 da7e364dab740d7210662f626dc1160a3ff83a81a880fd6a4132bc64a749f07e44a1a127961c930027cd600e76dbe2438f1b284a9400310d09d6fa0ab1605b08
-EBUILD dune-configurator-2.8.4.ebuild 4118 BLAKE2B 1754774ccc4d32b252bb6fcf33b735051d8a6eb811bf520ccae53db0bcc28ef7b626cb5d543fda9fe0d08b8106afaad7d1490cf5c312e71f481c7dca55aa6bcc SHA512 af6f4ed4d33ef40018356f9dac5acce992ca8f4dcb34e566da2a1a3801490490df28ed3308656d60edf763059490d7a0f8834f9ac17763ecde2f7a6e7a02600d
+EBUILD dune-configurator-2.8.4.ebuild 4112 BLAKE2B ecdec62b5f0c2d5b96f74fee3c2d670877eb7003e26c3b4e24bddbeebbcdf476b5dfc15a9d6f2a24672de1592ba4561e9f29c7e52a816ba785448c938c7dcdba SHA512 749ac99b177af225ab9ea810cdcac69cb8d54a231d5f0e5e37469da7dffa2c5e38a277aaa35df122213f066aa9624241b54fb2c262146860c86ffe6043760101
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 56fa50bd7cf5..56fd4108739d 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index 213b61788364..a09a9f4ac453 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -1,5 +1,5 @@
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
 EBUILD dune-private-libs-2.8.2-r1.ebuild 3691 BLAKE2B 7275871c01c4f1c68db72e7c0fe976103dd916007fee23c901f5007783b84a113f30857fb1106f64e0e01a3b4db2cae19115cd29a921ccf7a7c4527234c21d3f SHA512 846081c97aa0fd064e2089fc9d17b87ca6ca2c247341ddd1704bd53170c829151a8a3b4fa9404b71eed99705e4d437c31baff7be7835c1150750900940617d7a
-EBUILD dune-private-libs-2.8.4.ebuild 4119 BLAKE2B eaea1ebab708adcbd6d1807cb2a14010e3cac7d7dbaeaa12c291ea2d2c4dc804a5e34a4a2c02ac342f73d98f09156ceb5bee510fe0d15dc91bbfdf7afd70dc2e SHA512 458293150214b84f21c2aa64923bf04fe49e7f7d1bd075219e12bed6ccf989bc2af492c15e0b18979e85483c15e13a35d481c3a1f18540b27a14d3302105f49a
+EBUILD dune-private-libs-2.8.4.ebuild 4113 BLAKE2B abbb2c64d54ffe7b78468d37517a83725e561ba58cfc85f710576342720bb92bc8b40e7818ebc1537c0ce5651d1a38ae8da5ffaeab278a63364a5298bbab44c7 SHA512 6d6f87691c660cd4d01e8a3adb86cb46b2cbac3b4288e8f9d34a89795bf8e7891badd9bc364ed8593c85a8b45bcde24da03c1cb6026c054aef3d164f47598ceb
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
index 7b6b59feb352..f11dee1ac83d 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index e5a1504e5708..4612307713ea 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,9 +3,9 @@ DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e828
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
-EBUILD dune-1.11.4.ebuild 688 BLAKE2B cdf2a8f91b21e32ebf3c0f22c05b4f61560c0adfac4e67c17c1729506216919a4013c26ab1556d47e3e4722d9a81c01c84170b5dd914f4a4c70b3a1ec5fd8115 SHA512 5e3dd0d2e81006816ee09005891644f252bfaa2e37d800a0a3d9892ff7fd59ec80cfcbd581ba60e34a202afc940f0c6461bdf0c155a4e42ce54b31614e2881a3
-EBUILD dune-2.1.0.ebuild 693 BLAKE2B f29523daba28750f07a15e6e6acfb47bce3d0793fda6fd95af855f9cfe19b534059f3824bc0f66af3d6bcaa9f728b94ff6e0d1aa6f64989d4957515c9dcaed5b SHA512 453c4ed9686b9e33b237d977cfefe5d920487318f0a29e14bc70ea829cab78508e59c7e876fa9bb7edafffe8b6e4d24b71b0b9c88b6679c845f950e6bdf512d1
-EBUILD dune-2.7.1.ebuild 760 BLAKE2B 78f494098d67c0f08aa9076186b2641bbfaa082c3e14f767f8b6e399c2ba503eaed3d4400b5831b353483ecfb6b1216e64099a0d2dca2108fc68928860fd7476 SHA512 b5cec406cc7f8dd2ef0186f73aee3cd9d4feae1319ef2ff26d2d48b1755c530efa08e356a12c3c52cfedc2685f1482087b443a7825f71891840e76cc9d1ba3e4
+EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
+EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
+EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
 EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
-EBUILD dune-2.8.4.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
+EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-1.11.4.ebuild b/dev-ml/dune/dune-1.11.4.ebuild
index e767836ab78c..f6d5ce200b8a 100644
--- a/dev-ml/dune/dune-1.11.4.ebuild
+++ b/dev-ml/dune/dune-1.11.4.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit multiprocessing
-
 DESCRIPTION="A composable build system for OCaml"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +15,6 @@ IUSE="test"
 DEPEND="dev-lang/ocaml"
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -27,6 +24,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
index beec8b498b00..dc4c0613e50b 100644
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ b/dev-ml/dune/dune-2.1.0.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit multiprocessing
-
 DESCRIPTION="A composable build system for OCaml"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +15,6 @@ IUSE="test"
 DEPEND=">=dev-lang/ocaml-4.07:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -27,6 +24,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index 52a9b1648031..d4ddb517ae0d 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -17,7 +17,6 @@ IUSE="test"
 DEPEND=">=dev-lang/ocaml-4.08:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -32,6 +31,6 @@ src_compile() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild
index 47084c42bd00..ae0c9474e80e 100644
--- a/dev-ml/dune/dune-2.8.4.ebuild
+++ b/dev-ml/dune/dune-2.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
index 0b34515988b9..0a4921e7efbb 100644
--- a/dev-ml/easy-format/Manifest
+++ b/dev-ml/easy-format/Manifest
@@ -1,3 +1,3 @@
 DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
-EBUILD easy-format-1.2.0.ebuild 667 BLAKE2B 29a46d20176330c80d0d9bf7132bec4eec2ce7c0bf54f0eb41759336aa0737b00b7fd0ea737154f20058eb5dfb443aedfd15c38e5b1b198bbf3ce51870625f80 SHA512 f21275174e49404dcccef768d41925edf46040147a246760e12fe851444d1ec75117d83d62b499100306a96eb0ddffe37c6d3f6f9f9c8cd171790bd388540559
+EBUILD easy-format-1.2.0.ebuild 663 BLAKE2B f1c4acb05ed87333ceccc0a89f00feb2167dfc9834d2ba4ebe6db3faf9ff0a58732144ea3484d616fee37e17d96e44be3ddd8055b5103dc495f483750e7f81fb SHA512 b09e2d80a2188a4333617fbcf0bce1afeb513d71bac326d2211658aecf336bba1d28b706fcc946c72649aa0af27ba4471cc3982ac84b7704ee48818595c07f74
 MISC metadata.xml 251 BLAKE2B 74ebf46bc822086f29fdbc1ed4b4ba867ef18b43a8d0cddd7d12d8af90eae16f1ebcd58d6aec1c6787fde89b239805fce3453a655a967f71ba7bdf076f94b57e SHA512 d66a84be5f4853c868e485056636f04c4f6db8aaf57c0d4050239f2b6b10c88ecd8f0076043ca4603dc72c834d6cb656eeb3a963e62bed03b63ed2ead2d7a972
diff --git a/dev-ml/easy-format/easy-format-1.2.0.ebuild b/dev-ml/easy-format/easy-format-1.2.0.ebuild
index 669c69092068..8a98e21fa9ab 100644
--- a/dev-ml/easy-format/easy-format-1.2.0.ebuild
+++ b/dev-ml/easy-format/easy-format-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit findlib
 
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/mjambon/easy-format/archive/v${PV}.tar.gz -> ${P}.ta
 SLOT="0/${PV}"
 LICENSE="BSD"
 KEYWORDS="~amd64"
-
 IUSE="examples +ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
diff --git a/dev-ml/eliom/Manifest b/dev-ml/eliom/Manifest
deleted file mode 100644
index ea23dcf50b31..000000000000
--- a/dev-ml/eliom/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX lwt3.patch 1654 BLAKE2B 12f4072a740da3fa29070005634197ce2b442dab48ccb1f78e7b48076d5b9363fe0d669afe4578eab7fc684461cfa0539436f1a6710d924fd712330a777921cd SHA512 14b521b8622c07d472211af1e50b4a880ffa28ac18c3fb04d459a3302f22346ae31e1c76f9ace728d2ba6383c7222a3a1dcb7896552e5bdf3251b2db1878217b
-DIST eliom-6.2.0.tar.gz 724359 BLAKE2B f52805c83f71eb76e3a183637d9800690714dbe07cbe82ad1bac09ea02ac286cbae541b22dea73592bd8cfa095700264c2a8903ead5fae498e847c4f6bdc8d47 SHA512 02ea52c78470f222297dd9f82218e82427ea2d2d0c9f261d1a9c2decbe7644c0bf583b77b8cef2577d5662d363efd276755f400e7a4c29c89a2265e49ca850db
-EBUILD eliom-6.2.0.ebuild 1544 BLAKE2B c10ea42e4a93fd36086fd40cc7d2ff5d66dda609290626bbfd9d6255ea7a98367e992393b1f2f418c6a9001e7353d2f1f58d03f3bbcce348a24a4aecc6c7b001 SHA512 5d776b94022cd76c2e12fef2040599e43a5edf1d7cf20387993f5d5f40bc5e71d58d24930d236e9750e17c159ec9acd670be8704b6e25b0f7a56e33fa90a134d
-EBUILD eliom-9999.ebuild 1492 BLAKE2B c17b1a69a7b8bb620a09731d316002a34efad182c7bfb7900f01862a4f07bf86dadd7ffc486e0fd2898772daf53a214981f5e6efc3158a87273112a6cba32e0c SHA512 e207bcdfd12adf5f5223c0d983a0b149db55d70f527410bf8c4649b769ac921bd9cef05262fa67efe4132243d766b4cc78d42dc60c67681ca0e1d4460c3aedec
-MISC metadata.xml 323 BLAKE2B c605c2e9e661905fea452e61c58008f82fe2070a234a50ed7c5ebd3e1313a0182ad1605a137055d05765c7b18872ccacad735a4222cdb628b8f08c02bf58e935 SHA512 2d7ff78ccab62a4a00e3acc7ab4ceaf64067c08836f1fced698d3c5f0e549beb0dbd001f8c21d8161c6273db65ab61ad458a08b7591e3e9ae2dccf51707b8991
diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild
deleted file mode 100644
index d1da9028bbfc..000000000000
--- a/dev-ml/eliom/eliom-6.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib findlib
-
-DESCRIPTION="A web framework to program client/server applications"
-HOMEPAGE="http://ocsigen.org/eliom/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
-else
-	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="doc +ocamlopt +ppx"
-
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
-	>=dev-ml/js_of_ocaml-2.8.2:=[xml]
-	>=www-servers/ocsigenserver-2.8:=
-	>=dev-ml/tyxml-4:=
-	>=dev-ml/deriving-0.6:=
-	>=dev-ml/reactiveData-0.2.1:=
-	dev-ml/ocaml-ipaddr:=
-	dev-ml/react:=
-	dev-ml/ocaml-ssl:=
-	>=dev-ml/lwt-2.5.0:=
-	dev-ml/lwt_react:=
-	dev-ml/camlp4:=
-	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-	dev-ml/opam"
-
-src_prepare() {
-	epatch "${FILESDIR}/lwt3.patch"
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		emake PPX=$(usex ppx true false) all
-	else
-		emake PPX=$(usex ppx true false) byte
-	fi
-	use doc && emake doc
-	emake man
-}
-
-src_install() {
-	opam-installer \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		|| die
-	dodoc CHANGES README.md
-	if use doc ; then
-		docinto client/html
-		dodoc -r _build/src/lib/client/api.docdir/*
-		docinto server/html
-		dodoc -r _build/src/lib/server/api.docdir/*
-	fi
-}
diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild
deleted file mode 100644
index 216ba051bff0..000000000000
--- a/dev-ml/eliom/eliom-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib findlib
-
-DESCRIPTION="A web framework to program client/server applications"
-HOMEPAGE="http://ocsigen.org/eliom/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
-else
-	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="doc +ocamlopt +ppx"
-
-RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]
-	>=dev-ml/js_of_ocaml-2.8.2:=[xml]
-	>=www-servers/ocsigenserver-2.8:=
-	>=dev-ml/tyxml-4:=
-	>=dev-ml/deriving-0.6:=
-	>=dev-ml/reactiveData-0.2.1:=
-	dev-ml/ocaml-ipaddr:=
-	dev-ml/react:=
-	dev-ml/ocaml-ssl:=
-	>=dev-ml/lwt-2.5.0:=
-	dev-ml/lwt_react:=
-	dev-ml/camlp4:=
-	ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-	dev-ml/opam"
-
-src_compile() {
-	if use ocamlopt ; then
-		emake PPX=$(usex ppx true false) all
-	else
-		emake PPX=$(usex ppx true false) byte
-	fi
-	use doc && emake doc
-	emake man
-}
-
-src_install() {
-	opam-installer \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		|| die
-	dodoc CHANGES README.md
-	if use doc ; then
-		docinto client/html
-		dodoc -r _build/src/lib/client/api.docdir/*
-		docinto server/html
-		dodoc -r _build/src/lib/server/api.docdir/*
-	fi
-}
diff --git a/dev-ml/eliom/files/lwt3.patch b/dev-ml/eliom/files/lwt3.patch
deleted file mode 100644
index 6b8d993fb687..000000000000
--- a/dev-ml/eliom/files/lwt3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: eliom-6.2.0/pkg/META
-===================================================================
---- eliom-6.2.0.orig/pkg/META
-+++ eliom-6.2.0/pkg/META
-@@ -13,7 +13,7 @@ package "server" (
-               react,
-               reactiveData,
-               tyxml,
--              lwt.react,
-+              lwt_react,
-               cryptokit,
-               reactiveData"
-   archive(byte) = "server.cma"
-@@ -49,7 +49,7 @@ package "client" (
-               js_of_ocaml.tyxml,
-               js_of_ocaml.log,
-               js_of_ocaml.weak,
--              lwt.react,
-+              lwt_react,
-               react,
-               reactiveData,
-               tyxml.functor"
-Index: eliom-6.2.0/src/_tags
-===================================================================
---- eliom-6.2.0.orig/src/_tags
-+++ eliom-6.2.0/src/_tags
-@@ -11,7 +11,7 @@ true:keep_locs
- 
- <lib/server/*.ml{,i}>:thread
- <lib/server/*.ml{,i}>:package(lwt,ocsigenserver,ocsigenserver.ext,tyxml.functor)
--<lib/server/*.ml{,i}>:package(react,js_of_ocaml)
-+<lib/server/*.ml{,i}>:package(lwt_react,react,js_of_ocaml)
- 
- <lib/server/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
- 
-@@ -24,7 +24,7 @@ true:keep_locs
- <lib/client/*.ml{,i}>: eliom_ppx
- <lib/client/*.ml{,i}>:package(ocsigenserver.cookies,ocsigenserver.polytables,ocsigenserver.baselib.base)
- <lib/client/*.ml{,i}>:package(deriving.runtime,js_of_ocaml.deriving)
--<lib/client/*.ml{,i}>:package(lwt.react,tyxml.functor,js_of_ocaml.tyxml)
-+<lib/client/*.ml{,i}>:package(lwt_react,tyxml.functor,js_of_ocaml.tyxml)
- <lib/client/*.ml{,i}>:package(react,js_of_ocaml,reactiveData)
- 
- <lib/client/*.ml{,i}>:package(js_of_ocaml.deriving.ppx)
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
deleted file mode 100644
index d15d988283c6..000000000000
--- a/dev-ml/eliom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/eliom</remote-id>
-	</upstream>
-	<use>
-		<flag name="ppx">Enable PPX syntax extension support.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest
deleted file mode 100644
index 41f9b61dd3a6..000000000000
--- a/dev-ml/gen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gen-0.4.0.1.tar.gz 72415 BLAKE2B 73fa4169b6c2c3790a7f455136be4fa3bc2ce328833b17293dba793383133f5f151c6e1a2372c3422c7f827ef29eb1c3925a69a28dba787af29f7609ec8c299d SHA512 30722cca6d9b360a9a7d4a97f7553935d5425d5e3d49a7ae265bd0aee5961628a20d182775767a125cf367e1cd218ce4e782f025951468a4f95975163a1f4d76
-EBUILD gen-0.4.0.1.ebuild 502 BLAKE2B c83710e2204e95f5c8e7580f1b23af089cc37705639f8b5f26ac9914db1193b88f2555d724908e1c632b838a74d2dea6a9e17a9257808b44f21e2473e69f47ad SHA512 4c786e785ecf66800b9ce1d79de74c2aa49a92386f024cf61472c17c47253ca9b25162ea63ffa4711f9680d2dfb9e5f68f11bb7bcc9f5f788e67959e3752429e
-MISC metadata.xml 242 BLAKE2B e62e3df0d2a9ae7f2c79242b070e686f8b6959eef804a4d525c45ebee9958f31475649d89be8a19a4449b2420b866ae74c2e00098228c9a0e380b0d9efc8402f SHA512 45a3258f4d8afe9c924ab5a06e43f44c162dca47c7d5660aca54199c5cbdb523eca5013303171c3c305001a9c002ab871a00de084cd1d3a90c26807a1a491d18
diff --git a/dev-ml/gen/gen-0.4.0.1.ebuild b/dev-ml/gen/gen-0.4.0.1.ebuild
deleted file mode 100644
index 13385f56421c..000000000000
--- a/dev-ml/gen/gen-0.4.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Simple, efficient iterators for OCaml"
-HOMEPAGE="https://github.com/c-cube/gen"
-SRC_URI="https://github.com/c-cube/gen/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit dev-ml/iTeML )
-"
-DOCS=( "README.md" "CHANGELOG.md" )
diff --git a/dev-ml/gen/metadata.xml b/dev-ml/gen/metadata.xml
deleted file mode 100644
index fb3837d25e60..000000000000
--- a/dev-ml/gen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">c-cube/gen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/gsl-ocaml/Manifest b/dev-ml/gsl-ocaml/Manifest
index 09276ad20f09..4c37c25073ef 100644
--- a/dev-ml/gsl-ocaml/Manifest
+++ b/dev-ml/gsl-ocaml/Manifest
@@ -1,3 +1,3 @@
-DIST gsl-ocaml-1.19.1.tar.gz 167549 BLAKE2B 17d559b31a2be9583fd616b273f1d5cac5a42bebc7df2cf4882ba5bf7ddf411971b4f49dc36eb3bcdb0265ea204d0ea0ba19bc6c63f49a6b8b6075715bd0a967 SHA512 be199d46479f07a16d2f667d7a29675171bc4ecc5a6e5948335bf98f72e6f12474d16455a22e6bfc73683f1d67de3a186d75f817f398f6621241b640c333e07d
-EBUILD gsl-ocaml-1.19.1.ebuild 654 BLAKE2B 24ca5f842efc365231d480097d212f32d023e7f35f7451ef2c6457ecf115c350b2710123b50264436c280648ea51800d60f26fbc388b6f9fd8cbfd87e94a7c88 SHA512 35e36e20006bfc00f63f4f0dfa5acf16b0f6deea6fd585d9ae7c49dee961de5614d4c56cffe3867f06ffa4261c26a49f628b1d6f78c5cc8a06b127e027c1ac92
+DIST gsl-1.24.3.tbz 100642 BLAKE2B cf1bd63593901ba41ec33a8d073d923351e8cd6021f0402ce337242dd6b378408e740f2904a1c53f123453444dc08a05971921ab53e683b2ecf1e8a869f28e46 SHA512 c6e2578618591d1bef428693b69026cdea0f1606cd25d9f02d637a90256a5685eee70ecd0259d2595a1cd7b292c34e3c913c007e2706aa125af045d37e55d9c4
+EBUILD gsl-ocaml-1.24.3.ebuild 607 BLAKE2B 06adeef9509bce72e4c07be5ca929a8d39ced66a3626ca113f72178b7b91d522e9b5723b38e358454577565b5fb687a9aaad3dd5ec3bd1d7f08660de1400f881 SHA512 9b673f03b2e73cdde6eed613f8f99c719fea9e27fc9cc7ab4515f4285b475e15519d18b93e2a7cef6f0ed88c402727a7f8da522c8a51e6dca9393bbf9bfe1068
 MISC metadata.xml 405 BLAKE2B 9456c1d7c9bfc2e658ca7aa43f4009ec24bca515d3a4de2d66d47399128b10abf165f9012bd7629356fc7e1c998c77c7ee9e4e2ad6da8d49f66383f3d5e21222 SHA512 56eaeacab9b94d6df7372c027c8e139e3fdb8763f3a67342da7f460a48ac2f944fee48721a441e26b2f74254d2af0b3ded55da015bcc7bbf43cc5e9dc1314443
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
deleted file mode 100644
index 7b461efb3ec0..000000000000
--- a/dev-ml/gsl-ocaml/gsl-ocaml-1.19.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
-HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
-SRC_URI="https://github.com/mmottl/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=sci-libs/gsl-1.19"
-RDEPEND="${DEPEND}
-	!dev-ml/ocamlgsl"
-
-DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
-
-src_prepare() {
-	oasis_configure_opts="$(use_enable examples)"
-}
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3.ebuild
new file mode 100644
index 000000000000..7de5ef50474e
--- /dev/null
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.24.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="gsl"
+inherit dune
+
+MY_P=${P/-ocaml/}
+DESCRIPTION="OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)"
+HOMEPAGE="https://github.com/mmottl/gsl-ocaml"
+SRC_URI="https://github.com/mmottl/${PN}/releases/download/${PV}/${MY_P}.tbz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/dune-configurator
+	>=sci-libs/gsl-1.19
+"
+RDEPEND="${DEPEND}
+	!dev-ml/ocamlgsl"
+
+# DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
deleted file mode 100644
index b3b12a757d3d..000000000000
--- a/dev-ml/iTeML/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iTeML-2.7.tar.gz 34866 BLAKE2B c3d2df6901ca1c5a804b8e5becf2960f6de10a0edc88fab86fadd39ec25d35143d5ccb3765a1bb5e4d55f28d1dc8942085b964b343dc1f8622ea4438b842e9a6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65
-EBUILD iTeML-2.7.ebuild 616 BLAKE2B 8701d46e53561cfefc823af98c8912fe061321c7a5444c83757f7a2fea634f81124d4209a59cadfb5df9588bd9fc29285628932192fd39c826df85e1b0607b19 SHA512 201b4767bae5d86e8ee937f557b69396c97315f44c181803bc5aa8117fda265cb0eefdc3cf13cac6f6828a16040479ad9a03dbbd497877b0e44f65f7325fc8ea
-MISC metadata.xml 256 BLAKE2B 09b9dfc51aa2ff66b4244c86b7fdccb3a6eb2a84e5f4f57d304b977d4c192ecf2f7c088eba60fae1bd3b7cda7ebb7c233684eefa11a531cb4641b23799142f51 SHA512 50e99c06648a84ac4e070680dfbe717e801f0b4f89e26517bd202e36b0d62cb9ff1fa13caa5a049ae32ee765a57e72f9f896a63006b959dbbcbfb4e23ab32da7
diff --git a/dev-ml/iTeML/iTeML-2.7.ebuild b/dev-ml/iTeML/iTeML-2.7.ebuild
deleted file mode 100644
index 7047a3ea4d8d..000000000000
--- a/dev-ml/iTeML/iTeML-2.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Inline (Unit) Tests for OCaml"
-HOMEPAGE="https://github.com/vincent-hugot/iTeML"
-SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	dev-lang/ocaml:=[ocamlopt]
-	>=dev-ml/qcheck-0.5:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-"
-
-src_install() {
-	findlib_src_preinst
-	dodir /usr/bin
-	emake BIN="${ED}/usr/bin/" install
-	dodoc README.adoc HOWTO.adoc
-}
diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml
deleted file mode 100644
index 54b0c114ffec..000000000000
--- a/dev-ml/iTeML/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">vincent-hugot/iTeML</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/jbuilder/Manifest b/dev-ml/jbuilder/Manifest
deleted file mode 100644
index 92041899d12e..000000000000
--- a/dev-ml/jbuilder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jbuilder-1.0-beta14.tar.gz 268571 BLAKE2B 509fded43004426fa0bc0d692c50ef2fcc97dc3aa22010bf306f993a3964110cc3f5b3b0ae33a0ea64d00500d70e846450f73142edfef74af75931b99977e9fd SHA512 0258067b0b48dbd22c0d25b65fcb1fe9a7e65f9389031f954fab7cccf4e0791fe2242f85d441f23e284d13a0b1a3f4485546f94008211adef7b58fd14c4091d3
-EBUILD jbuilder-1.0_beta14.ebuild 784 BLAKE2B 6ee3d4fbe78bffd14e9c5c1c36da5df68c49977a4b31debc552e57bfe0265a067c708ce206e9e845d490de9dd4e20dc4d18795c48cf0fcb17d7365355e5f322a SHA512 6b3de1763a1c4a388a6b916716a45b432d625b3f1c742219549b9089f4ac801d1a24496c7bf83d239814b4b5482172a962c65d81a832ed53dfa4eda2552f2a61
-MISC metadata.xml 251 BLAKE2B 171570e8ee2d8f802ac6926bda478fe7e3e82820a2528c5a4eccc32837d5c2ee8d27ed8b223787c7cc6689d589a94a3c8a9bc61fe0370be97441840a002558c4 SHA512 56bc14cefb420a3889a3d146919d8eee02c0d887acbb0c742c64b1b89f6882f4c63a2bde6a40bdbf7c2b8b7b3d32ef097cea45c19013e00abe5f95a00f7444cd
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
deleted file mode 100644
index b3506058f1fb..000000000000
--- a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-MY_PV="${PV/_/+}"
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/janestreet/jbuilder"
-SRC_URI="https://github.com/janestreet/jbuilder/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="<dev-lang/ocaml-4.09:="
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/menhir
-		dev-ml/findlib
-	)
-"
-OPAMSWITCH="system"
-
-S="${WORKDIR}/${MY_P}"
-OPAMROOT="${D}"
-
-src_prepare() {
-	# Disable Werror like behavior, doesnt build with ocaml 4.05 otherwise
-	sed -i -e 's/--dev//' Makefile || die
-}
diff --git a/dev-ml/jbuilder/metadata.xml b/dev-ml/jbuilder/metadata.xml
deleted file mode 100644
index 45dd54a49f28..000000000000
--- a/dev-ml/jbuilder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/jbuilder</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
deleted file mode 100644
index 10c11f51351e..000000000000
--- a/dev-ml/js_of_ocaml/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ocaml405.patch 1795 BLAKE2B 63db628b51cbf8ef91d223f20109d82d4e4de971219b2974a135d76ef587ac72e61445875fe875f309c07b99c795da0e329823727446ce6cd563e116a5359448 SHA512 6256e9042d3077fdb1b39ed3972abc80a05719be74d63bd049cc35084e07f8eca2d57b74d0aeb299954d49c5c4f8609c2c052fb0a050957d81438a4fd6579370
-AUX ppx.patch 542 BLAKE2B 4ec12f99067e811412564f648ed63c0b894849fb1b19779df9ad6a504ae54eba1c9c26f9f269a742d53f50b2dd28d42d0ad64e484c0b13674e78767a3a8d8ff6 SHA512 f8220bad4ee7df4191d0e69d3283e09bb167769ddd14e7906780c0ef31308074fcffa063a28fb0b6479724f72e28c23592f57388e256f44701a50de309b6e7f7
-DIST js_of_ocaml-2.8.4.tar.gz 1344082 BLAKE2B f7f24e422a906d14ccf26b65de00c4d08726058cb14113c60527e337a14b6e2e65fc6dcda76dcffe3139c5fc7b5b2c1111ecb3ceaf820697581fed7cd35d097d SHA512 8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd
-DIST js_of_ocaml-3.0.0.tar.gz 1433377 BLAKE2B c4d696adc90c8caacf725f7b691b9f57199385f6137356da8562d63b95c5089317064e36d343f524713df600e07f04d8b530b591cb5532f0dffa4ae143dd8f4b SHA512 dc4bbbfdacb43338aa7f97b7012b6de8a2eac5d7c5f535ceb9565c477c961a212ce5b2a75b1719fcd9f2d57938ee2162f6f04d3364397a469d7a13d1fe4e3908
-EBUILD js_of_ocaml-2.8.4-r2.ebuild 1926 BLAKE2B 2e8c5f9eab3d07b63b006c14cbe51b15d4ed1809d71e5ef7a5a32d1639c92a57b6fd06fdd2c5733d1e8c98ad5cd33597d53e55d5ac61376a817206407ddd159e SHA512 d66eccc7429c20de923256a718fba5088f78ea8541ef665b4bcbb3a9529795a48449e12434407c3d459d87903dab3d88571e02d9a076489392128c3705e0e78d
-EBUILD js_of_ocaml-3.0.0.ebuild 1690 BLAKE2B 94abbe038cbd4c71129c65a8e10f9bd67628586be8ed1462223c728059b6806aec059ebfa48c7c39373d98d46bb1c8c55cb8ab681b59846bdec3bdebd6cae6ce SHA512 d8de607c03ad9751f557e0b76431b18effa7b6f7a3365997260c9a230c6a17ee75d7e83a16c669e5c492636d7c7dae422ea379f7c3dfc5073f1109426808e3e1
-EBUILD js_of_ocaml-9999.ebuild 1621 BLAKE2B 447af2aecfee0dc998925fa17d4ec94970799f1b8fded809d35149582d67809164bcd363e4935ed10477fc0f02e9e73a584b563e5453911b21be0f211a7bdef7 SHA512 17f9820a6636abfff560d1b351199ccaacc96d5545937892284c214385f50a003da1b0a5d093a108e72edd1f1f24d2f71f2d1829ee6147ffca21c6e9f5da4874
-MISC metadata.xml 636 BLAKE2B 602471959d825740e7ebc8b721fb60672b522ca66eda595acf20efc1c98cf1d82c2cc51a9cbf259482fde8916ab465f133ea3bb485395e7e2cfdc6179e242a8c SHA512 15c916cc04037f5868dd1b92a0b13d57e811ead7f68513660bfec8a232d13f0b24d12733e653995e291742757d44ce7426fd9e25a224c5f5fc6b3cfec6fae530
diff --git a/dev-ml/js_of_ocaml/files/ocaml405.patch b/dev-ml/js_of_ocaml/files/ocaml405.patch
deleted file mode 100644
index 552dff425c46..000000000000
--- a/dev-ml/js_of_ocaml/files/ocaml405.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
-===================================================================
---- js_of_ocaml-2.8.4.orig/lib/ppx/ppx_js.ml
-+++ js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
-@@ -162,7 +162,8 @@ let invoker ?(extra_types = []) uplift d
-      {[ fun (type res t0 t1 ..) arg1 arg2 -> e ]}
-   *)
-   let local_types =
--    res :: List.map Arg.name (extra_types @ arguments)
-+    List.map Location.mknoloc
-+    (res :: List.map Arg.name (extra_types @ arguments))
-   in
-   let result = List.fold_right Exp.newtype local_types invoker in
- 
-@@ -210,7 +211,7 @@ let method_call ~loc obj meth args =
-          (Exp.fun_ ~loc ~attrs:[merlin_noloc] Label.nolabel None
-             (Pat.var ~loc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
-             (Exp.send ~loc ~attrs:[merlin_noloc]
--               (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) meth))]
-+               (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc meth)))]
-   )
- 
- (* {[ obj##.prop ]} generates
-@@ -244,7 +245,7 @@ let prop_get ~loc:_ ~prop_loc obj prop =
-         (Exp.fun_ ~loc:gloc Label.nolabel None
-            (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
-            (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
--              (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
-+              (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
-     ]
-   )
- 
-@@ -289,7 +290,7 @@ let prop_set ~loc ~prop_loc obj prop val
-         (Exp.fun_ ~loc Label.nolabel None
-            (Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
-            (Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
--              (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
-+              (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc prop)))
-     ]
-   )
- 
diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch
deleted file mode 100644
index c46293f546da..000000000000
--- a/dev-ml/js_of_ocaml/files/ppx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
-===================================================================
---- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml
-+++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
-@@ -1,5 +1,5 @@
- let () =
-   let js_mapper = Ppx_js.js_mapper [] in
--  Ppx_driver.register_transformation "js_of_ocaml"
-+  Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml"
-     ~impl:(js_mapper.Ast_mapper.structure js_mapper)
-     ~intf:(js_mapper.Ast_mapper.signature js_mapper)
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
deleted file mode 100644
index 411a3127760b..000000000000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
-else
-	SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?,X(+)?]
-	>=dev-ml/lwt-2.4.4:=[camlp4(+)]
-	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-	xml? ( >=dev-ml/tyxml-4:= )
-	ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= )
-	dev-ml/cmdliner:=
-	dev-ml/menhir:=
-	dev-ml/ocaml-base64:=
-	dev-ml/camlp4:=
-	dev-ml/cppo:=
-	dev-ml/uchar:=
-	dev-ml/ocamlbuild:=
-	dev-ml/yojson:=
-	dev-ml/ocaml-migrate-parsetree:=
-	deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/ppx.patch"
-	has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch"
-}
-
-src_configure() {
-	printf "\n\n" >> Makefile.conf
-	use ocamlopt || echo "BEST := byte" >> Makefile.conf
-	use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-	use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-	use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
-	use react || echo "WITH_REACT := NO" >> Makefile.conf
-	use ppx || echo "WITH_PPX := NO" >> Makefile.conf
-	use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf
-	use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf
-	echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	emake BINDIR="${ED}/usr/bin/" install
-	dodoc CHANGES README.md
-	use doc && dohtml -r doc/api/html/
-}
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
deleted file mode 100644
index 6b828ef47386..000000000000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
-else
-	SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	# Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit
-	#KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-
-	camlp4? ( dev-ml/camlp4:= )
-
-	dev-ml/cmdliner:=
-	dev-ml/cppo:=
-
-	lwt? ( >=dev-ml/lwt-2.4.4:= )
-
-	dev-ml/ocamlbuild:=
-
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_tools_versioned:=
-	dev-ml/uchar:=
-
-	ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= )
-
-	xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/opam
-	test? ( dev-util/patdiff )
-"
-REQUIRED_USE="xml? ( ppx )"
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-oinstall() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${1}.install || die
-}
-
-src_install() {
-	use camlp4 && oinstall js_of_ocaml-camlp4
-	oinstall js_of_ocaml-compiler
-	use lwt && oinstall js_of_ocaml-lwt
-	oinstall js_of_ocaml-ocamlbuild
-	oinstall js_of_ocaml
-	use ppx && oinstall js_of_ocaml-ppx
-	use ppx && oinstall js_of_ocaml-toplevel
-	use xml && oinstall js_of_ocaml-tyxml
-}
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
deleted file mode 100644
index af747867d5a6..000000000000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?]
-
-	camlp4? ( dev-ml/camlp4:= )
-
-	dev-ml/cmdliner:=
-	dev-ml/cppo:=
-
-	lwt? ( >=dev-ml/lwt-2.4.4:= )
-
-	dev-ml/ocamlbuild:=
-
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_tools_versioned:=
-	dev-ml/uchar:=
-
-	ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= )
-
-	xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/opam
-	test? ( dev-util/patdiff )
-"
-REQUIRED_USE="xml? ( ppx )"
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-oinstall() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${1}.install || die
-}
-
-src_install() {
-	use camlp4 && oinstall js_of_ocaml-camlp4
-	oinstall js_of_ocaml-compiler
-	use lwt && oinstall js_of_ocaml-lwt
-	oinstall js_of_ocaml-ocamlbuild
-	oinstall js_of_ocaml
-	use ppx && oinstall js_of_ocaml-ppx
-	use ppx && oinstall js_of_ocaml-toplevel
-	use xml && oinstall js_of_ocaml-tyxml
-}
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
deleted file mode 100644
index c99ea42ab35b..000000000000
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="camlp4">Build with camlp4 syntax extensions.</flag>
-		<flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
-		<flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
-		<flag name="ppx">Enables the ppx syntax extension</flag>
-		<flag name="react">Enable functionnal reactive programming support.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ocsigen/js_of_ocaml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/jsonm/Manifest b/dev-ml/jsonm/Manifest
index d926370734c4..c4957ae124a0 100644
--- a/dev-ml/jsonm/Manifest
+++ b/dev-ml/jsonm/Manifest
@@ -1,3 +1,3 @@
 DIST jsonm-1.0.1.tbz 21608 BLAKE2B 4d3ce2a3430176df0876aeb6276a48bf23e51ebee2a1a46e5b25a370b26ba27c9ba09ff01365396123de4851d8f263c4c86c3176b13118910fd458ad3b23d80b SHA512 e86e225073b429f71063af14ad39b87498609db6a122b39e1a739c5b77fcde487bf6b17235b2f9742b7d22aca0f6d475fdba1b0bab2a6329cf7e681fe43d31a6
-EBUILD jsonm-1.0.1.ebuild 955 BLAKE2B 1ab33614f555f822167222430d5944b6a799d69891c9c6414677287d8688c54d4ad19f2529a1538750f52e3c2ce9bd84c11b90e9b4ad3020dd26d717353ff382 SHA512 3e3b2bed9d07f3dbcadbedde6427b325ecf11a406bd0743232105da9fc48019c7bcc98aa3c905c4f4f661b041432f717c6b0c1e4be2bb9e46f377115422de5f2
+EBUILD jsonm-1.0.1.ebuild 955 BLAKE2B 6cfecd55e6ddabf730bfd0759595e6a33f024d51c6963afb082984c046317cd4cef6307730041ffa5e7c7939c5ab18c11de146170fd107bb055c669fe1b34b64 SHA512 be9f40676af2d42743a9756c057ddff0eff651db5b016889542ee18b349f5311fbf218965aa6ac49976f9f7a8e29a0254751b316d2342bf3c2a77e4b6e83f1a3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/jsonm/jsonm-1.0.1.ebuild b/dev-ml/jsonm/jsonm-1.0.1.ebuild
index a51e2c2f0762..07992359e9a5 100644
--- a/dev-ml/jsonm/jsonm-1.0.1.ebuild
+++ b/dev-ml/jsonm/jsonm-1.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
@@ -31,8 +31,10 @@ src_compile() {
 src_install() {
 	# Can't use opam-installer here as it is an opam dep...
 	findlib_src_preinst
+
 	local nativelibs="$(echo _build/src/${PN}.cm{x,xa,xs,ti} _build/src/${PN}.a)"
 	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+
 	newbin _build/test/jsontrip.native jsontrip
 	dodoc CHANGES.md TODO.md README.md
 }
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 2af8a821e0d4..5e7cd260a69c 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,6 +1,6 @@
-AUX lablgl-1.06-makefile.patch 374 BLAKE2B 0aa21f1f7da48db3ec8819511e7c11be6af72522305c1b4ca23992488250ecb566efc726a7bceb8d2c7efbceda05beb11dab316d9704f6fd9cf6b23b3d816dd5 SHA512 2c0a2681efd830e8ad2edbf9880a9740b12af5680b82316cb297928ab4ad97c50f5c51a7e641729fd5b2b8481282d351016011fe5f7518c1aa892844972ad16e
+AUX lablgl-1.06-makefile.patch 354 BLAKE2B e50b0b731b50331d286d19509eb76a84a5978d5c8db1a7f91251e5a3640fdaa57480e10beb40e366db1f5b2e7d4d1631342ddcf53358bc838122cb8b93174532 SHA512 1b6a6d3f5eda6713e5627ca95590e2126837693eb68464bb67eb24bb9299021bebc027b685f5b03552fb2d15540c5b1791c7de55e23c6d1c5149c2e4f22f7f6a
 DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
 DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
-EBUILD lablgl-1.05-r1.ebuild 2076 BLAKE2B 278a2ebeca0bd44208c56db32455996a1e7dca46b14ab5e63f61cefe84446524de6bbbe9cc24964db95f2937d7039a8866a6fa19d69dcbe6807f60002bbea100 SHA512 1698c97247f6b90709c0fa4fcf0a62a4f0b455a4a68a60e73414aef3b1284d2ea5a3c61f3ff3b3a20f908769b11b425622a82d92a52f983b8c50b2bd7b2addcb
-EBUILD lablgl-1.06-r1.ebuild 2114 BLAKE2B 385efc79cfc5f019893cce1d722a3e6a5f5a4d4e94ce8435ac3578f32e9160426026be1698ef05008f985c85d67c35b1267bd31d5a49b824efa5968edd9ff684 SHA512 f3dd25a494a4c5690a02fcfeb0c52c7c202b69bed6df33888a6908cd27b8e04b2a8b15062acc0ec41786b9b315062eb68d6b815b4d488f2e40ccfbea11981ec1
+EBUILD lablgl-1.05-r1.ebuild 2082 BLAKE2B 30ac541730dee33e3cd7c22b4884fa0e82a7bdec1b35c3993e4b8df1b32c933b663bf0eaec4776206d8890b78ed74af1c840b515ac0706e57823a164605dc670 SHA512 4e2b04b1d4a91fda01406439792829a8a07a501a4ba5e54d6de2689a20ae50aafefe44bdd994b8a597ed58bf21d05b45dc0c7688d1ee3a3f245053aedd8303e9
+EBUILD lablgl-1.06-r1.ebuild 2110 BLAKE2B 905eefe4aa73f1c0d2517a173e1d485ffa94edd5eb63d52307aff8665c961f6381a558b9ad00dacbd23d40fdb12c521541656d3371ee9860c6962962f63a8061 SHA512 c9799c6d4ddd6b7f70fc086102d729bf5fe6a9979a8063892301411d5098039fc58bb6d7ad15484f400e03595a2d2594fe270bad638221a8585b579dbbe9aa6e
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/lablgl/files/lablgl-1.06-makefile.patch b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch
index 36a1051a27bb..1e336872ad5d 100644
--- a/dev-ml/lablgl/files/lablgl-1.06-makefile.patch
+++ b/dev-ml/lablgl/files/lablgl-1.06-makefile.patch
@@ -1,7 +1,7 @@
 Make sure install dir exists before copying file to it.
 
---- lablgl-1.06/LablGlut/src/Makefile
-+++ lablgl-1.06/LablGlut/src/Makefile
+--- a/LablGlut/src/Makefile
++++ b/LablGlut/src/Makefile
 @@ -68,6 +68,7 @@
  	cd "$(INSTALLDIR)" && $(RANLIB) liblablglut$(XA)
  	@if test -f dlllablglut$(XS); then $(MAKE) installdll; \
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index d99d7d1f7933..e247ba03cdc1 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit multilib eutils toolchain-funcs
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Objective CAML interface for OpenGL"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
@@ -28,7 +28,7 @@ RDEPEND="
 		>=dev-lang/tk-8.3:0=
 		dev-ml/labltk:=
 	)
-	"
+"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -82,10 +82,10 @@ src_install() {
 	dodoc README CHANGES
 
 	if use doc ; then
-		mv Togl/examples{,.togl}
+		mv Togl/examples{,.togl} || die
 		dodoc -r Togl/examples.togl
 
-		mv LablGlut/examples{,.glut}
+		mv LablGlut/examples{,.glut} || die
 		dodoc -r LablGlut/examples.glut
 	fi
 }
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index 427234ccf7b8..bf898cbd35d8 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc glut +ocamlopt tk"
 
 RDEPEND="
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index 47cbf1dda79e..8566557b5c70 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -1,6 +1,6 @@
 AUX findlib.patch 645 BLAKE2B 63c8dc3a2b332129bf90af98b908e1ade5a15381a903ec9591973b6a2c3843fe254fb0001ce627ec831df5d4c6885d01de679f3d7b74e6538692de08a1fcf608 SHA512 4f5172bc7d603375bda331d40708ad14e7e9e7374f97cbd11da56473ca704421f7c801559dbcc753fe8004a809b80142158974a1c5c469eb2894580121cc9442
 DIST labltk-8.06.7.tar.gz 370870 BLAKE2B 2d836c824d9adbd4f03d0e7e81faa51669837eecb4f94f6c89c657966774fe7d6ed928459be3ccca7fd3e7cf67a54ee63f7d2d08dcc8b7e853f5ad64769b33a2 SHA512 3c7352d14bc337adfb1939e72bd2658bb5e60b463f10f3748779084d1b7a6e6225028c775b548e355d69984a8944b91580fa978ff904b20b8b762ba9046f5e7d
 DIST labltk-8.06.9.tar.gz 371504 BLAKE2B 587ff01da120501f85f6d9921e46275858f1e1ce730eef205f9e7d7c64f6d3c0ea701cf832fdb8eb0746e1f0cff1151bccb077641740fb18811473b1553e2940 SHA512 fd6defa302d919f229394c486dcefab110b144534525a87082a27d2cab29c0af4ece3da821098fea25416850ad857f7af979d48790330d62dfb8d8db8f2bf6ca
-EBUILD labltk-8.06.7.ebuild 998 BLAKE2B c31a2f9eb29f5d63a22a998c8dd9e143798f74d17e0d04bfef4c6995e9a003cbe897a5b157d6044f450fd3177c024cc768db785ab90577101651cbfa3f5d8cce SHA512 c4fc20f8b97e23cb0caf8e3b478d34c60c13a00617fb41dad005c811f9746f1c42c508796af24ca306b7d29bc065bdf6ebbb8b4ca377ba785ae24106620d7758
-EBUILD labltk-8.06.9.ebuild 986 BLAKE2B acfde3021a3cae9b4ced6ba8e79c04034b5eaca4d3b54b45c4c2823c838ebf7887192a5396c91b8a748bfc5c2c154ae6839a35936445d607d5bffdaec0dfe244 SHA512 12877671736a842ee5a21caee37015a963163d66efcc95d2c05de8fbb58868c21258513f26bb26920e93abfadd4b74c02b9695132558a45c9131ac9e1e4040c8
+EBUILD labltk-8.06.7.ebuild 992 BLAKE2B 67153839b68d13cfdbe8eab47a10c65d03beefbcc08b27edeb9d75c144ef563787978037e6a7a52f6c50707d0ecc52e77c29fe3de509bd19d8c670e4cc82344a SHA512 181baa5df2eada2fb0768691bdf37a2b18e91633e99b529205477310d8eed23a9fd35250aa19ae2e849a09b3ba660483911cc3a3aa60f862f3105ab7e0a1c417
+EBUILD labltk-8.06.9.ebuild 980 BLAKE2B 030b066865f536672e2f097909a622175edb0e0fe622734628cce7cd556ee602041842e99beb79009089e6a59edb450e5542f4ca873ccc732c5bcb10187aab36 SHA512 8c25f38845bc032fba61c9f7694eaf8aa82ca1b80401aad0650fc350dea967dc60bfc53cd625e9de9c6b9f4b551a9c17d1d5adab033b0bd413576e8ece9c6d22
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/labltk/labltk-8.06.7.ebuild b/dev-ml/labltk/labltk-8.06.7.ebuild
index 17212676196f..193ef043c201 100644
--- a/dev-ml/labltk/labltk-8.06.7.ebuild
+++ b/dev-ml/labltk/labltk-8.06.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
 HOMEPAGE="https://garrigue.github.io/labltk/"
@@ -36,7 +36,7 @@ src_install() {
 	findlib_src_preinst
 	dodir /usr/bin
 	emake \
-		INSTALLDIR="${D}$(ocamlc -where)/labltk" \
+		INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
 		INSTALLBINDIR="${ED}/usr/bin/" \
 		install
 	dodoc Changes README.mlTk
diff --git a/dev-ml/labltk/labltk-8.06.9.ebuild b/dev-ml/labltk/labltk-8.06.9.ebuild
index ce876c58810a..10d78bc548ad 100644
--- a/dev-ml/labltk/labltk-8.06.9.ebuild
+++ b/dev-ml/labltk/labltk-8.06.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
 HOMEPAGE="https://garrigue.github.io/labltk/"
@@ -37,7 +37,7 @@ src_install() {
 	findlib_src_preinst
 	dodir /usr/bin
 	emake \
-		INSTALLDIR="${D}$(ocamlc -where)/labltk" \
+		INSTALLDIR="${D}/$(ocamlc -where)/labltk" \
 		INSTALLBINDIR="${ED}/usr/bin/" \
 		install
 	dodoc Changes README.mlTk
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 654031ef8433..842c845281ac 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,14 +2,12 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD llvm-ocaml-10.0.1.ebuild 2991 BLAKE2B 8f6847347faf4ba2afd66e3b2f8052b27662a9db05ca3d03e5c1ba44ce77ef9731dca1632e21a5bda21ae963531d85db9633f92c33bb9713e0a4b9fdf19ea775 SHA512 2d43e10b0a15ea9b438f93a15bf32575e2d111eea1954c8c36f7ce949774055ee720d448cfd7e08a7627539ca8095d81c8f65e69de926475b8f40d5dbcc75db0
 EBUILD llvm-ocaml-11.0.0.ebuild 3053 BLAKE2B 0f8b152cf350f9a7cdf3d552347b5729091b265a47bff1ce289473c4d094ba55f168b9d5c18e7754cb5f48e0eafcfa1f3b3d07b6c4bae9780ac53037e7e88d04 SHA512 75d8e6273fd3360e0df8d3dd1130f4a5dcfd3c8c93d75b3b48b173632d263341d7d235d1a5309d4e9d33ce78aea262e35ab6844a7533d8fb84ce3f758cd0e27e
 EBUILD llvm-ocaml-11.0.1.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
-EBUILD llvm-ocaml-12.0.0_rc2.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
-EBUILD llvm-ocaml-12.0.0_rc3.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
-EBUILD llvm-ocaml-13.0.0.9999.ebuild 3043 BLAKE2B 579eeb6491b8eb85e94b5c3f1efb873d04b7aac517747661a3b34641c47e87997139dc2784e8c2c91461fe2db9f21f25ecc86695b51bbf6b81d5b325b2827df9 SHA512 ae470c4552ec701f5b32f1bc6c3efa9a0c75779dfa48b60b7c5df1bc203be7b4656048452109146fd12c8c7b3b0b8b15bf8ffd47afdb40dde42f8e4b6cda82e3
+EBUILD llvm-ocaml-12.0.0.ebuild 3059 BLAKE2B a3a9b1a45127499e7212d30ce699c7a23229895e0e4ac14fe5f9e02d1bd401350b6f419eada422cf66f9301dc180d16ad126e43267a4ef7db797eab184dc7eb5 SHA512 2208b0de0343ae1d33385226eef2e5bef2185a3799a30ea74094c5b004d7b9d7f97f73a97191f46ecc6d3be5b05d647300e0eab5ee5b4649051a98135b2bfa91
+EBUILD llvm-ocaml-13.0.0.9999.ebuild 3048 BLAKE2B 7be8fdfb701b0d1ac20c3fe032d49602394008b102101846bfcf751161fb239c5ef17f37005449ad7cb86095cbf872ca98083800aa216eac98d0af488f4e334e SHA512 bb86ebc2b8d8dd2c3656bbe339f690eaa6b5c8faad7ccebe0fbae48924a96619bccdeaf56805f8d3a0927f38b9228506a60ddab4a2c2ddd50d78e3f78cbd2ed7
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.ebuild
index 3fc4ee845be9..b88949c4b08d 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.ebuild
@@ -18,7 +18,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild
deleted file mode 100644
index 3fc4ee845be9..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	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}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# 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/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
index 3fc4ee845be9..279c620cde8a 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE )
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
diff --git a/dev-ml/lwt_react/Manifest b/dev-ml/lwt_react/Manifest
deleted file mode 100644
index 0b433a340602..000000000000
--- a/dev-ml/lwt_react/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lwt_react-1.0.1.tar.gz 50329 BLAKE2B 30de048131a0b2b3cc2711efdfa3cd9832d676f7d279871e911c7cf7291dc8a30fb8351f8dc4ee42ca0d01b44fc1b370b5045aeee36dd28bae2f731f3da377f0 SHA512 cd2dcc32ca87a3d26d1771d5bf51bd9f444c75cba028f7ff71e96cb9bc12387d66d6d0c59b6c8d4bac84fb42c6e2e969c385ef1d2f6cbc8e912963304a49eda8
-EBUILD lwt_react-1.0.1.ebuild 498 BLAKE2B a13a4cdb3b8711f93e74996edc9314af8f3e41a7138a2827ba121d5dd456f31836e166e2cd400ec33c2d76736efb4d4259580fff10328a1b8cd319b0879997ad SHA512 0a5442406f70dba2a41e7257be7875047ee13943b182055696ecffe0251367fe49c902c1af555da3b8d4c3574783e1954d9e1911d795c26e335b336d43919de6
-MISC metadata.xml 243 BLAKE2B f4f8ba5087618a3e022e6c8a81bed9e79da719beb13e41c3f1c91961e7e18afac544c6039f176dfbbcc78149311d5631ef1469abbe1e832885c5e738effeac87 SHA512 a4e5b8654e590aae9cd003aa9ff9470deea7790d90b0d057c477c4b78a8d1fe5dd26bbcae47f1fba3fefe4a98181d2a5e0cbd35cf16b0ae07200df3184e92798
diff --git a/dev-ml/lwt_react/lwt_react-1.0.1.ebuild b/dev-ml/lwt_react/lwt_react-1.0.1.ebuild
deleted file mode 100644
index 89316861ed22..000000000000
--- a/dev-ml/lwt_react/lwt_react-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-LWT_VER=3.0.0
-
-inherit oasis
-
-DESCRIPTION="GLib integration for Lwt"
-SRC_URI="https://github.com/ocsigen/lwt/releases/download/${LWT_VER}/${P}.tar.gz"
-HOMEPAGE="http://ocsigen.org/lwt"
-
-IUSE=""
-
-DEPEND="
-	>=dev-ml/lwt-${LWT_VER}:=
-	>=dev-ml/react-1.2:=
-"
-
-RDEPEND="${DEPEND}"
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1-with-linking-exception"
-KEYWORDS="~amd64 ~arm ~ppc"
diff --git a/dev-ml/lwt_react/metadata.xml b/dev-ml/lwt_react/metadata.xml
deleted file mode 100644
index e72b88da28f8..000000000000
--- a/dev-ml/lwt_react/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/lwt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/macaque/Manifest b/dev-ml/macaque/Manifest
deleted file mode 100644
index cd810faf1106..000000000000
--- a/dev-ml/macaque/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST macaque-0.7.4.tar.gz 64896 BLAKE2B d0a0fcb09bd468cb5de75551ee62278282f98de4d4477c71b55c065d35bc1d6483614c578ba18f609e5cdc98bd52d93943efa9948d9c01a95b8a3d1608e246bb SHA512 db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a
-EBUILD macaque-0.7.4.ebuild 584 BLAKE2B e8bddd4563ba150bb189eaaa992f312e6852dac76f17427c73e0e0b42d481380429060907e42b6c2e8d3e3d97f08609c31b316599e3b180d8b84121e468710ab SHA512 b77b2a83370c075cf5901b15626018f6ce4ad4451392b9b8afb92a6c075f52dbfc6cac18d77ab91a1deece425032d11aa097256dcc603b4ee3aa5f54bdaa9cc1
-MISC metadata.xml 252 BLAKE2B 1e49a002749d490cf9edc4cb7cd9531f47c17170faf0f1e63af8d008e740c0e43ea3fbbd07bada161cb5a5d46817ea4b2ee0d616b5e3a6f1fc42ec0bb18cec37 SHA512 80f9391cbd33ca630216272c312762ac2df193864a3090f901bb2bf0e6a4f16eb5495ec74c23676d14039f39d056f9b50f9057551137143f7dd0cef4708a1915
diff --git a/dev-ml/macaque/macaque-0.7.4.ebuild b/dev-ml/macaque/macaque-0.7.4.ebuild
deleted file mode 100644
index f8b8e3fb069d..000000000000
--- a/dev-ml/macaque/macaque-0.7.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit oasis
-
-DESCRIPTION="DSL for SQL Queries in Caml"
-HOMEPAGE="http://ocsigen.org/macaque/"
-SRC_URI="https://github.com/ocsigen/macaque/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-ml/pgocaml-2.1:=
-	dev-ml/camlp4:="
-DEPEND="${RDEPEND}
-	dev-ml/oasis"
-DOCS=( Changelog README.md )
-OASIS_SETUP_COMMAND="./setup.exe"
-
-src_configure() {
-	emake setup.exe
-	oasis_src_configure
-}
diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml
deleted file mode 100644
index 706c8061785e..000000000000
--- a/dev-ml/macaque/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocsigen/macaque</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index eb50bb5019ce..2ab49aa90fd9 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,3 +1,3 @@
 DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
-EBUILD menhir-20190924.ebuild 906 BLAKE2B f64a1821c1015688bcb4e786f81ec5e066bbc010df4b0edc1cf30d270d3688c2dd228ff9d9ae6313969864b2f9efc882e526c7f98d2bf41a15338cc1268691d2 SHA512 6ed9b185d507cadec87ed86dcf876838780105f8ad75b6fcf9adfd658d1528d5d611aad66e822a4e2afc27ac4fe63e67a82f4a235fec6ba586433451479eb8db
+EBUILD menhir-20190924.ebuild 915 BLAKE2B c33ff204555d700ec02abc8bef23ca5e30767b409f3d226dd5fd380ce75d11fc1bb228d3446c3f7d1822530e6a556225138fa2700ea8ed99c828bdcc0dd983d4 SHA512 0ea611c2f1f32aaeee73ee407a9eae82a24bca518e006eeb66b33ab5f1f0adb3c06ff85fd2c0a99fdd865f8a3245239165617a0c3ccbe815009aa761b8ad7b21
 MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/menhir/menhir-20190924.ebuild b/dev-ml/menhir/menhir-20190924.ebuild
index c0bb1d2198fa..0b92e499c6d3 100644
--- a/dev-ml/menhir/menhir-20190924.ebuild
+++ b/dev-ml/menhir/menhir-20190924.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 DESCRIPTION="LR(1) parser generator for the OCaml language"
 HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
@@ -30,7 +30,13 @@ src_compile() {
 
 src_install() {
 	findlib_src_preinst
-	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+
+	emake \
+		PREFIX="${ED}"/usr \
+		docdir="${ED}"/usr/share/doc/${PF} \
+		$(use examples || echo "DOCS=manual.pdf") \
+		install
+
 	use examples && docompress -x /usr/share/doc/${PF}/demos
 	dodoc README.md CHANGES.md
 }
diff --git a/dev-ml/merlin-extend/Manifest b/dev-ml/merlin-extend/Manifest
index 398ea9b40cb8..85bf7824791b 100644
--- a/dev-ml/merlin-extend/Manifest
+++ b/dev-ml/merlin-extend/Manifest
@@ -1,3 +1,3 @@
 DIST merlin-extend-0.3.tar.gz 15422 BLAKE2B cfd658c9afa6f4500899c342c86c75399cbbef89fe5817c2a957ec93ba02c360fff66e01b81890d19c87a89380ba1cd352a2ffdc10a2dc53c7d535e8af5f720a SHA512 1e6436299b38c7fa57ae5b681a1409795545bc6f5956d6b1c37cbfdbdabfd90da476c030067fe2e016c823d60d1e5498c4536c869bf58425e1a6ff78295efba4
-EBUILD merlin-extend-0.3.ebuild 496 BLAKE2B a09416c7cf256af5dbcc3a259fa9292b93da746846fe49fd1aca8e37f30c19025b74acffca21663b170390c9502aa57b42521b06a0ec01b025cacce0193e095e SHA512 fade4604fb0f52a1ba37b093c255cc88565d118e22172268bc45f3167c09eb2754f4a1b6407ac108bf32ad194b3cee5f39bc53db8b050c8d0287145bd152d374
+EBUILD merlin-extend-0.3.ebuild 488 BLAKE2B e366b3905c7dbe07279b7dd12cabe56e579eee53763f5a6069e9992ad6f49536c2b40e17fd602a40b58f0f05df6316d20802349b30d626dea5a2d3b93a53307d SHA512 a6850604dc7e12b447f3efc8cca8926aa745be0e47bf6542d23a3a6b5bbc657de3f5d7869791737343205a9261022bb24a4097fefcae7ff4c1f441b9d5f79e18
 MISC metadata.xml 318 BLAKE2B b58e16f26419d26ae958729d1b854a1ea29f3e71c9c9b6bfcc7851c1b0248bc26bc0e13028cab62744013280a88254d42e03e7894994033de077b781eaa76ecf SHA512 c50c068b90bc67f46cc5016182ecd06929dd31c2bff0a63065196a0adf382dcbe33f2e4a19a1e5744ce4d805a9d342ce1c9ceda4e1079f061af3497df2302365
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild b/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
index fc7c9b64453a..e15e2f21b2f2 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit findlib
 
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/let-def/merlin-extend/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND="dev-lang/ocaml:0/4.05.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 945cbc95fb43..49e6fa185fed 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,3 +1,3 @@
 DIST mtime-1.1.0.tbz 15467 BLAKE2B 975fdb01c6a4806035a5fbc256d192d6c2f45bdfb750045293b10a732c5613108d9bce897d3c1be660af60d6e9bafbf299dedbc0d872d1c09f65f47b11c9a6b6 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c
-EBUILD mtime-1.1.0.ebuild 733 BLAKE2B b7229e94b733051aa012524d7b00730bb591a2e9b1c064060463d099d3950cc65c9fa4f0f36bba45ad683d2237ae03b510d527578a4e7daf84c1532a3ed28167 SHA512 550e3bbc97f486e92de2dbc3da61cba0e45c84df2517e35aa93c5d5471f9f249f5b19088dcad1d29759dafc9d5efe9e1ae4ff24c78221593a5363f070e292b5f
+EBUILD mtime-1.1.0.ebuild 723 BLAKE2B 3da03fa3bd6a6ddc6621e6ed26cc9cc54e55488ad504b81d5c38b38f68e991631b95aeb8dcd2b60892c729a849fa4a1e0e3fb349d8eaa0e2cafe2a231cac88a0 SHA512 22c755c8c00adac4711d1fecfeb3410688d2ecc022f46f696fc2c711e1f84a0558bb73683116a99f62d880f684895bf33a7d0389bc1260dce2fdbb880bfd7a65
 MISC metadata.xml 311 BLAKE2B ec6d4e0813be98a7a30d4e8ca05ac9c74953bb0fa763c7d004ac76f23dfefb8d157784dab7f0d3674a81e840659d16ba4f28ffe3ab6913aa6affefe80b8786eb SHA512 ac2409cb1fcd4b9ba1760c38024a96ac3dccb7337b78e7eff636c23cf7f2aeea22fdec377eb80afedfda0738a2396d511afb1d4f0913fb6e95ab8473a850b9df
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index 91dfab39d4d9..a6d491ea6add 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils opam
+inherit opam
 
 DESCRIPTION="OCaml module to access monotonic wall-clock time"
 HOMEPAGE="https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-lang/ocaml:=[ocamlopt]
-"
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
 DEPEND="${RDEPEND}
 	dev-ml/topkg
 	dev-ml/ocamlbuild
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 74cdf480cc15..0ac96aeaf800 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -1,6 +1,6 @@
 AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a51995c015ddec399747381175936e523f25b2312aed434ef25dfbcc2d6ef3aaa502ade39ff14fbd0ead636 SHA512 95245b0c3738511ff6a8a43b5f4c8897a82502a751552e1f1c846f3c7bb1040a5227055a55303292c1eca18a454d0f7c038ef574f00a772db2b72611857e15b5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
-EBUILD num-1.3-r1.ebuild 798 BLAKE2B 2d1d99154b1dc00c796925dd3bb7bdbcdc26c429243e9c783fe607238d24f17a3cda34e18c2269d3ce0da9f961437f6e058d12f96cfccd7cf45f00fc6d6a706e SHA512 63434c701515038f368bb84b380119200876c98b84b37324d7145fcf2b384fd8cffe017b91ab3284526fd48601c0c485b320ac59388ca1763f5019a11c80666c
-EBUILD num-1.4-r1.ebuild 739 BLAKE2B 6d1cf81df5c7e127ce1208a44c5467c2e504096ecbd56975a209ed71801126656774819fbefb8531f5f43ee0937ae0f98dfa33edd388cbe09b9536fbcd69d99f SHA512 0160908a5713a00c46e3a0a85eb97bf79c83820ad2fb8f68dc5e2d9e4cd3aaa81b6257924f4cf6bceffc6222a7e77d277492ee1ee92a7b5a43d89d54d8ae0ad5
+EBUILD num-1.3-r1.ebuild 781 BLAKE2B 00e2a293bd75493d356699c154a45c4bbc82b9f35fd5167896a9ed581ac2d10405db1c60a3acd5634c02774ab3695cea2931adcc636c71fbb7c29e9a8ccef32e SHA512 83d3167348b0beb3699362207258ce9f12a4b9b9229f1f2c9c4590104f5d854f86db2b4b1dc6e137797513436e46afb2d581dc6027c8809a39ceee9daf6a5b38
+EBUILD num-1.4-r1.ebuild 733 BLAKE2B c615ba53e5931d7523cccfe98b0358e518143429cd360da39e497f801bf58635b7a4ef15b63850f1cc36bb64ec9695ab5a9451449b832e769379f9ff16711ca9 SHA512 9aacfd615e5261869853719d3f2b0292bedb849ccc21db44f5796d962501588b3753ef1ba3991452b7ce1c3a7e50781c885a691f917dd5804e79ce47731fab84
 MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
index 8cbf68aa3b51..73cc299b3bf4 100644
--- a/dev-ml/num/num-1.3-r1.ebuild
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib findlib
+inherit findlib
 
 DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
 HOMEPAGE="https://github.com/ocaml/num"
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
 	>=dev-ml/findlib-1.8.1[ocamlopt]"
diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r1.ebuild
index 39defb4f3131..dca4527a23d9 100644
--- a/dev-ml/num/num-1.4-r1.ebuild
+++ b/dev-ml/num/num-1.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+ocamlopt"
 
 src_compile() {
diff --git a/dev-ml/oasis/Manifest b/dev-ml/oasis/Manifest
deleted file mode 100644
index e4b615f082bb..000000000000
--- a/dev-ml/oasis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST oasis-0.4.10.tar.gz 394732 BLAKE2B 6347e532d595e33a3a62f63669625d6de0081e8be90568a0e9f334b9745a40ec2593e7c79d21174f3119728c4831393efff0a3ab6d1aeadc594a0f96e5112a72 SHA512 c173a3a774d13a7cb21ddb44f89dadef210d331ab5f3a1e7ff1705e815572f70e22815736cc3f3788b6d8f784c21a309b45c5bf5e984e583b31931847bf107fd
-EBUILD oasis-0.4.10.ebuild 892 BLAKE2B 68e49b5c33b3b3caa045f332a4cb9316998a6f6376a32c41535765a9d154be382b63b7129277c0c62df313d1d42888cfae796c30bdd5b256cd9cccbc24a18a50 SHA512 41db14a5b6612fe2c31b76ff0d80014aa77c66ac2f905c45e3ca5f04f6428cda080a05af0e44a7f8445c5ec5ba23b0964730d1596920a9a1b32c89c4916e213b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-ml/oasis/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/oasis/oasis-0.4.10.ebuild b/dev-ml/oasis/oasis-0.4.10.ebuild
deleted file mode 100644
index 9319826b935e..000000000000
--- a/dev-ml/oasis/oasis-0.4.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_P=${P/_/\~}
-DESCRIPTION="Tool to integrate a configure, build and install system in OCaml project"
-HOMEPAGE="http://oasis.forge.ocamlcore.org/index.php"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1694/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-ml/ocamlbuild:=[ocamlopt]
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-1.3.1
-	dev-ml/ocamlify
-	dev-ml/ocamlmod
-	!<sci-chemistry/oasis-4.0-r3
-	test? (
-		>=dev-ml/ocaml-fileutils-0.4.2
-		>=dev-ml/ounit-2.0.0
-		>=dev-ml/ocaml-expect-0.0.4
-		dev-ml/pcre-ocaml
-		dev-ml/extlib
-	)"
-
-RESTRICT+=" strip"
-S="${WORKDIR}/${MY_P}"
-DOCS=( "README.md" "TODO.txt" "AUTHORS.md" "CHANGES.txt" )
diff --git a/dev-ml/ocaml-augeas/Manifest b/dev-ml/ocaml-augeas/Manifest
index 168f18374970..c8fb2e43cd60 100644
--- a/dev-ml/ocaml-augeas/Manifest
+++ b/dev-ml/ocaml-augeas/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-augeas-0.5.tar.gz 59908 BLAKE2B f9f51afa0aec82e95d7bd81811e93e10587f1f2c1905338c0bbe47de61d983c24c0e5ab77aff1ca319834bf2199040a482b453177fa3c774e24ab72c3a534c14 SHA512 dfbad89790c6b5ada0e1239d002cb61a56a15350b2687d0987e0c61108d905e0c03756c08db7a3121eac3966fbeed86500e6f3c3c416cea2b974d9f50b8adabf
-EBUILD ocaml-augeas-0.5.ebuild 542 BLAKE2B 6818b811874c92b3409da1a02701959b1f5e8eb8f365e867d3c25394880ca061624fd72ac3532385a682ce3c8d8107dde5ea7db542a1b6a12568721ce3154b63 SHA512 b909cc87331cc0d7e98bd3e0ca7aa720bd36b3744e839a9a122e9723f7f8570adc920f9db5420683d99ee7cf042667af9181b86817d81c18852ccb21618954bf
+EBUILD ocaml-augeas-0.5.ebuild 532 BLAKE2B ebecb5e303ecd3d1ed0c9778b72c1eaa94ea35cc3ae0a7f2664ed03c11b5c363b03d34d03cf00ab7a474c9c31f611679742d2062a576f30a3a9c829068cbd661 SHA512 9dd471a2effd9bbb0a7a90f610dfefc10d0fef1b5bf3b45df2f24166422ae1678f37da1945a68b72d2be75507b2521856687d76b071b57652f44a9e00acf1e4a
 MISC metadata.xml 221 BLAKE2B 7f745ba55325e9e440ed43914bedb2cedfac4c5c30a6e5c86eadd7b88534fd72f2f6b84812dfee68bb01263fd801292dddc5ae7f5c44408e37be41c36615fbb6 SHA512 c01a7672ca5ae6bed92d8261dfaff331f88e085e55c755277a58eb0295800719062d8090647421058d325af9d8519bdffa15c0ff05d2c92954d163cbcd8c1028
diff --git a/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
index 92d39261f54a..ab46abaca844 100644
--- a/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
+++ b/dev-ml/ocaml-augeas/ocaml-augeas-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
@@ -13,7 +13,6 @@ SRC_URI="https://people.redhat.com/~rjones/augeas/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="app-admin/augeas
 		dev-ml/ocaml-autoconf
diff --git a/dev-ml/ocaml-cohttp/Manifest b/dev-ml/ocaml-cohttp/Manifest
deleted file mode 100644
index 7f3f35094ca2..000000000000
--- a/dev-ml/ocaml-cohttp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-cohttp-0.22.0.tar.gz 194568 BLAKE2B 220c291cdf50c1720e553cc224f6b3c7723add13a637cedd33deb162d4f420a8577b716f073c2b6a630de4458bdc9ac69d8eeeb1ccd44cb310b1a1262188c680 SHA512 60ae828a3e2085d5468f5d177f50a8e7a02ed47b8036af5548996ba3d36d8eef756662259abc65035c5d1f4158c9760762ac5f85376d6bfc76a7f027f01fa5b2
-EBUILD ocaml-cohttp-0.22.0-r1.ebuild 1108 BLAKE2B b6acd1d84ae5ba4288af7f7e71187742dd796866c831aa70c0143b1060044ba272a93a204f785c64cb41d089b6fb1571f537d9caad6c081d6b3a2abe50c60b7a SHA512 bd4418427a7ff284e58c46ce0a113e0189cfa8383d41b024ed3f0cfdd39b8953d166fcb53317bc74b6a454dca0c45bce43b7668259eb6d2845ada254f20bb3d0
-MISC metadata.xml 552 BLAKE2B c1820b2b2cc8084350fb35444e7ef95b88ef7b37b68cbc376214465ac12083de96be9c5bf69009bf349b5683f41583fa1bacb68426cfbc95b7e8e17c7170ec7f SHA512 5819b87043cbfecd5931c71c224e1d0fdcb67a24e44c3cb42b73fb4b17b64fa74db2fab7de3e75fe5a8b6d1441fca672518f9b95519299277eb40d09285ad1f6
diff --git a/dev-ml/ocaml-cohttp/metadata.xml b/dev-ml/ocaml-cohttp/metadata.xml
deleted file mode 100644
index fb051a0cc197..000000000000
--- a/dev-ml/ocaml-cohttp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag>
-		<flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-cohttp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0-r1.ebuild b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0-r1.ebuild
deleted file mode 100644
index bfcf3140f3d8..000000000000
--- a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Very lightweight HTTP server using Lwt or Async"
-HOMEPAGE="https://github.com/mirage/ocaml-cohttp"
-SRC_URI="https://github.com/mirage/ocaml-cohttp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async +lwt"
-
-DEPEND="
-	dev-ml/re:=
-	dev-ml/stringext:=
-	dev-ml/ocaml-uri:=
-	dev-ml/fieldslib:=
-	dev-ml/sexplib:=
-	dev-ml/ppx_fields_conv:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ocaml-base64:=
-	lwt? (
-		dev-ml/lwt:=
-		dev-ml/logs:=[fmt,lwt]
-		dev-ml/cmdliner:=
-		dev-ml/ocaml-conduit:=
-		dev-ml/ocaml-magic-mime:=
-	)
-	async? (
-		dev-ml/ocaml-conduit:=
-		dev-ml/logs:=[fmt]
-		dev-ml/ocaml-magic-mime:=
-		dev-ml/fmt:=
-	)
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	test? (
-		dev-ml/ounit
-		dev-ml/alcotest
-	)
-"
-DOCS=( README.md CHANGES DESIGN.md TODO.md )
-
-src_configure() {
-	local oasis_configure_opts="
-		$(use_enable lwt) $(use_enable lwt lwt-unix)
-		$(use_enable async)
-	"
-	oasis_src_configure
-}
diff --git a/dev-ml/ocaml-conduit/Manifest b/dev-ml/ocaml-conduit/Manifest
deleted file mode 100644
index b2f7c96bf7d0..000000000000
--- a/dev-ml/ocaml-conduit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-conduit-0.15.4.tar.gz 38960 BLAKE2B 3f4631a6a67ab00ecc0d903f0f0b832035b61d3fceec57db50bea0f56454292b4fa3911f4eeb5e05f8fb9fb68f13ca0f9e6c3c078d3bd5d0a1bb7c4bcac18495 SHA512 12f61828c943cb60b2c9be080fb32c8fe5ba16d8bac46a8b788f2ea9b8b7a3a53563defbb05271d516365d18cddafe57051125391ac018328608c4f6537ec5b0
-EBUILD ocaml-conduit-0.15.4.ebuild 868 BLAKE2B b250c496f80c67c851df0ba3ad2e4b8b709149febb5d01c5c10c1314ee9db2c690fc0bdce24b5492b6dbc425553025abefc07187323daa0e31c2f3ad39d8bdab SHA512 a10c6ff240d4f2ea9fd32bf99956d25dbc8e84e733cb0a54f3a631e4ebebb603a13ad19b2724ac7b61e1f43247ad2b95ef00468ec64d410a46efc4bbf7b5435c
-MISC metadata.xml 252 BLAKE2B 8458df778c7b7359377d7d027d1d6bc90eed5dd3283fafd7b6517fefedf8c018363ed7e2fd8c0ba40f62c92be86a3a1d2e48a6cd3c6ed5a65ed9936ebdd0ed18 SHA512 95f7c63a575b70b5b116c814e2927d21e1b71d15160be74fec4058a840e30cef7a22468d1add0804d1aca91bafb1d804185773ddc2e0cd2ac73dc7e4d6ac10bb
diff --git a/dev-ml/ocaml-conduit/metadata.xml b/dev-ml/ocaml-conduit/metadata.xml
deleted file mode 100644
index 237f85fa7a95..000000000000
--- a/dev-ml/ocaml-conduit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mirage/ocaml-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild b/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild
deleted file mode 100644
index 5690ccf9541d..000000000000
--- a/dev-ml/ocaml-conduit/ocaml-conduit-0.15.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Dereference URIs into communication channels for Async or Lwt"
-HOMEPAGE="https://github.com/mirage/ocaml-conduit"
-SRC_URI="https://github.com/mirage/ocaml-conduit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-lang/ocaml:=
-	dev-ml/sexplib:=
-	dev-ml/stringext:=
-	dev-ml/ocaml-uri:=
-	dev-ml/logs:=
-	dev-ml/ocaml-cstruct:=
-	dev-ml/ocaml-ipaddr:=
-
-	>=dev-ml/lwt-3:=
-	dev-ml/lwt_ssl:=
-	dev-ml/async:=
-	dev-ml/dns:=
-	dev-ml/ocaml-ssl:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-	dev-ml/ppx_driver
-	dev-ml/ppx_optcomp
-	dev-ml/ppx_sexp_conv
-"
-
-DOCS=( TODO.md README.md CHANGES )
-
-src_install() {
-	findlib_src_preinst
-	default
-}
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
deleted file mode 100644
index 0b92c30a2fb3..000000000000
--- a/dev-ml/ocaml-cstruct/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-cstruct-3.1.1.tar.gz 208725 BLAKE2B 2818c5695c4ab3d102cfa08a288e80e80d7fa4372a5d97aac831429f0681e21cb6b03baac245c7c1171a8efa23b8d6bca661ee74db0efe8c2649727d9be56505 SHA512 22ec8fe027dbebee537ff950c2aa9a494d0c4c000d8c4df848eae157b1c9502b73c208bb92c21fa4c13ba0291b7750de31e4c96b3a0571397402f841c3e01c21
-EBUILD ocaml-cstruct-3.1.1.ebuild 1310 BLAKE2B 0f79a924f5ac8c592cd259006b7b9ef1d0b4fb8d41e62c26b5eded4f9875e9ebe270e7b09ed0c568fe5f9864a61c62e9be3b59b5c5694ee5c25efe0d5ebfba85 SHA512 8889959da1352e25ab00385203aaf6aa9c5e96cc62a5aa4a81f84b57a0e6cdc287c623a14c2bdc69f145b856b24b9dcac6fe506e2ff7975da941dc961f671250
-MISC metadata.xml 502 BLAKE2B 27898a3a1e0255b8d0c418ea7b894fa9f6781884058031105ddd18f6716653e987faf4b9a9becc8780151b3b266e86574d47de164c932ee3e328ca358779be2d SHA512 16d2014f54ed982f55d27f6eb8be4cbc7ce139a686b93f7a2f35edcbd35264aadf978577eacafb3786ad79f440c159549f21f198b89a06f400ac458ddddbfecb
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
deleted file mode 100644
index ff9cc5cb9108..000000000000
--- a/dev-ml/ocaml-cstruct/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="async">Support for asynchronous execution</flag>
-		<flag name="lwt">Enable threads via lwt</flag>
-		<flag name="ppx">Enable the ppx syntax extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-cstruct</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
deleted file mode 100644
index f766d6e0c4f8..000000000000
--- a/dev-ml/ocaml-cstruct/ocaml-cstruct-3.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib opam
-
-DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async +lwt +ppx test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	async? (
-		dev-ml/async_kernel:=
-		dev-ml/async_unix:=
-		dev-ml/core_kernel:=
-	)
-	lwt? ( dev-ml/lwt:= )
-	ppx? (
-		dev-ml/ppx_tools:=
-		dev-ml/ocaml-migrate-parsetree:=
-		>=dev-ml/ppx_tools_versioned-5.0.1:=
-	)
-	dev-ml/ocplib-endian:=
-	dev-ml/sexplib:=
-	dev-ml/type-conv:=
-"
-DEPEND="
-	dev-ml/jbuilder
-	test? (
-		dev-ml/ounit
-		ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv )
-	)
-	${RDEPEND}
-"
-
-get_targets() {
-	local tgt="cstruct,cstruct-unix"
-	use lwt && tgt+=",cstruct-lwt"
-	use async && tgt+=",cstruct-async"
-	use ppx && tgt+=",ppx_cstruct"
-	echo "${tgt}"
-}
-
-src_compile() {
-	jbuilder build -p $(get_targets) || die
-}
-
-src_test() {
-	jbuilder runtest -p $(get_targets) || die
-}
-
-src_install() {
-	opam-install cstruct
-	opam-install cstruct-unix
-	use lwt && opam-install cstruct-lwt
-	use async && opam-install cstruct-async
-	use ppx && opam-install ppx_cstruct
-}
diff --git a/dev-ml/ocaml-dispatch/Manifest b/dev-ml/ocaml-dispatch/Manifest
deleted file mode 100644
index aa2ee4a1922d..000000000000
--- a/dev-ml/ocaml-dispatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-dispatch-0.4.0.tar.gz 7554 BLAKE2B 9bbe102df8a27642cbf54ad876caa276ba966ca3b19af53ac8f957799d0ca98b030c0d5ec055cc2868b2c374d71371c6e91ef0b89f4b5a072fbe2c47133df919 SHA512 d5318bda4079c21820fce5b21d178ed88fd0535a5cdc559dd6ceeb4d06ffb08456ee5aec1e56efd40b6d4f456f7d5c7eda17dc728666e6514dc936898b605b36
-EBUILD ocaml-dispatch-0.4.0.ebuild 878 BLAKE2B df6b567c81a3e6900d2322ab682fa0228afe5df1506d723baf460dd5a818e78532e1aec1987807080acd7d75dc259ca33100559718dae418134e4269cc9dccc9 SHA512 9edfe64ab8ef95608e7ea433e60793271b3ff6bc69bf10b8898aa69086cefb36dc9908be0a6562ad9c36ddeeed11b788b29188504f3e52b5199f21626b224b71
-MISC metadata.xml 260 BLAKE2B 2c01e02fd97a8fccc0f705d85be842abe3f587a45f4bbcf3b41ffcbff9ee2c2848847009b15b004ddca8abe84d35fbea548fc6517d8efead224c614483c4976a SHA512 4dcbfb971d15698777a531e300a4d78afe937f01ef4db0cf253830b377794662fc4d1349cc17b50045342b63df4348e81f44de7636ce86ff76904b880fc98d41
diff --git a/dev-ml/ocaml-dispatch/metadata.xml b/dev-ml/ocaml-dispatch/metadata.xml
deleted file mode 100644
index cf004079a542..000000000000
--- a/dev-ml/ocaml-dispatch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">inhabitedtype/ocaml-dispatch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild b/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
deleted file mode 100644
index 2e502161f235..000000000000
--- a/dev-ml/ocaml-dispatch/ocaml-dispatch-0.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="Path-based dispatching for client- and server-side applications"
-HOMEPAGE="https://github.com/inhabitedtype/ocaml-dispatch"
-SRC_URI="https://github.com/inhabitedtype/ocaml-dispatch/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-ml/result:=
-	dev-lang/ocaml:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-ml/jbuilder
-	dev-ml/opam
-	test? ( dev-ml/ounit )
-"
-
-src_compile() {
-	jbuilder build -p dispatch || die
-}
-
-oinstall() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--mandir="${ED}/usr/share/man" \
-		${1}.install || die
-}
-
-src_install() {
-	oinstall dispatch
-}
diff --git a/dev-ml/ocaml-doc/Manifest b/dev-ml/ocaml-doc/Manifest
index 7739de37fe37..6dab000f6967 100644
--- a/dev-ml/ocaml-doc/Manifest
+++ b/dev-ml/ocaml-doc/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-4.04-refman-html.tar.gz 833166 BLAKE2B 556534193cf23c3648c69465c139956695b68474a523ef6ca2bbfe9a40cdde86ab62a8077ab16759d3db4aa2b7e6f2bb615fc769ab0bf3aa46dc4c23231994aa SHA512 027ad5ea08488beb5ce65ec97a8aaf04197317d7d3194de771a4170dea9f8b90fc4309fd917b4176cd930dd0835c84448771b84fa92a735cfc60668ef0a6a413
 DIST ocaml-4.05-refman-html.tar.gz 882419 BLAKE2B 01ecd83c4d517a98c11564303bd31806fdd75c71f4492e25a71568941b3fb0b527944399fdd375a690557cf718c98f522577de37a946a5dfebf363d88962c944 SHA512 84688b06e61904345bc961d7244a74427025879c8e7365073887d76a560e5a373227d75c9f645f7bc16adbd05ea6a58918738beb13b5001cedc6b8289ed70bde
-EBUILD ocaml-doc-4.04.ebuild 523 BLAKE2B 06728af6f977dd69516b2caebdad8af7ca809e77b75b160b4400c66f27068c285c88618645cd411b703bf86342b55360b50526da99ddb75bbd430779a7660315 SHA512 95630bb77361f680537f17e30fa25005c0d87a2ef34ff6291a8856eeb623b4036fa254ce850c4ffe6d8551fbf002a82c932af192b66bbf45b4ce2573ca0f6486
-EBUILD ocaml-doc-4.05.ebuild 525 BLAKE2B 9549e81b825219587b30f3d5da2ce29655afb9bec81cc6bdf8544c0ec274e12da11d4a20f6c4d2982d9936187c626b504decb0d01a73271f9b1702660288d930 SHA512 271bfb48a846316799c22925abece1b703d08e2f163a6c1ed8b37990058a5c0a8f259dddebf41a9d8621cffc3ce03c4dff2b10e207c11878a179327d03d3107c
+EBUILD ocaml-doc-4.04.ebuild 528 BLAKE2B 6177d8904e9436651b5b480051ba4c2c223e74206a5707a8febde4543c42091ac18e2dcea6da32187d24b2367c2c7b8a63d0ebb2399c5c9041e25aa65c152177 SHA512 d015934039ba53691ef4885c6249029f06f81bfb2d84bcbb98da245bf3ac37840936133cedb95567feda9d256093ee07bd1571a6eb4585887d39dff03f72e636
+EBUILD ocaml-doc-4.05.ebuild 530 BLAKE2B d5493b004fa05145d9828968e98694b74c574cd03838af0dc6155da4a0ba2391826382961261f109a78778e1050d1630bfda3eecb9f3396cf77d3c1b12e078b3 SHA512 18896d50b15530ce1d0f5a2467ade2b080c53ad08d9e2e08ee99ea35ea808dbd936bc9d663862a9580a1259c8365e30385893787b19e559d9315d8ad58ad030f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
index 46e0e0b6687c..b15602118ee4 100644
--- a/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
+++ b/dev-ml/ocaml-doc/ocaml-doc-4.04.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Ocaml reference manual (html)"
-HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/"
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 ~ppc x86"
+HOMEPAGE="https://caml.inria.fr/pub/docs/manual-ocaml/"
+SRC_URI="https://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
+S="${WORKDIR}"/htmlman
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/htmlman
+KEYWORDS="amd64 ~ppc x86"
 
 src_install() {
-	dohtml -r *
+	docinto html
+	dodoc -r *
 }
 
 pkg_postinst() {
-	elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/"
+	elog "This manual is available online at https://caml.inria.fr/pub/docs/manual-ocaml/"
 }
diff --git a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
index 198cd811e65f..0cd8b61b87c8 100644
--- a/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
+++ b/dev-ml/ocaml-doc/ocaml-doc-4.05.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Ocaml reference manual (html)"
-HOMEPAGE="http://caml.inria.fr/pub/docs/manual-ocaml/"
-SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
+HOMEPAGE="https://caml.inria.fr/pub/docs/manual-ocaml/"
+SRC_URI="https://caml.inria.fr/pub/distrib/ocaml-${PV}/ocaml-${PV}-refman-html.tar.gz"
+S="${WORKDIR}"/htmlman
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/htmlman
+KEYWORDS="~amd64 ~ppc ~x86"
 
 src_install() {
-	dohtml -r *
+	docinto html
+	dodoc -r *
 }
 
 pkg_postinst() {
-	elog "This manual is available online at http://caml.inria.fr/pub/docs/manual-ocaml/"
+	elog "This manual is available online at https://caml.inria.fr/pub/docs/manual-ocaml/"
 }
diff --git a/dev-ml/ocaml-expect/Manifest b/dev-ml/ocaml-expect/Manifest
deleted file mode 100644
index 34b7b6d1d08c..000000000000
--- a/dev-ml/ocaml-expect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-expect-0.0.5.tar.gz 63245 BLAKE2B 8435db55e74f4e245c38f75a686b91b9389e1050a515f674e86308fb270a1090827af40fa9890982ab60ab3e3c5df494accf1a54c232c06c274b36a9a8a2b1f4 SHA512 fbb2ae41c12e57db4440e67d80740380d4cd7bab0f8fdf59d3b69ff91eb6e35a82ca718cf32ad2c791ae76be8a08174a5b3a95e8910351413cc98afd3105a63c
-EBUILD ocaml-expect-0.0.5.ebuild 631 BLAKE2B 214ec8f8e2c256bff8aacf2553157c2c10dfd85968ddc890953a9f63a562b524d87cdbc0922c3e36a1482433e21ebca082d961790dc2810129f567f8550a7777 SHA512 67b578e932aef1d842bc7fd13e9e4fac4a0e5b3b591fc6dc2140532e02bcf826993215f5483beb506404385638da38a1a688e9274157ea2ab59ed4b1d3edebaa
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-ml/ocaml-expect/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild b/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
deleted file mode 100644
index 7f9cc015a09e..000000000000
--- a/dev-ml/ocaml-expect/ocaml-expect-0.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Ocaml implementation of expect to help building unitary testing"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-expect/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1372/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/batteries:=
-	dev-ml/pcre-ocaml:="
-DEPEND="${RDEPEND}
-	test? ( >=dev-ml/ounit-2.0.0 )"
-
-DOCS=( "README.txt" "CHANGES.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ocaml-hashcons/Manifest b/dev-ml/ocaml-hashcons/Manifest
index 645ef1d15dc7..9f5f5d42e8e4 100644
--- a/dev-ml/ocaml-hashcons/Manifest
+++ b/dev-ml/ocaml-hashcons/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-hashcons-1.3.tar.gz 19495 BLAKE2B 0d29a529fb1d6953e7294e3992e6f41c094e8b4ea607ed4f2f0d97c558b2c9a6e8703de0aca06727b845ad3f3989ef99c634e248f221c95fbffc2321cd73e961 SHA512 fd194d48a3231e72ca8bf3d324e5e1f6442d965da9149973a1763cf70aa82398805fa00648bdd12de3d3daada8e90bdc575c73886f949b5183e79bea75beadc8
-EBUILD ocaml-hashcons-1.3.ebuild 856 BLAKE2B e8d2f6d399d40ca83b447c7c5a18ba8ed34c5d0b5b272852119ff8352dbe9111923e732a3ae5d01c33be478efff7e3c9174e6011f7216d149ae2f3807aefac38 SHA512 4b0f2ac976990f2086bbb37f8168b3756ec0fd845483db3eae2ca7f3c7ee7424ba6bdbb14b33b31dbf434654c34fe66cf9d14ec00aa4f833c8b2df8285523714
+EBUILD ocaml-hashcons-1.3.ebuild 885 BLAKE2B 5717313c262c96f23a87f39c2ffbe568f444c367bdf98281e7527e2622fb96349b5f88d095b6b6f484f18bf3fedbd0ef8351466cb7a2463ec6ca5290a3208f96 SHA512 15e40c8da43f58f23b87569b4034122115126b2e156e26dc090e7341d16339c7a573580f26cd8b39f83ef66477cb7b65e017b6794dc4f395f2fb339f8dd34b70
 MISC metadata.xml 259 BLAKE2B 72d093b371aa2735e9f81201fb32b5fe3e6ae2e3074c86be4e6f85c026d6a81cbeb3a82ca72ac6dbfe4ff3785e5661843b32d8f859ce50fad3823f218fed84c5 SHA512 ee8ee05e2b4f71e1e2b73d210db65707f53606f2943406f41a12759a4d024bd4cfbfc6f8c8e6ddf37e199adb10b7501aca1f2dc6e6704590221e50bec20bbeec
diff --git a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
index 7b027961ea87..e059ea1b1938 100644
--- a/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
+++ b/dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools findlib
 
@@ -18,7 +18,10 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
+
 	eautoreconf
+
 	sed -i -e 's/$(OCAMLFIND) remove/#/' Makefile.in || die
 }
 
@@ -31,7 +34,12 @@ src_compile() {
 }
 
 src_install() {
-	dodir "$(ocamlfind printconf destdir)/hashcons"
-	emake DESTDIR="-destdir ${D}/$(ocamlfind printconf destdir)/" $(usex ocamlopt install-opt install-byte)
+	local destdir=$(ocamlfind printconf destdir || die)
+	dodir ${destdir}/hashcons
+
+	emake \
+		DESTDIR="-destdir ${D}"/${destdir}/ \
+		$(usex ocamlopt install-opt install-byte)
+
 	dodoc README.md CHANGES
 }
diff --git a/dev-ml/ocaml-ipaddr/Manifest b/dev-ml/ocaml-ipaddr/Manifest
deleted file mode 100644
index 9fa0bcd2a032..000000000000
--- a/dev-ml/ocaml-ipaddr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-ipaddr-2.8.0.tar.gz 22134 BLAKE2B b6e9d49fd6ac69bd4cd4884e97490a744e863541084270f55847768c2fe312334feb00fc9404028664864cc1dffccf8cf2df004a341429e78122dc64bfe0a087 SHA512 1714ee4d6b2afa17b987844f37a9896f01d7b674770fa6804b03222dba656130f9ee0d2d1409b67e770e21f973682c7d1d5c550abb0a5d94bc0c04a1a97e8e3c
-EBUILD ocaml-ipaddr-2.8.0.ebuild 691 BLAKE2B 997ecdd3d8fe68e2e3d80b189bc34aa3fe8666a7ee7f0514a1707caf314f35fbdcf1bb2ae77a89b9a365872dd2c47048e45db589e38c61c65714b968f3635531 SHA512 34459eb407dab1e298a70c4ee7afa3c2a238665a76bd7712830553b9ef67220d03aba0575a7db3cebf9ef35175be8a735fffc9844a156987cdfa2f71005b9563
-MISC metadata.xml 256 BLAKE2B a192910731f71577053fb41fe5d0542ee091bb30854f56605fa35f82c222bc7bb0beb4cfa5e302cafd1bea2e5b508709ac2712c04dfcadc40f4b506438328114 SHA512 9a9b9631f5b9d20431e105c642ea92b5454b9ce1c97c8eb0a565e7f692949ba4e65ec31191172ad002ba7c2b055c582d3f95e92c8137506ef92a644f81c71bf6
diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/ocaml-ipaddr/metadata.xml
deleted file mode 100644
index ce6645f0aacc..000000000000
--- a/dev-ml/ocaml-ipaddr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
deleted file mode 100644
index 21a35d68fc5c..000000000000
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit opam
-
-DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
-HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
-SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-ml/sexplib:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_type_conv:=
-	dev-lang/ocaml:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-"
-
-src_install() {
-	opam_src_install ipaddr
-}
diff --git a/dev-ml/ocaml-magic-mime/Manifest b/dev-ml/ocaml-magic-mime/Manifest
deleted file mode 100644
index 32255517d2bf..000000000000
--- a/dev-ml/ocaml-magic-mime/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-magic-mime-1.0.0.tar.gz 53937 BLAKE2B 202968b4038f66e61b458b84d6505b1c143b8994ff32cd6c2e11d7feec31a4e99af26fddb84b72d19ce1a37cc01d6dd0bcf6e9648b6434f0a1509120fabda251 SHA512 e6a050e0adc465d174083b101b66805e3261b0498cd20d19bd4d2da52859d6c792f8e13e1c787d54f81e1ff65048f4fb3c38367f1a60c8e5c94367f5f685dc8e
-EBUILD ocaml-magic-mime-1.0.0.ebuild 413 BLAKE2B 2be617ad44dc2e64013ea4312ac3c5d72741fe1efc41e00e37617e076b235768f55af9597145702464b97afd8a72ced4aeff44dc5a1b2658f92d59fb6302357e SHA512 a7f2c1522bf4ebdbb409d4a49f52f81785484a3e6bd62190aa1b2dfea433164ab76ab9825d030bb89e4b32565c552f7fb8bc7d70d999fb686265e33d6901ff73
-MISC metadata.xml 255 BLAKE2B 462c8baed8edf3c58e8fe7efae303ad56ea2b80f29fd8e34194ad17b46468b43f6702431f46ef401be97c66b0b0096e028cb3788dbc2324ed5d38aaf89706123 SHA512 ed02e6320400ad6efd9450416414183553adc3a5c54449680d0a4905ee2d467fce67b9c82018a0f60d0ab5bb21288cd08f19cc0f6132ba77cad8bd68b8a9a68c
diff --git a/dev-ml/ocaml-magic-mime/metadata.xml b/dev-ml/ocaml-magic-mime/metadata.xml
deleted file mode 100644
index 2ca30fe9fc35..000000000000
--- a/dev-ml/ocaml-magic-mime/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mirage/ocaml-magic-mime</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
deleted file mode 100644
index 7693ae06464f..000000000000
--- a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit oasis
-
-DESCRIPTION="Convert file extensions to MIME types"
-HOMEPAGE="https://github.com/mirage/ocaml-magic-mime"
-SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-re/Manifest b/dev-ml/ocaml-re/Manifest
deleted file mode 100644
index 2c1fe875a66c..000000000000
--- a/dev-ml/ocaml-re/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-re-1.7.1.tar.gz 132948 BLAKE2B 79a3114cb6221742e7e26187080a7029c8e17f728066ce4f4420c0b69be6377bb651f143a97f55f7976074ce9e48913489a51c586f9c79ed6adbcb6c9a595924 SHA512 0df5b0db4c8ab7017576516adbd8edf2e7774afbdca63383cbdb0f2f2b023efb7215366a6679c8810f3b70d542e0181e6b6d4a212b30531cb5d0bef0a6033747
-EBUILD ocaml-re-1.7.1.ebuild 600 BLAKE2B 8e70ff0b736650dd87893fae794905e6446d9cb698d1fa69d174eee1cad9a2daaf8660bd4e496ff23afe169ece60916434fbdf936f1defd57bd84ff27eff6401 SHA512 7fc13e5f4b2ee034aeb6f4fc35e60ba323a39f4124157cb0ae36488fd856f8f258e7b3026f7e31d099fc0582d3d72832a26882af903b7ae7ef8c8373ca0d94b1
-MISC metadata.xml 251 BLAKE2B fc2d3e50a65be6ca39dd40d42d4b83a5497fb3800bed18a1ec57c9e19f4dccd182bae2fa78a1332625ec3c694014e41a9f99ce41cc65cd12ca4637b9aac0ac61 SHA512 d83b5d64c82a9dba5e7e3b78cb59c7eefa9b8ac17bc55ac3a89782df170aa1a3009ecadb3e2376151bc792b6ae5f21fec24aa014a8449ec6c839af6c94f49368
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
deleted file mode 100644
index f2a7b592bd52..000000000000
--- a/dev-ml/ocaml-re/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocaml/ocaml-re</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild b/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
deleted file mode 100644
index 0c28d5c302a8..000000000000
--- a/dev-ml/ocaml-re/ocaml-re-1.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Regular expression library for OCaml"
-HOMEPAGE="https://github.com/ocaml/ocaml-re"
-SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ocaml-4.02:="
-DEPEND="${RDEPEND}
-	test? ( dev-ml/ounit )"
-DOCS=( "CHANGES" "TODO.txt" "README.md" )
diff --git a/dev-ml/ocaml-ssl/Manifest b/dev-ml/ocaml-ssl/Manifest
index 3af01bbfec70..9300ffd78f4e 100644
--- a/dev-ml/ocaml-ssl/Manifest
+++ b/dev-ml/ocaml-ssl/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-ssl-0.5.10.tar.gz 33951 BLAKE2B a27cce7e19c3737657cbdba31d919d51d0db137aafddc6397ff018fe36346a8e99b0353c76f4a4bc4dcc7dcf63ec326e87b2ebc809b78de1511963357be280b0 SHA512 f2d0acc8dcdb0a36c8ad236f60c6e9d7f8f76ea25183017218953dbe3432a19de5b0be8214714add71b88b211ac78318f09429d4df7ecba1e19dc94d4414f0e1
 DIST ocaml-ssl-0.5.9.tar.gz 32721 BLAKE2B c6b1ec659fddf384005f2cb045c0b0c059daaa93bd782904354e12e1ce63432c04c9bdc823dbfd0cd903ce872c91f0a750975cc69a56c9384ef6d09ed46c22cd SHA512 6826e5a6ab9f51013e8d097900f443d091e085e3d2d232a315a0e3a90ca334c9b9779d20dcae267f9ed961bc4a08fcb80372e669389c59a22d5c7706d37fcd5f
-EBUILD ocaml-ssl-0.5.10.ebuild 596 BLAKE2B bc7c81afc83dd6740a44552024248e974258e9666585ff961aeae0ce6d2a0a8c4abb24509cdd0f921e49c7bc0464e706a06d1779d30d67d6f5388408e0b06732 SHA512 3ca3d8d41474aa7844b7e030e4c46c1cfb28ad3432ebd88dc2e1e370e555a92a5a5d1020b7196726757d685a00c986368714ae56825847056eed12b54b4891ef
+EBUILD ocaml-ssl-0.5.10.ebuild 594 BLAKE2B 4c255c4f7842e7aff8b445eb40a3f705324a36b1b8532b4bed9269da9c051929d259e9ad481506d6cc67e7f84693e2e766a9641748d510a17b0475753760ae8b SHA512 c35e32a3ab8acba63702a08e61d349db55b3775e2582d832ac9cbd7a09af538e526555565879bb6ebe89d43a87514349077cc0b7296a0c71466cb8102853a0fe
 EBUILD ocaml-ssl-0.5.9.ebuild 594 BLAKE2B 9937810b53282c9e858d0f513411dec14e91ac72ab3d174d6a36e57c17ac665448665c8fc039dcd8d68608eedbea7c475089c386ea4ad21446ec915e5c68fb91 SHA512 e0ebdff5183bfb5e77663071877372dd269a0cfc53d20f5a91586f51198e9b4852da67ced0dee3799e6449bbd509fc07ddbb977613812fb10774011484493075
 MISC metadata.xml 366 BLAKE2B 3500b88cfc5c67cc1cea168548db25e3c38b0e821dc9140b68472da7b8f11bedbcd9f9cf1c3bed002e4ce6848e83b2cf2a0531f0f60cd92a605596d5ed8ae8b4 SHA512 0d755921669d45da244c75aea1fdeadc05fca6c98256ba5b2afb8a524b8db705a91127a5e726cbd0f5be329a779a46578c941a93fc801a5ac373a6e8b0bc3e27
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
index 763f1ceeb645..0d53fe77db73 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/savonet/ocaml-ssl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/ocaml-uri/Manifest b/dev-ml/ocaml-uri/Manifest
deleted file mode 100644
index 70d157b925da..000000000000
--- a/dev-ml/ocaml-uri/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocaml-uri-1.9.4.tar.gz 213917 BLAKE2B 3b76ae2f39a7a97e581791e32e7ec302faacaf883ae82bb635497f205a7bb12b331f2ef34f834c4b22b56433fef75b6ba2c60db6b66f13997290e108f6f0f38b SHA512 c2314c55d1d89bb7824e6bd2aad57fa2bdc4889d5e6c0b4ce75f4ca33660d510d7ab125ff0f340f4688930f3ddac13193d34762f912cc70c4ce30aa206f32ddc
-EBUILD ocaml-uri-1.9.4-r1.ebuild 680 BLAKE2B a257706ab68aa2da1c8bd062c02cd7ead70646d3fcae9d21d598d9d72e19f2881eae9a3a647a3a2e26ddc3c7530666f53c25378dd303c48f135e04066bade580 SHA512 1432c929860ca6d160544d64ffdab07a19ffa9d7a00e766f6313d00e7b8cf6a2d3113bd604392439f73200f597e87fa4327a1dff1dc95e32746659d73fbe08ca
-MISC metadata.xml 313 BLAKE2B f10b6cbbf903da16e9ff5d9cbc811a3dd6d580e5cc62ef08b2242be8e9525b0c58ffbff5449959c11af7efda005c90423a5e9fd0ba23dbdfa94f958f6239da96 SHA512 9372267613c2a6b3437d082f4936147bbb5f946e431ab45542d13e62f7f0c60c2686a84bdedaec816160064e71a8b43cda374ef9a46de91c225e2a986ab70e65
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
deleted file mode 100644
index 5d2f0a1ef512..000000000000
--- a/dev-ml/ocaml-uri/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-uri</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4-r1.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4-r1.ebuild
deleted file mode 100644
index 63708fe6bc1f..000000000000
--- a/dev-ml/ocaml-uri/ocaml-uri-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib opam
-
-DESCRIPTION="RFC3986 URI parsing library for OCaml"
-HOMEPAGE="https://github.com/mirage/ocaml-uri https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/re:=
-	dev-ml/sexplib:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_type_conv:=
-	dev-ml/stringext:=
-	dev-ml/type-conv:=
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-ml/ounit-1.0.2 )
-	dev-ml/jbuilder
-"
-
-src_install() {
-	opam_src_install uri
-}
diff --git a/dev-ml/ocamlify/Manifest b/dev-ml/ocamlify/Manifest
deleted file mode 100644
index c6cc9ec37c82..000000000000
--- a/dev-ml/ocamlify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocamlify-0.0.2.tar.gz 53184 BLAKE2B fff11edce964a0552f9a7f130872f393e764a9413ac526d643dd575969a47cbc6a0f9c5040c0fcd3e5beb11c42a8a3a35fe55898eab176b11c659bdd74729b90 SHA512 e36dd09de6163be1e4d1a54944bb66871a5d461b3ead9ee8393d91a624cf6f7d038be8d8b9db36b04786adff67eb830d9aa3e81475e774dc0dee73adb985079e
-EBUILD ocamlify-0.0.2.ebuild 519 BLAKE2B 3081c21b0f220a55d3ccec96c3d70129109f156be94b95b502722cb1b476097ffdc85403c06b4a64529148708e9e191ab948db27beca1777eec4c4adff4df93c SHA512 f4f9dc715ed90155817652f298473f27428b45c11985916e19b9db043d46a740664bc44f9ea6d6d39fcced87fc13f3a2bb5a3b0e66f42dba5bd274971723d927
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-ml/ocamlify/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild b/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
deleted file mode 100644
index f5e146b1104b..000000000000
--- a/dev-ml/ocamlify/ocamlify-0.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit oasis
-
-DESCRIPTION="OCamlify creates OCaml code by including files into strings or string lists"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlify"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1209/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~dev-lang/ocaml-4.05.0"
-DEPEND="${RDEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" )
diff --git a/dev-ml/ocamlmod/Manifest b/dev-ml/ocamlmod/Manifest
deleted file mode 100644
index 7d09d6a179fe..000000000000
--- a/dev-ml/ocamlmod/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ocamlmod-0.0.9.tar.gz 55025 BLAKE2B 26be662e814543b65a2fb293732257a803c0cfc544550d0339617ff3c59ce1cf44f2330582e6eeca313cf8e25984d7cbfc4fc1c1a3b830fc490a16551961974e SHA512 cf0d3671cf8fa83bdbd0e4b47888a50f9eab24691c71685c0612a9a8efaf36ba9fa66cee604c928a71f2d8da40b35453d2f2d3619f73141aba0f46de3bd97537
-EBUILD ocamlmod-0.0.9.ebuild 522 BLAKE2B 7302c193286a7b8fbb9a0e60c19beed36d1861455fe6a2dd5ef3d7a51575c6c01d4ca520b257675a5039ed3bd8bc7ec5033a69cc9918977528a4ab21810bb2d6 SHA512 bf07f93cb0c37debc23040b2c7452e7400b39c09324a4fd619181174ecb2e7b8d6ca1ba4b852dc2fed734904427daa32ec1bf27ec1866d31180f93aa69263fa3
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-ml/ocamlmod/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild b/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
deleted file mode 100644
index 29b1d9d71889..000000000000
--- a/dev-ml/ocamlmod/ocamlmod-0.0.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Generate OCaml modules from source files"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocamlmod/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1702/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( >=dev-ml/ounit-2.0.0 )"
-
-DOCS=( "AUTHORS.txt" "README.txt" )
diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
index ed7229e95d0c..63e1d04299a9 100644
--- a/dev-ml/ocplib-simplex/Manifest
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -1,4 +1,4 @@
 AUX ocplib-simplex-0.4-flags.patch 1596 BLAKE2B 7bc7a8a70245756937c5c1de5fb3bdb21de5233dd978ca1a8ac781d98c0d4e4bb22384d5e8df0601d42c413522824c9c697d706e64fc9d9ca848294da0ec9e4b SHA512 09f4edb690922d7a460a1a4ba7d72773cd26abc699fe5e9d1c130c2e5321edfd99e913b121f274f026c0d8ca26833b7e08677e0047821ef0e4dceacb7797f3bf
 DIST ocplib-simplex-0.4.tar.gz 31784 BLAKE2B 89ebb43ba59debc658b1400b24379dcb717f44f484742a4ea2227e1692f2d1d359469add4e3c22bd15b7a5044e4d45877994b40e80f28ec8639989bf28565d9a SHA512 5eb80f0c8ad32291d24423255c0359e139cd85e2262b0cbbfaffcab66d9a7eb66c9bf04bb9d5d5c103574ec7041a72cde5412e6cb03fc9fe4a8fd257dab49a76
-EBUILD ocplib-simplex-0.4.ebuild 873 BLAKE2B 28c840cc9fd1fa52b199140191b20c951cf4bd9bd930d466786f35ce47e8e3378c37308b10f8e93b26272e21d57242646dbef6be3d7a45d5ec73f325b25508bc SHA512 ba17ac1c46113fcd36930de84e37c221c84af9f689bc74fdd12acd98ee27219177ebd6b8bbe3420364ddb1abdf2a63f09219ab9b39adb53872af262af6e2e6e3
+EBUILD ocplib-simplex-0.4.ebuild 833 BLAKE2B 4cd41122c5a768eff618c2281e12c2936c95e3a949675dd2230bf405a4dc84f257ac615143ab9950c720f700ef3bb3945f61879f0c829e5283bd0492f0183d16 SHA512 5baa1e157a3e958140918f8cdcfc7e95044c5a3186ea8cc17a8692c42bc16827c77551b53c2d1bf652497b6c388b7d9f029b06ad4f6046e48fd2250d21810036
 MISC metadata.xml 395 BLAKE2B 54a700f2e21a6b8a8b9f05e017e7c2601d7880aa7c3009b8877beb3cf023c5fb6a74e7ec63b65920c0b88994a594a36218aa5e1bef367a1f499fcc87a34134d2 SHA512 7f7ac525cbf0913934c92722e9c279846664b9f0628eb529f67039e6dadda276925535b53b9139a22ed2da67e51f6434f0dea35ff60d74d8941e27b51a0f0ea1
diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
index d032ec5579be..048bdf309541 100644
--- a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
+++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
@@ -1,24 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools findlib multilib
+inherit autotools findlib
 
 DESCRIPTION="A library implementing a simplex algorithm"
 HOMEPAGE="https://github.com/OCamlPro-Iguernlala/ocplib-simplex"
-SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+SRC_URI="https://github.com/OCamlPro-Iguernlala/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
+DOCS=( CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-flags.patch
@@ -32,7 +27,7 @@ src_prepare() {
 	default
 	mv configure.{in,ac} || die
 	sed -i -e "s:configure.in:configure.ac:g" \
-		Makefile.in
+		Makefile.in || die
 	eautoreconf
 }
 
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
index 6cc3b28900f6..5bb839e093d9 100644
--- a/dev-ml/octavius/Manifest
+++ b/dev-ml/octavius/Manifest
@@ -1,3 +1,3 @@
 DIST octavius-1.2.2.tar.gz 14910 BLAKE2B ad2c6cc274e205918276ed8ab58032ce3f5fb5d564c1ad7cc33c2d73accf1952e972899bd872b9bcb190fcfa223ee4de7f74fbeba44720b3fe78725d1d4d2561 SHA512 57e40f0bd03599bf0b14d85b29bef2214f9b9393917c0a65acf60cf028fe028a730a804f3c0101fee1378cacd4feb7a4f2df3c8411ceeb6bb34d47f849b7a55e
-EBUILD octavius-1.2.2.ebuild 425 BLAKE2B 8f92e03167a4b10bb417ba9f4293877b6c6d9745b8d2a4c6650f951db437bc83793ff50720eceab75fd7ba5d7d995122d515c7bbb4de359f7b9453a412bcc6a8 SHA512 28e0a96b6664e3fdaeff346b6db993e5c19291b397a0c37a8d35de5258d25362e7197d368390e99676bc49f7670b396f220b63614541baeccf9a6e601b028c13
+EBUILD octavius-1.2.2.ebuild 394 BLAKE2B 09bea5b82e92dd4dbc80d099185139d95bada4bcaba57d153e51967d42220c71a5d64efc1d9978ebdc7ef23c7c2475027f20a99e179fae2f038ecdf97e348218 SHA512 80b65a7bf28f87ebfa2fa173aba84b3b535e6f226b93e30ba027aa11b0227d957fa09e95191758846162a3c202c4d3cb9c52f2ab28192a28bf243a0d3de38758
 MISC metadata.xml 327 BLAKE2B 58702e13c3b8968a045cfef09983d51eefe7d52e2e698e79573403887bb75f0365c1aebb23a442227bd498ab62c5c6fbc41253fed5d289be7e6bb97a808edf99 SHA512 ebff2af79425cbf3b4b403ee4caa36ef7eade90779a52cf247c100684f973b80974e7c2c1f819168d17c692b2b8405bc2cfb6be14f6cbaf1a78785ae259279ba
diff --git a/dev-ml/octavius/octavius-1.2.2.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild
index 8cd4f8364783..750e6cbda7f1 100644
--- a/dev-ml/octavius/octavius-1.2.2.ebuild
+++ b/dev-ml/octavius/octavius-1.2.2.ebuild
@@ -13,6 +13,3 @@ LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt"
-
-RDEPEND=""
-DEPEND="${DEPEND}"
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 3e5ded24e68f..810a9af1d97b 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1,6 +1,6 @@
-AUX stublibs.patch 591 BLAKE2B 6aca6475f230754bba8822d5181c9bb798004efad8a5656e7f5380d03544f6e67e875b0bc7ccce41ac0262af40961a823f6fd2906433a8c66f53d67d24cb0a5c SHA512 b10fd1ed192d6bba0c893538a6c936d37330f8fc89bfc30f334c5ef1086e4274b989c7ab8e059754d87cbb64897c0657a5ff49add456f83fb035185631bacce4
+AUX stublibs.patch 454 BLAKE2B 18da6bb7e978d9f5cec3357f9e450d473274c1a0c4fa691691fa280ca25ac1a70a1312aaa06ed078cebc35bc0b7fa30f395de22328d3ed0ef88752a1c3a774bc SHA512 ed03ddaac89ed4edf845dce028a5acc8935439207331dd67fd8a27278a0c5466c1ac5dc97216fc4e24cfba5b5f6928d25bed825a93249383506bf3336d882d25
 DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-1.3.1-r2.ebuild 1093 BLAKE2B ecc0296a205c8d2b6f4b1d060eea574b892bcb4e970419b266c6c74437ec6da6c733feeb93979716f6bcfe7c977b1870119348e06eb35e8417cbdb97cbf3164a SHA512 e422e7d15e363970fb2ca752faa5b9b156f884eaa139362973d57d98bf613cefcf35ba5a4961ad210fd132e4298a5d881d0b4e97e5099d473ec0aa4eaaf2bcf4
+EBUILD opam-1.3.1-r2.ebuild 1086 BLAKE2B 89dd08f3b0861f6e12225cac660c7578740a6c88c0804d62617098bd4b0ef33333a55f28153362a6bad8abeed6eab4d40293dfca80841fabec83680279ee9480 SHA512 5858a2df6184919fae0afe999c92b9b67ad0f7d7234d8174c63d3b5b5a66b7bcafe469b5e1c4c769cfe60b89697e3ceaaaf6dfb71952fa97c7bdfd2016db6334
 EBUILD opam-2.0.8-r1.ebuild 796 BLAKE2B 83b7753c328cc34f0b96c2609b97e4c9ecced2e759e678adb8f4a4d9b69718b78918d258364431a47d86066db0cec6d8741344da0e0921c2c8cea34362233203 SHA512 a4e040c25560f328d8e533dc348fce084c839b5ad001dc41ea58823b64e437730e0bf2b4826f2d8d4ad0bc988f4f4328115562a5b28534f99cd9b01690a0f15f
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam/files/stublibs.patch b/dev-ml/opam/files/stublibs.patch
index 3cb61883233a..69fb02913b50 100644
--- a/dev-ml/opam/files/stublibs.patch
+++ b/dev-ml/opam/files/stublibs.patch
@@ -1,7 +1,5 @@
-Index: opam-1.3.1/src/tools/opam_installer.ml
-===================================================================
---- opam-1.3.1.orig/src/tools/opam_installer.ml
-+++ opam-1.3.1/src/tools/opam_installer.ml
+--- a/src/tools/opam_installer.ml
++++ b/src/tools/opam_installer.ml
 @@ -312,7 +312,7 @@ let options =
      let mandir = mk_dir mandir in
      let libdir = mk_dir libdir in
diff --git a/dev-ml/opam/opam-1.3.1-r2.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild
index 17c5bc14ce18..e1d225ca5e67 100644
--- a/dev-ml/opam/opam-1.3.1-r2.ebuild
+++ b/dev-ml/opam/opam-1.3.1-r2.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/"
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != 9999 ]]; then
+if [[ ${PV} != 9999 ]] ; then
 	SRC_URI="https://github.com/ocaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ocaml/opam.git"
 fi
 
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-lang/ocaml:=
 	|| ( net-misc/wget net-misc/curl )
 	dev-ml/extlib:=
@@ -36,13 +34,14 @@ DEPEND="${RDEPEND}
 	test? ( dev-vcs/git )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/stublibs.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/stublibs.patch
+)
 
 src_compile() {
 	emake -j1
-	cd doc
+
+	cd doc || die
 	emake man
 }
 
@@ -52,5 +51,9 @@ src_test() {
 
 src_install() {
 	default
-	emake DESTDIR="${D}" OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" libinstall
+
+	emake \
+		DESTDIR="${D}" \
+		OPAMINSTALLER_FLAGS="--prefix=\"${ED}/usr\" --libdir=\"${D}/$(ocamlc -where)\"" \
+		libinstall
 }
diff --git a/dev-ml/optcomp/Manifest b/dev-ml/optcomp/Manifest
deleted file mode 100644
index 166021d955eb..000000000000
--- a/dev-ml/optcomp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST optcomp-1.6.tar.gz 56370 BLAKE2B 15a349d7ce927d69b10424329abd59108803683cba85dcea66cea19d0465a18e43f990a8031e2b63dba5e8bfb97488b28c905dd09391de0a0ff919d62926381a SHA512 19fa04a42e5ed589979647469759017442598d170bf82d49c3b720d1b1b6bbe3066ae3ffee77a3f15dcbf51be5d7a8934300873391ebce423f3a0f3878250c18
-EBUILD optcomp-1.6-r1.ebuild 475 BLAKE2B 9cd0224cbbc5813247d13d516e84b815d0508d50eb6be243a90e7ee26b3493c7ba94899f56cf8a1d56480b6f25acc73d7e0244168f35a3d6fcec2ae27f9df9bc SHA512 70f0a86f7e0718809c900fd448381bd05032d2844e0b72c897217da3b660a038f2a3ba0f2c374f64da531503a9d74432e8d06961cdee2fa4cbb6c96ce9575e1a
-MISC metadata.xml 249 BLAKE2B 37c5fadfce090dfab733c96e3eea8ea6510661a126e5b1da15a7903215918c8fa205548bfed8cac200360ffee16c0d99d8ae92275c9659e3cb83e221f4512346 SHA512 29c6722d3298e19f0ea7115d1d0f747a5b824c045d6f009c07b12947af30e340acf17d51fc74c634234a56fd96401e6f2648dd1b7a361543900878ab1c2ef2cb
diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/optcomp/metadata.xml
deleted file mode 100644
index c143b4d35ed1..000000000000
--- a/dev-ml/optcomp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">diml/optcomp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/optcomp/optcomp-1.6-r1.ebuild b/dev-ml/optcomp/optcomp-1.6-r1.ebuild
deleted file mode 100644
index e64a3633ee6b..000000000000
--- a/dev-ml/optcomp/optcomp-1.6-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Optional compilation for OCaml with cpp-like directives"
-HOMEPAGE="https://github.com/diml/optcomp"
-SRC_URI="https://github.com/diml/optcomp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ml/camlp4:="
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES.md README.md )
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
deleted file mode 100644
index 98248af621f0..000000000000
--- a/dev-ml/ounit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
-EBUILD ounit-2.0.6.ebuild 474 BLAKE2B b2fe101070e188388d17423862e99d4da3fc45dd851058f7797940a01d4001601f25058073bbe70dc726a9538fad9b49cd7cd1c03be8d4e5d65727ed9aaf102e SHA512 a79fddf41d6000384c917c6ecbfa81349bc704492e4cb264f11a7e50e452c6795add9b9538857e49d874e0ffb786613b5277ca954bc853b56ae0f6d18d527ff7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-ml/ounit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
deleted file mode 100644
index b39ae6572f54..000000000000
--- a/dev-ml/ounit/ounit-2.0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-DEPEND=""
-RDEPEND="${DEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 79fe34cd5b7a..5cdad149b3a6 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -1,3 +1,5 @@
+DIST parmap-1.2.1.tar.gz 47069 BLAKE2B 85d67aacff70c9d8b70c73e4673486804a0d0a4cc52391cd93bf12ed19206c11cb77066e64757f5a22352580789383e04b7d984aade5e60872be12728a173fb6 SHA512 b5ed86b464f68db625e6442606cb74c7e2b10fd066a20732e60042d32b937c20f83ff4ebf17f47b79ee6725e0de9ca42bbb050c06b47d90a27052b3b0fb07afb
 DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e3a4687b1d882d203cb43e4069a42675319c27878d8bca3fa0e19af96ab1dfda8df3967dc48d28ec542b91 SHA512 69431e146e8aa01823ae1583c6a5e7753436cecee37c3da3064a836c20cf8c6b9033248412203406d03bd4efdd957b2e118ea5c5866e3bd1f668d8c4fd48777f
+EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
 EBUILD parmap-1.2.ebuild 602 BLAKE2B f818b95d8edfc4e83b56569ab59392fc0a142b224fa7df50b6b08e0fa1ee7df8633c36c563923b3000a2b38bc82d1976731ceca541d72ce9c24fa4e3cab109aa SHA512 4efeda43e48ddad028e583f8ebe3df12bcdf96e802de2555162569178298be87b5ce815537cefdc42c55c92eaa60f962d5ffc423f08b9087f68cdfa8c21e0f11
 MISC metadata.xml 322 BLAKE2B ce1a2f61e9f4fd4fd8286835af805812ab1fddb8cba9e85401f0967ed03ef6be8507868ef292accb826332b47f800b32229a0dc2ae62c2e8f44bae20bfcd9de4 SHA512 7d752bdbddf86b905a475ba3243f4bedfb1b07ecd70fe36f73671dd197c1bba4d1abcd8c44d4ffc94301417c33bb30e15d819645f63390d3c9ffc4f9a8fb6cd6
diff --git a/dev-ml/parmap/parmap-1.2.1.ebuild b/dev-ml/parmap/parmap-1.2.1.ebuild
new file mode 100644
index 000000000000..44ada0a27777
--- /dev/null
+++ b/dev-ml/parmap/parmap-1.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="Library to exploit multicore architectures for OCaml programs"
+HOMEPAGE="https://www.dicosmo.org/code/parmap/"
+SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV/+/-}"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
+
+BDEPEND="dev-ml/dune-configurator"
+RDEPEND=">=dev-lang/ocaml-4.03:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/pgocaml/Manifest b/dev-ml/pgocaml/Manifest
deleted file mode 100644
index af35d1f05482..000000000000
--- a/dev-ml/pgocaml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pgocaml-2.3.tgz 90383 BLAKE2B 3e536b4a310846688a3fd55b7a807e1aeebd12ce5f551d66572f8f3014007058a6843da1bfaf6acf16d0c1ab8b8c61551b85c29b95a79d604e9314849c1b1e05 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7
-EBUILD pgocaml-2.3-r1.ebuild 751 BLAKE2B 786997be6758d84b625a251231dce96d8c24d308b8e410d4cc4be91e3aa80461a1e98e1f68a998f056763a3c9607f26bea18c092cc1d598604499f10f2f3a86a SHA512 ee7502a2bca4c22d0e1013bac5d5226c4d28a1e2502c4dff8d3999b49b4eb30a4d9fe4012c4aa32ee600d2444540b60c7c13e63fc7a9095e9aa062576b17af81
-MISC metadata.xml 310 BLAKE2B a8815f61329171a03ad48302558e1cde2a7150b7538e9af2a4d4656bd433124b81ea4cd675c1b636906864f3f720745bc6c990d7e2ec5fa07dc6ef2e99b73ea5 SHA512 7f09e40d89364360d2031427193202b7c29b5a635c456993c2f69b0ff659ba50c38b2dfc474a589b667a7af9d6b95eb620792d3190a281cd804bcd8414fbc034
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
deleted file mode 100644
index 1c104aae19ab..000000000000
--- a/dev-ml/pgocaml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-ml/pgocaml/pgocaml-2.3-r1.ebuild b/dev-ml/pgocaml/pgocaml-2.3-r1.ebuild
deleted file mode 100644
index db6b18302050..000000000000
--- a/dev-ml/pgocaml/pgocaml-2.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
-HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+camlp4 doc"
-
-DEPEND="dev-ml/calendar:=
-	dev-ml/csv:=
-	dev-ml/re:=
-	camlp4? ( dev-ml/camlp4:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.md" "CHANGELOG.txt"
-	"doc/BUGS.txt" "doc/CONTRIBUTORS.txt"
-	"doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt"
-	)
-
-src_configure() {
-	oasis_configure_opts="$(use_enable camlp4 p4)" oasis_src_configure
-}
diff --git a/dev-ml/ppx_ast/Manifest b/dev-ml/ppx_ast/Manifest
deleted file mode 100644
index 5f2d212c883f..000000000000
--- a/dev-ml/ppx_ast/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_ast-0.9.1.tar.gz 86802 BLAKE2B 5974cbea0b2566e83d8fb4192aa7e7f802aa7b6fa02b8f638ea12ac5c617fdca1f4426e0ee3fc761c46fe0ddf2e26d4ed402eb8c21fd84ce513a60996047ca28 SHA512 4a5a9fb47282877763ecf9638e67bcd1b57110c1acfcf446703ed335b9fa5aaa1521c55a75fce6025f91e715f9c4522b695444dde4d3ffa7feed79560e399ad7
-EBUILD ppx_ast-0.9.1.ebuild 522 BLAKE2B 6740a54881d877ff4854786735a5bbce28641dfb7908e90b9859ab85ee9598f76b5b3b3bfd4920ab18c604e3419ffcbf939675028459ade87f97d078d8f3c2bb SHA512 e3fa3c5a3bdeeb30a16453d53c0c23faaa470680462e2b14c7613600352846c613b998f7486a2b8bd23cce243083dd362aeeee082fd5571c84eeeb1129595789
-MISC metadata.xml 250 BLAKE2B 9341cb2a084631090778142143230c38fefbe25b9f889b2788cb4f9eb299b2d224f40a49ad6605620b4b167c277efd8fcd0a21fb9bccf261fef5a5900ff64219 SHA512 d548916a829165228c7bcc0c4e67b2c3695aaee3a7d8eba1f84ff532e1d10bb79730d0b8c73cc99fba9256fbc8a37d6281a6cc752b22a63d5c15d85dcdb1f66a
diff --git a/dev-ml/ppx_ast/metadata.xml b/dev-ml/ppx_ast/metadata.xml
deleted file mode 100644
index 7479fbd4c5c4..000000000000
--- a/dev-ml/ppx_ast/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_ast</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild b/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
deleted file mode 100644
index acc14d99d440..000000000000
--- a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="AST used in Jane Street ppx rewriters"
-HOMEPAGE="https://github.com/janestreet/ppx_ast"
-SRC_URI="https://github.com/janestreet/ppx_ast/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-ml/ocaml-compiler-libs:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder"
diff --git a/dev-ml/ppx_core/Manifest b/dev-ml/ppx_core/Manifest
deleted file mode 100644
index e63eb07dab16..000000000000
--- a/dev-ml/ppx_core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_core-0.9.0.tar.gz 44525 BLAKE2B a2d67d6ba07217446af11f0e7030197f8894fd271b9eebefefa03a01ccb8692b1d866accf192926ea9193d639e1c551b085875baf877eb396d5a75c847378ec6 SHA512 04b0e096aa545c27f040feeea8745078e0fb9dbe4816ade6d3f39b6690da669c6c786334381dbccd74dfd46514ae88c6475b14db8c3216167a6acfea79601e06
-EBUILD ppx_core-0.9.0-r1.ebuild 600 BLAKE2B b6e77ccba23ad1f64c69813d9f23b05e9d3d64768e17d5eed725c62cad9a71b9a2a64706fd7c8ef0711cb3fd9809868af6d3df3a18d8dda5429a60d7efc0498a SHA512 9b17fa080088dc0249c1bc57018879fdbe185ea5179c574de57a0804a3e5e94a6cad9dde55da8e59110d89788c10de15e3b9bc768499e867e7213fd2b6b85d1a
-MISC metadata.xml 251 BLAKE2B 43f8b8e793a8a333b0fbadd1e78014173d8bd4bdf7b2db458d051dce4203d6567a163aa4907b3bc4b795e1f7f40284c5a523648ced60f0640795d314971c9961 SHA512 f3c52d8807414ea6aa81cf9e2b88265cb9a6eec29b4e9327f676dafbba482a4fc103a5b15828de82d58e165e203a148b0d70d5bdc6ef2cfd9b1deab7cef1c4b4
diff --git a/dev-ml/ppx_core/metadata.xml b/dev-ml/ppx_core/metadata.xml
deleted file mode 100644
index be8727d00044..000000000000
--- a/dev-ml/ppx_core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild b/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
deleted file mode 100644
index b7479abd2f4f..000000000000
--- a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Standard library for ppx rewriters"
-HOMEPAGE="https://github.com/janestreet/ppx_core"
-SRC_URI="https://github.com/janestreet/ppx_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-ml/base:=
-	dev-ml/ocaml-compiler-libs:=
-	dev-ml/ppx_ast:=
-	dev-ml/ppx_traverse_builtins:=
-	dev-ml/stdio:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
deleted file mode 100644
index 584a6fe73bb9..000000000000
--- a/dev-ml/ppx_driver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_driver-0.11.0.tar.gz 9157 BLAKE2B 053e710c3d8cb6096c893bd5308fbe2b4563dfb2de3c006402ae363aed60db31a3bb1b7656f0565ce13d88368d8b6bef68658f81190dda397562d462828618f4 SHA512 d7ef318f6f0c6e4c56537584bb50b6673b294b67ac264208b7c8b4bcc9d0ca6baf1cbea752459b12d9102bb84a392047c907c65afd23760cac1cc4465ed85ea9
-EBUILD ppx_driver-0.11.0.ebuild 562 BLAKE2B cefbb4d569843a80cf4ceeaf883abf4e327a315cae57bccadc66019851f492a360277402d58113a5ae52f6189586c32c4daeb41fadad1ef2c1ad4b56b2d444ab SHA512 4d0d99d02640f86514ee70365d94b9c0b9bca05f5102ab0c11e3ca0d9329805b771a7bc89f9dbc1b17bc78110ce7dad92472a32413cd238c4740aac2613ee429
-MISC metadata.xml 330 BLAKE2B b26e242c2907dec64f194c92a1e3f967cfadba1966632646d2903c2d010d59d45de6ad7da3d7a54a6e380f076bb7f3a6a15fed04d16552f913b1f86a1ed8128a SHA512 754889cdf700f13e44cb022e9d2750c63145b51b792a67e8003162baf40a0f7402835d14f573db348f99137f47375f169232e85a10cd881b1882cd7da1b7253c
diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml
deleted file mode 100644
index c69342dd5815..000000000000
--- a/dev-ml/ppx_driver/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_driver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
deleted file mode 100644
index aa88a6f5b4d2..000000000000
--- a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit opam
-
-DESCRIPTION="Feature-full driver for OCaml AST transformers"
-HOMEPAGE="https://github.com/janestreet/ppx_driver"
-SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-BDEPEND="dev-ml/jbuilder"
-DEPEND="
-	dev-ml/ppx_core:=
-	dev-ml/stdio:=
-	dev-ml/ppx_optcomp:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ocamlbuild:="
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_traverse/Manifest b/dev-ml/ppx_traverse/Manifest
deleted file mode 100644
index 6d6a8762e275..000000000000
--- a/dev-ml/ppx_traverse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_traverse-0.9.0.tar.gz 10837 BLAKE2B b0d3e9a10c5af698105fae5dec13afe8b545bb3ee2b48ec72b3d7e76466d3e2ce7ece1ecdfeeabde63855bf8d24c89a05666f8e2fa8c286621ca1c9bd35274d8 SHA512 914f79405f09ccfecd444416499b63f68f700d4b7485031c45b7ab9500a82c4bc65dad8315a6cc7b7669b2c40f51e98a6fa453869b20501a22eff5b1ffb0e441
-EBUILD ppx_traverse-0.9.0.ebuild 579 BLAKE2B 3fa290d536cafb8f3ede603dba3204b620f7a82d1fb0f24f9f6a65f20cee554af6184272dd3a0180d142186d7d1060588ca73b4aa740ce213685ce23be248808 SHA512 bc8cfd99b43efd3d93ea23d6ad79581335d3b585b55fed0664f9964c4ada5e9362553313884bb4027df45cd691f99de46463bd79354ebaef604c3a7c0560b99a
-MISC metadata.xml 255 BLAKE2B ec4f9380e58091b0964cbc8466f55ee0bee334a4ca148db87587fc6dad66763132b4b3fe4e2389e6966afd4b0cdf3350cf65db5c33db4cd622344f5f1da14bde SHA512 c091fbc9b4f0cfbb273038c6ce4f23e728be55b541022d3913b78ed3c8752ecd5d8ab857946c521beaece9939c8416178bc8fc05e8ceac31fd596b0d0e026b6b
diff --git a/dev-ml/ppx_traverse/metadata.xml b/dev-ml/ppx_traverse/metadata.xml
deleted file mode 100644
index 777735f041c6..000000000000
--- a/dev-ml/ppx_traverse/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_traverse</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild b/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild
deleted file mode 100644
index 1ea84ac585ee..000000000000
--- a/dev-ml/ppx_traverse/ppx_traverse-0.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Automatic generation of open recursion classes"
-HOMEPAGE="https://github.com/janestreet/ppx_traverse"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-ml/ppx_core:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_metaquot:=
-	dev-ml/ppx_type_conv:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_traverse_builtins/Manifest b/dev-ml/ppx_traverse_builtins/Manifest
deleted file mode 100644
index 50417f07f25e..000000000000
--- a/dev-ml/ppx_traverse_builtins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_traverse_builtins-0.9.0.tar.gz 6328 BLAKE2B 1e111d97876fb97826a04dfddbd1289e4b64ca93cb09e2f8692fcd5c1b87eb09259938b31662ed712d3e3926cd3b8edecf967d85ce9846805c74b28a4359e02a SHA512 c8d77138f8fcd4d440870eb9126f5aca2d9fa917fac6bd9aa7f6dd4fb3e75f5860efbdc312ffc23b375808c33e1527726318918bf7bee61f470ef3a2cb40f6ba
-EBUILD ppx_traverse_builtins-0.9.0.ebuild 473 BLAKE2B db026b980369efc4ca5549653a0ee251fc5ca06441cc0eecd717e5bf5eb7eb932ff94b3bd56f6c0fad03b99024d43543a4db0b983e10d20c0e62b02b35da3ee4 SHA512 70918525a322d61ee9f0f58532f311fb7cfbf60375d2b9b1a5e0daa430983378aaef13d2c1b6ae85e70b69bbb0c5133ddf9762dcc92d9aacdf811c60918b0651
-MISC metadata.xml 264 BLAKE2B f92c2dc9a8766e3e84530fb113e5bec9ec7a91d6351248f38cc1dd93fd0acf2c5dcfe79680b204b4384e74e939c83385492c6526cc9707bed98e721b7bd2e023 SHA512 b2454096ba7a7cedeaf3cca762d7e57fa69328631f7275de166a3b771730707c2b63888d1c317cdeb853677e3ddbfcf657e77cbabfcabc424cb848ce990106fa
diff --git a/dev-ml/ppx_traverse_builtins/metadata.xml b/dev-ml/ppx_traverse_builtins/metadata.xml
deleted file mode 100644
index 424c533ad3f3..000000000000
--- a/dev-ml/ppx_traverse_builtins/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_traverse_builtins</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild b/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
deleted file mode 100644
index 07f2a2aa57fd..000000000000
--- a/dev-ml/ppx_traverse_builtins/ppx_traverse_builtins-0.9.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Builtins for ppx_traverse"
-HOMEPAGE="https://github.com/janestreet/ppx_traverse_builtins"
-SRC_URI="https://github.com/janestreet/ppx_traverse_builtins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder"
diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
deleted file mode 100644
index afa53d525c05..000000000000
--- a/dev-ml/ppx_type_conv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppx_type_conv-0.9.0.tar.gz 14651 BLAKE2B 50b4ffb85062eb306bbadb3b641f9ca0318e95c614482302c4b3e001eeeb14137c4d0050abb8cf5c6e57a5fd8afe70b16a3455b4080e6f85981c88765c8ba945 SHA512 71af29d7e882652a5e101e1fc3610adb4faaba30068161b4b391e3ce7419af7feffd289070c1707cc961c593eda7b7f325609e8c98543c1168400cfafea31472
-EBUILD ppx_type_conv-0.9.0.ebuild 591 BLAKE2B b73ad16e007701fb5c9cf80f34ab0fd3fcdb65026a88a7f87cb57564c1c4a978e9fa090fdee3ed7da7416d45d52dec2f5d9641d1a3a1e5d3d7c7c64683474958 SHA512 d96ac4e0fb282c57a8a7aaada5da41b1d877fdc27383fd77e883b3852a893c0a803872a19e65c36f79ca73eed3e1bbde124144b3990af397cac79c80479cd553
-MISC metadata.xml 256 BLAKE2B ea0e119431a1ab6056032ea09d88d3996205c737989c029ff4877c3017ef27b3f75acc9924271c620c5231d92e559ead2f3a5e007962edb8d6a8189aeae46b47 SHA512 1d9dd77b1ecd27aa63474621fc2bcbe76f980e81360ce41e526e598c44d440fb887c5e410aff35639c380b8022fe2f31bb9f4f683f5d96ad03105ff61e19f983
diff --git a/dev-ml/ppx_type_conv/metadata.xml b/dev-ml/ppx_type_conv/metadata.xml
deleted file mode 100644
index 75fe4910a683..000000000000
--- a/dev-ml/ppx_type_conv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_type_conv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
deleted file mode 100644
index 879332244f97..000000000000
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Support Library for type-driven code generators"
-HOMEPAGE="https://github.com/janestreet/ppx_type_conv"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_metaquot:=
-	dev-ml/ppx_core:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_deriving:=
-"
-
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
deleted file mode 100644
index 1ff60ba2d33f..000000000000
--- a/dev-ml/qcheck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qcheck-0.7.tar.gz 257935 BLAKE2B a885635e555a7442f0ad7687320e3d9f45897b9167ba4ac12baf632bc60e1eca207ae5ccf4b57ff36897e418f5ef4e781f9f2bf674ec16cdab140049debcb6c6 SHA512 3082029a09d5efe3af0cb8fcd0bd08f11dd1066d5bffc6beaac16c7244b07286b3ae93931e699f22c977ad4d6ba050dff69b133ce3492455d6932a9e0cc304f7
-EBUILD qcheck-0.7.ebuild 508 BLAKE2B d34f2f30a4322595035caf15db5a5a2e77f7816f833323e7207ac7f6eb9cea7587e2a4781c90d116161b4213c57b0c93ebafd67cedbbbce91d06188824db2b9b SHA512 0cffa1892c54378a9a2e1d74cde0ce167eeada2f0995bd409daef8bfc411e45723803b567c1e0a1036a15a338033cd46d7a178e1485ba6bb269ad90caccf4435
-MISC metadata.xml 250 BLAKE2B 56876e7e1d60959facf42b1a20761dbc738d7c794accadcbd0b56dbda43096d418f0fb5b76315bafe70fbe18c68e9c61229828a7a7122849c8d8c39b73a117bf SHA512 6ce7321f0917a67a97a262b1b96967c39e0131752ebca6813695e2916f27e8d534546e7cdc974a39fc10dd0b3e3b2178f016afdcbf63f51c6ea6f3e84e02d9fc
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
deleted file mode 100644
index 11fddec26cee..000000000000
--- a/dev-ml/qcheck/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">c-cube/qcheck</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ml/qcheck/qcheck-0.7.ebuild b/dev-ml/qcheck/qcheck-0.7.ebuild
deleted file mode 100644
index 63578ec22400..000000000000
--- a/dev-ml/qcheck/qcheck-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
-HOMEPAGE="https://github.com/c-cube/qcheck/"
-SRC_URI="https://github.com/c-cube/qcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ml/ounit:=
-	!<dev-ml/iTeML-2.5"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
diff --git a/dev-ml/re2/Manifest b/dev-ml/re2/Manifest
deleted file mode 100644
index eebab22d0ee0..000000000000
--- a/dev-ml/re2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST re2-0.9.1.tar.gz 388911 BLAKE2B d6d0673142e2523c0d5fed2c19439bbf7c2ace401558f4c40f0302445492ae17bf67076c4faeb0e25eeb8cc01f463f4804317d4f6a5113586be77df18ec93874 SHA512 a92dc39a1d263dd2bbfad88f0ea0936fcadd1d03cd735d9db151412919713cfb4d8329f1e0fa454917d8faa49480e8dd60af9331b0863548ab267b647bd1e192
-EBUILD re2-0.9.1.ebuild 521 BLAKE2B 4a50fb64a536b6d94fa2ae9e92fa0d797eedc37999ba2bffa9da0767504abd68b53b7273aa251db6f2fe6a82b03306cc8684e68af9810a31e1bf987e85b300ed SHA512 94caa7fb09a0ad87bd3406e5237c9d80e2855ad3bd2e36cad7a9c5103e64f00ea2c5b58509333da0e8afaf12f6aeceeb9a338e0ef022763885a10f736f81285d
-MISC metadata.xml 246 BLAKE2B 71c16ea01f8455f814a717e9bf9e954fdc0d950374a51fb5f6ba39c04a33b24d502d5ba72b1ca94df36d77b61a4a38d3f371d603967539761d836f49ded019da SHA512 575e02776f35b8b43c8ca52139384e0ee642a664685e3dbd85da97a2450f70e62b8604f34be6edb253819e448e08d014a48299cd64806bac792376a6a723d335
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
deleted file mode 100644
index ea7b1788aeb6..000000000000
--- a/dev-ml/re2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/re2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/re2/re2-0.9.1.ebuild b/dev-ml/re2/re2-0.9.1.ebuild
deleted file mode 100644
index e77c46fb6030..000000000000
--- a/dev-ml/re2/re2-0.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="OCaml bindings for RE2"
-HOMEPAGE="https://github.com/janestreet/re2"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-ml/core_kernel:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_jane:=
-	dev-ml/ocaml-migrate-parsetree:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/reactiveData/Manifest b/dev-ml/reactiveData/Manifest
index 1d2d20dbaa21..88fcaf1a74de 100644
--- a/dev-ml/reactiveData/Manifest
+++ b/dev-ml/reactiveData/Manifest
@@ -1,4 +1,3 @@
 DIST reactiveData-0.2.1.tar.gz 21219 BLAKE2B f3b1c4a4007fc3aefbc34d64ba5ffba5216aee675796719fde11c3c970a431cffbd6dccb35c8cc0192fcc68c7f80f06da91b1000d50ee9f3116efd6febc7e242 SHA512 e4dad870fd1f669566394d9c2ab52665a3d27f6b2dd3807dba245d89ca90eda08b98b266fb0795bcfa5cb4ffed7a86aa719f8db5c316b0d920ee3c342493d029
-EBUILD reactiveData-0.2.1.ebuild 799 BLAKE2B 8a8813f1087d99b8bc862e2e901453f20ebfa99bd60ac0058beec25af9d9a601945ef61ad0a22f55034f5ba90454d1cd76da3294139dc5ca6983b2cef558a9f4 SHA512 67ea3c05e58ef03f4ac85ef654ddd5510f07ffbf7c35e44b43ece5b38cfe3107ed949f64467762d239b6f2698383382006e9013f5e9f783ebddd246d54a03367
-EBUILD reactiveData-9999.ebuild 799 BLAKE2B 8a8813f1087d99b8bc862e2e901453f20ebfa99bd60ac0058beec25af9d9a601945ef61ad0a22f55034f5ba90454d1cd76da3294139dc5ca6983b2cef558a9f4 SHA512 67ea3c05e58ef03f4ac85ef654ddd5510f07ffbf7c35e44b43ece5b38cfe3107ed949f64467762d239b6f2698383382006e9013f5e9f783ebddd246d54a03367
+EBUILD reactiveData-0.2.1.ebuild 787 BLAKE2B d098db0dd47abf687ed5c80edc532199863c2a3a871bea9a6a8173625e7d771af6ff161729eaec2c38c14ec0afccd0d1bfc3d5854d04265868197f98fdadfd20 SHA512 3559bb7ac0dfa1107a4fa79d521136bd3f10ce7de8ca28e01e87f73426861665253c944ec4c62b80a21d47b04ca538e0b8ace8f0b36afc3470ad5ac5862b1b06
 MISC metadata.xml 252 BLAKE2B 0b8b251004679a063d2f41a2ca47839b37d6d89c0d5c1eb34cd71afe3eaa503112cb66c3fccfdb42e74d62985e34b400e2f2ed24a8530c678bafc9081e779a4d SHA512 5761a6f3e33b0de155f584f5405069bc1514db270c118d18e5471a51f3a9e4fcfe33c8f2e558a4082937097ab44620ea0ee7b711b910609d087820e288dccfc5
diff --git a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
index 5cbd4d885110..f016dcff52af 100644
--- a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
+++ b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit opam
 
 DESCRIPTION="Functional reactive programming with incremental changes in data structures"
 HOMEPAGE="https://github.com/ocsigen/reactiveData"
 
-if [ "${PV#9999}" != "${PV}" ] ; then
+if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
 else
 	SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ml/reactiveData/reactiveData-9999.ebuild b/dev-ml/reactiveData/reactiveData-9999.ebuild
deleted file mode 100644
index 5cbd4d885110..000000000000
--- a/dev-ml/reactiveData/reactiveData-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit opam
-
-DESCRIPTION="Functional reactive programming with incremental changes in data structures"
-HOMEPAGE="https://github.com/ocsigen/reactiveData"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
-else
-	SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-ml/react:="
-DEPEND="${RDEPEND}
-	dev-ml/findlib
-	dev-ml/ocamlbuild
-"
-
-src_compile() {
-	ocaml pkg/build.ml \
-		native=$(usex ocamlopt true false) \
-		native-dynlink=$(usex ocamlopt true false) \
-		|| die
-}
diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest
deleted file mode 100644
index fe25983a0126..000000000000
--- a/dev-ml/stringext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stringext-1.4.3.tar.gz 49255 BLAKE2B a1594144be431ead57e92339fef60a4823b8d1bf77e60bdfc7f89e5bc8700c4c55afcae90980b6486284d0de62b8cb3090a1cffe2f26a276f8063329e34c8068 SHA512 f6d6ad9e6cd89fb499f2ef449eede448fe9d67912644f44ffadf4e869326bc20fd839d7e725a133e4a81ca8ba98497fd02307efb9f9f62cbad4308e18123ffb5
-EBUILD stringext-1.4.3.ebuild 488 BLAKE2B 7ec2ac93a61902147b0846cfc5a10711ccb52d8f8e480ebff21b1618aca80c4328a078f3da882adc87f7112d00f9274da9029170f3975a083e30f57947959193 SHA512 256b32952df653a6ba499afec40ad8e3c7f846341cb16908bfce86a0a16a2840d12c218dea9404536139cdaabb2b9b2e3b82ec6bf869ee28f2224e1af6a751e8
-MISC metadata.xml 264 BLAKE2B 4cfbed9a4a1f0b20c6fad2f89b5534bb1319c698913b130b9ad34230c81ca9dae0d31861822ab699e2a42a01d91886a02b6ec3857a70da3ed3bf712f4f221c32 SHA512 a4b33afef90e950e833e14172417f795ef80098b04558514fe63857cad4879fecf9cb5f06712ac24cd86836d8da0a4bed3a9de74206b57e51471c67e647e2f7e
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
deleted file mode 100644
index 546e97319333..000000000000
--- a/dev-ml/stringext/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-   <!-- maintainer-needed -->
-   <upstream>
-        <remote-id type="github">rgrinberg/stringext</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-ml/stringext/stringext-1.4.3.ebuild b/dev-ml/stringext/stringext-1.4.3.ebuild
deleted file mode 100644
index 2d743c11f5e3..000000000000
--- a/dev-ml/stringext/stringext-1.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="Extra string functions for OCaml"
-HOMEPAGE="https://github.com/rgrinberg/stringext"
-SRC_URI="https://github.com/rgrinberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/ocaml-4:=
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-ml/iTeML )
-"
-
-DOCS=( README.md )
diff --git a/dev-ml/type-conv/Manifest b/dev-ml/type-conv/Manifest
deleted file mode 100644
index c96c2287f7c6..000000000000
--- a/dev-ml/type-conv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST type_conv-113.00.02.tar.gz 64174 BLAKE2B 23189d3b9f676657d59d0801ec0c7bde7b926e2e75c6a2316ae5fc8b5dedb3a2cda944b029e61a10d997b555ed0678dd0cb0593693c395a5bcd4df4de4a15de9 SHA512 6bc6db0e5a36fa4150941155290d137552d9e19aac7cf3aff107f0a7eaa47749c7044c4a4e475827d739784b99ef2103e9c9c03191c6aaa55c51585e71553559
-EBUILD type-conv-113.00.02.ebuild 626 BLAKE2B 29810ffcf429dad5c0476e8fe6be47ef392ad55dd6db40a13224a3a8a0172cc21128208859d9900dc712e8c6a81942618ee4de35c2cc95d6063aea95b3d72b6b SHA512 b29d1e2d5d723ef31d0cd800b9edfeb31cd0998b6522404bc5b3cf5bc24387de63c62e007fe8fd5126ee46dad447a717719b101951017e72ab5eb580d4ae48a1
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/dev-ml/type-conv/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-ml/type-conv/type-conv-113.00.02.ebuild b/dev-ml/type-conv/type-conv-113.00.02.ebuild
deleted file mode 100644
index 088550945270..000000000000
--- a/dev-ml/type-conv/type-conv-113.00.02.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Mini library required for some other preprocessing libraries"
-HOMEPAGE="http://janestreet.github.io/"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ocaml-4.02[ocamlopt?]
-	dev-ml/camlp4:="
-DEPEND="${RDEPEND}
-	>=dev-ml/findlib-1.3.2"
-
-DOCS=( "README.md" "CHANGES.md" )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest
deleted file mode 100644
index d0b9850f096f..000000000000
--- a/dev-ml/tyxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tyxml-4.2.0.tar.gz 182255 BLAKE2B 04ec57372bb4b63eb66b21c8d8771290cf9d7d9a344d8354414c5512d112852c2f2af9e5dbda74e6c990c64a498545ad6ad7f4f94190523b7b9029809b0f41c8 SHA512 555df1fdf5eb30592a3bd93b7d08345964b1cd6e16c2f746ef777cb3c5fc9a31dddf316432e0457d317eaf7728c5d1156982956169a7b1eb9b660eedcf89ca58
-EBUILD tyxml-4.2.0.ebuild 808 BLAKE2B f6aac155d8daa6eaa848da343c59913d56b2209ca683992f2fedfbaac7ace2eb5ffd431613f2a1d64337575cbc5cb842e1eb59d31de0ae858b8f5e3b325959ba SHA512 45eebfa8712c70c47237f912931f7968abf95bc0df21a22b0b6d29844706fe30394d479085f5f8c4d867c25f1a485b1570fa8074d0834d0292db88305bcbbf80
-MISC metadata.xml 474 BLAKE2B 8e13652eda3c3353ba63d05717f1a9a95a295c08b9e8455011579bc041c06dd31fdee2f3ab0f5acf32809ae6ec60d969022cfcc9ccc7227fadd90c29739430b2 SHA512 cbad13a5c13320b3e3fc2fe1ca6d647cafa4cf186ad2837833ed9a08955fb9fbf39f2ce4e4f6845598f02fa646890551c4ab7256561d7d7432f2949657eebdbc
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
deleted file mode 100644
index 0bed57209834..000000000000
--- a/dev-ml/tyxml/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocsigen/tyxml</remote-id>
-	</upstream>
-	<use>
-		<flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
-		<flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-ml/tyxml/tyxml-4.2.0.ebuild b/dev-ml/tyxml/tyxml-4.2.0.ebuild
deleted file mode 100644
index 77cd847248e3..000000000000
--- a/dev-ml/tyxml/tyxml-4.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-# Cannot find findlib package alcotest
-# OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="A libary to build xml trees typechecked by OCaml"
-HOMEPAGE="http://ocsigen.org/tyxml/"
-SRC_URI="https://github.com/ocsigen/tyxml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ppx +camlp4"
-
-DEPEND="
-	>=dev-ml/uutf-1.0:=
-	dev-ml/uchar:=
-	dev-ml/re:=
-	ppx? (
-		>=dev-ml/ppx_tools_versioned-5.2.2:=
-		dev-ml/markup:=
-	)
-	camlp4? ( dev-ml/camlp4:= )"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGES README.md )
-
-src_configure() {
-	oasis_configure_opts="
-		$(use_enable camlp4 syntax)
-		$(use_enable ppx)
-	" oasis_src_configure
-}
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 4d0c119e493d..ddcef2b5e763 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,3 +1,3 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
-EBUILD uutf-1.0.1.ebuild 1560 BLAKE2B 92fe17e6e2f6c623ef664daaab4efefdba780620cf5d88271d837ded7ed80271e0252548beced6b53a5402a2e8b9f81c9e924e4e1bedef153df4cc77aaa88bae SHA512 0100b5357d033991922f481f9fbd03a61352b1795ec0b73e18d7543630bbfacd3959677e6e35aa0d6c18066da259dcba6dfebda4a65c28e747aea9d5a04f0c5a
+EBUILD uutf-1.0.1.ebuild 1589 BLAKE2B 97df4d6bd39a80eaa5e1cf303b2a7ce5735cf4df7564282b6d0b98b23f6f51063c20f120eda76220aae96c80a95bdb9523bb3494149ea5cb91572b60962b465e SHA512 c56f090492fab0564607595faa7e5765ffd7e13d3bda71e0ed99841bb01183c286b7e7c552e5766626674169bcf88604a6ff9ffa720d21fdd46bd8e38cbc1f65
 MISC metadata.xml 390 BLAKE2B c7f6ffb069cf171a47ffaf90b0bbd742d50baa96260e98b21738651722d3006e176f4bc5223932986b2640aa1f091861c7a027f5b4130ed2af77b7ae1e2701bb SHA512 b23f82ba753956db53103340358857cbdee18bc34ee5d5db86d68dc6f04ea419b3f64df7e5fa54ac84e6122eef7236daebda8fbd60aaa7fa59d45714d21aec4a
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index 47b4c9ac86d5..ca6cd4708b6e 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit findlib
 
@@ -35,7 +35,7 @@ src_test() {
 		ocamlbuild -use-ocamlfind tests.otarget || die
 		pushd _build/test || die
 		./test.native || die
-		#Rebuild to avoid mismatches between installed files, bug #604674
+		# Rebuild to avoid mismatches between installed files, bug #604674
 		popd || die
 		ocaml pkg/pkg.ml build \
 			--with-cmdliner "$(usex utftrip true false)" \
@@ -49,9 +49,15 @@ src_install() {
 	# Can't use opam-installer here as it is an opam dep...
 	findlib_src_preinst
 	local nativelibs=""
+
 	use ocamlopt && nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
 	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+
 	use utftrip && newbin utftrip.$(usex ocamlopt native byte) utftrip
 	dodoc CHANGES.md README.md
-	use doc && dohtml -r doc/*
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/*
+	fi
 }
diff --git a/dev-ml/xml-light/Manifest b/dev-ml/xml-light/Manifest
index f26edc7dcab7..0244e3f0b036 100644
--- a/dev-ml/xml-light/Manifest
+++ b/dev-ml/xml-light/Manifest
@@ -1,7 +1,7 @@
-AUX 01_installopt.dpatch 861 BLAKE2B 0adf06c9c8bac79bb3653dba5b6f882ab80ad40dba56ac9242061e177407e33f1f466be55d0ffbac4c4bd832193940cf6b757e8386aefaeaa0bda92901c95a29 SHA512 1413f51f182affc2628799d0f4224033cb305755c31174450873cada394f9ca83fa7afc6452414b1c305f0b39b8f9936b28ca96c4aeef4acc1b0f9957a20865e
-AUX 02_cmi_depends.dpatch 492 BLAKE2B 1b6094d0b024c9381ae15e73ca593835bf1f4d3d2b30f9cf25edc2b42726313505d9a5d070615db54caec2279519836667157cf4c24d036b68109e1ad74730b4 SHA512 47f9e71b14d1df29325d5b9077c93353114566f579fb8d26b9dd5a24ce8dd66a2c56e0508924eb8c3491373bc8870e81039be990290417b559345400e03cab09
-AUX 03_cflags.dpatch 1681 BLAKE2B 7d1195efbce6ffa26bcf6e7bc33faa2e27f20991d08ded7a0a6eebc615e99f42d8c58a1092d9db90ecf047398fcc701419f1ca6959876a462922d8956e2d9f98 SHA512 314d30a73cd6a430a367a38b50c10afaf1d307b8ce63795315b093be8500dfb5ddac98eaf5a60f32b047a62f203fa59d9e6dd5c342e7ec7132b78fcd734de51e
-AUX 04_dtd_trace.dpatch 780 BLAKE2B 358cf04728f0d8e7bbe7e29568ebe55b4e07b51217e7a308437ba2dfc202d76ac7cdd8d3fcf40e201124d625249c1a93d5c496a9834f34f7ffa35f872c0424d1 SHA512 14cb78558afeed100e6f085233b001ea5501ccb3020c2437362870031b1a14ad7227794bc81c3de9567cf0d797c0966c515ce56245e429a149f097895c06f771
+AUX 01_installopt.patch 497 BLAKE2B 87c51b6870d38e935f528aa0b69bcea7a825bca822afdb52238f7c8e6dcc581d73293b8512a2d6ae4dc455415f94fb2a1f447b917788a6879dfa3976dfa81f9b SHA512 98ea3b49cbd29ce1d1cd57c0dab42b96f31064a0acf99280636e2fa342de1717276b7cea886c5131374a6de3900b1b444bd0b4f9331df1f91467fd756f1d1e11
+AUX 02_cmi_depends.patch 127 BLAKE2B 79d3c29e72e3ad47511173dc961afc1bde4e44da83f3faa3a7b82c04134501b22ac54cb8fe633feb6bd1b23cd340cdbe8e4a957c1914a17830c73853faed92f6 SHA512 7d3e9503f07126c32b3ac74e8f5055e409b54e69059fe8fb34d7558892ffae8e2435b86c4de788dfcfbdc606b99c616e8161d1263737d196e1a45930c21beaa4
+AUX 03_cflags.patch 1321 BLAKE2B cc31b252624711dcf3eace32b7ba8169caddf06518c831a9b543b49dba80d6206b873e2abd19599793697a5aceeee4baa28f7ddfb6822566479b935ebc16babb SHA512 86366c45285dd05910c38f1044e73d2a745e6280e4b8b56c40b7adc6f92d65a5836b49af4150c53c06a2a4fa285d91c4f1b1aad4517d6625581560d09598267f
+AUX 04_dtd_trace.patch 421 BLAKE2B 8bb177b2f0a1735628a95d7af07c55a85552f0a16f7be5b10cf5a2bb5165127885b359a4a60da6096fb47d6dca4cd9a737731121ad26199c31711ebff73d0f92 SHA512 7f28fe7b8d19fa81d60789e3082b4636280c2b5159a0ae7356cea34368596c6cd162da2b0df3e34ffd1b377b6aec0a48ebd468932d4dae0b08e14b0ed49ac8ff
 DIST xml-light-2.2.zip 22130 BLAKE2B 95b4bc23be63ef5c6faf529877aaf753e3c9fee99948dff82bab5e3206ea718a71ce1e03a2bdba17ff21c040dc8774312ce752c97450f0420681926524864f58 SHA512 b3be968db1ea8b9f8cc439fc8a685083227a7b07469af17c31993229a506f2ff6b1b0cf2097f4198a71e1d858d166f36c99bb26720136633c233a790764087ed
-EBUILD xml-light-2.2-r3.ebuild 1261 BLAKE2B 0d990de3a6c4f19042b2bade2d123e5d60d2ca5febd65f37ef714a0d977852e8a9fe6fc265d4590890217ce63abc30f3a53f10ac427976bd558b0e88ce6b1299 SHA512 0645c8c3065ff24bbf74c8e0ef8e7e66a402817767508765faa81e77718cb2c033d9b452d26982849b148e4b6c4750d3cf8cab15d5892a8486d3ecf0841f8e39
+EBUILD xml-light-2.2-r3.ebuild 1334 BLAKE2B a108deaae9830f90a6aef5f3af47e471e71972ca8299c2d68a53eba713d5502af3f8dda57b33e346b81abe5bc1e6b07153d44250b9321dbf481c0640ab63cd5c SHA512 799bfc48ce770e2acd04305acbe818b954a046b4df653bc5dd28086a0450c6ed03f5e44997142ed18f09b6e0892be73c3c54d25eb64cadb03a729730ad58d9dd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/xml-light/files/01_installopt.dpatch b/dev-ml/xml-light/files/01_installopt.patch
index 1dfb50c9e271..d3a3d8457431 100644
--- a/dev-ml/xml-light/files/01_installopt.dpatch
+++ b/dev-ml/xml-light/files/01_installopt.patch
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_installopt.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2005-10-11 23:26:41.000000000 +0200
-+++ xml-light-2.2/Makefile	2005-10-11 23:28:00.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -11,8 +11,11 @@
  
  opt: xml-light.cmxa test_opt.exe
diff --git a/dev-ml/xml-light/files/02_cmi_depends.dpatch b/dev-ml/xml-light/files/02_cmi_depends.dpatch
deleted file mode 100644
index 1fcf17048407..000000000000
--- a/dev-ml/xml-light/files/02_cmi_depends.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_cmi_depends.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2006-01-03 17:34:23.000000000 +0100
-+++ xml-light-2.2/Makefile	2006-01-03 17:35:04.000000000 +0100
-@@ -82,6 +82,6 @@
- .mll.ml:
- 	ocamllex $<
- 
--.mly.ml:
-+%.mli %.ml: %.mly
- 	ocamlyacc $<
- 
diff --git a/dev-ml/xml-light/files/02_cmi_depends.patch b/dev-ml/xml-light/files/02_cmi_depends.patch
new file mode 100644
index 000000000000..c1f4ce31d159
--- /dev/null
+++ b/dev-ml/xml-light/files/02_cmi_depends.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -82,6 +82,6 @@
+ .mll.ml:
+ 	ocamllex $<
+ 
+-.mly.ml:
++%.mli %.ml: %.mly
+ 	ocamlyacc $<
+ 
diff --git a/dev-ml/xml-light/files/03_cflags.dpatch b/dev-ml/xml-light/files/03_cflags.patch
index 5dfbffe5da1f..3895b2ad6872 100644
--- a/dev-ml/xml-light/files/03_cflags.dpatch
+++ b/dev-ml/xml-light/files/03_cflags.patch
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cflags.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2006-10-26 00:22:41.000000000 +0200
-+++ xml-light-2.2/Makefile	2006-10-26 00:24:45.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -3,8 +3,8 @@
  .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
  
diff --git a/dev-ml/xml-light/files/04_dtd_trace.dpatch b/dev-ml/xml-light/files/04_dtd_trace.dpatch
deleted file mode 100644
index 9dbea4bdf0c8..000000000000
--- a/dev-ml/xml-light/files/04_dtd_trace.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_dtd_trace.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml
---- xml-light-2.2~/dtd.ml	2005-02-18 10:01:54.000000000 +0100
-+++ xml-light-2.2/dtd.ml	2006-10-26 23:22:25.000000000 +0200
-@@ -267,7 +267,7 @@
- exception TmpResult of dtd_result
- 
- let prove_child dtd tag = 
--	trace dtd tag;
-+	(*trace dtd tag;*)
- 	match dtd.current with
- 	| DTDEmpty -> raise (Prove_error EmptyExpected)
- 	| DTDAny -> ()
-@@ -505,4 +505,4 @@
- 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
- 
- ;;
--to_string_ref := to_string
-\ No newline at end of file
-+to_string_ref := to_string
diff --git a/dev-ml/xml-light/files/04_dtd_trace.patch b/dev-ml/xml-light/files/04_dtd_trace.patch
new file mode 100644
index 000000000000..ac0da3cb5b86
--- /dev/null
+++ b/dev-ml/xml-light/files/04_dtd_trace.patch
@@ -0,0 +1,18 @@
+--- a/dtd.ml
++++ b/dtd.ml
+@@ -267,7 +267,7 @@
+ exception TmpResult of dtd_result
+ 
+ let prove_child dtd tag = 
+-	trace dtd tag;
++	(*trace dtd tag;*)
+ 	match dtd.current with
+ 	| DTDEmpty -> raise (Prove_error EmptyExpected)
+ 	| DTDAny -> ()
+@@ -505,4 +505,4 @@
+ 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
+ 
+ ;;
+-to_string_ref := to_string
+\ No newline at end of file
++to_string_ref := to_string
diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
index acc3930daa92..7976f46e976d 100644
--- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="Minimal Xml parser and printer for OCaml"
 HOMEPAGE="http://tech.motion-twin.com/xmllight.html"
 SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
@@ -15,21 +14,23 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
-	epatch
-}
+PATCHES=(
+	"${FILESDIR}"/01_installopt.patch
+	"${FILESDIR}"/02_cmi_depends.patch
+	"${FILESDIR}"/03_cflags.patch
+	"${FILESDIR}"/04_dtd_trace.patch
+)
 
 src_compile() {
 	emake -j1
+
 	if use ocamlopt; then
 		emake -j1 opt
 	fi
+
 	if use doc;then
 		emake doc
 	fi
@@ -43,20 +44,26 @@ src_test() {
 src_install() {
 	dodir /usr/$(get_libdir)/ocaml/${PN}
 	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} install
-	cat > "${D}"/usr/$(get_libdir)/ocaml/${PN}/META << EOF
+
+	cat > "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die << EOF
 name="${PN}"
 version="${PV}"
 description="${DESCRIPTION}"
 requires=""
 archive(byte)="xml-light.cma"
 EOF
+
 	if use ocamlopt; then
 		emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} installopt
-		echo 'archive(native)="xml-light.cmxa"' >> "${D}"/usr/$(get_libdir)/ocaml/${PN}/META
+		echo 'archive(native)="xml-light.cmxa"' >> "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die
 	fi
+
 	dodoc README
+
 	if use doc; then
 		emake doc
-		dohtml doc/*
+
+		docinto html
+		dodoc doc/*
 	fi
 }
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 2887f1bb6b57..23e451ae3d20 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,5 +1,5 @@
 DIST zarith-1.11.tar.gz 98909 BLAKE2B 01deed333dc79dfdb5748c835ef80403c7892e36e461a1c65e5bb97f147b32df2e6cbe8f4e9b916aabc3bd2479bd97439a68d9cdb123d15b7c9ed0e3e7f784f3 SHA512 7c0645d63511d42b763cd0a33b3fb139c26d23ae0cf59cd651388644cb8e7c43a83265d55d69ff3320d8c4586c4f8dbd9c3412197bab2e110c38e6e7dac88b83
 DIST zarith-1.12.tar.gz 93695 BLAKE2B b9622e2f397887d08fb8a8520419cf459e99906c05a897af91258b17d92d3fbbd2314a0a4be8a56a07074dcb0a0d04c896b3b5e69526a6c81a8a07b657d1bfec SHA512 8075573ae65579a2606b37dd1b213032a07d220d28c733f9288ae80d36f8a2cc4d91632806df2503c130ea9658dc207ee3a64347c21aa53969050a208f5b2bb4
 EBUILD zarith-1.11.ebuild 1349 BLAKE2B 94ba51ff6528da6c29e75920680d596852c403c957755633999f17cbb218ce8af091ff18efec885e6378a1dbcb170001deb82ad1bc955eb738865e3b9bbfd9f0 SHA512 72384da49f4aed3f07e4c86560cef28b40a308a76b3ff7acea064b432f0f2d1f50dc9bfe9bae04215e21359e5569d75b156a62ae4cffc6bfe863dc2d6d9c05ff
-EBUILD zarith-1.12.ebuild 1331 BLAKE2B e5c30054936820f77f807d9d82ff048217a7add76c052a266a5e8e99d0bb3fa18761c632d3e4c12d71c3d8756e86610be56b43c2fe168fcb6d60a331f01de3de SHA512 ae8ae01e1f96f4fa95b2df41a07e01ee112ea20cfc9a75e7e2ae8081b07b47b0eb21a23ee28d6695cca03dc24041a863c11c8fe9fa0c694c8b9ba90e40ffe670
+EBUILD zarith-1.12.ebuild 1328 BLAKE2B 227b968a6afda8d5b57e559074b27bb1d5123b4b90d1165c9f10d7ec235da491ad2442c7bbe783915a443399f0f596c39edc208e4c7ff17e406d2bf35a305b97 SHA512 138168f2783fbed6f1f9cc635d76ccb87b5417a8e71203d0f59b51e8642dfb4f50585f47156838e6a125b466645b39e1fe8b6f5560ff9e2970c97dfc786cb5bf
 MISC metadata.xml 384 BLAKE2B 2476ec65036f286fe12f1b64916114abb08792a1c8840be05fe48ba075c9beeeeef5d01ea1a920ca91144fda6d946c86c045c8a853b698bd08d0c02ff93c9bba SHA512 4e0f0e30d6b928341d9610efb0d42717476bb76a897ab3b350782b101cf7a4d3fa5b31d61499552073c987eac1ceb8bc0c9bd9103115f50ee9b52939301ff1ed
diff --git a/dev-ml/zarith/zarith-1.12.ebuild b/dev-ml/zarith/zarith-1.12.ebuild
index baeb795af4c2..365b3503fd38 100644
--- a/dev-ml/zarith/zarith-1.12.ebuild
+++ b/dev-ml/zarith/zarith-1.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="doc mpir +ocamlopt"
 RESTRICT="!ocamlopt? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-ml
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)