gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /metadata/md5-cache/dev-ml
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
334 files changed, 533 insertions, 422 deletions
diff --git a/metadata/md5-cache/dev-ml/ANSITerminal-0.6.5 b/metadata/md5-cache/dev-ml/ANSITerminal-0.6.5
index dbfc6f35e1ed..1dc3a5e9b504 100644
--- a/metadata/md5-cache/dev-ml/ANSITerminal-0.6.5
+++ b/metadata/md5-cache/dev-ml/ANSITerminal-0.6.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.6.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1206/ANSITerminal-0.6.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46ce2151f6f0cf4d4d2c6ede7cc9f925
diff --git a/metadata/md5-cache/dev-ml/ANSITerminal-0.7 b/metadata/md5-cache/dev-ml/ANSITerminal-0.7
index 1bfc39b8a362..64be2439fab4 100644
--- a/metadata/md5-cache/dev-ml/ANSITerminal-0.7
+++ b/metadata/md5-cache/dev-ml/ANSITerminal-0.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.7
 SRC_URI=https://github.com/Chris00/ANSITerminal/archive/0.7.tar.gz -> ANSITerminal-0.7.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f35873f8817de25af38fab1b3f49e6b
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index cc896742dfb7..154d1641e52e 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1 b/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1
index 54107b3a1afa..c866167ea3c5 100644
--- a/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1
+++ b/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1
@@ -9,5 +9,5 @@ RDEPEND=>=media-gfx/imagemagick-7:= dev-lang/ocaml:=[ocamlopt]
 RESTRICT=test
 SLOT=0/70.34
 SRC_URI=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz mirror://gentoo/OCaml-ImageMagick-0.34-imagemagick7.patch.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c38900991455510a4cb1f1ab37f76eac
diff --git a/metadata/md5-cache/dev-ml/alcotest-0.8.1 b/metadata/md5-cache/dev-ml/alcotest-0.8.1
index ac0594ad8b3e..8394f13fd606 100644
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.1
+++ b/metadata/md5-cache/dev-ml/alcotest-0.8.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.1
 SRC_URI=https://github.com/mirage/alcotest/archive/0.8.1.tar.gz -> alcotest-0.8.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=e4b101035b078938c5c75de8559caebf
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/alcotest-0.8.2 b/metadata/md5-cache/dev-ml/alcotest-0.8.2
index bda14cb2713b..b9618b0d2937 100644
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.2
+++ b/metadata/md5-cache/dev-ml/alcotest-0.8.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://github.com/mirage/alcotest/archive/0.8.2.tar.gz -> alcotest-0.8.2.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=e4b101035b078938c5c75de8559caebf
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/angstrom-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-0.7.0
index 2ba23dfccc50..b743eee82041 100644
--- a/metadata/md5-cache/dev-ml/angstrom-0.7.0
+++ b/metadata/md5-cache/dev-ml/angstrom-0.7.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 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	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=cc2f65c3654d5c5d63ce38283906b580
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=115d273fb0d6332702629bb80755a2cc
diff --git a/metadata/md5-cache/dev-ml/angstrom-async-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-async-0.7.0
index b3597de47fdf..868edc6d2edc 100644
--- a/metadata/md5-cache/dev-ml/angstrom-async-0.7.0
+++ b/metadata/md5-cache/dev-ml/angstrom-async-0.7.0
@@ -8,5 +8,5 @@ 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	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=c31cc3a45efe5ae7c15de2a9c45b4ef3
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
index 53b7371f0855..d961d47936be 100644
--- a/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.7.0
+++ b/metadata/md5-cache/dev-ml/angstrom-lwt-unix-0.7.0
@@ -8,5 +8,5 @@ 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	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=9d325b187990d05de59b857244d165c5
diff --git a/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0 b/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0
index 6e7372d61dc4..a157ac27a982 100644
--- a/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0
+++ b/metadata/md5-cache/dev-ml/angstrom-unix-0.7.0
@@ -8,5 +8,5 @@ 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	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 eb9895962ae1..1d9f84d24b9d 100644
--- a/metadata/md5-cache/dev-ml/astring-0.8.3
+++ b/metadata/md5-cache/dev-ml/astring-0.8.3
@@ -8,5 +8,5 @@ LICENSE=ISC
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=bf19617785588138c4b41ef0b8bb0499
diff --git a/metadata/md5-cache/dev-ml/async-0.9.0 b/metadata/md5-cache/dev-ml/async-0.9.0
index acd51c6d079e..264fc8219dd1 100644
--- a/metadata/md5-cache/dev-ml/async-0.9.0
+++ b/metadata/md5-cache/dev-ml/async-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= 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/async/archive/v0.9.0.tar.gz -> async-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=a986994d3355154bf98c7ebfba8f16ed
diff --git a/metadata/md5-cache/dev-ml/atd-1.12.0 b/metadata/md5-cache/dev-ml/atd-1.12.0
index 2bf8258b0193..3ea9d09d6330 100644
--- a/metadata/md5-cache/dev-ml/atd-1.12.0
+++ b/metadata/md5-cache/dev-ml/atd-1.12.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.12.0
 SRC_URI=https://github.com/mjambon/atd/archive/v1.12.0.tar.gz -> atd-1.12.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=05a5412d5359c6c489fb90a5e32c14be
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=ae5e7d835b5f1678435a90cedc711239
diff --git a/metadata/md5-cache/dev-ml/atd-1.2.0 b/metadata/md5-cache/dev-ml/atd-1.2.0
index d9735bfb0394..46c8de0fdc8d 100644
--- a/metadata/md5-cache/dev-ml/atd-1.2.0
+++ b/metadata/md5-cache/dev-ml/atd-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/atd/archive/v1.2.0.tar.gz -> atd-1.2.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0af6dceaa99b639cdd667f369723185c
diff --git a/metadata/md5-cache/dev-ml/atd-1.2.1 b/metadata/md5-cache/dev-ml/atd-1.2.1
index 528aa239309b..fa6824d9dc24 100644
--- a/metadata/md5-cache/dev-ml/atd-1.2.1
+++ b/metadata/md5-cache/dev-ml/atd-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] dev-ml/menhir:=[ocamlopt?]
 SLOT=0/1.2.1
 SRC_URI=https://github.com/mjambon/atd/archive/v1.2.1.tar.gz -> atd-1.2.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=de637d3e27a98870a0608f7307b54b15
diff --git a/metadata/md5-cache/dev-ml/atdgen-1.10.0 b/metadata/md5-cache/dev-ml/atdgen-1.10.0
index f75ac36d8d03..3f5f54807b0a 100644
--- a/metadata/md5-cache/dev-ml/atdgen-1.10.0
+++ b/metadata/md5-cache/dev-ml/atdgen-1.10.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:=[ocamlopt?] dev-ml/biniou:=[ocamlopt?] dev-ml/yojson:=
 SLOT=0/1.10.0
 SRC_URI=https://github.com/mjambon/atdgen/archive/v1.10.0.tar.gz -> atdgen-1.10.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=ea176d93883195c26483e055434f3aaa
diff --git a/metadata/md5-cache/dev-ml/atdgen-1.10.2 b/metadata/md5-cache/dev-ml/atdgen-1.10.2
index 732e77aeb7f6..c3458472bf57 100644
--- a/metadata/md5-cache/dev-ml/atdgen-1.10.2
+++ b/metadata/md5-cache/dev-ml/atdgen-1.10.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:=[ocamlopt?] dev-ml/biniou:=[ocamlopt?] dev-ml/yojson:=
 SLOT=0/1.10.2
 SRC_URI=https://github.com/mjambon/atdgen/archive/v1.10.2.tar.gz -> atdgen-1.10.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=d846ec8fe443ba95eea658b7c4e9fea4
diff --git a/metadata/md5-cache/dev-ml/atdgen-1.12.0 b/metadata/md5-cache/dev-ml/atdgen-1.12.0
index 77d71e0b95bc..6625e2b99f54 100644
--- a/metadata/md5-cache/dev-ml/atdgen-1.12.0
+++ b/metadata/md5-cache/dev-ml/atdgen-1.12.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/atd:= dev-ml/biniou:= dev-ml/yojson:=
 SLOT=0/1.12.0
 SRC_URI=https://github.com/mjambon/atd/archive/v1.12.0.tar.gz -> atd-1.12.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=8f1b88749673137817dd51c9e760d696
diff --git a/metadata/md5-cache/dev-ml/batteries-2.7.0 b/metadata/md5-cache/dev-ml/batteries-2.7.0
index bfc92842c362..f09a687cd259 100644
--- a/metadata/md5-cache/dev-ml/batteries-2.7.0
+++ b/metadata/md5-cache/dev-ml/batteries-2.7.0
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camomile:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/2.7.0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v2.7.0.tar.gz -> batteries-2.7.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bb20054f840efe54ab07376895c7c5a
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=951448ab2ff88af375f944ee07a22905
diff --git a/metadata/md5-cache/dev-ml/biniou-1.0.12 b/metadata/md5-cache/dev-ml/biniou-1.0.12
index 021debe39734..a7ea299fc034 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.0.12
+++ b/metadata/md5-cache/dev-ml/biniou-1.0.12
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
 SLOT=0/1.0.12
 SRC_URI=https://github.com/mjambon/biniou/archive/v1.0.12.tar.gz -> biniou-1.0.12.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=918cdf4fdd785509dd6d863cf65ca27a
diff --git a/metadata/md5-cache/dev-ml/biniou-1.0.13 b/metadata/md5-cache/dev-ml/biniou-1.0.13
index 723f4bdf5877..bfd48a9c0b0e 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.0.13
+++ b/metadata/md5-cache/dev-ml/biniou-1.0.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
 SLOT=0/1.0.13
 SRC_URI=https://github.com/mjambon/biniou/archive/v1.0.13.tar.gz -> biniou-1.0.13.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2d42a0143d49d564efa6218f47916204
diff --git a/metadata/md5-cache/dev-ml/biniou-1.1.0 b/metadata/md5-cache/dev-ml/biniou-1.1.0
index 4bd42582b786..8ab968809307 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.1.0
+++ b/metadata/md5-cache/dev-ml/biniou-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
 SLOT=0/1.1.0
 SRC_URI=https://github.com/mjambon/biniou/archive/v1.1.0.tar.gz -> biniou-1.1.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0737b25fd7076c9b7fd353f69672dcb4
diff --git a/metadata/md5-cache/dev-ml/biniou-1.2.0 b/metadata/md5-cache/dev-ml/biniou-1.2.0
index 12295737f4b8..cef35625f20e 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.2.0
+++ b/metadata/md5-cache/dev-ml/biniou-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/biniou/archive/v1.2.0.tar.gz -> biniou-1.2.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0737b25fd7076c9b7fd353f69672dcb4
diff --git a/metadata/md5-cache/dev-ml/bolt-1.4 b/metadata/md5-cache/dev-ml/bolt-1.4
index 1a2e7cd9614b..fa52237060e8 100644
--- a/metadata/md5-cache/dev-ml/bolt-1.4
+++ b/metadata/md5-cache/dev-ml/bolt-1.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/camlp4:=
 SLOT=0/1.4
 SRC_URI=http://bolt.x9c.fr/distrib/bolt-1.4.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=418d85c8966f60eaee067b60a6d25845
diff --git a/metadata/md5-cache/dev-ml/bos-0.1.6 b/metadata/md5-cache/dev-ml/bos-0.1.6
index a00a95f1e018..5f6c178bfeb3 100644
--- a/metadata/md5-cache/dev-ml/bos-0.1.6
+++ b/metadata/md5-cache/dev-ml/bos-0.1.6
@@ -7,6 +7,7 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/rresult:= dev-ml/astring:= dev-ml/fpath:= dev-ml/fmt:= dev-ml/logs:=
+RESTRICT=!test? ( test )
 SLOT=0/0.1.6
 SRC_URI=http://erratique.ch/software/bos/releases/bos-0.1.6.tbz
-_md5_=5feb11d48b357c79cd257e71a3d398cf
+_md5_=2f5814171c21faa368bee3b9bb577962
diff --git a/metadata/md5-cache/dev-ml/bson-0.89.3 b/metadata/md5-cache/dev-ml/bson-0.89.3
index cfcc5636f11b..fbcf1d8d227b 100644
--- a/metadata/md5-cache/dev-ml/bson-0.89.3
+++ b/metadata/md5-cache/dev-ml/bson-0.89.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.89.3
 SRC_URI=https://github.com/MassD/bson/archive/v0.89.3.tar.gz -> bson-0.89.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21393e6ddf061bd0a070aca883812dbd
diff --git a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0 b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
index acc84e34eeaa..9fc49ea5dff2 100644
--- a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
+++ b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango )
 SLOT=0/1.2.0
 SRC_URI=https://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d478e67ee434d086c0dae852b3bb609
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index 656a8ef031b4..175560161a2e 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/2.04
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90f560df3cde1413499b2a5ec1fa6ea9
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.6.0 b/metadata/md5-cache/dev-ml/camlbz2-0.6.0
index ac6cf78bfdaf..1c48a9a73e8f 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.6.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.6.0
@@ -9,5 +9,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0ba8d11a5df6d82082e665cb66098d71
diff --git a/metadata/md5-cache/dev-ml/camldbm-1.0 b/metadata/md5-cache/dev-ml/camldbm-1.0
index 4a9aee7666d0..9cc4bf3d3f30 100644
--- a/metadata/md5-cache/dev-ml/camldbm-1.0
+++ b/metadata/md5-cache/dev-ml/camldbm-1.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=sys-libs/gdbm-1.9.1-r2[berkdb] >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/1.0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/728/camldbm-1.0.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8dcecc4caa01d97e859f598c5e422220
diff --git a/metadata/md5-cache/dev-ml/camlidl-1.05-r1 b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
index d6bea2cc0aca..b0eae1e8713e 100644
--- a/metadata/md5-cache/dev-ml/camlidl-1.05-r1
+++ b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
@@ -8,5 +8,5 @@ LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
 SLOT=0/1.05
 SRC_URI=http://caml.inria.fr/distrib/bazar-ocaml/camlidl-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b416fdadf6f3dc00428c0073c3057992
diff --git a/metadata/md5-cache/dev-ml/camlimages-4.2.2 b/metadata/md5-cache/dev-ml/camlimages-4.2.2
index c812105bf3af..4fa83a889bb7 100644
--- a/metadata/md5-cache/dev-ml/camlimages-4.2.2
+++ b/metadata/md5-cache/dev-ml/camlimages-4.2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) X? ( x11-apps/rgb ) sys-libs/zlib
 SLOT=0/4.2.2
 SRC_URI=https://bitbucket.org/camlspotter/camlimages/get/4.2.2.tar.bz2 -> camlimages-4.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=4f677aece91eed2f7412d4e6a1418989
diff --git a/metadata/md5-cache/dev-ml/camlimages-4.2.3 b/metadata/md5-cache/dev-ml/camlimages-4.2.3
index d9a72263fa99..64305ad130e5 100644
--- a/metadata/md5-cache/dev-ml/camlimages-4.2.3
+++ b/metadata/md5-cache/dev-ml/camlimages-4.2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) X? ( x11-apps/rgb ) sys-libs/zlib
 SLOT=0/4.2.3
 SRC_URI=https://bitbucket.org/camlspotter/camlimages/get/4.2.3.tar.bz2 -> camlimages-4.2.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1c0a5f16028a6d0d96fcaf50a5a074b8
diff --git a/metadata/md5-cache/dev-ml/camlimages-4.2.4 b/metadata/md5-cache/dev-ml/camlimages-4.2.4
index 87ba0fd8bbab..ac5a2b903320 100644
--- a/metadata/md5-cache/dev-ml/camlimages-4.2.4
+++ b/metadata/md5-cache/dev-ml/camlimages-4.2.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[X?,ocamlopt] exif? ( media-libs/libexif ) gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.4:0 ) postscript? ( app-text/ghostscript-gpl ) truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm ) X? ( x11-apps/rgb ) sys-libs/zlib
 SLOT=0/4.2.4
 SRC_URI=https://bitbucket.org/camlspotter/camlimages/get/4.2.4.tar.bz2 -> camlimages-4.2.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1c0a5f16028a6d0d96fcaf50a5a074b8
