gentoo resync : 05.03.2021

31 files changed, 120 insertions, 50 deletions

diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 06a63de0091e..9776d6efef52 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/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index 2da3c31a3c53..613cc2d318bc 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=String type based on Bigarray, for use in I/O and C-bindings
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=72f5719a8e695917fc9f1fcc1642ec1c
+_md5_=9088394404339e376fe3ab878ccc8021
diff --git a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0 b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
new file mode 100644
index 000000000000..7070487b0e5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Compatibility library to use Stdlib.Bigarray when possible
+EAPI=7
+HOMEPAGE=https://github.com/mirage/bigarray-compat
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+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	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=ce6d5d9dccb2a19dc4320443beca2ee1
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 a24e5e352d5b..c6fb51d3760f 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -5,11 +5,11 @@ 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
+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?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=977881d2621a72947296d713f39e1c85
+_md5_=a87efeb24f55849f7ddd920169c01749
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 dffed48bbb76..7d302490009d 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Micro-benchmarking library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core_bench
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=701fc40ebc3d497c30f5003a5736173a
+_md5_=7db8727936041937b42e280b7e1eb2d5
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 cfb440cf955b..d7c275dc52d4 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
@@ -5,11 +5,11 @@ DESCRIPTION=System-independent part of Core
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/core_kernel
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/fieldslib:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_hash:= dev-ml/ppx_inline_test:= dev-ml/ppx_jane:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_message:= dev-ml/splittable_random:= dev-ml/sexplib:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/typerep:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=[ocamlopt?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4533042bb94411b336f114c323031c8b
+_md5_=d9b6d6485ba37c47e015205837479566
diff --git a/metadata/md5-cache/dev-ml/cstruct-5.2.0 b/metadata/md5-cache/dev-ml/cstruct-5.2.0
new file mode 100644
index 000000000000..abe71229f031
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cstruct-5.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/async_unix:= dev-ml/bigarray-compat:= >=dev-ml/ppx_tools_versioned-5.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Map OCaml arrays onto C-like structs
+EAPI=7
+HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+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	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=3aa3509542e95d6d1ee013daa642ae62
diff --git a/metadata/md5-cache/dev-ml/dune-2.8.2 b/metadata/md5-cache/dev-ml/dune-2.8.2
index e5211f387eea..0f929c8f0643 100644
--- a/metadata/md5-cache/dev-ml/dune-2.8.2
+++ b/metadata/md5-cache/dev-ml/dune-2.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08:= !dev-ml/jbuilder
 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_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=3569a2ac11427345099d95c6aa52f449
+_md5_=35c2d836517260f83c8dae3f06459618
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 02937fd110e0..549e42ce5ab7 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
@@ -5,11 +5,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=~dev-ml/dune-private-libs-2.8.2:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] dev-ml/result:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d4c17ae4fc6cdb632d8ea72b22c18315
+_md5_=e5316578a15c2735c90896b731a47c94
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 93c354009a7e..a628ca0735c4 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
@@ -5,11 +5,11 @@ DESCRIPTION=A composable build system for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4.09:= >=dev-lang/ocaml-4:=[ocamlopt?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=61ff23042c92c4fcb6bc92921ead4dfd
+_md5_=fd001019e28a15e9c426b16c9234a84c
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3 b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
new file mode 100644
index 000000000000..e4be4b059c06
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=GLib integration for Lwt
+EAPI=7
+HOMEPAGE=http://ocsigen.org/lwt_ssl
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~ppc
+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	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=2b3319efe437d18aa0459bfa8321b803
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.11 b/metadata/md5-cache/dev-ml/mccs-1.1.11
index cbf15984e44c..21deaf6c9e9c 100644
--- a/metadata/md5-cache/dev-ml/mccs-1.1.11
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.11
@@ -5,11 +5,11 @@ DESCRIPTION=Multi Criteria CUDF Solver
 EAPI=7
 HOMEPAGE=http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=BSD
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=a10861293b24806909f525bde4d8e0dc
+_md5_=3e4a322aa533fafe969b2a3fd8c63481
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index 1181f9786c4f..e7b79c1c8b1c 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -4,10 +4,10 @@ DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 IUSE=examples +ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+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
-_md5_=063d9cbbc219dc2d42fd2ff024c502eb
+_md5_=2ce66ec005bf1bd2cf7365cd26c263d7
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index 9d634f38beee..1ce84eb178b3 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -4,10 +4,10 @@ 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
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 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
-_md5_=263095f85f5a107e600e05cbe0afd4dd
+_md5_=6fe2ba867222055a849265661b01e452
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 b0aab2139193..ff67ae2f0acd 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A source-based package manager for OCaml
 EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=4a21900c38d24cd182f829e768d33f92
+_md5_=d5a7da8c6000af733856b1fe954a01d4
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 7bbe2f2f2ae4..23a53d701661 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=opam client libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=dfd4aafce63100ef3ea36369526ae3ec
+_md5_=bfe06d639a15a98226097868a11cff1a
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 a795aa7a9ca5..2f749cc4ab0d 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
@@ -4,10 +4,10 @@ DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=b21d10248a61dc49322da70ad2fa8c9f
+_md5_=d01fb717b29da66c209ebaa64e75d2a7
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 d4e08bc6f610..0196f7b923c3 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
@@ -5,10 +5,10 @@ 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
+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?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=d29d865490a15e835701425c66fafc59
+_md5_=92234b031fc1ee195e23100b0dae2380
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 8192a22c0e98..19c746e934d0 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
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.8 dev-m
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 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	b2f22dc6e8db7cf1649d72fd9ee5a986
-_md5_=72329a603faf9f87cbea9f87a8e9e273
+_md5_=e24a3dadb2b85232db5a560c3fa8537b
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 6b3f65ea9288..ac538ce76b89 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -5,11 +5,11 @@ 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
+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?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=7d8558d554d38027c40a6ce27aced137
+_md5_=0ae9ed580635f8bc0f6f3bf0812d2e18
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 9a8c79263526..209e82251d7a 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
@@ -5,11 +5,11 @@ DESCRIPTION=opam solver
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=0172c611893cb7af89a4a82dc33dcd7b
+_md5_=837225798860c2df980d49d7d9411be3
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 d9909ebd3b54..ec8562355d6f 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -5,11 +5,11 @@ 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
+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?]
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=2256b1d7c3a4d93c05cb1bf9ed89a26f
+_md5_=4609c95b4fcedc7ebf7f4043d0c2bb3b
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
index e6f6a5927790..4298c7ba75ad 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=S-expression parsing library
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/parsexp
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=9f8a0c12ebbe7e67b4cb8715aa9b952e
+_md5_=34dd0a07bb91839d8fc0e0639bc4c6f5
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
new file mode 100644
index 000000000000..f9741aeb1d3f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=<dev-ml/ocaml-migrate-parsetree-2.0.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Tools for authors of ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+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	46e13a2340ab32b2ad8ae98b653695ea
+_md5_=75eb0ed593abf6f283eb3b66143ba579
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
index 7cae650ff730..c912ae32432d 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expre
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/sexplib
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=cb37baa97d348f8b4e46f00095c66333
+_md5_=ee678e063d13a6131bf1d311f302c0ee
diff --git a/metadata/md5-cache/dev-ml/spawn-0.13.0 b/metadata/md5-cache/dev-ml/spawn-0.13.0
index cd327e87eb00..ed52e4453dc5 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.13.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.13.0
@@ -5,11 +5,11 @@ DESCRIPTION=Spawning sub-processes
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/spawn
 IUSE=ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=MIT
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=3a6c8be2c233de9d0d42bda8eacb03f7
+_md5_=3459558e0f5763f6306ee82f220f7a82
diff --git a/metadata/md5-cache/dev-ml/textutils-0.14.0 b/metadata/md5-cache/dev-ml/textutils-0.14.0
index 33d71d5037e3..3070799d3390 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.14.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Text output utilities
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/textutils
 IUSE=ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=9423667504217711e92183f0e5a287b2
