2017-09-22 09:02:50 UTC

50 files changed, 172 insertions, 321 deletions

diff --git a/metadata/md5-cache/dev-ml/angstrom-0.5.1 b/metadata/md5-cache/dev-ml/angstrom-0.5.1
deleted file mode 100644
index 1d6f74e2c1d2..000000000000
--- a/metadata/md5-cache/dev-ml/angstrom-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:= lwt? ( dev-ml/lwt:= ) async? ( dev-ml/async:= ) test? ( dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=5
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-IUSE=+lwt async +ocamlopt debug test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:= lwt? ( dev-ml/lwt:= ) async? ( dev-ml/async:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=test
-SLOT=0/0.5.1
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.5.1.tar.gz -> angstrom-0.5.1.tar.gz
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f50e252443a8bbb011ccdcaeb46f9d0f
diff --git a/metadata/md5-cache/dev-ml/angstrom-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-0.6.0
deleted file mode 100644
index 3871f879dfa6..000000000000
--- a/metadata/md5-cache/dev-ml/angstrom-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-cstruct:= dev-ml/ocplib-endian:= dev-ml/result:=
-RESTRICT=test
-SLOT=0/0.6.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a4d3e46062552a0c9db35476ca673f9a
diff --git a/metadata/md5-cache/dev-ml/angstrom-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-0.7.0
new file mode 100644
index 000000000000..1d6b6df4babb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/result:= dev-ml/jbuilder test? ( dev-ml/alcotest ) >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
+SLOT=0/0.7.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=cc2f65c3654d5c5d63ce38283906b580
diff --git a/metadata/md5-cache/dev-ml/angstrom-async-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-async-0.6.0
deleted file mode 100644
index ee72f2e236c9..000000000000
--- a/metadata/md5-cache/dev-ml/angstrom-async-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:=
-SLOT=0/0.6.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=11c86db67f6f5171b0f414d08a5a85ea
diff --git a/metadata/md5-cache/dev-ml/angstrom-async-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-async-0.7.0
new file mode 100644
index 000000000000..7b6b8fa63429
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-async-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/async:= >=dev-lang/ocaml-4:=
+SLOT=0/0.7.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=c31cc3a45efe5ae7c15de2a9c45b4ef3
diff --git a/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0
deleted file mode 100644
index fb002fc11d7a..000000000000
--- a/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:=
-SLOT=0/0.6.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=599d9028d0d6f88cb399f284140ed8f3
diff --git a/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.7.0
new file mode 100644
index 000000000000..50b107731a13
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/lwt:= >=dev-lang/ocaml-4:=
+SLOT=0/0.7.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=9d325b187990d05de59b857244d165c5
diff --git a/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0 b/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0
deleted file mode 100644
index f8d8e9a2dbbd..000000000000
--- a/metadata/md5-cache/dev-ml/angstrom-unix-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/angstrom:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Parser combinators built for speed and memory efficiency
-EAPI=6
-HOMEPAGE=https://github.com/inhabitedtype/angstrom
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/angstrom:=
-SLOT=0/0.6.0
-SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.6.0.tar.gz -> angstrom-0.6.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=6774f791d56a6d129a957e82821625ad
diff --git a/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0
new file mode 100644
index 000000000000..11ab4a7e1aae
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/angstrom:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Parser combinators built for speed and memory efficiency
+EAPI=6
+HOMEPAGE=https://github.com/inhabitedtype/angstrom
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ml/angstrom:= >=dev-lang/ocaml-4:=
+SLOT=0/0.7.0
+SRC_URI=https://github.com/inhabitedtype/angstrom/archive/0.7.0.tar.gz -> angstrom-0.7.0.tar.gz
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=3836476be7b69ee263ba3237e62e0f9e
diff --git a/metadata/md5-cache/dev-ml/astring-0.8.3 b/metadata/md5-cache/dev-ml/astring-0.8.3
index 8c6ff79244f8..66a57471ce96 100644
--- a/metadata/md5-cache/dev-ml/astring-0.8.3
+++ b/metadata/md5-cache/dev-ml/astring-0.8.3
@@ -1,11 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Alternative String module for OCaml
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/astring https://github.com/dbuenzli/astring
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt]
+RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/0.8.3
 SRC_URI=http://erratique.ch/software/astring/releases/astring-0.8.3.tbz
-_md5_=5d1eaf5998db0f367f71525d343c813d
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=bf19617785588138c4b41ef0b8bb0499
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.2 b/metadata/md5-cache/dev-ml/fmt-0.8.2
deleted file mode 100644
index 29bf293eee13..000000000000
--- a/metadata/md5-cache/dev-ml/fmt-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] dev-ml/opam >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt]
-SLOT=0/0.8.2
-SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=123300be08077244b70794e4df328f0d
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.3 b/metadata/md5-cache/dev-ml/fmt-0.8.3
deleted file mode 100644
index 349ae7413fb9..000000000000
--- a/metadata/md5-cache/dev-ml/fmt-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] dev-ml/opam >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt]
-SLOT=0/0.8.3
-SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.3.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=123300be08077244b70794e4df328f0d
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
index 63a740622e21..a58926d993f4 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] dev-ml/opam >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt]
+RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/0.8.4
 SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=123300be08077244b70794e4df328f0d
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=3fa32445820b291255570863e7370f5f
diff --git a/metadata/md5-cache/dev-ml/lambda-term-1.11 b/metadata/md5-cache/dev-ml/lambda-term-1.11
index 11ccd3ad6bfd..be0e567115d1 100644
--- a/metadata/md5-cache/dev-ml/lambda-term-1.11
+++ b/metadata/md5-cache/dev-ml/lambda-term-1.11
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/lwt_react:= >=dev-ml/lwt-2.4.0:= >=dev-ml/zed-1.2:= >=dev-ml/react-1.2:= dev-ml/jbuilder dev-ml/opam
+DEPEND=dev-ml/lwt_react:= >=dev-ml/lwt-2.4.0:= >=dev-ml/zed-1.2:= >=dev-ml/react-1.2:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=A cross-platform library for manipulating the terminal
 EAPI=6
 HOMEPAGE=https://github.com/diml/lambda-term
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/lwt_react:= >=dev-ml/lwt-2.4.0:= >=dev-ml/zed-1.2:= >=dev-ml/react-1.2:=
+RDEPEND=dev-ml/lwt_react:= >=dev-ml/lwt-2.4.0:= >=dev-ml/zed-1.2:= >=dev-ml/react-1.2:= >=dev-lang/ocaml-4:=
 SLOT=0/1.11
 SRC_URI=https://github.com/diml/lambda-term/archive/1.11.tar.gz -> lambda-term-1.11.tar.gz