diff --git a/metadata/md5-cache/dev-ml/camlp5-6.17 b/metadata/md5-cache/dev-ml/camlp5-6.17
index d6a08fdfcf08..eb8e051123eb 100644
--- a/metadata/md5-cache/dev-ml/camlp5-6.17
+++ b/metadata/md5-cache/dev-ml/camlp5-6.17
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] <=dev-lang/ocaml-4.4.2
 SLOT=0/6.17
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel617.tar.gz -> camlp5-6.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ccaabd18e7744a09092710ff8d5ecf5b
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.00 b/metadata/md5-cache/dev-ml/camlp5-7.00
index 1bf3bbf6479a..f3406dceedf6 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.00
+++ b/metadata/md5-cache/dev-ml/camlp5-7.00
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] <=dev-lang/ocaml-4.6.0
 SLOT=0/7.00
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel700.tar.gz -> camlp5-7.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5830bb88928f93d721ce5859e5302729
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.01 b/metadata/md5-cache/dev-ml/camlp5-7.01
index e5cae0ca6bae..85f34c132264 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.01
+++ b/metadata/md5-cache/dev-ml/camlp5-7.01
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] <=dev-lang/ocaml-4.6.0
 SLOT=0/7.01
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel701.tar.gz -> camlp5-7.01.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5830bb88928f93d721ce5859e5302729
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.03 b/metadata/md5-cache/dev-ml/camlp5-7.03
index 8c6dbaf2aaa8..7387c2e5097d 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.03
+++ b/metadata/md5-cache/dev-ml/camlp5-7.03
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] <=dev-lang/ocaml-4.6.0
 SLOT=0/7.03
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel703.tar.gz -> camlp5-7.03.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5830bb88928f93d721ce5859e5302729
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.1.1 b/metadata/md5-cache/dev-ml/camlpdf-2.1.1
deleted file mode 100644
index 9294add43ff1..000000000000
--- a/metadata/md5-cache/dev-ml/camlpdf-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=OCaml library for reading, writing, and modifying PDF files
-EAPI=5
-HOMEPAGE=https://github.com/johnwhitington/camlpdf/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=
-SLOT=0/2.1.1
-SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.1.1.tar.gz -> camlpdf-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26e30cb25577f04803cd1915d654a3a1
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.2.1 b/metadata/md5-cache/dev-ml/camlpdf-2.2.1
index fa70f52ad693..ed765b894c40 100644
--- a/metadata/md5-cache/dev-ml/camlpdf-2.2.1
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt]
 SLOT=0/2.2.1
 SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.2.1.tar.gz -> camlpdf-2.2.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=560a8ec33d2a73ffc2cf6d8d29f289b1
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.3 b/metadata/md5-cache/dev-ml/camlpdf-2.3
new file mode 100644
index 000000000000..4ce4e6c11f35
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=OCaml library for reading, writing, and modifying PDF files
+EAPI=7
+HOMEPAGE=https://github.com/johnwhitington/camlpdf/
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-lang/ocaml:=[ocamlopt]
+SLOT=0/2.3
+SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.3.tar.gz -> camlpdf-2.3.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=0d359c4840afbfdbf87c8432fcfcdf42
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.06 b/metadata/md5-cache/dev-ml/camlzip-1.06
index e9160f987f7e..b68106b0aae8 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.06
+++ b/metadata/md5-cache/dev-ml/camlzip-1.06
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] >=sys-libs/zlib-1.1.3
 SLOT=1/1.06
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1616/camlzip-1.06.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43b91b07f7bf802eb020c72f82108bb6
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.07 b/metadata/md5-cache/dev-ml/camlzip-1.07
index 8b35e3d68a01..b080b281728d 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.07
+++ b/metadata/md5-cache/dev-ml/camlzip-1.07
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] >=sys-libs/zlib-1.1.3
 SLOT=1/1.07
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz -> camlzip-1.07.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d3d101c421cac38e20717377acb36778
diff --git a/metadata/md5-cache/dev-ml/camomile-0.8.5-r1 b/metadata/md5-cache/dev-ml/camomile-0.8.5-r1
index 04c3cee498e1..4a60a206c306 100644
--- a/metadata/md5-cache/dev-ml/camomile-0.8.5-r1
+++ b/metadata/md5-cache/dev-ml/camomile-0.8.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:=
 SLOT=0/0.8.5
 SRC_URI=https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09234b3c14624f11f95d9f77e23a0bca
diff --git a/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0 b/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
index 625aa7a82c6c..ab5dc302cdaf 100644
--- a/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
+++ b/metadata/md5-cache/dev-ml/capnp-ocaml-3.0.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/pelzlpj/capnp-ocaml/archive/v3.0.0.tar.gz -> capnp-ocaml-3.0.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=a1e142261b117d0c118b1c79b7e385d5
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=c5f0cbf17b89df7dce39cb4865d7f1b9
diff --git a/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0 b/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
index bc18abacb6c8..b2f5996550d1 100644
--- a/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
+++ b/metadata/md5-cache/dev-ml/capnp-ocaml-3.1.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/core_kernel:= dev-ml/ocaml-extunix:= dev-ml/ocplib-endian:= dev-ml/res:= dev-ml/ocaml-uint:= dev-libs/capnproto:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.1.0
 SRC_URI=https://github.com/pelzlpj/capnp-ocaml/archive/v3.1.0.tar.gz -> capnp-ocaml-3.1.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=a1e142261b117d0c118b1c79b7e385d5
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=c5f0cbf17b89df7dce39cb4865d7f1b9
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.0 b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
index e23508b5ddd7..062c116773b5 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.0
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.0.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.1 b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
index a6d6175f197e..0adcfb1a870a 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.1
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.1.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.2 b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
index 15fe13883677..b0c36b8863ce 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.2
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=673c48e7a65d135d5665b2c36846e6eb
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=79feb9b363ab3054388233c3afeb32cf
diff --git a/metadata/md5-cache/dev-ml/core-0.9.1-r1 b/metadata/md5-cache/dev-ml/core-0.9.1-r1
index b15aaf391507..d6683af2f1a7 100644
--- a/metadata/md5-cache/dev-ml/core-0.9.1-r1
+++ b/metadata/md5-cache/dev-ml/core-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/core/archive/v0.9.1.tar.gz -> core-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=df4572d1e1b80028c10da6de7016e9ff
diff --git a/metadata/md5-cache/dev-ml/core-0.9.2 b/metadata/md5-cache/dev-ml/core-0.9.2
index 9476e05974f9..cf1757627ff9 100644
--- a/metadata/md5-cache/dev-ml/core-0.9.2
+++ b/metadata/md5-cache/dev-ml/core-0.9.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/core/archive/v0.9.2.tar.gz -> core-0.9.2.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=aee3b69142b609b9a4a6bf0f5895800f
diff --git a/metadata/md5-cache/dev-ml/cppo-1.4.1 b/metadata/md5-cache/dev-ml/cppo-1.4.1
index 308a4983ec9f..c4acd506f546 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.4.1
+++ b/metadata/md5-cache/dev-ml/cppo-1.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.12:= dev-ml/ocamlbuild:=
 SLOT=0/1.4.1
 SRC_URI=https://github.com/mjambon/cppo/archive/v1.4.1.tar.gz -> cppo-1.4.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=1fde101bf2915947b436f6b5eb28aeb6
diff --git a/metadata/md5-cache/dev-ml/cppo-1.5.0 b/metadata/md5-cache/dev-ml/cppo-1.5.0
index 33649730f37a..45e2bdcbadfc 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.5.0
+++ b/metadata/md5-cache/dev-ml/cppo-1.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild:=[ocamlopt?]
 SLOT=0/1.5.0
 SRC_URI=https://github.com/mjambon/cppo/archive/v1.5.0.tar.gz -> cppo-1.5.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=7984fbcff953ecdf60fd061da222bb85
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.10 b/metadata/md5-cache/dev-ml/cryptokit-1.10
index 714d58820a62..efae8dc23280 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.10
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.10
@@ -7,7 +7,8 @@ IUSE=zlib +ocamlopt debug doc test
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.10
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26918f617760751c66ea0fe5135b623f
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.11 b/metadata/md5-cache/dev-ml/cryptokit-1.11
index 09e6a22f333a..4104b2cf9bf1 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.11
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.11
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=LGPL-2
 RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 REQUIRED_USE=test? ( ocamlopt )
+RESTRICT=!test? ( test )
 SLOT=0/1.11
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e95d21db4155fdf397dfe8e6e68a2472
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.12 b/metadata/md5-cache/dev-ml/cryptokit-1.12
index 4d731135b783..7115399e44a3 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.12
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.12
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~ppc
 LICENSE=LGPL-2
 RDEPEND=zlib? ( >=sys-libs/zlib-1.1 ) dev-ml/zarith:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 REQUIRED_USE=test? ( ocamlopt )
+RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/xavierleroy/cryptokit/archive/release112.tar.gz -> cryptokit-1.12.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6f73a4599648910ece18abf92c642654
diff --git a/metadata/md5-cache/dev-ml/csv-1.5 b/metadata/md5-cache/dev-ml/csv-1.5
index 2e930698717b..bf9a90fbb856 100644
--- a/metadata/md5-cache/dev-ml/csv-1.5
+++ b/metadata/md5-cache/dev-ml/csv-1.5
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.5
 SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7eecf398f6f1ab0cb7e76a9704061e26
diff --git a/metadata/md5-cache/dev-ml/csv-1.6 b/metadata/md5-cache/dev-ml/csv-1.6
index e3129a9847b4..8a5c1d632329 100644
--- a/metadata/md5-cache/dev-ml/csv-1.6
+++ b/metadata/md5-cache/dev-ml/csv-1.6
@@ -7,7 +7,8 @@ IUSE=+lwt +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.6
 SRC_URI=https://github.com/Chris00/ocaml-csv/releases/download/1.6/csv-1.6.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7846eaaef4cb64d34d3ef6d65a69a49
diff --git a/metadata/md5-cache/dev-ml/csv-1.7 b/metadata/md5-cache/dev-ml/csv-1.7
index d7f8111210f5..625534025445 100644
--- a/metadata/md5-cache/dev-ml/csv-1.7
+++ b/metadata/md5-cache/dev-ml/csv-1.7
@@ -7,7 +7,8 @@ IUSE=+lwt +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.7
 SRC_URI=https://github.com/Chris00/ocaml-csv/archive/1.7.tar.gz -> csv-1.7.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=53da00c4126aa34709d4d08436dbe083
diff --git a/metadata/md5-cache/dev-ml/cudf-0.8-r1 b/metadata/md5-cache/dev-ml/cudf-0.8-r1
index 188f343b6431..347018eacef0 100644
--- a/metadata/md5-cache/dev-ml/cudf-0.8-r1
+++ b/metadata/md5-cache/dev-ml/cudf-0.8-r1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 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:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/34659/cudf-0.8.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be87acb995abe5a2dc59d3ea36c4be3e
+_md5_=18219ae01e558a6a4550ddec583ed33a
diff --git a/metadata/md5-cache/dev-ml/deriving-0.7.1 b/metadata/md5-cache/dev-ml/deriving-0.7.1
index 92862cb52847..c9b77baed5b0 100644
--- a/metadata/md5-cache/dev-ml/deriving-0.7.1
+++ b/metadata/md5-cache/dev-ml/deriving-0.7.1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-ml/type-conv-108:= dev-ml/optcomp:= dev-ml/findlib:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.7.1
 SRC_URI=https://github.com/ocsigen/deriving/archive/0.7.1.tar.gz -> deriving-0.7.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0fd38769fbc139df9d8f2e108fd910ac
diff --git a/metadata/md5-cache/dev-ml/dns-1.0.0 b/metadata/md5-cache/dev-ml/dns-1.0.0
index 04b5dafc487f..c10213ba5f1a 100644
--- a/metadata/md5-cache/dev-ml/dns-1.0.0
+++ b/metadata/md5-cache/dev-ml/dns-1.0.0
@@ -9,5 +9,5 @@ RDEPEND=>=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml
 RESTRICT=test
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=6ce03d8214e5fe840ad2c595ed1061f5
diff --git a/metadata/md5-cache/dev-ml/dns-async-1.0.0 b/metadata/md5-cache/dev-ml/dns-async-1.0.0
index 3d8027787241..edfa41991663 100644
--- a/metadata/md5-cache/dev-ml/dns-async-1.0.0
+++ b/metadata/md5-cache/dev-ml/dns-async-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:= dev-ml/async:= dev-ml/dns:= >=dev-lang/ocaml-4:=
 RESTRICT=test
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/ocaml-dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=e57db79757a5e68489eb92b7d3ab26ec
diff --git a/metadata/md5-cache/dev-ml/dns-lwt-1.0.0 b/metadata/md5-cache/dev-ml/dns-lwt-1.0.0
index b882b7de7ac4..97e62a4c6a65 100644
--- a/metadata/md5-cache/dev-ml/dns-lwt-1.0.0
+++ b/metadata/md5-cache/dev-ml/dns-lwt-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:= dev-ml/lwt:= dev-ml/dns:= dev-ml/mirage-profile:= >
 RESTRICT=test
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/ocaml-dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=14e4d9980c24a5e7b3c6530658f3183d
diff --git a/metadata/md5-cache/dev-ml/dns-lwt-unix-1.0.0 b/metadata/md5-cache/dev-ml/dns-lwt-unix-1.0.0
index 745e006a4869..880341c5feb6 100644
--- a/metadata/md5-cache/dev-ml/dns-lwt-unix-1.0.0
+++ b/metadata/md5-cache/dev-ml/dns-lwt-unix-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:= dev-ml/dns-lwt:= dev-ml/dns:= dev-ml/cmdliner:= dev
 RESTRICT=test
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/ocaml-dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=39b05dcbb156e96be60a30359275d00f
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1 b/metadata/md5-cache/dev-ml/dose3-5.0.1
index a97b102e8f5a..9f2a17bd7654 100644
--- a/metadata/md5-cache/dev-ml/dose3-5.0.1
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:=
 RESTRICT=test
 SLOT=0/5.0.1
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0bd92c44c5624b8fac4e4e806e1d3556
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=25ba7b6e057ca6cbde1e880a304e89d4
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.0.2 b/metadata/md5-cache/dev-ml/easy-format-1.0.2
index 2dce58b17220..9dcac8dea3bd 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.0.2
+++ b/metadata/md5-cache/dev-ml/easy-format-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.2
 SRC_URI=http://mjambon.com/releases/easy-format/easy-format-1.0.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=efc71a1d6389ea34bfdd4d040edd7f3b
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.2.0 b/metadata/md5-cache/dev-ml/easy-format-1.2.0
index 46421c446047..9e6e8f2b13b3 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=6e7952ad6480e325dea6b9fd42f83911
diff --git a/metadata/md5-cache/dev-ml/eliom-6.2.0 b/metadata/md5-cache/dev-ml/eliom-6.2.0
index f96dc7ee9651..b3078db10e9e 100644
--- a/metadata/md5-cache/dev-ml/eliom-6.2.0
+++ b/metadata/md5-cache/dev-ml/eliom-6.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-ml/js_of_ocaml-2.8.2:=[xml] >=www-servers/ocsigenserver-2.8:= >=dev-ml/tyxml-4:= >=dev-ml/deriving-0.6:= >=dev-ml/reactiveData-0.2.1:= dev-ml/ocaml-ipaddr:= dev-ml/react:= dev-ml/ocaml-ssl:= >=dev-ml/lwt-2.5.0:= dev-ml/lwt_react:= dev-ml/camlp4:= ppx? ( >=dev-ml/ppx_tools-0.99.3:= )
 SLOT=0/6.2.0
 SRC_URI=https://github.com/ocsigen/eliom/archive/6.2.0.tar.gz -> eliom-6.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d832036c26a5349ca021f487b5f02256
