2021-04-04 06:20:50 UTC

author: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-04 06:20:52 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2021-04-04 06:20:52 +0000
commit: 38710548376b93e8c9dd28709f3b752cba0ad581 (patch)
tree: 329e37748ade3afe3ee898ebf240f9b1eeda6f37 /metadata/md5-cache/dev-ml
parent: Merge updates from master (diff)
download: gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.tar.gz
gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.tar.bz2
gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.zip
227 files changed, 228 insertions, 797 deletions
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3 b/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
index 3fa564aafa8b..bb84bde57fdb 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
+++ b/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/astring:= dev-ml/async_unix:= dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.3
 SRC_URI=https://github.com/mirage/alcotest/archive/1.2.3.tar.gz -> alcotest-1.2.3.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=4816160c9e9520c6ebccfaef1dd01eeb
diff --git a/metadata/md5-cache/dev-ml/astring-0.8.5 b/metadata/md5-cache/dev-ml/astring-0.8.5
index 3356ce2267e9..9748a3ac508d 100644
--- a/metadata/md5-cache/dev-ml/astring-0.8.5
+++ b/metadata/md5-cache/dev-ml/astring-0.8.5
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4.05.0:= >=dev-lang/ocaml-4:=
 SLOT=0/0.8.5
 SRC_URI=https://erratique.ch/software/astring/releases/astring-0.8.5.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=65e2073c5dddd7791574ae8de1d316e6
diff --git a/metadata/md5-cache/dev-ml/async-0.14.0 b/metadata/md5-cache/dev-ml/async-0.14.0
index 27c64ccc8330..081ee5ea74bd 100644
--- a/metadata/md5-cache/dev-ml/async-0.14.0
+++ b/metadata/md5-cache/dev-ml/async-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/co
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async/archive/v0.14.0.tar.gz -> async-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=eed16425e4f52f9642689d25748723f0
diff --git a/metadata/md5-cache/dev-ml/async_extra-0.14.0 b/metadata/md5-cache/dev-ml/async_extra-0.14.0
index 2855cbd2d154..114d86be0449 100644
--- a/metadata/md5-cache/dev-ml/async_extra-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_extra-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_extra/archive/v0.14.0.tar.gz -> async_extra-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6f93872f9c4f8cacf08ea54031356e9c
diff --git a/metadata/md5-cache/dev-ml/async_kernel-0.14.0 b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
index e1fe894d72c5..2e64ff970b8a 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.14.0.tar.gz -> async_kernel-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=9eebc82e7622bb7dcd6d69ac9d6b17c7
diff --git a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1 b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
index 175b538a295a..497b2da257c1 100644
--- a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
+++ b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/protocol_version_header:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_rpc_kernel/archive/v0.14.0.tar.gz -> async_rpc_kernel-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=7f4f3c4a9e0aa029a726caf66d89324b
diff --git a/metadata/md5-cache/dev-ml/async_ssl-0.14.0 b/metadata/md5-cache/dev-ml/async_ssl-0.14.0
index 8a958fc98583..3fcf5263fa9b 100644
--- a/metadata/md5-cache/dev-ml/async_ssl-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_ssl-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/async:= dev-ml/base:= dev-ml/core:= dev-ml/dune-configurator:= dev-ml/ppx_jane:= dev-ml/stdio:= dev-ml/ocaml-ctypes:= dev-libs/openssl:0= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_ssl/archive/v0.14.0.tar.gz -> async_ssl-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=c6b0631777d3f80527b6befcfb36b1bf
diff --git a/metadata/md5-cache/dev-ml/async_unix-0.14.0 b/metadata/md5-cache/dev-ml/async_unix-0.14.0
index f66369942475..6a96894a147e 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_unix/archive/v0.14.0.tar.gz -> async_unix-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=2b2e0ef526979534e00dfc3ad29ce0f2
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
index 49669367e4a7..31469d21e0e2 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.0
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.0.tar.gz -> base-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6128f07880b62ac1e51d68afcb723ca8
diff --git a/metadata/md5-cache/dev-ml/base-0.14.1 b/metadata/md5-cache/dev-ml/base-0.14.1
index f69898f4306a..1b954c87f637 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.1
+++ b/metadata/md5-cache/dev-ml/base-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.1.tar.gz -> base-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=35c64aedea00bac4b4350c5a225288af
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index 1d83e4173f12..0f7cd2ae0e09 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.14.0.tar.gz -> base_bigstring-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=385c066e9d3d4fa035de72d884e7f258
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
index a7402585b70b..30dec7d579ac 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=df0860c33500878e5837fe71b6c26d81
diff --git a/metadata/md5-cache/dev-ml/batteries-2.7.0 b/metadata/md5-cache/dev-ml/batteries-2.7.0
deleted file mode 100644
index 0bb2a2d23b73..000000000000
--- a/metadata/md5-cache/dev-ml/batteries-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camomile:= test? ( dev-ml/ounit dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=The community-maintained foundation library for your OCaml projects
-EAPI=5
-HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included/
-INHERIT=oasis
-IUSE=test +ocamlopt debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/2.7.0
-SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.7.0.tar.gz -> batteries-2.7.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=8e814fc2dc9a0ea9d77c74a9bec54a95
diff --git a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0 b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
index b1bf3e6c8072..8aefec8a6583 100644
--- a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
+++ b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz -> bigarray-compat-1.0.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ce6d5d9dccb2a19dc4320443beca2ee1
diff --git a/metadata/md5-cache/dev-ml/bin-prot-0.9.2 b/metadata/md5-cache/dev-ml/bin-prot-0.9.2
deleted file mode 100644
index 082a19e75d12..000000000000
--- a/metadata/md5-cache/dev-ml/bin-prot-0.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=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:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Binary protocol generator
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/bin_prot
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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:=
-SLOT=0/0.9.2
-SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.9.2.tar.gz -> bin-prot-0.9.2.tar.gz
-_md5_=ca7055131f1fcafb82f0ccb0307cf5d6
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
index 09f2531af048..b8b71d7ba697 100644
--- a/metadata/md5-cache/dev-ml/bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.14.0.tar.gz -> bin_prot-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fe61884d68e235e2c2b7c18b30093623
diff --git a/metadata/md5-cache/dev-ml/biniou-1.2.1 b/metadata/md5-cache/dev-ml/biniou-1.2.1
index 35738ea7b1f0..e379cebd5b7c 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.2.1
+++ b/metadata/md5-cache/dev-ml/biniou-1.2.1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.1
 SRC_URI=https://github.com/ocaml-community/biniou/archive/1.2.1.tar.gz -> biniou-1.2.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=59369231073dabc8ba5a01fac7f3af0c
diff --git a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1 b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
index 26bb0625e577..1e5b5d61a6c6 100644
--- a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
+++ b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango )
 SLOT=0/1.2.0
 SRC_URI=https://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba
 _md5_=ec999f68294fcd1f84c8923368840afc
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.1 b/metadata/md5-cache/dev-ml/cairo2-0.6.1
index 9f535a91b283..6b7c25e31457 100644
--- a/metadata/md5-cache/dev-ml/cairo2-0.6.1
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.1
@@ -12,5 +12,5 @@ RDEPEND=x11-libs/cairo:= dev-ml/dune-configurator:= !dev-ml/ocaml-cairo >=dev-la
 RESTRICT=test
 SLOT=0/0.6.1
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.1/cairo2-0.6.1.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=84847a414cf237f82cb47c298f0d2dc6
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index 4169ade419b0..aefe0f388dd2 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/2.04
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=98a4ad1eb8a4730293a71476871017f0
diff --git a/metadata/md5-cache/dev-ml/calendars-1.0.0 b/metadata/md5-cache/dev-ml/calendars-1.0.0
index 72e294625807..ab192b15b6aa 100644
--- a/metadata/md5-cache/dev-ml/calendars-1.0.0
+++ b/metadata/md5-cache/dev-ml/calendars-1.0.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/geneweb/calendars/archive/v1.0.0.tar.gz -> calendars-1.0.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=136c81cf8f87f62984776998af4d261a
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.7.0 b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
index 2c912044a8f2..d0e7f7e6368c 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.7.0
 SRC_URI=https://gitlab.com/irill/camlbz2/-/archive/0.7.0/camlbz2-0.7.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=61ee3e5a6e052b646a3e2f46321e9a37
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11-r1 b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
index 3e0f578ed36f..b432d069d020 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.11-r1
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
@@ -3,11 +3,12 @@ DEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
+INHERIT=findlib
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?]
 SLOT=0/7.11
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel711.tar.gz -> camlp5-7.11.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=cde1dbd375f335b2f7f5140d4c1e0617
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.12 b/metadata/md5-cache/dev-ml/camlp5-7.12
index 9cbf635f6f83..5329e3b9ae56 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.12
+++ b/metadata/md5-cache/dev-ml/camlp5-7.12
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
 SLOT=0/7.12
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel712.tar.gz -> camlp5-7.12.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16ff8f5223b15d7c96254419dbf36139
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.13 b/metadata/md5-cache/dev-ml/camlp5-7.13
index 6fa588dd9e96..4f48ea7041f6 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.13
+++ b/metadata/md5-cache/dev-ml/camlp5-7.13
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
 SLOT=0/7.13
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel713.tar.gz -> camlp5-7.13.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=28ab10a8b30abc4108982ece5dfd8b0b
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.14 b/metadata/md5-cache/dev-ml/camlp5-7.14
index 3e659760c783..3a07af44cd7d 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.14
+++ b/metadata/md5-cache/dev-ml/camlp5-7.14
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
 SLOT=0/7.14
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel714.tar.gz -> camlp5-7.14.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2a6d0fb08bb3daebf210355cef5622c
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00 b/metadata/md5-cache/dev-ml/camlp5-8.00
index 0cbbaf76a3a6..c03c0c0d9daa 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
 SLOT=0/8.00
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.tar.gz -> camlp5-8.00.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c13990ac18b63018473ad47ce92d2e3a
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.3.1 b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
index 8900294087e6..d0512bd87fa1 100644
--- a/metadata/md5-cache/dev-ml/camlpdf-2.3.1
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
@@ -3,11 +3,12 @@ DEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml library for reading, writing, and modifying PDF files
 EAPI=7
 HOMEPAGE=https://github.com/johnwhitington/camlpdf/
