2017-08-02 11:53:43 UTC

51 files changed, 175 insertions, 263 deletions

diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.6.0 b/metadata/md5-cache/dev-ml/camlbz2-0.6.0
index 2180217fd159..360a8e7be3f3 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.6.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
 EAPI=5
 HOMEPAGE=http://camlbz2.forge.ocamlcore.org/
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.6.0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/72/camlbz2-0.6.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a03959b55222efd0181748ecd29777d4
+_md5_=0ba8d11a5df6d82082e665cb66098d71
diff --git a/metadata/md5-cache/dev-ml/cmdliner-0.9.8 b/metadata/md5-cache/dev-ml/cmdliner-0.9.8
deleted file mode 100644
index c67eed6c4774..000000000000
--- a/metadata/md5-cache/dev-ml/cmdliner-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Declarative definition of command line interfaces for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/cmdliner
-IUSE=doc +ocamlopt
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
-SLOT=0/0.9.8
-SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.8.tbz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=eac1c2628c22662516a665f793f64d40
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.0 b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
index 668cd5ec8c64..f58a1e6d72e6 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.0
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/cmdliner
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
 SLOT=0/1.0.0
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
 _eclass_exported_funcs=src_compile:- src_test:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=42b729ea80916fec8f4a61263b3b2727
+_md5_=673c48e7a65d135d5665b2c36846e6eb
diff --git a/metadata/md5-cache/dev-ml/cudf-0.8-r1 b/metadata/md5-cache/dev-ml/cudf-0.8-r1
index a00ce2fba5f5..38d82c39a4f1 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.8-r1
+++ b/metadata/md5-cache/dev-ml/cudf-0.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
 EAPI=5
 HOMEPAGE=http://www.mancoosi.org/cudf/
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 dev-ml/camlp4:= dev-ml/cppo:=
 SLOT=0/0.8
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/34659/cudf-0.8.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=76d154f0a8527f422642897a78c6564e
+_md5_=be87acb995abe5a2dc59d3ea36c4be3e
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1 b/metadata/md5-cache/dev-ml/dose3-5.0.1
index 3091093e4960..9de3387027e2 100644
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Library and a collection of tools to perform la large spectrum of an
 EAPI=5
 HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
 IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0/5.0.1
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=e1a5352b04342b1392f9f1ed5896f69e
+_md5_=e99063654bac6223c14b4ff9ccd66bef
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10
deleted file mode 100644
index cc33a4f29976..000000000000
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ocaml:= dev-ml/opam test? ( dev-ml/menhir )
-DESCRIPTION=A composable build system for OCaml
-EAPI=5
-HOMEPAGE=https://github.com/janestreet/jbuilder
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/1.0_beta10
-SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta10.tar.gz -> jbuilder-1.0-beta10.tar.gz
-_eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=55df15654758c0e05f92527d7158626d
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11
index 35a433cb523d..ee77097c919c 100644
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11
+++ b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta11
@@ -1,13 +1,14 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ocaml:= dev-ml/opam test? ( dev-ml/menhir )
+DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=A composable build system for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/janestreet/jbuilder
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.0_beta11
 SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta11.tar.gz -> jbuilder-1.0-beta11.tar.gz