diff --git a/metadata/md5-cache/dev-ml/eliom-9999 b/metadata/md5-cache/dev-ml/eliom-9999
index 5e70a93f0c41..3829b91ba1f2 100644
--- a/metadata/md5-cache/dev-ml/eliom-9999
+++ b/metadata/md5-cache/dev-ml/eliom-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 PROPERTIES=live
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-ml/js_of_ocaml-2.8.2:=[xml] >=www-servers/ocsigenserver-2.8:= >=dev-ml/tyxml-4:= >=dev-ml/deriving-0.6:= >=dev-ml/reactiveData-0.2.1:= dev-ml/ocaml-ipaddr:= dev-ml/react:= dev-ml/ocaml-ssl:= >=dev-ml/lwt-2.5.0:= dev-ml/lwt_react:= dev-ml/camlp4:= ppx? ( >=dev-ml/ppx_tools-0.99.3:= )
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e284de7fc5cd8d76d9d87d46bd334bba
diff --git a/metadata/md5-cache/dev-ml/enumerate-111.08.00-r1 b/metadata/md5-cache/dev-ml/enumerate-111.08.00-r1
index 7f238b1c1364..94bad0ebe8e0 100644
--- a/metadata/md5-cache/dev-ml/enumerate-111.08.00-r1
+++ b/metadata/md5-cache/dev-ml/enumerate-111.08.00-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/type-conv-111.13:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/111.08.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz https://dev.gentoo.org/~aballier/distfiles/enumerate-111.08.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d25559d71792177b9a76ea824e9a072c
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.1 b/metadata/md5-cache/dev-ml/extlib-1.7.1
index 0d729c3c545d..59f3a113434e 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.1
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:=
 SLOT=0/1.7.1
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.1.tar.gz -> extlib-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e7c9875ee0c6eed8e8398f02f7cc0a9d
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.2 b/metadata/md5-cache/dev-ml/extlib-1.7.2
index 0acdb0aa5713..a7ae0f9ebf3b 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.2
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/cppo:=
 SLOT=0/1.7.2
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.2.tar.gz -> extlib-1.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fadf18a6216fc35043292e9cb4cafa5
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.1 b/metadata/md5-cache/dev-ml/findlib-1.7.1
index 38ceebfcba9f..bc8d337475df 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.1
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f08859c6215a2d549dd68ebf39a8edb9
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.2 b/metadata/md5-cache/dev-ml/findlib-1.7.2
index 6ed9b8adc291..19fcf5c18281 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.2
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed31efdc6806add58e45e92e6de374ec
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.3 b/metadata/md5-cache/dev-ml/findlib-1.7.3
index 87afa3edcaa5..720ba5a387c9 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.3
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9262a5adbd7b7bba438849a106e4a514
diff --git a/metadata/md5-cache/dev-ml/flow_parser-0.50.0 b/metadata/md5-cache/dev-ml/flow_parser-0.50.0
index 7d23946e4a86..aa19ae73c939 100644
--- a/metadata/md5-cache/dev-ml/flow_parser-0.50.0
+++ b/metadata/md5-cache/dev-ml/flow_parser-0.50.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/sedlex:=
 SLOT=0/0.50.0
 SRC_URI=https://github.com/facebook/flow/archive/v0.50.0.tar.gz -> flow-0.50.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/metadata/md5-cache/dev-ml/flow_parser-0.51.0 b/metadata/md5-cache/dev-ml/flow_parser-0.51.0
index 6bb9c8621683..6d29f48bfe5b 100644
--- a/metadata/md5-cache/dev-ml/flow_parser-0.51.0
+++ b/metadata/md5-cache/dev-ml/flow_parser-0.51.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/sedlex:=
 SLOT=0/0.51.0
 SRC_URI=https://github.com/facebook/flow/archive/v0.51.0.tar.gz -> flow-0.51.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/metadata/md5-cache/dev-ml/flow_parser-0.52.0 b/metadata/md5-cache/dev-ml/flow_parser-0.52.0
index f0b2dd499f7a..eb73701e58f7 100644
--- a/metadata/md5-cache/dev-ml/flow_parser-0.52.0
+++ b/metadata/md5-cache/dev-ml/flow_parser-0.52.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/sedlex:=
 SLOT=0/0.52.0
 SRC_URI=https://github.com/facebook/flow/archive/v0.52.0.tar.gz -> flow-0.52.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2117e50326d7c232c53edc83efcc5ea0
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
index 8e8c512296a2..55a9fc9f5ee2 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.4
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.8.4
 SRC_URI=http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=3fa32445820b291255570863e7370f5f
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=a5e4eaeea3f00b0446c044271b023de4
diff --git a/metadata/md5-cache/dev-ml/fort-0.4.2 b/metadata/md5-cache/dev-ml/fort-0.4.2
index c8687208e818..f38011b073bf 100644
--- a/metadata/md5-cache/dev-ml/fort-0.4.2
+++ b/metadata/md5-cache/dev-ml/fort-0.4.2
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/0.4.2
 SRC_URI=mirror://sourceforge/fort/0.4.2/fort-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e00157e1fd21faec6b38f513670db93f
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.2 b/metadata/md5-cache/dev-ml/fpath-0.7.2
index d42eab61fec4..f4bbfdf5ca16 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.2
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.2
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.2
 SRC_URI=http://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=4f19f4661dd9d1c4a0500436dfb86298
diff --git a/metadata/md5-cache/dev-ml/gd4o-1.0_alpha5 b/metadata/md5-cache/dev-ml/gd4o-1.0_alpha5
index 9996a96b52e5..576512e316fb 100644
--- a/metadata/md5-cache/dev-ml/gd4o-1.0_alpha5
+++ b/metadata/md5-cache/dev-ml/gd4o-1.0_alpha5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] media-libs/gd[jpeg,png] virtual/jpeg:0 sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2
 SLOT=0/1.0_alpha5
 SRC_URI=mirror://sourceforge/gd4o/gd4o-1.0a5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=340a184eea9fd03ab7ba7c7f684ce5e1
diff --git a/metadata/md5-cache/dev-ml/gen-0.4.0.1 b/metadata/md5-cache/dev-ml/gen-0.4.0.1
index f8313f91be34..fa615813128a 100644
--- a/metadata/md5-cache/dev-ml/gen-0.4.0.1
+++ b/metadata/md5-cache/dev-ml/gen-0.4.0.1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.4.0.1
 SRC_URI=https://github.com/c-cube/gen/archive/0.4.0.1.tar.gz -> gen-0.4.0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a392610245c386561aa4f740d8bc4f92
diff --git a/metadata/md5-cache/dev-ml/gen_js_api-1.0.3 b/metadata/md5-cache/dev-ml/gen_js_api-1.0.3
index 84af27bab2ce..befdaad18345 100644
--- a/metadata/md5-cache/dev-ml/gen_js_api-1.0.3
+++ b/metadata/md5-cache/dev-ml/gen_js_api-1.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/1.0.3
 SRC_URI=https://github.com/LexiFi/gen_js_api/archive/v1.0.3.tar.gz -> gen_js_api-1.0.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0d43ddb582bc57237567d9b0e8fb3122
diff --git a/metadata/md5-cache/dev-ml/gen_js_api-1.0.4 b/metadata/md5-cache/dev-ml/gen_js_api-1.0.4
index 1c50d28b9e9b..ad7e6ffcf982 100644
--- a/metadata/md5-cache/dev-ml/gen_js_api-1.0.4
+++ b/metadata/md5-cache/dev-ml/gen_js_api-1.0.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.05:=
 SLOT=0/1.0.4
 SRC_URI=https://github.com/LexiFi/gen_js_api/archive/v1.0.4.tar.gz -> gen_js_api-1.0.4.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=7e7335490a538e845794e67367438225
diff --git a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1 b/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
index e6d91014efa1..451dc64f9c91 100644
--- a/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
+++ b/metadata/md5-cache/dev-ml/gsl-ocaml-1.19.1
@@ -7,7 +7,8 @@ IUSE=examples test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/gsl-1.19 !dev-ml/ocamlgsl >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/v1.19.1/gsl-ocaml-1.19.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9627e4bd10aec9b569f23141d2b7f820
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e51bbfdd30287784d373ea37fdd5a225
diff --git a/metadata/md5-cache/dev-ml/herelib-112.35.00 b/metadata/md5-cache/dev-ml/herelib-112.35.00
index 03b7d63ede9d..45962c76fd1f 100644
--- a/metadata/md5-cache/dev-ml/herelib-112.35.00
+++ b/metadata/md5-cache/dev-ml/herelib-112.35.00
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.00.0:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/112.35.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/112.35/files/herelib-112.35.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6798d531c2c892b90c3c01c086ae7f57
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.5 b/metadata/md5-cache/dev-ml/iTeML-2.5
index c6e9fbba1b32..4833ab667b2d 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.5
+++ b/metadata/md5-cache/dev-ml/iTeML-2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.5
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.5.tar.gz -> iTeML-2.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.6 b/metadata/md5-cache/dev-ml/iTeML-2.6
index fe9a6a1d14fd..2b7f99e3a096 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.6
+++ b/metadata/md5-cache/dev-ml/iTeML-2.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.6
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.6.tar.gz -> iTeML-2.6.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/iTeML-2.7 b/metadata/md5-cache/dev-ml/iTeML-2.7
index 46376fed3a93..b82d774b9071 100644
--- a/metadata/md5-cache/dev-ml/iTeML-2.7
+++ b/metadata/md5-cache/dev-ml/iTeML-2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-ml/ounit:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/qcheck-0.5:=
 SLOT=0/2.7
 SRC_URI=https://github.com/vincent-hugot/iTeML/archive/v2.7.tar.gz -> iTeML-2.7.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=8b17093b979998210dd621ee22e3b8da
diff --git a/metadata/md5-cache/dev-ml/io-page-1.6.0 b/metadata/md5-cache/dev-ml/io-page-1.6.0
index 0583a32ce79a..9a5a3ce045a3 100644
--- a/metadata/md5-cache/dev-ml/io-page-1.6.0
+++ b/metadata/md5-cache/dev-ml/io-page-1.6.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:= >=dev-ml/ocaml-cstruct-1.1.0:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.6.0
 SRC_URI=https://github.com/mirage/io-page/archive/v1.6.0.tar.gz -> io-page-1.6.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f133b8102000fe96d1b3e549abf8129
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
index 179dad6adcb0..9dbe34c7f088 100644
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
+++ b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0_beta14
 SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz -> jbuilder-1.0-beta14.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=281533637252a9fb9df3516f20d92c45
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=c506b3bd50e5dc7af6ef1e8ceab4a7b5
diff --git a/metadata/md5-cache/dev-ml/js-build-tools-113.33.04 b/metadata/md5-cache/dev-ml/js-build-tools-113.33.04
index 8f9af013254f..ce1f7447ccc5 100644
--- a/metadata/md5-cache/dev-ml/js-build-tools-113.33.04
+++ b/metadata/md5-cache/dev-ml/js-build-tools-113.33.04
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ocamlbuild:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/113.33.04
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.33/files/js-build-tools-113.33.04.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdc5f59e4232d59f6388e9cfc27c8b6f
diff --git a/metadata/md5-cache/dev-ml/js-build-tools-113.33.06 b/metadata/md5-cache/dev-ml/js-build-tools-113.33.06
index a0435500a94c..aa0697b9fb7a 100644
--- a/metadata/md5-cache/dev-ml/js-build-tools-113.33.06
+++ b/metadata/md5-cache/dev-ml/js-build-tools-113.33.06
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/ocamlbuild:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/113.33.06
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.33/files/js-build-tools-113.33.06.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fdc5f59e4232d59f6388e9cfc27c8b6f
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2 b/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
index d90ff4da36f7..10943d49cb39 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-2.8.4-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] >=dev-ml/lwt-2.4.4:=[camlp4(+)] react? ( dev-ml/react:= dev-ml/reactiveData:= ) xml? ( >=dev-ml/tyxml-4:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) dev-ml/cmdliner:= dev-ml/menhir:= dev-ml/ocaml-base64:= dev-ml/camlp4:= dev-ml/cppo:= dev-ml/uchar:= dev-ml/ocamlbuild:= dev-ml/yojson:= dev-ml/ocaml-migrate-parsetree:= deriving? ( >=dev-ml/deriving-0.6:= )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/2.8.4.tar.gz -> js_of_ocaml-2.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d1076348e2e995e922fb6497b7e252ba
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0 b/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
index 0f9e73fb1cdb..bf60fc393e29 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-3.0.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] camlp4? ( dev-ml/camlp4:= ) dev-ml/cmdliner:= dev-ml/cppo:= lwt? ( >=dev-ml/lwt-2.4.4:= ) dev-ml/ocamlbuild:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/uchar:= ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
 REQUIRED_USE=xml? ( ppx )
+RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocsigen/js_of_ocaml/archive/3.0.0.tar.gz -> js_of_ocaml-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b0ac6d60087ed4e9921892d3d8547b6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f054e0c49f7c6079c28853eae21a3a8b
diff --git a/metadata/md5-cache/dev-ml/js_of_ocaml-9999 b/metadata/md5-cache/dev-ml/js_of_ocaml-9999
index c97cd070ebda..6a24dae0f5c6 100644
--- a/metadata/md5-cache/dev-ml/js_of_ocaml-9999
+++ b/metadata/md5-cache/dev-ml/js_of_ocaml-9999
@@ -8,6 +8,7 @@ LICENSE=LGPL-2.1-with-linking-exception
 PROPERTIES=live
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] camlp4? ( dev-ml/camlp4:= ) dev-ml/cmdliner:= dev-ml/cppo:= lwt? ( >=dev-ml/lwt-2.4.4:= ) dev-ml/ocamlbuild:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/uchar:= ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= ) xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
 REQUIRED_USE=xml? ( ppx )
+RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1409ef1c5ac0ae0ade05e3662d0ce652
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7a2d109691f312ead72a22cd45434578
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 553d25e0fcf6..bcb179bd1056 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -8,5 +8,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=b43f5749f7d472155a39fdfb392a7d7b
diff --git a/metadata/md5-cache/dev-ml/kaputt-1.2 b/metadata/md5-cache/dev-ml/kaputt-1.2
index 76eac8825651..7baa024ba91a 100644
--- a/metadata/md5-cache/dev-ml/kaputt-1.2
+++ b/metadata/md5-cache/dev-ml/kaputt-1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt]
 SLOT=0/1.2
 SRC_URI=http://kaputt.x9c.fr/distrib/kaputt-1.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2ab3b9ba1637817a70218f644e46d242