+INHERIT=findlib
 IUSE=doc examples
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt]
 SLOT=0/2.3.1
 SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.3.1.tar.gz -> camlpdf-2.3.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=0d359c4840afbfdbf87c8432fcfcdf42
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.10 b/metadata/md5-cache/dev-ml/camlzip-1.10
index 7bbbd2fa4814..81e230f11f92 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.10
+++ b/metadata/md5-cache/dev-ml/camlzip-1.10
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib
 DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
+INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3
 SLOT=1/1.10
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz -> camlzip-1.10.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=74127cf99b770d401c6cd3ef33eded35
diff --git a/metadata/md5-cache/dev-ml/camomile-1.0.2 b/metadata/md5-cache/dev-ml/camomile-1.0.2
index 49658d76b29c..e74e767fb1f9 100644
--- a/metadata/md5-cache/dev-ml/camomile-1.0.2
+++ b/metadata/md5-cache/dev-ml/camomile-1.0.2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/1.0.2
 SRC_URI=https://github.com/yoriyuki/Camomile/archive/1.0.2.tar.gz -> camomile-1.0.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b39d22d19f4a2c11f593a84d84475e5a
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.14.0 b/metadata/md5-cache/dev-ml/cinaps-0.14.0
index 22921b528b12..e02c3d6c0706 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.14.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/findlib:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.14.0.tar.gz -> cinaps-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=45ae8a8f9215e5b5dcd7080485779650
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.0 b/metadata/md5-cache/dev-ml/cinaps-0.15.0
index 275814a7ef4e..f1a5b13bd897 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.0
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.15.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.0.tar.gz -> cinaps-0.15.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=8181c0f3a9cc6ab54db9ec5d531cc725
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
index c379b4b06116..34163f330ebb 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.4
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:= dev-ml/t
 DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/cmdliner
+INHERIT=findlib
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=5218301cadbc2c95ef53fe4c49bb784e
diff --git a/metadata/md5-cache/dev-ml/configurator-0.9.1 b/metadata/md5-cache/dev-ml/configurator-0.9.1
deleted file mode 100644
index 01d586cc23f9..000000000000
--- a/metadata/md5-cache/dev-ml/configurator-0.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Helper library for gathering system configuration
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/configurator
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_driver:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/configurator/archive/v0.9.1.tar.gz -> configurator-0.9.1.tar.gz
-_md5_=fe39bc023608a20f675256fc67021e7e
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r3 b/metadata/md5-cache/dev-ml/core-0.14.0-r3
index b7a03bdec846..a06e0c1d2177 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:=
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=2e0ab8acde9a464b624508e79902d39a
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.14.0 b/metadata/md5-cache/dev-ml/core_bench-0.14.0
index 4a15bc8bab12..40667f282eef 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/core-0.14.0:= >=dev-ml/core_kernel-0.14.0:= >=dev-ml/ppx_jane-0.14.0:= dev-ml/textutils:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.14.0.tar.gz -> core_bench-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=9b6a44dc871f8a8690a1709df31b4bc0
diff --git a/metadata/md5-cache/dev-ml/core_extended-0.9.0 b/metadata/md5-cache/dev-ml/core_extended-0.9.0
deleted file mode 100644
index cc63225a38dd..000000000000
--- a/metadata/md5-cache/dev-ml/core_extended-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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 dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Jane Street's alternative to the standard library
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/core_extended
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/core_extended/archive/v0.9.0.tar.gz -> core_extended-0.9.0.tar.gz
-_md5_=03b7a6b4758eed8661b0c5044281a51b
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3 b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
index 20904287f0c3..8a4f9b533490 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quick
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.1.tar.gz -> core_kernel-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=4638604d54f6190e569e1f7d2bf3bc23
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.7 b/metadata/md5-cache/dev-ml/cppo-1.6.7
index b85b85bb9775..7159c2c38720 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.7
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.7
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.6.7
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.7.tar.gz -> cppo-1.6.7.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=93a2cfbe959b403abe4197b5a2a09e79
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1 b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
index 834eef0cf442..1aee471193d1 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.16.1
 SRC_URI=https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz -> cryptokit-1.16.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=8b5830c5643d57d645ced2b9b2943da7
diff --git a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1 b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
index 8da7075a7b68..516d693e8e60 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fe4a73684fcb9e69f5e29aaa1a68daf3
diff --git a/metadata/md5-cache/dev-ml/cstruct-5.2.0 b/metadata/md5-cache/dev-ml/cstruct-5.2.0
index 988fa0b01214..ff4f8143b377 100644
--- a/metadata/md5-cache/dev-ml/cstruct-5.2.0
+++ b/metadata/md5-cache/dev-ml/cstruct-5.2.0
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/async_unix:= dev-ml/bigarray-compat:= >=dev-ml/ppx_tools_versioned-5.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/5.2.0
 SRC_URI=https://github.com/mirage/ocaml-cstruct/releases/download/v5.2.0/cstruct-v5.2.0.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3aa3509542e95d6d1ee013daa642ae62