-_eclass_exported_funcs=src_prepare:- src_install:-
-_md5_=55df15654758c0e05f92527d7158626d
+_eclass_exported_funcs=src_prepare:- src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=281533637252a9fb9df3516f20d92c45
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r1 b/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
index b6dc74924755..2d0e5459ff5c 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r1
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= deriving? ( >=dev-ml/deriving-0.6:= ) >=dev-ml/findlib-1.0.4-r1
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= dev-ml/ocaml-migrate-parsetree:= deriving? ( >=dev-ml/deriving-0.6:= ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A compiler from OCaml bytecode to javascript
 EAPI=5
 HOMEPAGE=http://ocsigen.org/js_of_ocaml/
 IUSE=+ocamlopt doc +deriving +ppx +react +xml X
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= deriving? ( >=dev-ml/deriving-0.6:= )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= dev-ml/ocaml-migrate-parsetree:= deriving? ( >=dev-ml/deriving-0.6:= )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/2.8.4.tar.gz -> js_of_ocaml-2.8.4.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=865a9f9b855432be50450dd3f23cfa0f
+_md5_=d1076348e2e995e922fb6497b7e252ba
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.0 b/metadata/md5-cache/dev-ml/jsonm-1.0.0
deleted file mode 100644
index 1a33bc16cec2..000000000000
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Non-blocking streaming JSON codec for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/jsonm
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=ISC
-RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
-SLOT=0/1.0.0
-SRC_URI=http://erratique.ch/software/jsonm/releases/jsonm-1.0.0.tbz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=12078e0db8f0bd6e0f78aabfef23c127
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 005af4fb7265..3e135a5011ea 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml
 DESCRIPTION=Non-blocking streaming JSON codec for OCaml
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/jsonm
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=542d5611a97903be18e760d80b5bc207
+_md5_=b43f5749f7d472155a39fdfb392a7d7b
diff --git a/metadata/md5-cache/dev-ml/lwt-3.1.0 b/metadata/md5-cache/dev-ml/lwt-3.1.0
index 7e09b5b2399a..302abfdec5b7 100644
--- a/metadata/md5-cache/dev-ml/lwt-3.1.0
+++ b/metadata/md5-cache/dev-ml/lwt-3.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cooperative light-weight thread library for OCaml
 EAPI=5
 HOMEPAGE=http://ocsigen.org/lwt
 IUSE=+camlp4 +libev
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:= dev-ml/result:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= libev? ( dev-libs/libev ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1
 SLOT=0/3.1.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/3.1.0.tar.gz -> lwt-3.1.0.tar.gz
 _eclass_exported_funcs=src_configure:- src_compile:- src_test:- src_install:-
-_md5_=b714e03ea810139ddf48772cff147f3b
+_md5_=15ff3b91f82d9b733fb1c34848b99d88
diff --git a/metadata/md5-cache/dev-ml/ocaml-make-6.39.0 b/metadata/md5-cache/dev-ml/ocaml-make-6.39.0
new file mode 100644
index 000000000000..1af0405a9e14
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-make-6.39.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Generic O'Caml Makefile for GNU Make
+EAPI=4
+HOMEPAGE=http://mmottl.github.io/ocaml-makefile/ https://github.com/mmottl/ocaml-makefile
+IUSE=examples
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-3.06-r1 >=dev-ml/findlib-0.8
+SLOT=0
+SRC_URI=https://github.com/mmottl/ocaml-makefile/releases/download/6.39.0/ocaml-makefile-6.39.0.tbz
+_eclass_exported_funcs=src_install:-
+_md5_=08682ba84fcd504cf4eb76df7348270c
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.2 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.2
new file mode 100644
index 000000000000..67d730a13598
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/ocaml:= dev-ml/result:= dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Convert OCaml parsetrees between different major versions
+EAPI=6
+HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/ocaml:= dev-ml/result:=
+SLOT=0/1.0.2
+SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.2.tar.gz -> ocaml-migrate-parsetree-1.0.2.tar.gz
+_eclass_exported_funcs=src_install:-
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=22b18b479a92a89d960512a010ee190f
diff --git a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1 b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
index c385d5cb37d1..582beac38057 100644
--- a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
+++ b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Regular expression library for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocaml/ocaml-re
 IUSE=test +ocamlopt debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.7.1
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> ocaml-re-1.7.1.tar.gz
 _eclass_exported_funcs=src_unpack:base src_prepare:base src_configure:oasis src_compile:oasis src_test:oasis src_install:oasis
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=afeef1824d52f9a05fae98b212563e12
+_md5_=3ac6ddcaf5838eaa7219126af17b7423
diff --git a/metadata/md5-cache/dev-ml/ocaml-text-0.8 b/metadata/md5-cache/dev-ml/ocaml-text-0.8
index 99a1258f6e70..77f1f8b68490 100644
--- a/metadata/md5-cache/dev-ml/ocaml-text-0.8
+++ b/metadata/md5-cache/dev-ml/ocaml-text-0.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) doc? ( dev-tex/rubber virtual/latex-base ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) doc? ( dev-tex/rubber virtual/latex-base ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=Library for dealing with 'text'
 EAPI=5
 HOMEPAGE=https://github.com/vbmithr/ocaml-text/
 IUSE=pcre +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RDEPEND=virtual/libiconv dev-ml/camlp4:= pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.8
 SRC_URI=https://github.com/vbmithr/ocaml-text/archive/0.8.tar.gz -> ocaml-text-0.8.tar.gz
 _eclass_exported_funcs=src_unpack:base src_prepare:base src_configure:- src_compile:oasis src_test:oasis src_install:-
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=0f2ef6ee87479dd51c0f9588c616d2dd
+_md5_=e3adbb9233448a15831d90c3cf66e1b2
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.7.10 b/metadata/md5-cache/dev-ml/ocurl-0.7.10
index 1bb6cd6e1044..701bd6b9dd7d 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.7.10
+++ b/metadata/md5-cache/dev-ml/ocurl-0.7.10
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=5
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
 IUSE=examples
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.7.10
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.10.tar.gz -> ocurl-0.7.10.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a6cc18315f51b2fc8ca3a7a051e1cf01
+_md5_=ed4809e4ad06f3dc4da5b980c0d19375
diff --git a/metadata/md5-cache/dev-ml/opam-1.3.0 b/metadata/md5-cache/dev-ml/opam-1.3.0
deleted file mode 100644
index bf45c761a460..000000000000
--- a/metadata/md5-cache/dev-ml/opam-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/ocaml-re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:=
-DESCRIPTION=A source-based package manager for OCaml
-EAPI=5
-HOMEPAGE=http://opam.ocaml.org/
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/ocaml-re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:= dev-ml/findlib
-SLOT=0/1.3.0
-SRC_URI=https://github.com/ocaml/opam/archive/1.3.0.tar.gz -> opam-1.3.0.tar.gz
-_eclass_exported_funcs=src_prepare:- src_compile:- src_test:- src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=c245beb5050b37e310620113c947170e
diff --git a/metadata/md5-cache/dev-ml/opam-1.3.1-r1 b/metadata/md5-cache/dev-ml/opam-1.3.1-r1
index cfe054ea8dec..6e69f020e446 100644
--- a/metadata/md5-cache/dev-ml/opam-1.3.1-r1
+++ b/metadata/md5-cache/dev-ml/opam-1.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A source-based package manager for OCaml
 EAPI=5
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/ocaml-re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:=
 SLOT=0/1.3.1
 SRC_URI=https://github.com/ocaml/opam/archive/1.3.1.tar.gz -> opam-1.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_compile:- src_test:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=e9a5ca8313e3d23b4f0407c52bb54d0f
+_md5_=afd631461720bd37bba0c38aec3b8a3e
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
new file mode 100644
index 000000000000..c7d08689d4e1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
+EAPI=5
+HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
+IUSE=examples
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
+SLOT=0/7.3.0
+SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.0/pcre-7.3.0.tbz -> pcre-ocaml-7.3.0.tbz
+_eclass_exported_funcs=src_compile:- src_test:- src_install:-
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=a705bdc24e4377353a79e6321ca423c8
diff --git a/metadata/md5-cache/dev-ml/ppx_core-0.9.0 b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
index 6bb61ba08115..d86f8a29c851 100644
--- a/metadata/md5-cache/dev-ml/ppx_core-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
@@ -1,12 +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/opam dev-ml/jbuilder
+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
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_core
 KEYWORDS=~amd64
 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:=
+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:=
 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
 _eclass_exported_funcs=src_install:-
-_md5_=f77f276fe6edd40e604f9f979f69befb
+_md5_=b9165049722abdb813675b03cf8b9015
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r2
index 98bfd6598170..5d78d014dc6b 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/ppx_core:= dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
 DESCRIPTION=Optional compilation for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/ppx_core:= dev-lang/ocaml:=
+RDEPEND=dev-ml/ppx_core:= dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.9.0.tar.gz -> ppx_optcomp-0.9.0.tar.gz
 _eclass_exported_funcs=src_install:-
-_md5_=84d5605c819e6c4735d8a0eea3c77854
+_md5_=8314e7c277e5048efc8697e01fd7b5e6
diff --git a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1 b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
index a2d458284c8f..85a31117e409 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
+++ b/metadata/md5-cache/dev-ml/ppx_tools_versioned-5.0.1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/findlib-1.0.4-
 DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ppx_tools_versioned
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-migrate-parsetree:=
 SLOT=0/5.0.1
 SRC_URI=https://github.com/let-def/ppx_tools_versioned/archive/5.0.1.tar.gz -> ppx_tools_versioned-5.0.1.tar.gz
 _eclass_exported_funcs=src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=0470af908b5508d6a77fb7b91edfe64c
+_md5_=7218f7b16c3a7e057efef3f7066a165b
diff --git a/metadata/md5-cache/dev-ml/result-1.2 b/metadata/md5-cache/dev-ml/result-1.2
index 4b4a000105fc..f31d044c5d13 100644
--- a/metadata/md5-cache/dev-ml/result-1.2
+++ b/metadata/md5-cache/dev-ml/result-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Compat result type
 EAPI=5
 HOMEPAGE=https://github.com/janestreet/result
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=https://github.com/janestreet/result/archive/1.2.tar.gz -> result-1.2.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=d026338efc837b01860d5be596cedbe3
+_md5_=799973ba6cd4e0a8cd6fcb53c039eab8
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.1 b/metadata/md5-cache/dev-ml/sexplib-0.9.1
deleted file mode 100644
index bb5bfe5ffaf0..000000000000
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
-DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
-EAPI=6
-HOMEPAGE=https://github.com/janestreet/sexplib
-KEYWORDS=~amd64 ~ppc
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/0.9.1
-SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.1.tar.gz -> sexplib-0.9.1.tar.gz
-_eclass_exported_funcs=src_test:- src_install:-
-_md5_=cff0e9f9c27764190ab2e7a1e9b15302
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.2 b/metadata/md5-cache/dev-ml/sexplib-0.9.2
index 5d0c61667924..ebc896b6e761 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.2
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.2
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/sexplib
 KEYWORDS=~amd64 ~ppc
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.2.tar.gz -> sexplib-0.9.2.tar.gz
-_eclass_exported_funcs=src_test:- src_install:-
-_md5_=cff0e9f9c27764190ab2e7a1e9b15302
+_eclass_exported_funcs=src_test:- src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=50f0595f707d1de175d84c22f289161d
diff --git a/metadata/md5-cache/dev-ml/spawn-0.9.0 b/metadata/md5-cache/dev-ml/spawn-0.9.0
index 5a03181825a9..d58a465b608e 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.9.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.9.0
@@ -1,12 +1,13 @@
 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=Spawning sub-processes
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/spawn
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.9.0.tar.gz -> spawn-0.9.0.tar.gz
-_eclass_exported_funcs=src_install:-
-_md5_=9f797e4c759909351c2499fc9a480e9f
+_eclass_exported_funcs=src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=efa61e05acee15c9104a3e2f5b0dae70
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.0 b/metadata/md5-cache/dev-ml/stdio-0.9.0
index 6273a2290ce6..7a456c14a448 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.0
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install test
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/base:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Standard IO Library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/stdio
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:=
+RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.0.tar.gz -> stdio-0.9.0.tar.gz
-_eclass_exported_funcs=src_test:- src_install:-
-_md5_=6673ce7f64feb33f3e17f1fee3cc265e
+_eclass_exported_funcs=src_test:- src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=62b4b96f745f0074d2e2ec5e7228c8b3
diff --git a/metadata/md5-cache/dev-ml/textutils-0.9.0 b/metadata/md5-cache/dev-ml/textutils-0.9.0
index f40ccfca2f74..13a0f3326fcb 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.9.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.9.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Text output utilities
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/textutils
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/core:= 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/textutils/archive/v0.9.0.tar.gz -> textutils-0.9.0.tar.gz
-_eclass_exported_funcs=src_install:-
-_md5_=31d219ca974c9e96cddf4047d16ed9b8
+_eclass_exported_funcs=src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=704a092f6d2caecf664702c91fec2df6
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.0 b/metadata/md5-cache/dev-ml/topkg-0.9.0
index 5e5c7a13783e..a078c02da711 100644
--- a/metadata/md5-cache/dev-ml/topkg-0.9.0
+++ b/metadata/md5-cache/dev-ml/topkg-0.9.0
@@ -3,11 +3,11 @@ DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=d
 DESCRIPTION=The transitory OCaml software packager
 EAPI=6
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.0.tar.gz -> topkg-0.9.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=13e173da2bc1cc34c6265a681c36bda1
+_md5_=fa2c9d36389e05a00dbd15965399cc39
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.1 b/metadata/md5-cache/dev-ml/uchar-0.0.1
deleted file mode 100644
index 837b9ea37326..000000000000
--- a/metadata/md5-cache/dev-ml/uchar-0.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4.03:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Uchar compatibility library
-EAPI=6
-HOMEPAGE=https://github.com/ocaml/uchar
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=
-RESTRICT=test
-SLOT=0/0.0.1
-SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.1.tar.gz -> uchar-0.0.1.tar.gz
-_eclass_exported_funcs=src_compile:- src_test:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=74a867ebb1dba5479fa41706a014d84f
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 5db13968457b..a739ee1bc832 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=
 RESTRICT=test
@@ -12,4 +12,4 @@ SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
 _eclass_exported_funcs=src_compile:- src_test:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=74a867ebb1dba5479fa41706a014d84f
+_md5_=061a9464d94aa03f3a45b4f44d184eee
diff --git a/metadata/md5-cache/dev-ml/utop-2.0.1 b/metadata/md5-cache/dev-ml/utop-2.0.1
index 0cb383730543..4ea4beef9a71 100644
--- a/metadata/md5-cache/dev-ml/utop-2.0.1
+++ b/metadata/md5-cache/dev-ml/utop-2.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= >=dev-ml/lwt-2.4.0:= dev-ml/lwt_react:= >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= >=dev-ml/cppo-1.0.1:= >=dev-ml/findlib-1.7.2:= dev-ml/opam dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1
+DEPEND=>=dev-ml/lwt-2.4.0:= dev-ml/lwt_react:= >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= >=dev-ml/cppo-1.0.1:= >=dev-ml/findlib-1.7.2:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=A new toplevel for OCaml with completion and colorization
 EAPI=5
 HOMEPAGE=https://github.com/diml/utop
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= >=dev-ml/lwt-2.4.0:= dev-ml/lwt_react:= >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= >=dev-ml/cppo-1.0.1:= >=dev-ml/findlib-1.7.2:=
+RDEPEND=>=dev-ml/lwt-2.4.0:= dev-ml/lwt_react:= >=dev-ml/lambda-term-1.2:= >=dev-ml/zed-1.2:= >=dev-ml/cppo-1.0.1:= >=dev-ml/findlib-1.7.2:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.1
 SRC_URI=https://github.com/diml/utop/archive/2.0.1.tar.gz -> utop-2.0.1.tar.gz
-_eclass_exported_funcs=src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=ffffd7386230b5201a771325fdb6f7b5
+_eclass_exported_funcs=src_install:opam
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=68f1091b989f9d853c792d9bf2c37890
diff --git a/metadata/md5-cache/dev-ml/uuidm-0.9.6 b/metadata/md5-cache/dev-ml/uuidm-0.9.6
index 9691202a17cd..b5a8e9e0ea64 100644
--- a/metadata/md5-cache/dev-ml/uuidm-0.9.6
+++ b/metadata/md5-cache/dev-ml/uuidm-0.9.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:= dev-ml/cmdliner:= dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-ml/cmdliner:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=OCaml module implementing 128 bits universally unique identifiers
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/uuidm
 KEYWORDS=~amd64
 LICENSE=ISC
-RDEPEND=dev-lang/ocaml:= dev-ml/cmdliner:=
+RDEPEND=dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.6
 SRC_URI=http://erratique.ch/software/uuidm/releases/uuidm-0.9.6.tbz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=1078dd72e35735a30560c9e7602fbebf
+_eclass_exported_funcs=src_compile:- src_install:opam
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=62ef72e9291251a968fd334e50701e3a
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.0-r1 b/metadata/md5-cache/dev-ml/uutf-1.0.0-r1
deleted file mode 100644
index e8ba7e331d75..000000000000
--- a/metadata/md5-cache/dev-ml/uutf-1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/cmdliner ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/uutf
-IUSE=doc utftrip +ocamlopt test
-KEYWORDS=~amd64 ~arm ~ppc
-LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
-SLOT=0/1.0.0
-SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.0.tbz
-_eclass_exported_funcs=src_compile:- src_test:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=1e5fd1f4fd9e172d0c0a6a9880c1e535
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index e4fc8e669d5e..ffa183b180f4 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/uutf
 IUSE=doc utftrip +ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclass_exported_funcs=src_compile:- src_test:- src_install:-
 _eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=772e33f4528f97af37fc73530523e06a
+_md5_=7adb19fb33d0ebe8e713c4bf7fbfaedb
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.9.0 b/metadata/md5-cache/dev-ml/variantslib-0.9.0
index 50694cc98213..359e5f6402a6 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.9.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.9.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=install
-DEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=OCaml variants as first class values
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/variantslib
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:=
+RDEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.9.0.tar.gz -> variantslib-0.9.0.tar.gz
-_eclass_exported_funcs=src_install:-
-_md5_=b3b3b3a102bdc92839f95b4e63cc38cf
+_eclass_exported_funcs=src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=d886530b2ff32238ab5fec6fc318d0e1
diff --git a/metadata/md5-cache/dev-ml/xmlm-1.2.0 b/metadata/md5-cache/dev-ml/xmlm-1.2.0
deleted file mode 100644
index f84dc0d30188..000000000000
--- a/metadata/md5-cache/dev-ml/xmlm-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/findlib dev-ml/opam
-DESCRIPTION=Ocaml XML manipulation module
-EAPI=5
-HOMEPAGE=http://erratique.ch/software/xmlm
-IUSE=doc +ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.2.0
-SRC_URI=http://erratique.ch/software/xmlm/releases/xmlm-1.2.0.tbz
-_eclass_exported_funcs=src_compile:- src_install:-
-_md5_=00ca2950d2c6d8de1ecf94166a042487
diff --git a/metadata/md5-cache/dev-ml/xmlm-1.3.0 b/metadata/md5-cache/dev-ml/xmlm-1.3.0
index b3048c090551..5f1a2989b2bf 100644
--- a/metadata/md5-cache/dev-ml/xmlm-1.3.0
+++ b/metadata/md5-cache/dev-ml/xmlm-1.3.0
@@ -1,13 +1,14 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-3.12:= dev-ml/findlib dev-ml/opam >=dev-ml/topkg-0.9
+DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Ocaml XML manipulation module
 EAPI=5
 HOMEPAGE=http://erratique.ch/software/xmlm https://github.com/dbuenzli/xmlm
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.12:=
+RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.3.0
 SRC_URI=http://erratique.ch/software/xmlm/releases/xmlm-1.3.0.tbz
-_eclass_exported_funcs=src_compile:- src_test:- src_install:-
-_md5_=0a60b65bf2217314c661e54298f81c53
+_eclass_exported_funcs=src_compile:- src_test:- src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=cc99bd1b9a9bfefa7d74b4d59f8be67b
diff --git a/metadata/md5-cache/dev-ml/yojson-1.3.3 b/metadata/md5-cache/dev-ml/yojson-1.3.3
deleted file mode 100644
index d222c061ebb1..000000000000
--- a/metadata/md5-cache/dev-ml/yojson-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] dev-ml/biniou:=[ocamlopt] dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=JSON parsing and pretty-printing library for OCaml
-EAPI=5
-HOMEPAGE=http://mjambon.com/yojson.html
-IUSE=examples
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] dev-ml/biniou:=[ocamlopt]
-SLOT=0/1.3.3
-SRC_URI=https://github.com/mjambon/yojson/archive/v1.3.3.tar.gz -> yojson-1.3.3.tar.gz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=57e9d8a70ef229a85f174408138d5599
diff --git a/metadata/md5-cache/dev-ml/yojson-1.4.0 b/metadata/md5-cache/dev-ml/yojson-1.4.0
index e79498150d26..5601df10c4b8 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.4.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
+DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=JSON parsing and pretty-printing library for OCaml
 EAPI=5
 HOMEPAGE=http://mjambon.com/yojson.html https://github.com/mjambon/yojson
 IUSE=examples
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt]
+RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/1.4.0
 SRC_URI=https://github.com/mjambon/yojson/archive/v1.4.0.tar.gz -> yojson-1.4.0.tar.gz
 _eclass_exported_funcs=src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=e597fe9cd254b4b5555854b7c5b9cead
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=790517d7ae78040c627038e589b18e59
diff --git a/metadata/md5-cache/dev-ml/zed-1.4 b/metadata/md5-cache/dev-ml/zed-1.4
deleted file mode 100644
index aedb8e88528d..000000000000
--- a/metadata/md5-cache/dev-ml/zed-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/camomile:= dev-ml/react:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Zed is an abstract engine for text edition
-EAPI=5
-HOMEPAGE=https://github.com/diml/zed
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ml/camomile:= dev-ml/react:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/1.4
-SRC_URI=https://github.com/diml/zed/archive/1.4.tar.gz -> zed-1.4.tar.gz
-_eclass_exported_funcs=src_unpack:base src_prepare:base src_configure:oasis src_compile:oasis src_test:oasis src_install:oasis
-_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=3f00fe4dc4de734d7c52cac8aae29488
diff --git a/metadata/md5-cache/dev-ml/zed-1.5 b/metadata/md5-cache/dev-ml/zed-1.5
index 67d06cc0d18a..9bf3be06da21 100644
--- a/metadata/md5-cache/dev-ml/zed-1.5
+++ b/metadata/md5-cache/dev-ml/zed-1.5
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:= dev-ml/opam dev-ml/jbuilder
+DEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
 DESCRIPTION=Zed is an abstract engine for text edition
 EAPI=5
 HOMEPAGE=https://github.com/diml/zed
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:=
+RDEPEND=dev-lang/ocaml:= dev-ml/camomile:= dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/1.5
 SRC_URI=https://github.com/diml/zed/archive/1.5.tar.gz -> zed-1.5.tar.gz