+_md5_=d80705bd6949cd98ddf50aaadfb408b4
diff --git a/metadata/md5-cache/dev-ml/timezone-0.14.0 b/metadata/md5-cache/dev-ml/timezone-0.14.0
index 824139993989..41c14a44240f 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.14.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.14.0
@@ -5,10 +5,10 @@ DESCRIPTION=Time-zone handling for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/janestreet/timezone
 IUSE=ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 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	46e13a2340ab32b2ad8ae98b653695ea
-_md5_=0dd959ec5ec8e521e8f9e61c10ad99d9
+_md5_=26f5d540284120a949e3cc330609dd9a
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 5798a45273a3..95285ee5ae9a 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 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
-_md5_=f26c798b5a1a8b086c262e89d366814e
+_md5_=7e81bdd830750043efe950aef3bd5a74
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index c9cb771887b2..d0bae782a179 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/uutf
 IUSE=doc utftrip +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
 REQUIRED_USE=utftrip? ( ocamlopt )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	3d3de4bef686774baeeabfa2b916631c
-_md5_=2bdecdca439208c63b3429dfa4a480a9
+_md5_=cbd7a7d949e4aa2c76bc3c11e6a27397
diff --git a/metadata/md5-cache/dev-ml/zarith-1.12 b/metadata/md5-cache/dev-ml/zarith-1.12
new file mode 100644
index 000000000000..b107dfa47555
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/zarith-1.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= ) dev-lang/perl >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/Zarith
+IUSE=doc mpir +ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= )
+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
+_md5_=721aec9f496964e4c3790ec2a9c1156e