gentoo resync : 01.10.2021

29 files changed, 68 insertions, 81 deletions

diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 4012e64c7331..0979c2156c0a 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
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 e5691e5ba148..73ec4f290545 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] d
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=65b38a4798f76dcd42a2ff97c6586035
+_md5_=c08a6f66c1cb34af1e4b366143359962
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 8aa5eb27ec58..3d7183e8ba4c 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/async_kernel:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=a78f977b7dfcd26f442878a6291e9a6b
+_md5_=95df6408b5466cadc51f4e19df6d44fa
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
index 0bda6999dfa5..ae9ecc2519a4 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.0
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 >=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Standard library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 >=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=6128f07880b62ac1e51d68afcb723ca8
+_md5_=dc5c1395c4367c14c64b09bf385617da
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 f54b2cb7f2d5..ecd010e61d18 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=2e0ab8acde9a464b624508e79902d39a
+_md5_=3d54637cd0895fea6c71f8af200dce93
diff --git a/metadata/md5-cache/dev-ml/core-0.14.1 b/metadata/md5-cache/dev-ml/core-0.14.1
new file mode 100644
index 000000000000..1c7c61145e51
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/core-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Jane Street's alternative to the standard library
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/core
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/timezone:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/core/archive/v0.14.1.tar.gz -> core-0.14.1.tar.gz
+_eclasses_=dune	eefe841059d4f6d649fc9a121683e311
+_md5_=c2d04fb645fb2a67802ef4f47ce6ba55
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 cebf14e12e18..152dc1c1648b 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-ml/core-0.14.0:= >=dev-ml/core_kernel-0.14.0:= >=dev-ml/ppx_jane-0
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=9b6a44dc871f8a8690a1709df31b4bc0
+_md5_=b43302ab3a79c5eb501fda923edbfc10
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index fc0425929d7e..acb09e293f33 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
 _eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
-_md5_=bd18ffcba3e130203c43457c322db736
+_md5_=8b8dd673ab86d68019d02cfd5f978cb7
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0
new file mode 100644
index 000000000000..89944e8493a3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[llvm_targets_VE] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0[llvm_targets_VE] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/13.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=99d7824b767bb182e30becd6720c7749
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2
deleted file mode 100644
index 106157cc74cb..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_VE] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc2[llvm_targets_VE] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
-RESTRICT=!test? ( test )
-SLOT=0/13.0.0_rc2
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc2.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3
deleted file mode 100644
index 16e240259d9f..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_VE] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc3:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc3[llvm_targets_VE] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
-RESTRICT=!test? ( test )
-SLOT=0/13.0.0_rc3
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc3.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4 b/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4
deleted file mode 100644
index 8b3738721fad..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-13.0.0_rc4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 test? ( dev-ml/ounit2 ) || ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_VE] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-13.0.0_rc4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_SystemZ] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_M68k] ) llvm_targets_VE? ( ~sys-devel/llvm-13.0.0_rc4[llvm_targets_VE] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k llvm_targets_VE )
-RESTRICT=!test? ( test )
-SLOT=0/13.0.0_rc4
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.0-rc4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	llvm	19c0cdeff39b0e08d1454df31b588316	llvm.org	21b9255c65ab2859fc1af2242a432103	multilib	4b66d835ec72e021e359bb81eacfe988	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	655fe65f186504e455c2f3116808fda8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=bcf35ead1fae88c5ea2ce230978e3763
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 525d73a11a64..38bd7a3e50b4 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=ffd2eb61f120553d5b477a671eca0f5d
+_md5_=34b6c89dc9788dfd601a3cf14ab2e311
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r2 b/metadata/md5-cache/dev-ml/merlin-4.1-r2
index 2168b9310046..523e85b80eda 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.1-r2
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r2
@@ -1,14 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
-IUSE=emacs +ocamlopt
+IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
 SLOT=0/4.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311	elisp-common	cf4fd1b0835b9f3e638724840468064a