-_eclass_exported_funcs=src_compile:- src_install:-
-_md5_=3d13e858383da1139d38be4173ff011b
+_eclass_exported_funcs=src_compile:- src_install:opam
+_eclasses_=opam	24b4a2529c1fd12f1304856d6c5a690d
+_md5_=fdb294a15bf407125f16eac9a24d2f6d
diff --git a/metadata/md5-cache/dev-python/mando-0.3.2 b/metadata/md5-cache/dev-python/mando-0.3.2
index 3181d28397af..9a7ec10c89b3 100644
--- a/metadata/md5-cache/dev-python/mando-0.3.2
+++ b/metadata/md5-cache/dev-python/mando-0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Create Python CLI apps with little to no effort at all!
 EAPI=5
 HOMEPAGE=https://mando.readthedocs.org/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=https://github.com/rubik/mando/archive/v0.3.2.tar.gz -> mando-0.3.2.tar.gz
 _eclass_exported_funcs=src_unpack:vcs-snapshot src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=416814dc87a508936ca38d236c71bd36
+_md5_=ac4cbd43522d7deeaba5c2d9b8bb6c2f
diff --git a/metadata/md5-cache/dev-python/paramunittest-0.2 b/metadata/md5-cache/dev-python/paramunittest-0.2
index b1224a07030f..780215c16464 100644
--- a/metadata/md5-cache/dev-python/paramunittest-0.2
+++ b/metadata/md5-cache/dev-python/paramunittest-0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Simple extension to have parametrized unit tests.
 EAPI=5
 HOMEPAGE=https://github.com/rik0/ParamUnittest
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/P/ParamUnittest/ParamUnittest-0.2.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=8a4ab25def3a4c304264c6126e900c42
+_md5_=e55f6e15e7708b59a0a36aded7e6c679
diff --git a/metadata/md5-cache/dev-python/radon-1.4.2 b/metadata/md5-cache/dev-python/radon-1.4.2
index ebd43b67c471..c7fa3874ec98 100644
--- a/metadata/md5-cache/dev-python/radon-1.4.2
+++ b/metadata/md5-cache/dev-python/radon-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Code Metrics in Python
 EAPI=5
 HOMEPAGE=https://radon.readthedocs.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/colorama-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flake8-polyfill[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mando-0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mando-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-1.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0cfdf49404e3bac98b41a2bac8555481