-_md5_=e037ba17e84061e65a9eec64bf8c5fcf
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=76322c6e5fe7ed17b151542c87c7d98f
diff --git a/metadata/md5-cache/dev-ml/mtime-0.8.4 b/metadata/md5-cache/dev-ml/mtime-0.8.4
deleted file mode 100644
index 7a32c0f36af5..000000000000
--- a/metadata/md5-cache/dev-ml/mtime-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib
-DESCRIPTION=OCaml module to access monotonic wall-clock time
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
-IUSE=javascript test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= )
-SLOT=0/0.8.4
-SRC_URI=http://erratique.ch/software/mtime/releases/mtime-0.8.4.tbz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=410e7d8b6a4acec8a68a86a5c9916b6b
diff --git a/metadata/md5-cache/dev-ml/mtime-1.0.0 b/metadata/md5-cache/dev-ml/mtime-1.0.0
deleted file mode 100644
index db51ba05e3b9..000000000000
--- a/metadata/md5-cache/dev-ml/mtime-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib
-DESCRIPTION=OCaml module to access monotonic wall-clock time
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
-IUSE=javascript test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= )
-SLOT=0/1.0.0
-SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.0.0.tbz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cd6344b0ee9bd9d468c6ac17d14b720d
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index 39c353a999a3..d654587a067c 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/opam dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib
+DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=OCaml module to access monotonic wall-clock time
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
 IUSE=javascript test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= )
+RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-lang/ocaml-4:=
 SLOT=0/1.1.0
 SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cd6344b0ee9bd9d468c6ac17d14b720d
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	opam	24b4a2529c1fd12f1304856d6c5a690d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=24e3ec0e91fa8a013f4e7d8dde5223a6
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-2.0.0 b/metadata/md5-cache/dev-ml/ocaml-base64-2.0.0
deleted file mode 100644
index 5b98999e62ce..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-base64-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Library for radix-64 representation (de)coding
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-base64
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.0.0
-SRC_URI=https://github.com/mirage/ocaml-base64/archive/v2.0.0.tar.gz -> ocaml-base64-2.0.0.tar.gz
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5060781baa9fc591c6cbc8eaa2c58917
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0 b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
index a07c5ce69fdb..4d7a94213b76 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-4.02:= dev-ml/jbuilder dev-ml/opam test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-ml/jbuilder test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Library for radix-64 representation (de)coding
 EAPI=6
 HOMEPAGE=https://github.com/mirage/ocaml-base64
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4.02:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/2.2.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v2.2.0.tar.gz -> ocaml-base64-2.2.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=d941370fd406e53aab553b5ad43eb78a
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=9232f5a16cae33937ada6cc94028e909
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
index 9e741244b914..9fffcf2e2247 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.9.0.tar.gz -> ocaml-compiler-libs-0.9.0.tar.gz
-_md5_=fb54ec024b8169cc59766ead04d73f76
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=71682a5e3a28fb0b2b096f94d678b639
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.1 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.1
deleted file mode 100644
index 473356e272d0..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) async? ( dev-ml/async:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-IUSE=async +lwt +ppx test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=async? ( dev-ml/async:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:=
-SLOT=0/3.0.1
-SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.0.1.tar.gz -> ocaml-cstruct-3.0.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=928ebc97ead002100d355f4110b23846
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.2 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.2
deleted file mode 100644
index 473363798659..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) 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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:=
-SLOT=0/3.0.2
-SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.0.2.tar.gz -> ocaml-cstruct-3.0.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=2c51e8cb45d5b8d80a3fe0fce96b749a
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.0 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.0
deleted file mode 100644
index cec01844fb38..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder dev-ml/opam test? ( dev-ml/ounit ) 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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Map OCaml arrays onto C-like structs
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:=
-SLOT=0/3.1.0
-SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.0.tar.gz -> ocaml-cstruct-3.1.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=2c51e8cb45d5b8d80a3fe0fce96b749a
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
index 4bf51bb1b003..7d0f28249ec9 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder dev-ml/opam 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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1
+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
 DESCRIPTION=Map OCaml arrays onto C-like structs
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
 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-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:=
+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:=
 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	45d6030075064a68da8d7143726a1150
-_md5_=fcba7383ec74a24fb4a61ed5d0f6ef98
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=60a5b9226fb3932386dc49b611ae6b0a
diff --git a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0 b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
index a8ed2dcf9084..90ec705001b1 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
@@ -1,12 +1,13 @@
 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/opam dev-ml/findlib test? ( dev-ml/ounit )
+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
 DESCRIPTION=OCaml library for manipulation of IP (and MAC) address representations
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-ipaddr
 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?]
+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:=
 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
-_md5_=dc69428157e8cfaeaa146b60e8cec12b
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=47b583b39ce07bc7e5cee44984a9660c
diff --git a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4 b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
index 5d9652b8fac1..f2fa8976f656 100644
--- a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
+++ b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-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:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-ml/ocaml-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
 DESCRIPTION=RFC3986 URI parsing library for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-uri https://mirage.io
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-ml/ocaml-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:=
+RDEPEND=dev-ml/ocaml-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:=
 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	45d6030075064a68da8d7143726a1150