diff --git a/metadata/md5-cache/dev-ml/csv-1.7 b/metadata/md5-cache/dev-ml/csv-1.7
deleted file mode 100644
index 01682c1adc5f..000000000000
--- a/metadata/md5-cache/dev-ml/csv-1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=lwt? ( dev-ml/lwt:= ) dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A pure OCaml library to read and write CSV files
-EAPI=5
-HOMEPAGE=https://github.com/Chris00/ocaml-csv
-INHERIT=oasis
-IUSE=+lwt +ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.7
-SRC_URI=https://github.com/Chris00/ocaml-csv/archive/1.7.tar.gz -> csv-1.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=53da00c4126aa34709d4d08436dbe083
diff --git a/metadata/md5-cache/dev-ml/deriving-0.7.1 b/metadata/md5-cache/dev-ml/deriving-0.7.1
deleted file mode 100644
index 5d31c32e69ee..000000000000
--- a/metadata/md5-cache/dev-ml/deriving-0.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/type-conv-108:= dev-ml/optcomp:= dev-ml/findlib:= dev-ml/camlp4:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A deriving library for Ocsigen
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/deriving
-INHERIT=oasis
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-ml/type-conv-108:= dev-ml/optcomp:= dev-ml/findlib:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.7.1
-SRC_URI=https://github.com/ocsigen/deriving/archive/0.7.1.tar.gz -> deriving-0.7.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=0fd38769fbc139df9d8f2e108fd910ac
diff --git a/metadata/md5-cache/dev-ml/dns-1.0.0-r1 b/metadata/md5-cache/dev-ml/dns-1.0.0-r1
deleted file mode 100644
index 623c052865ea..000000000000
--- a/metadata/md5-cache/dev-ml/dns-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder >=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 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=A pure OCaml implementation of the DNS protocol
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-INHERIT=findlib opam
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-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 >=dev-lang/ocaml-4:=
-RESTRICT=test
-SLOT=0/1.0.0
-SRC_URI=https://github.com/mirage/dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=836a6e0e2cc7c872f7cada71fa851b94
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
index f886f64d29b9..cb49cfca8f75 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
@@ -12,5 +12,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.8.2:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=2a5a39ef87781b07fbc9468c4d4dd89a
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
index f7a8c79caab1..b138d5ed7306 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
@@ -12,5 +12,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.8.4:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f6945ecc3f0c437e485db49779afb240
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
index 25facab0fdf2..7e5d2788b3c9 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ab53b8f2ee2fff859aa237b91f027217
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
index facbcb66b9ee..7673790be2cd 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a51ab7500c6555e75f1b14bdf32755f2
diff --git a/metadata/md5-cache/dev-ml/duration-0.1.3 b/metadata/md5-cache/dev-ml/duration-0.1.3
index d2af15e98566..cd5040a8a776 100644
--- a/metadata/md5-cache/dev-ml/duration-0.1.3
+++ b/metadata/md5-cache/dev-ml/duration-0.1.3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://github.com/hannesm/duration/archive/0.1.3.tar.gz -> duration-0.1.3.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=092ba3eaa3be415d6f81a9dcf9a33c10
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.2.0 b/metadata/md5-cache/dev-ml/easy-format-1.2.0
index b51357a2bad5..5b6bc8974ebf 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -3,11 +3,12 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Pretty-printing library for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/mjambon/easy-format
+INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=6e7952ad6480e325dea6b9fd42f83911
diff --git a/metadata/md5-cache/dev-ml/eliom-6.2.0 b/metadata/md5-cache/dev-ml/eliom-6.2.0
deleted file mode 100644
index 4c4d91be2168..000000000000
--- a/metadata/md5-cache/dev-ml/eliom-6.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=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:= ) dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A web framework to program client/server applications
-EAPI=5
-HOMEPAGE=http://ocsigen.org/eliom/
-INHERIT=eutils multilib findlib
-IUSE=doc +ocamlopt +ppx
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-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:= )
-SLOT=0/6.2.0
-SRC_URI=https://github.com/ocsigen/eliom/archive/6.2.0.tar.gz -> eliom-6.2.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=4f68dbbaacd6eefe3dfc808aaa1f5c92
diff --git a/metadata/md5-cache/dev-ml/eliom-9999 b/metadata/md5-cache/dev-ml/eliom-9999
deleted file mode 100644
index de7c38f27241..000000000000
--- a/metadata/md5-cache/dev-ml/eliom-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=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:= ) dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A web framework to program client/server applications
-EAPI=5
-HOMEPAGE=http://ocsigen.org/eliom/
-INHERIT=eutils multilib findlib git-r3
-IUSE=doc +ocamlopt +ppx
-LICENSE=LGPL-2.1-with-linking-exception
-PROPERTIES=live
-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:= )
-SLOT=0/9999
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=d573529a48f9b382e0d685fa40a75587
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
index 3064ed6df05b..7a26afacdbaf 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -4,11 +4,12 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.7
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e9bd27402f3d978f12037534b694b0a
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.8 b/metadata/md5-cache/dev-ml/extlib-1.7.8
index 66d7ce1a873d..110e0079706b 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.8
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.8
@@ -4,11 +4,12 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
+INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.8
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.8.tar.gz -> extlib-1.7.8.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5ac57c0e3d6f0655611ab656217d612
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.14.0 b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
index bff73a4435d2..31eab0ee2211 100644
--- a/metadata/md5-cache/dev-ml/fieldslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.14.0.tar.gz -> fieldslib-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=5336cea5bac127480dceea5d70e5aec0
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1 b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
index bcca829df8a2..04aecb7b3ace 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[o
 RESTRICT=!test? ( test )
 SLOT=0/0.8.9
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.9.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=d159ad92e3706f47246bf040e6370a27
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.2 b/metadata/md5-cache/dev-ml/fpath-0.7.2
index dfd682367b1f..6e1ce949f013 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.2
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.2
 SRC_URI=https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=2fea3947c7078d4c95c57f18739c79a9
diff --git a/metadata/md5-cache/dev-ml/gen-0.4.0.1 b/metadata/md5-cache/dev-ml/gen-0.4.0.1
deleted file mode 100644
index e5b5769a03a7..000000000000
--- a/metadata/md5-cache/dev-ml/gen-0.4.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ml/ounit dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Simple, efficient iterators for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/gen
-INHERIT=oasis
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.4.0.1
-SRC_URI=https://github.com/c-cube/gen/archive/0.4.0.1.tar.gz -> gen-0.4.0.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=a392610245c386561aa4f740d8bc4f92
diff --git a/metadata/md5-cache/dev-ml/graphics-5.1.1 b/metadata/md5-cache/dev-ml/graphics-5.1.1
index b87df83a3d6b..60e5852ee6a9 100644
--- a/metadata/md5-cache/dev-ml/graphics-5.1.1
+++ b/metadata/md5-cache/dev-ml/graphics-5.1.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09 x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/graphics/releases/download/5.1.1/graphics-5.1.1.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=0b87df41534312e6e94177366e1ec814
diff --git a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1 b/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
deleted file mode 100644
index cf7bbe57a1a4..000000000000
--- a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sci-libs/gsl-1.19 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)
-EAPI=5
-HOMEPAGE=https://github.com/mmottl/gsl-ocaml
-INHERIT=oasis
-IUSE=examples test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sci-libs/gsl-1.19 !dev-ml/ocamlgsl >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/v1.19.1/gsl-ocaml-1.19.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=e51bbfdd30287784d373ea37fdd5a225
diff --git a/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3 b/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3
new file mode 100644
index 000000000000..2c62b6c9d19a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/dune-configurator >=sci-libs/gsl-1.19 >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=OCaml bindings for the GSL library (successor of dev-ml/ocamlgsl)
+EAPI=7
+HOMEPAGE=https://github.com/mmottl/gsl-ocaml
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-ml/dune-configurator >=sci-libs/gsl-1.19 !dev-ml/ocamlgsl >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0
+SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/1.24.3/gsl-1.24.3.tbz
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
+_md5_=b1ba71cbfa5cf0caf57dbcb184219c98
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.7 b/metadata/md5-cache/dev-ml/iTeML-2.7
deleted file mode 100644
index 124f2f0f9e6f..000000000000
--- a/metadata/md5-cache/dev-ml/iTeML-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Inline (Unit) Tests for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/vincent-hugot/iTeML
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
-SLOT=0/2.7
-SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.7.tar.gz -> iTeML-2.7.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/integers-0.4.0 b/metadata/md5-cache/dev-ml/integers-0.4.0
index 92533dd06bab..84e0e986222c 100644
--- a/metadata/md5-cache/dev-ml/integers-0.4.0
+++ b/metadata/md5-cache/dev-ml/integers-0.4.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.4.0
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.4.0.tar.gz -> integers-0.4.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=c7ef4b14d1d2c27a1a57b2d1d5cbef3f
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0 b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
index 972a2c86b0fe..b0c94c4436c2 100644
--- a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.14.0.tar.gz -> jane-street-headers-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=73f96c757fa5b2c17a3ee35631cfe8a1
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
deleted file mode 100644
index ca217abe2e33..000000000000
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=<dev-lang/ocaml-4.09:= test? ( dev-ml/menhir dev-ml/findlib ) >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-INHERIT=opam
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-lang/ocaml-4.09:= >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/1.0_beta14
-SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz -> jbuilder-1.0-beta14.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=9385c9d461b5b7c3f028ba468e7dd928
diff --git a/metadata/md5-cache/dev-ml/jingoo-1.4.2 b/metadata/md5-cache/dev-ml/jingoo-1.4.2
index dbbb0c6a9bb1..fdf20c26ecd1 100644
--- a/metadata/md5-cache/dev-ml/jingoo-1.4.2
+++ b/metadata/md5-cache/dev-ml/jingoo-1.4.2
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/men
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tategakibunko/jingoo/archive/v1.4.2.tar.gz -> jingoo-1.4.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f7c993ba6d9ff6c4dabb0f58b7925bd6
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2 b/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
deleted file mode 100644
index a98e3bd5116b..000000000000
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=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:= ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-INHERIT=findlib eutils
-IUSE=+ocamlopt doc +deriving +ppx +react +xml X
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-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:= )
-SLOT=0/2.8.4
-SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/2.8.4.tar.gz -> js_of_ocaml-2.8.4.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=bce4fcbf168617b8941fef0125e45714
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0 b/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
deleted file mode 100644
index 0f13f3a4261c..000000000000
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=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:= ) dev-ml/jbuilder dev-ml/opam test? ( dev-util/patdiff ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-INHERIT=findlib eutils
-IUSE=+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test
-LICENSE=LGPL-2.1-with-linking-exception
-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:= )
-REQUIRED_USE=xml? ( ppx )
-RESTRICT=!test? ( test )
-SLOT=0/3.0.0
-SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/3.0.0.tar.gz -> js_of_ocaml-3.0.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=6d6e82ccabd774e054e5de2f27f2916c
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-9999 b/metadata/md5-cache/dev-ml/js_of_ocaml-9999
deleted file mode 100644
index 8eff69baffe4..000000000000
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=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:= ) dev-ml/jbuilder dev-ml/opam test? ( dev-util/patdiff ) >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A compiler from OCaml bytecode to javascript
-EAPI=5
-HOMEPAGE=http://ocsigen.org/js_of_ocaml/
-INHERIT=findlib eutils git-r3
-IUSE=+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test
-LICENSE=LGPL-2.1-with-linking-exception
-PROPERTIES=live
-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:= )
-REQUIRED_USE=xml? ( ppx )
-RESTRICT=!test? ( test )
-SLOT=0/9999
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=05615f12a3ea0b4f8342269dc453bcee
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index dd307952b99b..132af6c3c8d3 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -3,10 +3,11 @@ DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml
 DESCRIPTION=Non-blocking streaming JSON codec for OCaml
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/jsonm
+INHERIT=findlib
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=c56ddeca7e680b3a21ade99e3dabc59a
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.0 b/metadata/md5-cache/dev-ml/jst-config-0.14.0
index 7a6f7eddb9f2..aa409d276f3a 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.14.0
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.0.tar.gz -> jst-config-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=07610653412a8ccc56fcdd31c4085d12
diff --git a/metadata/md5-cache/dev-ml/lablgtk-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
index b3234c214afb..85aa85118f95 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-3.1.1
+++ b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
@@ -12,5 +12,5 @@ PDEPEND=sourceview? ( dev-ml/lablgtk-sourceview:3/3.1.1 )
 RDEPEND=app-text/gtkspell:3= x11-libs/gtk+:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=3/3.1.1
 SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=7045653533ff3dba2bf756c23164546f
diff --git a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
index 269bf1a132ca..6d9fe842263c 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
+++ b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=x11-libs/gtksourceview:3.0= >=dev-ml/lablgtk-3.1.1:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=3/3.1.1
 SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=c85a693667e516353b35a70c85d90d88
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.7 b/metadata/md5-cache/dev-ml/labltk-8.06.7
index 1c6616205f23..14f30f82759e 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.7
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.7
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?] >=dev-ml/f
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
+INHERIT=findlib eutils
 IUSE=+ocamlopt X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]
 SLOT=0/8.06.7
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.7.tar.gz -> labltk-8.06.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=bf810c4e2cc994451e62633dbd05afc4
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.9 b/metadata/md5-cache/dev-ml/labltk-8.06.9
index f8dd9335db13..f0d7f2f0701f 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.9
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.9
@@ -3,11 +3,12 @@ DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=d
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
+INHERIT=findlib eutils
 IUSE=+ocamlopt X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]
 SLOT=0/8.06.9
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.9.tar.gz -> labltk-8.06.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=1f3b7d08050c6ebe957ece82cba3b8db
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0 b/metadata/md5-cache/dev-ml/logs-0.7.0
index 0b043868c544..2b0064fff548 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0
@@ -3,6 +3,7 @@ DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:=
 DESCRIPTION=Logging infrastructure for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/logs https://github.com/dbuenzli/logs