+_md5_=b3f04dfd65c5288e09224eef52344d15
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.5 b/metadata/md5-cache/dev-util/coccinelle-1.0.5
index 402a71dd32d6..becf2d42393d 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.5
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
 DESCRIPTION=Program matching and transformation engine
 EAPI=5
 HOMEPAGE=http://coccinelle.lip6.fr/
 IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.5.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=c0f95bac0c247c49f5b6364f2ab2e604
+_md5_=fcc63bb31b045e156c3f16a451163ce8
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.6 b/metadata/md5-cache/dev-util/coccinelle-1.0.6
index 8aeaffdf32f0..e9888ad20604 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.6
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra )
 DESCRIPTION=Program matching and transformation engine
 EAPI=6
 HOMEPAGE=http://coccinelle.lip6.fr/
 IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz
 _eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:- src_test:- src_install:-
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=04485590b8f61fecbd8685384d34adb4
+_md5_=362f9197f07943b9c64e0620e7f44e5b
diff --git a/metadata/md5-cache/sys-block/aoetools-35 b/metadata/md5-cache/sys-block/aoetools-35
deleted file mode 100644
index eed9894a3f7b..000000000000
--- a/metadata/md5-cache/sys-block/aoetools-35
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=tools for ATA over Ethernet (AoE) network storage protocol
-EAPI=4
-HOMEPAGE=http://aoetools.sourceforge.net/
-KEYWORDS=amd64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/aoetools/aoetools-35.tar.gz
-_eclass_exported_funcs=src_prepare:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=8940ee766282ea854f543ff79f4a407d
diff --git a/metadata/md5-cache/sys-block/aoetools-37 b/metadata/md5-cache/sys-block/aoetools-37
new file mode 100644
index 000000000000..b144dc11ad04
--- /dev/null
+++ b/metadata/md5-cache/sys-block/aoetools-37
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=tools for ATA over Ethernet (AoE) network storage protocol
+EAPI=6
+HOMEPAGE=https://github.com/OpenAoE/aoetools
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/OpenAoE/aoetools/archive/aoetools-37.tar.gz
+_eclass_exported_funcs=src_prepare:-
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
+_md5_=195a0a57e67496dc66636e2227c283d6
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f40d02cd16b1..f5bf8f4a5d1a 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5230,7 +5230,7 @@ dev-ml/camlpdf 2.1.1: OCaml library for reading, writing, and modifying PDF file
 dev-ml/camlzip 1.06 1.07: Compressed file access ML library (ZIP, GZIP and JAR)
 dev-ml/camomile 0.8.5-r1: Camomile is a comprehensive Unicode library for ocaml
 dev-ml/capnp-ocaml 2.1.1: OCaml code generator plugin for the Cap'n Proto serialization framework