-_md5_=ea67b97826d72aff00b2f2023b3062d0
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=936dee0ca12d3dd49a70c83a83827df3
diff --git a/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0 b/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0
index 735c386d49e6..455f7e650186 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=User interface widgets for Ocsigen applications
 EAPI=6
 HOMEPAGE=https://github.com/ocsigen/ocsigen-toolkit
 IUSE=+ocamlopt debug
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:=
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.0
 SRC_URI=https://github.com/ocsigen/ocsigen-toolkit/archive/1.0.0.tar.gz -> ocsigen-toolkit-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=c47898cf48ea4d670c398655bb6bb58e
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999 b/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
index ae4176b1cf2c..edf48b94de10 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
+++ b/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= dev-ml/opam >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam >=dev-vcs/git-1.8.2.1
 DESCRIPTION=User interface widgets for Ocsigen applications
 EAPI=6
 HOMEPAGE=https://github.com/ocsigen/ocsigen-toolkit
 IUSE=+ocamlopt debug
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:=
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] >dev-ml/js_of_ocaml-2.7:= >=dev-ml/eliom-5.1:=[ppx] dev-ml/ppx_deriving:= dev-ml/calendar:= dev-ml/lwt:= >=dev-lang/ocaml-4:=
 SLOT=0/9999
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	git-r3	52a888802d25387c2c74cb845d1219bc
-_md5_=c47898cf48ea4d670c398655bb6bb58e
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	git-r3	52a888802d25387c2c74cb845d1219bc	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/metadata/md5-cache/dev-ml/octavius-0.2.0 b/metadata/md5-cache/dev-ml/octavius-0.2.0
deleted file mode 100644
index bf57f503d8b6..000000000000
--- a/metadata/md5-cache/dev-ml/octavius-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:= dev-ml/topkg dev-ml/opam dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=ocamldoc comment syntax parser
-EAPI=6
-HOMEPAGE=https://github.com/ocaml-doc/octavius
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/0.2.0
-SRC_URI=https://github.com/ocaml-doc/octavius/archive/v0.2.0.tar.gz -> octavius-0.2.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=471e5e190acfebda39886bee66b55ea9
diff --git a/metadata/md5-cache/dev-ml/octavius-1.1.0 b/metadata/md5-cache/dev-ml/octavius-1.1.0
index 13657de4538a..50d41ab72ea3 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.1.0
+++ b/metadata/md5-cache/dev-ml/octavius-1.1.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/jbuilder dev-ml/opam dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-ml/jbuilder dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=ocamldoc comment syntax parser
 EAPI=6
 HOMEPAGE=https://github.com/ocaml-doc/octavius
 KEYWORDS=~amd64 ~ppc
 LICENSE=ISC