diff --git a/metadata/md5-cache/dev-ml/lablgl-1.05-r1 b/metadata/md5-cache/dev-ml/lablgl-1.05-r1
index 41ca924502c1..721d94b8f479 100644
--- a/metadata/md5-cache/dev-ml/lablgl-1.05-r1
+++ b/metadata/md5-cache/dev-ml/lablgl-1.05-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] x11-libs/libXext x11-libs/libXmu x11-libs/libX11 virtual/opengl virtual/glu dev-ml/camlp4:= glut? ( media-libs/freeglut ) tk? ( >=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= dev-ml/labltk:= )
 SLOT=0/1.05
 SRC_URI=http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgl-1.05.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8e4cd7db9e2dd39af27a6392c9740d4
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.5 b/metadata/md5-cache/dev-ml/lablgtk-2.18.5
index bd43198ed2ff..b1c64f45af12 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.5
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=x11-libs/gtk+-2.10:2 >=dev-lang/ocaml-3.10:=[ocamlopt?] svg? ( >=gnome-base/librsvg-2.2:2 ) glade? ( >=gnome-base/libglade-2.0.1 ) gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 ) opengl? ( >=dev-ml/lablgl-0.98:= >=x11-libs/gtkglarea-1.9:2 ) spell? ( app-text/gtkspell:2 ) sourceview? ( x11-libs/gtksourceview:2.0 ) dev-ml/camlp4:=
 SLOT=2/2.18.5
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=da8f1f219048318ac6b42c593955c85a
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.2 b/metadata/md5-cache/dev-ml/labltk-8.06.2
index 1a00643718e0..3e1fba3a7ab3 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.2
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.2
@@ -9,5 +9,5 @@ LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]
 SLOT=0/8.06.2
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1628/labltk-8.06.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a7c3e5f43a1249b1a0548c7c400a3c3d
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.3 b/metadata/md5-cache/dev-ml/labltk-8.06.3
index 99360fbff829..660b68a160e2 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.3
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.3
@@ -9,5 +9,5 @@ LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]
 SLOT=0/8.06.3
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1701/labltk-8.06.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58312dbcc18af708d3bdf68ec7833dd1
diff --git a/metadata/md5-cache/dev-ml/lambda-term-1.11 b/metadata/md5-cache/dev-ml/lambda-term-1.11
index 934482dc06e0..dcba01683735 100644
--- a/metadata/md5-cache/dev-ml/lambda-term-1.11
+++ b/metadata/md5-cache/dev-ml/lambda-term-1.11
@@ -8,5 +8,5 @@ LICENSE=BSD
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=76322c6e5fe7ed17b151542c87c7d98f
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
index 30775ca7788f..2a5efc3aad3c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR )
 RESTRICT=!test? ( test )
 SLOT=0/10.0.0.9999
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	d4ab0d2fd42477ead909a966ffb2e175	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9140dc4da209481b2bc7077e15d4d9aa
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	c036a57f84a13faca636ccb19e3f35d3	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0b0816a3e1267a2cdc3d5ba1b5f8d2a
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
deleted file mode 100644
index 339d01220d9a..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-6.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-6.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-6.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-RESTRICT=!test? ( test )
-SLOT=0/6.0.1
-SRC_URI=https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1a7fff86284c40c3112cacdd6db270
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
index 0ac7a3414295..72233405e9df 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-7.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-7.1.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-7.1.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=OCaml bindings for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/7.1.0
 SRC_URI=https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1a7fff86284c40c3112cacdd6db270
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4441cafd4487a3aacf49f4803d9449b
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.1
index bd34514812e8..3d74e837ead3 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-8.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-8.0.1:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=OCaml bindings for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/8.0.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d85d8ab7df14945f2d5783650d8e797f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c1ee8042722f003b8c7fddee68c2d48
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0
index f1c08528ccb9..84634707551a 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.0:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/9.0.0
 SRC_URI=https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	d4ab0d2fd42477ead909a966ffb2e175	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35528eccb56c6988cfd5db692d5668dc
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	c036a57f84a13faca636ccb19e3f35d3	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49c62bdb26283ebe47603eb4b30aa99e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1.9999
index a2f6a8bbf0ed..14df7e2bf087 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1.9999:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1.9
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=0/9.0.1.9999
-_eclasses_=cmake-utils	a5d9146ee60641275d46a91aab93d02f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	d4ab0d2fd42477ead909a966ffb2e175	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	93ff6f0f8518926f2951ca70ce36e887	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76a5ee2c8378300914f3d434e5c1b754
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	git-r3	6d22636df236df4cc8475f7b7668bdcd	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	c036a57f84a13faca636ccb19e3f35d3	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13c964fa6b762492d7685f6cad3bcf30
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc2 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc2
new file mode 100644
index 000000000000..0da92ee6a1fe
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1_rc2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
+RESTRICT=!test? ( test )
+SLOT=0/9.0.1_rc2
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1-rc2.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	c036a57f84a13faca636ccb19e3f35d3	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49c62bdb26283ebe47603eb4b30aa99e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc3
new file mode 100644
index 000000000000..1b6e6946ae4b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1_rc3
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1_rc3:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1_rc3:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore )
+RESTRICT=!test? ( test )
+SLOT=0/9.0.1_rc3
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1-rc3.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	llvm	5dbc14df2333105b7c006124ead9bf3f	llvm.org	c036a57f84a13faca636ccb19e3f35d3	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	2a3000b370786b5c90a651e7dd7c4797	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49c62bdb26283ebe47603eb4b30aa99e
diff --git a/metadata/md5-cache/dev-ml/logs-0.6.2 b/metadata/md5-cache/dev-ml/logs-0.6.2
index 0080d23d18fc..ee89d3a4f311 100644
--- a/metadata/md5-cache/dev-ml/logs-0.6.2
+++ b/metadata/md5-cache/dev-ml/logs-0.6.2
@@ -7,7 +7,8 @@ IUSE=javascript +fmt cli +lwt test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= )
+RESTRICT=!test? ( test )
 SLOT=0/0.6.2
 SRC_URI=http://erratique.ch/software/logs/releases/logs-0.6.2.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=fe8d609bbec62c8c124aa8ecc0cac5bd
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=ebd5b5dbf0d5590b0d6ac40172e819c2
diff --git a/metadata/md5-cache/dev-ml/lwt-3.0.0 b/metadata/md5-cache/dev-ml/lwt-3.0.0
index 5be299ada784..81b4cbeccf2e 100644
--- a/metadata/md5-cache/dev-ml/lwt-3.0.0
+++ b/metadata/md5-cache/dev-ml/lwt-3.0.0
@@ -7,7 +7,8 @@ IUSE=+camlp4 +ppx +ocamlopt debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-libs/libev >=dev-lang/ocaml-4.02:= dev-ml/result:= ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/3.0.0.tar.gz -> lwt-3.0.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96d6618de5ea94439776e574164b421b
diff --git a/metadata/md5-cache/dev-ml/lwt_glib-1.0.1 b/metadata/md5-cache/dev-ml/lwt_glib-1.0.1
index 42912588ddb8..2d80297f50a7 100644
--- a/metadata/md5-cache/dev-ml/lwt_glib-1.0.1
+++ b/metadata/md5-cache/dev-ml/lwt_glib-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lwt-3.0.0:= dev-libs/glib:2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.0.1
 SRC_URI=https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_glib-1.0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afad5f70087886fc48dfb7e9e570b541
diff --git a/metadata/md5-cache/dev-ml/lwt_react-1.0.1 b/metadata/md5-cache/dev-ml/lwt_react-1.0.1
index 866dc759a547..78d11a7c9f8b 100644
--- a/metadata/md5-cache/dev-ml/lwt_react-1.0.1
+++ b/metadata/md5-cache/dev-ml/lwt_react-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/react-1.2:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.0.1
 SRC_URI=https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=49c732db5e85b600c47da89de8925c76
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1 b/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
index babb6c279990..99618c681138 100644
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lwt-3.0.0:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.0.1
 SRC_URI=https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_ssl-1.0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0dff6c27265e7fca48a22fb6000cf2a2
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1 b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
index 9b2ad7ba7a8e..d703f6ccdddf 100644
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-4:=
 SLOT=0/1.1.1
 SRC_URI=https://github.com/ocsigen/lwt/archive/lwt_ssl-1.1.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=6c0c83196eb5aebe7ccd078109a2b78b
diff --git a/metadata/md5-cache/dev-ml/macaque-0.7.4 b/metadata/md5-cache/dev-ml/macaque-0.7.4
index a6195de22d6a..0868d46792e2 100644
--- a/metadata/md5-cache/dev-ml/macaque-0.7.4
+++ b/metadata/md5-cache/dev-ml/macaque-0.7.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.7.4
 SRC_URI=https://github.com/ocsigen/macaque/archive/0.7.4.tar.gz -> macaque-0.7.4.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e94c1b8ad8a730144111484da5ede78f
diff --git a/metadata/md5-cache/dev-ml/markup-0.7.5 b/metadata/md5-cache/dev-ml/markup-0.7.5
index 9f775922c7e0..7a0c5df91c3c 100644
--- a/metadata/md5-cache/dev-ml/markup-0.7.5
+++ b/metadata/md5-cache/dev-ml/markup-0.7.5
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/lwt:=[ocamlopt(+)] >=dev-ml/uutf-1.0:=[ocamlopt]
+RESTRICT=!test? ( test )
 SLOT=0/0.7.5p1
 SRC_URI=https://github.com/aantron/markup.ml/archive/0.7.5.tar.gz -> markup-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f8c29b4ea209c7e079c79557c3ba214
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8e41c31ccca9e6ef86c6fc63b14b009
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.2c b/metadata/md5-cache/dev-ml/mccs-1.1.2c
index 9be21cd3adf2..96da9c870d92 100644
--- a/metadata/md5-cache/dev-ml/mccs-1.1.2c
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.2c
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/cudf:= sci-mathematics/glpk:= >=dev-lang/ocaml-4:=
 SLOT=0/1.1.2c
 SRC_URI=https://github.com/AltGr/ocaml-mccs/archive/1.1+2c.tar.gz -> mccs-1.1.2c.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	opam	3f1ccc0b5a5708088c2c156d4ca79a20	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	opam	c053036d04fbcede5c53fe5752699eb5	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7ebcdca046cbdc52757a030e540c7ab4
diff --git a/metadata/md5-cache/dev-ml/menhir-20170712 b/metadata/md5-cache/dev-ml/menhir-20170712
index f0ae6af8849c..68a8f77496c0 100644
--- a/metadata/md5-cache/dev-ml/menhir-20170712
+++ b/metadata/md5-cache/dev-ml/menhir-20170712
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20170712
 SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9107d7895b69fb99e36071feaf352336
diff --git a/metadata/md5-cache/dev-ml/menhir-20171013 b/metadata/md5-cache/dev-ml/menhir-20171013
index 6d50c1175c05..44ea120357f1 100644
--- a/metadata/md5-cache/dev-ml/menhir-20171013
+++ b/metadata/md5-cache/dev-ml/menhir-20171013
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20171013
 SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20171013.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b112ac03ed80bbee59a3d7d262c3dbf5
diff --git a/metadata/md5-cache/dev-ml/menhir-20181006 b/metadata/md5-cache/dev-ml/menhir-20181006
index ec128aefa9f0..eedc2fe59057 100644
--- a/metadata/md5-cache/dev-ml/menhir-20181006
+++ b/metadata/md5-cache/dev-ml/menhir-20181006
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
 SLOT=0/20181006
 SRC_URI=http://gallium.inria.fr/~fpottier/menhir/menhir-20181006.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=12c53d41328fb34a71231502078b10af
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
new file mode 100644
index 000000000000..0b5e12998f30
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=LR(1) parser generator for the OCaml language
+EAPI=7
+HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
+IUSE=examples +ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
+SLOT=0/20190924
+SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=a2c8f8e83bf085a5da7ea17054528fae
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.3 b/metadata/md5-cache/dev-ml/merlin-2.5.3
index 6de286caa973..b539925244ce 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.3
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.3
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.3.tar.gz -> merlin-2.5.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.4 b/metadata/md5-cache/dev-ml/merlin-2.5.4
index 486a51e7e02f..9440ee54733e 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.4
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.4
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.4.tar.gz -> merlin-2.5.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-2.5.5 b/metadata/md5-cache/dev-ml/merlin-2.5.5
index 5d10aa03d308..7cc4c11d03b6 100644
--- a/metadata/md5-cache/dev-ml/merlin-2.5.5
+++ b/metadata/md5-cache/dev-ml/merlin-2.5.5
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/2.5.5
 SRC_URI=https://github.com/ocaml/merlin/archive/v2.5.5.tar.gz -> merlin-2.5.5.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.0 b/metadata/md5-cache/dev-ml/merlin-3.0.0
index d1e43645aad2..a1f0454a5ecd 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.0
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.0.tar.gz -> merlin-3.0.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.1 b/metadata/md5-cache/dev-ml/merlin-3.0.1
index 90dec8026942..ba7525d28b67 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.1
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.1.tar.gz -> merlin-3.0.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.2 b/metadata/md5-cache/dev-ml/merlin-3.0.2
index dd988b17ce5b..a09316727ef7 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.2
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.2.tar.gz -> merlin-3.0.2.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-3.0.3 b/metadata/md5-cache/dev-ml/merlin-3.0.3
index 191963862eb6..3c841dc75e6b 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.0.3
+++ b/metadata/md5-cache/dev-ml/merlin-3.0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= dev-ml/yojson:= || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.0.3.tar.gz -> merlin-3.0.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	findlib	45d6030075064a68da8d7143726a1150	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	findlib	17c71a5d96323df925f9f6db1215668a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8f11d3c8ca5ff7c5ca6556735193bc36
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3 b/metadata/md5-cache/dev-ml/merlin-extend-0.3
index a4f5dd9f10d1..3bdcd3e49f62 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/0.3
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz -> merlin-extend-0.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=315271c0ec42214ddf1359e876b5fab4
diff --git a/metadata/md5-cache/dev-ml/mirage-profile-0.7.0-r1 b/metadata/md5-cache/dev-ml/mirage-profile-0.7.0-r1
index 23e35a078569..b697395446a2 100644
--- a/metadata/md5-cache/dev-ml/mirage-profile-0.7.0-r1
+++ b/metadata/md5-cache/dev-ml/mirage-profile-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:= dev-ml/io-page:= dev-ml/lwt:= >=dev-ml/ocaml-cstruc
 RESTRICT=test
 SLOT=0/0.7.0
 SRC_URI=https://github.com/mirage/mirage-profile/archive/v0.7.0.tar.gz -> mirage-profile-0.7.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9e556f6325fe6751c91df87fb2422b10
diff --git a/metadata/md5-cache/dev-ml/mongo-0.67.2 b/metadata/md5-cache/dev-ml/mongo-0.67.2
index 9ee907ffbf4a..1a9f1cce2da0 100644
--- a/metadata/md5-cache/dev-ml/mongo-0.67.2
+++ b/metadata/md5-cache/dev-ml/mongo-0.67.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/bson:= dev-ml/lwt:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.67.2
 SRC_URI=https://github.com/MassD/mongo/archive/v0.67.2.tar.gz -> mongo-0.67.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5be6d71754f5b3b9ab1ce2c99d4f7ed6
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index 6f627b5a460d..f6ef25bfa99d 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -7,7 +7,8 @@ IUSE=javascript test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=http://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e3ec0e91fa8a013f4e7d8dde5223a6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2913272b04fe905f4e39cf85fc90c602
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.10 b/metadata/md5-cache/dev-ml/oasis-0.4.10
index bf578b85c25d..4391704065f9 100644
--- a/metadata/md5-cache/dev-ml/oasis-0.4.10
+++ b/metadata/md5-cache/dev-ml/oasis-0.4.10
@@ -7,8 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=strip
+RESTRICT=!test? ( test ) strip
 SLOT=0/0.4.10
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=865e0077a13a24b45b38b456c7d6ccde
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a37c94393441859c240fdb5312fb58ba
diff --git a/metadata/md5-cache/dev-ml/oasis-0.4.8 b/metadata/md5-cache/dev-ml/oasis-0.4.8
index 0cbf7cc1a65b..74231ac2780f 100644
--- a/metadata/md5-cache/dev-ml/oasis-0.4.8
+++ b/metadata/md5-cache/dev-ml/oasis-0.4.8
@@ -7,8 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/ocaml-data-notation-0.0.11:= dev-ml/ocamlbuild:=[ocamlopt] >=dev-lang/ocaml-3.12:=[ocamlopt?]
-RESTRICT=strip
+RESTRICT=!test? ( test ) strip
 SLOT=0/0.4.8
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1669/oasis-0.4.8.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1aed0859876ce97658c29f4639e4b684
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ec28108f0313052a142781b2d0b02b3
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index 5b64c849656d..3e48b3420443 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=4355e192967773a0d7fa5db572cd1e75
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 72b12b268fd4..df047ae903ab 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 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	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=9232f5a16cae33937ada6cc94028e909
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=f0d607f5775ed53b334dd4e6437651f1
diff --git a/metadata/md5-cache/dev-ml/ocaml-bigstring-0.1.1 b/metadata/md5-cache/dev-ml/ocaml-bigstring-0.1.1
index de85d81bec54..acd3bb017bd0 100644
--- a/metadata/md5-cache/dev-ml/ocaml-bigstring-0.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-bigstring-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/ocaml:=
 RESTRICT=test
 SLOT=0/0.1.1
 SRC_URI=https://github.com/c-cube/ocaml-bigstring/archive/0.1.1.tar.gz -> ocaml-bigstring-0.1.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=4b78435acee46389e32195623ea2a9b7