+INHERIT=findlib
 IUSE=+fmt cli +lwt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=ISC
@@ -10,5 +11,5 @@ RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:=
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/logs/releases/logs-0.7.0.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=1d05a0be8cbe50c665e825f05a32c3ff
diff --git a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1 b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
index 1f31a5754739..87815b1eadf6 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-ml/ppxlib-0.18.0:= dev-ml/react:= dev-ml/dune-configurator:= dev-libs/libev !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/5.3.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.3.0.tar.gz -> lwt-5.3.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ffd2eb61f120553d5b477a671eca0f5d
diff --git a/metadata/md5-cache/dev-ml/lwt_react-1.0.1 b/metadata/md5-cache/dev-ml/lwt_react-1.0.1
deleted file mode 100644
index 79aeb2087255..000000000000
--- a/metadata/md5-cache/dev-ml/lwt_react-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/react-1.2:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=GLib integration for Lwt
-EAPI=5
-HOMEPAGE=http://ocsigen.org/lwt
-INHERIT=oasis
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/react-1.2:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.0.1
-SRC_URI=https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=49c732db5e85b600c47da89de8925c76
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3 b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
index 230f7c6e01cb..c927918b96ed 100644
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/base >=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.1.3
 SRC_URI=https://github.com/ocsigen/lwt_ssl/archive/1.1.3.tar.gz -> lwt_ssl-1.1.3.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=2b3319efe437d18aa0459bfa8321b803
diff --git a/metadata/md5-cache/dev-ml/macaque-0.7.4 b/metadata/md5-cache/dev-ml/macaque-0.7.4
deleted file mode 100644
index 31a34cd8bc36..000000000000
--- a/metadata/md5-cache/dev-ml/macaque-0.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= dev-ml/oasis >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=DSL for SQL Queries in Caml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/macaque/
-INHERIT=oasis
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/0.7.4
-SRC_URI=https://github.com/ocsigen/macaque/archive/0.7.4.tar.gz -> macaque-0.7.4.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=e94c1b8ad8a730144111484da5ede78f
diff --git a/metadata/md5-cache/dev-ml/markup-1.0.0 b/metadata/md5-cache/dev-ml/markup-1.0.0
index bebfed3ae76a..71f86f029079 100644
--- a/metadata/md5-cache/dev-ml/markup-1.0.0
+++ b/metadata/md5-cache/dev-ml/markup-1.0.0
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/lwt dev-ml/uutf >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/aantron/markup.ml/archive/1.0.0.tar.gz -> markup-1.0.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=eed3e7e84ad76bf3b99780a27b402c41
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.11 b/metadata/md5-cache/dev-ml/mccs-1.1.11
index 3e461061ea5f..64f8712de355 100644
--- a/metadata/md5-cache/dev-ml/mccs-1.1.11
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.11
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/cudf:= sci-mathematics/glpk:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.11
 SRC_URI=https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz -> mccs-1.1.11.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=1e0afbbb3bfe46af104a4070faf72297
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index 8aa546e46e7c..9c048d57910c 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0
 DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
+INHERIT=findlib eutils
 IUSE=examples +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20190924
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	3d3de4bef686774baeeabfa2b916631c	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
 _md5_=0f66fff880fb0dee0d8f488473ca4158
diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1 b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
index c63cfc075ccb..52cae31f685d 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/3.4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
-_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=8a5a0751184bc93d507186e699808717
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r1 b/metadata/md5-cache/dev-ml/merlin-4.1-r1
index 3b5f5143acda..de258f9f0972 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.1-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/4.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
-_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=elisp-common	36f97076abd90f943a34f8bcd58b5bcc	dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=7f716c102d084462d26dda1ba0a5c044
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3 b/metadata/md5-cache/dev-ml/merlin-extend-0.3
index e5cc1c356661..07ea21a49c2f 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3
@@ -3,10 +3,11 @@ DEPEND=dev-lang/ocaml:0/4.05.0 dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=SDK to extend Merlin
 EAPI=5
 HOMEPAGE=https://github.com/let-def/merlin-extend
+INHERIT=findlib
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:0/4.05.0
 SLOT=0/0.3
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz -> merlin-extend-0.3.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=ce85a9c43bafda9e786360053f203c3b
diff --git a/metadata/md5-cache/dev-ml/mirage-clock-3.1.0 b/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
index 48d87bedffea..2161535d9e52 100644
--- a/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
+++ b/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/3.1.0
 SRC_URI=https://github.com/mirage/mirage-clock/archive/v3.1.0.tar.gz -> mirage-clock-3.1.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3412d2d773b40c2b04cb1adae3954f20
diff --git a/metadata/md5-cache/dev-ml/mmap-1.1.0 b/metadata/md5-cache/dev-ml/mmap-1.1.0
index 8dd4769d32e8..32cb766c9b81 100644
--- a/metadata/md5-cache/dev-ml/mmap-1.1.0
+++ b/metadata/md5-cache/dev-ml/mmap-1.1.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.1.0
 SRC_URI=https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a1fb963ae6aed01631f0db94895fac0c
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index 0ebc4864fffc..279d778b6585 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=ec5f0b04769f0608312ca837933ed963
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index 9aec0000c4a3..bde7159febe1 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -4,10 +4,11 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=de
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
+INHERIT=multilib findlib
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=fcf99ccb31e6a5eb44d2374354312464
diff --git a/metadata/md5-cache/dev-ml/num-1.4-r1 b/metadata/md5-cache/dev-ml/num-1.4-r1
index c30094b731fc..5cfa1610d718 100644
--- a/metadata/md5-cache/dev-ml/num-1.4-r1
+++ b/metadata/md5-cache/dev-ml/num-1.4-r1
@@ -3,10 +3,11 @@ DEPEND=>=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
+INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.4.tar.gz -> num-1.4.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=1a1d0c89f9f20c80eeb2e2cdd9a8e064
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.10 b/metadata/md5-cache/dev-ml/oasis-0.4.10
deleted file mode 100644
index 3ab37ab3e817..000000000000
--- a/metadata/md5-cache/dev-ml/oasis-0.4.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ocamlbuild:=[ocamlopt] dev-ml/camlp4:= >=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 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Tool to integrate a configure, build and install system in OCaml project
-EAPI=5
-HOMEPAGE=http://oasis.forge.ocamlcore.org/index.php
-INHERIT=oasis
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/ocamlbuild:=[ocamlopt] dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test ) strip
-SLOT=0/0.4.10
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=33b8c7cd5a74ae2f2e0d0bd7ba75a5d2
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index ed50f6485295..feba8374f2b4 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -3,10 +3,11 @@ DEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocam
 DESCRIPTION=Ocaml bindings for Augeas
 EAPI=5
 HOMEPAGE=http://augeas.net/
+INHERIT=findlib
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocamlopt]
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.5.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=76e54ded6746510da592d83b2bff3b37
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0 b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
index 95679550de81..b77220ef93bf 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/3.5.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v3.5.0.tar.gz -> ocaml-base64-3.5.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=73527751fd7a397897b6aeaf960f6f99
diff --git a/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0-r1 b/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0-r1
deleted file mode 100644
index 7f04d62a7877..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-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:= ) test? ( dev-ml/ounit dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Very lightweight HTTP server using Lwt or Async
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cohttp
-INHERIT=oasis
-IUSE=async +lwt +ocamlopt debug doc test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=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:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.22.0
-SRC_URI=https://github.com/mirage/ocaml-cohttp/archive/v0.22.0.tar.gz -> ocaml-cohttp-0.22.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=a09d439d1a0a592106f85011d3b5f7aa
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
index 4924923600f6..c686b5f7f5ff 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.12.3
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.3.tar.gz -> ocaml-compiler-libs-0.12.3.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=5c297729ffcac7d2109d8097b7bf9f3d
diff --git a/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4 b/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
deleted file mode 100644
index b18ac6eb892c..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-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:= dev-ml/findlib dev-ml/ocamlbuild dev-ml/ppx_driver dev-ml/ppx_optcomp dev-ml/ppx_sexp_conv >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Dereference URIs into communication channels for Async or Lwt
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-conduit
-INHERIT=findlib eutils
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=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:=
-SLOT=0/0.15.4
-SRC_URI=https://github.com/mirage/ocaml-conduit/archive/v0.15.4.tar.gz -> ocaml-conduit-0.15.4.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e
-_md5_=5bc408aead33a6d10f7e49493460bf10
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
deleted file mode 100644
index 53bfc068bad9..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/ounit ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv ) ) 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:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-INHERIT=findlib opam
-IUSE=async +lwt +ppx test
-KEYWORDS=~amd64
-LICENSE=ISC
-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:= >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/3.1.1
-SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.1.tar.gz -> ocaml-cstruct-3.1.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=7baef6bed6fb57211c8515e34f89827f
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
index 3f571ef483dc..f3d74642e94a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/in
 DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