-RDEPEND=dev-lang/ocaml:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.1.0.tar.gz -> octavius-1.1.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=9ff857a9727661fb1e43535d2bb39563
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=7e580a7f262ac28d1e85e67a5392040f
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.9.0 b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
index 9dd7541cbc77..05dad246f1b7 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.9.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+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
 DESCRIPTION=Tool and library implementing patience diff
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/patience_diff
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
+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.0
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.9.0.tar.gz -> patience_diff-0.9.0.tar.gz
-_md5_=568ef1839b58aa550f383425536297ce
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=1f9504b537b5f20dc0cb4c5e1ecbc963
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.9.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
index 3ffe9cd740ca..b326291f187e 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_assert
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.9.0.tar.gz -> ppx_assert-0.9.0.tar.gz
-_md5_=79c7253dc599c4e95ccc7e20290393b0
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=0b7b46991c8396fb9131499d74e1d319
diff --git a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1 b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
index 8672f1c0eb98..508cd26dcde3 100644
--- a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=AST used in Jane Street ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_ast
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:=
+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
-_md5_=b721a461778d3f98eddaf1604b6a4281
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=e35f3188a2d7715800e03095fbec913b
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.9.0 b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
index 0860ae266c32..a194d6343643 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Base set of ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_base
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= 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_base/archive/v0.9.0.tar.gz -> ppx_base-0.9.0.tar.gz
-_md5_=b992269df7d021958a1b17bdca18149d
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=64ff34d877d7aba65a0aa88bb9b692f5
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.9.0 b/metadata/md5-cache/dev-ml/ppx_bench-0.9.0
deleted file mode 100644
index 9bc620c5c8b1..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_bench
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.9.0.tar.gz -> ppx_bench-0.9.0.tar.gz
-_md5_=c20cfaa1d837f24871f6ecae02fa42fb
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.9.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
index 2e591e22c37d..b8106693e8f7 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_bench
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.9.1.tar.gz -> ppx_bench-0.9.1.tar.gz
-_md5_=c20cfaa1d837f24871f6ecae02fa42fb
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=d32aca086ea3a8eb8da9ba91a7502155
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
index 4fd910dd0fdd..406edd8fa36c 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Generation of bin_prot readers and writers from types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= 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_bin_prot/archive/v0.9.0.tar.gz -> ppx_bin_prot-0.9.0.tar.gz
-_md5_=cecd02c2678c72a58eb86d8e07e17c52
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=ab5c3768ecdd8c3acd769013aa10380e
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
index 90050e788df2..ec8b46491284 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Generation of comparison functions from types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_compare
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:=
+RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.9.0.tar.gz -> ppx_compare-0.9.0.tar.gz
-_md5_=eeda9adb28573767a2fd8c354a38a1fd
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=231d0511af0912b2f46d11a629a7678b
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
index 0dac7b9415d2..a2fa7f5d00a8 100644
--- a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= 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/opam dev-ml/jbuilder
+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
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_core
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=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
-_md5_=b8c95f9746418621e25d852e173d81a4
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=7a43cc34ad34baa7f4d4d33feb8c0c4d
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
index 287ea96de725..623e8d29cb8b 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Printf-style format-strings for user-defined string conversion
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.9.0.tar.gz -> ppx_custom_printf-0.9.0.tar.gz
-_md5_=f86b922e84128e72d3fdd374ba430149
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=1e7b4d1bba9283bd7d0922c3ff71f77f
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.1-r1 b/metadata/md5-cache/dev-ml/ppx_deriving-4.1-r1
deleted file mode 100644
index b04159f841a7..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/ppx_tools:= >=dev-lang/ocaml-4.02.3:=[ocamlopt?] dev-ml/cppo dev-ml/opam test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Type-driven code generation for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/whitequark/ppx_deriving
-IUSE=doc +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-ml/ppx_tools:= >=dev-lang/ocaml-4.02.3:=[ocamlopt?]
-SLOT=0/4.1
-SRC_URI=https://github.com/whitequark/ppx_deriving/archive/v4.1.tar.gz -> ppx_deriving-4.1.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c7fe64475aa37777b88b12568e16f36b
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0 b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
index 9b5aa3edfed2..79448476917e 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
+++ b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= dev-ml/findlib dev-ml/ocamlbuild test? ( dev-ml/ounit dev-ml/ppx_import )
+DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= dev-ml/findlib dev-ml/ocamlbuild test? ( dev-ml/ounit dev-ml/ppx_import ) >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=A Yojson codec generator for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/whitequark/ppx_deriving_yojson/
 IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:=
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/yojson:= dev-ml/result:= >=dev-ml/ppx_deriving-4:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
 SLOT=0/3.0
 SRC_URI=https://github.com/whitequark/ppx_deriving_yojson/archive/v3.0.tar.gz -> ppx_deriving_yojson-3.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=79b20b98e88b582e2edb470a571783a1
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	opam	24b4a2529c1fd12f1304856d6c5a690d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=c5badd88606f9b236df7f0b20af8b626
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.0 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.0
deleted file mode 100644
index fbec3bd91822..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Feature-full driver for OCaml AST transformers
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/ppx_driver
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:=
-SLOT=0/0.9.0
-SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.0.tar.gz -> ppx_driver-0.9.0.tar.gz
-_md5_=4226ccbe98ee82cfa37c83d7e30a00c6
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1
index 7b2168e0ae8f..f9c53a66a7b0 100644
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Feature-full driver for OCaml AST transformers
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_driver
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:=
+RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.1.tar.gz -> ppx_driver-0.9.1.tar.gz
-_md5_=bceba8a92c3d66ed2997a2d7a8e0a767
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=974f60ad6c0233cab701317d4f7ef030
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
index f09908ca151e..41302d89d684 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+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
 DESCRIPTION=Generate a list containing all values of a finite type
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_enumerate
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:=
+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_enumerate/archive/v0.9.0.tar.gz -> ppx_enumerate-0.9.0.tar.gz
-_md5_=2eb73f93b0ceb2c4240a5df3dc050498
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=ee3abdd66abd44cb6e863ee39149a899
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.9.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
index 879f388a812a..58523b16e4a0 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Cram like framework for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_expect
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:=
+RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.9.0.tar.gz -> ppx_expect-0.9.0.tar.gz
-_md5_=71a96e4fb9fff71c2d3bfd821c278117
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=de04ea3737696aa4d6ce8eacba8c8d99
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.9.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
index 90b6e30fb620..e38adcf93f48 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Add location to calls to failwiths
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_fail
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.9.0.tar.gz -> ppx_fail-0.9.0.tar.gz
-_md5_=a7638b938c69b54d2492eeebdf233ec6
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=a68b871d171c9d63f11e06827910681e
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
index 3571b39e82e4..8e61e6b3e714 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
@@ -1,11 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Generation of accessor and iteration functions for ocaml records
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:=
+RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.9.0.tar.gz -> ppx_fields_conv-0.9.0.tar.gz
-_md5_=0e963c8133cd4797e2aad007ae0ee29f
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=553274bc3d71f529cb5de9b8bcd16d7b
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f00149cacccc..de029dfb5962 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5195,10 +5195,10 @@ dev-lua/toluapp 1.0.93: A tool to integrate C/C++ code with Lua
 dev-ml/ANSITerminal 0.6.5 0.7: Module which offers basic control of ANSI compliant terminals
 dev-ml/OCaml-ImageMagick 0.34-r1: Provide the ImageMagick methods to OCaml
 dev-ml/alcotest 0.8.1 0.8.2: A lightweight and colourful test framework