-dev-ml/cmdliner 0.9.8 1.0.0: Declarative definition of command line interfaces for OCaml
+dev-ml/cmdliner 1.0.0: Declarative definition of command line interfaces for OCaml
 dev-ml/configurator 0.9.0 0.9.1: Helper library for gathering system configuration
 dev-ml/core 0.9.0 0.9.1: Jane Street's alternative to the standard library
 dev-ml/core_bench 0.9.0: Micro-benchmarking library for OCaml
@@ -5268,10 +5268,10 @@ dev-ml/incremental_kernel 0.9.0: Library for incremental computations depending
 dev-ml/integers 0.2.2: Various signed and unsigned integer types for OCaml
 dev-ml/io-page 1.6.0: IO memory page library for Mirage backends
 dev-ml/jane-street-headers 0.9.0: Jane Street header files
-dev-ml/jbuilder 1.0_beta10 1.0_beta11: A composable build system for OCaml
+dev-ml/jbuilder 1.0_beta11: A composable build system for OCaml
 dev-ml/js-build-tools 113.33.04 113.33.06: Collection of tools to help building Jane Street Packages
-dev-ml/js_of_ocaml 2.8.4-r1 3.0.0 9999: A compiler from OCaml bytecode to javascript
-dev-ml/jsonm 1.0.0 1.0.1: Non-blocking streaming JSON codec for OCaml
+dev-ml/js_of_ocaml 2.8.4-r2 3.0.0 9999: A compiler from OCaml bytecode to javascript
+dev-ml/jsonm 1.0.1: Non-blocking streaming JSON codec for OCaml
 dev-ml/kaputt 1.2: Unit testing tool for the Objective Caml language
 dev-ml/lablgl 1.05-r1: Objective CAML interface for OpenGL
 dev-ml/lablgtk 2.18.5: Objective CAML interface for Gtk+2