diff --git a/metadata/md5-cache/dev-ml/ocaml-cairo-0.5 b/metadata/md5-cache/dev-ml/ocaml-cairo-0.5
index 83ab13460ec4..89955f6ae725 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cairo-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-cairo-0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=gtk? ( dev-ml/lablgtk:= ) x11-libs/cairo[svg(+)] >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.5
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.5/cairo2-0.5.tar.gz -> ocaml-cairo-0.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cfb314e28d4a1ba4719fb56785be5058
diff --git a/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0 b/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0
index 97e59dc8b89f..b84222bad665 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0
+++ b/metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0
@@ -7,7 +7,8 @@ IUSE=async javascript +lwt +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/ocaml-re:= dev-ml/stringext:= dev-ml/ocaml-uri:= dev-ml/fieldslib:= dev-ml/sexplib:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-base64:= lwt? ( dev-ml/lwt:= dev-ml/logs:=[fmt,lwt] dev-ml/cmdliner:= dev-ml/ocaml-conduit:= dev-ml/ocaml-magic-mime:= ) async? ( dev-ml/ocaml-conduit:= dev-ml/logs:=[fmt] dev-ml/ocaml-magic-mime:= dev-ml/fmt:= ) javascript? ( dev-ml/js_of_ocaml:=[ppx] ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.22.0
 SRC_URI=https://github.com/mirage/ocaml-cohttp/archive/v0.22.0.tar.gz -> ocaml-cohttp-0.22.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2e90dd6c1cc7b082502bf8dae1676b9
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 69b2470c76e0..f67b89f9ec07 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
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=85278258dffbf8bdfe72848d2ed4c816
diff --git a/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4 b/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
index 127d13c457f1..906e9bd80b32 100644
--- a/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
+++ b/metadata/md5-cache/dev-ml/ocaml-conduit-0.15.4
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-lang/ocaml:= dev-ml/sexplib:= dev-ml/stringext:= dev-ml/ocaml-uri:= dev-ml/logs:= dev-ml/ocaml-cstruct:= dev-ml/ocaml-ipaddr:= >=dev-ml/lwt-3:= dev-ml/lwt_ssl:= dev-ml/async:= dev-ml/dns:= dev-ml/ocaml-ssl:=
 SLOT=0/0.15.4
 SRC_URI=https://github.com/mirage/ocaml-conduit/archive/v0.15.4.tar.gz -> ocaml-conduit-0.15.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bc408aead33a6d10f7e49493460bf10
diff --git a/metadata/md5-cache/dev-ml/ocaml-containers-1.3 b/metadata/md5-cache/dev-ml/ocaml-containers-1.3
index 8da98ea9fd96..969073171d87 100644
--- a/metadata/md5-cache/dev-ml/ocaml-containers-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-containers-1.3
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/c-cube/ocaml-containers/archive/1.3.tar.gz -> ocaml-containers-1.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e7643e2af5357afe212ab0752754dee7
diff --git a/metadata/md5-cache/dev-ml/ocaml-containers-1.4 b/metadata/md5-cache/dev-ml/ocaml-containers-1.4
index a669c9a48406..a71d6708c960 100644
--- a/metadata/md5-cache/dev-ml/ocaml-containers-1.4
+++ b/metadata/md5-cache/dev-ml/ocaml-containers-1.4
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=dev-ml/result:= >=dev-ml/sequence-0.9:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/c-cube/ocaml-containers/archive/1.4.tar.gz -> ocaml-containers-1.4.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91f2cc8c0efc208f7a66e46397deefb0
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e7643e2af5357afe212ab0752754dee7
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 b2488f197bc2..8ff107489d29 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
@@ -7,7 +7,8 @@ IUSE=async +lwt +ppx test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/3.1.1
 SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.1.tar.gz -> ocaml-cstruct-3.1.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=60a5b9226fb3932386dc49b611ae6b0a
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=7baef6bed6fb57211c8515e34f89827f
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
index 5cd18bd082ed..f2d84a5c1537 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.2
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/0.11.2
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.2.tar.gz -> ocaml-ctypes-0.11.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=ea6cb045597ca298e54f1268a9214d84
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=d78ba8f1023d3331b5e919ed504a2dc6
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
index bc4f41e43ad7..3445c8b960ec 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.11.3
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+RESTRICT=!test? ( test )
 SLOT=0/0.11.3
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.11.3.tar.gz -> ocaml-ctypes-0.11.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a797bd031ebdb46eb6681029a552358e
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=ae07a84c3c6946a37564283b8fb4a9b5
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
index f2c48a124304..e9dbf703c55b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.12.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
+RESTRICT=!test? ( test )
 SLOT=0/0.12.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.12.1.tar.gz -> ocaml-ctypes-0.12.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=302ee12fcc75e965601a87528422e600
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
index 94d9869b1ce1..9e04b4bd17b2 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.13.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi dev-ml/integers:=
+RESTRICT=!test? ( test )
 SLOT=0/0.13.0
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.13.0.tar.gz -> ocaml-ctypes-0.13.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=9878d7c9a54dd50f7ac2176b2d6eb2e8
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=302ee12fcc75e965601a87528422e600
diff --git a/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1 b/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
index 4b3bbdfa27d8..b94b97312f9f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-data-notation-0.0.11-r1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-ml/type-conv-108.07.01:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.0.11
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=005d13437cf9b8e2ce34595884e8d793
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
index ff04893131e0..ffaefd20185b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
+++ b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.3.0
@@ -7,7 +7,8 @@ IUSE=javascript +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=javascript? ( dev-ml/js_of_ocaml:=[ppx,ocamlopt?] ) dev-ml/result:=[ocamlopt?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.3.0
 SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.3.0.tar.gz -> ocaml-dispatch-0.3.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a905da72b9363914dad5d686a7176dd6
diff --git a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
index bcc8829058fe..2085506a8448 100644
--- a/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-dispatch-0.4.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-ml/result:= dev-lang/ocaml:=
+RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/inhabitedtype/ocaml-dispatch/archive/0.4.0.tar.gz -> ocaml-dispatch-0.4.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=5ba3990520dbb30f7b5915532ee0a3cc
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=bd2ddc078e2275a1885b5e49a121f906
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
index 9c25cfd0b6f8..49a1698e1979 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.0.0
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.0.0.tar.gz -> ocaml-expat-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
index 1abcb0b39600..f16853f2c689 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6505a2a75e932fb8cbfe8f64cf9898a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a6d17d3e66d9ed1d794b78cb238e4f50
diff --git a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5 b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
index f7ac278c8379..5144ce9022ad 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-expect-0.0.5
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/batteries:= dev-ml/pcre-ocaml:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.0.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1372/ocaml-expect-0.0.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b484d41378ba0439ba4eaedc218a31b
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b77c289b8bc39aba3bd1196dd6099bcc
diff --git a/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.4 b/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.4
index 726cf58819cb..b2ac9d5a463b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.4
+++ b/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.4
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.1.4
 SRC_URI=http://ygrek.org.ua/p/release/ocaml-extunix/ocaml-extunix-0.1.4.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e4e931406484c2d590cc790d7e934198
diff --git a/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.5 b/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.5
index bad68795b127..2f3144cdeaef 100644
--- a/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.5
+++ b/metadata/md5-cache/dev-ml/ocaml-extunix-0.1.5
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.1.5
 SRC_URI=https://github.com/ygrek/extunix/releases/download/v0.1.5/ocaml-extunix-0.1.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e1685ddddfd38492dc9e72589b5fdd0
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
index 928f109628fd..0f42d2e4fa93 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.5.1
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b2fefa65fee2cd3125f18ca6ec20ceb
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
index b6f4704bb8d6..b8ad065f8d2c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.5.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.5.2
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f52a6a98edabfa271fe3897bc8d592a9
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
index b0c81e1edd1c..5c032fdece11 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.5-r1
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12.1:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1433/ocaml-gettext-0.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60c0ecb70409a954b411ad5b4fa7619f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c494a098ec993436cdb7e8991626b600
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
index fb11c44760c0..e236a41ab5ae 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7
@@ -7,7 +7,8 @@ IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12.1:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f15677795ff8198a71302427f9d54e2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3c590ae8098d8f545c609009fe036573
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
index 61f667a0f281..4134d6cc4495 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.2.tar.gz -> ocaml-hashcons-1.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d1738214c2a8dbeb35fbe1e9118c68c
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index 4e0e96f97a10..ff530be5d0fc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.3
 SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.3.tar.gz -> ocaml-hashcons-1.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea0dcaeade9713d11f14cc5684c340cc
diff --git a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0 b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
index 0e6d886f1ee2..237b420f1d1f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/2.8.0
 SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.8.0.tar.gz -> ocaml-ipaddr-2.8.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=47b583b39ce07bc7e5cee44984a9660c
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=bd5949dbdf484129d9b3b6ad716fb3cb
diff --git a/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0 b/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
index a4e397d34f09..889b33261bd3 100644
--- a/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocaml-magic-mime-1.0.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/ocaml-magic-mime/archive/v1.0.0.tar.gz -> ocaml-magic-mime-1.0.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0692fee9c679c335f7e5989f86824f37
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
index 8aa91ad8936f..f5f794ba213b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.5
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.5.tar.gz -> ocaml-migrate-parsetree-1.0.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
index 2ebee39d5b67..17d1eb114d4f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.6
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.6.tar.gz -> ocaml-migrate-parsetree-1.0.6.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
index 1b62f41609cb..1da512b6de2c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.7
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.7.tar.gz -> ocaml-migrate-parsetree-1.0.7.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1 b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1
index 0c5fa1580ba1..9fc3ebcc7696 100644
--- a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1
+++ b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib >=virtual/mysql-4.0
 SLOT=0/1.2.1
 SRC_URI=http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6b3cf6579a67f8d63afa98356e26a2d8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ffac2c74d406570b827184c33104ee1e
diff --git a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1-r1 b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1-r1
index 6e8541f79e57..a94254b3e0e1 100644
--- a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib dev-db/mysql-connector-c:0=
 SLOT=0/1.2.1
 SRC_URI=http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-1.2.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=c10499a9d3181d5d120a90f020692c8f
diff --git a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.2-r1 b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.2-r1
index 8141bca90a83..7c730e04e3b4 100644
--- a/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.2-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-mysql-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] sys-libs/zlib dev-db/mysql-connector-c:0=
 SLOT=0/1.2.2
 SRC_URI=http://ygrek.org.ua/p/release/ocaml-mysql/ocaml-mysql-1.2.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=514fc4a1b1ab7fd7a1c9af0e3d84ff9c
diff --git a/metadata/md5-cache/dev-ml/ocaml-pcap-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-pcap-0.4.0
index 89dbe4535e9f..50e640b8257f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-pcap-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-pcap-0.4.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=dev-ml/ocaml-ipaddr:= !dev-ml/mirage-net-socket !<dev-ml/mirage-0.9.2 >=dev-ml/ocaml-cstruct-0.6.0:=[ppx(-)] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/mirage/ocaml-pcap/archive/v0.4.0.tar.gz -> ocaml-pcap-0.4.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50f00de8ffe1ade9655588898b67d8a0
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 68704a013232..4b62f6a66089 100644
--- a/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
+++ b/metadata/md5-cache/dev-ml/ocaml-re-1.7.1
@@ -7,7 +7,8 @@ IUSE=test +ocamlopt debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.7.1
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.7.1.tar.gz -> ocaml-re-1.7.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ac6ddcaf5838eaa7219126af17b7423
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93d768c93ecbd5a8b43f0d736aeb17c7
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
index 881f175100c0..d3ce98e6421c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-re:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=fd19c9c0ee42fcba57e67e66138e4c62
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=910652294e3a14baeeadeb8e7f80483c
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
index d745a0541f57..5d59e4d6a327 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-lwt-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:= dev-ml/lwt:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=c39fe4340c4786046886c945432cc0bc
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=4846e1b4dde3d11f5ddbf8a1eae10bfe
diff --git a/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5 b/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
index 10922d3660eb..588685a69d39 100644
--- a/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
+++ b/metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:= dev-ml/ocaml-redis:=
+RESTRICT=!test? ( test )
 SLOT=0/0.3.5
 SRC_URI=https://github.com/0xffea/ocaml-redis/archive/0.3.5.tar.gz -> ocaml-redis-0.3.5.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=7090d74a8da02fff55aa049d4806eb3c
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=b54cc9d6d7242acc9b933804972a9d0f
diff --git a/metadata/md5-cache/dev-ml/ocaml-safepass-2.0 b/metadata/md5-cache/dev-ml/ocaml-safepass-2.0
index 2130a3aa36ee..dc04f1cea156 100644
--- a/metadata/md5-cache/dev-ml/ocaml-safepass-2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-safepass-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.0
 SRC_URI=https://github.com/darioteixeira/ocaml-safepass/archive/v2.0.tar.gz -> ocaml-safepass-2.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68477a1419ea69047341351177e60324
diff --git a/metadata/md5-cache/dev-ml/ocaml-sha-1.9 b/metadata/md5-cache/dev-ml/ocaml-sha-1.9
index f0ffc6b3afe0..da83830cab41 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sha-1.9
+++ b/metadata/md5-cache/dev-ml/ocaml-sha-1.9
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/1.9
 SRC_URI=https://github.com/vincenthz/ocaml-sha/archive/ocaml-sha-v1.9.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=88f377e5a329869a11ab99c4493a3161
diff --git a/metadata/md5-cache/dev-ml/ocaml-snappy-0.1.0 b/metadata/md5-cache/dev-ml/ocaml-snappy-0.1.0
index f4595a1765f7..aa70da78ac7f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-snappy-0.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-snappy-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/snappy:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.1.0
 SRC_URI=https://github.com/ygrek/ocaml-snappy/releases/download/v0.1.0/ocaml-snappy-0.1.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=919116bde15639822f81fd31255bdb7c
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
index ba77fa1b5ba0..9101305de27e 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/4.1.2
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.2/sqlite3-ocaml-4.1.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=84f7acbbc7b41d1e596c9a49e6d17121
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
index 6e58a0899eec..d4ecbcf7da87 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.3
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/4.1.3
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.3/sqlite3-ocaml-4.1.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=84f7acbbc7b41d1e596c9a49e6d17121
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
index 03fa24499f3b..18fa386319da 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.2.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.2.0/sqlite3-4.2.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=44715ecd1904679f92c6006b7c107848
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
index db34976535c4..f9f102d081ee 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.3.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.3.0/sqlite3-4.3.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=44715ecd1904679f92c6006b7c107848
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3
index 243296278c3c..aaa2aeb890d5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=
 SLOT=0/0.5.3
 SRC_URI=https://github.com/savonet/ocaml-ssl/releases/download/0.5.3/ocaml-ssl-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6eb1d929cbafca54ce47846c5ce35b63
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.4 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.4
index 46479a1c537b..1f0121747370 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.4
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=
 SLOT=0/0.5.4
 SRC_URI=https://github.com/savonet/ocaml-ssl/releases/download/0.5.4/ocaml-ssl-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8536ccef3ef4afe81444e3ad98bcd8ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5
index b6073118a8ab..64c71b577dec 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=
 SLOT=0/0.5.5
 SRC_URI=https://github.com/savonet/ocaml-ssl/releases/download/0.5.5/ocaml-ssl-0.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8536ccef3ef4afe81444e3ad98bcd8ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.2
index 8b24bfe7fc4c..23257d4e4def 100644
--- a/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-stdint-0.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.4.2
 SRC_URI=https://github.com/andrenth/ocaml-stdint/archive/0.4.2.tar.gz -> ocaml-stdint-0.4.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccd77af0377bf14d5a92355f941f44d9
diff --git a/metadata/md5-cache/dev-ml/ocaml-stdint-0.5.0 b/metadata/md5-cache/dev-ml/ocaml-stdint-0.5.0
index 8d6af1d5d6ff..e0d00238e5f2 100644
--- a/metadata/md5-cache/dev-ml/ocaml-stdint-0.5.0
+++ b/metadata/md5-cache/dev-ml/ocaml-stdint-0.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.5.0
 SRC_URI=https://github.com/andrenth/ocaml-stdint/archive/0.5.0.tar.gz -> ocaml-stdint-0.5.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccd77af0377bf14d5a92355f941f44d9
diff --git a/metadata/md5-cache/dev-ml/ocaml-text-0.8 b/metadata/md5-cache/dev-ml/ocaml-text-0.8
index d4a6d254494d..b09d03429d20 100644
--- a/metadata/md5-cache/dev-ml/ocaml-text-0.8
+++ b/metadata/md5-cache/dev-ml/ocaml-text-0.8
@@ -7,7 +7,8 @@ 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?]
+RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/vbmithr/ocaml-text/archive/0.8.tar.gz -> ocaml-text-0.8.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e3adbb9233448a15831d90c3cf66e1b2
diff --git a/metadata/md5-cache/dev-ml/ocaml-uint-1.2.0 b/metadata/md5-cache/dev-ml/ocaml-uint-1.2.0
index 491eea8a1ecb..abd419753e9f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-uint-1.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-uint-1.2.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1516/ocaml-uint-1.2.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c24059996cd9a9ab2ba15ad19b92b7c5
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 22f2fee6b4e0..719e6786b3e4 100644
--- a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
+++ b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -7,7 +7,8 @@ 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-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.9.4
 SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=936dee0ca12d3dd49a70c83a83827df3
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=366defb3d072a037c03ab776d2b4fffe
diff --git a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
index 9df692a272cb..f69e941ec4bc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt(+)?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/inhabitedtype/ocaml-webmachine/archive/0.4.0.tar.gz -> ocaml-webmachine-0.4.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7076f45155bc05998df45b4bc4c07ccd
diff --git a/metadata/md5-cache/dev-ml/ocaml-websocket-2.9 b/metadata/md5-cache/dev-ml/ocaml-websocket-2.9
index 3d09e26e7982..571bbf6329d7 100644
--- a/metadata/md5-cache/dev-ml/ocaml-websocket-2.9
+++ b/metadata/md5-cache/dev-ml/ocaml-websocket-2.9
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/astring:=[ocamlopt(+)?] dev-ml/ocaml-cohttp:=[ocamlopt(+)?,async?,lwt?] dev-ml/cppo:=[ocamlopt(+)?] dev-ml/ocplib-endian:=[ocamlopt(+)?] async? ( dev-ml/async:=[ocamlopt(+)?] ssl? ( dev-ml/async_ssl:=[ocamlopt(+)?] ) ) lwt? ( dev-ml/lwt:=[ocamlopt(+)?] ) ssl? ( dev-ml/cryptokit:=[ocamlopt(+)?] ) >=dev-lang/ocaml-4:=
 SLOT=0/2.9
 SRC_URI=https://github.com/vbmithr/ocaml-websocket/archive/2.9.tar.gz -> ocaml-websocket-2.9.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=3c0545ce6516a9141e1e5b4092d035a2
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0 b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
index 5e6ea941b967..97bedc87ba88 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
@@ -7,6 +7,7 @@ IUSE=+ocamlopt test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
+RESTRICT=!test? ( test )
 SLOT=0/0.11.0
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.11.0.tar.gz -> ocamlbuild-0.11.0.tar.gz
-_md5_=189102e860196aa7d93a9cb1c11051af
+_md5_=c8f676df06d4d2d05ee999189d9e4231
diff --git a/metadata/md5-cache/dev-ml/ocamldap-2.2 b/metadata/md5-cache/dev-ml/ocamldap-2.2
index b8a2a0d5a2ef..bfba8ad51a2a 100644
--- a/metadata/md5-cache/dev-ml/ocamldap-2.2
+++ b/metadata/md5-cache/dev-ml/ocamldap-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/pcre-ocaml:= dev-ml/ocaml-ssl:= dev-ml/ocamlnet:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=https://bitbucket.org/deplai_j/ocamldap/downloads/ocamldap-2.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9e57e1ebf77084a6dedbe6685412840c
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7
index 5cdc3b7f90cb..a494f571cf6e 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )
 SLOT=0/1.8.7
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=05eb8005c34eb7d3d0c965998539f043
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8
index e6065ddb5a36..51d3a92bb56b 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )
 SLOT=0/1.8.8
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=63cdff21606c7086d9b9fb5b56a28cf0
diff --git a/metadata/md5-cache/dev-ml/ocamlify-0.0.2 b/metadata/md5-cache/dev-ml/ocamlify-0.0.2
index 09b81724facd..8415506ac3b0 100644
--- a/metadata/md5-cache/dev-ml/ocamlify-0.0.2
+++ b/metadata/md5-cache/dev-ml/ocamlify-0.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1104e7686a98f98111717ffb264f98bc
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
index f671f8b83e70..d2fe3992db4d 100644
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
+++ b/metadata/md5-cache/dev-ml/ocamlmod-0.0.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.0.8
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1544/ocamlmod-0.0.8.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=20706d559ae5cb0a85aacb0b824c9bc8
diff --git a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9 b/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
index 234e745d2177..9623bdd78804 100644
--- a/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
+++ b/metadata/md5-cache/dev-ml/ocamlmod-0.0.9
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.0.9
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1e615c70dc38b42b07a2670a01fadde5
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.2 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.2
index 2654c2b0da89..54eb94d7111b 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.2
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-
 RESTRICT=installsources strip
 SLOT=0/4.1.2
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b9a0a019fbd225b6d2086baa1ce51ec
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.3 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.3
index 42017cef4881..21066224758f 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.3
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-
 RESTRICT=installsources strip
 SLOT=0/4.1.3
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c955f85a4f3d13cbcf6fce513fd0701
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.4 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.4
index 4214d0b6d6fb..89d1ba6d0342 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.4
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-
 RESTRICT=installsources strip
 SLOT=0/4.1.4
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c955f85a4f3d13cbcf6fce513fd0701
diff --git a/metadata/md5-cache/dev-ml/ocamlpam-1.1 b/metadata/md5-cache/dev-ml/ocamlpam-1.1
index f5eac8a1eec4..7c501ad6f76c 100644
--- a/metadata/md5-cache/dev-ml/ocamlpam-1.1
+++ b/metadata/md5-cache/dev-ml/ocamlpam-1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] sys-libs/pam
 SLOT=0/1.1
 SRC_URI=http://sharvil.nanavati.net/projects/ocamlpam/files/ocamlpam-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ba4deff43590136e164a83a183a1188