-dev-ml/angstrom 0.5.1 0.6.0: Parser combinators built for speed and memory efficiency
-dev-ml/angstrom-async 0.6.0: Parser combinators built for speed and memory efficiency
-dev-ml/angstrom-lwt-unix 0.6.0: Parser combinators built for speed and memory efficiency
-dev-ml/angstrom-unix 0.6.0: Parser combinators built for speed and memory efficiency
+dev-ml/angstrom 0.7.0: Parser combinators built for speed and memory efficiency
+dev-ml/angstrom-async 0.7.0: Parser combinators built for speed and memory efficiency
+dev-ml/angstrom-lwt-unix 0.7.0: Parser combinators built for speed and memory efficiency
+dev-ml/angstrom-unix 0.7.0: Parser combinators built for speed and memory efficiency
 dev-ml/astring 0.8.3: Alternative String module for OCaml
 dev-ml/async 0.9.0: Jane Street Capital's asynchronous execution library
 dev-ml/async_extra 0.9.0: Jane Street Capital's asynchronous execution library (extra)
@@ -5253,7 +5253,7 @@ dev-ml/facile 1.1.2 1.1.3: OCaml constraint programming library on integer & int
 dev-ml/fieldslib 0.9.0: Folding over record fields
 dev-ml/findlib 1.7.1 1.7.2 1.7.3: OCaml tool to find/use non-standard packages
 dev-ml/flow_parser 0.50.0 0.51.0 0.52.0: JavaScript parser written in OCaml
-dev-ml/fmt 0.8.2 0.8.3 0.8.4: Combinators to devise OCaml Format pretty-printing functions
+dev-ml/fmt 0.8.4: Combinators to devise OCaml Format pretty-printing functions
 dev-ml/fort 0.4.2: provides an environment for testing programs and Objective Caml modules
 dev-ml/fpath 0.7.2: File system paths for OCaml
 dev-ml/gd4o 1.0_alpha5: OCaml interface to the GD graphics library
@@ -5290,18 +5290,18 @@ dev-ml/merlin 2.5.3 2.5.4 2.5.5 3.0.0 3.0.1 3.0.2: Context sensitive completion
 dev-ml/merlin-extend 0.3: SDK to extend Merlin
 dev-ml/mirage-profile 0.7.0-r1: Collect profiling information
 dev-ml/mongo 0.67.2: An ocaml driver for mongodb
-dev-ml/mtime 0.8.4 1.0.0 1.1.0: OCaml module to access monotonic wall-clock time
+dev-ml/mtime 1.1.0: OCaml module to access monotonic wall-clock time
 dev-ml/oasis 0.4.8 0.4.10: Tool to integrate a configure, build and install system in OCaml project
 dev-ml/ocaml-augeas 0.5: Ocaml bindings for Augeas
 dev-ml/ocaml-autoconf 1.1: autoconf macros to support configuration of OCaml programs and libraries