@@ -5315,8 +5315,8 @@ dev-ml/ocaml-gettext 0.3.5-r1 0.3.7: Provides support for internationalization o
 dev-ml/ocaml-hashcons 1.2: OCaml hash-consing library
 dev-ml/ocaml-ipaddr 2.8.0: OCaml library for manipulation of IP (and MAC) address representations
 dev-ml/ocaml-magic-mime 1.0.0 1.1.0: Convert file extensions to MIME types
-dev-ml/ocaml-make 6.37.0: Generic O'Caml Makefile for GNU Make
-dev-ml/ocaml-migrate-parsetree 1.0.1: Convert OCaml parsetrees between different major versions
+dev-ml/ocaml-make 6.37.0 6.39.0: Generic O'Caml Makefile for GNU Make
+dev-ml/ocaml-migrate-parsetree 1.0.1 1.0.2: Convert OCaml parsetrees between different major versions
 dev-ml/ocaml-mysql 1.2.1: A package for ocaml that provides access to mysql databases
 dev-ml/ocaml-pcap 0.4.0: Read and write pcap-formatted network packet traces.
 dev-ml/ocaml-re 1.7.1: Regular expression library for OCaml
@@ -5353,7 +5353,7 @@ 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.
 dev-ml/onanomsg 1.0-r1: nanomsg bindings for OCaml