diff --git a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1 b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
index 0cb965a2d561..b208d1accc2a 100644
--- a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 truetype? ( >=media-libs/sdl-ttf-2.0 )
 SLOT=0/0.9.1
 SRC_URI=mirror://sourceforge/ocamlsdl/ocamlsdl-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b4377f10d5dfa660199599acf1b3503
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.39 b/metadata/md5-cache/dev-ml/ocamlweb-1.39
index 915e8281d201..c283327a54a2 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.39
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.39
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra
 DESCRIPTION=O'Caml literate programming tool
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.lri.fr/~filliatr/ocamlweb/
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.39.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff4eb2d06b4d45529e10be3fd957ed31
+_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_md5_=449f7ac251141f75d15c52ac965d1a3c
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.0 b/metadata/md5-cache/dev-ml/ocplib-endian-1.0
index b02701106994..3e71d10df408 100644
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.0
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.0
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.0
 SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz -> ocplib-endian-1.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=29ab8897b09cc1fc485c69d218585462
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.3 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.3
index 7650a37a2d7d..05a3b096f11a 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.3
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/0.3.tar.gz -> ocplib-simplex-0.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c61a9499cbd22e136246509813b2b3f9
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
index 40539207408e..20629d30f1b2 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/v0.4.tar.gz -> ocplib-simplex-0.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	45d6030075064a68da8d7143726a1150	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=51069763e40866e8d230e8041645e8b5
diff --git a/metadata/md5-cache/dev-ml/ocsigen-i18n-3.1.0 b/metadata/md5-cache/dev-ml/ocsigen-i18n-3.1.0
index 3a66162e63ca..b1f7aff0dda0 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-i18n-3.1.0
+++ b/metadata/md5-cache/dev-ml/ocsigen-i18n-3.1.0
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=
 SLOT=0/3.1.0
 SRC_URI=https://github.com/besport/ocsigen-i18n/archive/3.1.0.tar.gz -> ocsigen-i18n-3.1.0.tar.gz
-_md5_=3a6d4f130e52a64217fce33daa9a8122
+_md5_=596adb0036eabe5ee8f2759b7bb12710
diff --git a/metadata/md5-cache/dev-ml/ocsigen-start-1.0.0 b/metadata/md5-cache/dev-ml/ocsigen-start-1.0.0
index 582f26cc2181..9a59dc7cb79d 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-start-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocsigen-start-1.0.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= >=dev-ml/eliom-6.2:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:=
 SLOT=0/1.0.0
 SRC_URI=https://github.com/ocsigen/ocsigen-start/archive/1.0.0.tar.gz -> ocsigen-start-1.0.0.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=e1dd4ef3b85d3c53be1810f6687852a3
diff --git a/metadata/md5-cache/dev-ml/ocsigen-start-9999 b/metadata/md5-cache/dev-ml/ocsigen-start-9999
index 9d95fc357197..444c9533ba2b 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-start-9999
+++ b/metadata/md5-cache/dev-ml/ocsigen-start-9999
@@ -7,5 +7,5 @@ LICENSE=LGPL-3
 PROPERTIES=live
 RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= >=dev-ml/eliom-6.2:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:=
 SLOT=0/9999
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	git-r3	562b380fc59ae6a8622171d0acb777d1
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	git-r3	6d22636df236df4cc8475f7b7668bdcd
 _md5_=e1dd4ef3b85d3c53be1810f6687852a3
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 53c5b57b7d2a..9e60aa6dac41 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0
+++ b/metadata/md5-cache/dev-ml/ocsigen-toolkit-1.0.0
@@ -9,5 +9,5 @@ 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:= >=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	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999 b/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
index 2d3c9836f0be..5de98ee5d798 100644
--- a/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
+++ b/metadata/md5-cache/dev-ml/ocsigen-toolkit-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 PROPERTIES=live
 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	562b380fc59ae6a8622171d0acb777d1	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	git-r3	6d22636df236df4cc8475f7b7668bdcd	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=3c71932883f9e7b977c7d9ea22525c89
diff --git a/metadata/md5-cache/dev-ml/octavius-1.1.0 b/metadata/md5-cache/dev-ml/octavius-1.1.0
index 6ee595b23ebc..17eedc59ff7c 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.1.0
+++ b/metadata/md5-cache/dev-ml/octavius-1.1.0
@@ -8,5 +8,5 @@ LICENSE=ISC
 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	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=cbcb5b3732af72b5c28797739eaf0f15
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.6.1 b/metadata/md5-cache/dev-ml/ocurl-0.6.1
index ad0126908062..599b01130baf 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.6.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 >=dev-lang/ocaml-3.12:=[ocamlopt]
 SLOT=0/0.6.1
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1374/ocurl-0.6.1.tgz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=28592b96d0c635adbf2afa54351e7dd1
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.7.10 b/metadata/md5-cache/dev-ml/ocurl-0.7.10
index 8838146d1adb..218b0c1464e4 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.7.10
+++ b/metadata/md5-cache/dev-ml/ocurl-0.7.10
@@ -9,5 +9,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=0f784370de25524671b548c589b3ec9f
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.7.9 b/metadata/md5-cache/dev-ml/ocurl-0.7.9
index 62339d219464..b1539e6f765d 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.7.9
+++ b/metadata/md5-cache/dev-ml/ocurl-0.7.9
@@ -9,5 +9,5 @@ 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.9
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.7.9.tar.gz -> ocurl-0.7.9.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=cef4fc8d040f9de44dce8425e438effa
diff --git a/metadata/md5-cache/dev-ml/odns-0.3-r1 b/metadata/md5-cache/dev-ml/odns-0.3-r1
index 1d152a354d3a..b6cb3297bd87 100644
--- a/metadata/md5-cache/dev-ml/odns-0.3-r1
+++ b/metadata/md5-cache/dev-ml/odns-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt] !dev-ml/dns !dev-ml/ocaml-dns
 SLOT=0/0.3
 SRC_URI=http://download.tuxfamily.org/odns/odns-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39a87a64b2ec93289b86f2abd4b2237b
diff --git a/metadata/md5-cache/dev-ml/ojquery-0.1 b/metadata/md5-cache/dev-ml/ojquery-0.1
index c9e45576fce9..aaf19333aa08 100644
--- a/metadata/md5-cache/dev-ml/ojquery-0.1
+++ b/metadata/md5-cache/dev-ml/ojquery-0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-ml/react:= dev-ml/js_of_ocaml:= dev-ml/lwt:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.1
 SRC_URI=https://github.com/ocsigen/ojquery/archive/0.1.tar.gz -> ojquery-0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2cb7c5f867468980231d1dea064ea16b
diff --git a/metadata/md5-cache/dev-ml/ojquery-9999 b/metadata/md5-cache/dev-ml/ojquery-9999
index 92eebd0574bc..528a82d2d9a0 100644
--- a/metadata/md5-cache/dev-ml/ojquery-9999
+++ b/metadata/md5-cache/dev-ml/ojquery-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 PROPERTIES=live
 RDEPEND=dev-ml/react:= dev-ml/js_of_ocaml:= dev-ml/lwt:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/9999
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2cb7c5f867468980231d1dea064ea16b
diff --git a/metadata/md5-cache/dev-ml/onanomsg-1.0-r2 b/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
index f50d014f6ca5..a5839c02e1f1 100644
--- a/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
+++ b/metadata/md5-cache/dev-ml/onanomsg-1.0-r2
@@ -7,7 +7,8 @@ IUSE=+lwt +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=WTFPL-2
 RDEPEND=dev-libs/nanomsg:= dev-lang/ocaml:=[ocamlopt?] dev-ml/ocaml-ctypes:= dev-ml/ocaml-ipaddr:=[ocamlopt?] dev-ml/sexplib:= dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ocaml-containers:=[ocamlopt?] dev-ml/ocaml-bigstring:= lwt? ( dev-ml/lwt:=[ocamlopt(+)?] ) >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.0-bigstring
 SRC_URI=https://github.com/rgrinberg/onanomsg/archive/1.0.tar.gz -> onanomsg-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61b5eba20786e97537a3b8b7ef08be7b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b15be7dc1f76fb50a5f6db13fa78d13
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 c2e71c9c11a1..95f3da1089b9 100644
--- a/metadata/md5-cache/dev-ml/opam-1.3.1-r1
+++ b/metadata/md5-cache/dev-ml/opam-1.3.1-r1
@@ -7,7 +7,8 @@ IUSE=test
 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:=
+RESTRICT=!test? ( test )
 SLOT=0/1.3.1
 SRC_URI=https://github.com/ocaml/opam/archive/1.3.1.tar.gz -> opam-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afd631461720bd37bba0c38aec3b8a3e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=73e4a3101c3761a4a6348214cbcaba63
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.0.0_beta3 b/metadata/md5-cache/dev-ml/opam-file-format-2.0.0_beta3
index d1b82405dbcf..be1fafad7315 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.0.0_beta3
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.0.0_beta3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.0.0-beta3.tar.gz -> opam-file-format-2.0.0_beta3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=fc4abf8f9f2e3a355ecf998f8100ebb1
diff --git a/metadata/md5-cache/dev-ml/optcomp-1.6-r1 b/metadata/md5-cache/dev-ml/optcomp-1.6-r1
index e2ff4d47e2fb..ff0140190b1a 100644
--- a/metadata/md5-cache/dev-ml/optcomp-1.6-r1
+++ b/metadata/md5-cache/dev-ml/optcomp-1.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.6
 SRC_URI=https://github.com/diml/optcomp/archive/1.6.tar.gz -> optcomp-1.6.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74bcdf05f0ffc6eb0d36c47d1b22ffe3
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.0 b/metadata/md5-cache/dev-ml/ounit-2.0.0
index 10c01164e1f9..c7e34914de35 100644
--- a/metadata/md5-cache/dev-ml/ounit-2.0.0
+++ b/metadata/md5-cache/dev-ml/ounit-2.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.0.0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1258/ounit-2.0.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=02fd56e902931293388118839423e27c
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.5 b/metadata/md5-cache/dev-ml/ounit-2.0.5
index afff861edb67..5d4237822eb8 100644
--- a/metadata/md5-cache/dev-ml/ounit-2.0.5
+++ b/metadata/md5-cache/dev-ml/ounit-2.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.0.5
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1719/ounit-2.0.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3dc07a372d13c7436a1b299b785a8205
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.6 b/metadata/md5-cache/dev-ml/ounit-2.0.6
index fb9fc5659088..4724b57b7e9e 100644
--- a/metadata/md5-cache/dev-ml/ounit-2.0.6
+++ b/metadata/md5-cache/dev-ml/ounit-2.0.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.0.6
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1722/ounit-2.0.6.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f3784bf6aca9b29e85393265db9d253
diff --git a/metadata/md5-cache/dev-ml/pa_bench-112.06.00 b/metadata/md5-cache/dev-ml/pa_bench-112.06.00
index d5edf314e1e2..22f11c5f9ef3 100644
--- a/metadata/md5-cache/dev-ml/pa_bench-112.06.00
+++ b/metadata/md5-cache/dev-ml/pa_bench-112.06.00
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/type-conv-109:= dev-ml/pa_ounit:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/112.06.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/112.06.00/individual/pa_bench-112.06.00.tar.gz https://dev.gentoo.org/~aballier/distfiles/pa_bench-112.06.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61a4bf4222d870aa19cddde4a492d502
diff --git a/metadata/md5-cache/dev-ml/pa_ounit-113.00.00 b/metadata/md5-cache/dev-ml/pa_ounit-113.00.00
index 637565eaae63..11d0ddf3f9f2 100644
--- a/metadata/md5-cache/dev-ml/pa_ounit-113.00.00
+++ b/metadata/md5-cache/dev-ml/pa_ounit-113.00.00
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ounit-1.1.1:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/113.00.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.00/files/pa_ounit-113.00.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7a134c8883d7909e2d994a9a77f283a
diff --git a/metadata/md5-cache/dev-ml/pa_sexp_conv-113.00.01 b/metadata/md5-cache/dev-ml/pa_sexp_conv-113.00.01
index 026a77efdf22..63747f9e40d5 100644
--- a/metadata/md5-cache/dev-ml/pa_sexp_conv-113.00.01
+++ b/metadata/md5-cache/dev-ml/pa_sexp_conv-113.00.01
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/type-conv:= dev-ml/sexplib:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/113.00.01
 SRC_URI=https://github.com/janestreet/pa_sexp_conv/archive/113.00.01.tar.gz -> pa_sexp_conv-113.00.01.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=896e8e1e2715f966f03ec79e6424ea85