-_md5_=42650b7fa356be02227e94302017646e
+_md5_=bfa96ef2a29c4ff4e8ce6325f58e3699
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 bb019ab94cb8..7fd32ccf2603 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
@@ -1,14 +1,14 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= dev-ml/cppo >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 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?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=e5014d9e9429ede0929734664e1addea
+_md5_=cec5825c634b44d4cf837278cba43823
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
index ae9bf6d27a8d..b632df2235c7 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
@@ -11,4 +11,4 @@ RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=ee08593fce3c6ed9455f9ad6b6727f58
+_md5_=93176cbb44dd7e787659288919518340
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.9 b/metadata/md5-cache/dev-ml/opam-format-2.0.9
index 5fa45dde59d1..19964123be51 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.9
@@ -11,4 +11,4 @@ RDEPEND=~dev-ml/opam-core-2.0.9:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=ee08593fce3c6ed9455f9ad6b6727f58
+_md5_=93176cbb44dd7e787659288919518340
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 c4cd12a05dd8..26396f59302e 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=b88efcf4100ed5d8d94152d1b13b87b5
+_md5_=301d3671640350b85f9b8bb0c2a475fa
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
index 6021fd9f4156..f4b765089a71 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
@@ -12,4 +12,4 @@ 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	eefe841059d4f6d649fc9a121683e311
-_md5_=76585f94f8da84e5871145c067c6e4cd
+_md5_=c924724823e0770d06c104da6176e10a
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.9 b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
index 8c524e72b4d6..246affd16d02 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=76585f94f8da84e5871145c067c6e4cd
+_md5_=c924724823e0770d06c104da6176e10a
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
index 03580651acdb..ae491e7f1d8b 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
@@ -12,4 +12,4 @@ 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	eefe841059d4f6d649fc9a121683e311
-_md5_=081a9f2af39a1b60e3fb03eb6cbb370e
+_md5_=7fef03536387efc3c158722f7a354eb8
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.9 b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
index 1b2301ce288c..9b88c71f966e 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=081a9f2af39a1b60e3fb03eb6cbb370e
+_md5_=7fef03536387efc3c158722f7a354eb8
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 78556de165b7..cf0f6ecaa315 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -1,15 +1,15 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-lang/ocaml-4.12 dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-lang/ocaml-4.12 dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=6d360d2c249e0367bca6f14d4ebebee7
+_md5_=7499169612c073ee21e16029df4c3a2b
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
index 1b1618fdb298..950b0051d3f7 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
@@ -12,4 +12,4 @@ 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	eefe841059d4f6d649fc9a121683e311
-_md5_=2a491625c05b35c106fda78889172612
+_md5_=cc1638f368982f85d7769fec9e549f23
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.9 b/metadata/md5-cache/dev-ml/opam-state-2.0.9
index 514f2c7cbce5..79cc5ca3ac5a 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.9
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=2a491625c05b35c106fda78889172612
+_md5_=cc1638f368982f85d7769fec9e549f23
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.1 b/metadata/md5-cache/dev-ml/parmap-1.2.1
index c4bcf29f7703..c20c88e6237c 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.1
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-m
 SLOT=0/1.2.1
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.1.tar.gz -> parmap-1.2.1.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=7a4a9adfd367aee2ff7fd50edd87b7ab
+_md5_=9ec91fa22a232f000f27ec433dc9f765
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.3 b/metadata/md5-cache/dev-ml/parmap-1.2.3
index 3015bef2bf3d..49748999edae 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.3
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.3
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-m
 SLOT=0/1.2.3
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.3.tar.gz -> parmap-1.2.3.tar.gz
 _eclasses_=dune	eefe841059d4f6d649fc9a121683e311
-_md5_=84ed9018d91e515c4a0f1b624d330e0a
+_md5_=6bd8bc896e937529c79b87dcb6baadc2
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 b5d7b7933248..e6facd42ed6a 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.14.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=f1f5c00286b366bd86a6b4ef500a1362
+_md5_=037defe92e24269b09c45b92f24b5601
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 1eb3070454e0..9aaaba89c361 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev
 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	eefe841059d4f6d649fc9a121683e311
-_md5_=65accfdb7b16140f146ebe74444f0986
+_md5_=591a2d86252872948d9eeca4182d4b00