+INHERIT=findlib
 IUSE=test
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/i
 RESTRICT=!test? ( test )
 SLOT=0/0.17.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz -> ocaml-ctypes-0.17.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=68ffd978d8b2627a94a4bb380291dea0
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
deleted file mode 100644
index bdd27e9c39bb..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-lang/ocaml:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Path-based dispatching for client- and server-side applications
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/ocaml-dispatch
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/result:= dev-lang/ocaml:=
-RESTRICT=!test? ( test )
-SLOT=0/0.4.0
-SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.4.0.tar.gz -> ocaml-dispatch-0.4.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=bd2ddc078e2275a1885b5e49a121f906
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
index 2a3d2db0e2fa..c494a65d9b70 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
@@ -3,6 +3,7 @@ DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit2
 DESCRIPTION=OCaml bindings for expat
 EAPI=7
 HOMEPAGE=https://github.com/whitequark/ocaml-expat
+INHERIT=findlib
 IUSE=doc +ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=5eb4340f24b2a108c4d7f5537c4fb451
diff --git a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5 b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
deleted file mode 100644
index ffcb47a758d1..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= test? ( >=dev-ml/ounit-2.0.0 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Ocaml implementation of expect to help building unitary testing
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocaml-expect/
-INHERIT=oasis
-IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.0.5
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1372/ocaml-expect-0.0.5.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=b77c289b8bc39aba3bd1196dd6099bcc
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
index a6677366ffb6..b59a7e36128e 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.2/fileutils-v0.6.2.tbz -> ocaml-fileutils-0.6.2.tar.bz2
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=2e6643b3d4c0889c519dd77d71250455
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
index 9847dadf9815..ed98316523b0 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileut
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a9ab2d138b11c5a045d448357ccb9a9b
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
index e19f96a96c50..1dd4840a2dfd 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= >=dev-l
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6d73558928d6b7890fec1ecc758df2bf
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
index 34c229f2aa9f..5baecde5da00 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ff20e57118cd6bedab3e3fe84c31a546
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index 59d118c0150a..0044a018abcb 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.3
 SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.3.tar.gz -> ocaml-hashcons-1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=ea0dcaeade9713d11f14cc5684c340cc
diff --git a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0 b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
deleted file mode 100644
index 33ba23b1358c..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=OCaml library for manipulation of IP (and MAC) address representations
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-ipaddr
-INHERIT=opam
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/2.8.0
-SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.8.0.tar.gz -> ocaml-ipaddr-2.8.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=bd5949dbdf484129d9b3b6ad716fb3cb
diff --git a/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0 b/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
deleted file mode 100644
index 010bee25208d..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Convert file extensions to MIME types
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-magic-mime
-INHERIT=oasis
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.0.0
-SRC_URI=https://github.com/mirage/ocaml-magic-mime/archive/v1.0.0.tar.gz -> ocaml-magic-mime-1.0.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=0692fee9c679c335f7e5989f86824f37
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
index bc141316ddae..4fdd783e0ad5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/cinaps:= dev-ml/ppx_derivers:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.8.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.8.0.tar.gz -> ocaml-migrate-parsetree-1.8.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=670e238ce3e197999804086ecd9e5c8f
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
index cee94ed390a7..f67cac8fdfde 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.1.0.tar.gz -> ocaml-migrate-parsetree-2.1.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=811ee1c37b37786d3250b5aeced79748
diff --git a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1 b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
deleted file mode 100644
index 0a80027d982b..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.02:= test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Regular expression library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/ocaml/ocaml-re
-INHERIT=oasis
-IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.7.1
-SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> ocaml-re-1.7.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=93d768c93ecbd5a8b43f0d736aeb17c7
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
index 41b668bf12b1..ee3753c1c193 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/5.0.2
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/archive/5.0.2.tar.gz -> ocaml-sqlite3-5.0.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3d9ea5cbe6c6c16ea67dc5a6aaea15c4
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
index 14f2cd8ff5e7..547cb3721c0c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.5.10
 SRC_URI=https://github.com/savonet/ocaml-ssl/archive/v0.5.10.tar.gz -> ocaml-ssl-0.5.10.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3bbcd622516edebc86175c154cd0bd9f
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
index 7dbe9b6fead2..6809de07793b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.5.9
 SRC_URI=https://github.com/savonet/ocaml-ssl/archive/0.5.9.tar.gz -> ocaml-ssl-0.5.9.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=d6e23431bbf3c5397577d98cb1a16291
diff --git a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4-r1 b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4-r1
deleted file mode 100644
index 0c64c13c2526..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=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:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=RFC3986 URI parsing library for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-uri https://mirage.io
-INHERIT=findlib opam
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-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:= >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/1.9.4
-SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=c7333f9b05c9b7581ce4d510c7e12ebb
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
index bf95136b8a37..97423c82f978 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
@@ -4,11 +4,12 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas
 DESCRIPTION=O'Caml Graph library
 EAPI=7
 HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
+INHERIT=findlib
 IUSE=doc examples gtk +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
 SLOT=0/1.8.8
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=fec682d1031c5f5ae701652c09ef1972
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1 b/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
index dfaabcc2526e..8f7d64a75bbd 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.0
 SRC_URI=https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=718ff38554a131732395a02a70d3195f
diff --git a/metadata/md5-cache/dev-ml/ocamlify-0.0.2 b/metadata/md5-cache/dev-ml/ocamlify-0.0.2
deleted file mode 100644
index 6bfdd267d29f..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlify-0.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-lang/ocaml-4.05.0 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=OCamlify creates OCaml code by including files into strings or string lists
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlify
-INHERIT=oasis
-IUSE=+ocamlopt debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=~dev-lang/ocaml-4.05.0 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=4b3cf6cae5da578d60d21fd2d84552af
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
deleted file mode 100644
index d8bd9dddd5b4..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-ml/ounit-2.0.0 ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Generate OCaml modules from source files
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/ocamlmod/
-INHERIT=oasis
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.0.9
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=0ddbe4ba2bb6cc578a9720d8eb2f2c40
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
index 368d1efcf07d..54f3481182d3 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-
 RESTRICT=installsources strip
 SLOT=0/4.1.8
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1 b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
index d1eec065ae30..622e18435f8e 100644
--- a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
@@ -3,11 +3,12 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=de
 DESCRIPTION=OCaml SDL Bindings
 EAPI=7
 HOMEPAGE=http://ocamlsdl.sourceforge.net
+INHERIT=findlib
 IUSE=doc +ocamlopt opengl truetype
 KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 truetype? ( >=media-libs/sdl-ttf-2.0 )
 SLOT=0/0.9.1
 SRC_URI=mirror://sourceforge/ocamlsdl/ocamlsdl-0.9.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=1a311da00e4c349e39769a3da3cd64ec
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1 b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
index 1df6ab0d386f..879a41180edb 100644
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/1.1
 SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz -> ocplib-endian-1.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=d03cfc46e3130ce275c5e2a47fef1784
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
index 754778777faa..b8d89c78cc76 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -9,5 +9,5 @@ KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/v0.4.tar.gz -> ocplib-simplex-0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	6ff8412ccf96444868b310b0a28973ba	findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=db1b5c4c5fcd6a27dfd90cba1a30b8b3
diff --git a/metadata/md5-cache/dev-ml/octavius-1.2.2 b/metadata/md5-cache/dev-ml/octavius-1.2.2
index e0d43f190a46..eda7afc9f180 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.2.2
+++ b/metadata/md5-cache/dev-ml/octavius-1.2.2
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.2
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz -> octavius-1.2.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=547f5548f48de931341300a1a888ecef
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.1 b/metadata/md5-cache/dev-ml/ocurl-0.9.1
index 43e22b3cac71..6d7870762b16 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.1
@@ -4,11 +4,12 @@ DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:
 DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
+INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.1.tar.gz -> ocurl-0.9.1.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=fd07450fc47d4a7c8d6fcbef4bfe2200
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
index ee16177915ce..b3ef30da634c 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3d373d211d383c5f9695dea15ff2b781
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8 b/metadata/md5-cache/dev-ml/opam-client-2.0.8
index 2259025a1d9a..8da4a41a0e6d 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=16e7ecdcc4693a76d1bb075ecaa5f29d
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
index 34d98889729c..6fca1726cb6a 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=57ae99f6f4a1ca77d192e95698c80e0c
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
index 1e523d2cef89..a7b102883195 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
@@ -3,11 +3,12 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Parser and printer for the opam file syntax
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/opam-file-format
+INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.0.tar.gz -> opam-file-format-2.1.0.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=82a2e1da0399dcbe2d56d32065b8f09e
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.2 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
index 47b185e2fd34..a42d657114c9 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/2.1.2
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.2.tar.gz -> opam-file-format-2.1.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=44f33a6bee8abd5eea17d0ae37525906
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
index f1a8308cc19c..e467bf24d1f2 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=e5014d9e9429ede0929734664e1addea
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
index 9bdcfa91df08..70414abed3e8 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.8/opam-full-2.0.8.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=268abf3d4ba1a551a214287819ec96b3
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
index 66a087940cf9..78cd8312be43 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -12,5 +12,5 @@ RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b88efcf4100ed5d8d94152d1b13b87b5
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
index 36b94e644dfb..edde21ea9e90 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
@@ -12,5 +12,5 @@ RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-
 RESTRICT=!test? ( test )
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a49810dbfa95aafebb7afebbcc8ff73a
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8 b/metadata/md5-cache/dev-ml/opam-state-2.0.8
index 4d5841f68d80..08390c55e9e6 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6d360d2c249e0367bca6f14d4ebebee7
diff --git a/metadata/md5-cache/dev-ml/optcomp-1.6-r1 b/metadata/md5-cache/dev-ml/optcomp-1.6-r1
deleted file mode 100644
index 0099ed670014..000000000000
--- a/metadata/md5-cache/dev-ml/optcomp-1.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Optional compilation for OCaml with cpp-like directives
-EAPI=5
-HOMEPAGE=https://github.com/diml/optcomp
-INHERIT=oasis
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.6
-SRC_URI=https://github.com/diml/optcomp/archive/1.6.tar.gz -> optcomp-1.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=74bcdf05f0ffc6eb0d36c47d1b22ffe3
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.6 b/metadata/md5-cache/dev-ml/ounit-2.0.6
deleted file mode 100644
index 534e42142927..000000000000
--- a/metadata/md5-cache/dev-ml/ounit-2.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-INHERIT=oasis
-IUSE=+ocamlopt debug doc
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.0.6
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1722/ounit-2.0.6.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=d27cf6bcf1393f965f504cc1f79eb01c
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.3 b/metadata/md5-cache/dev-ml/ounit2-2.2.3
index 06c71274918a..6cae69ad2a42 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.3
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.3
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.2.3
 SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.3/ounit-v2.2.3.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=10732129e273a38695736725f2761096
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.4 b/metadata/md5-cache/dev-ml/ounit2-2.2.4
index 6dce6bf67a4a..124fcfbc3a63 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.4
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.4
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/2.2.4
 SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fe45db68c747604d896ef80af6daf2b5
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2 b/metadata/md5-cache/dev-ml/parmap-1.2
index 686ab32e07ee..05d44f5528ec 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2
+++ b/metadata/md5-cache/dev-ml/parmap-1.2
@@ -11,5 +11,5 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.tar.gz -> parmap-1.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=1a295064f872d5b84c9c35178184b423
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
index 3004d5034c42..77637201c446 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.0.tar.gz -> parsexp-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f855186d69223b0b207bcce7fdd8e4d0
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.14.0 b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
index 7fe4c8aa3ec5..9116750cd8b6 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.14.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.14.0.tar.gz -> patience_diff-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f1f5c00286b366bd86a6b4ef500a1362
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1
index ff0148323529..6792267e1743 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/7.4.6
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.4.6/pcre-7.4.6.tbz -> pcre-ocaml-7.4.6.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=49fd6e8969e7ce86c50650fa91aeb842
diff --git a/metadata/md5-cache/dev-ml/pgocaml-2.3-r1 b/metadata/md5-cache/dev-ml/pgocaml-2.3-r1
deleted file mode 100644
index 0a85cda2b6fd..000000000000
--- a/metadata/md5-cache/dev-ml/pgocaml-2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/re:= camlp4? ( dev-ml/camlp4:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=PG'OCaml is a set of OCaml bindings for the PostgreSQL database
-EAPI=5
-HOMEPAGE=http://pgocaml.forge.ocamlcore.org/
-INHERIT=oasis
-IUSE=+camlp4 doc +ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/re:= camlp4? ( dev-ml/camlp4:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.3
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1597/pgocaml-2.3.tgz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=aa61c4e5aab1f501d9c1cde052c6fab1
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
index 360193e8519a..21029134dece 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=65accfdb7b16140f146ebe74444f0986
diff --git a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1 b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
deleted file mode 100644
index 0d30c89f75da..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=AST used in Jane Street ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_ast
-INHERIT=opam
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/ppx_ast/archive/v0.9.1.tar.gz -> ppx_ast-0.9.1.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=2f8970af9000908999d6184d066c41bb
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.14.0 b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
index ef4149874ec9..faecf72dba53 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_enumerate-0.14.0:= >=dev-ml/ppx_hash-0.14.0:= >=dev-ml/ppx_js_style-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.14.0.tar.gz -> ppx_base-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=247a247a14aa362a1afc06b1c54653d5
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
index 9c9d760c09a2..8f401c99cbbb 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz -> ppx_bench-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a0e553b69907ab178983bc8d245adbda
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
index b5f952ad73a3..34de120c33a3 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=05312be2fe0b6fd4684064fdbf0bc663
diff --git a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0 b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
index c14b5b7fd612..ca89ba7219c9 100644
--- a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_cold/archive/v0.14.0.tar.gz -> ppx_cold-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=d32847e5aa14c4ca77662ba096ca0e62
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
index 6cdb5da3768e..7e999d02d9e6 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-m
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.14.0.tar.gz -> ppx_compare-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b1a80c8cc404da297c71d584aba27f18
diff --git a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
deleted file mode 100644
index cbb1c321c5e4..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-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:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Standard library for ppx rewriters
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_core
-INHERIT=opam
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=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:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_core/archive/v0.9.0.tar.gz -> ppx_core-0.9.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=39357472dfc94cf45b643e5eb2246f52
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
index 89db82171f8d..93ceb2cbe6b2 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.14.0.tar.gz -> ppx_custom_printf-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=69c5018ebca05c4453ce378480cf3015
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1 b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
index 3e901b93a0c3..b5fd60db2859 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.2.1
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.2.1.tar.gz -> ppx_derivers-1.2.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=645376917126544e6d99045ee19e4c0c
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-5.2 b/metadata/md5-cache/dev-ml/ppx_deriving-5.2
index f5f5019767f8..59245bd335f8 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-5.2
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-5.2
@@ -12,5 +12,5 @@ RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:
 RESTRICT=!test? ( test )
 SLOT=0/5.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v5.2.tar.gz -> ppx_deriving-5.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=1328462542636ee99d013bae80449aca
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.11.0 b/metadata/md5-cache/dev-ml/ppx_driver-0.11.0
deleted file mode 100644
index d2172dbbdf25..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-ml/jbuilder dev-ml/opam-installer dev-lang/ocaml
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
-DESCRIPTION=Feature-full driver for OCaml AST transformers
-EAPI=7
-HOMEPAGE=https://github.com/janestreet/ppx_driver
-INHERIT=opam
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
-SLOT=0/0.11.0
-SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.11.0.tar.gz -> ppx_driver-0.11.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=b0cc73f0c63fea2e202bedba30439459
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
index faa37515f59d..425314bda039 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.14.0.tar.gz -> ppx_enumerate-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a1600a795d1134c23b9ca4215fca21a0
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
index dc19605ce3cb..5aaad3a44a7c 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_te
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.0.tar.gz -> ppx_expect-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a3fd584763acc183bf1e311fbd65365b
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
index 156399a7eb1d..6061325f4df8 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.14.0.tar.gz -> ppx_fail-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=cbd7de4e980f015920cb3245d30c2573
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
index 435ad6e76a01..c1f8226a18ce 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/fieldslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.14.1.tar.gz -> ppx_fields_conv-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=70de61263be005fc34eaa3431f240eab
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
index 5e98a38046d8..5cf95298acfd 100644
--- a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.14.0.tar.gz -> ppx_fixed_literal-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a0f974d696978e59d4a9d9b2806a9845
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
index 3a5afc2eefc2..cf10774b0771 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.14.0.tar.gz -> ppx_hash-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ebf039c18654bac98d2ca7cf7df161d9
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.14.0 b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
index 5d2eeb36763f..a2df5caa57e9 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-m
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.14.0.tar.gz -> ppx_here-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=1a4fe6084e2d1be4e74756ffd9eb534d
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
index fac32783947a..35618e771d18 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.14.1.tar.gz -> ppx_inline_test-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6f424a7c8b7c8e59482d824ce28c95d3
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
index c41b004db261..f08bd469374c 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base_quickcheck-0.14.0:= >=dev-ml/ppx_assert-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_bench-0.14.1:= >=dev-ml/ppx_bin_prot-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_expect-0.14.0:= >=dev-ml/ppx_fail-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_fixed_literal-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_module_timer-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_optional-0.14.0:= >=dev-ml/ppx_pipebang-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= >=dev-ml/ppx_stable-0.14.1:= >=dev-ml/ppx_string-0.14.1:= >=dev-ml/ppx_typerep_conv-0.14.1:= >=dev-ml/ppx_variants_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=e9cfb9bde23db1cdaae2eafe50a61164
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
index 3508a55b97af..c90b8a0913f4 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= dev-ml/octavius:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.14.0.tar.gz -> ppx_js_style-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a88963ce14258637cab5837b749eaa7e
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.14.0 b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
index d9b3ba4b18ed..9e5bca8b45bb 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.14.0.tar.gz -> ppx_let-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=0419f2e14e70e0516b58be2a7804412b
diff --git a/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0 b/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0
index bb8bde0067c9..f951688b9ab2 100644
--- a/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0
+++ b/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.11.0
 SRC_URI=https://github.com/janestreet/ppx_metaquot/archive/v0.11.0.tar.gz -> ppx_metaquot-0.11.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=0793b77cc7dce044a7a9eb90289b1cbe
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
index 76e67a47d48c..30430f43d2e0 100644
--- a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.14.0.tar.gz -> ppx_module_timer-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=4eaa724d75147b4c0506681cebe08ce5
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
index 8a97382a9376..dfbfcee47738 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.0.tar.gz -> ppx_optcomp-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=e52b529b2569ef93e105e4519651b994
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
index ef9f65408520..71393ea78ff1 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.14.0.tar.gz -> ppx_optional-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=38c47246367d87262117d9408fe5b245
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
index e7fd8c103a7f..1526a164324f 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.14.0.tar.gz -> ppx_pipebang-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=d9c22e66d9e7b8bdcc167b487349b2e6
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
index 9dbc3b7112c5..6b0b7eceae9b 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz -> ppx_sexp_conv-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=87764ab47113c3c3f300648c75b9ec09
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
index 716ac32f651a..0c721d35e35d 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=8ff7582ed906e22d9e32e39c7f00bcd5
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
index f9acfff81bdc..a9eff3daf14d 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.0.tar.gz -> ppx_sexp_message-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=4e3e87b594dee9b58aaae60d5d741d2c
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
index bff706432b35..b2efbc02eec2 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.14.0.tar.gz -> ppx_sexp_value-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=c00879a84cd06ba00c44271c93dae1e0
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1 b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
index 41fb2ead7794..8e9f04319cef 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz -> ppx_stable-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=275c44d0c8bc1589520ab3b82cf9c632
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.14.1 b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
index da976129412b..7deb65f3932e 100644
--- a/metadata/md5-cache/dev-ml/ppx_string-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz -> ppx_string-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=5e5f1cfaaa67f35cdeacc05bb01b3ee7
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.2 b/metadata/md5-cache/dev-ml/ppx_tools-6.2
index 3e6da6fab22f..adef63360f66 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.2
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/6.2
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.2.tar.gz -> ppx_tools-6.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fd9f7fb102c2cee92e6610ce2c13ca4d
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
index f523d796cbc9..e307e94fa092 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=<dev-ml/ocaml-migrate-parsetree-2.0.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/5.4.0
 SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.4.0.tar.gz -> ppx_tools_versioned-5.4.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=9ffa83466e4c30131e889a92961c7041
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
deleted file mode 100644
index a28aa5a838f6..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Automatic generation of open recursion classes
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_traverse
-INHERIT=opam
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_traverse/archive/v0.9.0.tar.gz -> ppx_traverse-0.9.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=ea43b4900c7d52031ecc6dddcca7c011
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
deleted file mode 100644
index 0145e88c7f2f..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Builtins for ppx_traverse
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_traverse_builtins
-INHERIT=opam
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_traverse_builtins/archive/v0.9.0.tar.gz -> ppx_traverse_builtins-0.9.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=53f213a132b85b86d9c2c24544a9f989
diff --git a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
deleted file mode 100644
index 447143611af2..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=Support Library for type-driven code generators
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_type_conv
-INHERIT=opam
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_type_conv/archive/v0.9.0.tar.gz -> ppx_type_conv-0.9.0.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=afeb46c8e96915695f5d12fe37b59a9f
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
index 0dabc2c351d6..a4ea8bcd7836 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <=dev-ml/ppxlib-0.20.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f92b4a597061fabc24b7769f5171c4f9
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
index 055f9164aa4e..892f22ffd928 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=431c04d1d586abf2b136e41694b87bc0
diff --git a/metadata/md5-cache/dev-ml/ppxfind-1.4 b/metadata/md5-cache/dev-ml/ppxfind-1.4
index 09cea6c1e281..683da2a54981 100644
--- a/metadata/md5-cache/dev-ml/ppxfind-1.4
+++ b/metadata/md5-cache/dev-ml/ppxfind-1.4
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=<=dev-ml/ocaml-migrate-parsetree-1.80:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.4
 SRC_URI=https://github.com/diml/ppxfind/releases/download/1.4/ppxfind-1.4.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=4dc59cefd26db134a8cf705c9b6ab11e
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.18.0 b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
index ec8c80147aa2..f80f1e5a4947 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.18.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.18.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.18.0.tar.gz -> ppxlib-0.18.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=cf7971181747627baed68ac39b4759f8
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.20.0 b/metadata/md5-cache/dev-ml/ppxlib-0.20.0
index 3201e1e57716..bacad7b4050e 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.20.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.20.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.20.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.20.0.tar.gz -> ppxlib-0.20.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=a06b624961f69fb528aac4ec80362ec5
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r1
index b06a0c7732d7..cc6db71e146c 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r1
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.21.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.21.0.tar.gz -> ppxlib-0.21.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3a50695a76b959288f572d14ff7ff590
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r1
index f73a00139728..3707cedbf564 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r1
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2
 RESTRICT=!test? ( test )
 SLOT=0/0.22.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.0.tar.gz -> ppxlib-0.22.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=9c202b8cd28827ccb471ea7a52778523
diff --git a/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0 b/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
index 336eb08dda85..ec08aa801e32 100644
--- a/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
+++ b/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/protocol_version_header/archive/v0.14.0.tar.gz -> protocol_version_header-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=cbb0cb40d3ddf2da03697a5e55adf5d5
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.7 b/metadata/md5-cache/dev-ml/qcheck-0.7
deleted file mode 100644
index dbcd62814228..000000000000
--- a/metadata/md5-cache/dev-ml/qcheck-0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=QuickCheck inspired property-based testing for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/c-cube/qcheck/
-INHERIT=oasis
-IUSE=+ocamlopt debug doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/0.7
-SRC_URI=https://github.com/c-cube/qcheck/archive/0.7.tar.gz -> qcheck-0.7.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=1fe4c96a2688c948d5e98588dc192cc4
diff --git a/metadata/md5-cache/dev-ml/re-1.9.0 b/metadata/md5-cache/dev-ml/re-1.9.0
index fa95425918a2..fbf529b71b8b 100644
--- a/metadata/md5-cache/dev-ml/re-1.9.0
+++ b/metadata/md5-cache/dev-ml/re-1.9.0
@@ -12,5 +12,5 @@ RDEPEND=!dev-ml/ocaml-re dev-ml/seq:= >=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.9.0.tar.gz -> ocaml-re-1.9.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3e9bd73e8212ee5454440ed50c8b4821
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.1 b/metadata/md5-cache/dev-ml/re2-0.9.1
deleted file mode 100644
index a23dbe997b0a..000000000000
--- a/metadata/md5-cache/dev-ml/re2-0.9.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
-DESCRIPTION=OCaml bindings for RE2
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/re2
-INHERIT=opam
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/re2/archive/v0.9.1.tar.gz -> re2-0.9.1.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
-_md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1-r1 b/metadata/md5-cache/dev-ml/react-1.2.1-r1
index bbca9887c363..2999d4e3343c 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1-r1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1-r1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1
 SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=dbe1029e2b35b44298ec37b5261f8f29
diff --git a/metadata/md5-cache/dev-ml/reactiveData-0.2.1 b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
index 98164b2d10d2..855e8d3ab863 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-0.2.1
+++ b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/0.2.1
 SRC_URI=https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz -> reactiveData-0.2.1.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=1d4dfd3b44004e20724207b8a3e4a350
diff --git a/metadata/md5-cache/dev-ml/reactiveData-9999 b/metadata/md5-cache/dev-ml/reactiveData-9999
index fc0f8db068da..d49205b8f415 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-9999
+++ b/metadata/md5-cache/dev-ml/reactiveData-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 PROPERTIES=live
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/9999
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=1d4dfd3b44004e20724207b8a3e4a350
diff --git a/metadata/md5-cache/dev-ml/result-1.5 b/metadata/md5-cache/dev-ml/result-1.5
index 1f9f3469ce11..26b824ee5e3b 100644
--- a/metadata/md5-cache/dev-ml/result-1.5
+++ b/metadata/md5-cache/dev-ml/result-1.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/1.5
 SRC_URI=https://github.com/janestreet/result/archive/1.5.tar.gz -> result-1.5.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=1ca06e8fecb78cf4dc99b4440b38cf7e
diff --git a/metadata/md5-cache/dev-ml/rresult-0.5.0 b/metadata/md5-cache/dev-ml/rresult-0.5.0
index 796bdf13bdb2..145f21f0f97d 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.5.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.5.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.5.0
 SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=a9ddede575de757ac0c8b23dc94394cc
diff --git a/metadata/md5-cache/dev-ml/seq-0.2 b/metadata/md5-cache/dev-ml/seq-0.2
index a303fbf272d8..44940865c196 100644
--- a/metadata/md5-cache/dev-ml/seq-0.2
+++ b/metadata/md5-cache/dev-ml/seq-0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.2.tar.gz -> seq-0.2.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=ac63e83e51514cb2b0c9ff37a61ba861
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
index 8bc85d54bd36..54a3a9cc0657 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.14.0.tar.gz -> sexplib-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f39d6232fb3dba5ce9fd8d3261bdc6a9
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.14.0 b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
index 7bbfc09b33bb..789701d4a2c9 100644
--- a/metadata/md5-cache/dev-ml/sexplib0-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.14.0.tar.gz -> sexplib0-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3d2d8426bb3ab49bfe94ea200aacd4d3
diff --git a/metadata/md5-cache/dev-ml/spawn-0.13.0 b/metadata/md5-cache/dev-ml/spawn-0.13.0
index 833b7c20004b..a6d4691b2b51 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.13.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.13.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.13.0.tar.gz -> spawn-0.13.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=3c27b9b3c7836560a6ff542c0daaa41c
diff --git a/metadata/md5-cache/dev-ml/splittable_random-0.14.0 b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
index 4370b051451b..d40ef172620c 100644
--- a/metadata/md5-cache/dev-ml/splittable_random-0.14.0
+++ b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_message:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/splittable_random/archive/v0.14.0.tar.gz -> splittable_random-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b2a3629266290777bc8f7c5bd39cd6f5
diff --git a/metadata/md5-cache/dev-ml/stdio-0.14.0 b/metadata/md5-cache/dev-ml/stdio-0.14.0
index fdad8984fc31..c81c07220557 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.14.0
+++ b/metadata/md5-cache/dev-ml/stdio-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.14.0.tar.gz -> stdio-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fc87acd942b4d1b7023c6fd4f3c2e8b1
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
index 691bf86ae423..f9da8e4909f9 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.2.0/stdlib-shims-0.2.0.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=f47f8e58c5246327b29ef593436891f5
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
index 6a8084a466d4..14ab0b8e2de6 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b3a1f5ccf306e611aa6932b02014dae4
diff --git a/metadata/md5-cache/dev-ml/stringext-1.4.3 b/metadata/md5-cache/dev-ml/stringext-1.4.3
deleted file mode 100644
index 75c3c4c88cb2..000000000000
--- a/metadata/md5-cache/dev-ml/stringext-1.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4:= test? ( dev-ml/iTeML ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Extra string functions for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/rgrinberg/stringext
-INHERIT=oasis
-IUSE=+ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=!test? ( test )
-SLOT=0/1.4.3
-SRC_URI=https://github.com/rgrinberg/stringext/archive/v1.4.3.tar.gz -> stringext-1.4.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=f434d6b54ae69e829a986614210af2f9
diff --git a/metadata/md5-cache/dev-ml/textutils-0.14.0 b/metadata/md5-cache/dev-ml/textutils-0.14.0
index 0b86d609c4a0..e4b3a1a5467d 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.14.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.14.0.tar.gz -> textutils-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=d18121a704e280b59b196893341209d2
diff --git a/metadata/md5-cache/dev-ml/time_now-0.14.0 b/metadata/md5-cache/dev-ml/time_now-0.14.0
index 18aaa7f694e4..c57ef8bbefb4 100644
--- a/metadata/md5-cache/dev-ml/time_now-0.14.0
+++ b/metadata/md5-cache/dev-ml/time_now-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_base:= dev-ml/ppx_optcomp:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/time_now/archive/v0.14.0.tar.gz -> time_now-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=6780d7d8a0d3e403af5af3c845f0872e
diff --git a/metadata/md5-cache/dev-ml/timezone-0.14.0 b/metadata/md5-cache/dev-ml/timezone-0.14.0
index 5bf8c8abd2af..891afd3402cb 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.14.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.14.0
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/timezone/archive/v0.14.0.tar.gz -> timezone-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=57fdee2208259bf8f4c66f316bc12aa1
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.3 b/metadata/md5-cache/dev-ml/topkg-1.0.3
index b7443e992b3b..5b1648d69b58 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.3
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -3,10 +3,11 @@ DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=d
 DESCRIPTION=The transitory OCaml software packager
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
+INHERIT=findlib
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/1.0.3
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.3.tar.gz -> topkg-1.0.3.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=f264091b8557cfb0f823b38435c08b30
diff --git a/metadata/md5-cache/dev-ml/type-conv-113.00.02 b/metadata/md5-cache/dev-ml/type-conv-113.00.02
deleted file mode 100644
index 0c7120611ba9..000000000000
--- a/metadata/md5-cache/dev-ml/type-conv-113.00.02
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/camlp4:= >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Mini library required for some other preprocessing libraries
-EAPI=5
-HOMEPAGE=http://janestreet.github.io/
-INHERIT=oasis
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/113.00.02
-SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.00/files/type_conv-113.00.02.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=790ff2b2c3413f325b952c1f2733312b
diff --git a/metadata/md5-cache/dev-ml/typerep-0.14.0 b/metadata/md5-cache/dev-ml/typerep-0.14.0
index 7c5e80814fea..abc8c40ba844 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.14.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.14.0.tar.gz -> typerep-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=374bd75dfe307083945d4fa24aff443c
diff --git a/metadata/md5-cache/dev-ml/tyxml-4.2.0 b/metadata/md5-cache/dev-ml/tyxml-4.2.0
deleted file mode 100644
index 6317e7734ff8..000000000000
--- a/metadata/md5-cache/dev-ml/tyxml-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-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:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=A libary to build xml trees typechecked by OCaml
-EAPI=5
-HOMEPAGE=http://ocsigen.org/tyxml/
-INHERIT=oasis
-IUSE=+ppx +camlp4 +ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=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:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/4.2.0
-SRC_URI=https://github.com/ocsigen/tyxml/archive/4.2.0.tar.gz -> tyxml-4.2.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	findlib	3d3de4bef686774baeeabfa2b916631c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	f62592ba170464d52e9a05f584161347	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	base	a3f380d8a13f148f16d76fe39e90f451	oasis	6594737378e44ee268d90b74277915b6
-_md5_=68e4883d5becc394e2af8ed03386f51e
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 0a3ecda41080..5d44ed38099c 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.03:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
+INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.03:=
 RESTRICT=test
 SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=6b1a445737154f460460acfec1dad23d
diff --git a/metadata/md5-cache/dev-ml/unidecode-0.4.0 b/metadata/md5-cache/dev-ml/unidecode-0.4.0
index 97b3f6ec4bc2..9a7ae252482b 100644
--- a/metadata/md5-cache/dev-ml/unidecode-0.4.0
+++ b/metadata/md5-cache/dev-ml/unidecode-0.4.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/geneweb/unidecode/archive/v0.4.0.tar.gz -> unidecode-0.4.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=fe0c254a6c43769d0db47918ff517fb9
diff --git a/metadata/md5-cache/dev-ml/uucp-13.0.0-r2 b/metadata/md5-cache/dev-ml/uucp-13.0.0-r2
index 7cc89946bdb1..dc8d412a6d02 100644
--- a/metadata/md5-cache/dev-ml/uucp-13.0.0-r2
+++ b/metadata/md5-cache/dev-ml/uucp-13.0.0-r2
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/topkg dev-ml/findlib >=dev-lang/ocaml-4:=
 SLOT=0/13.0.0
 SRC_URI=https://erratique.ch/software/uucp/releases/uucp-13.0.0.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=4a27ceec805efbcff4b7cd52397326e9
diff --git a/metadata/md5-cache/dev-ml/uuidm-0.9.7 b/metadata/md5-cache/dev-ml/uuidm-0.9.7
index 2058c9f34396..629afefdc0cc 100644
--- a/metadata/md5-cache/dev-ml/uuidm-0.9.7
+++ b/metadata/md5-cache/dev-ml/uuidm-0.9.7
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.7
 SRC_URI=https://github.com/dbuenzli/uuidm/archive/v0.9.7.tar.gz -> uuidm-0.9.7.tar.gz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=83a079433e3c328ef50534db3197ce29
diff --git a/metadata/md5-cache/dev-ml/uunf-13.0.0 b/metadata/md5-cache/dev-ml/uunf-13.0.0
index b48856b124f7..7747b515c222 100644
--- a/metadata/md5-cache/dev-ml/uunf-13.0.0
+++ b/metadata/md5-cache/dev-ml/uunf-13.0.0
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/topkg dev-ml/uutf dev-ml/cmdliner >=dev-lang/ocaml-4:=
 SLOT=0/13.0.0
 SRC_URI=https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz
-_eclasses_=opam	b961a62d9389bc7b60bcadb0c851459b
+_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=09cf9731d7519c29ec45e0f9e07ee340
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index d2a10df5945f..e02d34ea8696 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdli
 DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/uutf
+INHERIT=findlib
 IUSE=doc utftrip +ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
@@ -11,5 +12,5 @@ REQUIRED_USE=utftrip? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
 _md5_=db92ee2473e729a944507f6306f3a339
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.14.0 b/metadata/md5-cache/dev-ml/variantslib-0.14.0
index 77e8d1dc3b4a..3f864742dc25 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.14.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.14.0.tar.gz -> variantslib-0.14.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=8cc69d261be9892a13c4c4c9f3066ac3
diff --git a/metadata/md5-cache/dev-ml/yojson-1.7.0 b/metadata/md5-cache/dev-ml/yojson-1.7.0
index d44866e6f9a0..271df0804ea9 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.7.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.7.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt=] dev-ml/easy-format:=[ocamlopt=] >=d
 RESTRICT=!test? ( test )
 SLOT=0/1.7.0
 SRC_URI=https://github.com/ocaml-community/yojson/archive/1.7.0.tar.gz -> yojson-1.7.0.tar.gz
-_eclasses_=dune	3cafc471b3e2c22dfa1c289440929c5b
+_eclasses_=dune	2d138ae1c0f7d4624876ad486529731f
 _md5_=b5ee693f8b0511151203aaff0757e6f9
diff --git a/metadata/md5-cache/dev-ml/zarith-1.11 b/metadata/md5-cache/dev-ml/zarith-1.11
index 876ad56242c9..0d2555f8f677 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.11
+++ b/metadata/md5-cache/dev-ml/zarith-1.11
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci
 DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/Zarith
+INHERIT=findlib toolchain-funcs
 IUSE=doc mpir +ocamlopt
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2.1-with-linking-exception
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sc
 RESTRICT=!ocamlopt? ( test )
 SLOT=0/1.11
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz -> zarith-1.11.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=6655366fb5950ec24ab1af21a7194873
diff --git a/metadata/md5-cache/dev-ml/zarith-1.12 b/metadata/md5-cache/dev-ml/zarith-1.12
index b107dfa47555..9bc430a2f718 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.12
+++ b/metadata/md5-cache/dev-ml/zarith-1.12
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci
 DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/Zarith
+INHERIT=findlib toolchain-funcs
 IUSE=doc mpir +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sc
 RESTRICT=!ocamlopt? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.12.tar.gz -> zarith-1.12.tar.gz
-_eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
 _md5_=721aec9f496964e4c3790ec2a9c1156e
author	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-04 06:20:52 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2021-04-04 06:20:52 +0000
commit	38710548376b93e8c9dd28709f3b752cba0ad581 (patch)
tree	329e37748ade3afe3ee898ebf240f9b1eeda6f37 /metadata/md5-cache/dev-ml
parent	Merge updates from master (diff)
download	gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.tar.gz gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.tar.bz2 gentoo-38710548376b93e8c9dd28709f3b752cba0ad581.zip