diff --git a/metadata/md5-cache/dev-ml/pa_structural_sexp-113.00.00 b/metadata/md5-cache/dev-ml/pa_structural_sexp-113.00.00
index 8da9a12d7e88..91f9da1e0baa 100644
--- a/metadata/md5-cache/dev-ml/pa_structural_sexp-113.00.00
+++ b/metadata/md5-cache/dev-ml/pa_structural_sexp-113.00.00
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/camlp4:= dev-ml/type-conv:= dev-ml/sexplib:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/113.00.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.00/files/pa_structural_sexp-113.00.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=79bac4ff23e87baf139848422b51d729
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 f7ab23227712..2a06000171c9 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.9.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.9.0.tar.gz -> patience_diff-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=1f9504b537b5f20dc0cb4c5e1ecbc963
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
index 361e57b81234..a6295e6bbb64 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/7.2.3
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ee37f5a8a97dc9fcd0b5f817c2178bcb
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
index 226f523950dd..cac9b6a9eaf7 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
@@ -9,5 +9,5 @@ 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
index 832c0fdc09b0..f93603047b63 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.2
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.2/pcre-7.3.2.tbz -> pcre-ocaml-7.3.2.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
index dd6fc11d0ac6..869dd2d3935e 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.3
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.3/pcre-7.3.3.tbz -> pcre-ocaml-7.3.3.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/pgocaml-2.3 b/metadata/md5-cache/dev-ml/pgocaml-2.3
index 23be1c005c26..71f7fe2872c9 100644
--- a/metadata/md5-cache/dev-ml/pgocaml-2.3
+++ b/metadata/md5-cache/dev-ml/pgocaml-2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/ocaml-re:= camlp4? ( dev-ml/camlp4:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.3
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1597/pgocaml-2.3.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07c41cad72c9bbb555651e26923a4b1b
diff --git a/metadata/md5-cache/dev-ml/pipebang-113.00.00 b/metadata/md5-cache/dev-ml/pipebang-113.00.00
index 5a85606a0b40..e90319a6c943 100644
--- a/metadata/md5-cache/dev-ml/pipebang-113.00.00
+++ b/metadata/md5-cache/dev-ml/pipebang-113.00.00
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/type-conv-109.60:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/113.00.00
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.00/files/pipebang-113.00.00.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5bdd314cf82ece6053d6998890c249d9
diff --git a/metadata/md5-cache/dev-ml/pomap-3.0.6 b/metadata/md5-cache/dev-ml/pomap-3.0.6
index a693d5d362ba..6500c1bf10f1 100644
--- a/metadata/md5-cache/dev-ml/pomap-3.0.6
+++ b/metadata/md5-cache/dev-ml/pomap-3.0.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/3.0.6
 SRC_URI=https://github.com/mmottl/pomap/releases/download/v3.0.6/pomap-3.0.6.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd9fa661dd7288ae36a543c7e415b7c9
diff --git a/metadata/md5-cache/dev-ml/pomap-3.0.7 b/metadata/md5-cache/dev-ml/pomap-3.0.7
index f4f3d4f6adcd..b95f9794eed5 100644
--- a/metadata/md5-cache/dev-ml/pomap-3.0.7
+++ b/metadata/md5-cache/dev-ml/pomap-3.0.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/3.0.7
 SRC_URI=https://github.com/mmottl/pomap/releases/download/v3.0.7/pomap-3.0.7.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf9a15b670e93205cc29a4e11422174b
diff --git a/metadata/md5-cache/dev-ml/pomap-4.0.0 b/metadata/md5-cache/dev-ml/pomap-4.0.0
index 0d3966abac6f..06576b7ed1ee 100644
--- a/metadata/md5-cache/dev-ml/pomap-4.0.0
+++ b/metadata/md5-cache/dev-ml/pomap-4.0.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/4.0.0
 SRC_URI=https://github.com/mmottl/pomap/releases/download/4.0.0/pomap-4.0.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=76b6e916d62bc93fd283eecf3aa8af19
diff --git a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.0.1 b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.0.1
index e377c341bb9a..ae82c5b9b56b 100644
--- a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.0.1
+++ b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:=[server] >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/4.0.1
 SRC_URI=https://github.com/mmottl/postgresql-ocaml/releases/download/v4.0.1/postgresql-ocaml-4.0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=38162014ebbee75bf2301126b93cc9d6
diff --git a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.1.0 b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.1.0
index 9ad8a2634f5b..27c881e04659 100644
--- a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.1.0
+++ b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.1.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:=[server] >=dev-lang/ocaml-4:=
 SLOT=0/4.1.0
 SRC_URI=https://github.com/mmottl/postgresql-ocaml/releases/download/4.1.0/postgresql-4.1.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=bd7a74b3869e52518fe7887b756f99e7
diff --git a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.2.0 b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.2.0
index 557cd9bfc598..0b60f64feea5 100644
--- a/metadata/md5-cache/dev-ml/postgresql-ocaml-4.2.0
+++ b/metadata/md5-cache/dev-ml/postgresql-ocaml-4.2.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:=[server] >=dev-lang/ocaml-4:=
 SLOT=0/4.2.0
 SRC_URI=https://github.com/mmottl/postgresql-ocaml/releases/download/4.2.0/postgresql-4.2.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=bd7a74b3869e52518fe7887b756f99e7
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 3189b3938cb3..2db8358f2628 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 073d6433d19d..3f7b042392f9 100644
--- a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_ast/archive/v0.9.1.tar.gz -> ppx_ast-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=2f8970af9000908999d6184d066c41bb
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 8f8e0520047e..1b0e19e3058e 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=d2eda158fb743ca8beea2f0c327bd1ef
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 5fc21119515c..26fef8f05809 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 c360e379e9e8..c7c729e6c223 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
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=ab5c3768ecdd8c3acd769013aa10380e
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
index 3794ab0ac55c..2e1e46a538fd 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
@@ -8,5 +8,5 @@ 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:= >=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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=2dca3048f5f3c64b14e7150d0c45c0ea
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 688f5b8d196b..33526b31d99b 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
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_core/archive/v0.9.0.tar.gz -> ppx_core-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=39357472dfc94cf45b643e5eb2246f52
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
index 6cfda3e7eec0..91aa65049c17 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
@@ -8,5 +8,5 @@ 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:= >=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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=1e7b4d1bba9283bd7d0922c3ff71f77f
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.0 b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
index 1d5fe6ebfd68..d505b3ba7f67 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.0
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.0
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.0.tar.gz -> ppx_derivers-1.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=db65d659fb2c39bbe68597337ed82d5d
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1 b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
index 8ddc87580322..0177e3b16cd1 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
@@ -7,7 +7,8 @@ IUSE=doc +ocamlopt test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.tar.gz -> ppx_deriving-4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbdb709ad564fae109ed33a00089b2a9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50a684a5c7daf6fd58e4ac8b3df38370
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 ae8d7c426553..a0b30ca4023a 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
+++ b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.0
@@ -7,7 +7,8 @@ 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:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5badd88606f9b236df7f0b20af8b626
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4623ed730453fbb98d3781e1685b8caf
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
index 25eec4e6a901..0c71e74aa60e 100644
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.1.tar.gz -> ppx_driver-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=5eebc7208b78283faaf55e931f0c6ec1
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 76f21a153f78..7742416533a9 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.9.0.tar.gz -> ppx_enumerate-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=5d2b37c4d7c7350ca9bfee645c938f02
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 8c4849db64db..1b534abfed66 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 28f0a7852e2b..3c5eb5d01a11 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 deed1a89b3f3..1c71af24060d 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
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=553274bc3d71f529cb5de9b8bcd16d7b
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
index 864bf9c61b21..ab7badfb8cdb 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= 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_hash/archive/v0.9.0.tar.gz -> ppx_hash-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=6f24bade222da199f0aac381d0540358
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.9.1 b/metadata/md5-cache/dev-ml/ppx_here-0.9.1
index bcc51915bd9f..5964193256c2 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.9.1.tar.gz -> ppx_here-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=ec049e275302db6b5e6652389ae76e96
diff --git a/metadata/md5-cache/dev-ml/ppx_import-1.2 b/metadata/md5-cache/dev-ml/ppx_import-1.2
index 5536fdcc1332..3208443a4f18 100644
--- a/metadata/md5-cache/dev-ml/ppx_import-1.2
+++ b/metadata/md5-cache/dev-ml/ppx_import-1.2
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/ppx_tools:= dev-ml/cppo:= >=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2
 SRC_URI=https://github.com/whitequark/ppx_import/archive/v1.2.tar.gz -> ppx_import-1.2.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=5296f8d53290ced6c54db8d1ac3f04cd
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=9db06268349c902b25b45e10de99f9f7
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
index 2d03e6e74fcf..3922487ca456 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.9.2.tar.gz -> ppx_inline_test-0.9.2.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=23e500527a4d90eb7bd226d64561078a
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.9.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
index 7dc775fb6ddb..5f5a4c1621ef 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.9.0.tar.gz -> ppx_jane-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=0d947eb68cb8c2fe3a9358b43cf40433
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
index 6664b274f29c..d7e2e3966288 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.9.0.tar.gz -> ppx_js_style-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=2c76d118f31c13292ce2ccc5461e0f61
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.9.0 b/metadata/md5-cache/dev-ml/ppx_let-0.9.0
index 70c48c0ee9de..95aa65019355 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.9.0.tar.gz -> ppx_let-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=bfa40a81a5c7944f7e5c9ec28e6b46cb
diff --git a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0 b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
index 7bbd418f6906..e3d1cc2c361f 100644
--- a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_metaquot/archive/v0.9.0.tar.gz -> ppx_metaquot-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=b48d9680cabd3835456dd060028f00fc
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
index 77fd9018bef1..c905985880bb 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=a9c5ecff4f30e97f0ce2a20248452e78
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.9.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
index 11ecd8c04b7e..f0239749f603 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= 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_optional/archive/v0.9.0.tar.gz -> ppx_optional-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=5dd1adaf06b098bdf0a2da2f1f53866a
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
index 7838b54302d9..adf20d608ebb 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= 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_pipebang/archive/v0.9.0.tar.gz -> ppx_pipebang-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=7da0c4090a518ede339e19e9aafb644f
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
index 078c9c79b7b4..981d7298abcf 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_metaquot:= dev-ml/ppx_optcomp:= dev-ml/sexplib:= 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_sexp_conv/archive/v0.9.0.tar.gz -> ppx_sexp_conv-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=e35c4add784e5c4d871a691fc4cd8ead
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
index c5cdfdd99445..21a027444b5a 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_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_sexp_message/archive/v0.9.0.tar.gz -> ppx_sexp_message-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=f381bdbc035f18f7fdab24cb4a9e13c8
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
index 2dc919e5dd3a..abba7556e06d 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_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_sexp_value/archive/v0.9.0.tar.gz -> ppx_sexp_value-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=31666963ef78f649771038191855c3f6
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
index 0e572e8a5ac3..e96791f747e0 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.03.0:=[ocamlopt?]
 SLOT=0/5.0.4.03.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.03.0.tar.gz -> ppx_tools-5.0.4.03.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=19bc294b0f7923cfef422d2c35425091
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
index 0a7abda1e822..b77e29f131f2 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?]
 SLOT=0/5.0.4.05.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.05.0.tar.gz -> ppx_tools-5.0.4.05.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c193ba9c6fdd8bf0a266528231a15eb2
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 2966e333d90f..c8b95f8aa088 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
@@ -8,5 +8,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=7218f7b16c3a7e057efef3f7066a165b
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
index 52d240c9cc64..fc2d437f8d3a 100644
--- a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_traverse/archive/v0.9.0.tar.gz -> ppx_traverse-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=ea43b4900c7d52031ecc6dddcca7c011
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
index c82ba2996b35..8a91b9480b39 100644
--- a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_traverse_builtins/archive/v0.9.0.tar.gz -> ppx_traverse_builtins-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=53f213a132b85b86d9c2c24544a9f989
diff --git a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
index 9f91d7f58e7e..95ccb1197b19 100644
--- a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_type_conv/archive/v0.9.0.tar.gz -> ppx_type_conv-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=afeb46c8e96915695f5d12fe37b59a9f
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
index 84c2bd146f56..2efff565fa26 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/typerep:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.9.0.tar.gz -> ppx_typerep_conv-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=3d7c796e73f530b4ffc6369de466ce94
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
index 43729c928116..f11321330dd3 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.9.0.tar.gz -> ppx_variants_conv-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=85b8cf52cb554cc85eb56bd818a193ea
diff --git a/metadata/md5-cache/dev-ml/pxp-1.2.8-r1 b/metadata/md5-cache/dev-ml/pxp-1.2.8-r1
index dcbdb2f19adf..f939ef255d33 100644
--- a/metadata/md5-cache/dev-ml/pxp-1.2.8-r1
+++ b/metadata/md5-cache/dev-ml/pxp-1.2.8-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/pcre-ocaml-4.31:= >=dev-ml/ulex-0.5:= >=dev-ml/ocamlnet-4:= >=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:=
 SLOT=0/1.2.8
 SRC_URI=http://download.camlcity.org/download/pxp-1.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a4388603cf3778786c77a57afdbba2fc
diff --git a/metadata/md5-cache/dev-ml/pxp-1.2.9 b/metadata/md5-cache/dev-ml/pxp-1.2.9
index 29fa68650258..fa08082fd0b5 100644
--- a/metadata/md5-cache/dev-ml/pxp-1.2.9
+++ b/metadata/md5-cache/dev-ml/pxp-1.2.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/pcre-ocaml-4.31:= >=dev-ml/ulex-0.5:= >=dev-ml/ocamlnet-4:= >=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:=
 SLOT=0/1.2.9
 SRC_URI=http://download.camlcity.org/download/pxp-1.2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed7c866624923e15d94c0bd694fb4a5c
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.6 b/metadata/md5-cache/dev-ml/qcheck-0.6
index 585c04d93c90..ed6c6201e201 100644
--- a/metadata/md5-cache/dev-ml/qcheck-0.6
+++ b/metadata/md5-cache/dev-ml/qcheck-0.6
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.6
 SRC_URI=https://github.com/c-cube/qcheck/archive/0.6.tar.gz -> qcheck-0.6.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=972dcb87593ab4bf6d333df0e473be11
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.7 b/metadata/md5-cache/dev-ml/qcheck-0.7
index 16dbe4b32c13..1a9244a7d1cb 100644
--- a/metadata/md5-cache/dev-ml/qcheck-0.7
+++ b/metadata/md5-cache/dev-ml/qcheck-0.7
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-ml/ounit:= !<dev-ml/iTeML-2.5 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.7
 SRC_URI=https://github.com/c-cube/qcheck/archive/0.7.tar.gz -> qcheck-0.7.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1fe4c96a2688c948d5e98588dc192cc4
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.0 b/metadata/md5-cache/dev-ml/re2-0.9.0
index 02c83e1da015..eedbbff21181 100644
--- a/metadata/md5-cache/dev-ml/re2-0.9.0
+++ b/metadata/md5-cache/dev-ml/re2-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/re2/archive/v0.9.0.tar.gz -> re2-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.1 b/metadata/md5-cache/dev-ml/re2-0.9.1
index 5b47db8af311..c79aefe6f2b2 100644
--- a/metadata/md5-cache/dev-ml/re2-0.9.1
+++ b/metadata/md5-cache/dev-ml/re2-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/re2/archive/v0.9.1.tar.gz -> re2-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1 b/metadata/md5-cache/dev-ml/react-1.2.1
index f2743725f834..59db649ec326 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.2.1
 SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=03339606b39345ecbd8f8cd8dda71ac5
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=04bb41d5ec647c978d7ffd3317b1a9b6
diff --git a/metadata/md5-cache/dev-ml/reactiveData-0.2.1 b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
index 04496c2465f1..0430ed7affa0 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-0.2.1
+++ b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/0.2.1
 SRC_URI=https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz -> reactiveData-0.2.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/metadata/md5-cache/dev-ml/reactiveData-9999 b/metadata/md5-cache/dev-ml/reactiveData-9999