-dev-ml/opam 1.3.0 1.3.1-r1: A source-based package manager for OCaml
+dev-ml/opam 1.3.1-r1: A source-based package manager for OCaml
 dev-ml/optcomp 1.6-r1: Optional compilation for OCaml with cpp-like directives
 dev-ml/ounit 2.0.0: Unit testing framework for OCaml
 dev-ml/pa_bench 112.06.00: Syntax extension writing inline benchmarks
@@ -5362,7 +5362,7 @@ dev-ml/pa_sexp_conv 113.00.01: Deprecated camlp4 syntax extension for sexplib.
 dev-ml/pa_structural_sexp 113.00.00: Quotation expanders to simplify building s-expressions from ocaml values
 dev-ml/parmap 1.0_rc7-r1 1.0_rc8: Library allowing to exploit multicore architectures for OCaml programs with minimal modifications
 dev-ml/patience_diff 0.9.0: Tool and library implementing patience diff
-dev-ml/pcre-ocaml 7.2.3: Perl Compatibility Regular Expressions for O'Caml
+dev-ml/pcre-ocaml 7.2.3 7.3.0: Perl Compatibility Regular Expressions for O'Caml
 dev-ml/pgocaml 2.3: PG'OCaml is a set of OCaml bindings for the PostgreSQL database
 dev-ml/pipebang 113.00.00: Syntax extension to transform x |! f into f x
 dev-ml/pomap 3.0.6 3.0.7: Partially Ordered Map ADT for O'Caml