-dev-ml/ocaml-base64 2.0.0 2.2.0: Library for radix-64 representation (de)coding
+dev-ml/ocaml-base64 2.2.0: Library for radix-64 representation (de)coding
 dev-ml/ocaml-bigstring 0.1.1: Overlay over bigarrays of chars
 dev-ml/ocaml-cairo 0.5: OCaml Binding to Cairo
 dev-ml/ocaml-cohttp 0.22.0: Very lightweight HTTP server using Lwt or Async
 dev-ml/ocaml-compiler-libs 0.9.0: Repackage the OCaml compiler libs so they do not expose everything at toplevel
 dev-ml/ocaml-conduit 0.15.3 0.15.4: Dereference URIs into communication channels for Async or Lwt
 dev-ml/ocaml-containers 1.2 1.3: A modular standard library focused on data structures
-dev-ml/ocaml-cstruct 3.0.1 3.0.2 3.1.0 3.1.1: Map OCaml arrays onto C-like structs
+dev-ml/ocaml-cstruct 3.1.1: Map OCaml arrays onto C-like structs
 dev-ml/ocaml-ctypes 0.4.1-r1 0.11.2 0.11.3 0.11.3-r1 0.11.4 0.12.0 0.12.1: Library for binding to C libraries using pure OCaml
 dev-ml/ocaml-data-notation 0.0.11-r1: Use type-conv to dump OCaml data structure using OCaml data notation
 dev-ml/ocaml-dispatch 0.3.0 0.4.0: Path-based dispatching for client- and server-side applications
@@ -5348,7 +5348,7 @@ dev-ml/ocplib-endian 1.0: Functions to read and write int16/32/64 from strings,
 dev-ml/ocsigen-i18n 3.1.0: I18n made easy for web sites written with eliom
 dev-ml/ocsigen-start 1.0.0 9999: Eliom Base Application with users, (pre)registration, notifications, etc.
 dev-ml/ocsigen-toolkit 1.0.0 9999: User interface widgets for Ocsigen applications
-dev-ml/octavius 0.2.0 1.1.0: ocamldoc comment syntax parser
+dev-ml/octavius 1.1.0: ocamldoc comment syntax parser
 dev-ml/ocurl 0.6.1 0.7.9 0.7.10: OCaml interface to the libcurl library
 dev-ml/odns 0.3-r1: OCaml library to query DNS servers
 dev-ml/ojquery 0.1 9999: jQuery Binding for Eliom.
@@ -5371,15 +5371,15 @@ dev-ml/postgresql-ocaml 4.0.1 4.1.0: A package for ocaml that provides access to
 dev-ml/ppx_assert 0.9.0: Assert-like extension nodes that raise useful errors on failure
 dev-ml/ppx_ast 0.9.1: AST used in Jane Street ppx rewriters
 dev-ml/ppx_base 0.9.0: Base set of ppx rewriters
-dev-ml/ppx_bench 0.9.0 0.9.1: Syntax extension for writing in-line benchmarks in ocaml code
+dev-ml/ppx_bench 0.9.1: Syntax extension for writing in-line benchmarks in ocaml code
 dev-ml/ppx_bin_prot 0.9.0: Generation of bin_prot readers and writers from types
-dev-ml/ppx_compare 0.9.0: Generation of comparison functions from types
+dev-ml/ppx_compare 0.9.0-r1: Generation of comparison functions from types
 dev-ml/ppx_core 0.9.0-r1: Standard library for ppx rewriters
-dev-ml/ppx_custom_printf 0.9.0: Printf-style format-strings for user-defined string conversion
+dev-ml/ppx_custom_printf 0.9.0-r1: Printf-style format-strings for user-defined string conversion
 dev-ml/ppx_derivers 1.0: Shared [@@deriving] plugin registry
-dev-ml/ppx_deriving 4.1-r1 4.2-r1: Type-driven code generation for OCaml
+dev-ml/ppx_deriving 4.2-r1: Type-driven code generation for OCaml
 dev-ml/ppx_deriving_yojson 3.0: A Yojson codec generator for OCaml
-dev-ml/ppx_driver 0.9.0 0.9.1: Feature-full driver for OCaml AST transformers
+dev-ml/ppx_driver 0.9.1: Feature-full driver for OCaml AST transformers
 dev-ml/ppx_enumerate 0.9.0: Generate a list containing all values of a finite type
 dev-ml/ppx_expect 0.9.0: Cram like framework for OCaml
 dev-ml/ppx_fail 0.9.0: Add location to calls to failwiths
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d04b71d82342..906837c581ea 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Sep 2017 08:24:48 +0000
+Fri, 22 Sep 2017 09:02:51 +0000