index 034c88adda04..39a8244518e5 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-9999
+++ b/metadata/md5-cache/dev-ml/reactiveData-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-3-with-linking-exception
 PROPERTIES=live
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/9999
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=git-r3	6d22636df236df4cc8475f7b7668bdcd	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/metadata/md5-cache/dev-ml/reason-2.0.0 b/metadata/md5-cache/dev-ml/reason-2.0.0
index a63c44ed61c3..67a0a4cf5096 100644
--- a/metadata/md5-cache/dev-ml/reason-2.0.0
+++ b/metadata/md5-cache/dev-ml/reason-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/reason-parser:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/utop:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.0
 SRC_URI=https://github.com/facebook/reason/archive/2.0.0.tar.gz -> reason-2.0.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=ce39802c8bac2fc266bf4380e1bd7394
diff --git a/metadata/md5-cache/dev-ml/reason-parser-2.0.0 b/metadata/md5-cache/dev-ml/reason-parser-2.0.0
index 7583d69444a4..fa6117ab6d23 100644
--- a/metadata/md5-cache/dev-ml/reason-parser-2.0.0
+++ b/metadata/md5-cache/dev-ml/reason-parser-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ml/menhir-20170418:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.0
 SRC_URI=https://github.com/facebook/reason/releases/download/2.0.0/reason-parser-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	3f1ccc0b5a5708088c2c156d4ca79a20	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=610c58f785b745664d11d2f876ae2d1c
diff --git a/metadata/md5-cache/dev-ml/res-4.0.7 b/metadata/md5-cache/dev-ml/res-4.0.7
index c3c5493497db..30b67e25d75a 100644
--- a/metadata/md5-cache/dev-ml/res-4.0.7
+++ b/metadata/md5-cache/dev-ml/res-4.0.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/4.0.7
 SRC_URI=https://github.com/mmottl/res/releases/download/v4.0.7/res-4.0.7.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3c4158afdb258c06220e4c8ac4ea9130
diff --git a/metadata/md5-cache/dev-ml/res-5.0.0 b/metadata/md5-cache/dev-ml/res-5.0.0
index 03ac829cd08d..2e0089a6bfbf 100644
--- a/metadata/md5-cache/dev-ml/res-5.0.0
+++ b/metadata/md5-cache/dev-ml/res-5.0.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/5.0.0
 SRC_URI=https://github.com/mmottl/res/releases/download/5.0.0/res-5.0.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=06ecbc99998705f172721886a8d04509
diff --git a/metadata/md5-cache/dev-ml/result-1.2 b/metadata/md5-cache/dev-ml/result-1.2
index f3b21e9876a8..d40f0dcb2aed 100644
--- a/metadata/md5-cache/dev-ml/result-1.2
+++ b/metadata/md5-cache/dev-ml/result-1.2
@@ -9,5 +9,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=799973ba6cd4e0a8cd6fcb53c039eab8
diff --git a/metadata/md5-cache/dev-ml/rresult-0.5.0 b/metadata/md5-cache/dev-ml/rresult-0.5.0
index e9811a280cce..b1d1c6d025a0 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.5.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.5.0
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.5.0
 SRC_URI=http://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=9ebd0f5b91bf437a8aedc844fa976268
diff --git a/metadata/md5-cache/dev-ml/sedlex-1.99.3 b/metadata/md5-cache/dev-ml/sedlex-1.99.3
index e14199e73ef4..1c5ac9993fe1 100644
--- a/metadata/md5-cache/dev-ml/sedlex-1.99.3
+++ b/metadata/md5-cache/dev-ml/sedlex-1.99.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/gen:=[ocamlopt(+)?] dev-ml/ppx_tools:=[ocamlopt(+)?]
 SLOT=0/1.99.3
 SRC_URI=https://github.com/alainfrisch/sedlex/archive/v1.99.3.tar.gz -> sedlex-1.99.3.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=2ed7559a90be1316e9b2f08b47dec633
diff --git a/metadata/md5-cache/dev-ml/sedlex-1.99.4 b/metadata/md5-cache/dev-ml/sedlex-1.99.4
index 4bbafbf59886..887162d72dd5 100644
--- a/metadata/md5-cache/dev-ml/sedlex-1.99.4
+++ b/metadata/md5-cache/dev-ml/sedlex-1.99.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/gen:=[ocamlopt(+)?] dev-ml/ppx_tools_versioned:=[ocamlopt(+)?] dev-ml/ocaml-migrate-parsetree:=[ocamlopt(+)?]
 SLOT=0/1.99.4
 SRC_URI=https://github.com/alainfrisch/sedlex/archive/v1.99.4.tar.gz -> sedlex-1.99.4.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=c0cb9db11ce36c1d5636e6e5fa3b95b2
diff --git a/metadata/md5-cache/dev-ml/sequence-0.10 b/metadata/md5-cache/dev-ml/sequence-0.10
index 40c99f3e2c76..7bda47ad6250 100644
--- a/metadata/md5-cache/dev-ml/sequence-0.10
+++ b/metadata/md5-cache/dev-ml/sequence-0.10
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=>=dev-lang/ocaml-4.03:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://github.com/c-cube/sequence/archive/0.10.tar.gz -> sequence-0.10.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a84a8aa0a043e74973f0beebb58deced
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.2 b/metadata/md5-cache/dev-ml/sexplib-0.9.2
index d8932710e5c3..5712c5a8f3e8 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.2
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.3 b/metadata/md5-cache/dev-ml/sexplib-0.9.3
index 1aec1178b33b..8fefa876a059 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.3
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.3
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.3.tar.gz -> sexplib-0.9.3.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/spawn-0.9.0 b/metadata/md5-cache/dev-ml/spawn-0.9.0
index 02a3e70327c2..008716d54e4a 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.9.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=efa61e05acee15c9104a3e2f5b0dae70
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1 b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
index b439d47fc437..cf0aa7b59091 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.1 b/metadata/md5-cache/dev-ml/stdio-0.9.1
index 101e4b90d9d5..4d91ff628626 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.1.tar.gz -> stdio-0.9.1.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-ml/stringext-1.4.3 b/metadata/md5-cache/dev-ml/stringext-1.4.3
index 425e7324c30c..6e01916fbf94 100644
--- a/metadata/md5-cache/dev-ml/stringext-1.4.3
+++ b/metadata/md5-cache/dev-ml/stringext-1.4.3
@@ -7,7 +7,8 @@ IUSE=+ocamlopt debug test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RESTRICT=!test? ( test )
 SLOT=0/1.4.3
 SRC_URI=https://github.com/rgrinberg/stringext/archive/v1.4.3.tar.gz -> stringext-1.4.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f434d6b54ae69e829a986614210af2f9
diff --git a/metadata/md5-cache/dev-ml/stringext-1.5.0 b/metadata/md5-cache/dev-ml/stringext-1.5.0
index 62778046d720..bc96fe335972 100644
--- a/metadata/md5-cache/dev-ml/stringext-1.5.0
+++ b/metadata/md5-cache/dev-ml/stringext-1.5.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://github.com/rgrinberg/stringext/archive/1.5.0.tar.gz -> stringext-1.5.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=29825d7226f2562fb9d03aa1521a49d1
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=6c33702dec8e27042484c71df5e0e8c1
diff --git a/metadata/md5-cache/dev-ml/textutils-0.9.0 b/metadata/md5-cache/dev-ml/textutils-0.9.0
index c481afbe142f..de297d3567c8 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.9.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _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 1758e8760333..6443b991721a 100644
--- a/metadata/md5-cache/dev-ml/topkg-0.9.0
+++ b/metadata/md5-cache/dev-ml/topkg-0.9.0
@@ -8,5 +8,5 @@ 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=fa2c9d36389e05a00dbd15965399cc39
diff --git a/metadata/md5-cache/dev-ml/topkg-0.9.1 b/metadata/md5-cache/dev-ml/topkg-0.9.1
index 7cbf6017491a..993957428d25 100644
--- a/metadata/md5-cache/dev-ml/topkg-0.9.1
+++ b/metadata/md5-cache/dev-ml/topkg-0.9.1
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v0.9.1.tar.gz -> topkg-0.9.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=fa2c9d36389e05a00dbd15965399cc39
diff --git a/metadata/md5-cache/dev-ml/type-conv-113.00.02 b/metadata/md5-cache/dev-ml/type-conv-113.00.02
index a965c7cb7127..425387c65725 100644
--- a/metadata/md5-cache/dev-ml/type-conv-113.00.02
+++ b/metadata/md5-cache/dev-ml/type-conv-113.00.02
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/113.00.02
 SRC_URI=http://ocaml.janestreet.com/ocaml-core/113.00/files/type_conv-113.00.02.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=790ff2b2c3413f325b952c1f2733312b
diff --git a/metadata/md5-cache/dev-ml/typerep-0.9.0 b/metadata/md5-cache/dev-ml/typerep-0.9.0
index c343b53f2326..feffe9dade1c 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.9.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.9.0.tar.gz -> typerep-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=9715ff2e47717286dc2a7c1dc71b7e5f
diff --git a/metadata/md5-cache/dev-ml/typerep_extended-0.9.0 b/metadata/md5-cache/dev-ml/typerep_extended-0.9.0
index e2f6272951f0..5f161b028410 100644
--- a/metadata/md5-cache/dev-ml/typerep_extended-0.9.0
+++ b/metadata/md5-cache/dev-ml/typerep_extended-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/bin-prot:= dev-ml/core_kernel:= dev-ml/ppx_bin_prot:= dev-ml/ppx_driver:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_sexp_value:= dev-ml/ppx_type_conv:= dev-ml/ppx_typerep_conv:= dev-ml/sexplib:= dev-ml/typerep:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/typerep_extended/archive/v0.9.0.tar.gz -> typerep_extended-0.9.0.tar.gz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=9e4d8c11b58317bd92eccfdc93555e1e
diff --git a/metadata/md5-cache/dev-ml/tyxml-4.1.0 b/metadata/md5-cache/dev-ml/tyxml-4.1.0
index 156f0b25cd14..814f016d023c 100644
--- a/metadata/md5-cache/dev-ml/tyxml-4.1.0
+++ b/metadata/md5-cache/dev-ml/tyxml-4.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/uutf-1.0:= dev-ml/uchar:= dev-ml/ocaml-re:= ppx? ( >=dev-ml/ppx_tools-5:= dev-ml/markup:= ) camlp4? ( dev-ml/camlp4:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/4.1.0
 SRC_URI=https://github.com/ocsigen/tyxml/archive/4.1.0.tar.gz -> tyxml-4.1.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	79efa057b6e27e203e3feaa1c1710794	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	oasis	82eda17aa9cfd93d0b49294851c61214	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=021798829210256a5f2edc699b152ee7
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 43c0bce5b0c1..54669eaff260 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.03:=
 RESTRICT=test
 SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=061a9464d94aa03f3a45b4f44d184eee
diff --git a/metadata/md5-cache/dev-ml/ulex-1.1 b/metadata/md5-cache/dev-ml/ulex-1.1
index af247db79783..193fb3a6af2b 100644
--- a/metadata/md5-cache/dev-ml/ulex-1.1
+++ b/metadata/md5-cache/dev-ml/ulex-1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-ml/camlp4:=
 SLOT=0/1.1
 SRC_URI=http://www.cduce.org/download/ulex-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=afb5e8d0f56592449dc08407ff712151
diff --git a/metadata/md5-cache/dev-ml/utop-2.0.1 b/metadata/md5-cache/dev-ml/utop-2.0.1
index 75733f1f1a08..a8af27d99a6c 100644
--- a/metadata/md5-cache/dev-ml/utop-2.0.1
+++ b/metadata/md5-cache/dev-ml/utop-2.0.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _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 81a226da1b50..102e269e1966 100644
--- a/metadata/md5-cache/dev-ml/uuidm-0.9.6
+++ b/metadata/md5-cache/dev-ml/uuidm-0.9.6
@@ -8,5 +8,5 @@ LICENSE=ISC
 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=62ef72e9291251a968fd334e50701e3a
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index cd508cf71bc7..3ead1a7e4974 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -7,7 +7,8 @@ IUSE=doc utftrip +ocamlopt test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
+RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=http://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=7adb19fb33d0ebe8e713c4bf7fbfaedb
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=5023dfb5ce0f97856c1dfa6d878de247
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.9.0 b/metadata/md5-cache/dev-ml/variantslib-0.9.0
index 7a2fbef99527..6e409be637e0 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.9.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.9.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=d886530b2ff32238ab5fec6fc318d0e1
diff --git a/metadata/md5-cache/dev-ml/xml-light-2.2-r3 b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
index 338abb0af50a..c29ef3221b43 100644
--- a/metadata/md5-cache/dev-ml/xml-light-2.2-r3
+++ b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=http://tech.motion-twin.com/zip/xml-light-2.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f67a5830d65be3e1ca63fa045e5b83aa
diff --git a/metadata/md5-cache/dev-ml/xmlm-1.3.0 b/metadata/md5-cache/dev-ml/xmlm-1.3.0
index 2ae3587f551c..f81afeb044e6 100644
--- a/metadata/md5-cache/dev-ml/xmlm-1.3.0
+++ b/metadata/md5-cache/dev-ml/xmlm-1.3.0
@@ -7,7 +7,8 @@ IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
 SLOT=0/1.3.0
 SRC_URI=http://erratique.ch/software/xmlm/releases/xmlm-1.3.0.tbz
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
-_md5_=cc99bd1b9a9bfefa7d74b4d59f8be67b
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_md5_=697fbeb6c76a659a3e09c7fad5bce05a
diff --git a/metadata/md5-cache/dev-ml/xstr-0.2.1 b/metadata/md5-cache/dev-ml/xstr-0.2.1
index 17b0f917f894..3cbb4de27cc6 100644
--- a/metadata/md5-cache/dev-ml/xstr-0.2.1
+++ b/metadata/md5-cache/dev-ml/xstr-0.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt]
 SLOT=0/0.2.1
 SRC_URI=http://www.ocaml-programming.de/packages/xstr-0.2.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
 _md5_=7110de2b94ae0a793175b86266f6c953
diff --git a/metadata/md5-cache/dev-ml/yojson-1.4.0 b/metadata/md5-cache/dev-ml/yojson-1.4.0
index 8cef742db321..cfa532cb5806 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.4.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 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
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150	opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=fb6b0c3afce29897340daa4af070bbf4
diff --git a/metadata/md5-cache/dev-ml/zarith-1.4.1 b/metadata/md5-cache/dev-ml/zarith-1.4.1
index ec990333228c..8e1b552c3b30 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.4.1
+++ b/metadata/md5-cache/dev-ml/zarith-1.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
 SLOT=0/1.4.1
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1574/zarith-1.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64ad80ce8dcb5f5293a985a95f48a688
diff --git a/metadata/md5-cache/dev-ml/zarith-1.5 b/metadata/md5-cache/dev-ml/zarith-1.5
index 9be57731b79a..953bf116f60c 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.5
+++ b/metadata/md5-cache/dev-ml/zarith-1.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
 SLOT=0/1.5
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.5.tar.gz -> zarith-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c2c01e938d76da252430b6cc5269e16
diff --git a/metadata/md5-cache/dev-ml/zarith-1.6 b/metadata/md5-cache/dev-ml/zarith-1.6
index b7ace9a97d6d..cbe97ae07c68 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.6
+++ b/metadata/md5-cache/dev-ml/zarith-1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
 SLOT=0/1.6
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.6.tar.gz -> zarith-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6c2c01e938d76da252430b6cc5269e16
diff --git a/metadata/md5-cache/dev-ml/zarith-1.7 b/metadata/md5-cache/dev-ml/zarith-1.7
index e8cee6fab0af..13ee60cfbe12 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.7
+++ b/metadata/md5-cache/dev-ml/zarith-1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir )
 SLOT=0/1.7
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz -> zarith-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bdbcac0f5fbabd313eb05d38f5920763
diff --git a/metadata/md5-cache/dev-ml/zed-1.5 b/metadata/md5-cache/dev-ml/zed-1.5
index 182be5cf7fe7..5b36bd42a1cc 100644
--- a/metadata/md5-cache/dev-ml/zed-1.5
+++ b/metadata/md5-cache/dev-ml/zed-1.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 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
-_eclasses_=opam	3f1ccc0b5a5708088c2c156d4ca79a20
+_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
 _md5_=fdb294a15bf407125f16eac9a24d2f6d
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /metadata/md5-cache/dev-ml
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)