@@ -5373,7 +5373,7 @@ 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_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_core 0.9.0: Standard library for ppx rewriters
+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_deriving 4.1-r1: Type-driven code generation for OCaml
 dev-ml/ppx_deriving_yojson 3.0: A Yojson codec generator for OCaml
@@ -5390,7 +5390,7 @@ dev-ml/ppx_jane 0.9.0: Standard Jane Street ppx rewriters
 dev-ml/ppx_js_style 0.9.0: Code style checker for Jane Street Packages
 dev-ml/ppx_let 0.9.0: Monadic let-bindings
 dev-ml/ppx_metaquot 0.9.0: Write OCaml AST fragment using OCaml syntax
-dev-ml/ppx_optcomp 0.9.0-r1: Optional compilation for OCaml
+dev-ml/ppx_optcomp 0.9.0-r2: Optional compilation for OCaml
 dev-ml/ppx_optional 0.9.0: Pattern matching on flat options
 dev-ml/ppx_pipebang 0.9.0: A ppx rewriter that inlines reverse application operators |> and |!
 dev-ml/ppx_sexp_conv 0.9.0-r1: Support Library for type-driven code generators
@@ -5415,7 +5415,7 @@ dev-ml/result 1.2: Compat result type
 dev-ml/rresult 0.5.0: Result value combinators for OCaml
 dev-ml/sedlex 1.99.3 1.99.4: An OCaml lexer generator for Unicode
 dev-ml/sequence 0.10: Simple sequence (iterator) datatype and combinators
-dev-ml/sexplib 0.9.1 0.9.2: Library for automated conversion of OCaml-values to and from S-expressions
+dev-ml/sexplib 0.9.2: Library for automated conversion of OCaml-values to and from S-expressions
 dev-ml/spawn 0.9.0: Spawning sub-processes
 dev-ml/stdio 0.9.0: Standard IO Library for OCaml
 dev-ml/stringext 1.4.3: Extra string functions for OCaml
@@ -5425,18 +5425,18 @@ dev-ml/type-conv 113.00.02: Mini library required for some other preprocessing l
 dev-ml/typerep 0.9.0: Library for creating runtime representation of OCaml types
 dev-ml/typerep_extended 0.9.0: Runtime types for OCaml (Extended)
 dev-ml/tyxml 4.1.0: A libary to build xml trees typechecked by OCaml
-dev-ml/uchar 0.0.1 0.0.2: Uchar compatibility library
+dev-ml/uchar 0.0.2: Uchar compatibility library
 dev-ml/ulex 1.1: A lexer generator for unicode
 dev-ml/utop 2.0.1: A new toplevel for OCaml with completion and colorization
 dev-ml/uuidm 0.9.6: OCaml module implementing 128 bits universally unique identifiers
-dev-ml/uutf 1.0.0-r1 1.0.1: Non-blocking streaming Unicode codec for OCaml
+dev-ml/uutf 1.0.1: Non-blocking streaming Unicode codec for OCaml
 dev-ml/variantslib 0.9.0: OCaml variants as first class values
 dev-ml/xml-light 2.2-r3: Minimal Xml parser and printer for OCaml
-dev-ml/xmlm 1.2.0 1.3.0: Ocaml XML manipulation module
+dev-ml/xmlm 1.3.0: Ocaml XML manipulation module
 dev-ml/xstr 0.2.1: Thread-safe implementation of string searching/matching/splitting
-dev-ml/yojson 1.3.3 1.4.0: JSON parsing and pretty-printing library for OCaml
+dev-ml/yojson 1.4.0: JSON parsing and pretty-printing library for OCaml
 dev-ml/zarith 1.4.1 1.5: Arithmetic and logic operations over arbitrary-precision integers
-dev-ml/zed 1.4 1.5: Zed is an abstract engine for text edition
+dev-ml/zed 1.5: Zed is an abstract engine for text edition
 dev-perl/Ace 1.920.0-r1: Object-Oriented Access to ACEDB Databases
 dev-perl/Acme-Damn 0.60.0 0.80.0: Module, that 'unblesses' Perl objects
 dev-perl/Algorithm-Annotate 0.100.0-r1: Represent a series of changes in annotate form
@@ -17394,7 +17394,7 @@ sys-auth/ykneo-ccid-tools 0.0.0: Tools for Yubico's YubiKey NEO in CCID mode
 sys-auth/ykpers 1.18.0: Library and tool for personalization of Yubico's YubiKey
 sys-auth/yubico-piv-tool 1.4.3: Command line tool for the YubiKey PIV application
 sys-auth/yubikey-personalization-gui 3.1.23 3.1.24: GUI for personalization of Yubico's YubiKey
-sys-block/aoetools 35 36: tools for ATA over Ethernet (AoE) network storage protocol
+sys-block/aoetools 36 37: tools for ATA over Ethernet (AoE) network storage protocol
 sys-block/arcconf 1.2.20618 1.7.21229: Adaptec RAID Controller Command Line Utility
 sys-block/blktrace 1.0.3 1.1.0 1.1.0-r1: btrace can show detailed info about what is happening on a block device io queue
 sys-block/blocks 0.1.4_pre131210-r1 9999: Conversion tools for block devices
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index fb82589dbf08..26a0fb0e486c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Aug 2017 11:28:02 +0000
+Wed, 02 Aug 2017 11:53:44 +0000